From 859d18a50beea7dfe968f93a85e7a5b5d9d21f63 Mon Sep 17 00:00:00 2001 From: Jongmun Woo Date: Mon, 16 May 2016 22:51:07 -0700 Subject: [PATCH] Revert "fix error code" This reverts commit 4a4d6cf836ba51090326b4b7d9b85cc0481c2240. Change-Id: I494f758ce9d3aad7a6596b9d4e48d3a3e491acc3 --- include/maps_place.h | 21 +++++++++--------- include/maps_plugin.h | 27 +++++++++++++++------- include/maps_route.h | 4 ++-- include/maps_route_segment.h | 4 ++-- include/maps_service.h | 24 +++++++++++++++++--- include/maps_view.h | 3 +++ include/maps_view_event_data.h | 9 -------- include/maps_view_object.h | 1 + src/api/maps_place.cpp | 20 ++++++++--------- src/api/maps_route.cpp | 4 ++-- src/api/maps_route_segment.cpp | 4 ++-- src/api/maps_service.cpp | 34 ++++++++++++++-------------- src/api/maps_view_event_data.cpp | 18 +++++++-------- src/session/commands.cpp | 48 ++++++++++++++++++++-------------------- 14 files changed, 123 insertions(+), 98 deletions(-) diff --git a/include/maps_place.h b/include/maps_place.h index 023a7da..5762019 100644 --- a/include/maps_place.h +++ b/include/maps_place.h @@ -399,7 +399,7 @@ int maps_place_get_distance(const maps_place_h place, int *distance); * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported */ int maps_place_get_address(const maps_place_h place, maps_address_h *address); @@ -415,7 +415,7 @@ int maps_place_get_address(const maps_place_h place, * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported */ int maps_place_get_rating(const maps_place_h place, maps_place_rating_h *rating); @@ -458,7 +458,7 @@ int maps_place_foreach_property(const maps_place_h place, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_place_categories_cb() repeatedly to retrieve * each category. @@ -483,7 +483,7 @@ int maps_place_foreach_category(const maps_place_h place, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_place_attributes_cb() repeatedly to retrieve * each attribute. @@ -508,7 +508,7 @@ int maps_place_foreach_attribute(const maps_place_h place, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_place_contacts_cb() repeatedly to retrieve * each contact. @@ -533,7 +533,7 @@ int maps_place_foreach_contact(const maps_place_h place, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_place_editorials_cb() repeatedly to retrieve * each editorial. @@ -558,7 +558,7 @@ int maps_place_foreach_editorial(const maps_place_h place, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_place_images_cb() repeatedly to retrieve * each image. @@ -582,7 +582,7 @@ int maps_place_foreach_image(const maps_place_h place, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_place_reviews_cb() repeatedly to retrieve * each review. @@ -604,7 +604,7 @@ int maps_place_foreach_review(const maps_place_h place, * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported */ int maps_place_get_supplier_link(const maps_place_image_h place, maps_place_link_object_h *supplier); @@ -620,7 +620,7 @@ int maps_place_get_supplier_link(const maps_place_image_h place, * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported */ int maps_place_get_related_link(const maps_place_image_h place, maps_place_link_object_h *related); @@ -639,6 +639,7 @@ int maps_place_get_related_link(const maps_place_image_h place, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_place_cb() repeatedly to retrieve each place. * diff --git a/include/maps_plugin.h b/include/maps_plugin.h index 152f179..4bd1efb 100755 --- a/include/maps_plugin.h +++ b/include/maps_plugin.h @@ -121,7 +121,7 @@ int maps_plugin_get_info(maps_plugin_info_h *info); * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Invalid operation + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @see maps_plugin_get_provider_key() */ @@ -140,7 +140,7 @@ int maps_plugin_set_provider_key(const char *provider_key); * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Invalid operation + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @see maps_plugin_set_provider_key() */ @@ -156,7 +156,7 @@ int maps_plugin_get_provider_key(char **provider_key); * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Invalid operation + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied * * @see maps_plugin_get_preference() @@ -175,7 +175,7 @@ int maps_plugin_set_preference(maps_item_hashtable_h preference); * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Invalid operation + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @see maps_plugin_set_preference() */ @@ -191,7 +191,7 @@ int maps_plugin_get_preference(maps_item_hashtable_h *preference); * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Invalid operation + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre Call maps_service_create() to create Maps Service and obtain its handle. * @@ -209,7 +209,7 @@ int maps_plugin_is_service_supported(maps_service_e service, bool *supported); * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Invalid operation + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre Call maps_service_create() to create Maps Service and obtain its handle. * @@ -242,6 +242,7 @@ int maps_plugin_is_data_supported(maps_service_data_e data, bool *supported); * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -287,6 +288,7 @@ int maps_plugin_geocode(const char *address, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_KEY_NOT_AVAILABLE Invalid key * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid @@ -331,6 +333,7 @@ int maps_plugin_geocode_inside_area(const char *address, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -376,6 +379,7 @@ int maps_plugin_geocode_by_structured_address(const maps_address_h address, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -415,6 +419,7 @@ int maps_plugin_reverse_geocode(double latitude, double longitude, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -460,6 +465,7 @@ int maps_plugin_multi_reverse_geocode(const maps_coordinates_list_h geocode_list * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -505,6 +511,7 @@ int maps_plugin_search_place(const maps_coordinates_h position, int distance, * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -551,6 +558,7 @@ int maps_plugin_search_place_by_area(const maps_area_h boundary, * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -596,6 +604,7 @@ int maps_plugin_search_place_by_address(const char *address, * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -636,6 +645,7 @@ int maps_plugin_search_place_list(const maps_area_h boundary, * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -680,7 +690,7 @@ int maps_plugin_get_place_details(const char *url, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_OUT_OF_MEMORY Out of memory * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service unavailable + * @retval #MAPS_ERROR_NOT_SUPPORTED Service unavailable * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid @@ -721,7 +731,7 @@ int maps_plugin_search_route(const maps_coordinates_h origin, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_OUT_OF_MEMORY Out of memory * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service unavailable + * @retval #MAPS_ERROR_NOT_SUPPORTED Service unavailable * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid @@ -761,6 +771,7 @@ int maps_plugin_search_route_waypoints(const maps_coordinates_h *waypoint_list, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found diff --git a/include/maps_route.h b/include/maps_route.h index ab6acc0..9309cf1 100644 --- a/include/maps_route.h +++ b/include/maps_route.h @@ -338,7 +338,7 @@ int maps_route_foreach_property(const maps_route_h route, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_route_path_cb() repeatedly to retrieve each * coordinate point. @@ -362,7 +362,7 @@ int maps_route_foreach_path(const maps_route_h route, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_route_segment_cb() repeatedly to retrieve * each segment. diff --git a/include/maps_route_segment.h b/include/maps_route_segment.h index 7fc6a72..e187732 100644 --- a/include/maps_route_segment.h +++ b/include/maps_route_segment.h @@ -230,7 +230,7 @@ int maps_route_segment_get_duration(const maps_route_segment_h segment, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_route_segment_path_cb() repeatedly to * retrieve each coordinate point. @@ -256,7 +256,7 @@ int maps_route_segment_foreach_path(const maps_route_segment_h segment, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @post This function invokes maps_route_segment_maneuver_cb() repeatedly to * retrieve each coordinate point. diff --git a/include/maps_service.h b/include/maps_service.h index 7629b56..c6e5d0a 100644 --- a/include/maps_service.h +++ b/include/maps_service.h @@ -173,6 +173,7 @@ int maps_service_foreach_provider(maps_service_provider_info_cb callback, * @retval #MAPS_ERROR_OUT_OF_MEMORY Out of memory * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied * * @pre Call maps_service_foreach_provider() to get a available Maps Providers. @@ -205,7 +206,7 @@ int maps_service_create(const char *maps_provider, maps_service_h *maps); * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre Call maps_service_create() to create Maps Service and get its handle. * @@ -231,6 +232,7 @@ int maps_service_destroy(maps_service_h maps); * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre Call maps_service_create() to create Maps Service and get its handle. * @@ -255,6 +257,7 @@ int maps_service_set_provider_key(maps_service_h maps, * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre Call maps_service_create() to create Maps Service and get its handle. * @@ -275,6 +278,7 @@ int maps_service_get_provider_key(const maps_service_h maps, * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied * * @pre Call maps_service_create() to create Maps Service and get its handle. @@ -299,6 +303,7 @@ int maps_service_set_preference(maps_service_h maps, * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre Call maps_service_create() to create Maps Service and get its handle. * @@ -321,7 +326,7 @@ int maps_service_get_preference(maps_service_h maps, * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre Call maps_service_create() to create Maps Service and get its handle. * @@ -345,7 +350,7 @@ int maps_service_provider_is_service_supported(const maps_service_h maps, * @return 0 on success, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre Call maps_service_create() to create Maps Service and get its handle. * @@ -377,6 +382,7 @@ int maps_service_provider_is_data_supported(const maps_service_h maps, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -536,6 +542,7 @@ typedef void (*maps_service_reverse_geocode_cb) (maps_error_e result, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -588,6 +595,7 @@ int maps_service_geocode(const maps_service_h maps, const char *address, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_KEY_NOT_AVAILABLE Invalid key * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid @@ -642,6 +650,7 @@ int maps_service_geocode_inside_area(const maps_service_h maps, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -695,6 +704,7 @@ int maps_service_geocode_by_structured_address(const maps_service_h maps, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -781,6 +791,7 @@ typedef bool (*maps_service_multi_reverse_geocode_cb) (maps_error_e result, * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network connection failed * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -943,6 +954,7 @@ typedef void(*maps_service_get_place_details_cb) (maps_error_e error, * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -1001,6 +1013,7 @@ int maps_service_search_place(const maps_service_h maps, * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -1061,6 +1074,7 @@ int maps_service_search_place_by_area(const maps_service_h maps, * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -1115,6 +1129,7 @@ int maps_service_search_place_by_address(const maps_service_h maps, * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -1162,6 +1177,7 @@ int maps_service_search_place_list(const maps_service_h maps, * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_SERVICE_NOT_AVAILABLE Service not available * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -1271,6 +1287,7 @@ typedef bool(*maps_service_search_route_cb) (maps_error_e error, * @retval #MAPS_ERROR_OUT_OF_MEMORY Out of memory * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * @retval #MAPS_ERROR_NOT_FOUND Result not found @@ -1324,6 +1341,7 @@ int maps_service_search_route(const maps_service_h maps, * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_OUT_OF_MEMORY Out of memory * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter + * @retval #MAPS_ERROR_NOT_SUPPORTED Service unavailable * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid diff --git a/include/maps_view.h b/include/maps_view.h index a429cbf..9ceda49 100644 --- a/include/maps_view.h +++ b/include/maps_view.h @@ -510,6 +510,7 @@ int maps_view_get_type(const maps_view_h view, maps_view_type_e *type); * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network unavailable + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre @a view is created using maps_view_create(). * @@ -554,6 +555,7 @@ int maps_view_get_buildings_enabled(const maps_view_h view, bool *enable); * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network unavailable + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre @a view is created using maps_view_create(). * @@ -656,6 +658,7 @@ int maps_view_get_language(const maps_view_h view, char **language); * @retval #MAPS_ERROR_PERMISSION_DENIED Permission Denied * @retval #MAPS_ERROR_CONNECTION_TIME_OUT Timeout error, no answer * @retval #MAPS_ERROR_NETWORK_UNREACHABLE Network unavailable + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre @a view is created using maps_view_create(). * diff --git a/include/maps_view_event_data.h b/include/maps_view_event_data.h index e725af9..41a36f7 100644 --- a/include/maps_view_event_data.h +++ b/include/maps_view_event_data.h @@ -204,7 +204,6 @@ int maps_view_event_data_get_type(const maps_view_event_data_h event, maps_view_ * @return 0, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * * @pre @a event may be obtained in maps_view_on_event_cb() * @@ -227,7 +226,6 @@ int maps_view_event_data_get_gesture_type(const maps_view_event_data_h event, ma * @return 0, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * * @pre @a event may be obtained in maps_view_on_event_cb() * @@ -251,7 +249,6 @@ int maps_view_event_data_get_action_type(const maps_view_event_data_h event, map * @return 0, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * * @pre @a event may be obtained in maps_view_on_event_cb() * @@ -276,7 +273,6 @@ int maps_view_event_data_get_center(const maps_view_event_data_h event, maps_coo * @return 0, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * * @pre @a event may be obtained in maps_view_on_event_cb() * @@ -300,7 +296,6 @@ int maps_view_event_data_get_delta(const maps_view_event_data_h event, int *delt * @return 0, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * * @pre @a event may be obtained in maps_view_on_event_cb() * @@ -324,7 +319,6 @@ int maps_view_event_data_get_position(const maps_view_event_data_h event, int *x * @return 0, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * * @pre @a event may be obtained in maps_view_on_event_cb() * @@ -347,7 +341,6 @@ int maps_view_event_data_get_fingers(const maps_view_event_data_h event, int *fi * @return 0, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * * @pre @a event may be obtained in maps_view_on_event_cb() * @@ -370,7 +363,6 @@ int maps_view_event_data_get_zoom_factor(const maps_view_event_data_h event, dou * @return 0, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * * @pre @a event may be obtained in maps_view_on_event_cb() * @@ -394,7 +386,6 @@ int maps_view_event_data_get_rotation_angle(const maps_view_event_data_h event, * @return 0, otherwise a negative error value * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #MAPS_ERROR_INVALID_OPERATION Operation is not valid * * @pre @a event may be obtained in maps_view_on_event_cb() * diff --git a/include/maps_view_object.h b/include/maps_view_object.h index c8a05c9..ad18b07 100644 --- a/include/maps_view_object.h +++ b/include/maps_view_object.h @@ -504,6 +504,7 @@ int maps_view_object_polygon_set_polygon(maps_view_object_h polygon, maps_coordi * @retval #MAPS_ERROR_NONE Successful * @retval #MAPS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #MAPS_ERROR_NOT_FOUND Result not found + * @retval #MAPS_ERROR_NOT_SUPPORTED Not supported * * @pre @a polygon is created using maps_view_object_create_polygon(). * @post This function invokes maps_view_object_polygon_point_cb() repeatedly to diff --git a/src/api/maps_place.cpp b/src/api/maps_place.cpp index 52333d0..d9068a6 100755 --- a/src/api/maps_place.cpp +++ b/src/api/maps_place.cpp @@ -362,7 +362,7 @@ EXPORT_API int maps_place_get_address(const maps_place_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_ADDRESS)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!address) @@ -380,7 +380,7 @@ EXPORT_API int maps_place_get_rating(const maps_place_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_RATING)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!rating) @@ -410,7 +410,7 @@ EXPORT_API int maps_place_foreach_category(const maps_place_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_CATEGORIES)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) @@ -430,7 +430,7 @@ EXPORT_API int maps_place_foreach_attribute(const maps_place_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_ATTRIBUTES)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) @@ -450,7 +450,7 @@ EXPORT_API int maps_place_foreach_contact(const maps_place_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_CONTACTS)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) @@ -470,7 +470,7 @@ EXPORT_API int maps_place_foreach_editorial(const maps_place_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_EDITORIALS)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) @@ -490,7 +490,7 @@ EXPORT_API int maps_place_foreach_image(const maps_place_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_IMAGE)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) @@ -510,7 +510,7 @@ EXPORT_API int maps_place_foreach_review(const maps_place_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_REVIEWS)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) @@ -529,7 +529,7 @@ EXPORT_API int maps_place_get_supplier_link(const maps_place_image_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_SUPPLIER)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!supplier) @@ -548,7 +548,7 @@ EXPORT_API int maps_place_get_related_link(const maps_place_image_h place, /* Check if this API feature available */ if (!__is_supported(place, MAPS_PLACE_RELATED)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!related) diff --git a/src/api/maps_route.cpp b/src/api/maps_route.cpp index e14bff1..afb1498 100755 --- a/src/api/maps_route.cpp +++ b/src/api/maps_route.cpp @@ -287,7 +287,7 @@ EXPORT_API int maps_route_foreach_path(const maps_route_h route, /* Check if this API feature available */ if (!__is_supported(route, MAPS_ROUTE_PATH)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) @@ -308,7 +308,7 @@ EXPORT_API int maps_route_foreach_segment(const maps_route_h route, /* Check if this API feature available */ if (!__is_supported(route, MAPS_ROUTE_SEGMENTS_PATH) && !__is_supported(route, MAPS_ROUTE_SEGMENTS_MANEUVERS)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) diff --git a/src/api/maps_route_segment.cpp b/src/api/maps_route_segment.cpp index f1efae9..4963538 100755 --- a/src/api/maps_route_segment.cpp +++ b/src/api/maps_route_segment.cpp @@ -226,7 +226,7 @@ EXPORT_API int maps_route_segment_foreach_path(const maps_route_segment_h /* Check if this API feature available */ if (!__is_supported(segment, MAPS_ROUTE_SEGMENTS_PATH)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) @@ -248,7 +248,7 @@ EXPORT_API int maps_route_segment_foreach_maneuver(const maps_route_segment_h /* Check if this API feature available */ if (!__is_supported(segment, MAPS_ROUTE_SEGMENTS_MANEUVERS)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback) diff --git a/src/api/maps_service.cpp b/src/api/maps_service.cpp index 009b61a..0602e46 100755 --- a/src/api/maps_service.cpp +++ b/src/api/maps_service.cpp @@ -103,7 +103,7 @@ EXPORT_API int maps_service_create(const char *maps_provider, maps_service_h *ma return MAPS_ERROR_PERMISSION_DENIED; } - int error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + int error = MAPS_ERROR_NOT_SUPPORTED; char *provider = NULL, *module = NULL; do { @@ -114,7 +114,7 @@ EXPORT_API int maps_service_create(const char *maps_provider, maps_service_h *ma /* 1. Check whether provider info is valid */ if (info.empty()) { MAPS_LOGE("ERROR! Provider info not found for name: %s", maps_provider); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + error = MAPS_ERROR_NOT_SUPPORTED; break; } @@ -228,7 +228,7 @@ EXPORT_API int maps_service_provider_is_service_supported(const maps_service_h m return MAPS_ERROR_INVALID_PARAMETER; const plugin::plugin_s *p = __extract_plugin(maps); if (!p) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; return p->interface.maps_plugin_is_service_supported(service, supported); } @@ -244,7 +244,7 @@ EXPORT_API int maps_service_provider_is_data_supported(const maps_service_h maps const plugin::plugin_s *p = __extract_plugin(maps); if (!p) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; return p->interface.maps_plugin_is_data_supported(data, supported); } @@ -265,7 +265,7 @@ EXPORT_API int maps_service_geocode(const maps_service_h maps, /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_GEOCODE)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!address || !callback || !request_id) @@ -297,7 +297,7 @@ EXPORT_API int maps_service_geocode_inside_area(const maps_service_h maps, /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_GEOCODE_INSIDE_AREA)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!address || !bounds || !callback || !request_id) @@ -328,7 +328,7 @@ EXPORT_API int maps_service_geocode_by_structured_address(const maps_service_h m /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_GEOCODE_BY_STRUCTURED_ADDRESS)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!address || !callback || !request_id) @@ -359,7 +359,7 @@ EXPORT_API int maps_service_reverse_geocode(const maps_service_h maps, /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_REVERSE_GEOCODE)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!callback || !request_id) @@ -399,7 +399,7 @@ EXPORT_API int maps_service_search_place(const maps_service_h maps, /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_PLACE)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!position || !filter || !callback || !request_id) @@ -432,7 +432,7 @@ EXPORT_API int maps_service_search_place_by_area(const maps_service_h maps, /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_PLACE_BY_AREA)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!boundary || !filter || !callback || !request_id) @@ -466,7 +466,7 @@ EXPORT_API int maps_service_search_place_by_address(const maps_service_h maps, /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_PLACE_BY_ADDRESS)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!address || !boundary || !filter || !callback || !request_id) @@ -495,7 +495,7 @@ EXPORT_API int maps_service_search_place_list(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_PLACE_LIST)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; if (!boundary || !filter || !callback || !request_id) return MAPS_ERROR_INVALID_PARAMETER; @@ -519,7 +519,7 @@ EXPORT_API int maps_service_get_place_details(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_PLACE_LIST)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; if (!url || !callback || !request_id) return MAPS_ERROR_INVALID_PARAMETER; @@ -552,7 +552,7 @@ EXPORT_API int maps_service_search_route(const maps_service_h maps, /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_ROUTE)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!origin || !destination || !callback || !request_id) @@ -585,7 +585,7 @@ EXPORT_API int maps_service_search_route_waypoints(const maps_service_h maps, /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_ROUTE_WAYPOINTS)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (!waypoint_list || (waypoint_num < 2) || !callback || !request_id) @@ -615,7 +615,7 @@ EXPORT_API int maps_service_cancel_request(const maps_service_h maps, int reques /* Check if this API feature available */ if (!__maps_provider_supported(maps, MAPS_SERVICE_CANCEL_REQUEST)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ if (request_id < 0) @@ -644,7 +644,7 @@ EXPORT_API int maps_service_multi_reverse_geocode(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; if (!__maps_provider_supported(maps, MAPS_SERVICE_MULTI_REVERSE_GEOCODE)) - return MAPS_ERROR_SERVICE_NOT_AVAILABLE; + return MAPS_ERROR_NOT_SUPPORTED; if (!coordinates_list || !callback || !request_id) return MAPS_ERROR_INVALID_PARAMETER; diff --git a/src/api/maps_view_event_data.cpp b/src/api/maps_view_event_data.cpp index 7c46882..6de716b 100644 --- a/src/api/maps_view_event_data.cpp +++ b/src/api/maps_view_event_data.cpp @@ -302,7 +302,7 @@ EXPORT_API int maps_view_event_data_get_gesture_type(const maps_view_event_data_ return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if((e->event_type != MAPS_VIEW_EVENT_GESTURE) && (e->event_type != MAPS_VIEW_EVENT_OBJECT)) - return MAPS_ERROR_INVALID_OPERATION; + return MAPS_ERROR_INVALID_PARAMETER; *gesture_type = e->gesture_type; return MAPS_ERROR_NONE; } @@ -313,7 +313,7 @@ EXPORT_API int maps_view_event_data_get_action_type(const maps_view_event_data_h return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if(e->event_type != MAPS_VIEW_EVENT_ACTION) - return MAPS_ERROR_INVALID_OPERATION; + return MAPS_ERROR_INVALID_PARAMETER; *action_type = e->action_type; return MAPS_ERROR_NONE; } @@ -324,7 +324,7 @@ EXPORT_API int maps_view_event_data_get_center(const maps_view_event_data_h even return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if((e->event_type != MAPS_VIEW_EVENT_ACTION) && (e->event_type != MAPS_VIEW_EVENT_GESTURE)) - return MAPS_ERROR_INVALID_OPERATION; + return MAPS_ERROR_INVALID_PARAMETER; return maps_coordinates_clone(e->center, center); } @@ -334,7 +334,7 @@ EXPORT_API int maps_view_event_data_get_delta(const maps_view_event_data_h event return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if(e->event_type != MAPS_VIEW_EVENT_ACTION) - return MAPS_ERROR_INVALID_OPERATION; + return MAPS_ERROR_INVALID_PARAMETER; *delta_x = e->delta_x; *delta_y = e->delta_y; return MAPS_ERROR_NONE; @@ -346,7 +346,7 @@ EXPORT_API int maps_view_event_data_get_position(const maps_view_event_data_h ev return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if(e->event_type != MAPS_VIEW_EVENT_GESTURE) - return MAPS_ERROR_INVALID_OPERATION; + return MAPS_ERROR_INVALID_PARAMETER; *x = e->x; *y = e->y; return MAPS_ERROR_NONE; @@ -358,7 +358,7 @@ EXPORT_API int maps_view_event_data_get_fingers(const maps_view_event_data_h eve return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if(e->event_type != MAPS_VIEW_EVENT_GESTURE) - return MAPS_ERROR_INVALID_OPERATION; + return MAPS_ERROR_INVALID_PARAMETER; *fingers = e->fingers; return MAPS_ERROR_NONE; } @@ -369,7 +369,7 @@ EXPORT_API int maps_view_event_data_get_zoom_factor(const maps_view_event_data_h return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if((e->event_type != MAPS_VIEW_EVENT_GESTURE) && (e->event_type != MAPS_VIEW_EVENT_ACTION)) - return MAPS_ERROR_INVALID_OPERATION; + return MAPS_ERROR_INVALID_PARAMETER; *zoom_factor = e->zoom_factor; return MAPS_ERROR_NONE; } @@ -380,7 +380,7 @@ EXPORT_API int maps_view_event_data_get_rotation_angle(const maps_view_event_dat return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if((e->event_type != MAPS_VIEW_EVENT_GESTURE) && (e->event_type != MAPS_VIEW_EVENT_ACTION)) - return MAPS_ERROR_INVALID_OPERATION; + return MAPS_ERROR_INVALID_PARAMETER; *rotation_angle = e->rotation_angle; return MAPS_ERROR_NONE; } @@ -391,7 +391,7 @@ EXPORT_API int maps_view_event_data_get_object(const maps_view_event_data_h even return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if(e->event_type != MAPS_VIEW_EVENT_OBJECT) - return MAPS_ERROR_INVALID_OPERATION; + return MAPS_ERROR_INVALID_PARAMETER; *object = e->object; return MAPS_ERROR_NONE; } diff --git a/src/session/commands.cpp b/src/session/commands.cpp index a74a2fd..a3980dc 100755 --- a/src/session/commands.cpp +++ b/src/session/commands.cpp @@ -102,8 +102,8 @@ int session::command_geocode::run() /* func = plugin::get_empty_interface().maps_plugin_geocode; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -226,8 +226,8 @@ int session::command_geocode_inside_bounds::run() func = plugin::get_empty_interface(). maps_plugin_geocode_inside_area; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -307,8 +307,8 @@ int session::command_geocode_by_structured_address::run() func = plugin::get_empty_interface(). maps_plugin_geocode_by_structured_address; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -379,8 +379,8 @@ int session::command_reverse_geocode::run() func = plugin::get_empty_interface(). maps_plugin_reverse_geocode; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -496,8 +496,8 @@ int session::command_multi_reverse_geocode::run() func = plugin::get_empty_interface(). maps_plugin_multi_reverse_geocode; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -610,8 +610,8 @@ int session::command_search_place::run() /* func = plugin::get_empty_interface().maps_plugin_search_place; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -761,8 +761,8 @@ int session::command_search_by_area_place::run() maps_plugin_search_place_by_area; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -845,8 +845,8 @@ int session::command_search_by_address_place::run() func = plugin::get_empty_interface(). maps_plugin_search_place_by_address; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -924,8 +924,8 @@ int session::command_search_place_list::run() /* func = plugin::get_empty_interface().maps_plugin_search_place_list; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -1020,8 +1020,8 @@ int session::command_get_place_details::run() func = plugin::get_empty_interface(). maps_plugin_get_place_details; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -1145,8 +1145,8 @@ int session::command_search_route::run() /* func = plugin::get_empty_interface().maps_plugin_search_route; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; @@ -1234,8 +1234,8 @@ int session::command_search_route_waypoints::run() func = plugin::get_empty_interface(). maps_plugin_search_route_waypoints; */ - MAPS_LOGE("MAPS_ERROR_SERVICE_NOT_AVAILABLE: Can't get any plugin"); - error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; + MAPS_LOGE("MAPS_ERROR_NOT_SUPPORTED: Can't get any plugin"); + error = MAPS_ERROR_NOT_SUPPORTED; } const int ret = error; -- 2.7.4