modified conditions to check parameters of map_area_h

Change-Id: I82b39777878d000688d2ea6a80e11b87e277e746

diff --git a/src/api/maps_area.cpp b/src/api/maps_area.cpp
index 2cd6d30..1a0ca45 100755 (executable)
--- a/src/api/maps_area.cpp
+++ b/src/api/maps_area.cpp
@@ -28,25 +28,9 @@ EXPORT_API int maps_area_create_rectangle(const maps_coordinates_h top_left,
        if (!top_left || !bottom_right || !area)
                return MAPS_ERROR_INVALID_PARAMETER;
 
-       double tf_lat = .0;
-       double tf_lon = .0;
-       double rb_lat = .0;
-       double rb_lon = .0;
-
-       maps_coordinates_get_latitude(top_left, &tf_lat);
-       maps_coordinates_get_latitude(bottom_right, &rb_lat);
-       maps_coordinates_get_longitude(top_left, &tf_lon);
-       maps_coordinates_get_longitude(bottom_right, &rb_lon);
-
-       double lon_interval = rb_lon - tf_lat;
-
-       if (lon_interval < 180 && lon_interval > -180) {
-               if (rb_lon <= tf_lon || rb_lat >= tf_lat)
-                       return MAPS_ERROR_INVALID_PARAMETER;
-       } else {
-               if (rb_lon >= tf_lon || rb_lat >= tf_lat)
-                       return MAPS_ERROR_INVALID_PARAMETER;
-       }
+       if (!maps_coordinates_is_valid(top_left) ||
+               !maps_coordinates_is_valid(bottom_right))
+               return MAPS_ERROR_INVALID_PARAMETER;
 
        maps_area_s *bound = g_new0(maps_area_s, 1);
 
@@ -68,9 +52,10 @@ EXPORT_API int maps_area_create_rectangle(const maps_coordinates_h top_left,
 EXPORT_API int maps_area_create_circle(const maps_coordinates_h center,
                                       const double radius, maps_area_h *area)
 {
-       if (!center || !area)
+       if (!center || !area || radius <= 0)
                return MAPS_ERROR_INVALID_PARAMETER;
-       if (radius < 0)
+
+       if (!maps_coordinates_is_valid(center))
                return MAPS_ERROR_INVALID_PARAMETER;
 
        maps_area_s *bound = g_new0(maps_area_s, 1);
@@ -133,41 +118,6 @@ EXPORT_API int maps_area_clone(const maps_area_h origin, maps_area_h *cloned)
        return MAPS_ERROR_NONE;
 }
 
-bool __is_valid_rect(maps_coordinates_h top_left, maps_coordinates_h bottom_right)
-{
-       bool ret = true;
-
-       do {
-               if (!maps_coordinates_is_valid(top_left) ||
-                       !maps_coordinates_is_valid(bottom_right)) {
-                       ret = false;
-                       break;
-               }
-
-               double tf_lat = .0;
-               double tf_lon = .0;
-               double rb_lat = .0;
-               double rb_lon = .0;
-
-               maps_coordinates_get_latitude(top_left, &tf_lat);
-               maps_coordinates_get_latitude(bottom_right, &rb_lat);
-               maps_coordinates_get_longitude(top_left, &tf_lon);
-               maps_coordinates_get_longitude(bottom_right, &rb_lon);
-
-               double lon_interval = rb_lon - tf_lon;
-
-               if (lon_interval < 180 && lon_interval > -180) {
-                       if (rb_lon <= tf_lon || rb_lat >= tf_lat)
-                               ret = false;
-               } else {
-                       if (rb_lon >= tf_lon || rb_lat >= tf_lat)
-                               ret = false;
-               }
-       } while (false);
-
-       return ret;
-}
-
 bool maps_area_is_valid(const maps_area_h area)
 {
        if (!area) return false;
@@ -179,7 +129,8 @@ bool maps_area_is_valid(const maps_area_h area)
                if (handle->type == MAPS_AREA_RECTANGLE) {
                        maps_area_rectangle_s rect = handle->rect;
 
-                       if (!__is_valid_rect(&rect.top_left, &rect.bottom_right)) {
+                       if (!maps_coordinates_is_valid(&rect.top_left) ||
+                               !maps_coordinates_is_valid(&rect.bottom_right)) {
                                ret = false;
                                break;
                        }
@@ -201,4 +152,4 @@ bool maps_area_is_valid(const maps_area_h area)
        } while (false);
 
        return ret;
-}
\ No newline at end of file
+}

diff --git a/src/api/maps_extra_types.cpp b/src/api/maps_extra_types.cpp
index 3fdbdeb..4bfddd5 100755 (executable)
--- a/src/api/maps_extra_types.cpp
+++ b/src/api/maps_extra_types.cpp
@@ -429,8 +429,7 @@ EXPORT_API int maps_int_hashtable_remove(maps_int_hashtable_h table,
 }
 
 EXPORT_API int maps_int_hashtable_foreach(maps_int_hashtable_h table,
-                                         maps_int_hashtable_foreach_cb
-                                         callback,
+                                         maps_int_hashtable_foreach_cb callback,
                                          void *user_data)
 {
        if (!table || !callback)
@@ -522,9 +521,8 @@ void _maps_hashtable_item_create(maps_hashtable_item_s **item)
 {
        *item = g_slice_new0(maps_hashtable_item_s);
 
-       if (*item == NULL) {
+       if (*item == NULL)
                MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY);
-       }
 }
 
 void _maps_hashtable_item_destroy(gpointer data)

diff --git a/src/api/maps_place_review.cpp b/src/api/maps_place_review.cpp
index 86bb321..208be21 100755 (executable)
--- a/src/api/maps_place_review.cpp
+++ b/src/api/maps_place_review.cpp
@@ -198,8 +198,7 @@ EXPORT_API int maps_place_review_get_user_link(const maps_place_review_h place,
 {
        if (!place || !user)
                return MAPS_ERROR_INVALID_PARAMETER;
-       return maps_place_link_object_clone(((maps_place_review_s *) place)->
-               user, user);
+       return maps_place_link_object_clone(((maps_place_review_s *) place)->user, user);
 }
 
 /*----------------------------------------------------------------------------*/

diff --git a/src/api/maps_view.cpp b/src/api/maps_view.cpp
index f5abb22..1973445 100644 (file)
--- a/src/api/maps_view.cpp
+++ b/src/api/maps_view.cpp
@@ -170,7 +170,6 @@ static void __maps_view_on_event_empty_cb(maps_view_event_type_e type,
        /* empty */
 }
 
-
 session::command_queue *__maps_view_select_q()
 {
        /*
@@ -311,7 +310,6 @@ static void __on_canvas_multi_tap(void *data, Evas *e, Evas_Object *obj, void *e
        v->finger_stream->multi_tap((Evas_Event_Multi_Down *)event_info);
 }
 
-
 static void __on_canvas_multi_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
        MAPS_LOGI("__on_canvas_multi_up");
@@ -327,16 +325,6 @@ static void __on_canvas_multi_up(void *data, Evas *e, Evas_Object *obj, void *ev
        v->finger_stream->multi_up((Evas_Event_Multi_Up *)event_info);
 }
 
-static int __maps_plugin_render_map(const maps_view_h view,
-       const maps_coordinates_h coordinates, const double zoom_factor, const double rotation_angle)
-{
-       if (!view || !coordinates)
-               return MAPS_ERROR_INVALID_PARAMETER;
-
-       return __get_plugin_interface(view)->maps_plugin_render_map(view,
-                                                                               coordinates, zoom_factor, rotation_angle);
-}
-
 static void __on_canvas_multi_line(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
        MAPS_LOGI("__on_canvas_multi_line");
@@ -352,6 +340,16 @@ static void __on_canvas_multi_line(void *data, Evas *e, Evas_Object *obj, void *
        v->finger_stream->multi_move((Evas_Event_Multi_Move *)event_info);
 }
 
+static int __maps_plugin_render_map(const maps_view_h view,
+       const maps_coordinates_h coordinates, const double zoom_factor, const double rotation_angle)
+{
+       if (!view || !coordinates)
+               return MAPS_ERROR_INVALID_PARAMETER;
+
+       return __get_plugin_interface(view)->maps_plugin_render_map(view,
+                                                                               coordinates, zoom_factor, rotation_angle);
+}
+
 void _maps_view_set_idle_listener(const maps_view_h view,
        void (*callback)(void *user_data), void *user_data)
 {

diff --git a/src/view/runtime_data.cpp b/src/view/runtime_data.cpp
index d48fdf0..3534886 100644 (file)
--- a/src/view/runtime_data.cpp
+++ b/src/view/runtime_data.cpp
@@ -20,7 +20,6 @@
 #include "maps_view_plugin.h"
 #include <glib.h>
 
-
 view::touch_point::touch_point()
        : _x(0)
        , _y(0)