From 70e44b6b5df23d8a8708885f1f4f7ce90cb12fae Mon Sep 17 00:00:00 2001
From: asanoaozora <fifitaneki@hotmail.com>
Date: Tue, 25 Apr 2017 11:45:07 +0200
Subject: Fix issue in mapviewer and remove obsolete stuff for yocto recipe

---
 src/navigation/map-viewer/CMakeLists.txt                  |  4 ----
 .../genivi_mapviewer_mapviewercontrol.cxx                 | 15 ++++++++-------
 src/navigation/navigation-core/CMakeLists.txt             |  4 ----
 src/navigation/poi-cam/CMakeLists.txt                     |  4 ----
 4 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt
index 1c6611e..1caaf0d 100644
--- a/src/navigation/map-viewer/CMakeLists.txt
+++ b/src/navigation/map-viewer/CMakeLists.txt
@@ -84,10 +84,6 @@ endif()
 set(PLUGIN_LDFLAGS ${DBUS_CPP_LDFLAGS} ${DBUS_CPP_GLIB_LDFLAGS} ${GLIB_LDFLAGS})
 set(PLUGIN_LIBRARIES ${DBUS_CPP_LIBRARY_DIRS} ${GLIB_LIBRARY_DIRS} ${DBUS_CPP_GLIB_LIBRARY_DIRS})
 
-if(${YOCTO_CONFIG})
-    include_directories(${STAGING_INCDIR}/navit)
-endif()
-
 if (WITH_PLUGIN_MIGRATION)
     # DBus Path
     if(DBUS_LIB_PATH)
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index f85d187..db18c0d 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -1065,12 +1065,10 @@ MapViewerControlObj::SetMapViewScale(uint32_t SessionHandle, uint8_t ScaleID)
 void
 MapViewerControlObj::SetMapViewScaleByDelta(uint32_t SessionHandle, int16_t ScaleDelta)
 {
-	if (!ScaleDelta) 
-		throw DBus::ErrorInvalidArgs("ScaleDelta must not be 0");
 	if (ScaleDelta < 0) 
-		navit_zoom_out(m_navit.u.navit,1 << (-ScaleDelta),NULL);
+        navit_zoom_in(m_navit.u.navit,1 << (-ScaleDelta),NULL);
 	else if (ScaleDelta > 0) 
-		navit_zoom_in(m_navit.u.navit,1 << ScaleDelta,NULL);
+        navit_zoom_out(m_navit.u.navit,1 << ScaleDelta,NULL);
 }
 
 void
@@ -1078,10 +1076,13 @@ MapViewerControlObj::GetMapViewScale(uint8_t& ScaleID, DBusCommonAPIEnumeration&
 {
 	struct transformation *trans=navit_get_trans(m_navit.u.navit);
 	long scale=transform_get_scale(trans);
-	if (scale <= 1 || scale >= 2097152)
-		IsMinMax=1;
+    if (scale <= 1)
+        IsMinMax=GENIVI_MAPVIEWER_MIN;
 	else
-		IsMinMax=0;
+        if (scale >= 2097152)
+            IsMinMax=GENIVI_MAPVIEWER_MAX;
+        else
+            IsMinMax=GENIVI_MAPVIEWER_MID;
 	ScaleID=0;
 	while (scale > 1) {
 		scale >>=1;
diff --git a/src/navigation/navigation-core/CMakeLists.txt b/src/navigation/navigation-core/CMakeLists.txt
index d842366..35a8fe0 100644
--- a/src/navigation/navigation-core/CMakeLists.txt
+++ b/src/navigation/navigation-core/CMakeLists.txt
@@ -84,10 +84,6 @@ endif()
 set(PLUGIN_LDFLAGS ${DBUS_CPP_LDFLAGS} ${DBUS_CPP_GLIB_LDFLAGS} ${GLIB_LDFLAGS})
 set(PLUGIN_LIBRARIES ${DBUS_CPP_LIBRARY_DIRS} ${GLIB_LIBRARY_DIRS} ${DBUS_CPP_GLIB_LIBRARY_DIRS})
 
-if(${YOCTO_CONFIG})
-    include_directories(${STAGING_INCDIR}/navit)
-endif()
-
 if (WITH_PLUGIN_MIGRATION)
     # DBus Path
     if(DBUS_LIB_PATH)
diff --git a/src/navigation/poi-cam/CMakeLists.txt b/src/navigation/poi-cam/CMakeLists.txt
index 5a1fd45..3b2b2e5 100644
--- a/src/navigation/poi-cam/CMakeLists.txt
+++ b/src/navigation/poi-cam/CMakeLists.txt
@@ -52,10 +52,6 @@ include_directories(${NAVIGATION_COMMON_DIR})
 
 include_directories(${DBUS_GENERATED_INCLUDE_DIR}/poi-service)
 
-if(${YOCTO_CONFIG})
-    include_directories(${STAGING_INCDIR}/navit)
-endif()
-
 set(PLUGIN_LDFLAGS ${DBUS_CPP_LDFLAGS} ${DBUS_CPP_GLIB_LDFLAGS} ${GLIB_LDFLAGS})
 set(PLUGIN_LIBRARIES ${DBUS_CPP_LIBRARY_DIRS} ${GLIB_LIBRARY_DIRS} ${DBUS_CPP_GLIB_LIBRARY_DIRS})
 
-- 
cgit v1.2.1