-fixed multipoint problem (spelling mistake)

alatas · alatas · commit 6c3fcfa3a63d · 2015-09-12T16:36:43.000+03:00
-rewrote whole test procedure including all types of spatial data -fixed incorrect serialization of Polygon and MultiPolygon instances and added support for geometrycollection (thanx to Jackie Ng) -added support for linestring, multilinestring, polygon inner rings and boundingbox (thanks to Tito Luyo Murata) -fixed #3
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.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GeoJSON4EntityFramework", "GeoJSON4EntityFramework\GeoJSON4EntityFramework.vbproj", "{7B0F6694-A109-4F3F-84A0-9FA49193AF31}"
 EndProject
diff --git a/GeoJSON4EntityFramework/Base/IGeometry.vb b/GeoJSON4EntityFramework/Base/IGeometry.vb
@@ -1,3 +1,4 @@
-﻿Public Interface IGeoJsonGeometry
+﻿
+Public Interface IGeoJsonGeometry
 
 End Interface
diff --git a/GeoJSON4EntityFramework/Elements/FeatureEF6.vb b/GeoJSON4EntityFramework/Elements/FeatureEF6.vb
@@ -10,7 +10,7 @@
                 f.Geometry.Add(Polygon.FromDbGeometry(inp))
             Case "Point"
                 f.Geometry.Add(Point.FromDbGeometry(inp))
-            Case "MultPoint"
+            Case "MultiPoint"
                 f.Geometry.Add(MultiPoint.FromDbGeometry(inp))
             Case "LineString"
                 f.Geometry.Add(LineString.FromDbGeometry(inp))
diff --git a/GeoJSON4EntityFramework/Elements/GeometryCollection.vb b/GeoJSON4EntityFramework/Elements/GeometryCollection.vb
@@ -1,14 +1,10 @@
 ﻿Partial Public Class GeometryCollection
-    Inherits GeoJsonElement(Of GeometryCollection)
+    Inherits GeoJsonGeometry(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
-
+    <JsonIgnore>
+    Public Overrides ReadOnly Property Coordinates()
 End Class
diff --git a/GeoJSON4EntityFramework/Elements/GeometryCollectionEF6.vb b/GeoJSON4EntityFramework/Elements/GeometryCollectionEF6.vb
@@ -1,5 +1,5 @@
 ﻿Partial Public Class GeometryCollection
-    Public Sub CreateFromDbGeometry(inp As Entity.Spatial.DbGeometry)
+    Public Overrides Sub CreateFromDbGeometry(inp As Entity.Spatial.DbGeometry)
         If inp.SpatialTypeName <> "GeometryCollection" Then Throw New ArgumentException
         Geometries.Clear()
 
@@ -14,6 +14,8 @@
                     Geometries.Add(Point.FromDbGeometry(element))
                 Case "MultiPoint"
                     Geometries.Add(MultiPoint.FromDbGeometry(element))
+                Case Else
+                    Throw New NotImplementedException
             End Select
         Next
     End Sub
diff --git a/GeoJSON4EntityFramework/Elements/MultiLineString.vb b/GeoJSON4EntityFramework/Elements/MultiLineString.vb
@@ -7,8 +7,7 @@
 
     Public Overrides ReadOnly Property Coordinates As Object
         Get
-            'TODO: Complete
-            Throw New NotImplementedException
+            Return (From ls In LineStrings Let c = ls.Coordinates Select c).ToArray
         End Get
     End Property
 End Class
diff --git a/GeoJSON4EntityFramework/GeoJSON4EntityFramework.vbproj b/GeoJSON4EntityFramework/GeoJSON4EntityFramework.vbproj
@@ -143,9 +143,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="geojson.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/GeoJSON4EntityFramework5/Elements/FeatureEF5.vb b/GeoJSON4EntityFramework5/Elements/FeatureEF5.vb
@@ -10,12 +10,14 @@
                 f.Geometry.Add(Polygon.FromDbGeometry(inp))
             Case "Point"
                 f.Geometry.Add(Point.FromDbGeometry(inp))
-            Case "MultPoint"
+            Case "MultiPoint"
                 f.Geometry.Add(MultiPoint.FromDbGeometry(inp))
             Case "LineString"
                 f.Geometry.Add(LineString.FromDbGeometry(inp))
             Case "MultiLineString"
                 f.Geometry.Add(MultiLineString.FromDbGeometry(inp))
+            Case "GeometryCollection"
+                f.Geometry.Add(GeometryCollection.FromDbGeometry(inp))
             Case Else
                 Throw New NotImplementedException
         End Select
diff --git a/GeoJSON4EntityFramework5/Elements/GeometryCollectionEF5.vb b/GeoJSON4EntityFramework5/Elements/GeometryCollectionEF5.vb
@@ -0,0 +1,22 @@
+﻿Partial Public Class GeometryCollection
+    Public Overrides Sub CreateFromDbGeometry(inp As 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))
+                Case Else
+                    Throw New NotImplementedException
+            End Select
+        Next
+    End Sub
+End Class
diff --git a/GeoJSON4EntityFramework5/GeoJSON4EntityFramework5.vbproj b/GeoJSON4EntityFramework5/GeoJSON4EntityFramework5.vbproj
@@ -90,6 +90,9 @@
     <Compile Include="..\GeoJSON4EntityFramework\Elements\FeatureCollection.vb">
       <Link>Elements\FeatureCollection.vb</Link>
     </Compile>
+    <Compile Include="..\GeoJSON4EntityFramework\Elements\GeometryCollection.vb">
+      <Link>Elements\GeometryCollection.vb</Link>
+    </Compile>
     <Compile Include="..\GeoJSON4EntityFramework\Elements\LineString.vb">
       <Link>Elements\LineString.vb</Link>
     </Compile>
@@ -122,6 +125,7 @@
     </Compile>
     <Compile Include="Base\GeoJsonGeometryEF5.vb" />
     <Compile Include="Elements\FeatureEF5.vb" />
+    <Compile Include="Elements\GeometryCollectionEF5.vb" />
     <Compile Include="Elements\LineStringEF5.vb" />
     <Compile Include="Elements\MultiLineStringEF5.vb" />
     <Compile Include="Elements\MultiPointEF5.vb" />
diff --git a/TestProject/TestFeature.vb b/TestProject/TestFeature.vb
@@ -0,0 +1,31 @@
+﻿Public Class TestFeature
+    Sub New(_name As String, _geometry As String)
+        MyBase.New()
+
+        Name = _name
+        Geometry = _geometry
+
+        Dim ElementTypeName As String = Text.RegularExpressions.Regex.Match(Geometry, "^([A-Z]*)\s").Value
+        If Not ElementTypeName = "" Then
+            ElementType = [Enum].Parse(GetType(ElementTypeEnum), ElementTypeName)
+        Else
+            ElementType = ElementTypeEnum.UNKNOWN
+        End If
+    End Sub
+
+    Property ID As String = Guid.NewGuid.ToString.ToLower
+    Property Name As String
+    Property Geometry As String
+    Property ElementType As ElementTypeEnum
+
+    Public Enum ElementTypeEnum
+        UNKNOWN
+        POINT
+        MULTIPOINT
+        LINESTRING
+        MULTILINESTRING
+        POLYGON
+        MULTIPOLYGON
+        GEOMETRYCOLLECTION
+    End Enum
+End Class
diff --git a/TestProject/TestProject.vbproj b/TestProject/TestProject.vbproj
@@ -65,11 +65,15 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data" />
+    <Reference Include="System.Data">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data.DataSetExtensions">
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -96,6 +100,7 @@
     <Import Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="TestFeature.vb" />
     <Compile Include="Tests.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
@@ -112,6 +117,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="Tests_Shared.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\Resources.resx">
diff --git a/TestProject/Tests.vb b/TestProject/Tests.vb
diff --git a/TestProject/Tests_Shared.vb b/TestProject/Tests_Shared.vb
diff --git a/TestProjectEF5/TestProjectEF5.vbproj b/TestProjectEF5/TestProjectEF5.vbproj
diff --git a/TestProjectEF5/Tests.vb b/TestProjectEF5/Tests.vb
diff --git a/geojson.png b/geojson.png
