DATAMONGO-1110 - Add support for $minDistance for GeoJSON types.

We now make sure $minDistance operator gets correctly nested when using GeoJSON types.

Original pull request: #277.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java

@@ -441,7 +441,8 @@ public Criteria nearSphere(Point point) {
 	 */
 	public Criteria maxDistance(double maxDistance) {
 
-		if (createNearCriteriaForCommand("$near", maxDistance) || createNearCriteriaForCommand("$nearSphere", maxDistance)) {
+		if (createNearCriteriaForCommand("$near", "$maxDistance", maxDistance)
+				|| createNearCriteriaForCommand("$nearSphere", "$maxDistance", maxDistance)) {
 			return this;
 		}
 
@@ -458,6 +459,12 @@ public Criteria maxDistance(double maxDistance) {
 	 * @since 1.7
 	 */
 	public Criteria minDistance(double minDistance) {
+
+		if (createNearCriteriaForCommand("$near", "$minDistance", minDistance)
+				|| createNearCriteriaForCommand("$nearSphere", "$minDistance", minDistance)) {
+			return this;
+		}
+
 		criteria.put("$minDistance", minDistance);
 		return this;
 	}
@@ -618,7 +625,7 @@ private void setValue(DBObject dbo, String key, Object value) {
 		}
 	}
 
-	private boolean createNearCriteriaForCommand(String command, double maxDistance) {
+	private boolean createNearCriteriaForCommand(String command, String operation, double maxDistance) {
 
 		if (!criteria.containsKey(command)) {
 			return false;
@@ -628,14 +635,13 @@ private boolean createNearCriteriaForCommand(String command, double maxDistance)
 
 		if (existingNearOperationValue instanceof DBObject) {
 
-			((DBObject) existingNearOperationValue).put("$maxDistance", maxDistance);
+			((DBObject) existingNearOperationValue).put(operation, maxDistance);
 
 			return true;
 
 		} else if (existingNearOperationValue instanceof GeoJson) {
 
-			BasicDBObject dbo = new BasicDBObject("$geometry", existingNearOperationValue)
-					.append("$maxDistance", maxDistance);
+			BasicDBObject dbo = new BasicDBObject("$geometry", existingNearOperationValue).append(operation, maxDistance);
 			criteria.put(command, dbo);
 
 			return true;

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonTests.java

@@ -278,6 +278,45 @@ public void shouleSaveAndRetrieveDocumentWithGeoJsonGeometryCollectionTypeCorrec
 		assertThat(result.geoJsonGeometryCollection, equalTo(obj.geoJsonGeometryCollection));
 	}
 
+	/**
+	 * @see DATAMONGO-1110
+	 */
+	@Test
+	public void nearWithMinDistance() {
+
+		Point point = new GeoJsonPoint(-73.99171, 40.738868);
+		List<Venue2DSphere> venues = template.find(query(where("location").near(point).minDistance(0.01)),
+				Venue2DSphere.class);
+
+		assertThat(venues.size(), is(11));
+	}
+
+	/**
+	 * @see DATAMONGO-1110
+	 */
+	@Test
+	public void nearSphereWithMinDistance() {
+
+		Point point = new GeoJsonPoint(-73.99171, 40.738868);
+		List<Venue2DSphere> venues = template.find(query(where("location").nearSphere(point).minDistance(0.01)),
+				Venue2DSphere.class);
+
+		assertThat(venues.size(), is(11));
+	}
+
+	/**
+	 * @see DATAMONGO-1135
+	 */
+	@Test
+	public void nearWithMinAndMaxDistance() {
+
+		GeoJsonPoint point = new GeoJsonPoint(-73.99171, 40.738868);
+
+		Query query = query(where("location").near(point).minDistance(0.01).maxDistance(100));
+		List<Venue2DSphere> venues = template.find(query, Venue2DSphere.class);
+		assertThat(venues.size(), is(2));
+	}
+
 	private void addVenues() {
 
 		template.insert(new Venue2DSphere("Penn Station", -73.99408, 40.75057));

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java

@@ -211,4 +211,40 @@ public void maxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonTyp
 
 		assertThat(dbo, IsBsonObject.isBsonObject().containing("foo.$nearSphere.$maxDistance", 50D));
 	}
+
+	/**
+	 * @see DATAMONGO-1110
+	 */
+	@Test
+	public void minDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
+
+		DBObject dbo = new Criteria("foo").near(new GeoJsonPoint(100, 200)).minDistance(50D).getCriteriaObject();
+
+		assertThat(dbo, IsBsonObject.isBsonObject().containing("foo.$near.$minDistance", 50D));
+	}
+
+	/**
+	 * @see DATAMONGO-1110
+	 */
+	@Test
+	public void minDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
+
+		DBObject dbo = new Criteria("foo").nearSphere(new GeoJsonPoint(100, 200)).minDistance(50D).getCriteriaObject();
+
+		assertThat(dbo, IsBsonObject.isBsonObject().containing("foo.$nearSphere.$minDistance", 50D));
+	}
+
+	/**
+	 * @see DATAMONGO-1110
+	 */
+	@Test
+	public void minAndMaxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
+
+		DBObject dbo = new Criteria("foo").nearSphere(new GeoJsonPoint(100, 200)).minDistance(50D).maxDistance(100D)
+				.getCriteriaObject();
+
+		assertThat(dbo, IsBsonObject.isBsonObject().containing("foo.$nearSphere.$minDistance", 50D));
+		assertThat(dbo, IsBsonObject.isBsonObject().containing("foo.$nearSphere.$maxDistance", 100D));
+	}
+
 }