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

Rename _ol_format_XLink_ to KXLink

Browse Source
This commit is contained in:
Tim Schaub
2017-12-17 02:22:12 -07:00
parent 53cc0ad3ff
commit 2aeef0b120
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/format/OWS.js
View File

@@ -2,7 +2,7 @@
* @module ol/format/OWS * @module ol/format/OWS
*/ */
import {inherits} from '../index.js'; 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_XML_ from '../format/XML.js';
import _ol_format_XSD_ from '../format/XSD.js'; import _ol_format_XSD_ from '../format/XSD.js';
import _ol_xml_ from '../xml.js'; import _ol_xml_ from '../xml.js';
@@ -113,7 +113,7 @@ OWS.readDcp_ = function(node, objectStack) {
* @return {Object|undefined} The GET object. * @return {Object|undefined} The GET object.
*/ */
OWS.readGet_ = function(node, objectStack) { OWS.readGet_ = function(node, objectStack) {
var href = _ol_format_XLink_.readHref(node); var href = XLink.readHref(node);
if (!href) { if (!href) {
return undefined; return undefined;
} }
@@ -423,7 +423,7 @@ OWS.SERVICE_PROVIDER_PARSERS_ =
_ol_xml_.makeStructureNS( _ol_xml_.makeStructureNS(
OWS.NAMESPACE_URIS_, { OWS.NAMESPACE_URIS_, {
'ProviderName': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString), '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( 'ServiceContact': _ol_xml_.makeObjectPropertySetter(
OWS.readServiceContact_) OWS.readServiceContact_)
}); });

8
src/ol/format/WMSCapabilities.js
View File

@@ -2,7 +2,7 @@
* @module ol/format/WMSCapabilities * @module ol/format/WMSCapabilities
*/ */
import {inherits} from '../index.js'; 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_XML_ from '../format/XML.js';
import _ol_format_XSD_ from '../format/XSD.js'; import _ol_format_XSD_ from '../format/XSD.js';
import _ol_xml_ from '../xml.js'; import _ol_xml_ from '../xml.js';
@@ -519,7 +519,7 @@ WMSCapabilities.SERVICE_PARSERS_ = _ol_xml_.makeStructureNS(
'KeywordList': _ol_xml_.makeObjectPropertySetter( 'KeywordList': _ol_xml_.makeObjectPropertySetter(
WMSCapabilities.readKeywordList_), WMSCapabilities.readKeywordList_),
'OnlineResource': _ol_xml_.makeObjectPropertySetter( 'OnlineResource': _ol_xml_.makeObjectPropertySetter(
_ol_format_XLink_.readHref), XLink.readHref),
'ContactInformation': _ol_xml_.makeObjectPropertySetter( 'ContactInformation': _ol_xml_.makeObjectPropertySetter(
WMSCapabilities.readContactInformation_), WMSCapabilities.readContactInformation_),
'Fees': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString), 'Fees': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
@@ -648,7 +648,7 @@ WMSCapabilities.ATTRIBUTION_PARSERS_ = _ol_xml_.makeStructureNS(
WMSCapabilities.NAMESPACE_URIS_, { WMSCapabilities.NAMESPACE_URIS_, {
'Title': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString), 'Title': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
'OnlineResource': _ol_xml_.makeObjectPropertySetter( 'OnlineResource': _ol_xml_.makeObjectPropertySetter(
_ol_format_XLink_.readHref), XLink.readHref),
'LogoURL': _ol_xml_.makeObjectPropertySetter( 'LogoURL': _ol_xml_.makeObjectPropertySetter(
WMSCapabilities.readSizedFormatOnlineresource_) WMSCapabilities.readSizedFormatOnlineresource_)
}); });
@@ -755,7 +755,7 @@ WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_ =
_ol_xml_.makeStructureNS(WMSCapabilities.NAMESPACE_URIS_, { _ol_xml_.makeStructureNS(WMSCapabilities.NAMESPACE_URIS_, {
'Format': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString), 'Format': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
'OnlineResource': _ol_xml_.makeObjectPropertySetter( 'OnlineResource': _ol_xml_.makeObjectPropertySetter(
_ol_format_XLink_.readHref) XLink.readHref)
}); });

4
src/ol/format/WMTSCapabilities.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import {boundingExtent} from '../extent.js'; import {boundingExtent} from '../extent.js';
import OWS from '../format/OWS.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_XML_ from '../format/XML.js';
import _ol_format_XSD_ from '../format/XSD.js'; import _ol_format_XSD_ from '../format/XSD.js';
import _ol_xml_ from '../xml.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) { _ol_format_WMTSCapabilities_.readLegendUrl_ = function(node, objectStack) {
var legend = {}; var legend = {};
legend['format'] = node.getAttribute('format'); legend['format'] = node.getAttribute('format');
legend['href'] = _ol_format_XLink_.readHref(node); legend['href'] = XLink.readHref(node);
return legend; return legend;
}; };

10
src/ol/format/XLink.js
View File

@@ -1,21 +1,21 @@
/** /**
* @module ol/format/XLink * @module ol/format/XLink
*/ */
var _ol_format_XLink_ = {}; var XLink = {};
/** /**
* @const * @const
* @type {string} * @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. * @param {Node} node Node.
* @return {boolean|undefined} Boolean. * @return {boolean|undefined} Boolean.
*/ */
_ol_format_XLink_.readHref = function(node) { XLink.readHref = function(node) {
return node.getAttributeNS(_ol_format_XLink_.NAMESPACE_URI, 'href'); return node.getAttributeNS(XLink.NAMESPACE_URI, 'href');
}; };
export default _ol_format_XLink_; export default XLink;