Merge pull request #139 from ndsev/pins-clustering

Improve displaying markers and tiles feature search priority

erdblick_app/app/feature.search.service.ts

@@ -65,9 +65,8 @@ export class FeatureSearchService {
         this.startTime = Date.now();
 
         // Fill up work queue and start processing.
-        for (const [_, tile] of this.mapService.loadedTileLayers) {
-            this.workQueue.push(tile);
-        }
+        // TODO: What if we move / change the viewport during the search?
+        this.workQueue = this.mapService.getPrioritisedTiles();
         this.totalTiles = this.workQueue.length;
         this.isFeatureSearchActive.next(true);
 

erdblick_app/app/map.service.ts

@@ -599,6 +599,15 @@ export class MapService {
         this.update();
     }
 
+    getPrioritisedTiles() {
+        let tiles  = new Array<[number, FeatureTile]>();
+        for (const [_, tile] of this.loadedTileLayers) {
+            tiles.push([coreLib.getTilePriorityById(this.currentViewport, tile.tileId), tile]);
+        }
+        tiles.sort((a, b) => b[0] - a[0]);
+        return tiles.map(val => val[1]);
+    }
+
     getFeatureTile(tileKey: string): FeatureTile|null {
         return this.loadedTileLayers.get(tileKey) || null;
     }

libs/core/src/bindings.cpp

@@ -85,6 +85,10 @@ em::val getTileIds(Viewport const& vp, int level, int limit)
     return resultArray;
 }
 
+double getTilePriorityById(Viewport const& vp, uint64_t tileId) {
+    return Wgs84AABB::radialDistancePrioFn({vp.camPosLon, vp.camPosLat}, vp.orientation)(tileId);
+}
+
 /** Get the center position for a mapget tile id in WGS84. */
 mapget::Point getTilePosition(uint64_t tileIdValue) {
     mapget::TileId tid(tileIdValue);
@@ -321,6 +325,7 @@ EMSCRIPTEN_BINDINGS(erdblick)
 
     ////////// Viewport TileID calculation
     em::function("getTileIds", &getTileIds);
+    em::function("getTilePriorityById", &getTilePriorityById);
     em::function("getTilePosition", &getTilePosition);
     em::function("getTileIdFromPosition", &getTileIdFromPosition);