ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix link handling in KML parser

Browse Source
This commit is contained in:
Andreas Hocevar
2017-08-30 08:44:19 +02:00
parent 4987cf8ace
commit 99d933b66f
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ol/format/kml.js
View File

@@ -488,8 +488,12 @@ ol.format.KML.readFlatCoordinates_ = function(node) {
*/ */
ol.format.KML.readURI_ = function(node) { ol.format.KML.readURI_ = function(node) {
var s = ol.xml.getAllTextContent(node, false).trim(); var s = ol.xml.getAllTextContent(node, false).trim();
if (node.baseURI && node.baseURI !== 'about:blank') { var baseURI = node.baseURI;
var url = new URL(s, node.baseURI); if (!baseURI || baseURI == 'about:blank') {
baseURI = window.location.href;
}
if (baseURI) {
var url = new URL(s, baseURI);
return url.href; return url.href;
} else { } else {
return s; return s;
@@ -1744,8 +1748,12 @@ ol.format.KML.prototype.readSharedStyle_ = function(node, objectStack) {
var style = ol.format.KML.readStyle_(node, objectStack); var style = ol.format.KML.readStyle_(node, objectStack);
if (style) { if (style) {
var styleUri; var styleUri;
if (node.baseURI && node.baseURI !== 'about:blank') { var baseURI = node.baseURI;
var url = new URL('#' + id, node.baseURI); if (!baseURI || baseURI == 'about:blank') {
baseURI = window.location.href;
}
if (baseURI) {
var url = new URL('#' + id, baseURI);
styleUri = url.href; styleUri = url.href;
} else { } else {
styleUri = '#' + id; styleUri = '#' + id;
@@ -1771,8 +1779,12 @@ ol.format.KML.prototype.readSharedStyleMap_ = function(node, objectStack) {
return; return;
} }
var styleUri; var styleUri;
if (node.baseURI && node.baseURI !== 'about:blank') { var baseURI = node.baseURI;
var url = new URL('#' + id, node.baseURI); if (!baseURI || baseURI == 'about:blank') {
baseURI = window.location.href;
}
if (baseURI) {
var url = new URL('#' + id, baseURI);
styleUri = url.href; styleUri = url.href;
} else { } else {
styleUri = '#' + id; styleUri = '#' + id;