Merge pull request #19 from blackboxlogic/develop

Develop

Author: blackboxlogic

FunctionalTests/Tests.cs

@@ -14,10 +14,10 @@ public static class Tests
 	{
 		private static Bounds WashingtonDC = new Bounds()
 		{
-			MinLongitude = -77.0371918f,
-			MinLatitude = 38.9067186f,
-			MaxLongitude = -77.03599990f,
-			MaxLatitude = 38.907734f,
+			MinLongitude = -77.0671918f,
+			MinLatitude = 38.9007186f,
+			MaxLongitude = -77.00099990f,
+			MaxLatitude = 38.98734f,
 		};
 
 		private static Bounds TraceArea = new Bounds()
@@ -65,22 +65,25 @@ public static async Task TestClient(INonAuthClient client)
 			var wayComplete = await client.GetCompleteWay(wayId);
 			var relation = await client.GetRelation(relationId);
 			var relationComplete = await client.GetCompleteRelation(relationId);
-			var nodeVersion = await client.GetNodeVersion(nodeId, 3);
+			var nodeVersion = await client.GetNodeVersion(nodeId, 1);
 			NotNull(node, way, wayComplete, relation, relationComplete, nodeVersion);
 			var nodeHistory = await client.GetNodeHistory(nodeId);
 			var multifetchNodes = await client.GetNodes(new Dictionary<long, long?>() { { nodeId, null }, { nodeId + 1, 1 } });
 			var nodeRelations = await client.GetNodeRelations(nodeId);
 			var nodeWays = await client.GetNodeWays(nodeId);
 			var multifetchElements = await client.GetElements(
 				map.Nodes.Select(n => new OsmGeoKey(n)).Concat(map.Ways.Select(n => new OsmGeoKey(n))).ToArray());
-			True(nodeHistory?.Any(), multifetchNodes?.Any(), nodeRelations?.Any(), nodeWays?.Any(), multifetchElements?.Any());
+			True(nodeHistory?.Any(), multifetchNodes?.Any());
+			NotNull(nodeRelations, nodeWays, multifetchElements);
 			var changeset = await client.GetChangeset(node.ChangeSetId.Value);
 			var changesetWithDiscussion = await client.GetChangeset(node.ChangeSetId.Value, true);
 			NotNull(changeset, changesetWithDiscussion?.Discussion);
 			var changesets = await client.QueryChangesets(WashingtonDC, null, null, null, null, false, false, null);
 			True(changesets?.Any());
 			changesets = await client.QueryChangesets(null, node.UserId, null, null, null, false, false, null);
 			True(changesets?.Any());
+			changesets = await client.QueryChangesets(null, node.UserId, null, DateTime.MinValue, null, false, false, null);
+			True(changesets?.Any());
 			changesets = await client.QueryChangesets(null, null, node.UserName, null, null, false, false, null);
 			True(changesets?.Any());
 			changesets = await client.QueryChangesets(null, null, null, null, null, false, false, new long[] { 151176, 151177 });

src/INonAuthClient.cs

@@ -49,6 +49,6 @@ public interface INonAuthClient
         Task<Note[]> GetNotes(Bounds bounds, int limit = 100, int maxClosedDays = 7);
         Task<Stream> GetNotesRssFeed(Bounds bounds);
         Task<Note[]> QueryNotes(string searchText, long? userId, string userName, int? limit, int? maxClosedDays, DateTime? fromDate, DateTime? toDate);
-        Task<Note> CreateNote(float latitude, float longitude, string text);
+        Task<Note> CreateNote(double latitude, double longitude, string text);
     }
 }

src/NonAuthClient.cs

@@ -14,6 +14,7 @@
 using System.Web;
 using Microsoft.Extensions.Logging;
 using OsmSharp.Db;
+using System.Globalization;
 
 namespace OsmSharp.IO.API
 {
@@ -489,8 +490,8 @@ public async Task<Changeset[]> QueryChangesets(Bounds bounds, long? userId, stri
             if (bounds != null) query["bbox"] = ToString(bounds);
             if (userId.HasValue) query["user"] = userId.ToString();
             if (userName != null) query["display_name"] = userName;
-            if (minClosedDate.HasValue) query["time"] = minClosedDate.ToString();
-            if (maxOpenedDate.HasValue) query.Add("time", maxOpenedDate.ToString());
+            if (minClosedDate.HasValue) query["time"] = FormatNoteDate(minClosedDate.Value);
+            if (maxOpenedDate.HasValue) query.Add("time", FormatNoteDate(maxOpenedDate.Value));
             if (openOnly) query["open"] = "true";
             if (closedOnly) query["closed"] = "true";
             if (ids != null) query["changesets"] = string.Join(",", ids);
@@ -644,7 +645,7 @@ private static string FormatNoteDate(DateTime date)
         /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Create_a_new_note:_Create:_POST_.2Fapi.2F0.6.2Fnotes">
         /// POST /api/0.6/notes</see>.
         /// </summary>
-        public async Task<Note> CreateNote(float latitude, float longitude, string text)
+        public async Task<Note> CreateNote(double latitude, double longitude, string text)
         {
             var query = HttpUtility.ParseQueryString(string.Empty);
             query["text"] = text;
@@ -685,6 +686,11 @@ protected string ToString(float number)
             return number.ToString(OsmMaxPrecision);
         }
 
+        protected string ToString(double number)
+        {
+            return number.ToString(OsmMaxPrecision);
+        }
+
         #region Http
         protected static readonly Func<string, string> Encode = HttpUtility.UrlEncode;
 

src/OsmApiClient.csproj

@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>OsmApiClient</PackageId>
-    <Version>0.0.3</Version>
+    <Version>0.0.4</Version>
     <RepositoryUrl>https://github.com/OsmSharp/osm-api-client/</RepositoryUrl>
-    <PackageReleaseNotes>Adding GetElements(OsmGeoKey[] keys) which can fetch multiple element types in one call.</PackageReleaseNotes>
+    <PackageReleaseNotes>Fixed a bug in QueryChangesets() when supplying a time range</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/OsmSharp/osm-api-client/</PackageProjectUrl>
-    <Description>This is a simple C# client to allow using OSM API easily.</Description>
+    <Description>This is a simple C# client to allow using OSM API.</Description>
     <PackageTags>osm;openstreetmap;client</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>Copyright 2019 Alex Hennings &amp; Harel Mazor</Copyright>