1.fixed to scale maps automatically depending on resolution of the target 2.fixed...

Change-Id: I12c76c745e3c27d2804ac4234b9395d58159630b

diff --git a/inc/engine/common/BaseQuery.h b/inc/engine/common/BaseQuery.h
index 3e50987..3123bd7 100755 (executable)
--- a/inc/engine/common/BaseQuery.h
+++ b/inc/engine/common/BaseQuery.h
@@ -62,11 +62,6 @@ protected:
     static const String ILLEGAL_URL;
 
     /**
-     * This constant represents an App ID.
-     */
-    String RequestAppId;
-
-    /**
      * This is the default constructor.
      */
     BaseQuery();

diff --git a/inc/engine/graphic/Grp_Util.h b/inc/engine/graphic/Grp_Util.h
index b5e2e39..fc45436 100755 (executable)
--- a/inc/engine/graphic/Grp_Util.h
+++ b/inc/engine/graphic/Grp_Util.h
@@ -37,10 +37,10 @@ namespace _Util
        long GetHashCode(const char *string);
 
        EXPORT_API Bitmap* DecodePngToBmp(const byte* buffer, size_t size,
-                                          MediaPixelFormat pixelFormat=MEDIA_PIXEL_FORMAT_RGBA8888);
+                                                                               MediaPixelFormat pixelFormat=MEDIA_PIXEL_FORMAT_RGBA8888);
 
        EXPORT_API void ConvertRGBA2BGRA(void *data, unsigned int w, unsigned int h,
-                                         MediaPixelFormat format=MEDIA_PIXEL_FORMAT_RGBA8888);
+                                                                               MediaPixelFormat format=MEDIA_PIXEL_FORMAT_RGBA8888);
 
        template<typename T>
        inline T

diff --git a/inc/engine/maps/GeoTiledMap.h b/inc/engine/maps/GeoTiledMap.h
index f6343db..dcf54e8 100755 (executable)
--- a/inc/engine/maps/GeoTiledMap.h
+++ b/inc/engine/maps/GeoTiledMap.h
@@ -454,7 +454,6 @@ public:
      */
     void SetEvasGlApi(Evas_GL_API *__glapi);
 
-#ifdef TIZEN_MIGRATION
     /**
      * This typedef defines a function object as a type. The function object can
      * be called when the map has been ready after initialized. A function object of
@@ -469,26 +468,9 @@ public:
      * @param slot A function object to be called when the map has
      *        been ready after initialization.
      */
-    void SetReadyMapSignal(ReadyMapSignalFunctor callback, void *data);
-#else
-    /**
-     * This typedef defines a function object as a type. The function object can
-     * be called when the map has been ready after initialized. A function object of
-     * this type returns <code>void</code> and receives no arguments.
-     */
-    typedef void(*ReadyMapSignalFunctor)(void);
+    void SetReadyMapSignal(ReadyMapSignalFunctor callback, void *data = NULL);
 
     /**
-      * This method sets a callback to be invoked when the map has
-      * been ready after initialization.
-      *
-      * @param slot A function object to be called when the map has
-      *                  been ready after initialization.
-      */
-    void SetReadyMapSignal(ReadyMapSignalFunctor callback);
-
-#endif
-    /**
      * This method sets the angle of the map.
      *
      * @param angle The angle of the map [-360~360].
@@ -550,7 +532,11 @@ private:
     HERE_MAPS_NO_COPY_NO_ASSIGN(GeoTiledMap);
 
     class GeoTiledMapImpl;
+#ifdef TIZEN_MIGRATION
     GeoTiledMapImpl *m_pImpl;
+#else
+    std::auto_ptr<GeoTiledMapImpl> m_pImpl;
+#endif
 };
 
 HERE_MAPS_END_NAMESPACE

diff --git a/inc/here_api.h b/inc/here_api.h
index 8342ae3..daf9ca8 100644 (file)
--- a/inc/here_api.h
+++ b/inc/here_api.h
@@ -64,10 +64,12 @@ int HerePluginSearchPlaceByAddress(const char* szAddr, maps_area_h hArea,
        void * pUserData, int *nReqId);
 
 int HerePluginSearchPlaceList(maps_area_h hArea, maps_item_hashtable_h hPref,
-       maps_place_filter_h hFilter, maps_service_search_place_list_cb pCbFunc, void * pUserData, int *nReqId);
+       maps_place_filter_h hFilter, maps_service_search_place_list_cb pCbFunc,
+       void * pUserData, int *nReqId);
 
 int HerePluginSearchPlaceDetails(const char* szUrl,
-       maps_service_get_place_details_cb pCbFunc, void * pUserData, int *nReqId);
+       maps_service_get_place_details_cb pCbFunc,
+       void * pUserData, int *nReqId);
 
 int HerePluginSearchRoute(maps_coordinates_h hOrigin, maps_coordinates_h hDestination,
        maps_item_hashtable_h hPref, maps_service_search_route_cb pCbFunc,
@@ -85,25 +87,24 @@ int HerePluginCreateMapView(maps_view_h hView, maps_plugin_map_view_ready_cb pCb
 
 int HerePluginDestroyMapView(maps_view_h hView);
 
-int HerePluginRenderMap(maps_view_h hView, const maps_coordinates_h mapsCoord, const double dZoom, const double dAngle,
+int HerePluginRenderMap(maps_view_h hView, const maps_coordinates_h mapsCoord, double dZoom, double dAngle,
        maps_plugin_render_map_cb pCbFunc, void* pUserData, int* nReqId);
 
-int HerePluginRenderMapArea(maps_view_h hView, const maps_area_h hArea, const double dZoom, const double dAngle,
+int HerePluginRenderMapArea(maps_view_h hView, const maps_area_h hArea, double dZoom, double dAngle,
        maps_plugin_render_map_cb pCbFunc, void* pUserData, int* nReqId);
 
-int HerePluginMoveCenter(maps_view_h hView, const int delta_x, const int delta_y,
+int HerePluginMoveCenter(maps_view_h hView, int delta_x, int delta_y,
        maps_plugin_render_map_cb pCbFunc, void* pUserData, int* nReqId);
 
 int HerePluginSetScalebar(maps_view_h hView, bool enable);
 
 int HerePluginGetScalebar(maps_view_h hView, bool *enabled);
 
-int HerePluginDrawMap(Evas* pCanvas, const int x, const int y,
-       const int nWidth, const int nHeight);
+int HerePluginDrawMap(maps_view_h hView, Evas* pCanvas, int x, int y, int w, int h);
 
 int HerePluginGetCenter(maps_view_h hView, maps_coordinates_h *center);
 
-int HerePluginScreenToGeography(maps_view_h hView, const int x, const int y, maps_coordinates_h *mapsCoord);
+int HerePluginScreenToGeography(maps_view_h hView, int x, int y, maps_coordinates_h *mapsCoord);
 
 int HerePluginGeographyToScreen(maps_view_h hView, const maps_coordinates_h mapsCoord, int *x, int *y);
 
@@ -111,6 +112,6 @@ int HerePluginGetMinZoomLevel(maps_view_h hView, int *nMinZoomLevel);
 
 int HerePluginGetMaxZoomLevel(maps_view_h hView, int *nMaxZoomLevel);
 
-int HerePluginOnViewObject(maps_view_h hView, const maps_view_object_h object, const maps_view_object_operation_e operation);
+int HerePluginOnViewObject(maps_view_h hView, const maps_view_object_h object, maps_view_object_operation_e operation);
 
 #endif //_LOCATION_HERE_API_H_
\ No newline at end of file

diff --git a/lib/aarch64/libheremaps-engine.so.1.0.6_13 b/lib/aarch64/libheremaps-engine.so.1.0.6_13
old mode 100644 (file)
new mode 100755 (executable)
index 269a3d2..02eb719
Binary files a/lib/aarch64/libheremaps-engine.so.1.0.6_13 and b/lib/aarch64/libheremaps-engine.so.1.0.6_13 differ

diff --git a/lib/arm/libheremaps-engine.so.1.0.6_13 b/lib/arm/libheremaps-engine.so.1.0.6_13
old mode 100644 (file)
new mode 100755 (executable)
index 2252d8e..1f0a9cd
Binary files a/lib/arm/libheremaps-engine.so.1.0.6_13 and b/lib/arm/libheremaps-engine.so.1.0.6_13 differ

diff --git a/lib/i586/libheremaps-engine.so.1.0.6_13 b/lib/i586/libheremaps-engine.so.1.0.6_13
old mode 100644 (file)
new mode 100755 (executable)
index 28273e8..89a3032
Binary files a/lib/i586/libheremaps-engine.so.1.0.6_13 and b/lib/i586/libheremaps-engine.so.1.0.6_13 differ

diff --git a/lib/x86_64/libheremaps-engine.so.1.0.6_13 b/lib/x86_64/libheremaps-engine.so.1.0.6_13
old mode 100644 (file)
new mode 100755 (executable)
index 17ed2c7..b58ff0e
Binary files a/lib/x86_64/libheremaps-engine.so.1.0.6_13 and b/lib/x86_64/libheremaps-engine.so.1.0.6_13 differ

diff --git a/src/here_api.cpp b/src/here_api.cpp
index 7e6a6db..40df814 100644 (file)
--- a/src/here_api.cpp
+++ b/src/here_api.cpp
@@ -464,7 +464,8 @@ int HerePluginSearchPlaceByAddress(const char* szAddr, maps_area_h hArea,
 }
 
 int HerePluginSearchPlaceList(maps_area_h hArea, maps_item_hashtable_h hPref,
-       maps_place_filter_h hFilter, maps_service_search_place_list_cb pCbFunc, void *pUserData, int *nReqId)
+       maps_place_filter_h hFilter, maps_service_search_place_list_cb pCbFunc,
+       void *pUserData, int *nReqId)
 {
        /* checking parmaters */
        if (!hFilter || !pCbFunc || !nReqId)
@@ -511,7 +512,8 @@ int HerePluginSearchPlaceList(maps_area_h hArea, maps_item_hashtable_h hPref,
 }
 
 int HerePluginSearchPlaceDetails(const char* szUrl,
-       maps_service_get_place_details_cb pCbFunc, void *pUserData, int *nReqId)
+       maps_service_get_place_details_cb pCbFunc,
+       void *pUserData, int *nReqId)
 {
        /* checking parmaters */
        if (!szUrl || (szUrl && *szUrl == '\0') || !pCbFunc || !nReqId)
@@ -703,7 +705,7 @@ int HerePluginDestroyMapView(maps_view_h hView)
        return error;
 }
 
-int HerePluginRenderMap(maps_view_h hView, const maps_coordinates_h mapsCoord, const double dZoom, const double dAngle,
+int HerePluginRenderMap(maps_view_h hView, const maps_coordinates_h mapsCoord, double dZoom, double dAngle,
        maps_plugin_render_map_cb pCbFunc, void* pUserData, int* nReqId)
 {
        if (!hView || !mapsCoord || !pCbFunc || !nReqId)
@@ -726,7 +728,7 @@ int HerePluginRenderMap(maps_view_h hView, const maps_coordinates_h mapsCoord, c
        return error;
 }
 
-int HerePluginRenderMapArea(maps_view_h hView, const maps_area_h hArea, const double dZoom, const double dAngle,
+int HerePluginRenderMapArea(maps_view_h hView, const maps_area_h hArea, double dZoom, double dAngle,
        maps_plugin_render_map_cb pCbFunc, void* pUserData, int* nReqId)
 {
        if (!hView || !hArea || !pCbFunc || !nReqId)
@@ -749,7 +751,8 @@ int HerePluginRenderMapArea(maps_view_h hView, const maps_area_h hArea, const do
        return error;
 }
 
-int HerePluginMoveCenter(maps_view_h hView, const int delta_x, const int delta_y, maps_plugin_render_map_cb pCbFunc, void* pUserData, int* nReqId)
+int HerePluginMoveCenter(maps_view_h hView, int delta_x, int delta_y,
+       maps_plugin_render_map_cb pCbFunc, void* pUserData, int* nReqId)
 {
        if (!hView || !pCbFunc || !nReqId)
                return HERE_ERROR_INVALID_PARAMETER;
@@ -809,8 +812,7 @@ int HerePluginGetScalebar(maps_view_h hView, bool *enabled)
        return error;
 }
 
-int HerePluginDrawMap(Evas* pCanvas, const int x, const int y,
-       const int nWidth, const int nHeight)
+int HerePluginDrawMap(maps_view_h hView, Evas* pCanvas, int x, int y, int w, int h)
 {
        return HERE_ERROR_NONE;
 }
@@ -837,7 +839,7 @@ int HerePluginGetCenter(maps_view_h hView, maps_coordinates_h *center)
        return error;
 }
 
-int HerePluginScreenToGeography(maps_view_h hView, const int x, const int y, maps_coordinates_h *mapsCoord)
+int HerePluginScreenToGeography(maps_view_h hView, int x, int y, maps_coordinates_h *mapsCoord)
 {
        if (!hView || !mapsCoord)
                return HERE_ERROR_INVALID_PARAMETER;
@@ -897,7 +899,7 @@ int HerePluginGetMaxZoomLevel(maps_view_h hView, int *nMaxZoomLevel)
        return HereView::GetMaxZoomLevel(hView, nMaxZoomLevel);
 }
 
-int HerePluginOnViewObject(maps_view_h hView, const maps_view_object_h object, const maps_view_object_operation_e operation)
+int HerePluginOnViewObject(maps_view_h hView, const maps_view_object_h object, maps_view_object_operation_e operation)
 {
        if (!hView)
                return HERE_ERROR_INVALID_PARAMETER;

diff --git a/src/here_plugin.cpp b/src/here_plugin.cpp
index cab7174..f1a2bb9 100644 (file)
--- a/src/here_plugin.cpp
+++ b/src/here_plugin.cpp
@@ -317,11 +317,12 @@ EXPORT_API int maps_plugin_destroy_map_view(maps_view_h hView)
        return ConvertToMapsError(ret);
 }
 
-EXPORT_API int maps_plugin_render_map(maps_view_h hView, const maps_coordinates_h coordinates, const double zoom_factor,
-                                       const double rotation_angle, maps_plugin_render_map_cb callback, void* user_data, int* request_id)
+EXPORT_API int maps_plugin_render_map(maps_view_h hView,
+       const maps_coordinates_h coordinates, double zoom_factor, double rotation_angle,
+       maps_plugin_render_map_cb callback, void* user_data, int* request_id)
 {
        int ret = HerePluginRenderMap(hView, coordinates, zoom_factor, rotation_angle,
-                                       callback, user_data, request_id);
+                               callback, user_data, request_id);
 
        if (ret != HERE_ERROR_NONE)
                MAPS_LOGD("here_error_e = %d", ret);
@@ -329,10 +330,12 @@ EXPORT_API int maps_plugin_render_map(maps_view_h hView, const maps_coordinates_
        return ConvertToMapsError(ret);
 }
 
-EXPORT_API int maps_plugin_render_map_area(maps_view_h hView, const maps_area_h area, const double zoom_factor,
-                                       const double rotation_angle, maps_plugin_render_map_cb callback, void* user_data, int* request_id)
+EXPORT_API int maps_plugin_render_map_area(maps_view_h hView, const maps_area_h area,
+       double zoom_factor, double rotation_angle,
+       maps_plugin_render_map_cb callback, void* user_data, int* request_id)
 {
-       int ret = HerePluginRenderMapArea(hView, area, zoom_factor, rotation_angle, callback, user_data, request_id);
+       int ret = HerePluginRenderMapArea(hView, area, zoom_factor, rotation_angle,
+                               callback, user_data, request_id);
 
        if (ret != HERE_ERROR_NONE)
                MAPS_LOGD("here_error_e = %d", ret);
@@ -340,8 +343,8 @@ EXPORT_API int maps_plugin_render_map_area(maps_view_h hView, const maps_area_h
        return ConvertToMapsError(ret);
 }
 
-EXPORT_API int maps_plugin_move_center(maps_view_h hView, const int delta_x, const int delta_y, maps_plugin_render_map_cb callback,
-                                       void* user_data, int* request_id)
+EXPORT_API int maps_plugin_move_center(maps_view_h hView, int delta_x, int delta_y,
+       maps_plugin_render_map_cb callback, void* user_data, int* request_id)
 {
        int ret = HerePluginMoveCenter(hView, delta_x, delta_y, callback, user_data, request_id);
 
@@ -367,9 +370,9 @@ EXPORT_API int maps_plugin_get_scalebar(maps_view_h hView, bool *enabled)
        return ConvertToMapsError(ret);
 }
 
-EXPORT_API int maps_plugin_draw_map(maps_view_h hView, Evas* canvas, const int x, const int y, const int width, const int height)
+EXPORT_API int maps_plugin_draw_map(maps_view_h hView, Evas* canvas, int x, int y, int w, int h)
 {
-       int ret = HerePluginDrawMap(canvas, x, y, width, height);
+       int ret = HerePluginDrawMap(hView, canvas, x, y, w, h);
 
        if (ret != HERE_ERROR_NONE)
                MAPS_LOGD("here_error_e = %d", ret);
@@ -383,7 +386,7 @@ EXPORT_API int maps_plugin_get_center(maps_view_h hView, maps_coordinates_h *cen
        return ConvertToMapsError(ret);
 }
 
-EXPORT_API int maps_plugin_screen_to_geography(maps_view_h hView, const int x, const int y, maps_coordinates_h *mapsCoord)
+EXPORT_API int maps_plugin_screen_to_geography(maps_view_h hView, int x, int y, maps_coordinates_h *mapsCoord)
 {
        int ret = HerePluginScreenToGeography(hView, x, y, mapsCoord);
        return ConvertToMapsError(ret);
@@ -407,7 +410,7 @@ EXPORT_API int maps_plugin_get_max_zoom_level(maps_view_h hView, int *max_zoom_l
        return ConvertToMapsError(ret);
 }
 
-EXPORT_API int maps_plugin_on_object(maps_view_h hView, const maps_view_object_h object, const maps_view_object_operation_e operation)
+EXPORT_API int maps_plugin_on_object(maps_view_h hView, const maps_view_object_h object, maps_view_object_operation_e operation)
 {
        int ret = HerePluginOnViewObject(hView, object, operation);
 

diff --git a/src/here_view.cpp b/src/here_view.cpp
index 5b243e5..ee4ba8e 100644 (file)
--- a/src/here_view.cpp
+++ b/src/here_view.cpp
@@ -333,6 +333,7 @@ void HereView::__setMapType(maps_view_h hView)
        maps_view_get_traffic_enabled(hView, &traffic_enabled);
 
        bool public_transit_enabled = false;
+       maps_view_get_public_transit_enabled(hView, &public_transit_enabled);
 
        GeoTiledMap::MapType hereMapType = HereUtils::Convert(map_type, buildings_enabled,
                                                traffic_enabled, public_transit_enabled);

diff --git a/src/here_view_objects.cpp b/src/here_view_objects.cpp
index 3709bcc..189cba8 100644 (file)
--- a/src/here_view_objects.cpp
+++ b/src/here_view_objects.cpp
@@ -329,7 +329,9 @@ here_error_e HereViewObjects::__updateMarker(maps_view_object_h hMarker, GeoMapO
                hereMarker->SetPosition(GeoCoordinates(lat, lng));
 
                /* origin */
-               Tizen::Maps::FloatPoint fpntOrigin(0.5, 1);
+               Tizen::Maps::FloatPoint fpntOrigin(0.5, 0.5);
+               if (type == MAPS_VIEW_MARKER_PIN)
+                       fpntOrigin.y = 1.0;
                hereMarker->SetMarkerOrigin(fpntOrigin);
 
                /* z-order */