Skip to content

Commit 6b64150

Browse files
committed
2.2.0-rc1
-some cleanup
1 parent 3df6e0f commit 6b64150

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

GeoJSON4EntityFramework/Elements/Polygon.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Imports System.Data.Entity.Spatial
99
Public Class Polygon
1010
Inherits GeoJsonGeometry
1111

12-
<Newtonsoft.Json.JsonIgnore()>
12+
<JsonIgnore()>
1313
Public Property Rings As New List(Of CoordinateList)
1414

1515
Public Overrides ReadOnly Property Coordinates()

GeoJSON4EntityFramework/JsonNET/GeoJsonSerializer.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Public Class GeoJsonSerializer
22
Public Shared Function Serialize(inp As GeoJsonElement, Optional prettyPrint As Boolean = False) As String
3-
Dim settings As New Newtonsoft.Json.JsonSerializerSettings
3+
Dim settings As New JsonSerializerSettings
44
settings.ContractResolver = New OrderedContractResolver
55
settings.NullValueHandling = NullValueHandling.Ignore
66
settings.FloatFormatHandling = FloatFormatHandling.DefaultValue
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Public Class OrderedContractResolver
2-
Inherits Newtonsoft.Json.Serialization.DefaultContractResolver
2+
Inherits Serialization.DefaultContractResolver
33

4-
Protected Overrides Function CreateProperties(type As Type, memberSerialization As Newtonsoft.Json.MemberSerialization) As IList(Of Newtonsoft.Json.Serialization.JsonProperty)
4+
Protected Overrides Function CreateProperties(type As Type, memberSerialization As MemberSerialization) As IList(Of Serialization.JsonProperty)
55
Return (From p In MyBase.CreateProperties(type, memberSerialization) Let order As Byte = IIf(p.Order Is Nothing, 99, p.Order) Order By order, p.PropertyName Select p).ToList
66
End Function
77
End Class

GeoJSON4EntityFramework/My Project/AssemblyInfo.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
1212
<Assembly: AssemblyDescription("GeoJSON for Entity Framework 6 Spatial Data")>
1313
<Assembly: AssemblyCompany("")>
1414
<Assembly: AssemblyProduct("GeoJSON4EntityFramework")>
15-
<Assembly: AssemblyCopyright("Copyright © 2014 - 2015")>
15+
<Assembly: AssemblyCopyright("Copyright © 2014 - 2017")>
1616
<Assembly: AssemblyTrademark("Sukru Alatas")>
1717

1818
<Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2.1.0.0")>
35-
<Assembly: AssemblyFileVersion("2.1.0.0")>
34+
<Assembly: AssemblyVersion("2.2.0.0")>
35+
<Assembly: AssemblyFileVersion("2.2.0.0")>

GeoJSON4EntityFramework/Transform/TransformException.vb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Imports System.Runtime.Serialization
2-
''' <summary>
1+
''' <summary>
32
''' Thrown when there is a failure in transforming a geometry instance
43
''' </summary>
54
Public Class TransformException
@@ -10,7 +9,7 @@ Public Class TransformException
109
End Sub
1110

1211
Public Sub New(msg As String, x As Double, y As Double, tx As Double, ty As Double)
13-
MyBase.New
12+
MyBase.New(msg)
1413
ParamX = x
1514
ParamY = y
1615
ParamTX = tx

GeoJSON4EntityFramework5/My Project/AssemblyInfo.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
1212
<Assembly: AssemblyDescription("GeoJSON for Entity Framework 5 Spatial Data")>
1313
<Assembly: AssemblyCompany("")>
1414
<Assembly: AssemblyProduct("GeoJSON4EntityFramework5")>
15-
<Assembly: AssemblyCopyright("Copyright © 2014 - 2015")>
15+
<Assembly: AssemblyCopyright("Copyright © 2014 - 2017")>
1616
<Assembly: AssemblyTrademark("")>
1717

1818
<Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("2.1.0.0")>
35-
<Assembly: AssemblyFileVersion("2.1.0.0")>
34+
<Assembly: AssemblyVersion("2.2.0.0")>
35+
<Assembly: AssemblyFileVersion("2.2.0.0")>

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# GeoJSON4EntityFramework ![Logo](https://raw.githubusercontent.com/alatas/GeoJSON4EntityFramework/master/geojson.png) ![BuildStatus](https://sukru.visualstudio.com/_apis/public/build/definitions/ef35124c-d2ad-4375-9c78-8862c095207b/1/badge)
22
___
33

4-
### What is GeoJSON
4+
### What is GeoJSON?
55
[GeoJSON](http://geojson.org/) is a format for encoding a variety of geographic data structures. A GeoJSON object may represent a geometry, a feature, or a collection of features.
66

77
In 2015, the Internet Engineering Task Force (IETF), in conjunction with the original specification authors, formed a GeoJSON WG to standardize GeoJSON. [RFC 7946](https://tools.ietf.org/html/rfc7946) was published in August 2016 and is the new standard specification of the GeoJSON format, replacing the 2008 GeoJSON specification.
@@ -12,13 +12,13 @@ _Feature_ contain a geometry object and additional properties, and a _FeatureCol
1212

1313
For example, A house, a road and a bus stop represents three different _Feature_. All of them might have different type of geometries. House could be a _polygon_, road could be a _linestring_ and bus stop could be a _point_. All of them represents a neighbourhood and this called _FeatureCollection_ in GeoJSON.
1414

15-
### What is EntityFramework
15+
### What is EntityFramework?
1616
EntityFramework (EF) is an open source object-relational mapping [(ORM)](https://en.wikipedia.org/wiki/Object-relational_mapping) framework for Microsoft .net. It allows us to use database rows as class instances.
1717

18-
### What is Well-known Text (WKT)
18+
### What is Well-known Text (WKT)?
1919
[Well-known Text (WKT)](https://en.wikipedia.org/wiki/Well-known_text) is a text markup language for representing vector geometry objects on a map, spatial reference systems of spatial objects and transformations between spatial reference systems. In summary, It's a text representations of geometrical objects.
2020

21-
### So, What is GeoJSON4EntityFramework
21+
### So, What is GeoJSON4EntityFramework ??
2222
_GeoJSON for EntityFramework_ is a .net library that allows you to create GeoJSON output from EntityFramework Spatial Data or WKT inputs. In other words, It serializes different type of geometry objects to GeoJSON. It's not limited to only EF entities but It can serialize WKT inputs as well.
2323

2424
### Features
@@ -40,7 +40,7 @@ Function GetGeoJSONFromDB() As String
4040
Using db As New SpatialExampleEntities
4141
Dim data = From row In db.SampleTables Select row.SpatialData
4242

43-
Dim features = New FeatureCollection(data.ToArray)
43+
Dim features as New FeatureCollection(data.ToArray)
4444
Return features.Serialize(prettyPrint:=True)
4545
End Using
4646
End Function
@@ -73,7 +73,7 @@ Function GetGeoJSONFromWKT() As String
7373
"MULTIPOINT ((10 40), (40 30), (20 20), (30 10))",
7474
"LINESTRING (1 1, 2 2)"}
7575

76-
Dim features = New FeatureCollection(WKTs)
76+
Dim features as New FeatureCollection(WKTs)
7777
Return features.Serialize(prettyPrint:=True)
7878
End Function
7979
```

0 commit comments

Comments
 (0)