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

Merge pull request #7823 from fredj/f7801

Browse Source 
Replace static members with named exports
This commit is contained in:
Frédéric Junod
2018-02-14 13:05:36 +01:00
committed by GitHub
parent 55dbbde37e 48bb187075
commit 18fa8ddc58
16 changed files with 137 additions and 157 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
*/
import {inherits} from '../index.js';
import XLink from '../format/XLink.js';
import {readHref} from '../format/XLink.js';
import XML from '../format/XML.js';
import XSD from '../format/XSD.js';
import {makeObjectPropertyPusher, makeObjectPropertySetter, makeStructureNS, pushParseAndPop} from '../xml.js';
@@ -193,7 +193,7 @@ const SERVICE_PROVIDER_PARSERS =
makeStructureNS(
NAMESPACE_URIS, {
'ProviderName': makeObjectPropertySetter(XSD.readString),
'ProviderSite': makeObjectPropertySetter(XLink.readHref),
'ProviderSite': makeObjectPropertySetter(readHref),
'ServiceContact': makeObjectPropertySetter(
readServiceContact)
});
@@ -288,7 +288,7 @@ function readDcp(node, objectStack) {
* @return {Object|undefined} The GET object.
*/
function readGet(node, objectStack) {
const href = XLink.readHref(node);
const href = readHref(node);
if (!href) {
return undefined;
}

154
src/ol/format/WFS.js
View File

@@ -16,6 +16,53 @@ import {createElementNS, isDocument, isNode, makeArrayPusher, makeChildAppender,
makeObjectPropertySetter, makeSimpleNodeFactory, parse, parseNode,
pushParseAndPop, pushSerializeAndPop, setAttributeNS} from '../xml.js';
/**
* @type {string}
*/
const FEATURE_PREFIX = 'feature';
/**
* @type {string}
*/
const XMLNS = 'http://www.w3.org/2000/xmlns/';
/**
* @type {string}
*/
const OGCNS = 'http://www.opengis.net/ogc';
/**
* @type {string}
*/
const WFSNS = 'http://www.opengis.net/wfs';
/**
* @type {string}
*/
const FESNS = 'http://www.opengis.net/fes';
/**
* @type {Object.<string, string>}
*/
const SCHEMA_LOCATIONS = {
'1.1.0': 'http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd',
'1.0.0': 'http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd'
};
/**
* @const
* @type {string}
*/
const DEFAULT_VERSION = '1.1.0';
/**
* @classdesc
* Feature format for reading and writing data in the WFS format.
@@ -56,8 +103,7 @@ const WFS = function(opt_options) {
* @type {string}
*/
this.schemaLocation_ = options.schemaLocation ?
options.schemaLocation :
WFS.SCHEMA_LOCATIONS[WFS.DEFAULT_VERSION];
options.schemaLocation : SCHEMA_LOCATIONS[DEFAULT_VERSION];
XMLFeature.call(this);
};
@@ -65,60 +111,6 @@ const WFS = function(opt_options) {
inherits(WFS, XMLFeature);
/**
* @const
* @type {string}
*/
WFS.FEATURE_PREFIX = 'feature';
/**
* @const
* @type {string}
*/
WFS.XMLNS = 'http://www.w3.org/2000/xmlns/';
/**
* @const
* @type {string}
*/
WFS.OGCNS = 'http://www.opengis.net/ogc';
/**
* @const
* @type {string}
*/
WFS.WFSNS = 'http://www.opengis.net/wfs';
/**
* @const
* @type {string}
*/
WFS.FESNS = 'http://www.opengis.net/fes';
/**
* @const
* @type {Object.<string, string>}
*/
WFS.SCHEMA_LOCATIONS = {
'1.1.0': 'http://www.opengis.net/wfs ' +
'http://schemas.opengis.net/wfs/1.1.0/wfs.xsd',
'1.0.0': 'http://www.opengis.net/wfs ' +
'http://schemas.opengis.net/wfs/1.0.0/wfs.xsd'
};
/**
* @const
* @type {string}
*/
WFS.DEFAULT_VERSION = '1.1.0';
/**
* @return {Array.<string>|string|undefined} featureType
*/
@@ -405,8 +397,8 @@ function writeFeature(node, feature, objectStack) {
* @param {Array.<*>} objectStack Node stack.
*/
function writeOgcFidFilter(node, fid, objectStack) {
const filter = createElementNS(WFS.OGCNS, 'Filter');
const child = createElementNS(WFS.OGCNS, 'FeatureId');
const filter = createElementNS(OGCNS, 'Filter');
const child = createElementNS(OGCNS, 'FeatureId');
filter.appendChild(child);
child.setAttribute('fid', fid);
node.appendChild(filter);
@@ -419,8 +411,7 @@ function writeOgcFidFilter(node, fid, objectStack) {
* @returns {string} The value of the typeName property.
*/
function getTypeName(featurePrefix, featureType) {
featurePrefix = featurePrefix ? featurePrefix :
WFS.FEATURE_PREFIX;
featurePrefix = featurePrefix ? featurePrefix : FEATURE_PREFIX;
const prefix = featurePrefix + ':';
// The featureType already contains the prefix.
if (featureType.indexOf(prefix) === 0) {
@@ -444,8 +435,7 @@ function writeDelete(node, feature, objectStack) {
const featureNS = context['featureNS'];
const typeName = getTypeName(featurePrefix, featureType);
node.setAttribute('typeName', typeName);
setAttributeNS(node, WFS.XMLNS, 'xmlns:' + featurePrefix,
featureNS);
setAttributeNS(node, XMLNS, 'xmlns:' + featurePrefix, featureNS);
const fid = feature.getId();
if (fid !== undefined) {
writeOgcFidFilter(node, fid, objectStack);
@@ -481,8 +471,7 @@ function writeUpdate(node, feature, objectStack) {
const typeName = getTypeName(featurePrefix, featureType);
const geometryName = feature.getGeometryName();
node.setAttribute('typeName', typeName);
setAttributeNS(node, WFS.XMLNS, 'xmlns:' + featurePrefix,
featureNS);
setAttributeNS(node, XMLNS, 'xmlns:' + featurePrefix, featureNS);
const fid = feature.getId();
if (fid !== undefined) {
const keys = feature.getKeys();
@@ -514,13 +503,13 @@ function writeUpdate(node, feature, objectStack) {
* @param {Array.<*>} objectStack Node stack.
*/
function writeProperty(node, pair, objectStack) {
const name = createElementNS(WFS.WFSNS, 'Name');
const name = createElementNS(WFSNS, 'Name');
const context = objectStack[objectStack.length - 1];
const gmlVersion = context['gmlVersion'];
node.appendChild(name);
XSD.writeStringTextNode(name, pair.name);
if (pair.value !== undefined && pair.value !== null) {
const value = createElementNS(WFS.WFSNS, 'Value');
const value = createElementNS(WFSNS, 'Value');
node.appendChild(value);
if (pair.value instanceof Geometry) {
if (gmlVersion === 2) {
@@ -608,8 +597,7 @@ function writeQuery(node, featureType, objectStack) {
node.setAttribute('srsName', srsName);
}
if (featureNS) {
setAttributeNS(node, WFS.XMLNS, 'xmlns:' + featurePrefix,
featureNS);
setAttributeNS(node, XMLNS, 'xmlns:' + featurePrefix, featureNS);
}
const item = /** @type {ol.XmlNodeStackItem} */ (assign({}, context));
item.node = node;
@@ -619,7 +607,7 @@ function writeQuery(node, featureType, objectStack) {
objectStack);
const filter = context['filter'];
if (filter) {
const child = createElementNS(WFS.OGCNS, 'Filter');
const child = createElementNS(OGCNS, 'Filter');
node.appendChild(child);
writeFilterCondition(child, filter, objectStack);
}
@@ -704,7 +692,7 @@ function writeWithinFilter(node, filter, objectStack) {
*/
function writeDuringFilter(node, filter, objectStack) {
const valueReference = createElementNS(WFS.FESNS, 'ValueReference');
const valueReference = createElementNS(FESNS, 'ValueReference');
XSD.writeStringTextNode(valueReference, filter.propertyName);
node.appendChild(valueReference);
@@ -789,11 +777,11 @@ function writeIsNullFilter(node, filter, objectStack) {
function writeIsBetweenFilter(node, filter, objectStack) {
writeOgcPropertyName(node, filter.propertyName);
const lowerBoundary = createElementNS(WFS.OGCNS, 'LowerBoundary');
const lowerBoundary = createElementNS(OGCNS, 'LowerBoundary');
node.appendChild(lowerBoundary);
writeOgcLiteral(lowerBoundary, '' + filter.lowerBoundary);
const upperBoundary = createElementNS(WFS.OGCNS, 'UpperBoundary');
const upperBoundary = createElementNS(OGCNS, 'UpperBoundary');
node.appendChild(upperBoundary);
writeOgcLiteral(upperBoundary, '' + filter.upperBoundary);
}
@@ -822,7 +810,7 @@ function writeIsLikeFilter(node, filter, objectStack) {
* @param {string} value Value.
*/
function writeOgcExpression(tagName, node, value) {
const property = createElementNS(WFS.OGCNS, tagName);
const property = createElementNS(OGCNS, tagName);
XSD.writeStringTextNode(property, value);
node.appendChild(property);
}
@@ -867,11 +855,11 @@ function writeTimeInstant(node, time) {
* @return {Node} Result.
* @api
*/
WFS.writeFilter = function(filter) {
const child = createElementNS(WFS.OGCNS, 'Filter');
export function writeFilter(filter) {
const child = createElementNS(OGCNS, 'Filter');
writeFilterCondition(child, filter, []);
return child;
};
}
/**
@@ -898,7 +886,7 @@ function writeGetFeature(node, featureTypes, objectStack) {
* @api
*/
WFS.prototype.writeGetFeature = function(options) {
const node = createElementNS(WFS.WFSNS, 'GetFeature');
const node = createElementNS(WFSNS, 'GetFeature');
node.setAttribute('service', 'WFS');
node.setAttribute('version', '1.1.0');
let filter;
@@ -964,12 +952,10 @@ WFS.prototype.writeGetFeature = function(options) {
* @return {Node} Result.
* @api
*/
WFS.prototype.writeTransaction = function(inserts, updates, deletes,
options) {
WFS.prototype.writeTransaction = function(inserts, updates, deletes, options) {
const objectStack = [];
const node = createElementNS(WFS.WFSNS, 'Transaction');
const version = options.version ?
options.version : WFS.DEFAULT_VERSION;
const node = createElementNS(WFSNS, 'Transaction');
const version = options.version ? options.version : DEFAULT_VERSION;
const gmlVersion = version === '1.0.0' ? 2 : 3;
node.setAttribute('service', 'WFS');
node.setAttribute('version', version);
@@ -982,10 +968,10 @@ WFS.prototype.writeTransaction = function(inserts, updates, deletes,
node.setAttribute('handle', options.handle);
}
}
const schemaLocation = WFS.SCHEMA_LOCATIONS[version];
const schemaLocation = SCHEMA_LOCATIONS[version];
setAttributeNS(node, 'http://www.w3.org/2001/XMLSchema-instance',
'xsi:schemaLocation', schemaLocation);
const featurePrefix = options.featurePrefix ? options.featurePrefix : WFS.FEATURE_PREFIX;
const featurePrefix = options.featurePrefix ? options.featurePrefix : FEATURE_PREFIX;
if (inserts) {
obj = {node: node, 'featureNS': options.featureNS,
'featureType': options.featureType, 'featurePrefix': featurePrefix,

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

@@ -2,7 +2,7 @@
* @module ol/format/WMSCapabilities
*/
import {inherits} from '../index.js';
import XLink from '../format/XLink.js';
import {readHref} from '../format/XLink.js';
import XML from '../format/XML.js';
import XSD from '../format/XSD.js';
import {makeArrayPusher, makeObjectPropertyPusher, makeObjectPropertySetter,
@@ -73,7 +73,7 @@ const SERVICE_PARSERS = makeStructureNS(
'Title': makeObjectPropertySetter(XSD.readString),
'Abstract': makeObjectPropertySetter(XSD.readString),
'KeywordList': makeObjectPropertySetter(readKeywordList),
'OnlineResource': makeObjectPropertySetter(XLink.readHref),
'OnlineResource': makeObjectPropertySetter(readHref),
'ContactInformation': makeObjectPropertySetter(readContactInformation),
'Fees': makeObjectPropertySetter(XSD.readString),
'AccessConstraints': makeObjectPropertySetter(XSD.readString),
@@ -168,7 +168,7 @@ const LAYER_PARSERS = makeStructureNS(
const ATTRIBUTION_PARSERS = makeStructureNS(
NAMESPACE_URIS, {
'Title': makeObjectPropertySetter(XSD.readString),
'OnlineResource': makeObjectPropertySetter(XLink.readHref),
'OnlineResource': makeObjectPropertySetter(readHref),
'LogoURL': makeObjectPropertySetter(readSizedFormatOnlineresource)
});
@@ -252,7 +252,7 @@ const STYLE_PARSERS = makeStructureNS(
const FORMAT_ONLINERESOURCE_PARSERS =
makeStructureNS(NAMESPACE_URIS, {
'Format': makeObjectPropertySetter(XSD.readString),
'OnlineResource': makeObjectPropertySetter(XLink.readHref)
'OnlineResource': makeObjectPropertySetter(readHref)
});

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

@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import {boundingExtent} from '../extent.js';
import OWS from '../format/OWS.js';
import XLink from '../format/XLink.js';
import {readHref} from '../format/XLink.js';
import XML from '../format/XML.js';
import XSD from '../format/XSD.js';
import {pushParseAndPop, makeStructureNS,
@@ -344,7 +344,7 @@ function readWgs84BoundingBox(node, objectStack) {
function readLegendUrl(node, objectStack) {
const legend = {};
legend['format'] = node.getAttribute('format');
legend['href'] = XLink.readHref(node);
legend['href'] = readHref(node);
return legend;
}

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

@@ -1,7 +1,6 @@
/**
* @module ol/format/XLink
*/
const XLink = {};
/**
@@ -15,7 +14,6 @@ const NAMESPACE_URI = 'http://www.w3.org/1999/xlink';
* @param {Node} node Node.
* @return {boolean|undefined} Boolean.
*/
XLink.readHref = function(node) {
export function readHref(node) {
return node.getAttributeNS(NAMESPACE_URI, 'href');
};
export default XLink;
}