Merge branch 'tizen' into devel

Change-Id: I16ed5d83a84cf567acce1b322dc1bf944e71d93c
Signed-off-by: chanywa <cbible.kim@samsung.com>

diff --cc include/maps_preference.h
Simple merge

diff --cc include/maps_route.h
Simple merge

diff --cc include/maps_view_object.h
Simple merge

diff --cc src/api/maps_preference.cpp
index 467908a74352731664efa93675e79e5f0fb72b87,9af4639876fefd031791583e14bec582e9898359..067c85e7b75295fbd4ce226031ea800057b54e8f
--- 1/src/api/maps_preference.cpp
--- 2/src/api/maps_preference.cpp
+++ b/src/api/maps_preference.cpp
@@@ -218,13 -238,16 +243,15 @@@ EXPORT_API int maps_preference_get_rout
  EXPORT_API int maps_preference_get_route_alternatives_enabled(
                                                                const maps_preference_h preference, bool *enable)
  {
-       if (!preference || !enable)
+       if (!maps_condition_check_maps_feature())
+               return MAPS_ERROR_NOT_SUPPORTED;
+       if (!preference)
                return MAPS_ERROR_INVALID_PARAMETER;
 -
 -      int alternatives;
 -      int error = maps_item_hashtable_get_int(preference, "MAPS_PREFERENCE_ROUTE_ALTERNATIVES", &alternatives);
 +      int alternatives = 0;
 +      int error = maps_item_hashtable_get_int(preference,
 +              "MAPS_PREFERENCE_ROUTE_ALTERNATIVES", &alternatives);
        if (error != MAPS_ERROR_NONE)
                return error;
 -
        *enable = (alternatives == _DEFAULT_ALTERNATIVES_SIZE) ? true :false;
        return MAPS_ERROR_NONE;
  }
@@@ -348,20 -382,16 +395,22 @@@ EXPORT_API int maps_preference_set_rout
  EXPORT_API int maps_preference_set_route_alternatives_enabled(maps_preference_h preference,
                                                                bool enable)
  {
+       if (!maps_condition_check_maps_feature())
+               return MAPS_ERROR_NOT_SUPPORTED;
        if (!preference)
                return MAPS_ERROR_INVALID_PARAMETER;
 +      int alternatives = _DEFAULT_ALTERNATIVES_SIZE * enable;
 +      return maps_item_hashtable_set_int(preference,
 +              "MAPS_PREFERENCE_ROUTE_ALTERNATIVES", alternatives);
 +}
  
 -      int alternatives = 0;
 -      if (enable)
 -              alternatives = _DEFAULT_ALTERNATIVES_SIZE;
 -
 -      return maps_item_hashtable_set_int(preference, "MAPS_PREFERENCE_ROUTE_ALTERNATIVES", alternatives);
 +EXPORT_API int maps_preference_set_route_departure_time(const maps_preference_h preference,
 +                                                              time_t time)
 +{
 +      if (!preference)
 +              return MAPS_ERROR_INVALID_PARAMETER;
 +      return maps_item_hashtable_set_int(preference,
 +              "MAPS_PREFERENCE_ROUTE_DEPARTURE_TIME", (int)time);
  }
  
  EXPORT_API int maps_preference_set_property(maps_preference_h preference,

diff --cc src/api/maps_view_object.cpp
Simple merge