Namespaces reorg

README.md

@@ -71,11 +71,14 @@ else
 Static Maps API support allows you to get a valid url or a streamed bitmap which you can use:
 
 ```c#
+using Google.Maps;
+using Google.Maps.Common;
+
 //always need to use YOUR_API_KEY for requests.  Do this in App_Start.
 GoogleSigned.AssignAllServices(new GoogleSigned("YOUR_API_KEY"));
 var map = new StaticMapRequest();
 map.Center = new Location("1600 Pennsylvania Ave NW, Washington, DC 20500");
-map.Size = new System.Drawing.Size(400, 400);
+map.Size = new GSize(400, 400);
 map.Zoom = 14;
 ```
 
@@ -150,6 +153,7 @@ Questions, comments and/or suggestions are welcome! Please raise an [issue](http
 ## Contributors
 A big thank you to all of our [contributors](https://github.com/ericnewton76/gmaps-api-net/graphs/contributors) including:
 
+- [Luis Farzati](https://github.com/luisfarzati)
 - [Eric Newton](https://github.com/ericnewton76)
 - [Sheepzez](https://github.com/Sheepzez)
 - [Mieliespoor](https://github.com/mieliespoor)

src/ConsoleApp1/Program.cs

@@ -6,6 +6,7 @@
 
 using Google.Maps;
 using Google.Maps.Geocoding;
+using Google.Maps.Common;
 
 namespace ConsoleApp1
 {

src/Google.Maps.Test/Direction/DirectionRequestTests.cs

@@ -3,6 +3,7 @@
 using System.Collections.Specialized;
 
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps.Test/Direction/DirectionServiceTests.cs

@@ -21,7 +21,8 @@
 
 using NUnit.Framework;
 
-using Google.Maps.Shared;
+using Google.Maps.Common;
+using Google.Maps.Internal;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps.Test/DistanceMatrix/DistanceMatrixServiceTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps.DistanceMatrix
 {

src/Google.Maps.Test/Elevation/ElevationServiceTests.cs

@@ -18,6 +18,7 @@
 using System;
 
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps.Elevation
 {

src/Google.Maps.Test/Geocoding/GeocodingServiceTests.cs

@@ -21,7 +21,8 @@
 
 using NUnit.Framework;
 
-using Google.Maps.Shared;
+using Google.Maps.Common;
+using Google.Maps.Internal;
 
 namespace Google.Maps.Geocoding
 {

src/Google.Maps.Test/GoogleMapsForBusinessTests.cs

@@ -3,6 +3,7 @@
 using NUnit.Framework;
 
 using Google.Maps.Geocoding;
+using Google.Maps.Common;
 
 namespace Google.Maps
 {

src/Google.Maps.Test/LatLngComparerTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 
 using NUnit.Framework;
+using Google.Maps.Internal;
 
 namespace Google.Maps
 {

src/Google.Maps.Test/MapColorTests.cs

@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps
 {
@@ -8,9 +9,9 @@ public class MapColorTests
 		[Test]
 		public void IsUndefined_Works()
 		{
-			var undefined = new MapColor();
-			var definedName = MapColor.FromName("red");
-			var definedRGB = MapColor.FromArgb(255,255,255);
+			var undefined = new GColor();
+			var definedName = GColor.FromName("red");
+			var definedRGB = GColor.FromArgb(255,255,255);
 
 			Assert.AreEqual(true, undefined.IsUndefined);
 			Assert.AreEqual(false, definedName.IsUndefined);
@@ -20,9 +21,9 @@ public void IsUndefined_Works()
 		[Test]
 		public void To24BitColor_Works()
 		{
-			var namedColor = MapColor.FromName("red");
-			var rgbColor = MapColor.FromArgb(255, 0, 0);
-			var rgbaColor = MapColor.FromArgb(255, 255, 0, 0);
+			var namedColor = GColor.FromName("red");
+			var rgbColor = GColor.FromArgb(255, 0, 0);
+			var rgbaColor = GColor.FromArgb(255, 255, 0, 0);
 
 			Assert.AreEqual("red", namedColor.To24BitColorString());
 			Assert.AreEqual("0xFF0000", rgbColor.To24BitColorString());
@@ -32,9 +33,9 @@ public void To24BitColor_Works()
 		[Test]
 		public void To32BitColor_Works()
 		{
-			var namedColor = MapColor.FromName("red");
-			var rgbColor = MapColor.FromArgb(255, 0, 0);
-			var rgbaColor = MapColor.FromArgb(255, 255, 0, 0);
+			var namedColor = GColor.FromName("red");
+			var rgbColor = GColor.FromArgb(255, 0, 0);
+			var rgbaColor = GColor.FromArgb(255, 255, 0, 0);
 
 			Assert.AreEqual("red", namedColor.To32BitColorString());
 			Assert.AreEqual("0xFF0000FF", rgbColor.To32BitColorString());

src/Google.Maps.Test/Places/PlaceDetailsServiceTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps.Places.Details
 {

src/Google.Maps.Test/Places/PlacesServiceTests.cs

@@ -3,6 +3,7 @@
 using System.Threading;
 
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps.Places
 {

src/Google.Maps.Test/PolylineEncodingTests.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 
 using NUnit.Framework;
+using Google.Maps.Internal;
 
 namespace Google.Maps
 {

src/Google.Maps.Test/QuickExamplesTests.cs

@@ -7,6 +7,7 @@
 using Google.Maps.Direction;
 using Google.Maps.Geocoding;
 using Google.Maps.StaticMaps;
+using Google.Maps.Common;
 
 namespace Google.Maps
 {
@@ -43,7 +44,7 @@ public void StaticMapRequest_Example()
 		{
 			var map = new StaticMapRequest();
 			map.Center = new Location("1600 Amphitheatre Parkway Mountain View, CA 94043");
-			map.Size = new MapSize(400, 400);
+			map.Size = new GSize(400, 400);
 			map.Zoom = 14;
 
 			var imgTagSrc = map.ToUri();

src/Google.Maps.Test/StaticMaps/StaticMapRequestTests.cs

@@ -1,6 +1,7 @@
 using System;
 
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps.StaticMaps
 {
@@ -14,7 +15,7 @@ public void Invalid_size_propert_set()
 			{
 				StaticMapRequest sm = new StaticMapRequest()
 				{
-					Size = new MapSize(-1, -1)
+					Size = new GSize(-1, -1)
 				};
 			});
 		}
@@ -26,7 +27,7 @@ public void Invalid_size_max()
 			{
 				StaticMapRequest sm = new StaticMapRequest()
 				{
-					Size = new MapSize(4097, 4097)
+					Size = new GSize(4097, 4097)
 				};
 			});
 		}

src/Google.Maps.Test/StaticMaps/StaticMap_Path_Tests.cs

@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps.StaticMaps
 {
@@ -46,7 +47,7 @@ public void Path_NonstandardColor_EncodedProperly()
 			var map = new StaticMapRequest();
 			map.Paths.Add(new Path(new LatLng(30.0, -60.0))
 			{
-				Color = MapColor.FromArgb(0x80, 0xA0, 0xC0)
+				Color = GColor.FromArgb(0x80, 0xA0, 0xC0)
 			});
 			string color = ExtractColorFromUri(map.ToUri());
 			Assert.AreEqual("0X80A0C0FF", color.ToUpper());
@@ -89,7 +90,7 @@ private static Path GreenTriangleInAdaMN()
 				new LatLng(47.3017, -96.5299)
 			)
 			{
-				Color =  MapColor.FromName("green")
+				Color =  GColor.FromName("green")
 			};
 		}
 
@@ -102,7 +103,7 @@ private static Path RedTriangleNearAdaMN()
 				new LatLng(47.3105, -96.5326)
 			)
 			{
-				Color = MapColor.FromName("red")
+				Color = GColor.FromName("red")
 			};
 		}
 

src/Google.Maps.Test/StreetView/StreetViewRequestTests.cs

@@ -2,6 +2,7 @@
 
 using NUnit.Framework;
 using Google.Maps.StreetView;
+using Google.Maps.Common;
 
 namespace Google.Maps.StreetView
 {
@@ -15,7 +16,7 @@ public void Invalid_size_propert_set()
 			{
 				StreetViewRequest sm = new StreetViewRequest()
 				{
-					Size = new MapSize(-1, -1)
+					Size = new GSize(-1, -1)
 				};
 			});
 		}
@@ -27,7 +28,7 @@ public void Invalid_size_max()
 			{
 				StreetViewRequest sm = new StreetViewRequest()
 				{
-					Size = new MapSize(4097, 4097)
+					Size = new GSize(4097, 4097)
 				};
 			});
 		}

src/Google.Maps.Test/StreetView/StreetView_uribuilding_Tests.cs

@@ -6,6 +6,7 @@
 using FluentAssertions.Collections;
 using FluentAssertions;
 using Google.Maps.Test;
+using Google.Maps.Common;
 
 namespace Google.Maps.StreetView
 {
@@ -24,7 +25,7 @@ public void BasicUri()
 			StreetViewRequest sm = new StreetViewRequest()
 			{
 				Location = new LatLng(30.1, -60.2)
-				,Size = new MapSize(512, 512)
+				,Size = new GSize(512, 512)
 			};
 
 			//act
@@ -44,7 +45,7 @@ public void BasicUri_heading()
 			StreetViewRequest sm = new StreetViewRequest()
 			{
 				Location = new LatLng(30.1, -60.2)
-				,Size = new MapSize(512, 512)
+				,Size = new GSize(512, 512)
 				,Heading = 15
 			};
 
@@ -65,7 +66,7 @@ public void BasicUri_pitch()
 			StreetViewRequest sm = new StreetViewRequest()
 			{
 				Location = new LatLng(30.1, -60.2)
-				,Size = new MapSize(512, 512)
+				,Size = new GSize(512, 512)
 				,Pitch = 15
 			};
 

src/Google.Maps.Test/TimeZone/TimeZoneServiceTests.cs

@@ -19,6 +19,7 @@
 using System.Collections.Generic;
 
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps.TimeZone
 {

src/Google.Maps.Test/ValueTextComparer_Tests.cs

@@ -5,6 +5,9 @@
 using System.Text;
 using System.Threading.Tasks;
 
+using Google.Maps.Internal;
+using Google.Maps.Common;
+
 namespace Google.Maps.Test
 {
 	[TestFixture]

src/Google.Maps/Shared/AddressComponent.cs → src/Google.Maps/Common/AddressComponent.cs

@@ -18,7 +18,7 @@
 using Newtonsoft.Json;
 using System;
 
-namespace Google.Maps.Shared
+namespace Google.Maps.Common
 {
 	public class AddressComponent : IEquatable<AddressComponent>
 	{

src/Google.Maps/Shared/AddressType.cs → src/Google.Maps/Common/AddressType.cs

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace Google.Maps.Shared
+namespace Google.Maps.Common
 {
 	public enum AddressType
 	{

src/Google.Maps/Avoid.cs → src/Google.Maps/Common/Avoid.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Google.Maps
+namespace Google.Maps.Common
 {
 	/// <summary>
 	/// Directions may be calculated that adhere to certain restrictions.

src/Google.Maps/Common/BaseRequest.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Google.Maps.Common
+{
+	public abstract class BaseRequest
+	{
+		public abstract Uri ToUri();
+	}
+}

src/Google.Maps/ComponentFilter.cs → src/Google.Maps/Common/ComponentFilter.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace Google.Maps
+namespace Google.Maps.Common
 {
 	/// <summary>
 	/// In a geocoding response, the Google Maps Geocoding API can return address results restricted to a specific area.