Revert "Generate GEOMETRY (POINT) columns"

This reverts commit 4441b26.

Author: roji

src/EFCore.PG.NTS/Storage/Internal/NpgsqlNetTopologySuiteTypeMappingSourcePlugin.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
 using GeoAPI.Geometries;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -13,18 +11,6 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal
 {
     public class NpgsqlNetTopologySuiteTypeMappingSourcePlugin : IRelationalTypeMappingSourcePlugin
     {
-        static readonly Dictionary<string, Type> _storeTypeMappings = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase)
-        {
-            { "GEOMETRY", typeof(IGeometry) },
-            { "GEOMETRYCOLLECTION", typeof(IGeometryCollection) },
-            { "LINESTRING", typeof(ILineString) },
-            { "MULTILINESTRING", typeof(IMultiLineString) },
-            { "MULTIPOINT", typeof(IMultiPoint) },
-            { "MULTIPOLYGON", typeof(IMultiPolygon) },
-            { "POINT", typeof(IPoint) },
-            { "POLYGON", typeof(IPolygon) }
-        };
-
         // Note: we reference the options rather than copying IsGeographyDefault out, because that field is initialized
         // rather late by SingletonOptionsInitializer
         readonly INpgsqlNetTopologySuiteOptions _options;
@@ -35,96 +21,17 @@ public NpgsqlNetTopologySuiteTypeMappingSourcePlugin([NotNull] INpgsqlNetTopolog
         public virtual RelationalTypeMapping FindMapping(in RelationalTypeMappingInfo mappingInfo)
         {
             var clrType = mappingInfo.ClrType;
-            var storeType = mappingInfo.StoreTypeName;
+            var storeTypeName = mappingInfo.StoreTypeName;
 
             // TODO: Array
-            // TODO: SRID (https://github.com/aspnet/EntityFrameworkCore/issues/14000)
-
-            if (clrType != null)
-            {
-                if (typeof(IGeometry).IsAssignableFrom(clrType) &&
-                    (storeType != null || TryGetStoreType(clrType, _options.IsGeographyDefault, null, out storeType)))
-                {
-                    return (RelationalTypeMapping)Activator.CreateInstance(
-                        typeof(NpgsqlGeometryTypeMapping<>).MakeGenericType(clrType),
-                        storeType);
-                }
-            }
-            else if (storeType != null)
-            {
-                var x = ParseGeometryStoreType(storeType);
-                if (!x.HasValue)
-                    return null;
-
-                if (!_storeTypeMappings.TryGetValue(x.Value.SpatialType ?? "geometry", out clrType))
-                    return null;
-
-                return (RelationalTypeMapping)Activator.CreateInstance(
-                    typeof(NpgsqlGeometryTypeMapping<>).MakeGenericType(clrType),
-                    storeType);
-            }
-
-            return null;
-        }
-
-        static readonly Regex _storeTypeRegex = new Regex(@"^(GEOMETRY|GEOGRAPHY)\s*(\(\s*(\w+)(\s*,\s*(\d+))?\s*\))?$", RegexOptions.IgnoreCase);
-
-        /// <summary>
-        /// Given a PostgreSQL store type, attempts to parse it down to its components.
-        /// </summary>
-        /// <param name="storeType">A PostgreSQL store type string representation (e.g. GEOMETRY (POINT,4269))</param>
-        /// <returns>The different components of the store type, or null if <paramref name="storeType"/> isn't a spatial type.</returns>
-        public static (bool IsGeography, string SpatialType, int? Srid)? ParseGeometryStoreType(string storeType)
-        {
-            var m = _storeTypeRegex.Match(storeType);
-            if (!m.Success)
-                return null;
-
-            return (
-                string.Equals(m.Groups[1].Value, "GEOGRAPHY", StringComparison.OrdinalIgnoreCase),
-                m.Groups[3].Success ? m.Groups[3].Value : null,
-                m.Groups[5].Success ? (int?)int.Parse(m.Groups[5].Value) : null);
-        }
-
-        static bool TryGetStoreType(Type clrType, bool isGeography, int? srid, out string storeType)
-        {
-            var sb = new StringBuilder(isGeography ? "GEOGRAPHY" : "GEOMETRY");
-            if (typeof(ILineString).IsAssignableFrom(clrType))
-                sb.Append(" (LINESTRING");
-            else if (typeof(IMultiLineString).IsAssignableFrom(clrType))
-                sb.Append(" (MULTILINESTRING");
-            else if (typeof(IMultiPoint).IsAssignableFrom(clrType))
-                sb.Append(" (MULTIPOINT");
-            else if (typeof(IMultiPolygon).IsAssignableFrom(clrType))
-                sb.Append(" (MULTIPOLYGON");
-            else if (typeof(IPoint).IsAssignableFrom(clrType))
-                sb.Append(" (POINT");
-            else if (typeof(IPolygon).IsAssignableFrom(clrType))
-                sb.Append(" (POLYGON");
-            else if (typeof(IGeometryCollection).IsAssignableFrom(clrType))
-                sb.Append(" (GEOMETRYCOLLECTION");
-            else if (typeof(IGeometry).IsAssignableFrom(clrType))
-            {
-                if (!srid.HasValue)
-                {
-                    storeType = sb.ToString();
-                    return true;
-                }
-
-                sb.Append(" (GEOMETRY");
-            }
-            else
-            {
-                storeType = null;
-                return false;
-            }
-
-            if (srid.HasValue)
-                sb.Append(',').Append(srid.Value);
-            sb.Append(')');
-
-            storeType = sb.ToString();
-            return true;
+            return clrType != null && typeof(IGeometry).IsAssignableFrom(clrType) ||
+                   storeTypeName != null && (
+                        storeTypeName.Equals("geometry", StringComparison.OrdinalIgnoreCase) ||
+                        storeTypeName.Equals("geography", StringComparison.OrdinalIgnoreCase))
+                ? (RelationalTypeMapping)Activator.CreateInstance(
+                    typeof(NpgsqlGeometryTypeMapping<>).MakeGenericType(clrType ?? typeof(IGeometry)),
+                    storeTypeName ?? (_options.IsGeographyDefault ? "geography" : "geometry"))
+                : null;
         }
     }
 }