Add common GEO commands + tests

Author: mythz

lib/ServiceStack.Interfaces.dll

@@ -146,6 +146,19 @@ public static List<string> ToStringList(this byte[][] multiDataList)
             return results;
         }
 
+        public static string[] ToStringArray(this byte[][] multiDataList)
+        {
+            if (multiDataList == null)
+                return new string[0];
+
+            var to = new string[multiDataList.Length];
+            for (int i = 0; i < multiDataList.Length; i++)
+            {
+                to[i] = multiDataList[i].FromUtf8Bytes();
+            }
+            return to;
+        }
+
         public static Dictionary<string, string> ToStringDictionary(this byte[][] multiDataList)
         {
             if (multiDataList == null)

src/ServiceStack.Redis/RedisExtensions.cs

@@ -2213,19 +2213,32 @@ public long GeoAdd(string key, double longitude, double latitude, string member)
             return SendExpectLong(Commands.GeoAdd, key.ToUtf8Bytes(), longitude.ToUtf8Bytes(), latitude.ToUtf8Bytes(), member.ToUtf8Bytes());
         }
 
-        public long GeoAdd(string key, RedisGeo[] geoPoints)
+        public long GeoAdd(string key, params RedisGeo[] geoPoints)
         {
-            throw new NotImplementedException();
+            var members = new byte[geoPoints.Length * 3][];
+            for (var i = 0; i < geoPoints.Length; i++)
+            {
+                var geoPoint = geoPoints[i];
+                members[i * 3 + 0] = geoPoint.Longitude.ToUtf8Bytes();
+                members[i * 3 + 1] = geoPoint.Latitude.ToUtf8Bytes();
+                members[i * 3 + 2] = geoPoint.Member.ToUtf8Bytes();
+            }
+
+            var cmdWithArgs = MergeCommandWithArgs(Commands.GeoAdd, key.ToUtf8Bytes(), members);
+            return SendExpectLong(cmdWithArgs);
         }
 
         public double GeoDist(string key, string fromMember, string toMember, string unit = null)
         {
-            throw new NotImplementedException();
+            return unit == null
+                ? SendExpectDouble(Commands.GeoDist, key.ToUtf8Bytes(), fromMember.ToUtf8Bytes(), toMember.ToUtf8Bytes())
+                : SendExpectDouble(Commands.GeoDist, key.ToUtf8Bytes(), fromMember.ToUtf8Bytes(), toMember.ToUtf8Bytes(), unit.ToUtf8Bytes());
         }
 
-        public byte[][] GeoHash(string key, params string[] members)
+        public string[] GeoHash(string key, params string[] members)
         {
-            throw new NotImplementedException();
+            var cmdWithArgs = MergeCommandWithArgs(Commands.GeoHash, key.ToUtf8Bytes(), members.Map(x => x.ToUtf8Bytes()).ToArray());
+            return SendExpectMultiData(cmdWithArgs).ToStringArray();
         }
 
         public List<RedisGeo> GeoPos(string key, params string[] members)

src/ServiceStack.Redis/RedisNativeClient.cs

@@ -5,7 +5,7 @@ namespace ServiceStack.Redis.Tests
     [TestFixture]
     public class RedisGeoTests
     {
-        private RedisNativeClient redis;
+        private readonly RedisNativeClient redis;
 
         public RedisGeoTests()
         {
@@ -21,6 +21,7 @@ public void TestFixtureTearDown()
         [Test]
         public void Can_GeoAdd_and_GeoPos()
         {
+            redis.FlushDb();
             redis.GeoAdd("Sicily", 13.361389, 38.115556, "Palermo");
             var results = redis.GeoPos("Sicily", "Palermo");
 
@@ -29,5 +30,49 @@ public void Can_GeoAdd_and_GeoPos()
             Assert.That(results[0].Latitude, Is.EqualTo(38.115556).Within(.1));
             Assert.That(results[0].Member, Is.EqualTo("Palermo"));
         }
+
+        [Test]
+        public void Can_GeoAdd_and_GeoPos_multiple()
+        {
+            redis.FlushDb();
+            redis.GeoAdd("Sicily", 
+                new RedisGeo(13.361389, 38.115556, "Palermo"),
+                new RedisGeo(15.087269, 37.502669, "Catania"));
+
+            var results = redis.GeoPos("Sicily", "Palermo", "Catania");
+
+            Assert.That(results.Count, Is.EqualTo(2));
+            Assert.That(results[0].Longitude, Is.EqualTo(13.361389).Within(.1));
+            Assert.That(results[0].Latitude, Is.EqualTo(38.115556).Within(.1));
+            Assert.That(results[0].Member, Is.EqualTo("Palermo"));
+
+            Assert.That(results[1].Longitude, Is.EqualTo(15.087269).Within(.1));
+            Assert.That(results[1].Latitude, Is.EqualTo(37.502669).Within(.1));
+            Assert.That(results[1].Member, Is.EqualTo("Catania"));
+        }
+
+        [Test]
+        public void Can_GeoDist()
+        {
+            redis.FlushDb();
+            redis.GeoAdd("Sicily",
+                new RedisGeo(13.361389, 38.115556, "Palermo"),
+                new RedisGeo(15.087269, 37.502669, "Catania"));
+
+            var distance = redis.GeoDist("Sicily", "Palermo", "Catania");
+            Assert.That(distance, Is.EqualTo(166274.15156960039).Within(.1));
+        }
+
+        [Test]
+        public void Can_GeoHash()
+        {
+            redis.GeoAdd("Sicily",
+                new RedisGeo(13.361389, 38.115556, "Palermo"),
+                new RedisGeo(15.087269, 37.502669, "Catania"));
+
+            var hashes = redis.GeoHash("Sicily", "Palermo", "Catania");
+            Assert.That(hashes[0], Is.EqualTo("sqc8b49rny0"));
+            Assert.That(hashes[1], Is.EqualTo("sqdtr74hyu0"));
+        }
     }
 }