From 04c179a3910b89327dd437d6b6c5e9c8bec3cab2 Mon Sep 17 00:00:00 2001
From: "kj7.sung" <kj7.sung@samsung.com>
Date: Fri, 30 Dec 2016 17:44:05 +0900
Subject: [PATCH] c# location 1. Fix satellite callback 2. Remove invalid
 set_callback

Change-Id: Icdfe9cba7d2cb30e6bc8b4095184c1b1d85eb802
Signed-off-by: kj7.sung <kj7.sung@samsung.com>
---
 Tizen.Location/Tizen.Location/GpsSatellite.cs | 17 +++++++----------
 Tizen.Location/Tizen.Location/Locator.cs      | 14 +-------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/Tizen.Location/Tizen.Location/GpsSatellite.cs b/Tizen.Location/Tizen.Location/GpsSatellite.cs
index ce2cf23..6f833d5 100755
--- a/Tizen.Location/Tizen.Location/GpsSatellite.cs
+++ b/Tizen.Location/Tizen.Location/GpsSatellite.cs
@@ -35,6 +35,7 @@ namespace Tizen.Location
         /// Should be in the range [1~120] seconds.
         /// </summary>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used</exception>
+        /// <exception cref="NotSupportedException">Thrown when the location is not supported</exception>
         public int Interval
         {
             get
@@ -45,18 +46,14 @@ namespace Tizen.Location
             set
             {
                 Log.Info(Globals.LogTag, "Setting the Callback Interval");
-                if (value >= 0 && value <= 120)
+                if (value > 0 && value <= 120)
                 {
                     _interval = value;
-                    if (_satelliteStatusChanged != null)
-                    {
-                        SetSatelliteStatusChangeCallback();
-                    }
-                    else
-                    {
-                        Log.Error(Globals.LogTag, "Error Setting the Callback Interval");
-                        throw LocationErrorFactory.ThrowLocationException((int)LocationError.InvalidParameter);
-                    }
+                }
+                else
+                {
+                    Log.Error(Globals.LogTag, "Error Setting the Callback Interval");
+                    throw LocationErrorFactory.ThrowLocationException((int)LocationError.InvalidParameter);
                 }
             }
         }
diff --git a/Tizen.Location/Tizen.Location/Locator.cs b/Tizen.Location/Tizen.Location/Locator.cs
index 0d2f375..7604c20 100755
--- a/Tizen.Location/Tizen.Location/Locator.cs
+++ b/Tizen.Location/Tizen.Location/Locator.cs
@@ -100,10 +100,6 @@ namespace Tizen.Location
                 if (value > 0 && value <= 120)
                 {
                     _interval = value;
-                    if (_locationChanged != null)
-                    {
-                        SetLocationChangedCallback();
-                    }
                 }
                 else
                 {
@@ -132,10 +128,6 @@ namespace Tizen.Location
                 if (value > 0 && value <= 120)
                 {
                     _stayInterval = value;
-                    if (_distanceBasedLocationChanged != null)
-                    {
-                        SetDistanceBasedLocationChangedCallback();
-                    }
                 }
                 else
                 {
@@ -164,10 +156,6 @@ namespace Tizen.Location
                 if (value > 0 && value <= 120)
                 {
                     _distance = value;
-                    if (_distanceBasedLocationChanged != null)
-                    {
-                        SetDistanceBasedLocationChangedCallback();
-                    }
                 }
                 else
                 {
@@ -298,9 +286,9 @@ namespace Tizen.Location
             int ret = Interop.Locator.SetMockLocation(_handle, location.Latitude, location.Longitude, location.Altitude, location.Speed, location.Direction, location.HorizontalAccuracy);
             if (((LocationError)ret == LocationError.None))
             {
-                _location.Altitude = location.Altitude;
                 _location.Latitude = location.Latitude;
                 _location.Longitude = location.Longitude;
+                _location.Altitude = location.Altitude;
                 _location.Speed = location.Speed;
                 _location.Direction = location.Direction;
                 _location.HorizontalAccuracy = location.HorizontalAccuracy;
-- 
2.7.4