Revert "[TCSACR-38] Rename gesture events and handlers"

This reverts commit 9045b76445e38f2a7e06ef5dfa8227af4cb6c46c.

Change-Id: I8761cce846c64c6120d139b0181c7896c076cc6e

diff --git a/Tizen.Maps/Interop/Interop.View.Event.Data.cs b/Tizen.Maps/Interop/Interop.View.Event.Data.cs
index dd5fd6a..c1cde38 100755 (executable)
--- a/Tizen.Maps/Interop/Interop.View.Event.Data.cs
+++ b/Tizen.Maps/Interop/Interop.View.Event.Data.cs
@@ -36,10 +36,10 @@ internal static partial class Interop
         None, // MAPS_VIEW_GESTURE_NONE
         Scroll, // MAPS_VIEW_GESTURE_SCROLL
         Zoom, // MAPS_VIEW_GESTURE_ZOOM
-        Click, // MAPS_VIEW_GESTURE_TAP
-        DoubleClick, // MAPS_VIEW_GESTURE_DOUBLE_TAP
-        TwoFingerClick, // MAPS_VIEW_GESTURE_2_FINGER_TAP
-        Rotation, // MAPS_VIEW_GESTURE_ROTATE
+        Tap, // MAPS_VIEW_GESTURE_TAP
+        DoubleTap, // MAPS_VIEW_GESTURE_DOUBLE_TAP
+        TwoFingerTap, // MAPS_VIEW_GESTURE_2_FINGER_TAP
+        Rotate, // MAPS_VIEW_GESTURE_ROTATE
         LongPress, // MAPS_VIEW_GESTURE_LONG_PRESS
     }
 

diff --git a/Tizen.Maps/Tizen.Maps/Geocoordinates.cs b/Tizen.Maps/Tizen.Maps/Geocoordinates.cs
index 7a26724..e6ba385 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/Geocoordinates.cs
+++ b/Tizen.Maps/Tizen.Maps/Geocoordinates.cs
@@ -67,7 +67,6 @@ namespace Tizen.Maps
         /// <summary>
         /// Returns a string that represents this object.
         /// </summary>
-        /// <returns>Returns a string which presents this object.</returns>
         public override string ToString()
         {
             return $"[{Latitude}, {Longitude}]";

diff --git a/Tizen.Maps/Tizen.Maps/GestureType.cs b/Tizen.Maps/Tizen.Maps/GestureType.cs
index f4ccfae..4607787 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/GestureType.cs
+++ b/Tizen.Maps/Tizen.Maps/GestureType.cs
@@ -34,24 +34,24 @@ namespace Tizen.Maps
         /// </summary>
         Zoom = Interop.ViewGesture.Zoom,
         /// <summary>
-        /// Indicates the click user gesture
+        /// Indicates the tap user gesture.
         /// </summary>
-        Click = Interop.ViewGesture.Click,
+        Tap = Interop.ViewGesture.Tap,
         /// <summary>
-        /// Indicates the double click user gesture
+        /// Indicates the double tap user gesture.
         /// </summary>
-        DoubleClick = Interop.ViewGesture.DoubleClick,
+        DoubleTap = Interop.ViewGesture.DoubleTap,
         /// <summary>
-        /// Indicates the two-finger click user gesture
+        /// Indicates the two-finger tap user gesture.
         /// </summary>
-        TwoFingerClick = Interop.ViewGesture.TwoFingerClick,
+        TwoFingerTap = Interop.ViewGesture.TwoFingerTap,
         /// <summary>
         ///  Indicates the rotation user gesture.
         /// </summary>
-        Rotation = Interop.ViewGesture.Rotation,
+        Rotate = Interop.ViewGesture.Rotate,
         /// <summary>
         /// Indicates the long press user gesture.
         /// </summary>
         LongPress = Interop.ViewGesture.LongPress,
     }
-}
+}
\ No newline at end of file

diff --git a/Tizen.Maps/Tizen.Maps/MapService.cs b/Tizen.Maps/Tizen.Maps/MapService.cs
index 4c7648b..eba01fb 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/MapService.cs
+++ b/Tizen.Maps/Tizen.Maps/MapService.cs
@@ -81,7 +81,7 @@ namespace Tizen.Maps
         /// <summary>
         /// Gets and sets a string representing keys for map service provider
         /// </summary>
-        /// <remarks>Typically, the provider key is issued by each maps provider, after signing up for a plan in the web site.
+        /// <remarks>Regaularly, the provider key is issued by each maps provider, after signing up for a plan in the web site.
         /// Depending on the plan and its provider which you have signed, you might pay for the network traffic.</remarks>
         public string ProviderKey
         {
@@ -261,11 +261,11 @@ namespace Tizen.Maps
         /// Creates a reverse geocode search request for given latitude and longitude.
         /// </summary>
         /// <param name="latitude">Latitude of interested place</param>
-        /// <param name="longitude">Longitude of interested place</param>
+        /// <param name="longitute">Longitude of interested place</param>
         /// <returns>Returns ReverseGeocodeRequest object created with location coordinates</returns>
-        public ReverseGeocodeRequest CreateReverseGeocodeRequest(double latitude, double longitude)
+        public ReverseGeocodeRequest CreateReverseGeocodeRequest(double latitude, double longitute)
         {
-            return new ReverseGeocodeRequest(this, latitude, longitude);
+            return new ReverseGeocodeRequest(this, latitude, longitute);
         }
 
         /// <summary>

diff --git a/Tizen.Maps/Tizen.Maps/MapView.cs b/Tizen.Maps/Tizen.Maps/MapView.cs
index 12c1631..8814536 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/MapView.cs
+++ b/Tizen.Maps/Tizen.Maps/MapView.cs
@@ -37,11 +37,11 @@ namespace Tizen.Maps
         private Interop.ViewOnEventCallback _viewReadyEventCallback;
 
         private event EventHandler<MapGestureEventArgs> _scrolledEventHandler;
-        private event EventHandler<MapGestureEventArgs> _twoFingerZoomedEventHandler;
-        private event EventHandler<MapGestureEventArgs> _clickedEventHandler;
-        private event EventHandler<MapGestureEventArgs> _doubleClickedEventHandler;
-        private event EventHandler<MapGestureEventArgs> _twoFingerClickedEventHandler;
-        private event EventHandler<MapGestureEventArgs> _twoFingerRotatedEventHandler;
+        private event EventHandler<MapGestureEventArgs> _zoomedEventHandler;
+        private event EventHandler<MapGestureEventArgs> _tappedEventHandler;
+        private event EventHandler<MapGestureEventArgs> _doubleTappedEventHandler;
+        private event EventHandler<MapGestureEventArgs> _twoFingerTappedEventHandler;
+        private event EventHandler<MapGestureEventArgs> _rotatedEventHandler;
         private event EventHandler<MapGestureEventArgs> _longPressedEventHandler;
         private event EventHandler _viewReadyEventHandler;
 
@@ -64,7 +64,7 @@ namespace Tizen.Maps
             this.Resize(1, 1);
 
             // We need to keep Gesture Tap event enabled for object event to work
-            handle.SetGestureEnabled(Interop.ViewGesture.Click, true);
+            handle.SetGestureEnabled(Interop.ViewGesture.Tap, true);
             SetObjectEventCallback();
         }
 
@@ -99,20 +99,20 @@ namespace Tizen.Maps
         /// </summary>
         /// <value>Event handlers to get zoomed gesture event</value>
         /// <exception cref="System.NotSupportedException">Thrown when the required feature is not supported.</exception>
-        public event EventHandler<MapGestureEventArgs> TwoFingerZoomed
+        public event EventHandler<MapGestureEventArgs> ZoomChanged
         {
             add
             {
                 SetGestureEventCallback();
                 handle.SetGestureEnabled(Interop.ViewGesture.Zoom, true);
-                _twoFingerZoomedEventHandler += value;
-                Log.Info(string.Format("TwoFingerZoomed event handler is added"));
+                _zoomedEventHandler += value;
+                Log.Info(string.Format("ZoomChanged event handler is added"));
             }
             remove
             {
-                _twoFingerZoomedEventHandler -= value;
-                Log.Info(string.Format("TwoFingerZoomed event handler is removed"));
-                if (_twoFingerZoomedEventHandler == null)
+                _zoomedEventHandler -= value;
+                Log.Info(string.Format("ZoomChanged event handler is removed"));
+                if (_zoomedEventHandler == null)
                 {
                     handle.SetGestureEnabled(Interop.ViewGesture.Zoom, false);
                     UnsetGestureEventCallback();
@@ -130,17 +130,17 @@ namespace Tizen.Maps
             add
             {
                 SetGestureEventCallback();
-                //handle.SetGestureEnabled(Interop.ViewGesture.Click, true);
-                _clickedEventHandler += value;
+                //handle.SetGestureEnabled(Interop.ViewGesture.Tap, true);
+                _tappedEventHandler += value;
                 Log.Info(string.Format("Clicked event handler is added"));
             }
             remove
             {
-                _clickedEventHandler -= value;
+                _tappedEventHandler -= value;
                 Log.Info(string.Format("Clicked event handler is removed"));
-                if (_clickedEventHandler == null)
+                if (_tappedEventHandler == null)
                 {
-                    //handle.SetGestureEnabled(Interop.ViewGesture.Click, false);
+                    //handle.SetGestureEnabled(Interop.ViewGesture.Tap, false);
                     UnsetGestureEventCallback();
                 }
             }
@@ -156,17 +156,17 @@ namespace Tizen.Maps
             add
             {
                 SetGestureEventCallback();
-                handle.SetGestureEnabled(Interop.ViewGesture.DoubleClick, true);
-                _doubleClickedEventHandler += value;
+                handle.SetGestureEnabled(Interop.ViewGesture.DoubleTap, true);
+                _doubleTappedEventHandler += value;
                 Log.Info(string.Format("DoubleClicked event handler is removed"));
             }
             remove
             {
-                _doubleClickedEventHandler -= value;
+                _doubleTappedEventHandler -= value;
                 Log.Info(string.Format("DoubleClicked event handler is removed"));
-                if (_doubleClickedEventHandler == null)
+                if (_doubleTappedEventHandler == null)
                 {
-                    handle.SetGestureEnabled(Interop.ViewGesture.DoubleClick, false);
+                    handle.SetGestureEnabled(Interop.ViewGesture.DoubleTap, false);
                     UnsetGestureEventCallback();
                 }
             }
@@ -177,22 +177,22 @@ namespace Tizen.Maps
         /// </summary>
         /// <value>Event handlers to get clicked gesture event</value>
         /// <exception cref="System.NotSupportedException">Thrown when the required feature is not supported.</exception>
-        public event EventHandler<MapGestureEventArgs> TwoFingerClicked
+        public event EventHandler<MapGestureEventArgs> TwoFingerPressed
         {
             add
             {
                 SetGestureEventCallback();
-                handle.SetGestureEnabled(Interop.ViewGesture.TwoFingerClick, true);
-                _twoFingerClickedEventHandler += value;
-                Log.Info(string.Format("TwoFingerClicked event handler is added"));
+                handle.SetGestureEnabled(Interop.ViewGesture.TwoFingerTap, true);
+                _twoFingerTappedEventHandler += value;
+                Log.Info(string.Format("TwoFingerPressed event handler is added"));
             }
             remove
             {
-                _twoFingerClickedEventHandler -= value;
-                Log.Info(string.Format("TwoFingerClicked event handler is removed"));
-                if (_twoFingerClickedEventHandler == null)
+                _twoFingerTappedEventHandler -= value;
+                Log.Info(string.Format("TwoFingerPressed event handler is removed"));
+                if (_twoFingerTappedEventHandler == null)
                 {
-                    handle.SetGestureEnabled(Interop.ViewGesture.TwoFingerClick, false);
+                    handle.SetGestureEnabled(Interop.ViewGesture.TwoFingerTap, false);
                     UnsetGestureEventCallback();
                 }
             }
@@ -203,22 +203,22 @@ namespace Tizen.Maps
         /// </summary>
         /// <value>Event handlers to get rotated gesture event</value>
         /// <exception cref="System.NotSupportedException">Thrown when the required feature is not supported.</exception>
-        public event EventHandler<MapGestureEventArgs> TwoFingerRotated
+        public event EventHandler<MapGestureEventArgs> Rotated
         {
             add
             {
                 SetGestureEventCallback();
-                handle.SetGestureEnabled(Interop.ViewGesture.Rotation, true);
-                _twoFingerRotatedEventHandler += value;
+                handle.SetGestureEnabled(Interop.ViewGesture.Rotate, true);
+                _rotatedEventHandler += value;
                 Log.Info(string.Format("Rotated event handler is added"));
             }
             remove
             {
-                _twoFingerRotatedEventHandler -= value;
+                _rotatedEventHandler -= value;
                 Log.Info(string.Format("Rotated event handler is removed"));
-                if (_twoFingerRotatedEventHandler == null)
+                if (_rotatedEventHandler == null)
                 {
-                    handle.SetGestureEnabled(Interop.ViewGesture.Rotation, false);
+                    handle.SetGestureEnabled(Interop.ViewGesture.Rotate, false);
                     UnsetGestureEventCallback();
                 }
             }
@@ -648,11 +648,11 @@ namespace Tizen.Maps
                     switch (eventArg.GestureType)
                     {
                         case GestureType.Scroll: _scrolledEventHandler?.Invoke(this, eventArg); break;
-                        case GestureType.Zoom: _twoFingerZoomedEventHandler?.Invoke(this, eventArg); break;
-                        case GestureType.Click: _clickedEventHandler?.Invoke(this, eventArg); break;
-                        case GestureType.DoubleClick: _doubleClickedEventHandler?.Invoke(this, eventArg); break;
-                        case GestureType.TwoFingerClick: _twoFingerClickedEventHandler?.Invoke(this, eventArg); break;
-                        case GestureType.Rotation: _twoFingerRotatedEventHandler?.Invoke(this, eventArg); break;
+                        case GestureType.Zoom: _zoomedEventHandler?.Invoke(this, eventArg); break;
+                        case GestureType.Tap: _tappedEventHandler?.Invoke(this, eventArg); break;
+                        case GestureType.DoubleTap: _doubleTappedEventHandler?.Invoke(this, eventArg); break;
+                        case GestureType.TwoFingerTap: _twoFingerTappedEventHandler?.Invoke(this, eventArg); break;
+                        case GestureType.Rotate: _rotatedEventHandler?.Invoke(this, eventArg); break;
                         case GestureType.LongPress: _longPressedEventHandler?.Invoke(this, eventArg); break;
                     }
                 };
@@ -663,9 +663,9 @@ namespace Tizen.Maps
 
         private void UnsetGestureEventCallback()
         {
-            if (_scrolledEventHandler != null || _twoFingerZoomedEventHandler != null
-                || _clickedEventHandler != null || _doubleClickedEventHandler != null
-                || _twoFingerClickedEventHandler != null || _twoFingerRotatedEventHandler != null
+            if (_scrolledEventHandler != null || _zoomedEventHandler != null
+                || _tappedEventHandler != null || _doubleTappedEventHandler != null
+                || _twoFingerTappedEventHandler != null || _rotatedEventHandler != null
                 || _longPressedEventHandler != null)
             {
                 return;
@@ -686,12 +686,12 @@ namespace Tizen.Maps
                     var eventArg = new Interop.ObjectEventDataHandle(eventData);
                     switch (eventArg.GestureType)
                     {
-                        case Interop.ViewGesture.Click:
-                        {
-                            var mapObject = _handleToObjectTable[eventArg.ViewObject];
-                            mapObject?.HandleClickedEvent();
-                            break;
-                        }
+                        case Interop.ViewGesture.Tap:
+                            {
+                                var mapObject = _handleToObjectTable[eventArg.ViewObject];
+                                mapObject?.HandleClickedEvent();
+                                break;
+                            }
                     }
                 };
                 handle.SetEventCb(Interop.ViewEventType.Object, _objectEventCallback, IntPtr.Zero);

diff --git a/Tizen.Maps/Tizen.Maps/PlaceAddress.cs b/Tizen.Maps/Tizen.Maps/PlaceAddress.cs
index 6c90609..e9c9fb9 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/PlaceAddress.cs
+++ b/Tizen.Maps/Tizen.Maps/PlaceAddress.cs
@@ -192,7 +192,6 @@ namespace Tizen.Maps
         /// <summary>
         /// Returns a string that represents this object.
         /// </summary>
-        /// <returns>Returns a string which presents this object.</returns>
         public override string ToString()
         {
             return $"{Freetext}";

diff --git a/Tizen.Maps/Tizen.Maps/PlaceAttribute.cs b/Tizen.Maps/Tizen.Maps/PlaceAttribute.cs
index 89230cf..0e5d65f 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/PlaceAttribute.cs
+++ b/Tizen.Maps/Tizen.Maps/PlaceAttribute.cs
@@ -57,7 +57,6 @@ namespace Tizen.Maps
         /// <summary>
         /// Returns a string that represents this object.
         /// </summary>
-        /// <returns>Returns a string which presents this object.</returns>
         public override string ToString()
         {
             return $"{Label}: {Text}";

diff --git a/Tizen.Maps/Tizen.Maps/PlaceCategory.cs b/Tizen.Maps/Tizen.Maps/PlaceCategory.cs
index dae19e5..acbb1f0 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/PlaceCategory.cs
+++ b/Tizen.Maps/Tizen.Maps/PlaceCategory.cs
@@ -70,7 +70,6 @@ namespace Tizen.Maps
         /// <summary>
         /// Returns a string that represents this object.
         /// </summary>
-        /// <returns>Returns a string which presents this object.</returns>
         public override string ToString()
         {
             return $"{Name}";

diff --git a/Tizen.Maps/Tizen.Maps/PlaceContact.cs b/Tizen.Maps/Tizen.Maps/PlaceContact.cs
index b542ca6..e06ed72 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/PlaceContact.cs
+++ b/Tizen.Maps/Tizen.Maps/PlaceContact.cs
@@ -57,7 +57,6 @@ namespace Tizen.Maps
         /// <summary>
         /// Returns a string that represents this object.
         /// </summary>
-        /// <returns>Returns a string which presents this object.</returns>
         public override string ToString()
         {
             return $"{Label}: {Value}";

diff --git a/Tizen.Maps/Tizen.Maps/PlaceEditorial.cs b/Tizen.Maps/Tizen.Maps/PlaceEditorial.cs
index 9e11380..4a702a3 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/PlaceEditorial.cs
+++ b/Tizen.Maps/Tizen.Maps/PlaceEditorial.cs
@@ -56,7 +56,6 @@ namespace Tizen.Maps
         /// <summary>
         /// Returns a string that represents this object.
         /// </summary>
-        /// <returns>Returns a string which presents this object.</returns>
         public override string ToString()
         {
             return $"{Description}";

diff --git a/Tizen.Maps/Tizen.Maps/PlaceRating.cs b/Tizen.Maps/Tizen.Maps/PlaceRating.cs
index 99a8789..617fcb5 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/PlaceRating.cs
+++ b/Tizen.Maps/Tizen.Maps/PlaceRating.cs
@@ -45,7 +45,6 @@ namespace Tizen.Maps
         /// <summary>
         /// Returns a string that represents this object.
         /// </summary>
-        /// <returns>Returns a string which presents this object.</returns>
         public override string ToString()
         {
             return $"{Average}({UserCount} reviews)";

diff --git a/Tizen.Maps/Tizen.Maps/Polyline.cs b/Tizen.Maps/Tizen.Maps/Polyline.cs
index 58f053d..b1522b0 100755 (executable)
--- a/Tizen.Maps/Tizen.Maps/Polyline.cs
+++ b/Tizen.Maps/Tizen.Maps/Polyline.cs
@@ -54,9 +54,6 @@ namespace Tizen.Maps
         /// </summary>
         public event EventHandler Clicked;
 
-        /// <summary>
-        /// Gets or sets visibility for the polyline.
-        /// </summary>
         public override bool IsVisible
         {
             get { return handle.IsVisible; }