[LogoPosition] add a new feature

Change-Id: Id2efffbc04b0decd17aef5f7c932175e2dee20bb

diff --git a/inc/engine/finder/FinderQueryListener.h b/inc/engine/finder/FinderQueryListener.h
index e9fde4936d15c54cfa14f5697ec80819e56b5e9b..b0691fd028fb0e896844f9db4e3b6a69b31999cf 100644 (file)
--- a/inc/engine/finder/FinderQueryListener.h
+++ b/inc/engine/finder/FinderQueryListener.h
@@ -74,7 +74,7 @@ public:
      */
     virtual void OnPlaceDetailsReply(const PlaceDetailsReply& rReply) = 0;
 
-       #ifdef TIZEN_CUSTOMIZATION
+    #ifdef TIZEN_CUSTOMIZATION
     /**
      * This method is a callback invoked when data have arrived in response to a
      * categories request.
@@ -82,7 +82,7 @@ public:
      * @param rReply A constant reference to an object containing the response data.
      */
     virtual void OnCategoriesReply(const CategoriesReply& rReply) = 0;
-       #endif
+    #endif
 
     #ifdef TIZEN_MIGRATION
     /**
@@ -93,7 +93,7 @@ public:
     virtual void OnPlaceDetailsFailure(const PlaceDetailsReply& rReply) = 0;
     #endif
 
-       #ifdef TIZEN_CUSTOMIZATION
+    #ifdef TIZEN_CUSTOMIZATION
     /**
      * This method is a callback invoked when categories request is failed.
      *

diff --git a/inc/engine/internal/JsonParser.h b/inc/engine/internal/JsonParser.h
index 1b6bcc99da6bc2471337c395eddd2f0d9c00bfd7..1b9fcd6611a4374e8dc2ecb656aada5e2c041800 100755 (executable)
--- a/inc/engine/internal/JsonParser.h
+++ b/inc/engine/internal/JsonParser.h
@@ -105,7 +105,7 @@ public:
      * @param error A pointer to an object that is populated
      *        with error information should parsing fail.
      */
-       static bool ParseCategoriesSearch( ByteBuffer& buf, CategoriesReply& results_page, FinderError*& pError );
+    static bool ParseCategoriesSearch( ByteBuffer& buf, CategoriesReply& results_page, FinderError*& pError );
 #endif
 
 private:
@@ -194,7 +194,7 @@ private:
 
     static void ParsePlaceResults(JsonArray* pObject, PlaceItemList&, SearchItemList& );
 #ifdef TIZEN_CUSTOMIZATION
-       static void ParseCategoriesSearch( IJsonValue* pJsonValue, CategoriesReply& result );
+    static void ParseCategoriesSearch( IJsonValue* pJsonValue, CategoriesReply& result );
 #endif
 
 private:

diff --git a/inc/engine/maps/GeoTiledMap.h b/inc/engine/maps/GeoTiledMap.h
index de73f2d2ea229a9072eff2728b7db67092c74640..ed8af453b1049ab2104a40d6e381787464ae4040 100644 (file)
--- a/inc/engine/maps/GeoTiledMap.h
+++ b/inc/engine/maps/GeoTiledMap.h
@@ -498,6 +498,14 @@ public:
      * @return <code>true</code> if the scale bar is enabled, otherwise <code>false</code>.
      */
     bool GetScalebar() const;
+
+    /**
+     * This method sets position of logo of the map.
+     *
+     * @param xFactor The propotional x-position of the logo [0.0~1.0].
+     * @param yFactor The propotional y-position of the logo [0.0~1.0].
+     */
+    void SetLogoPosition(double xFactor, double yFactor);
 #endif
 
 #ifdef TIZEN_SUPPORT_TILE_FILE_CACHE

diff --git a/inc/here_api.h b/inc/here_api.h
index c2d402baee2d864043767179a2d40b1facbe5b20..9779b1792453afa7b374d2336b26e36ff06e6e2f 100644 (file)
--- a/inc/here_api.h
+++ b/inc/here_api.h
@@ -111,6 +111,8 @@ int HerePluginOnViewObject(maps_view_h hView, const maps_view_object_h object, m
 
 int HerePluginCaptureSnapshot(maps_view_h hView, void **data, int *w, int *h, maps_view_colorspace_type_e *cs);
 
+int HerePluginSetLogoPosition(maps_view_h view, double x_factor, double y_factor);
+
 int HerePluginCheckUC(const char *provider, maps_service_request_user_consent_cb pCbFunc, void *user_data);
 
 #endif //_LOCATION_HERE_API_H_
\ No newline at end of file

diff --git a/inc/here_view.h b/inc/here_view.h
index a29884a5a57ccc347f8880244950c9ab86d13bc2..541f25bbc1c8d1b2cd0d2f5c95064db37dcded61 100644 (file)
--- a/inc/here_view.h
+++ b/inc/here_view.h
@@ -61,6 +61,7 @@ public:
                                                                const maps_coordinates_h coord, int *x, int *y);
        here_error_e captureSnapshot(maps_view_h view, void **data, int *width, int *height,
                                                                maps_view_colorspace_type_e *cs);
+       here_error_e setLogoPosition(maps_view_h view, double x_factor, double y_factor);
 
        here_error_e getMinZoomLevel(maps_view_h view, int *zoom);
        here_error_e getMaxZoomLevel(maps_view_h view, int *zoom);

diff --git a/lib/aarch64/libheremaps-engine.so.1 b/lib/aarch64/libheremaps-engine.so.1
index 3585e21658538e30d2fcf48765953e44353acadd..98450dc8417e4e11bcb2b679df7bbd57a0399b22 120000 (symlink)
--- a/lib/aarch64/libheremaps-engine.so.1
+++ b/lib/aarch64/libheremaps-engine.so.1
@@ -1 +1 @@
-libheremaps-engine.so.1.0.6_20
\ No newline at end of file
+libheremaps-engine.so.1.0.6_22
\ No newline at end of file

diff --git a/lib/aarch64/libheremaps-engine.so.1.0.6_20 b/lib/aarch64/libheremaps-engine.so.1.0.6_20
deleted file mode 100755 (executable)
index 61a8325..0000000
Binary files a/lib/aarch64/libheremaps-engine.so.1.0.6_20 and /dev/null differ

diff --git a/lib/aarch64/libheremaps-engine.so.1.0.6_22 b/lib/aarch64/libheremaps-engine.so.1.0.6_22
new file mode 100755 (executable)
index 0000000..34f7598
Binary files /dev/null and b/lib/aarch64/libheremaps-engine.so.1.0.6_22 differ

diff --git a/lib/arm/libheremaps-engine.so.1 b/lib/arm/libheremaps-engine.so.1
index 3585e21658538e30d2fcf48765953e44353acadd..98450dc8417e4e11bcb2b679df7bbd57a0399b22 120000 (symlink)
--- a/lib/arm/libheremaps-engine.so.1
+++ b/lib/arm/libheremaps-engine.so.1
@@ -1 +1 @@
-libheremaps-engine.so.1.0.6_20
\ No newline at end of file
+libheremaps-engine.so.1.0.6_22
\ No newline at end of file

diff --git a/lib/arm/libheremaps-engine.so.1.0.6_20 b/lib/arm/libheremaps-engine.so.1.0.6_20
deleted file mode 100755 (executable)
index de9303b..0000000
Binary files a/lib/arm/libheremaps-engine.so.1.0.6_20 and /dev/null differ

diff --git a/lib/arm/libheremaps-engine.so.1.0.6_22 b/lib/arm/libheremaps-engine.so.1.0.6_22
new file mode 100755 (executable)
index 0000000..896b7e9
Binary files /dev/null and b/lib/arm/libheremaps-engine.so.1.0.6_22 differ

diff --git a/lib/i586/libheremaps-engine.so.1 b/lib/i586/libheremaps-engine.so.1
index 3585e21658538e30d2fcf48765953e44353acadd..98450dc8417e4e11bcb2b679df7bbd57a0399b22 120000 (symlink)
--- a/lib/i586/libheremaps-engine.so.1
+++ b/lib/i586/libheremaps-engine.so.1
@@ -1 +1 @@
-libheremaps-engine.so.1.0.6_20
\ No newline at end of file
+libheremaps-engine.so.1.0.6_22
\ No newline at end of file

diff --git a/lib/i586/libheremaps-engine.so.1.0.6_20 b/lib/i586/libheremaps-engine.so.1.0.6_20
deleted file mode 100755 (executable)
index daf60cd..0000000
Binary files a/lib/i586/libheremaps-engine.so.1.0.6_20 and /dev/null differ

diff --git a/lib/i586/libheremaps-engine.so.1.0.6_22 b/lib/i586/libheremaps-engine.so.1.0.6_22
new file mode 100755 (executable)
index 0000000..766a513
Binary files /dev/null and b/lib/i586/libheremaps-engine.so.1.0.6_22 differ

diff --git a/lib/x86_64/libheremaps-engine.so.1 b/lib/x86_64/libheremaps-engine.so.1
index 3585e21658538e30d2fcf48765953e44353acadd..98450dc8417e4e11bcb2b679df7bbd57a0399b22 120000 (symlink)
--- a/lib/x86_64/libheremaps-engine.so.1
+++ b/lib/x86_64/libheremaps-engine.so.1
@@ -1 +1 @@
-libheremaps-engine.so.1.0.6_20
\ No newline at end of file
+libheremaps-engine.so.1.0.6_22
\ No newline at end of file

diff --git a/lib/x86_64/libheremaps-engine.so.1.0.6_20 b/lib/x86_64/libheremaps-engine.so.1.0.6_20
deleted file mode 100755 (executable)
index f191594..0000000
Binary files a/lib/x86_64/libheremaps-engine.so.1.0.6_20 and /dev/null differ

diff --git a/lib/x86_64/libheremaps-engine.so.1.0.6_22 b/lib/x86_64/libheremaps-engine.so.1.0.6_22
new file mode 100755 (executable)
index 0000000..48ce928
Binary files /dev/null and b/lib/x86_64/libheremaps-engine.so.1.0.6_22 differ

diff --git a/src/here_api.cpp b/src/here_api.cpp
index 249c22b7aadb60781cb3ce03ce7a1edcf9ddc936..55197675d2920a5600d07915b6c6cb901217e8a5 100644 (file)
--- a/src/here_api.cpp
+++ b/src/here_api.cpp
@@ -853,6 +853,16 @@ int HerePluginCaptureSnapshot(maps_view_h view, void **data,
        return error;
 }
 
+int HerePluginSetLogoPosition(maps_view_h view, double x_factor, double y_factor)
+{
+       HereView *vh = NULL;
+       int maps_error = maps_view_get_maps_plugin_view_handle(view, (void**)&vh);
+       here_error_e error = (here_error_e)ConvertToHereError(maps_error);
+       if (error == HERE_ERROR_NONE && vh)
+               error = vh->setLogoPosition(view, x_factor, y_factor);
+       return error;
+}
+
 static void _heremaps_consent_changed_cb(keynode_t *node EINA_UNUSED, void *user_data)
 {
        MAPS_FUNC_ENTER

diff --git a/src/here_plugin.cpp b/src/here_plugin.cpp
index 2a9e08874c01182010dc40a4c9398d081e5dc4bc..0305a5fa72c5c0050480818bc55309fded6332f4 100644 (file)
--- a/src/here_plugin.cpp
+++ b/src/here_plugin.cpp
@@ -425,5 +425,11 @@ EXPORT_API int maps_plugin_capture_snapshot(maps_view_h view, void **data,
 
        return ConvertToMapsError(ret);
 }
+
+EXPORT_API int maps_plugin_set_logo_position(maps_view_h view, double x_factor, double y_factor)
+{
+       int ret = HerePluginSetLogoPosition(view, x_factor, y_factor);
+       return ConvertToMapsError(ret);
+}
 } // end of extern "C"
 

diff --git a/src/here_view.cpp b/src/here_view.cpp
index acf284bd46fc8c3c473a596f5f66fdac00e6407f..d63936f40b2941db00a2c7b96ad7ffb72b6dd136 100644 (file)
--- a/src/here_view.cpp
+++ b/src/here_view.cpp
@@ -560,4 +560,13 @@ here_error_e HereView::captureSnapshot(maps_view_h view, void **data, int *width
        return HERE_ERROR_NONE;
 }
 
+here_error_e HereView::setLogoPosition(maps_view_h view, double x_factor, double y_factor)
+{
+       if (!__isInitialized || !__map)
+               return HERE_ERROR_SERVICE_NOT_AVAILABLE;
+
+       __map->SetLogoPosition(x_factor, y_factor);
+       return HERE_ERROR_NONE;
+}
+
 HERE_PLUGIN_END_NAMESPACE