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

fix regression in background layer loading from URL

Browse Source 
fixes #3820
This commit is contained in:
Martin Raifer
2017-02-06 15:02:55 +01:00
parent 2120ab4706
commit ff4bf2597d
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/svg/gpx.js
+16 -13
View File
@@ -106,29 +106,32 @@ export function svgGpx(projection, context, dispatch) {
}
function getExtension(file) {
if (_.isUndefined(file)) {
function getExtension(fileName) {
if (_.isUndefined(fileName)) {
return '';
}
var lastDotIndex = file.name.lastIndexOf('.');
var lastDotIndex = fileName.lastIndexOf('.');
if (lastDotIndex < 0) {
return '';
}
return file.name.substr(lastDotIndex);
return fileName.substr(lastDotIndex);
}
function parseSaveAndZoom(extension, data) {
if (extension === '.gpx') {
drawGpx.geojson(toGeoJSON.gpx(toDom(data))).fitZoom();
}
else if (extension === '.kml') {
drawGpx.geojson(toGeoJSON.kml(toDom(data))).fitZoom();
}
else if (extension === '.geojson' || extension === '.json') {
drawGpx.geojson(JSON.parse(data)).fitZoom();
switch (extension) {
default:
drawGpx.geojson(toGeoJSON.gpx(toDom(data))).fitZoom();
break;
case '.kml':
drawGpx.geojson(toGeoJSON.kml(toDom(data))).fitZoom();
break;
case '.geojson':
case '.json':
drawGpx.geojson(JSON.parse(data)).fitZoom();
break;
}
}
@@ -180,7 +183,7 @@ export function svgGpx(projection, context, dispatch) {
reader = new FileReader();
reader.onload = (function(file) {
var extension = getExtension(file);
var extension = getExtension(file.name);
return function (e) {
parseSaveAndZoom(extension, e.target.result);