Merge pull request #7 from jumpinjackie/master

alatas · alatas · commit 8586e8caea01 · 2015-09-10T14:54:15.000+03:00
routed to additions_2 branch
diff --git a/GeoJSON4EntityFramework.sln b/GeoJSON4EntityFramework.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GeoJSON4EntityFramework", "GeoJSON4EntityFramework\GeoJSON4EntityFramework.vbproj", "{7B0F6694-A109-4F3F-84A0-9FA49193AF31}"
 EndProject
@@ -17,12 +17,12 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7B0F6694-A109-4F3F-84A0-9FA49193AF31}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{7B0F6694-A109-4F3F-84A0-9FA49193AF31}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{7B0F6694-A109-4F3F-84A0-9FA49193AF31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B0F6694-A109-4F3F-84A0-9FA49193AF31}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7B0F6694-A109-4F3F-84A0-9FA49193AF31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B0F6694-A109-4F3F-84A0-9FA49193AF31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AA1813C-601C-4FFF-8F7A-7070649CAF65}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{3AA1813C-601C-4FFF-8F7A-7070649CAF65}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{3AA1813C-601C-4FFF-8F7A-7070649CAF65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AA1813C-601C-4FFF-8F7A-7070649CAF65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3AA1813C-601C-4FFF-8F7A-7070649CAF65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AA1813C-601C-4FFF-8F7A-7070649CAF65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3622D159-0C66-4208-89FD-8DCD782B96F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/GeoJSON4EntityFramework/Elements/Coordinate.vb b/GeoJSON4EntityFramework/Elements/Coordinate.vb
@@ -1,4 +1,5 @@
-﻿Public Class Coordinate
+﻿<JsonConverter(GetType(CoordinateConverter))>
+Public Class Coordinate
     Sub New()
         MyBase.New()
     End Sub
@@ -14,8 +15,10 @@
         End Get
     End Property
 
+    <JsonIgnore()>
     Public Property X As Double
 
+    <JsonIgnore()>
     Public Property Y As Double
 
 End Class
diff --git a/GeoJSON4EntityFramework/Elements/FeatureCollection.vb b/GeoJSON4EntityFramework/Elements/FeatureCollection.vb
@@ -1,7 +1,6 @@
 ﻿Public Class FeatureCollection
     Inherits GeoJsonElement(Of FeatureCollection)
 
-    <JsonConverter(GetType(GenericListConverter(Of Feature)))>
     <JsonProperty(PropertyName:="features")>
     Public Property Features As New List(Of Feature)
 End Class
diff --git a/GeoJSON4EntityFramework/Elements/FeatureEF6.vb b/GeoJSON4EntityFramework/Elements/FeatureEF6.vb
@@ -12,8 +12,8 @@
                 f.Geometry.Add(Point.FromDbGeometry(inp))
             Case "MultPoint"
                 f.Geometry.Add(MultiPoint.FromDbGeometry(inp))
-            Case Else
-                Throw New NotImplementedException
+            Case "GeometryCollection"
+                f.Geometry.Add(GeometryCollection.FromDbGeometry(inp))
         End Select
 
         Return f
diff --git a/GeoJSON4EntityFramework/Elements/GeometryCollection.vb b/GeoJSON4EntityFramework/Elements/GeometryCollection.vb
@@ -0,0 +1,14 @@
+﻿Partial Public Class GeometryCollection
+    Inherits GeoJsonElement(Of GeometryCollection)
+    Implements IGeoJsonGeometry
+
+    <JsonProperty(PropertyName:="geometries")>
+    Public Property Geometries As New List(Of IGeoJsonGeometry)
+
+    Shared Function FromDbGeometry(inp As Entity.Spatial.DbGeometry) As IGeoJsonGeometry
+        Dim obj As New GeometryCollection()
+        obj.CreateFromDbGeometry(inp)
+        Return obj
+    End Function
+
+End Class
diff --git a/GeoJSON4EntityFramework/Elements/GeometryCollectionEF6.vb b/GeoJSON4EntityFramework/Elements/GeometryCollectionEF6.vb
@@ -0,0 +1,20 @@
+﻿Partial Public Class GeometryCollection
+    Public Sub CreateFromDbGeometry(inp As Entity.Spatial.DbGeometry)
+        If inp.SpatialTypeName <> "GeometryCollection" Then Throw New ArgumentException
+        Geometries.Clear()
+
+        For i As Integer = 1 To inp.ElementCount
+            Dim element = inp.ElementAt(i)
+            Select Case element.SpatialTypeName
+                Case "MultiPolygon"
+                    Geometries.Add(MultiPolygon.FromDbGeometry(element))
+                Case "Polygon"
+                    Geometries.Add(Polygon.FromDbGeometry(element))
+                Case "Point"
+                    Geometries.Add(Point.FromDbGeometry(element))
+                Case "MultiPoint"
+                    Geometries.Add(MultiPoint.FromDbGeometry(element))
+            End Select
+        Next
+    End Sub
+End Class
diff --git a/GeoJSON4EntityFramework/Elements/MultiPolygon.vb b/GeoJSON4EntityFramework/Elements/MultiPolygon.vb
@@ -7,16 +7,11 @@
 
     Public Overrides ReadOnly Property Coordinates As Object
         Get
-            If Polygons.Count = 0 Then
-                Return New Double() {}
-            Else
-                Dim out(Polygons.Count - 1)()()() As Double
-
-                Parallel.For(0, Polygons.Count, Sub(i)
-                                                    out(i) = Polygons(i).Coordinates
-                                                End Sub)
-                Return out
-            End If
+            Dim result As New List(Of Object)()
+            For Each poly In Polygons
+                result.Add(poly.Coordinates)
+            Next
+            Return result
         End Get
     End Property
 End Class
diff --git a/GeoJSON4EntityFramework/Elements/Polygon.vb b/GeoJSON4EntityFramework/Elements/Polygon.vb
@@ -3,26 +3,11 @@
     Implements IGeoJsonGeometry
 
     <Newtonsoft.Json.JsonIgnore()>
-    Public Property Points As New CoordinateList
+    Public Property Rings As New List(Of CoordinateList)
 
     Public Overrides ReadOnly Property Coordinates()
         Get
-            Try
-                If Points.Count = 0 Then
-                    Return New Double() {}
-                ElseIf Points.Count = 1 Then
-                    Throw New Exception("There must be an array of two or more points")
-                Else
-                    Dim out(0)()() As Double
-                    out(0) = New Double(Points.Count - 1)() {}
-                    Parallel.For(0, Points.Count, Sub(i)
-                                                      out(0)(i) = Points(i).Coordinate
-                                                  End Sub)
-                    Return out
-                End If
-            Catch ex As Exception
-                Return New Double() {}
-            End Try
+            Return Rings
         End Get
     End Property
 End Class
diff --git a/GeoJSON4EntityFramework/Elements/PolygonEF6.vb b/GeoJSON4EntityFramework/Elements/PolygonEF6.vb
@@ -1,11 +1,28 @@
 ﻿Partial Class Polygon
+
+    Private Function RingToCoordinateList(ring As Entity.Spatial.DbGeometry) As CoordinateList
+        Dim extRingCoords As New CoordinateList()
+        For i = 1 To ring.PointCount
+            Dim pt = ring.PointAt(i)
+            extRingCoords.Add(New Coordinate(pt.XCoordinate, pt.YCoordinate))
+        Next
+        Return extRingCoords
+    End Function
+
     Public Overrides Sub CreateFromDbGeometry(inp As Entity.Spatial.DbGeometry)
         If inp.SpatialTypeName <> MyBase.TypeName Then Throw New ArgumentException
-        Points.Clear()
+        Rings.Clear()
 
-        For i As Integer = 1 To inp.PointCount
-            Dim point = inp.PointAt(i)
-            Points.AddNew(point.XCoordinate, point.YCoordinate)
-        Next
+        ' Process exterior ring
+        Dim extRing = inp.ExteriorRing
+        Rings.Add(RingToCoordinateList(extRing))
+
+        ' Process interior rings (ie. holes)
+        If inp.InteriorRingCount > 0 Then
+            For i = 1 To inp.InteriorRingCount
+                Dim intRing = inp.InteriorRingAt(i)
+                Rings.Add(RingToCoordinateList(intRing))
+            Next
+        End If
     End Sub
 End Class
diff --git a/GeoJSON4EntityFramework/GeoJSON4EntityFramework.vbproj b/GeoJSON4EntityFramework/GeoJSON4EntityFramework.vbproj
@@ -79,10 +79,12 @@
   <ItemGroup>
     <Compile Include="Base\GeoJsonGeometryEF6.vb" />
     <Compile Include="Elements\FeatureEF6.vb" />
+    <Compile Include="Elements\GeometryCollection.vb" />
     <Compile Include="Elements\MultiPointEF6.vb" />
     <Compile Include="Elements\MultiPolygonEF6.vb" />
     <Compile Include="Elements\PointEF6.vb" />
     <Compile Include="Elements\PolygonEF6.vb" />
+    <Compile Include="JsonNET\CoordinateConverter.vb" />
     <Compile Include="JsonNET\GeoJsonSerializer.vb" />
     <Compile Include="Elements\Coordinate.vb" />
     <Compile Include="Elements\CoordinateList.vb" />
@@ -123,6 +125,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <Compile Include="Elements\GeometryCollectionEF6.vb" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
diff --git a/GeoJSON4EntityFramework/JsonNET/CoordinateConverter.vb b/GeoJSON4EntityFramework/JsonNET/CoordinateConverter.vb
@@ -0,0 +1,30 @@
+﻿Imports Newtonsoft.Json.Linq
+
+Public Class CoordinateConverter
+    Inherits JsonConverter
+
+    Public Overrides Function CanConvert(objectType As Type) As Boolean
+        Return objectType = GetType(Coordinate)
+    End Function
+
+    Public Overrides Sub WriteJson(writer As JsonWriter, value As Object, serializer As JsonSerializer)
+        Dim array As New JArray()
+        Dim coord = TryCast(value, Coordinate)
+        If Not coord Is Nothing Then
+            array.Add(coord.X)
+            array.Add(coord.Y)
+            array.WriteTo(writer)
+        End If
+    End Sub
+
+    Public Overrides Function ReadJson(reader As JsonReader, objectType As Type, existingValue As Object, serializer As JsonSerializer) As Object
+        Dim coord As New Coordinate()
+        Dim array = JArray.Load(reader)
+        If (array.Count = 2) Then
+            coord.X = array(0).ToObject(Of Double)()
+            coord.Y = array(1).ToObject(Of Double)()
+        End If
+        Return coord
+    End Function
+
+End Class
diff --git a/GeoJSON4EntityFramework5/Elements/PolygonEF5.vb b/GeoJSON4EntityFramework5/Elements/PolygonEF5.vb
@@ -1,11 +1,27 @@
 ﻿Partial Class Polygon
+    Private Function RingToCoordinateList(ring As Data.Spatial.DbGeometry) As CoordinateList
+        Dim extRingCoords As New CoordinateList()
+        For i = 1 To ring.PointCount
+            Dim pt = ring.PointAt(i)
+            extRingCoords.Add(New Coordinate(pt.XCoordinate, pt.YCoordinate))
+        Next
+        Return extRingCoords
+    End Function
+
     Public Overrides Sub CreateFromDbGeometry(inp As Data.Spatial.DbGeometry)
         If inp.SpatialTypeName <> MyBase.TypeName Then Throw New ArgumentException
-        Points.Clear()
+        Rings.Clear()
 
-        For i As Integer = 1 To inp.PointCount
-            Dim point = inp.PointAt(i)
-            Points.AddNew(point.XCoordinate, point.YCoordinate)
-        Next
+        ' Process exterior ring
+        Dim extRing = inp.ExteriorRing
+        Rings.Add(RingToCoordinateList(extRing))
+
+        ' Process interior rings (ie. holes)
+        If inp.InteriorRingCount > 0 Then
+            For i = 1 To inp.InteriorRingCount
+                Dim intRing = inp.InteriorRingAt(i)
+                Rings.Add(RingToCoordinateList(intRing))
+            Next
+        End If
     End Sub
 End Class
diff --git a/GeoJSON4EntityFramework5/GeoJSON4EntityFramework5.vbproj b/GeoJSON4EntityFramework5/GeoJSON4EntityFramework5.vbproj
@@ -102,6 +102,9 @@
     <Compile Include="..\GeoJSON4EntityFramework\Elements\Polygon.vb">
       <Link>Elements\Polygon.vb</Link>
     </Compile>
+    <Compile Include="..\GeoJSON4EntityFramework\JsonNET\CoordinateConverter.vb">
+      <Link>JsonNET\CoordinateConverter.vb</Link>
+    </Compile>
     <Compile Include="..\GeoJSON4EntityFramework\JsonNET\GenericListConverter.vb">
       <Link>JsonNET\GenericListConverter.vb</Link>
     </Compile>
diff --git a/TestProject/Tests.vb b/TestProject/Tests.vb
