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

Read photo filters from hash before reading enabled overlays/photos

Browse Source
This commit is contained in:
Quincy Morgan
2020-10-15 16:46:53 -04:00
parent b2b97c55a6
commit 17d8735956
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/renderer/photos.js
+9 -9
View File
@@ -136,15 +136,6 @@ export function rendererPhotos(context) {
photos.init = function() {
var hash = utilStringQs(window.location.hash);
if (hash.photo_overlay) {
// support enabling photo layers by default via a URL parameter, e.g. `photo_overlay=openstreetcam;mapillary;streetside`
var hashOverlayIDs = hash.photo_overlay.replace(/;/g, ',').split(',');
hashOverlayIDs.forEach(function(id) {
var layer = _layerIDs.indexOf(id) !== -1 && context.layers().layer(id);
if (layer && !layer.enabled()) layer.enabled(true);
});
}
if (hash.fromDate) {
this.setDateFilter('fromDate', hash.fromDate, false);
}
@@ -154,6 +145,15 @@ export function rendererPhotos(context) {
if (hash.username) {
this.setUsernameFilter(hash.username, false);
}
if (hash.photo_overlay) {
// support enabling photo layers by default via a URL parameter, e.g. `photo_overlay=openstreetcam;mapillary;streetside`
var hashOverlayIDs = hash.photo_overlay.replace(/;/g, ',').split(',');
hashOverlayIDs.forEach(function(id) {
var layer = _layerIDs.indexOf(id) !== -1 && context.layers().layer(id);
if (layer && !layer.enabled()) layer.enabled(true);
});
}
if (hash.photo) {
// support opening a photo via a URL parameter, e.g. `photo=mapillary-fztgSDtLpa08ohPZFZjeRQ`