Add new RedisGeo Types

mythz · mythz · commit be9907795539 · 2016-05-06T23:47:04.000-04:00
diff --git a/src/ServiceStack.Interfaces/Redis/RedisGeo.cs b/src/ServiceStack.Interfaces/Redis/RedisGeo.cs
@@ -3,68 +3,20 @@
 
 namespace ServiceStack.Redis
 {
-    public struct RedisGeo
+    public class RedisGeo
     {
-        public double Longitude;
-        public double Latitude;
-        public string Member;
-
-        public RedisGeo(double longitude, double latitude, string member)
-        {
-            Longitude = longitude;
-            Latitude = latitude;
-            Member = member;
-        }
-
-        public RedisGeo(string geoString) : this()
-        {
-            if (string.IsNullOrEmpty(geoString))
-                throw new ArgumentNullException("geoString");
-
-            var pos1 = geoString.IndexOf(' ');
-            if (pos1 == -1)
-                throw new ArgumentException("Invalid geoString: " + geoString);
-            Longitude = double.Parse(geoString.Substring(0, pos1));
-
-            var pos2 = geoString.IndexOf(' ', pos1 + 1);
-            if (pos2 == -1)
-                throw new ArgumentException("Invalid geoString: " + geoString);
-            Latitude = double.Parse(geoString.Substring(pos1, pos2 - pos1));
-
-            Member = geoString.Substring(pos2 + 1);
-        }
-
-        public override string ToString()
-        {
-            return Longitude.ToString(CultureInfo.InvariantCulture) 
-                + " " 
-                + Latitude.ToString(CultureInfo.InvariantCulture)
-                + " "
-                + Member;
-        }
-
-        public bool Equals(RedisGeo other)
-        {
-            return Longitude.Equals(other.Longitude) 
-                && Latitude.Equals(other.Latitude) 
-                && string.Equals(Member, other.Member);
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            return obj is RedisGeo && Equals((RedisGeo) obj);
-        }
+        public double Longitude { get; set; }
+        public double Latitude { get; set; }
+        public string Member { get; set; }
+    }
 
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = Longitude.GetHashCode();
-                hashCode = (hashCode*397) ^ Latitude.GetHashCode();
-                hashCode = (hashCode*397) ^ (Member != null ? Member.GetHashCode() : 0);
-                return hashCode;
-            }
-        }
+    public class RedisGeoResult
+    {
+        public string Member { get; set; }
+        public double? Longitude { get; set; }
+        public double? Latitude { get; set; }
+        public string Hash { get; set; }
+        public string Unit { get; set; }
+        public double? Distance { get; set; }
     }
 }
diff --git a/tests/ServiceStack.Common.Tests/RedisTypeTests.cs b/tests/ServiceStack.Common.Tests/RedisTypeTests.cs
@@ -6,13 +6,5 @@ namespace ServiceStack.Common.Tests
     [TestFixture]
     public class RedisTypeTests
     {
-        [Test]
-        public void Can_parse_RedisGeo()
-        {
-            var palermo = new RedisGeo(13.361389, 38.115556, "Palermo");
-            var geoString = palermo.ToString();
-            Assert.That(geoString, Is.EqualTo("13.361389 38.115556 Palermo"));
-            Assert.That(new RedisGeo(geoString), Is.EqualTo(palermo));
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,5 @@ namespace ServiceStack.Common.Tests`
`6`	`6`	`[TestFixture]`
`7`	`7`	`public class RedisTypeTests`
`8`	`8`	`{`
`9`		`- [Test]`
`10`		`- public void Can_parse_RedisGeo()`
`11`		`- {`
`12`		`- var palermo = new RedisGeo(13.361389, 38.115556, "Palermo");`
`13`		`- var geoString = palermo.ToString();`
`14`		`- Assert.That(geoString, Is.EqualTo("13.361389 38.115556 Palermo"));`
`15`		`- Assert.That(new RedisGeo(geoString), Is.EqualTo(palermo));`
`16`		`- }`
`17`	`9`	`}`
`18`	`10`	`}`