From a00debe663e4d315e7749054e96b6b8ba2e46753 Mon Sep 17 00:00:00 2001 From: Nikita Mashukov Date: Sat, 14 Oct 2017 18:37:49 +0700 Subject: [PATCH 1/2] push gpx src (file name or url) to imagery_used --- modules/renderer/background.js | 2 +- modules/svg/gpx.js | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/renderer/background.js b/modules/renderer/background.js index 75e3066fd..bc14298e1 100644 --- a/modules/renderer/background.js +++ b/modules/renderer/background.js @@ -91,7 +91,7 @@ export function rendererBackground(context) { var gpx = context.layers().layer('gpx'); if (gpx && gpx.enabled() && gpx.hasGpx()) { - imageryUsed.push('Local GPX'); + imageryUsed.push(gpx.getSrc()); } var mapillary_images = context.layers().layer('mapillary-images'); diff --git a/modules/svg/gpx.js b/modules/svg/gpx.js index 6eb1fb034..25c594092 100644 --- a/modules/svg/gpx.js +++ b/modules/svg/gpx.js @@ -26,7 +26,8 @@ import toGeoJSON from '@mapbox/togeojson'; export function svgGpx(projection, context, dispatch) { var showLabels = true, detected = utilDetect(), - layer; + layer, + src; function init() { @@ -187,6 +188,8 @@ export function svgGpx(projection, context, dispatch) { drawGpx.url = function(url) { d3_text(url, function(err, data) { if (!err) { + src = url; + var extension = getExtension(url); parseSaveAndZoom(extension, data); } @@ -201,6 +204,8 @@ export function svgGpx(projection, context, dispatch) { reader = new FileReader(); reader.onload = (function(file) { + src = file.name; + var extension = getExtension(file.name); return function (e) { @@ -212,6 +217,9 @@ export function svgGpx(projection, context, dispatch) { return this; }; + drawGpx.getSrc = function () { + return src; + }; drawGpx.fitZoom = function() { if (!this.hasGpx()) return this; From d0cca4bc5b820d46cd3d7f2dac968215721ff8e1 Mon Sep 17 00:00:00 2001 From: Nikita Mashukov Date: Sat, 14 Oct 2017 18:42:37 +0700 Subject: [PATCH 2/2] spaces instead tabs --- modules/svg/gpx.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/svg/gpx.js b/modules/svg/gpx.js index 25c594092..f1274203c 100644 --- a/modules/svg/gpx.js +++ b/modules/svg/gpx.js @@ -219,7 +219,7 @@ export function svgGpx(projection, context, dispatch) { drawGpx.getSrc = function () { return src; - }; + }; drawGpx.fitZoom = function() { if (!this.hasGpx()) return this;