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

rename all openstreetcam references to kartaview

Browse Source 
closes #8807
This commit is contained in:
Martin Raifer
2021-11-16 17:33:27 +01:00
parent 6a45b66294
commit 25d4ff100f
17 changed files with 113 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/renderer/background.js
+1 -1
View File
@@ -256,7 +256,7 @@ export function rendererBackground(context) {
mapillary: 'Mapillary Images',
'mapillary-map-features': 'Mapillary Map Features',
'mapillary-signs': 'Mapillary Signs',
openstreetcam: 'OpenStreetCam Images'
kartaview: 'KartaView Images'
};
for (let layerID in photoOverlayLayers) {
modules/renderer/photos.js
+7 -7
View File
@@ -7,7 +7,7 @@ import { utilQsString, utilStringQs } from '../util';
export function rendererPhotos(context) {
var dispatch = d3_dispatch('change');
var _layerIDs = ['streetside', 'mapillary', 'mapillary-map-features', 'mapillary-signs', 'openstreetcam'];
var _layerIDs = ['streetside', 'mapillary', 'mapillary-map-features', 'mapillary-signs', 'kartaview'];
var _allPhotoTypes = ['flat', 'panoramic'];
var _shownPhotoTypes = _allPhotoTypes.slice(); // shallow copy
var _dateFilters = ['fromDate', 'toDate'];
@@ -119,16 +119,16 @@ export function rendererPhotos(context) {
}
photos.shouldFilterByDate = function() {
return showsLayer('mapillary') || showsLayer('openstreetcam') || showsLayer('streetside');
return showsLayer('mapillary') || showsLayer('kartaview') || showsLayer('streetside');
};
photos.shouldFilterByPhotoType = function() {
return showsLayer('mapillary') ||
(showsLayer('streetside') && showsLayer('openstreetcam'));
(showsLayer('streetside') && showsLayer('kartaview'));
};
photos.shouldFilterByUsername = function() {
return !showsLayer('mapillary') && showsLayer('openstreetcam') && !showsLayer('streetside');
return !showsLayer('mapillary') && showsLayer('kartaview') && !showsLayer('streetside');
};
photos.showsPhotoType = function(val) {
@@ -180,22 +180,22 @@ export function rendererPhotos(context) {
this.setUsernameFilter(hash.photo_username, false);
}
if (hash.photo_overlay) {
// support enabling photo layers by default via a URL parameter, e.g. `photo_overlay=openstreetcam;mapillary;streetside`
// support enabling photo layers by default via a URL parameter, e.g. `photo_overlay=kartaview;mapillary;streetside`
var hashOverlayIDs = hash.photo_overlay.replace(/;/g, ',').split(',');
hashOverlayIDs.forEach(function(id) {
if (id === 'openstreetcam') id = 'kartaview'; // legacy alias
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`
var photoIds = hash.photo.replace(/;/g, ',').split(',');
var photoId = photoIds.length && photoIds[0].trim();
var results = /(.*)\/(.*)/g.exec(photoId);
if (results && results.length >= 3) {
var serviceId = results[1];
if (serviceId === 'openstreetcam') serviceId = 'kartaview'; // legacy alias
var photoKey = results[2];
var service = services[serviceId];
if (service && service.ensureViewerLoaded) {