From bae8705910dd69c285c0b01830cc888ba41ff0e9 Mon Sep 17 00:00:00 2001 From: ExMix Date: Sun, 30 Aug 2015 19:23:45 +0300 Subject: [PATCH] rebase fixes --- android/jni/com/mapswithme/maps/Framework.cpp | 4 +-- .../com/mapswithme/maps/MwmApplication.cpp | 2 +- .../com/mapswithme/maps/RenderFragment.java | 2 +- drape/glyph_manager.cpp | 2 +- drape_frontend/frontend_renderer.cpp | 2 +- map/framework.cpp | 28 ++++++++++--------- map/framework.hpp | 4 +++ map/map_tests/bookmarks_test.cpp | 2 +- routing/route.cpp | 2 +- 9 files changed, 27 insertions(+), 21 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 09e5215450..4a002789b7 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -84,13 +84,13 @@ void Framework::OnLocationUpdated(location::GpsInfo const & info) m_work.OnLocationUpdate(info); } -void Framework::OnCompassUpdated(location::CompassInfo const & info) +void Framework::OnCompassUpdated(location::CompassInfo const & info, bool force) { static double const COMPASS_THRASHOLD = my::DegToRad(1.0); /// @todo Do not emit compass bearing too often while we are passing it through nv-queue. /// Need to make more experiments in future. - if (fabs(ang::GetShortestDistance(m_lastCompass, info.m_bearing)) >= COMPASS_THRASHOLD) + if (force || fabs(ang::GetShortestDistance(m_lastCompass, info.m_bearing)) >= COMPASS_THRASHOLD) { m_lastCompass = info.m_bearing; m_work.OnCompassUpdate(info); diff --git a/android/jni/com/mapswithme/maps/MwmApplication.cpp b/android/jni/com/mapswithme/maps/MwmApplication.cpp index 9979c0c9c4..5de9b805ed 100644 --- a/android/jni/com/mapswithme/maps/MwmApplication.cpp +++ b/android/jni/com/mapswithme/maps/MwmApplication.cpp @@ -24,7 +24,7 @@ extern "C" } JNIEXPORT void JNICALL - Java_com_mapswithme_maps_MWMApplication_runNativeFunctor(JNIEnv * env, jobject thiz, jlong functorPointer) + Java_com_mapswithme_maps_MwmApplication_runNativeFunctor(JNIEnv * env, jobject thiz, jlong functorPointer) { android::Platform::Instance().CallNativeFunctor(functorPointer); } diff --git a/android/src/com/mapswithme/maps/RenderFragment.java b/android/src/com/mapswithme/maps/RenderFragment.java index a6be100bef..ac73d7b85b 100644 --- a/android/src/com/mapswithme/maps/RenderFragment.java +++ b/android/src/com/mapswithme/maps/RenderFragment.java @@ -49,7 +49,7 @@ public abstract class RenderFragment extends BaseMwmFragment if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB || getActivity() == null || !getActivity().isChangingConfigurations()) { - MWMApplication.get().clearFunctorsOnUiThread(); + MwmApplication.get().clearFunctorsOnUiThread(); destroyEngine(); } else diff --git a/drape/glyph_manager.cpp b/drape/glyph_manager.cpp index 63b49b0dc6..74f73fac7b 100644 --- a/drape/glyph_manager.cpp +++ b/drape/glyph_manager.cpp @@ -192,7 +192,7 @@ public: result.m_image = GlyphManager::GlyphImage { imageWidth, imageHeight, - bitmap.rows, bitmap.pitch, + static_cast(bitmap.rows), bitmap.pitch, data }; diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 3be070561d..118a64c9b7 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -632,7 +632,7 @@ void FrontendRenderer::RefreshModelView(ScreenBase const & screen) void FrontendRenderer::RefreshBgColor() { - uint32_t color = drule::rules().GetBgColor(); + uint32_t color = drule::rules().GetBgColor(df::GetDrawTileScale(m_userEventStream.GetCurrentScreen())); dp::Color c = dp::Extract(color, 255 - (color >> 24)); GLFunctions::glClearColor(c.GetRedF(), c.GetGreenF(), c.GetBlueF(), 1.0f); } diff --git a/map/framework.cpp b/map/framework.cpp index ea2fa35174..800a6a68e3 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1723,24 +1723,31 @@ void Framework::UpdateSavedDataVersion() Settings::Set("DataVersion", m_storage.GetCurrentDataVersion()); } -void Framework::BuildRoute(m2::PointD const & start, m2::PointD const & finish, uint32_t timeoutSec) +void Framework::BuildRoute(m2::PointD const & finish, uint32_t timeoutSec) { ASSERT_THREAD_CHECKER(m_threadChecker, ("BuildRoute")); ASSERT(m_drapeEngine != nullptr, ()); - m2::PointD myPosition; - bool const hasPosition = m_drapeEngine->GetMyPosition(myPosition); - if (!hasPosition) + m2::PointD start; + if (!m_drapeEngine->GetMyPosition(start)) { CallRouteBuilded(IRouter::NoCurrentPosition, vector(), vector()); return; } + BuildRoute(start, finish, timeoutSec); +} + +void Framework::BuildRoute(m2::PointD const & start, m2::PointD const & finish, uint32_t timeoutSec) +{ + ASSERT_THREAD_CHECKER(m_threadChecker, ("BuildRoute")); + ASSERT(m_drapeEngine != nullptr, ()); + if (IsRoutingActive()) CloseRouting(); SetLastUsedRouter(m_currentRouterType); - m_routingSession.SetUserCurrentPosition(myPosition); + m_routingSession.SetUserCurrentPosition(start); auto readyCallback = [this] (Route const & route, IRouter::ResultCode code) { @@ -1774,7 +1781,7 @@ void Framework::BuildRoute(m2::PointD const & start, m2::PointD const & finish, CallRouteBuilded(code, absentCountries, absentRoutingIndexes); }; - m_routingSession.BuildRoute(myPosition, destination, + m_routingSession.BuildRoute(start, finish, [readyCallback](Route const & route, IRouter::ResultCode code) { GetPlatform().RunOnGuiThread(bind(readyCallback, route, code)); @@ -1867,13 +1874,8 @@ void Framework::InsertRoute(Route const & route) } vector turns; - turns::TTurnsGeom const & turnsGeom = route.GetTurnsGeometry(); - if (!turnsGeom.empty()) - { - turns.reserve(turnsGeom.size()); - for (size_t i = 0; i < turnsGeom.size(); i++) - turns.push_back(turnsGeom[i].m_mercatorDistance); - } + if (m_currentRouterType == RouterType::Vehicle) + route.GetTurnsDistances(turns); dp::Color routeColor; if (m_currentRouterType == RouterType::Pedestrian) diff --git a/map/framework.hpp b/map/framework.hpp index 413932d2a5..6171b5b50e 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -241,6 +241,8 @@ public: void ShowBookmark(BookmarkAndCategory const & bnc); void ShowTrack(Track const & track); + void ClearBookmarks(); + bool AddBookmarksFile(string const & filePath); BookmarkAndCategory FindBookmark(UserMark const * mark) const; @@ -304,6 +306,8 @@ private: search::SearchParams m_lastSearch; uint8_t m_fixedSearchResults; + void OnSearchResultsCallback(search::Results const & results); + void OnSearchResultsCallbackUI(search::Results const & results); void FillSearchResultsMarks(search::Results const & results); void OnDownloadMapCallback(storage::TIndex const & countryIndex); diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp index 6a0c23e8d9..c97e67fbf8 100644 --- a/map/map_tests/bookmarks_test.cpp +++ b/map/map_tests/bookmarks_test.cpp @@ -278,7 +278,7 @@ UNIT_TEST(Bookmarks_Timestamp) TEST_EQUAL(fm.AddBookmark(1, orgPoint, b3), 0, ()); // Check bookmarks order here. First added should be in the bottom of the list. - TEST_EQUAL(fm.GetBmCategory(0)->GetBookmark(1), pBm, ()); + TEST_EQUAL(fm.GetBmCategory(0)->GetUserMark(1), pBm, ()); Bookmark const * bm01 = static_cast(fm.GetBmCategory(0)->GetUserMark(1)); diff --git a/routing/route.cpp b/routing/route.cpp index 830086b463..e7442a8931 100644 --- a/routing/route.cpp +++ b/routing/route.cpp @@ -260,7 +260,7 @@ void Route::MatchLocationToRoute(location::GpsInfo & location, location::RouteMa if (m_routingSettings.m_matchRoute) location.m_bearing = location::AngleToBearing(GetPolySegAngle(iter.m_ind)); - routeMatchingInfo.Set(m_current.m_pt, m_current.m_ind, GetMercatorDistanceFromBegin()); + routeMatchingInfo.Set(iter.m_pt, iter.m_ind, GetMercatorDistanceFromBegin()); } } }