From 712524b12130b4d906a72550b515226c08cc64b8 Mon Sep 17 00:00:00 2001
From:  <philippe colliot>
Date: Thu, 6 Aug 2015 18:06:36 +0200
Subject: fix ilm surface management

---
 src/navigation/README                              |  2 +-
 .../genivi_mapviewer_mapviewercontrol.cxx          | 25 ++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/navigation/README b/src/navigation/README
index 672518f..fa03e73 100644
--- a/src/navigation/README
+++ b/src/navigation/README
@@ -28,7 +28,7 @@ Ubuntu 14.04 LTS
 ===============================
 Current versions of additional code 
 ===============================
-<current version of positioning> (git): bf00492981d71fead8c0615fae59b73b03a4fbac
+<current version of positioning> (git): 8bcb5aee2172bf1672b4402a2dbae480d5fbdc25
 <current version of navit> (svn): 6084
 
 ===============================
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 919f43e..fd1ed20 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -33,7 +33,8 @@
 #include <ilm/ilm_client.h>
 #include <ilm/ilm_control.h>
 #ifndef FSA_LAYER
-#define FSA_LAYER 2000
+#define FSA_LAYER 600
+#define FSA_VERTICAL_OFFSET 68
 #endif
 #endif
 
@@ -1487,20 +1488,22 @@ MapViewerControlObj::MapViewerControlObj(MapViewerControl *mapviewercontrol, uin
     t_ilm_layer layerId=FSA_LAYER;
     if (ilm_surfaceCreate(nativehandle, MapViewSize._1, MapViewSize._2, ILM_PIXELFORMAT_RGBA_8888, &surfaceId) != ILM_SUCCESS) {
         dbg(lvl_debug,"error on ilm_surfaceCreate\n");
+    } 
+    if (ilm_surfaceSetSourceRectangle(surfaceId, 0, 0, MapViewSize._1, MapViewSize._2)  != ILM_SUCCESS) {
+        dbg(lvl_debug,"error on ilm_surfaceSetSourceRectangle\n");
+
+    if (ilm_surfaceSetDestinationRectangle(surfaceId, 0, 0, MapViewSize._1, MapViewSize._2-FSA_VERTICAL_OFFSET) != ILM_SUCCESS) {
+        dbg(lvl_debug,"error on ilm_surfaceSetDestinationRectangle\n");
     }
-#if 0
+
+    if (ilm_surfaceSetVisibility(surfaceId, ILM_TRUE) != ILM_SUCCESS) {
+        dbg(lvl_debug,"error on ilm_surfaceSetVisibility\n");
+    }
+
     if (ilm_layerAddSurface(layerId, surfaceId) != ILM_SUCCESS) {
         dbg(lvl_debug,"error on ilm_layerAddSurface\n");
     }
-#else
-    t_ilm_surface surfaceId_order[2] = {
-        FSA_LAYER + m_handle,
-        FSA_LAYER + m_handle + 1
-    };
-    if (ilm_layerSetRenderOrder(layerId, surfaceId_order, 2) != ILM_SUCCESS) {
-        dbg(lvl_debug,"error on ilm_layerSetRenderOrder\n");
-    }
-#endif
+
     if (ilm_commitChanges() != ILM_SUCCESS) {
         dbg(lvl_debug,"error on ilm_commitChanges\n");
     }
-- 
cgit v1.2.1