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

Merge pull request #5516 from probins/goog.uri

Browse Source 
Remove goog.Uri from KML format
This commit is contained in:
Andreas Hocevar
2016-07-14 22:50:45 +02:00
committed by GitHub
parent 2d8a19a94e 5732cde025
commit 878ca6471d
7 changed files with 73 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/kmlformat.js
+12 -23
View File
@@ -5,7 +5,6 @@
goog.provide('ol.format.KML');
goog.require('goog.Uri');
goog.require('goog.asserts');
goog.require('goog.object');
goog.require('ol');
@@ -44,6 +43,9 @@ goog.require('ol.xml');
* @classdesc
* Feature format for reading and writing data in the KML format.
*
* Note that the KML format uses the URL() constructor. Older browsers such as IE
* which do not support this will need a URL polyfill to be loaded before use.
*
* @constructor
* @extends {ol.format.XMLFeature}
* @param {olx.format.KMLOptions=} opt_options Options.
@@ -479,33 +481,18 @@ ol.format.KML.readFlatCoordinates_ = function(node) {
};
/**
* @param {Node} node Node.
* @private
* @return {string|undefined} Style URL.
*/
ol.format.KML.readStyleUrl_ = function(node) {
var s = ol.xml.getAllTextContent(node, false).trim();
if (node.baseURI) {
return goog.Uri.resolve(node.baseURI, s).toString();
} else {
return s;
}
};
/**
* @param {Node} node Node.
* @private
* @return {string} URI.
*/
ol.format.KML.readURI_ = function(node) {
var s = ol.xml.getAllTextContent(node, false);
var s = ol.xml.getAllTextContent(node, false).trim();
if (node.baseURI) {
return goog.Uri.resolve(node.baseURI, s.trim()).toString();
var url = new URL(s, node.baseURI);
return url.href;
} else {
return s.trim();
return s;
}
};
@@ -1622,7 +1609,7 @@ ol.format.KML.PAIR_PARSERS_ = ol.xml.makeStructureNS(
ol.format.KML.NAMESPACE_URIS_, {
'Style': ol.xml.makeObjectPropertySetter(ol.format.KML.readStyle_),
'key': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
'styleUrl': ol.xml.makeObjectPropertySetter(ol.format.KML.readStyleUrl_)
'styleUrl': ol.xml.makeObjectPropertySetter(ol.format.KML.readURI_)
});
@@ -1814,7 +1801,8 @@ ol.format.KML.prototype.readSharedStyle_ = function(node, objectStack) {
if (style) {
var styleUri;
if (node.baseURI) {
styleUri = goog.Uri.resolve(node.baseURI, '#' + id).toString();
var url = new URL('#' + id, node.baseURI);
styleUri = url.href;
} else {
styleUri = '#' + id;
}
@@ -1844,7 +1832,8 @@ ol.format.KML.prototype.readSharedStyleMap_ = function(node, objectStack) {
}
var styleUri;
if (node.baseURI) {
styleUri = goog.Uri.resolve(node.baseURI, '#' + id).toString();
var url = new URL('#' + id, node.baseURI);
styleUri = url.href;
} else {
styleUri = '#' + id;
}