From dd7de08a35290940d78f4e7e77970da5e4cffff2 Mon Sep 17 00:00:00 2001 From: Mattia Pezzotti <45800507+mattiapezzotti@users.noreply.github.com> Date: Sat, 3 Aug 2024 21:03:58 +0200 Subject: [PATCH] Fix panoramax highlight selected sequence (#10374) closes #10366 --- modules/services/panoramax.js | 6 +++--- modules/svg/panoramax_images.js | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/services/panoramax.js b/modules/services/panoramax.js index 364e2f2b0..59d437185 100644 --- a/modules/services/panoramax.js +++ b/modules/services/panoramax.js @@ -342,13 +342,13 @@ export default { const sequences = context.container().selectAll('.layer-panoramax .sequence'); markers - .classed('highlighted', function(d) { return d.id === hoveredImageId; }) + .classed('highlighted', function(d) { return d.sequence_id === selectedSequenceId || d.id === hoveredImageId; }) .classed('hovered', function(d) { return d.id === hoveredImageId; }) .classed('currentView', function(d) { return d.id === selectedImageId; }); sequences - .classed('highlighted', function(d) { return d.sequence_id === hoveredSequenceId; }) - .classed('currentView', function(d) { return d.sequence_id === selectedSequenceId; }); + .classed('highlighted', function(d) { return d.properties.id === hoveredSequenceId; }) + .classed('currentView', function(d) { return d.properties.id === selectedSequenceId; }); // update viewfields if needed context.container().selectAll('.layer-panoramax .viewfield-group .viewfield') diff --git a/modules/svg/panoramax_images.js b/modules/svg/panoramax_images.js index 20f0df37d..56313ff1a 100644 --- a/modules/svg/panoramax_images.js +++ b/modules/svg/panoramax_images.js @@ -217,7 +217,7 @@ export function svgPanoramaxImages(projection, context, dispatch) { sequences = await filterSequences(sequences, service); let traces = layer.selectAll('.sequences').selectAll('.sequence') - .data(sequences, function(d) { return d.id; }); + .data(sequences, function(d) { return d.properties.id; }); // exit traces.exit() @@ -279,6 +279,8 @@ export function svgPanoramaxImages(projection, context, dispatch) { .attr('transform', 'scale(1.5,1.5),translate(-8, -13)') .attr('d', viewfieldPath); + service.setStyles(context, null); + function viewfieldPath() { if (this.parentNode.__data__.isPano) { return 'M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0';