diff --git a/src/ol/format/OWS.js b/src/ol/format/OWS.js index 1143df65c8..6b5033829e 100644 --- a/src/ol/format/OWS.js +++ b/src/ol/format/OWS.js @@ -2,7 +2,7 @@ * @module ol/format/OWS */ import {inherits} from '../index.js'; -import _ol_format_XLink_ from '../format/XLink.js'; +import XLink from '../format/XLink.js'; import _ol_format_XML_ from '../format/XML.js'; import _ol_format_XSD_ from '../format/XSD.js'; import _ol_xml_ from '../xml.js'; @@ -113,7 +113,7 @@ OWS.readDcp_ = function(node, objectStack) { * @return {Object|undefined} The GET object. */ OWS.readGet_ = function(node, objectStack) { - var href = _ol_format_XLink_.readHref(node); + var href = XLink.readHref(node); if (!href) { return undefined; } @@ -423,7 +423,7 @@ OWS.SERVICE_PROVIDER_PARSERS_ = _ol_xml_.makeStructureNS( OWS.NAMESPACE_URIS_, { 'ProviderName': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString), - 'ProviderSite': _ol_xml_.makeObjectPropertySetter(_ol_format_XLink_.readHref), + 'ProviderSite': _ol_xml_.makeObjectPropertySetter(XLink.readHref), 'ServiceContact': _ol_xml_.makeObjectPropertySetter( OWS.readServiceContact_) }); diff --git a/src/ol/format/WMSCapabilities.js b/src/ol/format/WMSCapabilities.js index 79420bc5ed..2af551e1d9 100644 --- a/src/ol/format/WMSCapabilities.js +++ b/src/ol/format/WMSCapabilities.js @@ -2,7 +2,7 @@ * @module ol/format/WMSCapabilities */ import {inherits} from '../index.js'; -import _ol_format_XLink_ from '../format/XLink.js'; +import XLink from '../format/XLink.js'; import _ol_format_XML_ from '../format/XML.js'; import _ol_format_XSD_ from '../format/XSD.js'; import _ol_xml_ from '../xml.js'; @@ -519,7 +519,7 @@ WMSCapabilities.SERVICE_PARSERS_ = _ol_xml_.makeStructureNS( 'KeywordList': _ol_xml_.makeObjectPropertySetter( WMSCapabilities.readKeywordList_), 'OnlineResource': _ol_xml_.makeObjectPropertySetter( - _ol_format_XLink_.readHref), + XLink.readHref), 'ContactInformation': _ol_xml_.makeObjectPropertySetter( WMSCapabilities.readContactInformation_), 'Fees': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString), @@ -648,7 +648,7 @@ WMSCapabilities.ATTRIBUTION_PARSERS_ = _ol_xml_.makeStructureNS( WMSCapabilities.NAMESPACE_URIS_, { 'Title': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString), 'OnlineResource': _ol_xml_.makeObjectPropertySetter( - _ol_format_XLink_.readHref), + XLink.readHref), 'LogoURL': _ol_xml_.makeObjectPropertySetter( WMSCapabilities.readSizedFormatOnlineresource_) }); @@ -755,7 +755,7 @@ WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_ = _ol_xml_.makeStructureNS(WMSCapabilities.NAMESPACE_URIS_, { 'Format': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString), 'OnlineResource': _ol_xml_.makeObjectPropertySetter( - _ol_format_XLink_.readHref) + XLink.readHref) }); diff --git a/src/ol/format/WMTSCapabilities.js b/src/ol/format/WMTSCapabilities.js index ae4dc8fd65..0c240ba383 100644 --- a/src/ol/format/WMTSCapabilities.js +++ b/src/ol/format/WMTSCapabilities.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import {boundingExtent} from '../extent.js'; import OWS from '../format/OWS.js'; -import _ol_format_XLink_ from '../format/XLink.js'; +import XLink from '../format/XLink.js'; import _ol_format_XML_ from '../format/XML.js'; import _ol_format_XSD_ from '../format/XSD.js'; import _ol_xml_ from '../xml.js'; @@ -199,7 +199,7 @@ _ol_format_WMTSCapabilities_.readWgs84BoundingBox_ = function(node, objectStack) _ol_format_WMTSCapabilities_.readLegendUrl_ = function(node, objectStack) { var legend = {}; legend['format'] = node.getAttribute('format'); - legend['href'] = _ol_format_XLink_.readHref(node); + legend['href'] = XLink.readHref(node); return legend; }; diff --git a/src/ol/format/XLink.js b/src/ol/format/XLink.js index 4b60661f50..c61a00e15d 100644 --- a/src/ol/format/XLink.js +++ b/src/ol/format/XLink.js @@ -1,21 +1,21 @@ /** * @module ol/format/XLink */ -var _ol_format_XLink_ = {}; +var XLink = {}; /** * @const * @type {string} */ -_ol_format_XLink_.NAMESPACE_URI = 'http://www.w3.org/1999/xlink'; +XLink.NAMESPACE_URI = 'http://www.w3.org/1999/xlink'; /** * @param {Node} node Node. * @return {boolean|undefined} Boolean. */ -_ol_format_XLink_.readHref = function(node) { - return node.getAttributeNS(_ol_format_XLink_.NAMESPACE_URI, 'href'); +XLink.readHref = function(node) { + return node.getAttributeNS(XLink.NAMESPACE_URI, 'href'); }; -export default _ol_format_XLink_; +export default XLink;