Update Geocoding.Here to use "Geocoding and Search API v7".

README.md

@@ -7,7 +7,7 @@ Includes a model and interface for communicating with five popular Geocoding pro
   * [Bing Maps (aka Virtual Earth)](http://www.microsoft.com/maps/) - [docs](http://msdn.microsoft.com/en-us/library/ff701715.aspx)
   * :warning: MapQuest [(Commercial API)](http://www.mapquestapi.com/) - [docs](http://www.mapquestapi.com/geocoding/)
   * :warning: MapQuest [(OpenStreetMap)](http://open.mapquestapi.com/) - [docs](http://open.mapquestapi.com/geocoding/)
-  * [HERE](https://www.here.com/) - [docs](https://developer.here.com/documentation)
+  * [HERE](https://www.here.com/) - [docs](https://developer.here.com/documentation/geocoding-search-api)
 
 The API returns latitude/longitude coordinates and normalized address information.  This can be used to perform address validation, real time mapping of user-entered addresses, distance calculations, and much more.
 
@@ -73,7 +73,7 @@ You will need a [consumer secret and consumer key](http://developer.yahoo.com/bo
 
 MapQuest API requires a key. Sign up here: (http://developer.mapquest.com/web/products/open)
 
-HERE requires an [app ID and app Code](https://developer.here.com/?create=Freemium-Basic&keepState=true&step=account)
+HERE requires an [API key](https://developer.here.com/?create=Freemium-Basic&keepState=true&step=account).
 
 ## How to Build from Source
 

src/Geocoding.Core/QueryBuilder.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Text;
+
+namespace Geocoding
+{
+	/// <summary>
+	/// Provides a custom constructor for Uri query strings.
+	/// </summary>
+	public class QueryBuilder
+	{
+		private readonly List<QueryParameter> parameters = new List<QueryParameter>();
+
+		/// <summary>
+		/// Adds the parameter.
+		/// </summary>
+		/// <param name="parameter">The parameter to add.</param>
+		/// <returns>This instance of the Query builder, to allow Fluent calls.</returns>
+		public QueryBuilder AddParameter(QueryParameter parameter)
+		{
+			parameters.Add(parameter);
+			return this;
+		}
+
+		/// <summary>
+		/// Adds the parameter.
+		/// </summary>
+		/// <param name="name">The name/key of the parameter.</param>
+		/// <param name="value">The value of parameter.</param>
+		/// <remarks>Both name and value will be Url Encoded.</remarks>
+		/// <returns>This instance of the Query builder, to allow Fluent calls.</returns>
+		public QueryBuilder AddParameter(String name, String value)
+		{
+			return AddParameter(new QueryParameter(name, value));
+		}
+
+		/// <summary>
+		/// Adds the parameter if the value is not null or Empty.
+		/// </summary>
+		/// <param name="name">The name/key of the parameter.</param>
+		/// <param name="value">The value of parameter.</param>
+		/// <remarks>Both name and value will be Url Encoded.</remarks>
+		/// <returns>This instance of the Query builder, to allow Fluent calls.</returns>
+		public QueryBuilder AddNonEmptyParameter(String name, String value)
+		{
+			if (!string.IsNullOrEmpty(value))
+			{
+				AddParameter(new QueryParameter(name, value));
+			}
+			return this;
+		}
+
+		/// <summary>
+		/// Adds the parameter.
+		/// </summary>
+		/// <param name="parameters">The parameter to add.</param>
+		/// <returns>This instance of the Query builder, to allow Fluent calls.</returns>
+		public QueryBuilder AddParameters(IEnumerable<QueryParameter> parameters)
+		{
+			foreach (QueryParameter parameter in parameters)
+			{
+				AddParameter(parameter);
+			}
+			return this;
+		}
+
+		/// <summary>
+		/// Gets the query string.
+		/// </summary>
+		public String GetQuery(String separator = "&")
+		{
+			return String.Join(separator, parameters.Select(p => p.Query));
+		}
+	}
+}

src/Geocoding.Core/QueryParameter.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Globalization;
+using System.Net;
+
+namespace Geocoding
+{
+	public class QueryParameter
+	{
+		public String Name { get; }
+		public String Value { get; }
+
+		public QueryParameter(String name, String value)
+		{
+			Name = name;
+			Value = value;
+		}
+
+		public String Query
+		{
+			get
+			{
+				return String.Format(CultureInfo.InvariantCulture,
+					"{0}={1}",
+					WebUtility.UrlEncode(Name),
+					WebUtility.UrlEncode(Value));
+			}
+		}
+	}
+}

src/Geocoding.Here/HereAddress.cs

@@ -4,8 +4,7 @@ namespace Geocoding.Here
 {
 	public class HereAddress : Address
 	{
-		readonly string street, houseNumber, city, state, country, postalCode;
-		readonly HereLocationType type;
+		readonly string street, houseNumber, city, state, country, postalCode, resultType;
 
 		public string AddressLine
 		{
@@ -37,13 +36,13 @@ public string PostalCode
 			get { return postalCode ?? ""; }
 		}
 
-		public HereLocationType Type
+		public String ResultType
 		{
-			get { return type; }
+			get { return resultType; }
 		}
 
 		public HereAddress(string formattedAddress, Location coordinates, string street, string houseNumber, string city,
-			string state, string postalCode, string country, HereLocationType type)
+			string state, string postalCode, string country, string resultType)
 			: base(formattedAddress, coordinates, "HERE")
 		{
 			this.street = street;
@@ -52,7 +51,7 @@ public HereAddress(string formattedAddress, Location coordinates, string street,
 			this.state = state;
 			this.postalCode = postalCode;
 			this.country = country;
-			this.type = type;
+			this.resultType = resultType;
 		}
 	}
 }