Add RedisClient descriptive GEO API's with tests

Author: mythz

lib/ServiceStack.Interfaces.dll

@@ -68,6 +68,64 @@ public List<string> GetSortedEntryValues(string setId, int startingFrom, int end
             return multiDataList.ToStringList();
         }
 
+        public long AddGeoMember(string key, double longitude, double latitude, string member)
+        {
+            return base.GeoAdd(key, longitude, latitude, member);
+        }
+
+        public long AddGeoMembers(string key, params RedisGeo[] geoPoints)
+        {
+            return base.GeoAdd(key, geoPoints);
+        }
+
+        public double CalculateDistanceBetweenGeoMembers(string key, string fromMember, string toMember, string unit = null)
+        {
+            return base.GeoDist(key, fromMember, toMember, unit);
+        }
+
+        public string[] GetGeohashes(string key, params string[] members)
+        {
+            return base.GeoHash(key, members);
+        }
+
+        public List<RedisGeo> GetGeoCoordinates(string key, params string[] members)
+        {
+            return base.GeoPos(key, members);
+        }
+
+        public string[] FindGeoMembersInRadius(string key, double longitude, double latitude, double radius, string unit)
+        {
+            var results = base.GeoRadius(key, longitude, latitude, radius, unit);
+            var to = new string[results.Count];
+            for (var i = 0; i < results.Count; i++)
+            {
+                to[i] = results[i].Member;
+            }
+            return to;
+        }
+
+        public List<RedisGeoResult> FindGeoResultsInRadius(string key, double longitude, double latitude, double radius, string unit, 
+            int? count = null, bool? sortByNearest = null)
+        {
+            return base.GeoRadius(key, longitude, latitude, radius, unit, withCoords:true, withDist:true, withHash:true, count:count, asc: sortByNearest);
+        }
+
+        public string[] FindGeoMembersInRadius(string key, string member, double radius, string unit)
+        {
+            var results = base.GeoRadiusByMember(key, member, radius, unit);
+            var to = new string[results.Count];
+            for (var i = 0; i < results.Count; i++)
+            {
+                to[i] = results[i].Member;
+            }
+            return to;
+        }
+
+        public List<RedisGeoResult> FindGeoResultsInRadius(string key, string member, double radius, string unit, int? count = null, bool? sortByNearest = null)
+        {
+            return base.GeoRadiusByMember(key, member, radius, unit, withCoords: true, withDist: true, withHash: true, count: count, asc: sortByNearest);
+        }
+
         public HashSet<string> GetAllItemsFromSet(string setId)
         {
             var multiDataList = SMembers(setId);

src/ServiceStack.Redis/RedisClient_Set.cs

@@ -2261,7 +2261,13 @@ public List<RedisGeo> GeoPos(string key, params string[] members)
 
             for (var i = 0; i < members.Length; i++)
             {
+                if (data.Children.Count <= i)
+                    break;
+
                 var entry = data.Children[i];
+                if (entry.Children.Count == 0)
+                    continue;
+
                 to.Add(new RedisGeo
                 {
                     Longitude = double.Parse(entry.Children[0].Data.FromUtf8Bytes()),
@@ -2345,10 +2351,75 @@ public List<RedisGeoResult> GeoRadius(string key, double longitude, double latit
             return to;
         }
 
-        public List<RedisGeoResult> GeoRadiusByMember(string key, double longitude, double latitude, double radius,
-            string unit = null, bool withCoords = false, bool withHash = false, int count = 0, bool? asc = null)
+        public List<RedisGeoResult> GeoRadiusByMember(string key, string member, double radius, string unit, 
+            bool withCoords = false, bool withDist = false, bool withHash = false, int? count = null, bool? asc = null)
         {
-            throw new NotImplementedException();
+            if (key == null)
+                throw new ArgumentNullException("key");
+
+            var args = new List<byte[]>
+            {
+                member.ToUtf8Bytes(),
+                radius.ToUtf8Bytes(),
+                Commands.GetUnit(unit),
+            };
+
+            if (withCoords)
+                args.Add(Commands.WithCoord);
+            if (withDist)
+                args.Add(Commands.WithDist);
+            if (withHash)
+                args.Add(Commands.WithHash);
+
+            if (count != null)
+            {
+                args.Add(Commands.Count);
+                args.Add(count.Value.ToUtf8Bytes());
+            }
+
+            if (asc == true)
+                args.Add(Commands.Asc);
+            else if (asc == false)
+                args.Add(Commands.Desc);
+
+            var cmdWithArgs = MergeCommandWithArgs(Commands.GeoRadiusByMember, key.ToUtf8Bytes(), args.ToArray());
+
+            var to = new List<RedisGeoResult>();
+
+            if (!(withCoords || withDist || withHash))
+            {
+                var members = SendExpectMultiData(cmdWithArgs).ToStringArray();
+                foreach (var x in members)
+                {
+                    to.Add(new RedisGeoResult { Member = x });
+                }
+            }
+            else
+            {
+                var data = SendExpectComplexResponse(cmdWithArgs);
+
+                foreach (var child in data.Children)
+                {
+                    var i = 0;
+                    var result = new RedisGeoResult { Unit = unit, Member = child.Children[i++].Data.FromUtf8Bytes() };
+
+                    if (withDist)
+                        result.Distance = double.Parse(child.Children[i++].Data.FromUtf8Bytes());
+
+                    if (withHash)
+                        result.Hash = long.Parse(child.Children[i++].Data.FromUtf8Bytes());
+
+                    if (withCoords)
+                    {
+                        result.Longitude = double.Parse(child.Children[i].Children[0].Data.FromUtf8Bytes());
+                        result.Latitude = double.Parse(child.Children[i].Children[1].Data.FromUtf8Bytes());
+                    }
+
+                    to.Add(result);
+                }
+            }
+
+            return to;
         }
 
         #endregion