CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-28 16:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable the corresponding photo overlay layer when specifying a photo from that service via the URL (re: #6398)

Browse Source
This commit is contained in:
Quincy Morgan
2020-09-14 11:01:35 -04:00
parent 23c759fa98
commit 95dee987cb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/renderer/photos.js
View File

@@ -78,8 +78,8 @@ export function rendererPhotos(context) {
if (hash.photo_overlay) {
var hashOverlayIDs = hash.photo_overlay.replace(/;/g, ',').split(',');
hashOverlayIDs.forEach(function(id) {
var layer = context.layers().layer(id);
if (layer) layer.enabled(true);
var layer = _layerIDs.indexOf(id) !== -1 && context.layers().layer(id);
if (layer && !layer.enabled()) layer.enabled(true);
});
}
if (hash.photo) {
@@ -90,7 +90,12 @@ export function rendererPhotos(context) {
var serviceId = results[1];
var photoKey = results[2];
var service = services[serviceId];
if (service.ensureViewerLoaded) {
if (service && service.ensureViewerLoaded) {
// if we're showing a photo then make sure its layer is enabled too
var layer = _layerIDs.indexOf(serviceId) !== -1 && context.layers().layer(serviceId);
if (layer && !layer.enabled()) layer.enabled(true);
service.ensureViewerLoaded(context)
.then(function() {
service.updateViewer(context, photoKey);