CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-01 04:31:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP merge 'gpx' and 'mvt' layers into single 'data' layer

Browse Source
This commit is contained in:
Bryan Housel
2018-08-17 13:03:07 -04:00
parent 52c3858b48
commit 4b446e9e78
12 changed files with 191 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/renderer/background.js
+4 -19
View File
@@ -171,10 +171,10 @@ export function rendererBackground(context) {
.filter(function (d) { return !d.source().isLocatorOverlay() && !d.source().isHidden(); })
.forEach(function (d) { imageryUsed.push(d.source().imageryUsed()); });
var gpx = context.layers().layer('gpx');
if (gpx && gpx.enabled() && gpx.hasGpx()) {
var data = context.layers().layer('data');
if (data && data.enabled() && data.hasData()) {
// Include a string like '.gpx data file' or '.geojson data file'
var match = gpx.getSrc().match(/(kml|gpx|(?:geo)?json)$/i);
var match = data.getSrc().match(/(kml|gpx|pbf|mvt|(?:geo)?json)$/i);
var extension = match ? ('.' + match[0].toLowerCase() + ' ') : '';
imageryUsed.push(extension + 'data file');
}
@@ -184,14 +184,6 @@ export function rendererBackground(context) {
imageryUsed.push('Bing Streetside');
}
var mvt = context.layers().layer('mvt');
if (mvt && mvt.enabled() && mvt.hasMvt()) {
// Include a string like '.mvt data file' or '.geojson data file'
var matchmvt = mvt.getSrc().match(/(pbf|mvt|(?:geo)?json)$/i);
var extensionmvt = matchmvt ? ('.' + matchmvt[0].toLowerCase() + ' ') : '';
imageryUsed.push(extensionmvt + 'data file');
}
var mapillary_images = context.layers().layer('mapillary-images');
if (mapillary_images && mapillary_images.enabled()) {
imageryUsed.push('Mapillary Images');
@@ -464,19 +456,12 @@ export function rendererBackground(context) {
});
if (q.gpx) {
var gpx = context.layers().layer('gpx');
var gpx = context.layers().layer('data');
if (gpx) {
gpx.url(q.gpx);
}
}
if (q.mvt) {
var mvt = context.layers().layer('mvt');
if (mvt) {
mvt.url(q.mvt);
}
}
if (q.offset) {
var offset = q.offset.replace(/;/g, ',').split(',').map(function(n) {
return !isNaN(n) && n;