Fixing issue 115, Feature.Equals thros excpeiton when geometry is null

Author: matt-lethargic

README.md

@@ -1,14 +1,11 @@
 [![NuGet Version](http://img.shields.io/nuget/v/GeoJSON.NET.svg?style=flat)](https://www.nuget.org/packages/GeoJSON.NET/) 
 [![Build status](https://ci.appveyor.com/api/projects/status/n4q1opb6dod0hwac?svg=true)](https://ci.appveyor.com/project/matt-lethargic/geojson-net)
 
-## *** Notice ***
-A quick note... sorry to everyone who has been following or using this project over t
- last year, I started a new role a year ago and it took some time away from this project, when that calmed down I actually got locked out of my GitHub account and as it had two factor authentication on it was not an easy task getting back in. This is all sorted now and I'm going to be starting back on this project now. 
-MattLethargic, Aug '18
-
 # GeoJSON.NET
 GeoJSON.Net is a .NET library for the [RFC 7946 The GeoJSON Format](https://tools.ietf.org/html/rfc7946) and it uses and provides [Newtonsoft Json.NET](http://json.codeplex.com) converters for serialization and deserialization of GeoJSON data.
 
+## Version 2
+I'm starting to put together a plan for version 2 of GeoJSON.Net. I'm open to any suggestions or ideas, if you have any thoughts please open an issue and make it clear that it's an idea for version to and I'll tag it up as such.
 
 ## Installation & Usage
 
@@ -35,10 +32,6 @@ Point point = JsonConvert.DeserializeObject<Point>(json);
 See the [Tests](https://github.com/GeoJSON-Net/GeoJSON.Net/tree/master/src/GeoJSON.Net.Tests) for more examples.
 
 
-## News
-It's probably best to check out the [commits](https://github.com/GeoJSON-Net/GeoJSON.Net/commits/master) 
-and the [issues](https://github.com/GeoJSON-Net/GeoJSON.Net/issues) what has been added over time.
-
 ## Contributing
 Highly welcome! Just fork away and send a pull request. We try and review most pull requests within a couple of days. There is now a version 2.0.0 branch. I've created this ready for any breaking changes and any extra features and would encourage anything that isn't a bug fix to go in there.
 

src/GeoJSON.Net.Tests/Feature/FeatureTests.cs

@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using GeoJSON.Net.Feature;
 using GeoJSON.Net.Geometry;
 using Newtonsoft.Json;
 using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace GeoJSON.Net.Tests.Feature
 {
@@ -356,7 +355,65 @@ public void Feature_Equals_Itself_Issue94()
             Assert.IsTrue(equal1);
             Assert.IsTrue(equal2);
         }
-        
+
+        [Test]
+        public void Feature_Equals_Geometry_Null_Issue115()
+        {
+            bool equal1 = false;
+            bool equal2 = false;
+
+            var feature1 = new Net.Feature.Feature(null);
+            var feature2 = new Net.Feature.Feature(new Point(new Position(12, 123)));
+
+            Assert.DoesNotThrow(() =>
+            {
+                equal1 = feature1 == feature2;
+                equal2 = feature1.Equals(feature2);
+            });
+
+            Assert.IsFalse(equal1);
+            Assert.IsFalse(equal2);
+        }
+
+        [Test]
+        public void Feature_Equals_Other_Geometry_Null_Issue115()
+        {
+            bool equal1 = false;
+            bool equal2 = false;
+
+            var feature1 = new Net.Feature.Feature(new Point(new Position(12, 123)));
+            var feature2 = new Net.Feature.Feature(null);
+
+            Assert.DoesNotThrow(() =>
+            {
+                equal1 = feature1 == feature2;
+                equal2 = feature1.Equals(feature2);
+            });
+
+            Assert.IsFalse(equal1);
+            Assert.IsFalse(equal2);
+        }
+
+        [Test]
+        public void Feature_Equals_All_Geometry_Null_Issue115()
+        {
+            bool equal1 = false;
+            bool equal2 = false;
+
+            var feature1 = new Net.Feature.Feature(null);
+            var feature2 = new Net.Feature.Feature(null);
+
+            Assert.DoesNotThrow(() =>
+            {
+                equal1 = feature1 == feature2;
+                equal2 = feature1.Equals(feature2);
+            });
+
+            Assert.IsTrue(equal1);
+            Assert.IsTrue(equal2);
+        }
+
+
         private IGeometryObject GetGeometry()
         {
             var coordinates = new List<LineString>

src/GeoJSON.Net/Feature/Feature.cs

@@ -175,6 +175,21 @@ public bool Equals(Feature<TGeometry> other)
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
+            if (Geometry == null && other.Geometry == null)
+            {
+                return true;
+            }
+
+            if (Geometry == null && other.Geometry != null)
+            {
+                return false;
+            }
+
+            if (Geometry == null)
+            {
+                return false;
+            }
+
             return Geometry.Equals(other.Geometry);
         }