fixed svace defects & preference is not set in case of some commands

Change-Id: I789622d9ca748f02018f702ca5a1f85eb30e2106

diff --git a/src/api/maps_service.cpp b/src/api/maps_service.cpp
index e9dcfba5226d4cfd380db93f75cd2131f182cfc5..0602e4634c115bd01e7786733b6cf6299bc1c48c 100755 (executable)
--- a/src/api/maps_service.cpp
+++ b/src/api/maps_service.cpp
@@ -278,7 +278,7 @@ EXPORT_API int maps_service_geocode(const maps_service_h maps,
        session::command *cmd = new session::command_geocode(maps, address, preference,
                        callback, user_data, request_id);
 
-       int ret = (cmd || cmd->plugin()) ? cmd->run() : MAPS_ERROR_INVALID_PARAMETER;
+       int ret = (cmd && cmd->plugin()) ? cmd->run() : MAPS_ERROR_INVALID_PARAMETER;
        if (ret) MAPS_LOGE("Failed to run command.(%d)", ret);
        return ret;
 }
@@ -310,7 +310,7 @@ EXPORT_API int maps_service_geocode_inside_area(const maps_service_h maps,
        session::command *cmd = new session::command_geocode_inside_bounds(maps,
                        address, bounds, preference, callback, user_data, request_id);
 
-       int ret = (cmd || cmd->plugin()) ? cmd->run() : MAPS_ERROR_INVALID_PARAMETER;
+       int ret = (cmd && cmd->plugin()) ? cmd->run() : MAPS_ERROR_INVALID_PARAMETER;
        if (ret) MAPS_LOGE("Failed to run command.(%d)", ret);
        return ret;
 }
@@ -341,7 +341,7 @@ EXPORT_API int maps_service_geocode_by_structured_address(const maps_service_h m
        session::command *cmd = new session::command_geocode_by_structured_address(maps,
                        address, preference, callback, user_data, request_id);
 
-       int ret = (cmd || cmd->plugin()) ? cmd->run() : MAPS_ERROR_INVALID_PARAMETER;
+       int ret = (cmd && cmd->plugin()) ? cmd->run() : MAPS_ERROR_INVALID_PARAMETER;
        if (ret) MAPS_LOGE("Failed to run command.(%d)", ret);
        return ret;
 }
@@ -376,7 +376,7 @@ EXPORT_API int maps_service_reverse_geocode(const maps_service_h maps,
        session::command *cmd = new session::command_reverse_geocode(maps, latitude,
                        longitude, preference, callback, user_data, request_id);
 
-       int ret = (cmd || cmd->plugin()) ? cmd->run() : MAPS_ERROR_INVALID_PARAMETER;
+       int ret = (cmd && cmd->plugin()) ? cmd->run() : MAPS_ERROR_INVALID_PARAMETER;
        if (ret) MAPS_LOGE("Failed to run command.(%d)", ret);
        return ret;
 }

diff --git a/src/session/command.h b/src/session/command.h
index 899ebb31c1d53c7327be1c497a2b1cea909b078a..9bc85f6bb97704a50a10223d570ce0e6dc7ef905 100644 (file)
--- a/src/session/command.h
+++ b/src/session/command.h
@@ -24,12 +24,12 @@ namespace session
 {
 typedef enum _command_type_e {
        MAPS_DATA_COMMAND,
-       MAP_VIEW_SET_CENTER_COMMAND,
-       MAP_VIEW_MOVE_CENTER_COMMAND,
-       MAP_VIEW_ZOOM_COMMAND,
-       MAP_VIEW_ROTATE_COMMAND,
-       MAP_VIEW_ZOOM_ROTATE_COMMAND,
-       MAP_VIEW_READY_COMMAND,
+       MAPS_VIEW_SET_CENTER_COMMAND,
+       MAPS_VIEW_MOVE_CENTER_COMMAND,
+       MAPS_VIEW_ZOOM_COMMAND,
+       MAPS_VIEW_ROTATE_COMMAND,
+       MAPS_VIEW_ZOOM_ROTATE_COMMAND,
+       MAPS_VIEW_READY_COMMAND,
        MAPS_UNDEF_COOMAND = -1
 } command_type_e;
 

diff --git a/src/session/commands.cpp b/src/session/commands.cpp
index d12112cab6d0e4b0f69dc8a970cd934e6579879d..a3980dc2c434965a63ed698d7068c0418c27dc1f 100755 (executable)
--- a/src/session/commands.cpp
+++ b/src/session/commands.cpp
@@ -439,7 +439,7 @@ session::command_multi_reverse_geocode::command_multi_reverse_geocode(
                        maps_service_multi_reverse_geocode_cb cb, void *ud, int *request_id)
  : command(ms)
  , maps_list(NULL)
- , preference(NULL)
+ , preference(pref)
  , callback(cb)
  , user_data(ud)
  , error(0)
@@ -1075,7 +1075,7 @@ session::command_search_route::command_search_route(maps_service_h ms,
                                        maps_service_search_route_cb cb,
                                        void *ud, int *request_id)
  : command(ms)
- , preference(NULL)
+ , preference(pref)
  , origin(NULL)
  , destination(NULL)
  , callback(cb)
@@ -1367,7 +1367,7 @@ int session::command_view_set_center::run()
 
 session::command_type_e session::command_view_set_center::get_type() const
 {
-       return MAP_VIEW_SET_CENTER_COMMAND;
+       return MAPS_VIEW_SET_CENTER_COMMAND;
 }
 
 int session::command_view_set_center::get_priority() const
@@ -1430,7 +1430,7 @@ int session::command_view_move_center::run()
 
 session::command_type_e session::command_view_move_center::get_type() const
 {
-       return MAP_VIEW_MOVE_CENTER_COMMAND;
+       return MAPS_VIEW_MOVE_CENTER_COMMAND;
 }
 
 int session::command_view_move_center::get_priority() const
@@ -1466,7 +1466,7 @@ int session::command_view_zoom::run()
 
 session::command_type_e session::command_view_zoom::get_type() const
 {
-       return MAP_VIEW_ZOOM_COMMAND;
+       return MAPS_VIEW_ZOOM_COMMAND;
 }
 
 int session::command_view_zoom::get_priority() const
@@ -1501,7 +1501,7 @@ int session::command_view_rotate::run()
 
 session::command_type_e session::command_view_rotate::get_type() const
 {
-       return MAP_VIEW_ROTATE_COMMAND;
+       return MAPS_VIEW_ROTATE_COMMAND;
 }
 
 int session::command_view_rotate::get_priority() const
@@ -1540,7 +1540,7 @@ int session::command_view_zoom_rotate::run()
 
 session::command_type_e session::command_view_zoom_rotate::get_type() const
 {
-       return MAP_VIEW_ZOOM_ROTATE_COMMAND;
+       return MAPS_VIEW_ZOOM_ROTATE_COMMAND;
 }
 
 int session::command_view_zoom_rotate::get_priority() const