From 75dba4b6c7392ad3bf8f438e01c8f7bb0ab65a69 Mon Sep 17 00:00:00 2001
From: Noenandre <5470915+noenandre@users.noreply.github.com>
Date: Wed, 22 Feb 2023 21:30:55 +0100
Subject: [PATCH] Filter sequences too.

---
 modules/services/vegbilder.js |  9 ++++----
 modules/svg/vegbilder.js      | 40 +++++++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/modules/services/vegbilder.js b/modules/services/vegbilder.js
index bc3267bbb..1de0fbccf 100644
--- a/modules/services/vegbilder.js
+++ b/modules/services/vegbilder.js
@@ -3,7 +3,7 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
 import { select as d3_select } from 'd3-selection';
 import { zoom as d3_zoom, zoomIdentity as d3_zoomIdentity } from 'd3-zoom';
 import { pairs as d3_pairs } from 'd3-array';
-import { utilQsString, utilTiler, utilRebind, utilArrayUnion, utilStringQs, utilSetTransform} from '../util';
+import { utilQsString, utilTiler, utilRebind, utilArrayUnion, utilStringQs} from '../util';
 import {geoExtent, geoScaleToZoom, geoVecAngle} from '../geo';
 import RBush from 'rbush';
 
@@ -315,7 +315,7 @@ function searchLimited(limit, projection, rtree) {
         .slice(0, limit)
         .map(d => d.data);
 
-      return (found.length ? result.concat(found) : result);
+      return result.concat(found);
     }, []);
 }
 
@@ -366,13 +366,14 @@ export default {
     for (let {data} of _vegbilderCache.rtree.search(bbox)) {
       const sequence = _vegbilderCache.image_sequence_map.get(data.key);
       if (!sequence) continue;
-      const {key, geometry} = sequence;
+      const {key, geometry, images} = sequence;
       if (seen.has(key)) continue;
       seen.add(key);
       let line = {
         type: 'LineString',
         coordinates: geometry.coordinates,
-        key
+        key,
+        images
       };
       line_strings.push(line);
   }
diff --git a/modules/svg/vegbilder.js b/modules/svg/vegbilder.js
index 48feea3c0..9794cb6ad 100644
--- a/modules/svg/vegbilder.js
+++ b/modules/svg/vegbilder.js
@@ -124,9 +124,12 @@ export function svgVegbilder(projection, context, dispatch) {
   /**
    * transform().
    */
-  function transform(d) {
+  function transform(d, selected) {
     let t = svgPointTransform(projection)(d);
-    const rot = d.ca + _viewerYaw;
+    let rot = d.ca;
+    if (d === selected) {
+      rot += _viewerYaw;
+    }
     if (rot) {
       t += ' rotate(' + Math.floor(rot) + ',0,0)';
     }
@@ -149,7 +152,7 @@ export function svgVegbilder(projection, context, dispatch) {
     if (context.map().isTransformed()) return;
 
     layer.selectAll('.viewfield-group.currentView')
-      .attr('transform', transform);
+      .attr('transform', (d) => transform(d, d));
   }
 
   function filterImages(images) {
@@ -180,6 +183,34 @@ export function svgVegbilder(projection, context, dispatch) {
     return images;
   }
 
+  function filterSequences(sequences) {
+    const photoContext = context.photos();
+    const fromDateString = photoContext.fromDate();
+    const toDateString = photoContext.toDate();
+    const showsFlat = photoContext.showsFlat();
+    const showsPano = photoContext.showsPanoramic();
+
+    if (fromDateString) {
+      const fromDate = new Date(fromDateString);
+      sequences = sequences.filter(({images}) => images[0].captured_at.getTime() >= fromDate.getTime());
+    }
+
+    if (toDateString) {
+      const toDate = new Date(toDateString);
+      sequences = sequences.filter(({images}) => images[-1].captured_at.getTime() <= toDate.getTime());
+    }
+
+    if (!showsPano) {
+      sequences = sequences.filter(({images}) => !images[0].is_sphere);
+    }
+
+    if (!showsFlat) {
+      sequences = sequences.filter(({images}) => images[0].is_sphere);
+    }
+
+    return sequences;
+  }
+
   /**
    * update().
    */
@@ -200,6 +231,7 @@ export function svgVegbilder(projection, context, dispatch) {
       sequences = service.sequences(projection);
       images = showMarkers ? service.images(projection) : [];
       images = filterImages(images);
+      sequences = filterSequences(sequences);
     }
 
     let traces = layer.selectAll('.sequences').selectAll('.sequence')
@@ -244,7 +276,7 @@ export function svgVegbilder(projection, context, dispatch) {
           : (b === selected) ? -1
             : b.loc[1] - a.loc[1];
       })
-      .attr('transform', transform)
+      .attr('transform', (d) => transform(d, selected))
       .select('.viewfield-scale');