Improve parsing of wkt for DotSpatialCoordinateSystemFactory

FObermaier · FObermaier · commit 1d0f0efc56a9 · 2022-04-21T11:04:01.000+02:00
* null argument check for DotSpatialCoordinateTransformationFactory
diff --git a/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystemFactory.cs b/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystemFactory.cs
@@ -98,14 +98,19 @@ public ICoordinateSystem CreateFromXml(string xml)
         public ICoordinateSystem CreateFromWkt(string wkt)
         {
             //Hack: DotSpatial.Projections does not handle Authority and AuthorityCode
-            var pos1 = 10 + wkt.LastIndexOf("AUTHORITY[", StringComparison.InvariantCulture);
-            var pos2 = wkt.IndexOf("]", pos1, StringComparison.InvariantCulture) - 1;
-            var parts = wkt.Substring(pos1, pos2 - pos1 + 1).Split(',');
-
-            var auth = parts[0].Replace("\"", "").Trim();
-            var code =  int.Parse(parts[1].Replace("\"", ""), NumberStyles.Integer,
-                NumberFormatInfo.InvariantInfo);
+            var pos1 = wkt.LastIndexOf("AUTHORITY[", StringComparison.InvariantCulture);
+            string auth = "EPSG";
+            int code = 0;
+            // If there is an Authority entry in the WKT, try to parse the values
+            if (pos1 >= 0)
+            {
+                pos1 += 10;
+                var pos2 = wkt.IndexOf("]", pos1, StringComparison.InvariantCulture) - 1;
+                var parts = wkt.Substring(pos1, pos2 - pos1 + 1).Split(',');
 
+                auth = parts[0].Replace("\"", "").Trim();
+                int.TryParse(parts[1].Replace("\"", ""), NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out code);
+            }
             ProjectionInfo pi = null;
             try
             {
@@ -270,4 +275,4 @@ public IVerticalDatum CreateVerticalDatum(string name, DatumType datumType)
             throw new NotSupportedException();
         }
     }
-}
+}
diff --git a/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformationFactory.cs b/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformationFactory.cs
@@ -27,6 +27,9 @@ public class DotSpatialCoordinateTransformationFactory : ICoordinateTransformati
         /// </remarks>
         public ICoordinateTransformation CreateFromCoordinateSystems(ICoordinateSystem sourceCS, ICoordinateSystem targetCS)
         {
+            if (sourceCS == null || targetCS == null)
+                return null;
+
             var source = sourceCS as DotSpatialCoordinateSystem ??
                          new DotSpatialCoordinateSystem(ProjectionInfo.FromEsriString(sourceCS.WKT));
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@ public class DotSpatialCoordinateTransformationFactory : ICoordinateTransformati`
`27`	`27`	`/// </remarks>`
`28`	`28`	`public ICoordinateTransformation CreateFromCoordinateSystems(ICoordinateSystem sourceCS, ICoordinateSystem targetCS)`
`29`	`29`	`{`
	`30`	`+ if (sourceCS == null \|\| targetCS == null)`
	`31`	`+ return null;`
	`32`	`+`
`30`	`33`	`var source = sourceCS as DotSpatialCoordinateSystem ??`
`31`	`34`	`new DotSpatialCoordinateSystem(ProjectionInfo.FromEsriString(sourceCS.WKT));`
`32`	`35`