CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 09:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset marker for panoramic/viewfield when switching steetview layer

Browse Source
This commit is contained in:
Bryan Housel
2018-06-13 15:00:05 -04:00
parent 70c2a1777a
commit e493bb4c64
4 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/services/mapillary.js
View File

@@ -683,6 +683,19 @@ export default {
.classed('highlighted', function(d) { return d.properties.key === hoveredSequenceKey; })
.classed('selected', function(d) { return d.properties.key === selectedSequenceKey; });
// update viewfields if needed
d3_selectAll('.viewfield-group .viewfield')
.attr('d', viewfieldPath);
function viewfieldPath() {
var d = this.parentNode.__data__;
if (d.pano && d.key !== selectedImageKey) {
return 'M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0';
} else {
return 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z';
}
}
return this;
},

13
modules/services/openstreetcam.js
View File

@@ -573,6 +573,19 @@ export default {
.classed('highlighted', function(d) { return d.properties.key === hoveredSequenceKey; })
.classed('selected', function(d) { return d.properties.key === selectedSequenceKey; });
// update viewfields if needed
d3_selectAll('.viewfield-group .viewfield')
.attr('d', viewfieldPath);
function viewfieldPath() {
var d = this.parentNode.__data__;
if (d.pano && d.key !== selectedImageKey) {
return 'M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0';
} else {
return 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z';
}
}
return this;
},

15
modules/services/streetside.js
View File

@@ -370,7 +370,7 @@ export default {
},
initViewer: function (context) {
initViewer: function () {
if (!window.pannellum) return;
if (_pannellumViewer) return;
@@ -623,6 +623,19 @@ export default {
.classed('highlighted', function (d) { return d.properties.key === hoveredSequenceKey; })
.classed('selected', function (d) { return d.properties.key === selectedSequenceKey; });
// update viewfields if needed
d3_selectAll('.viewfield-group .viewfield')
.attr('d', viewfieldPath);
function viewfieldPath() {
var d = this.parentNode.__data__;
if (d.pano && d.key !== selectedBubbleKey) {
return 'M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0';
} else {
return 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z';
}
}
return this;
},

28
modules/svg/streetside.js
View File

@@ -98,18 +98,10 @@ export function svgStreetside(projection, context, dispatch) {
_viewerYaw = 0;
// reset bubble back to a circular field
layer.selectAll('.viewfield-group.selected .viewfield')
.attr('d', viewfieldPath);
service
.selectImage(d)
.showViewer();
// show selected bubble with a viewfield
layer.selectAll('.viewfield-group.selected .viewfield')
.attr('d', 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z');
context.map().centerEase(d.loc);
}
@@ -237,6 +229,17 @@ export function svgStreetside(projection, context, dispatch) {
.attr('class', 'viewfield')
.attr('transform', 'scale(1.5,1.5),translate(-8, -13)')
.attr('d', viewfieldPath);
function viewfieldPath() {
var d = this.parentNode.__data__;
if (d.pano) {
return 'M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0';
} else {
return 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z';
}
}
}
/**
@@ -283,15 +286,6 @@ export function svgStreetside(projection, context, dispatch) {
}
function viewfieldPath() {
var d = this.parentNode.__data__;
if (d.pano) {
return 'M 8,13 m -10,0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0';
} else {
return 'M 6,9 C 8,8.4 8,8.4 10,9 L 16,-2 C 12,-5 4,-5 0,-2 z';
}
}
/**
* drawImages.enabled().
*/