[booking][search] Review fixes

android/jni/com/mapswithme/maps/SearchEngine.cpp

@@ -528,11 +528,9 @@ public:
     }
     else
     {
-      // Use tomorrow and day after tomorrow by default.
-      result.m_checkin = booking::AvailabilityParams::Clock::now() + chrono::hours(24);
-      result.m_checkout = booking::AvailabilityParams::Clock::now() + chrono::hours(48);
-      // Use two adults without children.
-      result.m_rooms.emplace_back(2, -1);
+      result = g_framework->NativeFramework()->GetLastBookingAvailabilityParams();
+      if (result.IsEmpty())
+        result = booking::AvailabilityParams::MakeDefault();
     }
 
     result.m_dealsOnly = true;

android/jni/com/mapswithme/maps/SearchEngine.hpp

@@ -2,9 +2,8 @@
 
 #include "com/mapswithme/core/jni_helper.hpp"
 
-#include "search/result.hpp"
-
 #include "map/everywhere_search_callback.hpp"
+#include "search/result.hpp"
 
 #include <vector>
 

iphone/Maps/Core/Search/MWMSearch.mm

@@ -154,12 +154,9 @@ using Observers = NSHashTable<Observer>;
   booking::filter::Tasks tasks;
   if (availabilityParams.IsEmpty())
   {
-    booking::AvailabilityParams params;
-    // Use tomorrow and day after tomorrow by default.
-    params.m_checkin = booking::AvailabilityParams::Clock::now() + std::chrono::hours(24);
-    params.m_checkout = booking::AvailabilityParams::Clock::now() + std::chrono::hours(48);
-    // Use two adults without children.
-    params.m_rooms.emplace_back(2, -1);
+    auto params = GetFramework().GetLastBookingAvailabilityParams();
+    if (params.IsEmpty())
+      params = booking::AvailabilityParams::MakeDefault();
     params.m_dealsOnly = true;
     
     booking::filter::Params dp(std::make_shared<booking::AvailabilityParams>(params), {});

map/booking_filter_params.hpp

@@ -70,8 +70,12 @@ using TaskInternal = TaskImpl<ParamsInternal>;
 
 enum ApplyMode
 {
+  /// Apply filters independently on provided list of search results.
+  /// Every filter will be applied on own copy of search results.
   Independent,
-  Consecutively
+  /// Apply each filter one by one on provided list of search results.
+  /// All filters will be applied on joint copy of search results.
+  Consecutive
 };
 
 template <typename T>

map/booking_filter_processor.cpp

@@ -24,8 +24,8 @@ void FilterProcessor::ApplyFilters(search::Results const & results, TasksInterna
 
     switch (mode)
     {
-    case Independent: ApplyIndependent(results, tasks); break;
-    case Consecutively: ApplyConsecutively(results, tasks); break;
+    case Independent: ApplyIndependently(results, tasks); break;
+    case Consecutive: ApplyConsecutively(results, tasks); break;
     }
   });
 }
@@ -71,7 +71,7 @@ void FilterProcessor::ApplyConsecutively(search::Results const & results, TasksI
     auto const & cb = tasks[i - 1].m_filterParams.m_callback;
 
     tasks[i - 1].m_filterParams.m_callback =
-      [ this, cb, nextTask = std::move(tasks[i]) ](search::Results const & results) mutable
+      [this, cb, nextTask = std::move(tasks[i])](search::Results const & results) mutable
       {
         cb(results);
         // Run the next filter with obtained results from the previous one.
@@ -82,16 +82,15 @@ void FilterProcessor::ApplyConsecutively(search::Results const & results, TasksI
         });
       };
   }
-  // Run first filter.
+  // Run the first filter.
   m_filters.at(tasks.front().m_type)->ApplyFilter(results, tasks.front().m_filterParams);
 }
 
-void FilterProcessor::ApplyIndependent(search::Results const & results, TasksInternal const & tasks)
+void FilterProcessor::ApplyIndependently(search::Results const & results,
+                                         TasksInternal const & tasks)
 {
   for (auto const & task : tasks)
-  {
     m_filters.at(task.m_type)->ApplyFilter(results, task.m_filterParams);
-  }
 }
 }  // namespace filter
 }  // namespace booking

map/booking_filter_processor.hpp

@@ -46,7 +46,7 @@ public:
 
 private:
   void ApplyConsecutively(search::Results const & results, TasksInternal & tasks);
-  void ApplyIndependent(search::Results const & results, TasksInternal const & tasks);
+  void ApplyIndependently(search::Results const & results, TasksInternal const & tasks);
   Index const & m_index;
   Api const & m_api;
 

map/everywhere_search_callback.cpp

@@ -26,7 +26,7 @@ void EverywhereSearchCallback::operator()(Results const & results)
 
   if (results.IsEndedNormal() && results.GetType() == Results::Type::Hotels)
   {
-    m_delegate.FilterSearchResultsOnBooking(m_bookingFilterTasks, results, false /* inViewport */);
+    m_delegate.FilterResultsForHotelsQuery(m_bookingFilterTasks, results, false /* inViewport */);
   }
 
   ASSERT_EQUAL(m_productInfo.size(), results.GetCount(), ());

map/everywhere_search_callback.hpp

@@ -23,8 +23,8 @@ public:
     virtual ~Delegate() = default;
 
     virtual ProductInfo GetProductInfo(Result const & result) const = 0;
-    virtual void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks,
-                                              search::Results const & results, bool inViewport) = 0;
+    virtual void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks,
+                                             search::Results const & results, bool inViewport) = 0;
   };
 
   EverywhereSearchCallback(Delegate & delegate, booking::filter::Tasks const & bookingFilterTasks,

map/everywhere_search_params.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "map/booking_filter_params.hpp"
-#include "map/everywhere_search_callback.hpp"
 
 #include "search/hotels_filter.hpp"
 #include "search/result.hpp"

map/framework.cpp

@@ -3125,15 +3125,17 @@ void Framework::SetSearchDisplacementModeEnabled(bool enabled)
   SetDisplacementMode(DisplacementModeManager::SLOT_INTERACTIVE_SEARCH, enabled /* show */);
 }
 
+void Framework::ShowViewportSearchResults(bool clear, search::Results::ConstIter begin,
+                                          search::Results::ConstIter end)
+{
+  FillSearchResultsMarks(clear, begin, end);
+}
+
 void Framework::ShowViewportSearchResults(bool clear, booking::filter::Types types,
                                           search::Results::ConstIter begin,
                                           search::Results::ConstIter end)
 {
-  if (types.empty())
-  {
-    FillSearchResultsMarks(clear, begin, end);
-    return;
-  }
+  ASSERT(!types.empty(), ());
 
   search::Results results;
   results.AddResultsNoChecks(begin, end);
@@ -3408,8 +3410,8 @@ ugc::Reviews Framework::FilterUGCReviews(ugc::Reviews const & reviews) const
   return result;
 }
 
-void Framework::FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks,
-                                             search::Results const & results, bool inViewport)
+void Framework::FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks,
+                                            search::Results const & results, bool inViewport)
 {
   using namespace booking::filter;
 
@@ -3434,9 +3436,7 @@ void Framework::FilterSearchResultsOnBooking(booking::filter::Tasks const & filt
 
           std::vector<FeatureID> features;
           for (auto const & r : results)
-          {
             features.push_back(r.GetFeatureID());
-          }
 
           std::sort(features.begin(), features.end());
 
@@ -3448,7 +3448,7 @@ void Framework::FilterSearchResultsOnBooking(booking::filter::Tasks const & filt
               {
               case Type::Deals:
                 m_searchMarks.SetSales(features, true /* hasSale */);
-                  break;
+                break;
               case Type::Availability:
                 m_searchMarks.SetPreparingState(features, false /* isPreparing */);
                 break;
@@ -3475,3 +3475,8 @@ void Framework::OnBookingFilterParamsUpdate(booking::filter::Tasks const & filte
     m_bookingFilterProcessor.OnParamsUpdated(task.m_type, task.m_filterParams.m_apiParams);
   }
 }
+
+booking::AvailabilityParams Framework::GetLastBookingAvailabilityParams() const
+{
+  return m_bookingAvailabilityParams;
+}

map/framework.hpp

@@ -342,6 +342,8 @@ public:
   // SearchAPI::Delegate overrides:
   void RunUITask(function<void()> fn) override;
   void SetSearchDisplacementModeEnabled(bool enabled) override;
+  void ShowViewportSearchResults(bool clear, search::Results::ConstIter begin,
+                                 search::Results::ConstIter end) override;
   void ShowViewportSearchResults(bool clear, booking::filter::Types types,
                                  search::Results::ConstIter begin,
                                  search::Results::ConstIter end) override;
@@ -843,10 +845,12 @@ private:
   ugc::Reviews FilterUGCReviews(ugc::Reviews const & reviews) const;
 
 public:
-  void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks,
-                                    search::Results const & results, bool inViewport) override;
+  void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks,
+                                   search::Results const & results, bool inViewport) override;
   void OnBookingFilterParamsUpdate(booking::filter::Tasks const & filterTasks) override;
 
+  booking::AvailabilityParams GetLastBookingAvailabilityParams() const;
+
 private:
   // m_discoveryManager must be bellow m_searchApi, m_viatorApi, m_localsApi
   unique_ptr<discovery::Manager> m_discoveryManager;

map/map_integration_tests/CMakeLists.txt

@@ -40,4 +40,4 @@ omim_link_libraries(
   ${LIBZ}
 )
 
-link_qt5_core(${PROJECT_NAME})
+link_qt5_core(${PROJECT_NAME})

map/map_integration_tests/interactive_search_test.cpp

@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
 #include "search/mode.hpp"
-#include "search/search_tests_support/integration_tests_helpers.hpp"
+#include "search/search_tests_support/helpers.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
 #include "search/search_tests_support/test_search_request.hpp"
 
@@ -41,16 +41,21 @@ public:
 
   bool IsViewportSearchActive() const override { return true; }
 
-  void ShowViewportSearchResults(bool clear, booking::filter::Types /* types */,
-                                 Results::ConstIter begin, Results::ConstIter end) override
+  void ShowViewportSearchResults(bool clear, Results::ConstIter begin,
+                                 Results::ConstIter end) override
   {
     if (clear)
       m_stats.m_numShownResults = 0;
     m_stats.m_numShownResults += distance(begin, end);
   }
 
-  void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks,
-                                    search::Results const & results, bool inViewport) override
+  void ShowViewportSearchResults(bool clear, booking::filter::Types types,
+                                 Results::ConstIter begin, Results::ConstIter end) override
+  {
+  }
+
+  void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks,
+                                   search::Results const & results, bool inViewport) override
   {
   }
 

map/search_api.cpp

@@ -337,6 +337,12 @@ bool SearchAPI::IsViewportSearchActive() const
   return !m_searchIntents[static_cast<size_t>(Mode::Viewport)].m_params.m_query.empty();
 }
 
+void SearchAPI::ShowViewportSearchResults(bool clear, Results::ConstIter begin,
+                                          Results::ConstIter end)
+{
+  return m_delegate.ShowViewportSearchResults(clear, begin, end);
+}
+
 void SearchAPI::ShowViewportSearchResults(bool clear, booking::filter::Types types,
                                           Results::ConstIter begin, Results::ConstIter end)
 {
@@ -348,10 +354,10 @@ ProductInfo SearchAPI::GetProductInfo(Result const & result) const
   return m_delegate.GetProductInfo(result);
 }
 
-void SearchAPI::FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks,
-                                             search::Results const & results, bool inViewport)
+void SearchAPI::FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks,
+                                            search::Results const & results, bool inViewport)
 {
-  m_delegate.FilterSearchResultsOnBooking(filterTasks, results, inViewport);
+  m_delegate.FilterResultsForHotelsQuery(filterTasks, results, inViewport);
 }
 
 void SearchAPI::OnBookmarksCreated(vector<pair<kml::MarkId, kml::BookmarkData>> const & marks)

map/search_api.hpp

@@ -53,6 +53,11 @@ public:
 
     virtual void SetSearchDisplacementModeEnabled(bool /* enabled */) {}
 
+    virtual void ShowViewportSearchResults(bool clear, search::Results::ConstIter begin,
+                                           search::Results::ConstIter end)
+    {
+    }
+
     virtual void ShowViewportSearchResults(bool clear, booking::filter::Types types,
                                            search::Results::ConstIter begin,
                                            search::Results::ConstIter end)
@@ -70,8 +75,8 @@ public:
 
     virtual double GetMinDistanceBetweenResults() const { return 0.0; };
 
-    virtual void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks,
-                                              search::Results const & results, bool inViewport)
+    virtual void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks,
+                                             search::Results const & results, bool inViewport)
     {
     }
 
@@ -119,12 +124,14 @@ public:
   void RunUITask(std::function<void()> fn) override;
   void SetHotelDisplacementMode() override;
   bool IsViewportSearchActive() const override;
+  void ShowViewportSearchResults(bool clear, search::Results::ConstIter begin,
+                                 search::Results::ConstIter end) override;
   void ShowViewportSearchResults(bool clear, booking::filter::Types types,
                                  search::Results::ConstIter begin,
                                  search::Results::ConstIter end) override;
   search::ProductInfo GetProductInfo(search::Result const & result) const override;
-  void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks,
-                                    search::Results const & results, bool inViewport) override;
+  void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks,
+                                   search::Results const & results, bool inViewport) override;
 
   void OnBookmarksCreated(std::vector<std::pair<kml::MarkId, kml::BookmarkData>> const & marks);
   void OnBookmarksUpdated(std::vector<std::pair<kml::MarkId, kml::BookmarkData>> const & marks);

map/viewport_search_callback.cpp

@@ -77,14 +77,23 @@ void ViewportSearchCallback::operator()(Results const & results)
     m_delegate.RunUITask([&delegate, firstCall, types, results, lastResultsSize]() {
       if (!delegate.IsViewportSearchActive())
         return;
-      delegate.ShowViewportSearchResults(firstCall, types, results.begin() + lastResultsSize,
-                                         results.end());
+
+      if (types.empty())
+      {
+        delegate.ShowViewportSearchResults(firstCall, results.begin() + lastResultsSize,
+                                           results.end());
+      }
+      else
+      {
+        delegate.ShowViewportSearchResults(firstCall, types, results.begin() + lastResultsSize,
+                                           results.end());
+      }
     });
   }
 
   if (results.IsEndedNormal() && results.GetType() == Results::Type::Hotels)
   {
-    m_delegate.FilterSearchResultsOnBooking(m_bookingFilterTasks, results, true /* inViewport */);
+    m_delegate.FilterResultsForHotelsQuery(m_bookingFilterTasks, results, true /* inViewport */);
   }
 
   m_lastResultsSize = results.GetCount();

map/viewport_search_callback.hpp

@@ -24,10 +24,12 @@ public:
     virtual void RunUITask(std::function<void()> fn) = 0;
     virtual void SetHotelDisplacementMode() = 0;
     virtual bool IsViewportSearchActive() const = 0;
+    virtual void ShowViewportSearchResults(bool clear, Results::ConstIter begin,
+                                           Results::ConstIter end) = 0;
     virtual void ShowViewportSearchResults(bool clear, booking::filter::Types types,
                                            Results::ConstIter begin, Results::ConstIter end) = 0;
-    virtual void FilterSearchResultsOnBooking(booking::filter::Tasks const & filterTasks,
-                                              search::Results const & results, bool inViewport) = 0;
+    virtual void FilterResultsForHotelsQuery(booking::filter::Tasks const & filterTasks,
+                                             search::Results const & results, bool inViewport) = 0;
   };
 
   using OnResults = SearchParams::OnResults;

partners_api/booking_availability_params.cpp

@@ -73,6 +73,19 @@ bool AvailabilityParams::Room::operator==(AvailabilityParams::Room const & rhs)
   return !this->operator!=(rhs);
 }
 
+// static
+AvailabilityParams AvailabilityParams::MakeDefault()
+{
+  AvailabilityParams result;
+  // Use tomorrow and day after tomorrow by default.
+  result.m_checkin = Clock::now() + std::chrono::hours(24);
+  result.m_checkout = Clock::now() + std::chrono::hours(48);
+  // Use two adults without children.
+  result.m_rooms = {{2, Room::kNoChildren}};
+
+  return result;
+}
+
 url::Params AvailabilityParams::Get(UrlFilter const & filter /* = {} */) const
 {
   url::Params result;

partners_api/booking_availability_params.hpp

@@ -43,6 +43,8 @@ struct AvailabilityParams : public ParamsBase
   using Rooms = std::vector<Room>;
   using Stars = std::vector<std::string>;
 
+  static AvailabilityParams MakeDefault();
+
   using UrlFilter = std::unordered_set<std::string>;
   base::url::Params Get(UrlFilter const & filter = {}) const;
 
@@ -70,7 +72,7 @@ struct AvailabilityParams : public ParamsBase
   double m_minReviewScore = {};
   /// Limit to hotels with the given number(s) of stars. Supported values 1-5.
   Stars m_stars;
-  /// Only show rates that are deals of given types.
+  /// Only show rates that are deals of types: smart, lastm.
   bool m_dealsOnly = false;
 };
 }  // namespace booking

search/hotels_classifier.cpp

@@ -1,4 +1,5 @@
 #include "search/hotels_classifier.hpp"
+
 #include "search/result.hpp"
 
 #include "std/cstdint.hpp"
@@ -9,11 +10,9 @@ namespace search
 bool HotelsClassifier::IsHotelResults(Results const & results)
 {
   HotelsClassifier classifier;
-  auto first = results.begin();
-  for (; first != results.end(); ++first)
-  {
-    classifier.Add(*first);
-  }
+  for ( auto const & r : results)
+    classifier.Add(r);
+
   return classifier.IsHotelResults();
 }
 

search/result.hpp

@@ -164,7 +164,7 @@ public:
 
   enum class Type
   {
-    Simple,
+    Default,
     Hotels
   };
 
@@ -222,7 +222,7 @@ public:
 
   Type GetType() const
   {
-    return m_hotelsClassif.IsHotelResults() ? Type::Hotels : Type::Simple;
+    return m_hotelsClassif.IsHotelResults() ? Type::Hotels : Type::Default;
   }
 
 private:

search/search_integration_tests/downloader_search_test.cpp

@@ -5,7 +5,7 @@
 #include "search/downloader_search_callback.hpp"
 #include "search/mode.hpp"
 #include "search/result.hpp"
-#include "search/search_tests_support/integration_tests_helpers.hpp"
+#include "search/search_tests_support/helpers.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
 #include "search/search_tests_support/test_search_request.hpp"
 

search/search_integration_tests/pre_ranker_test.cpp

@@ -7,7 +7,7 @@
 #include "search/model.hpp"
 #include "search/pre_ranker.hpp"
 #include "search/ranker.hpp"
-#include "search/search_tests_support/integration_tests_helpers.hpp"
+#include "search/search_tests_support/helpers.hpp"
 #include "search/search_tests_support/test_search_engine.hpp"
 #include "search/suggest.hpp"
 

search/search_integration_tests/processor_test.cpp

@@ -3,7 +3,7 @@
 #include "search/cities_boundaries_table.hpp"
 #include "search/features_layer_path_finder.hpp"
 #include "search/retrieval.hpp"
-#include "search/search_tests_support/integration_tests_helpers.hpp"
+#include "search/search_tests_support/helpers.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
 #include "search/search_tests_support/test_search_request.hpp"
 #include "search/token_range.hpp"

search/search_integration_tests/ranker_test.cpp

@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/search_tests_support/integration_tests_helpers.hpp"
+#include "search/search_tests_support/helpers.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
 
 #include "generator/generator_tests_support/test_feature.hpp"

search/search_integration_tests/search_edited_features_test.cpp

@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/search_tests_support/integration_tests_helpers.hpp"
+#include "search/search_tests_support/helpers.hpp"
 
 #include "search/search_tests_support/test_results_matching.hpp"
 

search/search_integration_tests/smoke_test.cpp

@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/search_tests_support/integration_tests_helpers.hpp"
+#include "search/search_tests_support/helpers.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
 #include "search/search_tests_support/test_search_request.hpp"
 

search/search_integration_tests/tracer_tests.cpp

@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
 #include "search/geocoder_context.hpp"
-#include "search/search_tests_support/integration_tests_helpers.hpp"
+#include "search/search_tests_support/helpers.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
 #include "search/tracer.hpp"
 

search/search_tests_support/CMakeLists.txt

@@ -2,8 +2,8 @@ project(search_tests_support)
 
 set(
   SRC
-  integration_tests_helpers.cpp
-  integration_tests_helpers.hpp
+  helpers.cpp
+  helpers.hpp
   test_results_matching.cpp
   test_results_matching.hpp
   test_search_engine.cpp

search/search_tests_support/helpers.cpp

@@ -1,4 +1,4 @@
-#include "search/search_tests_support/integration_tests_helpers.hpp"
+#include "search/search_tests_support/helpers.hpp"
 
 #include "storage/country_info_getter.hpp"
 

xcode/map/map_tests copy-Info.plist

@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeIconFiles</key>
-			<array>
-				<string>320-pro.png</string>
-				<string>64-pro.png</string>
-				<string>44x58-pro.png</string>
-				<string>22x29-pro.png</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Google Earth KML Document</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>com.google.earth.kml</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleTypeIconFiles</key>
-			<array>
-				<string>320-pro.png</string>
-				<string>64-pro.png</string>
-				<string>44x58-pro.png</string>
-				<string>22x29-pro.png</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Google Earth KMZ Document</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>com.google.earth.kmz</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${CURRENT_PROJECT_VERSION}</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>CFBundleURLName</key>
-			<string>com.mapswithme.maps</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>mapswithme</string>
-				<string>mapsme</string>
-				<string>ge0</string>
-				<string>geo</string>
-				<string>fb185237551520383</string>
-				<string>mapswithmepro</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>com.googleusercontent.apps.1033279251462-k2pp753lp1f39dacjn0pkurcc8pbbvsi</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>0</string>
-	<key>Fabric</key>
-	<dict>
-		<key>APIKey</key>
-		<string>2773ac2121a74ed96c8cfd4009ed7ea1eb0d2313</string>
-		<key>Kits</key>
-		<array>
-			<dict>
-				<key>KitInfo</key>
-				<dict/>
-				<key>KitName</key>
-				<string>Crashlytics</string>
-			</dict>
-		</array>
-	</dict>
-	<key>FacebookAppID</key>
-	<string>185237551520383</string>
-	<key>FacebookDisplayName</key>
-	<string>MapsWithMe, offline maps</string>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>fbapi</string>
-		<string>fb-messenger-api</string>
-		<string>fbauth2</string>
-		<string>fbshareextension</string>
-		<string>uber</string>
-		<string>yandextaxi</string>
-		<string>tel</string>
-		<string>booking</string>
-	</array>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>akamaihd.net</key>
-			<dict>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-				<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
-				<false/>
-			</dict>
-			<key>facebook.com</key>
-			<dict>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-				<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
-				<false/>
-			</dict>
-			<key>fbcdn.net</key>
-			<dict>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-				<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
-				<false/>
-			</dict>
-			<key>maps.me</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-			<key>mapswithme.com</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-				<key>NSIncludesSubdomains</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
-	<key>NSCameraUsageDescription</key>
-	<string>Unused by an application</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Unused by an application</string>
-	<key>PW_USE_GPS</key>
-	<false/>
-	<key>Pushwoosh_APPID</key>
-	<string>84E00-0F767</string>
-	<key>Pushwoosh_LOG_LEVEL</key>
-	<string>WARNING</string>
-	<key>UIApplicationShortcutItems</key>
-	<array>
-		<dict>
-			<key>UIApplicationShortcutItemIconFile</key>
-			<string>ic_3dtouch_search</string>
-			<key>UIApplicationShortcutItemTitle</key>
-			<string>search</string>
-			<key>UIApplicationShortcutItemType</key>
-			<string>me.maps.3daction.search</string>
-		</dict>
-		<dict>
-			<key>UIApplicationShortcutItemIconFile</key>
-			<string>ic_3dtouch_bookmarks</string>
-			<key>UIApplicationShortcutItemTitle</key>
-			<string>bookmarks</string>
-			<key>UIApplicationShortcutItemType</key>
-			<string>me.maps.3daction.bookmarks</string>
-		</dict>
-		<dict>
-			<key>UIApplicationShortcutItemIconFile</key>
-			<string>ic_3dtouch_planing_route</string>
-			<key>UIApplicationShortcutItemTitle</key>
-			<string>route</string>
-			<key>UIApplicationShortcutItemType</key>
-			<string>me.maps.3daction.route</string>
-		</dict>
-	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>audio</string>
-		<string>fetch</string>
-		<string>location</string>
-		<string>remote-notification</string>
-	</array>
-	<key>UIFileSharingEnabled</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIPrerenderedIcon</key>
-	<true/>
-	<key>UIStatusBarHidden</key>
-	<false/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UTImportedTypeDeclarations</key>
-	<array>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.xml</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Google Earth KML Document</string>
-			<key>UTTypeIdentifier</key>
-			<string>com.google.earth.kml</string>
-			<key>UTTypeReferenceURL</key>
-			<string>http://earth.google.com/kml/</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>com.apple.ostype</key>
-				<string>GKml</string>
-				<key>public.filename-extension</key>
-				<array>
-					<string>kml</string>
-				</array>
-				<key>public.mime-type</key>
-				<string>application/vnd.google-earth.kml+xml</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>com.pkware.zip-archive</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Google Earth KMZ Document</string>
-			<key>UTTypeIdentifier</key>
-			<string>com.google.earth.kmz</string>
-			<key>UTTypeReferenceURL</key>
-			<string>http://earth.google.com/kmz/</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>com.apple.ostype</key>
-				<string>GKmz</string>
-				<key>public.filename-extension</key>
-				<array>
-					<string>kmz</string>
-				</array>
-				<key>public.mime-type</key>
-				<string>application/vnd.google-earth.kmz+xml</string>
-			</dict>
-		</dict>
-	</array>
-</dict>
-</plist>