Merge branch 'release/1.7.8'

Terradue · Aug 5, 2016 · 7bc398b · 7bc398b
2 parents 15883b3 + 737ffc3
commit 7bc398b
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,50 @@
+# Change Log
+
+## [Unreleased](https://github.com/Terradue/DotNetGeoJson/tree/HEAD)
+
+[Full Changelog](https://github.com/Terradue/DotNetGeoJson/compare/1.4.2...HEAD)
+
+**Closed issues:**
+
+- Multipolygon is not creating correct geojson object [\#11](https://github.com/Terradue/DotNetGeoJson/issues/11)
+- OutOfRangeException calling wktToFeature [\#9](https://github.com/Terradue/DotNetGeoJson/issues/9)
+
+**Merged pull requests:**
+
+- more types support for serialization/deserialization in georss helpers [\#12](https://github.com/Terradue/DotNetGeoJson/pull/12) ([emmanuelmathot](https://github.com/emmanuelmathot))
+- used nettopolgysuite to check innerpolygon when splitting [\#10](https://github.com/Terradue/DotNetGeoJson/pull/10) ([emmanuelmathot](https://github.com/emmanuelmathot))
+- Fixed strings concatenations [\#7](https://github.com/Terradue/DotNetGeoJson/pull/7) ([emmanuelmathot](https://github.com/emmanuelmathot))
+
+## [1.4.2](https://github.com/Terradue/DotNetGeoJson/tree/1.4.2) (2014-11-26)
+[Full Changelog](https://github.com/Terradue/DotNetGeoJson/compare/v1.4.0...1.4.2)
+
+## [v1.4.0](https://github.com/Terradue/DotNetGeoJson/tree/v1.4.0) (2014-10-08)
+[Full Changelog](https://github.com/Terradue/DotNetGeoJson/compare/1.4.0-beta...v1.4.0)
+
+## [1.4.0-beta](https://github.com/Terradue/DotNetGeoJson/tree/1.4.0-beta) (2014-09-11)
+[Full Changelog](https://github.com/Terradue/DotNetGeoJson/compare/v1.3.5...1.4.0-beta)
+
+## [v1.3.5](https://github.com/Terradue/DotNetGeoJson/tree/v1.3.5) (2014-07-22)
+[Full Changelog](https://github.com/Terradue/DotNetGeoJson/compare/v1.3.4...v1.3.5)
+
+## [v1.3.4](https://github.com/Terradue/DotNetGeoJson/tree/v1.3.4) (2014-07-22)
+[Full Changelog](https://github.com/Terradue/DotNetGeoJson/compare/v1.3.3...v1.3.4)
+
+## [v1.3.3](https://github.com/Terradue/DotNetGeoJson/tree/v1.3.3) (2014-07-22)
+[Full Changelog](https://github.com/Terradue/DotNetGeoJson/compare/v1.3.2...v1.3.3)
+
+**Merged pull requests:**
+
+- Update GeometryFactory.cs [\#2](https://github.com/Terradue/DotNetGeoJson/pull/2) ([Siliconrob](https://github.com/Siliconrob))
+
+## [v1.3.2](https://github.com/Terradue/DotNetGeoJson/tree/v1.3.2) (2014-07-04)
+[Full Changelog](https://github.com/Terradue/DotNetGeoJson/compare/v1.3.1...v1.3.2)
+
+**Merged pull requests:**
+
+- update README.md [\#1](https://github.com/Terradue/DotNetGeoJson/pull/1) ([fabricebrito](https://github.com/fabricebrito))
+
+## [v1.3.1](https://github.com/Terradue/DotNetGeoJson/tree/v1.3.1) (2014-04-14)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/Terradue.GeoJson.Tests/GeoRSSTest.cs b/Terradue.GeoJson.Tests/GeoRSSTest.cs
@@ -308,10 +308,18 @@ public void GeoRssFromFile2()
 
             var xr = XmlReader.Create(new FileStream("../Samples/noa-ers-georss.xml", FileMode.Open, FileAccess.Read));
 
-            var geom = GeoRssHelper.Deserialize(xr).ToGeometry();
+            MultiPolygon geom = GeoRssHelper.Deserialize(xr).ToGeometry() as MultiPolygon;
 
             Assert.IsNotNull(geom);
 
+            xr = XmlReader.Create(new FileStream("../Samples/noa-ers-georss.xml", FileMode.Open, FileAccess.Read));
+
+            MultiPolygon geom2 = GeoRssHelper.Deserialize(xr).ToGeometry() as MultiPolygon;
+
+            geom.Polygons.Add(geom2.Polygons[0]);
+
+            geom.ToGeoRss();
+
         }
 
 		[Test()]

diff --git a/Terradue.GeoJson.Tests/Terradue.GeoJson.Tests.csproj b/Terradue.GeoJson.Tests/Terradue.GeoJson.Tests.csproj
@@ -44,7 +44,7 @@
       <HintPath>..\packages\Terradue.ServiceModel.Syndication.1.0.0.0\lib\net40\Terradue.ServiceModel.Syndication.dll</HintPath>
     </Reference>
     <Reference Include="Terradue.ServiceModel.Ogc">
-      <HintPath>..\packages\Terradue.ServiceModel.Ogc.1.1.4\lib\net40\Terradue.ServiceModel.Ogc.dll</HintPath>
+      <HintPath>..\packages\Terradue.ServiceModel.Ogc.1.1.5\lib\net40\Terradue.ServiceModel.Ogc.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Terradue.GeoJson.Tests/packages.config b/Terradue.GeoJson.Tests/packages.config
@@ -3,6 +3,6 @@
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
   <package id="NuGet4Mono.Extensions" version="0.3.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
-  <package id="Terradue.ServiceModel.Ogc" version="1.1.4" targetFramework="net40" />
+  <package id="Terradue.ServiceModel.Ogc" version="1.1.5" targetFramework="net40" />
   <package id="Terradue.ServiceModel.Syndication" version="1.0.0.0" targetFramework="net40" />
 </packages>
diff --git a/Terradue.GeoJson/Properties/AssemblyInfo.cs b/Terradue.GeoJson/Properties/AssemblyInfo.cs
@@ -21,7 +21,7 @@
 @{
     Terradue .NET GeoJson Library. Initially developed to provide an easy way to manage Geometry objects with serialization and deserialization functions and transformation functions from/to GeoJson, it also supports GML, georss and Well Known Text (WKT)
 
-    \xrefitem sw_version "Versions" "Software Package Version" 1.7.7
+    \xrefitem sw_version "Versions" "Software Package Version" 1.7.8
 
     \xrefitem sw_link "Links" "Software Package List" [DotNetGeoJson](https://github.com/Terradue/DotNetGeoJson)
 
@@ -50,6 +50,6 @@
 [assembly: AssemblyProjectUrl("https://github.com/Terradue/DotNetGeoJson")]
 [assembly: AssemblyLicenseUrl("https://github.com/Terradue/DotNetGeoJson/blob/master/LICENSE")]
 [assembly: AssemblyCopyright("Terradue")]
-[assembly: AssemblyVersion("1.7.7.*")]
-[assembly: AssemblyInformationalVersion("1.7.7")]
+[assembly: AssemblyVersion("1.7.8.*")]
+[assembly: AssemblyInformationalVersion("1.7.8")]
 
diff --git a/Terradue.GeoJson/Terradue.GeoJson.csproj b/Terradue.GeoJson/Terradue.GeoJson.csproj
@@ -77,7 +77,7 @@
       <HintPath>..\packages\NuGet4Mono.Extensions.0.3.0\lib\net40\NuGet4Mono.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Terradue.ServiceModel.Ogc">
-      <HintPath>..\packages\Terradue.ServiceModel.Ogc.1.1.4\lib\net40\Terradue.ServiceModel.Ogc.dll</HintPath>
+      <HintPath>..\packages\Terradue.ServiceModel.Ogc.1.1.5\lib\net40\Terradue.ServiceModel.Ogc.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/Terradue.GeoJson/Terradue/GeoJson/GeoRss/GeoRss.cs b/Terradue.GeoJson/Terradue/GeoJson/GeoRss/GeoRss.cs
@@ -51,7 +51,9 @@ public partial class GeoRssWhere : abstractFeaturePropertyType, IGeoRSS {
         [System.Xml.Serialization.XmlElementAttribute("LineString", typeof(LineStringType), Namespace = "http://www.opengis.net/gml")]
         [System.Xml.Serialization.XmlElementAttribute("Point", typeof(PointType), Namespace = "http://www.opengis.net/gml")]
         [System.Xml.Serialization.XmlElementAttribute("Polygon", typeof(PolygonType), Namespace = "http://www.opengis.net/gml")]
-        [System.Xml.Serialization.XmlAnyElement()]
+        [System.Xml.Serialization.XmlElementAttribute("MultiSurface", typeof(MultiSurfaceType), Namespace = "http://www.opengis.net/gml")]
+        [System.Xml.Serialization.XmlElementAttribute("MultiCurve", typeof(MultiCurveType), Namespace = "http://www.opengis.net/gml")]
+        [System.Xml.Serialization.XmlElementAttribute("MultiPolygon", typeof(MultiPolygonType), Namespace = "http://www.opengis.net/gml")]
         public object[] Item {
             get {
                 return this.itemField;

diff --git a/Terradue.GeoJson/Terradue/GeoJson/GeoRss/GeoRssExtensions.cs b/Terradue.GeoJson/Terradue/GeoJson/GeoRss/GeoRssExtensions.cs
@@ -89,12 +89,18 @@ public static GeometryObject ToGeometry(this Terradue.GeoJson.GeoRss.GeoRssWhere
                 return ((PolygonType)where.Item[0]).ToGeometry();
             }
 
-            if (where.Item != null && where.Item.Count() > 0 && where.Item[0] is XmlElement) {
-                System.IO.StringReader reader = new System.IO.StringReader(((XmlElement)where.Item[0]).OuterXml);
+            if (where.Item != null && where.Item.Count() > 0 && where.Item[0] is MultiCurveType) {
+                return ((MultiCurveType)where.Item[0]).ToGeometry();
+            }
+
+            if (where.Item != null && where.Item.Count() > 0 && where.Item[0] is MultiPolygonType)
+            {
+                return ((MultiCurveType)where.Item[0]).ToGeometry();
+            }
 
-                XmlReader xReader = XmlReader.Create(reader);
-                AbstractGeometryType agt = (AbstractGeometryType)ServiceModel.Ogc.Gml311.GmlHelper.Deserialize(xReader);
-                return agt.ToGeometry();
+            if (where.Item != null && where.Item.Count() > 0 && where.Item[0] is MultiSurfaceType)
+            {
+                return ((MultiSurfaceType)where.Item[0]).ToGeometry();
             }
 
             return null;

diff --git a/Terradue.GeoJson/Terradue/GeoJson/Gml/Gml311Extensions.cs b/Terradue.GeoJson/Terradue/GeoJson/Gml/Gml311Extensions.cs
@@ -265,6 +265,26 @@ public static GeometryObject ToGeometry(this AbstractGeometryType gmlObject) {
                 return ((MultiSurfaceType)gmlObject).ToGeometry();
             }
 
+            if (gmlObject is PolygonType)
+            {
+                return ((PolygonType)gmlObject).ToGeometry();
+            }
+
+            if (gmlObject is PointType)
+            {
+                return ((PointType)gmlObject).ToGeometry();
+            }
+
+            if (gmlObject is LineStringType)
+            {
+                return ((LineStringType)gmlObject).ToGeometry();
+            }
+
+            if (gmlObject is LinearRingType)
+            {
+                return ((LinearRingType)gmlObject).ToGeometry();
+            }
+
             throw new NotImplementedException();
 
         }

diff --git a/Terradue.GeoJson/packages.config b/Terradue.GeoJson/packages.config
@@ -5,5 +5,5 @@
   <package id="NetTopologySuite.IO" version="1.13.3.2" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
   <package id="NuGet4Mono.Extensions" version="0.3.0" targetFramework="net40" />
-  <package id="Terradue.ServiceModel.Ogc" version="1.1.4" targetFramework="net40" />
+  <package id="Terradue.ServiceModel.Ogc" version="1.1.5" targetFramework="net40" />
 </packages>