Merge branch 'develop' into feature/unused-usings

Author: tkirill

src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs

@@ -3,39 +3,37 @@
 
 namespace Nest
 {
-	public class GeoShapeMappingDescriptor<T>
+	public class GeoPointMappingDescriptor<T>
 	{
-		internal GeoShapeMapping _Mapping = new GeoShapeMapping();
+		internal GeoPointMapping _Mapping = new GeoPointMapping();
 
-		public GeoShapeMappingDescriptor<T> Name(string name)
+		public GeoPointMappingDescriptor<T> Name(string name)
 		{
 			this._Mapping.Name = name;
 			return this;
 		}
-		public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
+		public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
 		{
 			this._Mapping.Name = objectPath;
 			return this;
 		}
 
-		public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)
+		public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)
 		{
-			this._Mapping.Tree = geoTree;
+			this._Mapping.IndexLatLon = indexLatLon;
 			return this;
 		}
 
-		public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)
+		public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)
 		{
-			this._Mapping.TreeLevels = treeLevels;
+			this._Mapping.IndexGeoHash = indexGeoHash;
 			return this;
 		}
 
-		public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)
+		public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)
 		{
-			this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;
+			this._Mapping.GeoHashPrecision = geoHashPrecision;
 			return this;
 		}
-		
-
 	}
 }

src/Nest/Domain/Mapping/Descriptors/GeoShapeMappingDescriptor.cs

@@ -3,40 +3,37 @@
 
 namespace Nest
 {
-	public class GeoPointMappingDescriptor<T>
+	public class GeoShapeMappingDescriptor<T>
 	{
-		internal GeoPointMapping _Mapping = new GeoPointMapping();
+		internal GeoShapeMapping _Mapping = new GeoShapeMapping();
 
-		public GeoPointMappingDescriptor<T> Name(string name)
+		public GeoShapeMappingDescriptor<T> Name(string name)
 		{
 			this._Mapping.Name = name;
 			return this;
 		}
-		public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
+		public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
 		{
 			this._Mapping.Name = objectPath;
 			return this;
 		}
 
-
-		public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)
+		public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)
 		{
-			this._Mapping.IndexLatLon = indexLatLon;
+			this._Mapping.Tree = geoTree;
 			return this;
 		}
 
-		public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)
+		public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)
 		{
-			this._Mapping.IndexGeoHash = indexGeoHash;
+			this._Mapping.TreeLevels = treeLevels;
 			return this;
 		}
 
-		public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)
+		public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)
 		{
-			this._Mapping.GeoHashPrecision = geoHashPrecision;
+			this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;
 			return this;
 		}
-		
-
 	}
 }

src/Nest/Extensions/Extensions.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
@@ -91,10 +92,12 @@ internal static void ThrowIfNull<T>(this T value, string name)
 			if (value == null)
 				throw new ArgumentNullException(name);
 		}
+		
 		internal static string F(this string format, params object[] args)
 		{
+			var c = CultureInfo.InvariantCulture;
 			format.ThrowIfNull("format");
-			return string.Format(format, args);
+			return string.Format(c, format, args);
 		}
 		internal static string EscapedFormat(this string format, params object[] args)
 		{

src/Nest/Resolvers/Converters/Filters/GeoBoundingFilterConverter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -100,6 +101,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 		private void ReadBox(IGeoBoundingBoxFilter filter, JsonReader reader)
 		{
+			var c = CultureInfo.InvariantCulture;
 			reader.Read();
 			if (reader.TokenType != JsonToken.StartObject)
 				return;
@@ -118,11 +120,11 @@ private void ReadBox(IGeoBoundingBoxFilter filter, JsonReader reader)
 				else if (reader.TokenType == JsonToken.StartArray)
 				{
 					var values = JArray.Load(reader).Values<double>();
-					filter.TopLeft = string.Join(", ", values);
+					filter.TopLeft = string.Join(", ", values.Select(v=>v.ToString(c)));
 					reader.Read();
 					reader.Read();
 					values = JArray.Load(reader).Values<double>();
-					filter.BottomRight =string.Join(", ", values); 
+					filter.BottomRight =string.Join(", ", values.Select(v=>v.ToString(c))); 
 				}
 				else if (reader.TokenType == JsonToken.StartObject)
 				{