From e3eb1c724e646d0285712e4230bf8e703ffc0015 Mon Sep 17 00:00:00 2001
From: chanywa <cbible.kim@samsung.com>
Date: Wed, 8 Feb 2017 12:47:53 +0900
Subject: [PATCH] Rename name of elements in ServiceRequestType. Change a
 attribute of Reqest.Cancel() to internal.

Change-Id: Ia3ac0bb382929506e40609958fd99f437015d937
---
 packaging/csapi-maps.spec                       | 2 +-
 src/Tizen.Maps/Tizen.Maps/MapServiceRequest.cs  | 5 +----
 src/Tizen.Maps/Tizen.Maps/RouteSearchRequest.cs | 6 +++---
 src/Tizen.Maps/Tizen.Maps/ServiceRequestType.cs | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packaging/csapi-maps.spec b/packaging/csapi-maps.spec
index fcfbc6e..1e521cd 100644
--- a/packaging/csapi-maps.spec
+++ b/packaging/csapi-maps.spec
@@ -8,7 +8,7 @@
 
 Name:       csapi-maps
 Summary:    Tizen Map Service API for C#
-Version:    1.0.6
+Version:    1.0.7
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
diff --git a/src/Tizen.Maps/Tizen.Maps/MapServiceRequest.cs b/src/Tizen.Maps/Tizen.Maps/MapServiceRequest.cs
index ff5bfc0..0e51f01 100755
--- a/src/Tizen.Maps/Tizen.Maps/MapServiceRequest.cs
+++ b/src/Tizen.Maps/Tizen.Maps/MapServiceRequest.cs
@@ -65,10 +65,7 @@ namespace Tizen.Maps
             return await _requestTask.Task;
         }
 
-        /// <summary>
-        /// Cancel this map service request
-        /// </summary>
-        public void Cancel()
+        internal void Cancel()
         {
             if (_requestTask?.Task.IsCompleted == false)
             {
diff --git a/src/Tizen.Maps/Tizen.Maps/RouteSearchRequest.cs b/src/Tizen.Maps/Tizen.Maps/RouteSearchRequest.cs
index 5b70bd9..d3bd456 100755
--- a/src/Tizen.Maps/Tizen.Maps/RouteSearchRequest.cs
+++ b/src/Tizen.Maps/Tizen.Maps/RouteSearchRequest.cs
@@ -32,7 +32,7 @@ namespace Tizen.Maps
         private Geocoordinates _from;
         private List<Geocoordinates> _waypoints = new List<Geocoordinates>();
 
-        internal RouteSearchRequest(MapService service, Geocoordinates from, Geocoordinates to) : this(service, ServiceRequestType.SearchByEndPoint)
+        internal RouteSearchRequest(MapService service, Geocoordinates from, Geocoordinates to) : this(service, ServiceRequestType.SearchRoute)
         {
             _to = to;
             _from = from;
@@ -42,7 +42,7 @@ namespace Tizen.Maps
                 errMessage = $"Failed to get route list for given origin {_from} and destination {_to}";
                 if (_waypoints?.Count == 0)
                 {
-                    _type = ServiceRequestType.SearchByEndPoint;
+                    _type = ServiceRequestType.SearchRoute;
                     errorCode = _service.handle.SearchRoute(_from.handle, _to.handle, _service.Preferences.handle, _routeCallback, IntPtr.Zero, out requestID);
                     if (errorCode.IsFailed() && errorCode != Interop.ErrorCode.Canceled)
                     {
@@ -51,7 +51,7 @@ namespace Tizen.Maps
                 }
                 else
                 {
-                    _type = ServiceRequestType.SearchWithWaypoints;
+                    _type = ServiceRequestType.SearchRouteWithWaypoints;
 
                     var waypoints = GetCoordinateListForWaypoints();
                     errorCode = _service.handle.SearchRouteWaypoints(waypoints, waypoints.Length, _service.Preferences.handle, _routeCallback, IntPtr.Zero, out requestID);
diff --git a/src/Tizen.Maps/Tizen.Maps/ServiceRequestType.cs b/src/Tizen.Maps/Tizen.Maps/ServiceRequestType.cs
index ea79b5e..d3d0f04 100755
--- a/src/Tizen.Maps/Tizen.Maps/ServiceRequestType.cs
+++ b/src/Tizen.Maps/Tizen.Maps/ServiceRequestType.cs
@@ -66,11 +66,11 @@ namespace Tizen.Maps
         /// <summary>
         /// Service request to query <see cref="Route"/> information from a given origin <see cref="Geocoordinates"/> and destination <see cref="Geocoordinates"/> is allowed
         /// </summary>
-        SearchByEndPoint = Interop.ServiceType.SearchRoute,
+        SearchRoute = Interop.ServiceType.SearchRoute,
         /// <summary>
         /// Service request to query <see cref="Route"/> information passing through specified way-points <see cref="GeocoordinatesList"/> is allowed
         /// </summary>
-        SearchWithWaypoints = Interop.ServiceType.SearchRouteWaypoints,
+        SearchRouteWithWaypoints = Interop.ServiceType.SearchRouteWaypoints,
 
         /// <summary>
         /// Map view service is allowed
-- 
2.7.4