From 0a09b51e7049d3db8a8ce413e1fc444daad0cd4b Mon Sep 17 00:00:00 2001
From: MohamedHamou <mohamed.hamou@gisaia.com>
Date: Thu, 26 Jul 2018 17:40:33 +0200
Subject: [PATCH] Apply sort/geosort when on new collaborations

---
 src/contributors/ResultListContributor.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/contributors/ResultListContributor.ts b/src/contributors/ResultListContributor.ts
index ece4f6f1..0ff45774 100644
--- a/src/contributors/ResultListContributor.ts
+++ b/src/contributors/ResultListContributor.ts
@@ -350,6 +350,7 @@ export class ResultListContributor extends Contributor {
             'sort': 'geodistance:' + lat.toString() + ' ' + lng.toString()
         };
         this.geoOrderSort = sort;
+        this.sort = {};
         this.getHitsObservable(this.includesvalues, this.geoOrderSort)
             .map(f => this.computeData(f))
             .map(f => this.setData(f))
@@ -436,7 +437,15 @@ export class ResultListContributor extends Contributor {
         }
     }
     public fetchData(collaborationEvent: CollaborationEvent): Observable<Hits> {
-        return this.getHitsObservable(this.includesvalues, this.geoOrderSort);
+        let sort: Sort = {};
+        if (this.geoOrderSort.sort) {
+            sort = this.geoOrderSort;
+        } else {
+            if (this.sort.sort) {
+                sort = this.sort;
+            }
+        }
+        return this.getHitsObservable(this.includesvalues, sort);
     }
 
     public computeData(hits: Hits): Array<Map<string, string | number | Date>> {