- Fix initialization of geography type from object string. Issue 95026 (#576)

Author: AlejandroP

dotnet/src/dotnetcore/GxClasses/Helpers/GXGeographyCore.cs

@@ -231,25 +231,21 @@ public static explicit operator String(Geospatial g)
 		public Geospatial(String value)
 		{
 			String s = value.ToString();
-			initInstanceVars();
-			this.FromString(s);
-			// serttype
-			this.setGXGeoType(NTSGeographyWrapper.STGeometryType(_innerValue).ToString());
+			InitGeo(s);
 		}
+
 		public Geospatial(Decimal latitude, Decimal longitude)
-		{
-			initInstanceVars();
+		{			
 			String wktBuffer = "POINT";
 			wktBuffer += "(" + longitude.ToString("G17", CultureInfo.InvariantCulture) + " " + latitude.ToString("G17", CultureInfo.InvariantCulture) + ")";
-			this.FromString(wktBuffer);
+			InitGeo(wktBuffer);
 		}
 
 		public Geospatial(Double latitude, Double longitude)
-		{
-			initInstanceVars();
+		{			
 			String wktBuffer = "POINT";
 			wktBuffer += "(" + ((Double)longitude).ToString("G17", CultureInfo.InvariantCulture) + " " + ((Double)latitude).ToString("G17", CultureInfo.InvariantCulture) + ")";
-			this.FromString(wktBuffer);
+			InitGeo(wktBuffer);
 		}
 
 		public Geospatial(String value, String format)
@@ -279,14 +275,20 @@ public Geospatial(object value)
 			else
 			{
 				String s = value.ToString();
-				new Geospatial(s);
+				InitGeo(s);
 			}
 		}
 
 		public Geospatial()
 		{
 			initInstanceVars();
 		}
+		void InitGeo(string s)
+		{
+			initInstanceVars();
+			this.FromString(s);
+			this.setGXGeoType(NTSGeographyWrapper.STGeometryType(_innerValue).ToString());
+		}
 
 		void initInstanceVars()
 		{

dotnet/src/dotnetframework/GxClasses/Helpers/GXUtilsGeospatial.cs

@@ -178,26 +178,24 @@ public static explicit operator String(Geospatial g)
 
         public Geospatial(String value)
 		{
-			String s = value.ToString();
-			initInstanceVars();
-			this.FromString(s);
-			this.setGXGeoType(SQLGeographyWrapper.STGeometryType(_innerValue).ToString());
+			String s = value.ToString();			
+			InitGeo(s);
 		}
+
 		public Geospatial(Decimal latitude, Decimal longitude)
-		{			
-			initInstanceVars();
+		{						
 			String wktBuffer = "POINT";
 			wktBuffer += "(" + longitude.ToString("G17", CultureInfo.InvariantCulture) + " " + latitude.ToString("G17", CultureInfo.InvariantCulture) + ")";
-			this.FromString(wktBuffer);
+			InitGeo(wktBuffer);
+			
 		}
 
 		public Geospatial(Double latitude, Double longitude)
         {           
-            initInstanceVars();
             String wktBuffer = "POINT";
             wktBuffer += "(" + ((Double)longitude).ToString("G17", CultureInfo.InvariantCulture) + " " + ((Double)latitude).ToString("G17", CultureInfo.InvariantCulture) + ")";
-            this.FromString(wktBuffer);
-        }
+			InitGeo(wktBuffer);
+		}
 
         public Geospatial(String value, String format)
         {
@@ -224,7 +222,7 @@ public Geospatial(object value)
             else
             {
                 String s = value.ToString();
-                new Geospatial(s);
+				InitGeo(s);
             }
 		}
 
@@ -233,6 +231,13 @@ public Geospatial()
             initInstanceVars();
         }
 
+		void InitGeo(string s)
+		{
+			initInstanceVars();
+			this.FromString(s);
+			this.setGXGeoType(SQLGeographyWrapper.STGeometryType(_innerValue).ToString());
+		}
+
         void initInstanceVars()
         {
 			this.PointList = new PointT[] { new PointT() };