Changes to Add proper handling of EXTENSION tag NetTopologySuite#111

Removed the AddParameter method.
Added async search methods to the database.

Author: Travis Yeik

src/ProjNet.Sqlite/DatabaseCoordinateService.cs

@@ -51,6 +51,20 @@ public CoordinateSystem GetCoordinateSystem(int srid)
             return null;
         }
 
+        /// <summary>
+        /// Returns the coordinate system by <paramref name="srid" /> identifier
+        /// </summary>
+        /// <param name="srid">The initialization for the coordinate system</param>
+        /// <returns>The coordinate system.</returns>
+        public async Task<CoordinateSystem> GetCoordinateSystemAsync(int srid)
+        {
+            var sysInfo = await _dbProvider.GetCoordinateSystemInfo(srid);
+            if (sysInfo != null)
+                return CsFactory.CreateFromWkt(sysInfo.WKT);
+
+            return null;
+        }
+
         /// <summary>
         /// Returns the coordinate system by <paramref name="authority" /> and <paramref name="code" />.
         /// </summary>
@@ -66,6 +80,16 @@ public CoordinateSystem GetCoordinateSystem(string authority, long code)
             return null;
         }
 
+        /// <summary>
+        /// Searches the table names based on an expression
+        /// </summary>
+        /// <param name="name"></param>
+        public Task<CoordinateSystemInfo[]> SearchCoordinateSystemAsync(string name)
+        {
+            return _dbProvider.SearchCoordinateSystemAsync(name);
+
+        }
+
         /// <summary>
         /// Method to get the identifier, by which this coordinate system can be accessed.
         /// </summary>

src/ProjNet.Sqlite/DatabaseProvider.cs

@@ -56,9 +56,19 @@ public async Task<CoordinateSystemInfo> GetCoordinateSystemInfo(int srid)
         }
 
         /// <summary>
-        /// Returns the number of entries in the database
+        /// Searches the table names based on an expression
         /// </summary>
-        internal async Task<int> GetCount()
+        /// <param name="name"></param>
+        public async Task<CoordinateSystemInfo[]> SearchCoordinateSystemAsync(string name)
+        {
+            await Init();
+            return await Database.Table<CoordinateSystemInfo>().Where(s => s.Name.ToLower().Contains(name)).ToArrayAsync();
+       }
+
+            /// <summary>
+            /// Returns the number of entries in the database
+            /// </summary>
+            internal async Task<int> GetCount()
         {
             await Init();
             return await Database.Table<CoordinateSystemInfo>().CountAsync();

src/ProjNet.Sqlite/ProjNet.Sqlite.csproj

@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFrameworks>net7.0;netstandard2.0</TargetFrameworks>
-		<SignAssembly>true</SignAssembly>
 		<EnableApiCompat>true</EnableApiCompat>
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
@@ -17,10 +16,6 @@
 		<PackageDescription>Provides an extension to ProjNet's ICoordinateSystemService by providing a database for coordinate systems</PackageDescription>
 		<PackageTags>OGC;SFS;Projection</PackageTags>
 	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
-	</ItemGroup>
 
 	<ItemGroup>
 		<None Remove="proj.db" />
@@ -32,6 +27,10 @@
 		</Content>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\ProjNet\ProjNET.csproj" />
 	</ItemGroup>

src/ProjNet/CoordinateSystems/CoordinateSystemFactory.cs

@@ -27,9 +27,9 @@ namespace ProjNet.CoordinateSystems
     /// </summary>
     /// <remarks>
     /// <para>CoordinateSystemFactory allows applications to make coordinate systems that 
-    /// cannot be created by a <see cref="CoordinateSystemAuthorityFactory"/>. This factory is very 
+    /// cannot be created by a <see cref="CoordinateSystemFactory"/>. This factory is very 
     /// flexible, whereas the authority factory is easier to use.</para>
-    /// <para>So <see cref="ICoordinateSystemAuthorityFactory"/>can be used to make 'standard' coordinate 
+    /// <para>So <see cref="CoordinateSystemFactory"/>can be used to make 'standard' coordinate 
     /// systems, and <see cref="CoordinateSystemFactory"/> can be used to make 'special' 
     /// coordinate systems.</para>
     /// <para>For example, the EPSG authority has codes for USA state plane coordinate systems 

src/ProjNet/CoordinateSystems/Info.cs

@@ -35,7 +35,7 @@ public abstract class Info : IInfo
 		/// were specified in the Simple Features interfaces, so they have been kept here.</para>
 		/// <para>This specification does not dictate what the contents of these items 
 		/// should be. However, the following guidelines are suggested:</para>
-		/// <para>When <see cref="ICoordinateSystemAuthorityFactory"/> is used to create an object, the ‘Authority’
+		/// <para>When <see cref="CoordinateSystemFactory"/> is used to create an object, the ‘Authority’
 		/// and 'AuthorityCode' values should be set to the authority name of the factory object, and the authority 
 		/// code supplied by the client, respectively. The other values may or may not be set. (If the authority is 
 		/// EPSG, the implementer may consider using the corresponding metadata values in the EPSG tables.)</para>

src/ProjNet/CoordinateSystems/Projection.cs

@@ -76,17 +76,6 @@ public ProjectionParameter GetParameter(int index)
 			return _parameters[index];
 		}
 
-        /// <summary>
-        /// Adds a parameter to the parameter list
-        /// </summary>
-        /// <param name="name">The name of the projection to add</param>
-        /// <param name="value">The projection value</param>
-        public void AddParameter(string name, double value)
-		{
-			var param = new ProjectionParameter(name, value);
-			_parameters.Add(param);
-		}
-
 		/// <summary>
 		/// Gets an named parameter of the projection.
 		/// </summary>

src/ProjNet/CoordinateSystems/Projections/MapProjection.cs

@@ -244,14 +244,6 @@ public ProjectionParameter GetParameter(string name)
             return _Parameters.Find(name);
         }
 
-        /// <summary>
-        /// Adds a parameter to the parameter list
-        /// </summary>
-        public void AddParameter(string name, double value)
-        {
-            _Parameters.Add(name, value);
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -1195,4 +1187,4 @@ protected static double hypot(double x, double y)
         }
         #endregion
     }
-}
+}

src/ProjNet/IO/CoordinateSystems/CoordinateSystemWktReader.cs

@@ -304,13 +304,13 @@ private static Projection ReadProjection(WktStreamTokenizer tokenizer)
             else
                 tokenizer.CheckCloser(bracket);
 
-            var paramList = new List<ProjectionParameter>();
+            var parameters = new List<ProjectionParameter>();
 
-            var projection = new Projection(projectionName, paramList, projectionName, authority, authorityCode, string.Empty, string.Empty, string.Empty);
+            var projection = new Projection(projectionName, parameters, projectionName, authority, authorityCode, string.Empty, string.Empty, string.Empty);
             return projection;
         }
 
-        private static void ReadParamater(WktStreamTokenizer tokenizer, Projection projection)
+        private static void ReadParameter(WktStreamTokenizer tokenizer, ICollection<ProjectionParameter> projections)
         {
             var bracket = tokenizer.ReadOpener();
             string paramName = tokenizer.ReadDoubleQuotedWord();
@@ -319,7 +319,7 @@ private static void ReadParamater(WktStreamTokenizer tokenizer, Projection proje
             double paramValue = tokenizer.GetNumericValue();
             tokenizer.ReadCloser(bracket);
 
-            projection.AddParameter(paramName, paramValue);
+            projections.Add(new ProjectionParameter(paramName, paramValue));
         }
 
         private static void ReadExtension(WktStreamTokenizer tokenizer)
@@ -334,12 +334,13 @@ private static void ReadExtension(WktStreamTokenizer tokenizer)
             }
             else
             {
-                System.Diagnostics.Debug.WriteLine("What are you?");
+                System.Diagnostics.Debug.WriteLine(string.Format("Unknown type of extension: {0}", paramName));
             }
 
             tokenizer.ReadCloser(bracket);
 
-            System.Diagnostics.Debug.WriteLine("Now what do we do with you?");
+            //TODO: store this extension as a variable? Do something with it?
+            System.Diagnostics.Debug.WriteLine("An extension was read but not processed.");
         }
 
 
@@ -394,15 +395,15 @@ private static ProjectedCoordinateSystem ReadProjectedCoordinateSystem(WktStream
                         geographicCS = ReadGeographicCoordinateSystem(tokenizer);
                         break;
                     case "PARAMETER":
-                        ReadParamater(tokenizer, projection);
+                        ReadParameter(tokenizer, projection.Parameters);
                         break;
                     case "PROJECTION":
                         projection = ReadProjection(tokenizer);
                         break;
                     case "UNIT":
                         unit = ReadLinearUnit(tokenizer);
                         break;
-                    case "EXTENSION": 
+                    case "EXTENSION":
                         ReadExtension(tokenizer);
                         break;
                     default:

src/ProjNet/ProjNET.csproj

@@ -8,6 +8,22 @@
 	<LangVersion>latest</LangVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+    <NoWarn>1701;1702;1591</NoWarn>
+  </PropertyGroup>
+
   <PropertyGroup Label="Assembly Info">
     <AssemblyTitle>Proj.NET</AssemblyTitle>
     <Description>Proj.NET performs point-to-point coordinate conversions between geodetic coordinate systems for use in .Net, Geographic Information Systems (GIS) or GPS applications. The spatial reference model used adheres to the Simple Features specification.</Description>
@@ -26,10 +42,6 @@ Proj.NET performs point-to-point coordinate conversions between geodetic coordin
     <PackageTags>OGC;SFS;Projection</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="IO\SqlReaderHelper.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />