Models renaming

chubrik · May 5, 2019 · f122a46 · f122a46
1 parent 1b8ec7f
commit f122a46
Show file tree

Hide file tree

Showing 28 changed files with 105 additions and 105 deletions.
diff --git a/OsmDataKit.Tests/OsmDataKit.Tests.csproj b/OsmDataKit.Tests/OsmDataKit.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/OsmDataKit.Tests/Tests.cs b/OsmDataKit.Tests/Tests.cs
@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OsmDataKit.Services;
 using OsmSharp;
 
 namespace OsmDataKit.Tests
@@ -29,11 +28,11 @@ public void LoadRelationObject()
 
             // https://www.openstreetmap.org/relation/2969204
             var title = "Vega Island";
-            var osmId = 2969204;
+            var relationId = 2969204;
 
-            var relation = OsmObjectService.LoadRelationObject(SrcPath, cacheName: title, relationId: osmId);
+            var relation = OsmObjectService.LoadRelationObject(SrcPath, cacheName: title, relationId: relationId);
             Assert.IsTrue(relation.Type == OsmGeoType.Relation);
-            Assert.IsTrue(relation.Id == osmId);
+            Assert.IsTrue(relation.Id == relationId);
             Assert.IsTrue(relation.Title == title);
             Assert.IsTrue(relation.Tags["type"] == "multipolygon");
             Assert.IsTrue(relation.Tags["place"] == "island");

diff --git a/OsmDataKit/Extensions/GeoCoordsCollectionExtensions.cs b/OsmDataKit/Extensions/GeoCoordsCollectionExtensions.cs
@@ -1,8 +1,7 @@
-using OsmDataKit.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
-namespace OsmDataKit.Extensions
+namespace OsmDataKit
 {
     public static class GeoCoordsCollectionExtensions
     {

diff --git a/OsmDataKit/Extensions/NodeExtensions.cs → ...Kit/Internal/Extensions/NodeExtensions.cs b/OsmDataKit/Extensions/NodeExtensions.cs → ...Kit/Internal/Extensions/NodeExtensions.cs
@@ -1,10 +1,9 @@
-using OsmDataKit.Models;
-using OsmSharp;
+using OsmSharp;
 using System;
 using System.Diagnostics;
 using System.Linq;
 
-namespace OsmDataKit.Extensions
+namespace OsmDataKit.Internal
 {
     internal static class NodeExtensions
     {

diff --git a/...taKit/Extensions/OsmResponseExtensions.cs → ...ernal/Extensions/OsmResponseExtensions.cs b/...taKit/Extensions/OsmResponseExtensions.cs → ...ernal/Extensions/OsmResponseExtensions.cs
@@ -1,7 +1,6 @@
-using OsmDataKit.Models;
-using System.Linq;
+using System.Linq;
 
-namespace OsmDataKit.Extensions
+namespace OsmDataKit.Internal
 {
     internal static class OsmResponseExtensions
     {

diff --git a/OsmDataKit/Extensions/RelationExtensions.cs → ...Internal/Extensions/RelationExtensions.cs b/OsmDataKit/Extensions/RelationExtensions.cs → ...Internal/Extensions/RelationExtensions.cs
@@ -1,10 +1,9 @@
-using OsmDataKit.Models;
-using OsmSharp;
+using OsmSharp;
 using System;
 using System.Diagnostics;
 using System.Linq;
 
-namespace OsmDataKit.Extensions
+namespace OsmDataKit.Internal
 {
     internal static class RelationExtensions
     {

diff --git a/...it/Extensions/RelationMemberExtensions.cs → ...al/Extensions/RelationMemberExtensions.cs b/...it/Extensions/RelationMemberExtensions.cs → ...al/Extensions/RelationMemberExtensions.cs
@@ -1,7 +1,6 @@
-using OsmDataKit.Models;
-using OsmSharp;
+using OsmSharp;
 
-namespace OsmDataKit.Extensions
+namespace OsmDataKit.Internal
 {
     internal static class RelationMemberExtensions
     {

diff --git a/OsmDataKit/Extensions/WayExtensions.cs → ...aKit/Internal/Extensions/WayExtensions.cs b/OsmDataKit/Extensions/WayExtensions.cs → ...aKit/Internal/Extensions/WayExtensions.cs
@@ -1,10 +1,9 @@
-using OsmDataKit.Models;
-using OsmSharp;
+using OsmSharp;
 using System;
 using System.Diagnostics;
 using System.Linq;
 
-namespace OsmDataKit.Extensions
+namespace OsmDataKit.Internal
 {
     internal static class WayExtensions
     {

diff --git a/OsmDataKit/Models/Data/NodeData.cs → OsmDataKit/Internal/NodeData.cs b/OsmDataKit/Models/Data/NodeData.cs → OsmDataKit/Internal/NodeData.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit.Internal
 {
     [JsonObject]
     internal class NodeData : OsmGeoData

diff --git a/OsmDataKit/Models/Data/OsmGeoData.cs → OsmDataKit/Internal/OsmGeoData.cs b/OsmDataKit/Models/Data/OsmGeoData.cs → OsmDataKit/Internal/OsmGeoData.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit.Internal
 {
     [JsonObject]
     internal abstract class OsmGeoData

diff --git a/OsmDataKit/Models/Data/OsmResponseData.cs → OsmDataKit/Internal/OsmResponseData.cs b/OsmDataKit/Models/Data/OsmResponseData.cs → OsmDataKit/Internal/OsmResponseData.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit.Internal
 {
     [JsonObject]
     internal class OsmResponseData

diff --git a/OsmDataKit/Models/Data/RelationData.cs → OsmDataKit/Internal/RelationData.cs b/OsmDataKit/Models/Data/RelationData.cs → OsmDataKit/Internal/RelationData.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit.Internal
 {
     [JsonObject]
     internal class RelationData : OsmGeoData

diff --git a/OsmDataKit/Models/Data/RelationMemberData.cs → OsmDataKit/Internal/RelationMemberData.cs b/OsmDataKit/Models/Data/RelationMemberData.cs → OsmDataKit/Internal/RelationMemberData.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using OsmSharp;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit.Internal
 {
     [JsonObject]
     internal class RelationMemberData

diff --git a/OsmDataKit/Models/Data/WayData.cs → OsmDataKit/Internal/WayData.cs b/OsmDataKit/Models/Data/WayData.cs → OsmDataKit/Internal/WayData.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit.Internal
 {
     [JsonObject]
     internal class WayData : OsmGeoData

diff --git a/OsmDataKit/Models/GeoCoords.cs b/OsmDataKit/Models/GeoCoords.cs
@@ -1,4 +1,4 @@
-namespace OsmDataKit.Models
+namespace OsmDataKit
 {
     public class GeoCoords : IGeoCoords
     {

diff --git a/OsmDataKit/Models/Objects/OsmObject.cs → OsmDataKit/Models/GeoObject.cs b/OsmDataKit/Models/Objects/OsmObject.cs → OsmDataKit/Models/GeoObject.cs
@@ -1,15 +1,16 @@
 using Kit;
+using OsmDataKit.Internal;
 using OsmSharp;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit
 {
 #if DEBUG
     [DebuggerDisplay("{" + nameof(DebugInfo) + ",nq}")]
 #endif
-    public abstract class OsmObject
+    public abstract class GeoObject
     {
         public long Id { get; }
         public IReadOnlyDictionary<string, string> Tags { get; }
@@ -55,7 +56,7 @@ public string Title
         #endregion
 
         // protected
-        internal OsmObject(OsmGeoData data)
+        internal GeoObject(OsmGeoData data)
         {
             Debug.Assert(data != null);
 
@@ -66,7 +67,7 @@ internal OsmObject(OsmGeoData data)
             Tags = data.Tags;
         }
 
-        protected OsmObject(
+        protected GeoObject(
             long id,
             IReadOnlyDictionary<string, string> tags,
             IReadOnlyDictionary<string, string> data)

diff --git a/OsmDataKit/Models/IGeoCoords.cs b/OsmDataKit/Models/IGeoCoords.cs
@@ -1,4 +1,4 @@
-namespace OsmDataKit.Models
+namespace OsmDataKit
 {
     public interface IGeoCoords
     {

diff --git a/OsmDataKit/Models/Objects/OsmNode.cs → OsmDataKit/Models/NodeObject.cs b/OsmDataKit/Models/Objects/OsmNode.cs → OsmDataKit/Models/NodeObject.cs
@@ -1,11 +1,12 @@
-using OsmSharp;
+using OsmDataKit.Internal;
+using OsmSharp;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit
 {
-    public class OsmNode : OsmObject, IGeoCoords
+    public class NodeObject : GeoObject, IGeoCoords
     {
         public double Latitude { get; }
         public double Longitude { get; }
@@ -14,7 +15,7 @@ public class OsmNode : OsmObject, IGeoCoords
         public override bool IsBroken => false;
         public override IGeoCoords AverageCoords => this;
 
-        internal OsmNode(NodeData data) : base(data)
+        internal NodeObject(NodeData data) : base(data)
         {
             Debug.Assert(data?.Coords?.Length == 2);
 
@@ -25,7 +26,7 @@ internal OsmNode(NodeData data) : base(data)
             Longitude = data.Coords[1];
         }
 
-        public OsmNode(
+        public NodeObject(
             long id, IReadOnlyDictionary<string, string> tags,
             IGeoCoords coords,
             IReadOnlyDictionary<string, string> data = null)

diff --git a/OsmDataKit/Models/Objects/OsmObjectResponse.cs b/OsmDataKit/Models/Objects/OsmObjectResponse.cs
diff --git a/OsmDataKit/Models/OsmObjectResponse.cs b/OsmDataKit/Models/OsmObjectResponse.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace OsmDataKit
+{
+    public class OsmObjectResponse
+    {
+        public IReadOnlyList<NodeObject> Nodes { get; set; }
+        public IReadOnlyList<WayObject> Ways { get; set; }
+        public IReadOnlyList<RelationObject> Relations { get; set; }
+        public IReadOnlyList<WayObject> BrokenWays { get; set; }
+        public IReadOnlyList<RelationObject> BrokenRelations { get; set; }
+        public IReadOnlyDictionary<long, NodeObject> AllNodesDict { get; set; }
+        public IReadOnlyDictionary<long, WayObject> AllWaysDict { get; set; }
+        public IReadOnlyDictionary<long, RelationObject> AllRelationsDict { get; set; }
+    }
+}
diff --git a/OsmDataKit/Models/OsmRequest.cs b/OsmDataKit/Models/OsmRequest.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit
 {
     public class OsmRequest
     {

diff --git a/OsmDataKit/Models/OsmResponse.cs b/OsmDataKit/Models/OsmResponse.cs
@@ -1,11 +1,12 @@
-using OsmSharp;
+using OsmDataKit.Internal;
+using OsmSharp;
 using OsmSharp.Tags;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit
 {
     public class OsmResponse
     {

diff --git a/OsmDataKit/Models/Objects/OsmMember.cs → OsmDataKit/Models/RelationMemberObject.cs b/OsmDataKit/Models/Objects/OsmMember.cs → OsmDataKit/Models/RelationMemberObject.cs
@@ -1,18 +1,19 @@
 using Kit;
+using OsmDataKit.Internal;
 using System;
 using System.Diagnostics;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit
 {
 #if DEBUG
     [DebuggerDisplay("{" + nameof(DebugInfo) + ",nq}")]
 #endif
-    public class OsmMember
+    public class RelationMemberObject
     {
         public string Role { get; }
-        public OsmObject Geo { get; }
+        public GeoObject Geo { get; }
 
-        internal OsmMember(RelationMemberData data, OsmObject geo)
+        internal RelationMemberObject(RelationMemberData data, GeoObject geo)
         {
             Debug.Assert(data != null);
 
@@ -28,7 +29,7 @@ internal OsmMember(RelationMemberData data, OsmObject geo)
             Geo = geo;
         }
 
-        public OsmMember(string role, OsmObject geo)
+        public RelationMemberObject(string role, GeoObject geo)
         {
             Debug.Assert(!role.IsNullOrEmpty());
             Debug.Assert(geo != null);

diff --git a/OsmDataKit/Models/Objects/OsmRelation.cs → OsmDataKit/Models/RelationObject.cs b/OsmDataKit/Models/Objects/OsmRelation.cs → OsmDataKit/Models/RelationObject.cs
@@ -1,31 +1,31 @@
-using OsmDataKit.Extensions;
+using OsmDataKit.Internal;
 using OsmSharp;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
-namespace OsmDataKit.Models
+namespace OsmDataKit
 {
-    public class OsmRelation : OsmObject
+    public class RelationObject : GeoObject
     {
-        public IReadOnlyList<OsmMember> Members { get; internal set; }
+        public IReadOnlyList<RelationMemberObject> Members { get; internal set; }
 
         #region Extensions
 
-        public IEnumerable<OsmNode> Nodes =>
+        public IEnumerable<NodeObject> Nodes =>
             Members.Where(i => i.Geo.Type == OsmGeoType.Node)
-                   .Select(i => (OsmNode)i.Geo);
+                   .Select(i => (NodeObject)i.Geo);
 
-        public IEnumerable<OsmWay> Ways =>
+        public IEnumerable<WayObject> Ways =>
             Members.Where(i => i.Geo.Type == OsmGeoType.Way)
-                   .Select(i => (OsmWay)i.Geo);
+                   .Select(i => (WayObject)i.Geo);
 
-        public IEnumerable<OsmRelation> Relations =>
+        public IEnumerable<RelationObject> Relations =>
             Members.Where(i => i.Geo.Type == OsmGeoType.Relation)
-                   .Select(i => (OsmRelation)i.Geo);
+                   .Select(i => (RelationObject)i.Geo);
 
-        public IEnumerable<OsmNode> AllNodes =>
+        public IEnumerable<NodeObject> AllNodes =>
             Nodes.Concat(Ways.SelectMany(i => i.Nodes))
                  .Concat(Relations.SelectMany(i => i.AllNodes));
 
@@ -47,20 +47,20 @@ public class OsmRelation : OsmObject
 
         #endregion
 
-        public void SetMembers(IReadOnlyList<OsmMember> members)
+        public void SetMembers(IReadOnlyList<RelationMemberObject> members)
         {
             Debug.Assert(members != null);
             Members = members ?? throw new ArgumentNullException(nameof(members));
             _isBroken = null;
             _averageCoords = null;
         }
 
-        internal OsmRelation(RelationData data) : base(data) { }
+        internal RelationObject(RelationData data) : base(data) { }
 
-        public OsmRelation(
+        public RelationObject(
             long id,
             IReadOnlyDictionary<string, string> tags,
-            IReadOnlyList<OsmMember> members,
+            IReadOnlyList<RelationMemberObject> members,
             IReadOnlyDictionary<string, string> data = null)
             : base(id, tags, data)
         {