cleanup #2

Author: alatas

GeoJSON4EntityFramework/Elements/FeatureEF6.vb

@@ -12,17 +12,14 @@
                 f.Geometry.Add(Point.FromDbGeometry(inp))
             Case "MultPoint"
                 f.Geometry.Add(MultiPoint.FromDbGeometry(inp))
-<<<<<<< HEAD
             Case "LineString"
                 f.Geometry.Add(LineString.FromDbGeometry(inp))
             Case "MultiLineString"
                 f.Geometry.Add(MultiLineString.FromDbGeometry(inp))
-            Case Else
-                Throw New NotImplementedException
-=======
             Case "GeometryCollection"
                 f.Geometry.Add(GeometryCollection.FromDbGeometry(inp))
->>>>>>> additions_2
+            Case Else
+                Throw New NotImplementedException
         End Select
 
         Return f

GeoJSON4EntityFramework/Elements/Polygon.vb

@@ -3,46 +3,11 @@
     Implements IGeoJsonGeometry
 
     <Newtonsoft.Json.JsonIgnore()>
-<<<<<<< HEAD
-    Public Property PointsList As New List(Of CoordinateList)
-
-    Public Overrides ReadOnly Property Coordinates()
-        Get
-            Try
-                If PointsList.Count = 0 Then
-                    Return New Double() {}
-                Else
-                    Dim out(PointsList.Count - 1)()() As Double
-                    For k As Integer = 0 To PointsList.Count - 1
-                        Dim Points3 As CoordinateList = PointsList(k)
-                        If Points3.Count = 0 Then
-                            Return New Double() {}
-                        ElseIf Points3.Count = 1 Then
-                            Throw New Exception("There must be an array of two or more points")
-                        Else
-                            out(k) = New Double(Points3.Count - 1)() {}
-                            '--Warning BC4232--
-                            'Using the iteration variable In a lambda expression may have unexpected results.  
-                            'Instead, create a local variable within the Loop And assign it the value Of the iteration variable.
-                            For i As Integer = 0 To Points3.Count
-                                out(k)(i) = Points3(i).Coordinate
-                            Next
-                            '--
-                        End If
-                    Next
-                    Return out
-                End If
-            Catch ex As Exception
-                Return New Double() {}
-            End Try
-=======
     Public Property Rings As New List(Of CoordinateList)
 
     Public Overrides ReadOnly Property Coordinates()
         Get
             Return Rings
->>>>>>> additions_2
         End Get
     End Property
-
 End Class

GeoJSON4EntityFramework/Elements/PolygonEF6.vb

@@ -1,28 +1,4 @@
 Partial Class Polygon
-<<<<<<< HEAD
-    Public Overrides Sub CreateFromDbGeometry(inp As Data.Entity.Spatial.DbGeometry)
-        If inp.SpatialTypeName <> MyBase.TypeName Then Throw New ArgumentException
-        PointsList.Clear()
-
-        Ring2Coordinates(inp.ExteriorRing)
-        Dim numRings = inp.InteriorRingCount
-        If (numRings = 0) Then Return
-        For i As Integer = 1 To numRings
-            Dim ring = inp.InteriorRingAt(i)
-            Ring2Coordinates(ring)
-        Next
-
-    End Sub
-
-    Private Sub Ring2Coordinates(ring As Data.Entity.Spatial.DbGeometry)
-        Dim Points = New CoordinateList
-        For i As Integer = 1 To ring.PointCount
-            Dim point = ring.PointAt(i)
-            Points.AddNew(point.XCoordinate, point.YCoordinate)
-        Next
-        PointsList.Add(Points)
-=======
-
     Private Function RingToCoordinateList(ring As Entity.Spatial.DbGeometry) As CoordinateList
         Dim extRingCoords As New CoordinateList()
         For i = 1 To ring.PointCount
@@ -47,7 +23,6 @@
                 Rings.Add(RingToCoordinateList(intRing))
             Next
         End If
->>>>>>> additions_2
     End Sub
 
 End Class

GeoJSON4EntityFramework/GeoJSON4EntityFramework.vbproj

@@ -81,13 +81,10 @@
   <ItemGroup>
     <Compile Include="Base\GeoJsonGeometryEF6.vb" />
     <Compile Include="Elements\FeatureEF6.vb" />
-<<<<<<< HEAD
     <Compile Include="Elements\LineString.vb" />
     <Compile Include="Elements\LineStringEF6.vb" />
     <Compile Include="Elements\MultiLineStringEF6.vb" />
-=======
     <Compile Include="Elements\GeometryCollection.vb" />
->>>>>>> additions_2
     <Compile Include="Elements\MultiPointEF6.vb" />
     <Compile Include="Elements\MultiPolygonEF6.vb" />
     <Compile Include="Elements\MultiLineString.vb" />

GeoJSON4EntityFramework5/Elements/PolygonEF5.vb

@@ -10,27 +10,6 @@
 
     Public Overrides Sub CreateFromDbGeometry(inp As Data.Spatial.DbGeometry)
         If inp.SpatialTypeName <> MyBase.TypeName Then Throw New ArgumentException
-<<<<<<< HEAD
-        PointsList.Clear()
-
-        Ring2Coordinates(inp.ExteriorRing)
-        Dim numRings = inp.InteriorRingCount
-        If (numRings = 0) Then Return
-        For i As Integer = 1 To numRings
-            Dim ring = inp.InteriorRingAt(i)
-            Ring2Coordinates(ring)
-        Next
-
-    End Sub
-
-    Private Sub Ring2Coordinates(ring As Data.Spatial.DbGeometry)
-        Dim Points = New CoordinateList
-        For i As Integer = 1 To ring.PointCount
-            Dim point = ring.PointAt(i)
-            Points.AddNew(point.XCoordinate, point.YCoordinate)
-        Next
-        PointsList.Add(Points)
-=======
         Rings.Clear()
 
         ' Process exterior ring
@@ -44,7 +23,6 @@
                 Rings.Add(RingToCoordinateList(intRing))
             Next
         End If
->>>>>>> additions_2
     End Sub
 
 End Class