Merge remote-tracking branch 'github/improvement/KR-256-geolocation-s…

…ort' into improvement/KR-248-worker-rewrite Conflicts: lib/database/elasticsearch_adapter.js
telepat-io · Apr 25, 2016 · 9ff442d · 9ff442d
2 parents 95136bd + 1d513c0
commit 9ff442d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/lib/database/elasticsearch_adapter.js b/lib/database/elasticsearch_adapter.js
@@ -245,8 +245,19 @@ ElasticSearchDB.prototype.searchObjects = function(options, callback) {
 			}
 		});
 	} else {
-		if (options.sort)
-			reqBody.sort = options.sort;
+		if (sort) {
+			reqBody.sort = {};
+
+			if (!sort.type) {
+				reqBody.sort = [sort];
+			} else if (sort.type == 'default') {
+				reqBody.sort[sort.field] = sort.order;
+			} else if (sort.type == 'geo') {
+				reqBody.sort._geo_distance = {};
+				reqBody.sort._geo_distance[sort.field] = {lat: sort.poi.lat || 0.0, lon: sort.poi.long || 0.0};
+				reqBody.sort._geo_distance.order = sort.order;
+			}
+		}
 
 		this.connection.search({
 			index: this.config.index,