Fixed pretty serious serialization bug and issues reported in #13

dotMorten · Oct 29, 2018 · 644b7b3 · 644b7b3
1 parent c32874d
commit 644b7b3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/src/Microsoft.SqlServer.Types/ShapeData.cs b/src/Microsoft.SqlServer.Types/ShapeData.cs
@@ -368,18 +368,18 @@ public void Write(BinaryWriter bw)
                 bw.Write(NumPoints); // Number of Points = 0 (no points) 
             foreach (var p in _vertices)
             {
-                bw.Write(X); //X
-                bw.Write(Y); //Y
+                bw.Write(p.X); //X
+                bw.Write(p.Y); //Y
             }
             if (_zValues != null)
-                foreach (var p in _zValues)
+                foreach (var z in _zValues)
                 {
-                    bw.Write(Z);
+                    bw.Write(z);
                 }
             if (_mValues != null)
-                foreach (var p in _mValues)
+                foreach (var m in _mValues)
                 {
-                    bw.Write(Z);
+                    bw.Write(m);
                 }
             if (!props.HasFlag(SerializationProps.IsSingleLineSegment) &&
                 !props.HasFlag(SerializationProps.IsSinglePoint))

diff --git a/src/Microsoft.SqlServer.Types/SqlGeography.cs b/src/Microsoft.SqlServer.Types/SqlGeography.cs
@@ -416,7 +416,7 @@ public static SqlGeography STGeomFromText(SqlChars geometryTaggedText, int srid)
         {
             if (geometryTaggedText.IsNull)
                 return SqlGeography.Null;
-            var data = Wkt.WktReader.Parse(geometryTaggedText.ToString());
+            var data = Wkt.WktReader.Parse(geometryTaggedText.ToString(), Wkt.WktReader.CoordinateOrder.LatLong);
             return new SqlGeography(data, srid);
         }
 
@@ -433,7 +433,7 @@ public static SqlGeography Parse(SqlString s)
         {
             if (s.IsNull)
                 return SqlGeography.Null;
-            var data = Wkt.WktReader.Parse(s.ToString());
+            var data = Wkt.WktReader.Parse(s.ToString(), Wkt.WktReader.CoordinateOrder.LatLong);
             return new SqlGeography(data, 4326);
         }
 

diff --git a/src/Microsoft.SqlServer.Types/SqlGeometry.cs b/src/Microsoft.SqlServer.Types/SqlGeometry.cs
@@ -412,7 +412,7 @@ public static SqlGeometry STGeomFromText(SqlChars geometryTaggedText, int srid)
         {
             if (geometryTaggedText.IsNull)
                 return SqlGeometry.Null;
-            var data = Wkt.WktReader.Parse(geometryTaggedText.ToString());
+            var data = Wkt.WktReader.Parse(geometryTaggedText.ToString(), Wkt.WktReader.CoordinateOrder.XY);
             return new SqlGeometry(data, srid);
         }
 
@@ -432,7 +432,7 @@ public static SqlGeometry Parse(SqlString s)
         {
             if (s.IsNull)
                 return SqlGeometry.Null;
-            var data = Wkt.WktReader.Parse(s.ToString());
+            var data = Wkt.WktReader.Parse(s.ToString(), Wkt.WktReader.CoordinateOrder.XY);
             return new SqlGeometry(data, 0);
         }
 

diff --git a/src/Microsoft.SqlServer.Types/Wkt/WktReader.cs b/src/Microsoft.SqlServer.Types/Wkt/WktReader.cs
@@ -21,6 +21,13 @@ internal class WktReader
         List<Figure> _figures;
         List<Segment> _segments;
         List<Shape> _shapes;
+        CoordinateOrder _order;
+
+        public enum CoordinateOrder
+        {
+            XY,
+            LatLong
+        }
 
         private WktReader(string str)
         {
@@ -40,9 +47,10 @@ private WktReader(string str)
             Current = wkt[0];
         }
 
-        public static ShapeData Parse(string str)
+        public static ShapeData Parse(string str, CoordinateOrder order)
         {
             WktReader reader = new WktReader(str);
+            reader._order = order;
             return reader.ReadShape();
         }
 
@@ -200,7 +208,12 @@ private void ReadCoordinateCollection()
 
         private void ReadCoordinate()
         {
-            _vertices.Add(new Point(ReadDouble(), ReadDouble()));
+            var x = ReadDouble();
+            var y = ReadDouble();
+            if(_order == CoordinateOrder.XY)
+                _vertices.Add(new Point(x, y));
+            else
+                _vertices.Add(new Point(y, x));
             hasZ = ReadOptionalDouble(out double z) || hasZ;
             _z.Add(z);
             hasM = ReadOptionalDouble(out double m) || hasM;