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

Merge pull request #204 from bartvde/wmscapsfixes

Browse Source 
fixes for the WMS capabilities parser (r=@elemoine)
This commit is contained in:
Bart van den Eijnden
2013-02-20 00:48:30 -08:00
parent eef683fcdb 793a956211
commit efefb2554a
12 changed files with 729 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/wms-capabilities.html
+1 -1
View File
@@ -13,9 +13,9 @@
height: 100%; height: 100%;
} }
#log { #log {
height: 500px;
position: absolute; position: absolute;
top: 130px; top: 130px;
font-size: 12px;
} }
#text { #text {
position: absolute; position: absolute;
examples/wms-capabilities.js
+14 -21
View File
@@ -1,26 +1,19 @@
goog.require('goog.debug.Console');
goog.require('goog.debug.DivConsole');
goog.require('goog.debug.Logger');
goog.require('goog.debug.Logger.Level');
goog.require('goog.json.Serializer');
goog.require('goog.net.XhrIo');
goog.require('ol.parser.ogc.WMSCapabilities'); goog.require('ol.parser.ogc.WMSCapabilities');
if (goog.DEBUG) {
goog.debug.Console.autoInstall();
goog.debug.Logger.getLogger('ol').setLevel(goog.debug.Logger.Level.INFO);
var logconsole = new goog.debug.DivConsole(goog.dom.getElement('log'));
logconsole.setCapturing(true);
}
var parser = new ol.parser.ogc.WMSCapabilities(), result; var parser = new ol.parser.ogc.WMSCapabilities(), result;
var url = '../test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/ogcsample.xml'; var url = '../test/spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/ogcsample.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target; var xhr = new XMLHttpRequest();
result = parser.read(xhr.getResponseXml()); xhr.open('GET', url, true);
if (goog.DEBUG) {
var output = new goog.json.Serializer().serialize(result);
goog.debug.Logger.getLogger('ol').info(output); /**
* onload handler for the XHR request.
*/
xhr.onload = function() {
if (xhr.status == 200) {
result = parser.read(xhr.responseXML);
document.getElementById('log').innerHTML = window.JSON.stringify(result);
} }
}); };
xhr.send();
src/ol/parser/ogc/wmscapabilities_v1.js
+113 -118
View File
@@ -19,17 +19,17 @@ ol.parser.ogc.WMSCapabilities_v1 = function() {
this.readChildNodes(node, obj['service']); this.readChildNodes(node, obj['service']);
}, },
'Name': function(node, obj) { 'Name': function(node, obj) {
obj.name = this.getChildValue(node); obj['name'] = this.getChildValue(node);
}, },
'Title': function(node, obj) { 'Title': function(node, obj) {
obj.title = this.getChildValue(node); obj['title'] = this.getChildValue(node);
}, },
'Abstract': function(node, obj) { 'Abstract': function(node, obj) {
obj['abstract'] = this.getChildValue(node); obj['abstract'] = this.getChildValue(node);
}, },
'BoundingBox': function(node, obj) { 'BoundingBox': function(node, obj) {
var bbox = {}; var bbox = {};
bbox.bbox = [ bbox['bbox'] = [
parseFloat(node.getAttribute('minx')), parseFloat(node.getAttribute('minx')),
parseFloat(node.getAttribute('miny')), parseFloat(node.getAttribute('miny')),
parseFloat(node.getAttribute('maxx')), parseFloat(node.getAttribute('maxx')),
@@ -40,96 +40,96 @@ ol.parser.ogc.WMSCapabilities_v1 = function() {
y: parseFloat(node.getAttribute('resy')) y: parseFloat(node.getAttribute('resy'))
}; };
if (! (isNaN(res.x) && isNaN(res.y))) { if (! (isNaN(res.x) && isNaN(res.y))) {
bbox.res = res; bbox['res'] = res;
} }
// return the bbox so that descendant classes can set the // return the bbox so that descendant classes can set the
// CRS and SRS and add it to the obj // CRS and SRS and add it to the obj
return bbox; return bbox;
}, },
'OnlineResource': function(node, obj) { 'OnlineResource': function(node, obj) {
obj.href = this.getAttributeNS(node, 'http://www.w3.org/1999/xlink', obj['href'] = this.getAttributeNS(node, 'http://www.w3.org/1999/xlink',
'href'); 'href');
}, },
'ContactInformation': function(node, obj) { 'ContactInformation': function(node, obj) {
obj.contactInformation = {}; obj['contactInformation'] = {};
this.readChildNodes(node, obj.contactInformation); this.readChildNodes(node, obj['contactInformation']);
}, },
'ContactPersonPrimary': function(node, obj) { 'ContactPersonPrimary': function(node, obj) {
obj.personPrimary = {}; obj['personPrimary'] = {};
this.readChildNodes(node, obj.personPrimary); this.readChildNodes(node, obj['personPrimary']);
}, },
'ContactPerson': function(node, obj) { 'ContactPerson': function(node, obj) {
obj.person = this.getChildValue(node); obj['person'] = this.getChildValue(node);
}, },
'ContactOrganization': function(node, obj) { 'ContactOrganization': function(node, obj) {
obj.organization = this.getChildValue(node); obj['organization'] = this.getChildValue(node);
}, },
'ContactPosition': function(node, obj) { 'ContactPosition': function(node, obj) {
obj.position = this.getChildValue(node); obj['position'] = this.getChildValue(node);
}, },
'ContactAddress': function(node, obj) { 'ContactAddress': function(node, obj) {
obj.contactAddress = {}; obj['contactAddress'] = {};
this.readChildNodes(node, obj.contactAddress); this.readChildNodes(node, obj['contactAddress']);
}, },
'AddressType': function(node, obj) { 'AddressType': function(node, obj) {
obj.type = this.getChildValue(node); obj['type'] = this.getChildValue(node);
}, },
'Address': function(node, obj) { 'Address': function(node, obj) {
obj.address = this.getChildValue(node); obj['address'] = this.getChildValue(node);
}, },
'City': function(node, obj) { 'City': function(node, obj) {
obj.city = this.getChildValue(node); obj['city'] = this.getChildValue(node);
}, },
'StateOrProvince': function(node, obj) { 'StateOrProvince': function(node, obj) {
obj.stateOrProvince = this.getChildValue(node); obj['stateOrProvince'] = this.getChildValue(node);
}, },
'PostCode': function(node, obj) { 'PostCode': function(node, obj) {
obj.postcode = this.getChildValue(node); obj['postcode'] = this.getChildValue(node);
}, },
'Country': function(node, obj) { 'Country': function(node, obj) {
obj.country = this.getChildValue(node); obj['country'] = this.getChildValue(node);
}, },
'ContactVoiceTelephone': function(node, obj) { 'ContactVoiceTelephone': function(node, obj) {
obj.phone = this.getChildValue(node); obj['phone'] = this.getChildValue(node);
}, },
'ContactFacsimileTelephone': function(node, obj) { 'ContactFacsimileTelephone': function(node, obj) {
obj.fax = this.getChildValue(node); obj['fax'] = this.getChildValue(node);
}, },
'ContactElectronicMailAddress': function(node, obj) { 'ContactElectronicMailAddress': function(node, obj) {
obj.email = this.getChildValue(node); obj['email'] = this.getChildValue(node);
}, },
'Fees': function(node, obj) { 'Fees': function(node, obj) {
var fees = this.getChildValue(node); var fees = this.getChildValue(node);
if (fees && fees.toLowerCase() != 'none') { if (fees && fees.toLowerCase() != 'none') {
obj.fees = fees; obj['fees'] = fees;
} }
}, },
'AccessConstraints': function(node, obj) { 'AccessConstraints': function(node, obj) {
var constraints = this.getChildValue(node); var constraints = this.getChildValue(node);
if (constraints && constraints.toLowerCase() != 'none') { if (constraints && constraints.toLowerCase() != 'none') {
obj.accessConstraints = constraints; obj['accessConstraints'] = constraints;
} }
}, },
'Capability': function(node, obj) { 'Capability': function(node, obj) {
obj.capability = { obj['capability'] = {};
nestedLayers: [], obj['capability']['nestedLayers'] = [];
layers: [] obj['capability']['layers'] = [];
}; this.readChildNodes(node, obj['capability']);
this.readChildNodes(node, obj.capability);
}, },
'Request': function(node, obj) { 'Request': function(node, obj) {
obj.request = {}; obj['request'] = {};
this.readChildNodes(node, obj.request); this.readChildNodes(node, obj['request']);
}, },
'GetCapabilities': function(node, obj) { 'GetCapabilities': function(node, obj) {
obj.getcapabilities = {formats: []}; obj['getcapabilities'] = {};
this.readChildNodes(node, obj.getcapabilities); obj['getcapabilities']['formats'] = [];
this.readChildNodes(node, obj['getcapabilities']);
}, },
'Format': function(node, obj) { 'Format': function(node, obj) {
if (goog.isArray(obj.formats)) { if (goog.isArray(obj['formats'])) {
obj.formats.push(this.getChildValue(node)); obj['formats'].push(this.getChildValue(node));
} else { } else {
obj.format = this.getChildValue(node); obj['format'] = this.getChildValue(node);
} }
}, },
'DCPType': function(node, obj) { 'DCPType': function(node, obj) {
@@ -139,37 +139,32 @@ ol.parser.ogc.WMSCapabilities_v1 = function() {
this.readChildNodes(node, obj); this.readChildNodes(node, obj);
}, },
'Get': function(node, obj) { 'Get': function(node, obj) {
obj.get = {}; obj['get'] = {};
this.readChildNodes(node, obj.get); this.readChildNodes(node, obj['get']);
// backwards compatibility
if (!obj.href) {
obj.href = obj.get.href;
}
}, },
'Post': function(node, obj) { 'Post': function(node, obj) {
obj.post = {}; obj['post'] = {};
this.readChildNodes(node, obj.post); this.readChildNodes(node, obj['post']);
// backwards compatibility
if (!obj.href) {
obj.href = obj.get.href;
}
}, },
'GetMap': function(node, obj) { 'GetMap': function(node, obj) {
obj.getmap = {formats: []}; obj['getmap'] = {};
this.readChildNodes(node, obj.getmap); obj['getmap']['formats'] = [];
this.readChildNodes(node, obj['getmap']);
}, },
'GetFeatureInfo': function(node, obj) { 'GetFeatureInfo': function(node, obj) {
obj.getfeatureinfo = {formats: []}; obj['getfeatureinfo'] = {};
this.readChildNodes(node, obj.getfeatureinfo); obj['getfeatureinfo']['formats'] = [];
this.readChildNodes(node, obj['getfeatureinfo']);
}, },
'Exception': function(node, obj) { 'Exception': function(node, obj) {
obj.exception = {formats: []}; obj['exception'] = {};
this.readChildNodes(node, obj.exception); obj['exception']['formats'] = [];
this.readChildNodes(node, obj['exception']);
}, },
'Layer': function(node, obj) { 'Layer': function(node, obj) {
var parentLayer, capability; var parentLayer, capability;
if (obj.capability) { if (obj['capability']) {
capability = obj.capability; capability = obj['capability'];
parentLayer = obj; parentLayer = obj;
} else { } else {
capability = obj; capability = obj;
@@ -188,113 +183,113 @@ ol.parser.ogc.WMSCapabilities_v1 = function() {
var fixedHeight = node.getAttribute('fixedHeight'); var fixedHeight = node.getAttribute('fixedHeight');
var parent = parentLayer || {}; var parent = parentLayer || {};
var layer = { var layer = {
nestedLayers: [], 'nestedLayers': [],
styles: parentLayer ? [].concat(parentLayer.styles) : [], 'styles': parentLayer ? [].concat(parentLayer['styles']) : [],
srs: {}, 'srs': {},
metadataURLs: [], 'metadataURLs': [],
bbox: {}, 'bbox': {},
llbbox: parent.llbbox, 'llbbox': parent['llbbox'],
dimensions: {}, 'dimensions': {},
authorityURLs: {}, 'authorityURLs': {},
identifiers: {}, 'identifiers': {},
keywords: [], 'keywords': [],
queryable: (queryable && queryable !== '') ? 'queryable': (queryable && queryable !== '') ?
(queryable === '1' || queryable === 'true') : (queryable === '1' || queryable === 'true') :
(parent.queryable || false), (parent['queryable'] || false),
cascaded: (cascaded !== null) ? parseInt(cascaded, 10) : 'cascaded': (cascaded !== null) ? parseInt(cascaded, 10) :
(parent.cascaded || 0), (parent['cascaded'] || 0),
opaque: opaque ? 'opaque': opaque ?
(opaque === '1' || opaque === 'true') : (opaque === '1' || opaque === 'true') :
(parent.opaque || false), (parent['opaque'] || false),
noSubsets: (noSubsets !== null) ? 'noSubsets': (noSubsets !== null) ?
(noSubsets === '1' || noSubsets === 'true') : (noSubsets === '1' || noSubsets === 'true') :
(parent.noSubsets || false), (parent['noSubsets'] || false),
fixedWidth: (fixedWidth !== null) ? 'fixedWidth': (fixedWidth !== null) ?
parseInt(fixedWidth, 10) : (parent.fixedWidth || 0), parseInt(fixedWidth, 10) : (parent['fixedWidth'] || 0),
fixedHeight: (fixedHeight !== null) ? 'fixedHeight': (fixedHeight !== null) ?
parseInt(fixedHeight, 10) : (parent.fixedHeight || 0), parseInt(fixedHeight, 10) : (parent['fixedHeight'] || 0),
minScale: parent.minScale, 'minScale': parent['minScale'],
maxScale: parent.maxScale, 'maxScale': parent['maxScale'],
attribution: parent.attribution 'attribution': parent['attribution']
}; };
if (parentLayer) { if (parentLayer) {
goog.object.extend(layer.srs, parent.srs); goog.object.extend(layer['srs'], parent['srs']);
goog.object.extend(layer.bbox, parent.bbox); goog.object.extend(layer['bbox'], parent['bbox']);
goog.object.extend(layer.dimensions, parent.dimensions); goog.object.extend(layer['dimensions'], parent['dimensions']);
goog.object.extend(layer.authorityURLs, parent.authorityURLs); goog.object.extend(layer['authorityURLs'], parent['authorityURLs']);
} }
obj.nestedLayers.push(layer); obj['nestedLayers'].push(layer);
layer.capability = capability; layer['capability'] = capability;
this.readChildNodes(node, layer); this.readChildNodes(node, layer);
delete layer.capability; delete layer['capability'];
if (layer.name) { if (layer['name']) {
var parts = layer.name.split(':'), var parts = layer['name'].split(':'),
request = capability.request, request = capability['request'],
gfi = request.getfeatureinfo; gfi = request['getfeatureinfo'];
if (parts.length > 0) { if (parts.length > 0) {
layer.prefix = parts[0]; layer['prefix'] = parts[0];
} }
capability.layers.push(layer); capability['layers'].push(layer);
if (layer.formats === undefined) { if (layer['formats'] === undefined) {
layer.formats = request.getmap.formats; layer['formats'] = request['getmap']['formats'];
} }
if (layer.infoFormats === undefined && gfi) { if (layer['infoFormats'] === undefined && gfi) {
layer.infoFormats = gfi.formats; layer['infoFormats'] = gfi['formats'];
} }
} }
}, },
'Attribution': function(node, obj) { 'Attribution': function(node, obj) {
obj.attribution = {}; obj['attribution'] = {};
this.readChildNodes(node, obj.attribution); this.readChildNodes(node, obj['attribution']);
}, },
'LogoURL': function(node, obj) { 'LogoURL': function(node, obj) {
obj.logo = { obj['logo'] = {
width: node.getAttribute('width'), 'width': node.getAttribute('width'),
height: node.getAttribute('height') 'height': node.getAttribute('height')
}; };
this.readChildNodes(node, obj.logo); this.readChildNodes(node, obj['logo']);
}, },
'Style': function(node, obj) { 'Style': function(node, obj) {
var style = {}; var style = {};
obj.styles.push(style); obj['styles'].push(style);
this.readChildNodes(node, style); this.readChildNodes(node, style);
}, },
'LegendURL': function(node, obj) { 'LegendURL': function(node, obj) {
var legend = { var legend = {
width: node.getAttribute('width'), 'width': node.getAttribute('width'),
height: node.getAttribute('height') 'height': node.getAttribute('height')
}; };
obj.legend = legend; obj['legend'] = legend;
this.readChildNodes(node, legend); this.readChildNodes(node, legend);
}, },
'MetadataURL': function(node, obj) { 'MetadataURL': function(node, obj) {
var metadataURL = {type: node.getAttribute('type')}; var metadataURL = {'type': node.getAttribute('type')};
obj.metadataURLs.push(metadataURL); obj['metadataURLs'].push(metadataURL);
this.readChildNodes(node, metadataURL); this.readChildNodes(node, metadataURL);
}, },
'DataURL': function(node, obj) { 'DataURL': function(node, obj) {
obj.dataURL = {}; obj['dataURL'] = {};
this.readChildNodes(node, obj.dataURL); this.readChildNodes(node, obj['dataURL']);
}, },
'FeatureListURL': function(node, obj) { 'FeatureListURL': function(node, obj) {
obj.featureListURL = {}; obj['featureListURL'] = {};
this.readChildNodes(node, obj.featureListURL); this.readChildNodes(node, obj['featureListURL']);
}, },
'AuthorityURL': function(node, obj) { 'AuthorityURL': function(node, obj) {
var name = node.getAttribute('name'); var name = node.getAttribute('name');
var authority = {}; var authority = {};
this.readChildNodes(node, authority); this.readChildNodes(node, authority);
obj.authorityURLs[name] = authority.href; obj['authorityURLs'][name] = authority['href'];
}, },
'Identifier': function(node, obj) { 'Identifier': function(node, obj) {
var authority = node.getAttribute('authority'); var authority = node.getAttribute('authority');
obj.identifiers[authority] = this.getChildValue(node); obj['identifiers'][authority] = this.getChildValue(node);
}, },
'KeywordList': function(node, obj) { 'KeywordList': function(node, obj) {
this.readChildNodes(node, obj); this.readChildNodes(node, obj);
}, },
'SRS': function(node, obj) { 'SRS': function(node, obj) {
obj.srs[this.getChildValue(node)] = true; obj['srs'][this.getChildValue(node)] = true;
} }
} }
}; };
src/ol/parser/ogc/wmscapabilities_v1_1.js
+29 -29
View File
@@ -15,37 +15,37 @@ ol.parser.ogc.WMSCapabilities_v1_1 = function() {
this.readChildNodes(node, obj); this.readChildNodes(node, obj);
}, },
'Keyword': function(node, obj) { 'Keyword': function(node, obj) {
if (obj.keywords) { if (obj['keywords']) {
obj.keywords.push({value: this.getChildValue(node)}); obj['keywords'].push({'value': this.getChildValue(node)});
} }
}, },
'DescribeLayer': function(node, obj) { 'DescribeLayer': function(node, obj) {
obj.describelayer = {formats: []}; obj['describelayer'] = {'formats': []};
this.readChildNodes(node, obj.describelayer); this.readChildNodes(node, obj['describelayer']);
}, },
'GetLegendGraphic': function(node, obj) { 'GetLegendGraphic': function(node, obj) {
obj.getlegendgraphic = {formats: []}; obj['getlegendgraphic'] = {'formats': []};
this.readChildNodes(node, obj.getlegendgraphic); this.readChildNodes(node, obj['getlegendgraphic']);
}, },
'GetStyles': function(node, obj) { 'GetStyles': function(node, obj) {
obj.getstyles = {formats: []}; obj['getstyles'] = {'formats': []};
this.readChildNodes(node, obj.getstyles); this.readChildNodes(node, obj['getstyles']);
}, },
'PutStyles': function(node, obj) { 'PutStyles': function(node, obj) {
obj.putstyles = {formats: []}; obj['putstyles'] = {'formats': []};
this.readChildNodes(node, obj.putstyles); this.readChildNodes(node, obj['putstyles']);
}, },
'UserDefinedSymbolization': function(node, obj) { 'UserDefinedSymbolization': function(node, obj) {
var userSymbols = { var userSymbols = {
supportSLD: parseInt(node.getAttribute('SupportSLD'), 10) == 1, 'supportSLD': parseInt(node.getAttribute('SupportSLD'), 10) == 1,
userLayer: parseInt(node.getAttribute('UserLayer'), 10) == 1, 'userLayer': parseInt(node.getAttribute('UserLayer'), 10) == 1,
userStyle: parseInt(node.getAttribute('UserStyle'), 10) == 1, 'userStyle': parseInt(node.getAttribute('UserStyle'), 10) == 1,
remoteWFS: parseInt(node.getAttribute('RemoteWFS'), 10) == 1 'remoteWFS': parseInt(node.getAttribute('RemoteWFS'), 10) == 1
}; };
obj.userSymbols = userSymbols; obj['userSymbols'] = userSymbols;
}, },
'LatLonBoundingBox': function(node, obj) { 'LatLonBoundingBox': function(node, obj) {
obj.llbbox = [ obj['llbbox'] = [
parseFloat(node.getAttribute('minx')), parseFloat(node.getAttribute('minx')),
parseFloat(node.getAttribute('miny')), parseFloat(node.getAttribute('miny')),
parseFloat(node.getAttribute('maxx')), parseFloat(node.getAttribute('maxx')),
@@ -54,8 +54,8 @@ ol.parser.ogc.WMSCapabilities_v1_1 = function() {
}, },
'BoundingBox': function(node, obj) { 'BoundingBox': function(node, obj) {
var bbox = bboxreader.apply(this, arguments); var bbox = bboxreader.apply(this, arguments);
bbox.srs = node.getAttribute('SRS'); bbox['srs'] = node.getAttribute('SRS');
obj.bbox[bbox.srs] = bbox; obj['bbox'][bbox['srs']] = bbox;
}, },
'ScaleHint': function(node, obj) { 'ScaleHint': function(node, obj) {
var min = parseFloat(node.getAttribute('min')); var min = parseFloat(node.getAttribute('min'));
@@ -64,33 +64,33 @@ ol.parser.ogc.WMSCapabilities_v1_1 = function() {
var dpi = (25.4 / 0.28); var dpi = (25.4 / 0.28);
var ipm = 39.37; var ipm = 39.37;
if (min !== 0) { if (min !== 0) {
obj.maxScale = parseFloat((min / rad2) * ipm * dpi); obj['maxScale'] = parseFloat((min / rad2) * ipm * dpi);
} }
if (max != Number.POSITIVE_INFINITY) { if (max != Number.POSITIVE_INFINITY) {
obj.minScale = parseFloat((max / rad2) * ipm * dpi); obj['minScale'] = parseFloat((max / rad2) * ipm * dpi);
} }
}, },
'Dimension': function(node, obj) { 'Dimension': function(node, obj) {
var name = node.getAttribute('name').toLowerCase(); var name = node.getAttribute('name').toLowerCase();
var dim = { var dim = {
name: name, 'name': name,
units: node.getAttribute('units'), 'units': node.getAttribute('units'),
unitsymbol: node.getAttribute('unitSymbol') 'unitsymbol': node.getAttribute('unitSymbol')
}; };
obj.dimensions[dim.name] = dim; obj['dimensions'][dim.name] = dim;
}, },
'Extent': function(node, obj) { 'Extent': function(node, obj) {
var name = node.getAttribute('name').toLowerCase(); var name = node.getAttribute('name').toLowerCase();
if (name in obj['dimensions']) { if (name in obj['dimensions']) {
var extent = obj.dimensions[name]; var extent = obj['dimensions'][name];
extent.nearestVal = extent['nearestVal'] =
node.getAttribute('nearestValue') === '1'; node.getAttribute('nearestValue') === '1';
extent.multipleVal = extent['multipleVal'] =
node.getAttribute('multipleValues') === '1'; node.getAttribute('multipleValues') === '1';
extent.current = node.getAttribute('current') === '1'; extent['current'] = node.getAttribute('current') === '1';
extent['default'] = node.getAttribute('default') || ''; extent['default'] = node.getAttribute('default') || '';
var values = this.getChildValue(node); var values = this.getChildValue(node);
extent.values = values.split(','); extent['values'] = values.split(',');
} }
} }
}); });
src/ol/parser/ogc/wmscapabilities_v1_1_0.js
+1 -1
View File
@@ -15,7 +15,7 @@ ol.parser.ogc.WMSCapabilities_v1_1_0 = function() {
var srs = this.getChildValue(node); var srs = this.getChildValue(node);
var values = srs.split(/ +/); var values = srs.split(/ +/);
for (var i = 0, len = values.length; i < len; i++) { for (var i = 0, len = values.length; i < len; i++) {
obj.srs[values[i]] = true; obj['srs'][values[i]] = true;
} }
} }
}); });
src/ol/parser/ogc/wmscapabilities_v1_1_1.js
+1 -1
View File
@@ -12,7 +12,7 @@ ol.parser.ogc.WMSCapabilities_v1_1_1 = function() {
this.version = '1.1.1'; this.version = '1.1.1';
goog.object.extend(this.readers['http://www.opengis.net/wms'], { goog.object.extend(this.readers['http://www.opengis.net/wms'], {
'SRS': function(node, obj) { 'SRS': function(node, obj) {
obj.srs[this.getChildValue(node)] = true; obj['srs'][this.getChildValue(node)] = true;
} }
}); });
}; };
src/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.js
+8 -8
View File
@@ -12,11 +12,11 @@ ol.parser.ogc.WMSCapabilities_v1_1_1_WMSC = function() {
this.profile = 'WMSC'; this.profile = 'WMSC';
goog.object.extend(this.readers['http://www.opengis.net/wms'], { goog.object.extend(this.readers['http://www.opengis.net/wms'], {
'VendorSpecificCapabilities': function(node, obj) { 'VendorSpecificCapabilities': function(node, obj) {
obj.vendorSpecific = {tileSets: []}; obj['vendorSpecific'] = {'tileSets': []};
this.readChildNodes(node, obj.vendorSpecific); this.readChildNodes(node, obj['vendorSpecific']);
}, },
'TileSet': function(node, vendorSpecific) { 'TileSet': function(node, vendorSpecific) {
var tileset = {srs: {}, bbox: {}, resolutions: []}; var tileset = {'srs': {}, 'bbox': {}, 'resolutions': []};
this.readChildNodes(node, tileset); this.readChildNodes(node, tileset);
vendorSpecific.tileSets.push(tileset); vendorSpecific.tileSets.push(tileset);
}, },
@@ -24,21 +24,21 @@ ol.parser.ogc.WMSCapabilities_v1_1_1_WMSC = function() {
var res = this.getChildValue(node).split(' '); var res = this.getChildValue(node).split(' ');
for (var i = 0, len = res.length; i < len; i++) { for (var i = 0, len = res.length; i < len; i++) {
if (res[i] !== '') { if (res[i] !== '') {
tileset.resolutions.push(parseFloat(res[i])); tileset['resolutions'].push(parseFloat(res[i]));
} }
} }
}, },
'Width': function(node, tileset) { 'Width': function(node, tileset) {
tileset.width = parseInt(this.getChildValue(node), 10); tileset['width'] = parseInt(this.getChildValue(node), 10);
}, },
'Height': function(node, tileset) { 'Height': function(node, tileset) {
tileset.height = parseInt(this.getChildValue(node), 10); tileset['height'] = parseInt(this.getChildValue(node), 10);
}, },
'Layers': function(node, tileset) { 'Layers': function(node, tileset) {
tileset.layers = this.getChildValue(node); tileset['layers'] = this.getChildValue(node);
}, },
'Styles': function(node, tileset) { 'Styles': function(node, tileset) {
tileset.styles = this.getChildValue(node); tileset['styles'] = this.getChildValue(node);
} }
}); });
}; };
src/ol/parser/ogc/wmscapabilities_v1_3_0.js
+23 -23
View File
@@ -15,18 +15,18 @@ ol.parser.ogc.WMSCapabilities_v1_3_0 = function() {
this.readChildNodes(node, obj); this.readChildNodes(node, obj);
}, },
'LayerLimit': function(node, obj) { 'LayerLimit': function(node, obj) {
obj.layerLimit = parseInt(this.getChildValue(node), 10); obj['layerLimit'] = parseInt(this.getChildValue(node), 10);
}, },
'MaxWidth': function(node, obj) { 'MaxWidth': function(node, obj) {
obj.maxWidth = parseInt(this.getChildValue(node), 10); obj['maxWidth'] = parseInt(this.getChildValue(node), 10);
}, },
'MaxHeight': function(node, obj) { 'MaxHeight': function(node, obj) {
obj.maxHeight = parseInt(this.getChildValue(node), 10); obj['maxHeight'] = parseInt(this.getChildValue(node), 10);
}, },
'BoundingBox': function(node, obj) { 'BoundingBox': function(node, obj) {
var bbox = bboxreader.apply(this, arguments); var bbox = bboxreader.apply(this, arguments);
bbox.srs = node.getAttribute('CRS'); bbox['srs'] = node.getAttribute('CRS');
obj.bbox[bbox.srs] = bbox; obj['bbox'][bbox['srs']] = bbox;
}, },
'CRS': function(node, obj) { 'CRS': function(node, obj) {
// CRS is the synonym of SRS // CRS is the synonym of SRS
@@ -34,8 +34,8 @@ ol.parser.ogc.WMSCapabilities_v1_3_0 = function() {
}, },
'EX_GeographicBoundingBox': function(node, obj) { 'EX_GeographicBoundingBox': function(node, obj) {
// replacement of LatLonBoundingBox // replacement of LatLonBoundingBox
obj.llbbox = []; obj['llbbox'] = [];
this.readChildNodes(node, obj.llbbox); this.readChildNodes(node, obj['llbbox']);
}, },
'westBoundLongitude': function(node, obj) { 'westBoundLongitude': function(node, obj) {
obj[0] = this.getChildValue(node); obj[0] = this.getChildValue(node);
@@ -50,10 +50,10 @@ ol.parser.ogc.WMSCapabilities_v1_3_0 = function() {
obj[3] = this.getChildValue(node); obj[3] = this.getChildValue(node);
}, },
'MinScaleDenominator': function(node, obj) { 'MinScaleDenominator': function(node, obj) {
obj.maxScale = parseFloat(this.getChildValue(node)).toPrecision(16); obj['maxScale'] = parseFloat(this.getChildValue(node)).toPrecision(16);
}, },
'MaxScaleDenominator': function(node, obj) { 'MaxScaleDenominator': function(node, obj) {
obj.minScale = parseFloat(this.getChildValue(node)).toPrecision(16); obj['minScale'] = parseFloat(this.getChildValue(node)).toPrecision(16);
}, },
'Dimension': function(node, obj) { 'Dimension': function(node, obj) {
// dimension has extra attributes: default, multipleValues, // dimension has extra attributes: default, multipleValues,
@@ -61,27 +61,27 @@ ol.parser.ogc.WMSCapabilities_v1_3_0 = function() {
// also contains the values. // also contains the values.
var name = node.getAttribute('name').toLowerCase(); var name = node.getAttribute('name').toLowerCase();
var dim = { var dim = {
name: name, 'name': name,
units: node.getAttribute('units'), 'units': node.getAttribute('units'),
unitsymbol: node.getAttribute('unitSymbol'), 'unitsymbol': node.getAttribute('unitSymbol'),
nearestVal: node.getAttribute('nearestValue') === '1', 'nearestVal': node.getAttribute('nearestValue') === '1',
multipleVal: node.getAttribute('multipleValues') === '1', 'multipleVal': node.getAttribute('multipleValues') === '1',
'default': node.getAttribute('default') || '', 'default': node.getAttribute('default') || '',
current: node.getAttribute('current') === '1', 'current': node.getAttribute('current') === '1',
values: this.getChildValue(node).split(',') 'values': this.getChildValue(node).split(',')
}; };
// Theoretically there can be more dimensions with the same // Theoretically there can be more dimensions with the same
// name, but with a different unit. Until we meet such a case, // name, but with a different unit. Until we meet such a case,
// let's just keep the same structure as the WMS 1.1 // let's just keep the same structure as the WMS 1.1
// GetCapabilities parser uses. We will store the last // GetCapabilities parser uses. We will store the last
// one encountered. // one encountered.
obj.dimensions[dim.name] = dim; obj['dimensions'][dim['name']] = dim;
}, },
'Keyword': function(node, obj) { 'Keyword': function(node, obj) {
var keyword = {value: this.getChildValue(node), var keyword = {'value': this.getChildValue(node),
vocabulary: node.getAttribute('vocabulary')}; 'vocabulary': node.getAttribute('vocabulary')};
if (obj.keywords) { if (obj['keywords']) {
obj.keywords.push(keyword); obj['keywords'].push(keyword);
} }
} }
}); });
@@ -91,9 +91,9 @@ ol.parser.ogc.WMSCapabilities_v1_3_0 = function() {
readers.UserDefinedSymbolization.apply(this, arguments); readers.UserDefinedSymbolization.apply(this, arguments);
// add the two extra attributes // add the two extra attributes
var value = node.getAttribute('InlineFeature'); var value = node.getAttribute('InlineFeature');
obj['userSymbols'].inlineFeature = parseInt(value, 10) == 1; obj['userSymbols']['inlineFeature'] = parseInt(value, 10) == 1;
value = node.getAttribute('RemoteWCS'); value = node.getAttribute('RemoteWCS');
obj['userSymbols'].remoteWCS = parseInt(value, 10) == 1; obj['userSymbols']['remoteWCS'] = parseInt(value, 10) == 1;
}, },
'DescribeLayer': function(node, obj) { 'DescribeLayer': function(node, obj) {
var readers = this.readers['http://www.opengis.net/wms']; var readers = this.readers['http://www.opengis.net/wms'];
test/spec/ol/parser/ogc/exceptionreport.test.js
+79 -84
View File
@@ -5,93 +5,88 @@ describe('ol.parser.ogc.exceptionreport', function() {
var parser = new ol.parser.ogc.ExceptionReport(); var parser = new ol.parser.ogc.ExceptionReport();
describe('test read exception', function() { describe('test read exception', function() {
var result, exceptions;
var url = 'spec/ol/parser/ogc/xml/exceptionreport/wms1_3_0.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
result = parser.read(xhr.getResponseXml());
exceptions = result.exceptionReport.exceptions;
});
it('OCG WMS 1.3.0 exceptions', function() { it('OCG WMS 1.3.0 exceptions', function() {
expect(exceptions.length).toBe(4); var result, exceptions;
var str = 'Plain text message about an error.'; runs(function() {
expect(goog.string.trim(exceptions[0].text)).toBe(str); var url = 'spec/ol/parser/ogc/xml/exceptionreport/wms1_3_0.xml';
expect(exceptions[1].code).toBe('InvalidUpdateSequence'); goog.net.XhrIo.send(url, function(e) {
str = ' Another error message, this one with a service exception ' + var xhr = e.target;
'code supplied. '; result = parser.read(xhr.getResponseXml());
expect(exceptions[1].text).toBe(str); exceptions = result.exceptionReport.exceptions;
str = 'Error in module <foo.c>, line 42A message that includes angle ' + });
'brackets in text must be enclosed in a Character Data Section as ' + });
'in this example. All XML-like markup is ignored except for this ' + waitsFor(function() {
'sequence of three closing characters:'; return (result !== undefined);
expect(goog.string.trim(exceptions[2].text), str); }, 'XHR timeout', 1000);
str = '<Module>foo.c</Module> <Error>An error occurred</Error> ' + runs(function() {
'<Explanation>Similarly, actual XML can be enclosed in a CDATA ' + expect(exceptions.length).toBe(4);
'section. A generic parser will ignore that XML, but ' + var str = 'Plain text message about an error.';
'application-specific software may choose to process it.' + expect(goog.string.trim(exceptions[0].text)).toBe(str);
'</Explanation>'; expect(exceptions[1].code).toBe('InvalidUpdateSequence');
expect(goog.string.trim(exceptions[3].text), str); str = ' Another error message, this one with a service exception ' +
'code supplied. ';
expect(exceptions[1].text).toBe(str);
str = 'Error in module <foo.c>, line 42A message that includes angle ' +
'brackets in text must be enclosed in a Character Data Section as' +
' in this example. All XML-like markup is ignored except for this' +
' sequence of three closing characters:';
expect(goog.string.trim(exceptions[2].text), str);
str = '<Module>foo.c</Module> <Error>An error occurred</Error> ' +
'<Explanation>Similarly, actual XML can be enclosed in a CDATA ' +
'section. A generic parser will ignore that XML, but ' +
'application-specific software may choose to process it.' +
'</Explanation>';
expect(goog.string.trim(exceptions[3].text), str);
});
}); });
}); it('test read exception OWSCommon 1.0.0', function() {
var result, report, exception;
describe('test read exception OWSCommon 1.0.0', function() { runs(function() {
var result, report, exception; var url = 'spec/ol/parser/ogc/xml/exceptionreport/ows1_0_0.xml';
var url = 'spec/ol/parser/ogc/xml/exceptionreport/ows1_0_0.xml'; goog.net.XhrIo.send(url, function(e) {
goog.net.XhrIo.send(url, function(e) { var xhr = e.target;
var xhr = e.target; result = parser.read(xhr.getResponseXml());
result = parser.read(xhr.getResponseXml()); report = result.exceptionReport;
report = result.exceptionReport; exception = report.exceptions[0];
exception = report.exceptions[0]; });
});
waitsFor(function() {
return (result !== undefined);
}, 'XHR timeout', 1000);
runs(function() {
expect(report.version).toEqual('1.0.0');
expect(report.language).toEqual('en');
expect(exception.code).toEqual('InvalidParameterValue');
expect(exception.locator).toEqual('foo');
var msg = 'Update error: Error occured updating features';
expect(exception.texts[0]).toEqual(msg);
msg = 'Second exception line';
expect(exception.texts[1]).toEqual(msg);
});
}); });
it('Version parsed correctly', function() { it('test read exception OWSCommon 1.1.0', function() {
expect(report.version).toEqual('1.0.0'); var result, report, exception;
}); runs(function() {
it('Language parsed correctly', function() { var url = 'spec/ol/parser/ogc/xml/exceptionreport/ows1_1_0.xml';
expect(report.language).toEqual('en'); goog.net.XhrIo.send(url, function(e) {
}); var xhr = e.target;
it('exceptionCode properly parsed', function() { result = parser.read(xhr.getResponseXml());
expect(exception.code).toEqual('InvalidParameterValue'); report = result.exceptionReport;
}); exception = report.exceptions[0];
it('locator properly parsed', function() { });
expect(exception.locator).toEqual('foo'); });
}); waitsFor(function() {
it('ExceptionText correctly parsed', function() { return (result !== undefined);
var msg = 'Update error: Error occured updating features'; }, 'XHR timeout', 1000);
expect(exception.texts[0]).toEqual(msg); runs(function() {
}); expect(report.version).toEqual('1.1.0');
it('Second ExceptionText correctly parsed', function() { expect(report.language).toEqual('en');
var msg = 'Second exception line'; expect(exception.code).toEqual('InvalidParameterValue');
expect(exception.texts[1]).toEqual(msg); expect(exception.locator).toEqual('foo');
}); var msg = 'Update error: Error occured updating features';
}); expect(exception.texts[0]).toEqual(msg);
expect(exception.texts[1]).toEqual('Second exception line');
describe('test read exception OWSCommon 1.1.0', function() { });
var result, report, exception;
var url = 'spec/ol/parser/ogc/xml/exceptionreport/ows1_1_0.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
result = parser.read(xhr.getResponseXml());
report = result.exceptionReport;
exception = report.exceptions[0];
});
it('Version parsed correctly', function() {
expect(report.version).toEqual('1.1.0');
});
it('Language parsed correctly', function() {
expect(report.language).toEqual('en');
});
it('exceptionCode properly parsed', function() {
expect(exception.code).toEqual('InvalidParameterValue');
});
it('locator properly parsed', function() {
expect(exception.locator).toEqual('foo');
});
it('ExceptionText correctly parsed', function() {
var msg = 'Update error: Error occured updating features';
expect(exception.texts[0]).toEqual(msg);
});
it('Second ExceptionText correctly parsed', function() {
expect(exception.texts[1]).toEqual('Second exception line');
}); });
}); });
}); });
test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js
+270 -399
View File
@@ -5,436 +5,307 @@ describe('ol.parser.ogc.wmscapabilities_v1_1_1', function() {
var parser = new ol.parser.ogc.WMSCapabilities(); var parser = new ol.parser.ogc.WMSCapabilities();
describe('test read exception', function() { describe('test read exception', function() {
var obj, url;
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/exceptionsample.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
obj = parser.read(xhr.getResponseXml());
});
it('Error reported correctly', function() { it('Error reported correctly', function() {
expect(!!obj.error).toBeTruthy(); var obj;
runs(function() {
var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/' +
'exceptionsample.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
obj = parser.read(xhr.getResponseXml());
});
});
waitsFor(function() {
return (obj !== undefined);
}, 'XHR timeout', 1000);
runs(function() {
expect(!!obj.error).toBeTruthy();
});
}); });
}); });
describe('test read', function() { describe('test read', function() {
var obj, capability, getmap, describelayer, getfeatureinfo, layer, url; it('Test read', function() {
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml'; var obj, capability, getmap, describelayer, getfeatureinfo, layer;
goog.net.XhrIo.send(url, function(e) { runs(function() {
var xhr = e.target; var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml';
obj = parser.read(xhr.getResponseXml()); goog.net.XhrIo.send(url, function(e) {
capability = obj.capability; var xhr = e.target;
getmap = capability.request.getmap; obj = parser.read(xhr.getResponseXml());
describelayer = capability.request.describelayer; capability = obj.capability;
getfeatureinfo = capability.request.getfeatureinfo; getmap = capability.request.getmap;
layer = capability.layers[2]; describelayer = capability.request.describelayer;
}); getfeatureinfo = capability.request.getfeatureinfo;
it('object contains capability property', function() { layer = capability.layers[2];
expect(capability).toBeTruthy(); });
}); });
it('getmap formats parsed', function() { waitsFor(function() {
expect(getmap.formats.length).toEqual(28); return (obj !== undefined);
}); }, 'XHR timeout', 1000);
it('getmap href parsed', function() { runs(function() {
var url = 'http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&'; expect(capability).toBeTruthy();
expect(getmap.href).toEqual(url); expect(getmap.formats.length).toEqual(28);
}); var get = 'http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&';
it('getmap.get.href parsed', function() { expect(getmap.get.href).toEqual(get);
expect(getmap.get.href).toEqual(getmap.href); expect(getmap.post).toBeUndefined();
}); get = 'http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&';
it('getmap.post not available', function() { expect(describelayer.get.href).toEqual(get);
expect(getmap.post).toBeUndefined(); expect(describelayer.post).toBeUndefined();
}); get = 'http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&';
it('describelayer href parsed', function() { expect(getfeatureinfo.get.href).toEqual(get);
var url = 'http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&'; var post = 'http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&';
expect(describelayer.href).toEqual(url); expect(getfeatureinfo.post.href).toEqual(post);
}); expect(capability.layers).toBeTruthy();
it('describelayer.get.href parsed', function() { expect(capability.layers.length).toEqual(22);
expect(describelayer.get.href).toEqual(describelayer.href); var infoFormats = ['text/plain', 'text/html',
}); 'application/vnd.ogc.gml'];
it('describelayer.post not available', function() { expect(layer.infoFormats).toEqual(infoFormats);
expect(describelayer.post).toBeUndefined(); expect(layer.name).toEqual('tiger:tiger_roads');
}); expect(layer.prefix).toEqual('tiger');
it('getfeatureinfo href parsed', function() { expect(layer.title).toEqual('Manhattan (NY) roads');
var url = 'http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&'; var abstr = 'Highly simplified road layout of Manhattan in New York..';
expect(getfeatureinfo.href).toEqual(url); expect(layer['abstract']).toEqual(abstr);
}); var bbox = [-74.08769307536667, 40.660618924633326,
it('getmap.get.href parsed', function() { -73.84653192463333, 40.90178007536667];
expect(getfeatureinfo.get.href).toEqual(getfeatureinfo.href); expect(layer.llbbox).toEqual(bbox);
}); expect(layer.styles.length).toEqual(1);
it('getfeatureinfo.post set correctly', function() { expect(layer.styles[0].name).toEqual('tiger_roads');
var url = 'http://publicus.opengeo.org:80/geoserver/wms?SERVICE=WMS&'; var legend = 'http://publicus.opengeo.org:80/geoserver/wms/' +
expect(getfeatureinfo.post.href).toEqual(url);
});
it('layers parsed', function() {
expect(capability.layers).toBeTruthy();
});
it('correct number of layers parsed', function() {
expect(capability.layers.length).toEqual(22);
});
it('infoFormats set on layer', function() {
var infoFormats = ['text/plain', 'text/html', 'application/vnd.ogc.gml'];
expect(layer.infoFormats).toEqual(infoFormats);
});
it('[2] correct layer name', function() {
expect(layer.name).toEqual('tiger:tiger_roads');
});
it('[2] correct layer prefix', function() {
expect(layer.prefix).toEqual('tiger');
});
it('[2] correct layer title', function() {
expect(layer.title).toEqual('Manhattan (NY) roads');
});
it('[2] correct layer abstract', function() {
var abstr = 'Highly simplified road layout of Manhattan in New York..';
expect(layer['abstract']).toEqual(abstr);
});
it('[2] correct layer bbox', function() {
var bbox = [-74.08769307536667, 40.660618924633326,
-73.84653192463333, 40.90178007536667];
expect(layer.llbbox).toEqual(bbox);
});
it('[2] correct styles length', function() {
expect(layer.styles.length).toEqual(1);
});
it('[2] correct style name', function() {
expect(layer.styles[0].name).toEqual('tiger_roads');
});
it('[2] correct legend url', function() {
var url = 'http://publicus.opengeo.org:80/geoserver/wms/' +
'GetLegendGraphic?VERSION=1.0.0&FORMAT=image/png&WIDTH=20&' + 'GetLegendGraphic?VERSION=1.0.0&FORMAT=image/png&WIDTH=20&' +
'HEIGHT=20&LAYER=tiger:tiger_roads'; 'HEIGHT=20&LAYER=tiger:tiger_roads';
expect(layer.styles[0].legend.href).toEqual(url); expect(layer.styles[0].legend.href).toEqual(legend);
}); expect(layer.styles[0].legend.format).toEqual('image/png');
it('[2] correct legend format', function() { expect(layer.queryable).toBeTruthy();
expect(layer.styles[0].legend.format).toEqual('image/png'); });
});
it('[2] correct queryable attribute', function() {
expect(layer.queryable).toBeTruthy();
}); });
}); });
describe('test layers', function() { describe('test layers', function() {
var obj, capability, layers = {}, rootlayer, identifiers, authorities; it('Test layers', function() {
var featurelist, url; var obj, capability, layers = {}, rootlayer, identifiers, authorities;
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml'; var featurelist;
goog.net.XhrIo.send(url, function(e) { runs(function() {
var xhr = e.target; var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml';
obj = parser.read(xhr.getResponseXml()); goog.net.XhrIo.send(url, function(e) {
capability = obj.capability; var xhr = e.target;
for (var i = 0, len = capability.layers.length; i < len; i++) { obj = parser.read(xhr.getResponseXml());
if ('name' in capability.layers[i]) { capability = obj.capability;
layers[capability.layers[i].name] = capability.layers[i]; for (var i = 0, len = capability.layers.length; i < len; i++) {
} if ('name' in capability.layers[i]) {
} layers[capability.layers[i].name] = capability.layers[i];
rootlayer = capability.layers[capability.layers.length - 1]; }
identifiers = layers['ROADS_RIVERS'].identifiers; }
authorities = layers['ROADS_RIVERS'].authorityURLs; rootlayer = capability.layers[capability.layers.length - 1];
featurelist = layers['ROADS_RIVERS'].featureListURL; identifiers = layers['ROADS_RIVERS'].identifiers;
}); authorities = layers['ROADS_RIVERS'].authorityURLs;
it('SRS parsed correctly for root layer', function() { featurelist = layers['ROADS_RIVERS'].featureListURL;
expect(rootlayer.srs).toEqual({'EPSG:4326': true}); });
}); });
it('Inheritance of SRS handled correctly when adding SRSes', function() { waitsFor(function() {
var srs = {'EPSG:4326': true, 'EPSG:26986': true}; return (obj !== undefined);
expect(layers['ROADS_RIVERS'].srs).toEqual(srs); }, 'XHR timeout', 1000);
}); runs(function() {
var msg = 'Inheritance of SRS handled correctly when redeclaring an ' + expect(rootlayer.srs).toEqual({'EPSG:4326': true});
'inherited SRS'; var srs = {'EPSG:4326': true, 'EPSG:26986': true};
it(msg, function() { expect(layers['ROADS_RIVERS'].srs).toEqual(srs);
expect(layers['Temperature'].srs).toEqual({'EPSG:4326': true}); expect(layers['Temperature'].srs).toEqual({'EPSG:4326': true});
}); var bbox = layers['ROADS_RIVERS'].bbox['EPSG:26986'];
it('Correct bbox and res from BoundingBox', function() { expect(bbox.bbox).toEqual([189000, 834000, 285000, 962000]);
var bbox = layers['ROADS_RIVERS'].bbox['EPSG:26986']; expect(bbox.res).toEqual({x: 1, y: 1});
expect(bbox.bbox).toEqual([189000, 834000, 285000, 962000]); bbox = layers['ROADS_RIVERS'].bbox['EPSG:4326'];
expect(bbox.res).toEqual({x: 1, y: 1}); expect(bbox.bbox).toEqual([-71.63, 41.75, -70.78, 42.90]);
}); expect(bbox.res).toEqual({x: 0.01, y: 0.01});
it('Correct bbox and res from BoundingBox (override)', function() { bbox = layers['ROADS_1M'].bbox['EPSG:26986'];
bbox = layers['ROADS_RIVERS'].bbox['EPSG:4326']; expect(bbox.bbox).toEqual([189000, 834000, 285000, 962000]);
expect(bbox.bbox).toEqual([-71.63, 41.75, -70.78, 42.90]); expect(bbox.res).toEqual({x: 1, y: 1});
expect(bbox.res).toEqual({x: 0.01, y: 0.01}); expect(identifiers).toBeTruthy();
}); expect('DIF_ID' in identifiers).toBeTruthy();
it('Correctly inherited bbox and resolution', function() { expect(identifiers['DIF_ID']).toEqual('123456');
bbox = layers['ROADS_1M'].bbox['EPSG:26986']; expect('DIF_ID' in authorities).toBeTruthy();
expect(bbox.bbox).toEqual([189000, 834000, 285000, 962000]); var url = 'http://gcmd.gsfc.nasa.gov/difguide/whatisadif.html';
expect(bbox.res).toEqual({x: 1, y: 1}); expect(authorities['DIF_ID']).toEqual(url);
}); expect(featurelist).toBeTruthy();
it('got identifiers from layer ROADS_RIVERS', function() { expect(featurelist.format).toEqual('application/vnd.ogc.se_xml');
expect(identifiers).toBeTruthy(); url = 'http://www.university.edu/data/roads_rivers.gml';
}); expect(featurelist.href).toEqual(url);
it('authority attribute from Identifiers parsed correctly', function() { expect(layers['Pressure'].queryable).toBeTruthy();
expect('DIF_ID' in identifiers).toBeTruthy(); expect(layers['ozone_image'].queryable).toBeFalsy();
}); expect(layers['population'].cascaded).toEqual(1);
it('Identifier value parsed correctly', function() { expect(layers['ozone_image'].fixedWidth).toEqual(512);
expect(identifiers['DIF_ID']).toEqual('123456'); expect(layers['ozone_image'].fixedHeight).toEqual(256);
}); expect(layers['ozone_image'].opaque).toBeTruthy();
it('AuthorityURLs parsed and inherited correctly', function() { expect(layers['ozone_image'].noSubsets).toBeTruthy();
expect('DIF_ID' in authorities).toBeTruthy(); });
});
it('OnlineResource in AuthorityURLs parsed correctly', function() {
var url = 'http://gcmd.gsfc.nasa.gov/difguide/whatisadif.html';
expect(authorities['DIF_ID']).toEqual(url);
});
it('layer has FeatureListURL', function() {
expect(featurelist).toBeTruthy();
});
it('FeatureListURL format parsed correctly', function() {
expect(featurelist.format).toEqual('application/vnd.ogc.se_xml');
});
it('FeatureListURL OnlineResource parsed correctly', function() {
var url = 'http://www.university.edu/data/roads_rivers.gml';
expect(featurelist.href).toEqual(url);
});
it('queryable property inherited correctly', function() {
expect(layers['Pressure'].queryable).toBeTruthy();
});
it('queryable property has correct default value', function() {
expect(layers['ozone_image'].queryable).toBeFalsy();
});
it('cascaded property parsed correctly', function() {
expect(layers['population'].cascaded).toEqual(1);
});
it('fixedWidth property correctly parsed', function() {
expect(layers['ozone_image'].fixedWidth).toEqual(512);
});
it('fixedHeight property correctly parsed', function() {
expect(layers['ozone_image'].fixedHeight).toEqual(256);
});
it('opaque property parsed correctly', function() {
expect(layers['ozone_image'].opaque).toBeTruthy();
});
it('noSubsets property parsed correctly', function() {
expect(layers['ozone_image'].noSubsets).toBeTruthy();
}); });
}); });
describe('test dimensions', function() { describe('test dimensions', function() {
var obj, capability, layers = {}, time, elevation, url; it('Test dimensions', function() {
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml'; var obj, capability, layers = {}, time, elevation;
goog.net.XhrIo.send(url, function(e) { runs(function() {
var xhr = e.target; var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml';
obj = parser.read(xhr.getResponseXml()); goog.net.XhrIo.send(url, function(e) {
capability = obj.capability; var xhr = e.target;
for (var i = 0, len = capability.layers.length; i < len; i++) { obj = parser.read(xhr.getResponseXml());
if ('name' in capability.layers[i]) { capability = obj.capability;
layers[capability.layers[i].name] = capability.layers[i]; for (var i = 0, len = capability.layers.length; i < len; i++) {
} if ('name' in capability.layers[i]) {
} layers[capability.layers[i].name] = capability.layers[i];
time = layers['Clouds'].dimensions.time; }
elevation = layers['Pressure'].dimensions.elevation; }
}); time = layers['Clouds'].dimensions.time;
it('Default time value parsed correctly', function() { elevation = layers['Pressure'].dimensions.elevation;
expect(time['default']).toEqual('2000-08-22'); });
}); });
it('Currect number of time extent values/periods', function() { waitsFor(function() {
expect(time.values.length).toEqual(1); return (obj !== undefined);
}); }, 'XHR timeout', 1000);
it('Time extent values parsed correctly', function() { runs(function() {
expect(time.values[0]).toEqual('1999-01-01/2000-08-22/P1D'); expect(time['default']).toEqual('2000-08-22');
}); expect(time.values.length).toEqual(1);
it('Dimension units parsed correctly', function() { expect(time.values[0]).toEqual('1999-01-01/2000-08-22/P1D');
expect(elevation.units).toEqual('EPSG:5030'); expect(elevation.units).toEqual('EPSG:5030');
}); expect(elevation['default']).toEqual('0');
it('Default elevation value parsed correctly', function() { expect(elevation.nearestVal).toBeTruthy();
expect(elevation['default']).toEqual('0'); expect(elevation.multipleVal).toBeFalsy();
}); expect(elevation.values).toEqual(['0', '1000', '3000', '5000',
it('NearestValue parsed correctly', function() { '10000']);
expect(elevation.nearestVal).toBeTruthy(); });
});
it('Absense of MultipleValues handled correctly', function() {
expect(elevation.multipleVal).toBeFalsy();
});
it('Parsing of comma-separated values done correctly', function() {
expect(elevation.values).toEqual(['0', '1000', '3000', '5000', '10000']);
}); });
}); });
describe('test contact info', function() { describe('test contact info', function() {
var obj, service, contactinfo, personPrimary, addr, url; it('Test contact info', function() {
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml'; var obj, service, contactinfo, personPrimary, addr;
goog.net.XhrIo.send(url, function(e) { runs(function() {
var xhr = e.target; var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/' +
obj = parser.read(xhr.getResponseXml()); 'ogcsample.xml';
service = obj.service; goog.net.XhrIo.send(url, function(e) {
contactinfo = service.contactInformation; var xhr = e.target;
personPrimary = contactinfo.personPrimary; obj = parser.read(xhr.getResponseXml());
addr = contactinfo.contactAddress; service = obj.service;
}); contactinfo = service.contactInformation;
it('object contains contactInformation property', function() { personPrimary = contactinfo.personPrimary;
expect(contactinfo).toBeTruthy(); addr = contactinfo.contactAddress;
}); });
it('object contains personPrimary property', function() { });
expect(personPrimary).toBeTruthy(); waitsFor(function() {
}); return (obj !== undefined);
it('ContactPerson parsed correctly', function() { }, 'XHR timeout', 1000);
expect(personPrimary.person).toEqual('Jeff deLaBeaujardiere'); runs(function() {
}); expect(contactinfo).toBeTruthy();
it('ContactOrganization parsed correctly', function() { expect(personPrimary).toBeTruthy();
expect(personPrimary.organization).toEqual('NASA'); expect(personPrimary.person).toEqual('Jeff deLaBeaujardiere');
}); expect(personPrimary.organization).toEqual('NASA');
it('ContactPosition parsed correctly', function() { expect(contactinfo.position).toEqual('Computer Scientist');
expect(contactinfo.position).toEqual('Computer Scientist'); expect(addr).toBeTruthy();
}); expect(addr.type).toEqual('postal');
it('object contains contactAddress property', function() { var address = 'NASA Goddard Space Flight Center, Code 933';
expect(addr).toBeTruthy(); expect(addr.address).toEqual(address);
}); expect(addr.city).toEqual('Greenbelt');
it('AddressType parsed correctly', function() { expect(addr.stateOrProvince).toEqual('MD');
expect(addr.type).toEqual('postal'); expect(addr.postcode).toEqual('20771');
}); expect(addr.country).toEqual('USA');
it('Address parsed correctly', function() { expect(contactinfo.phone).toEqual('+1 301 286-1569');
var address = 'NASA Goddard Space Flight Center, Code 933'; expect(contactinfo.fax).toEqual('+1 301 286-1777');
expect(addr.address).toEqual(address); expect(contactinfo.email).toEqual('delabeau@iniki.gsfc.nasa.gov');
}); });
it('City parsed correctly', function() {
expect(addr.city).toEqual('Greenbelt');
});
it('StateOrProvince parsed correctly', function() {
expect(addr.stateOrProvince).toEqual('MD');
});
it('PostCode parsed correctly', function() {
expect(addr.postcode).toEqual('20771');
});
it('Country parsed correctly', function() {
expect(addr.country).toEqual('USA');
});
it('ContactVoiceTelephone parsed correctly', function() {
expect(contactinfo.phone).toEqual('+1 301 286-1569');
});
it('ContactFacsimileTelephone parsed correctly', function() {
expect(contactinfo.fax).toEqual('+1 301 286-1777');
});
it('ContactElectronicMailAddress parsed correctly', function() {
expect(contactinfo.email).toEqual('delabeau@iniki.gsfc.nasa.gov');
}); });
}); });
describe('Test fees and constraints', function() { describe('Test fees and constraints', function() {
var obj, service, url; it('Test fees and constraints', function() {
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml'; var obj, service;
goog.net.XhrIo.send(url, function(e) { runs(function() {
var xhr = e.target; var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml';
obj = parser.read(xhr.getResponseXml()); goog.net.XhrIo.send(url, function(e) {
service = obj.service; var xhr = e.target;
}); obj = parser.read(xhr.getResponseXml());
it('Fees=none handled correctly', function() { service = obj.service;
expect('fees' in service).toBeFalsy(); });
}); });
it('AccessConstraints=none handled correctly', function() { waitsFor(function() {
expect('accessConstraints' in service).toBeFalsy(); return (obj !== undefined);
}, 'XHR timeout', 1000);
runs(function() {
expect('fees' in service).toBeFalsy();
expect('accessConstraints' in service).toBeFalsy();
});
}); });
}); });
describe('Test requests', function() { describe('Test requests', function() {
var obj, request, exception, userSymbols, url; it('Test requests', function() {
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml'; var obj, request, exception, userSymbols;
goog.net.XhrIo.send(url, function(e) { runs(function() {
var xhr = e.target; var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/gssample.xml';
obj = parser.read(xhr.getResponseXml()); goog.net.XhrIo.send(url, function(e) {
request = obj.capability.request; var xhr = e.target;
exception = obj.capability.exception; obj = parser.read(xhr.getResponseXml());
userSymbols = obj.capability.userSymbols; request = obj.capability.request;
}); exception = obj.capability.exception;
it('request property exists', function() { userSymbols = obj.capability.userSymbols;
expect(request).toBeTruthy(); });
}); });
it('got GetMap request', function() { waitsFor(function() {
expect('getmap' in request).toBeTruthy(); return (obj !== undefined);
}); }, 'XHR timeout', 1000);
it('got GetFeatureInfo request', function() { runs(function() {
expect('getfeatureinfo' in request).toBeTruthy(); expect(request).toBeTruthy();
}); expect('getmap' in request).toBeTruthy();
it('GetFeatureInfo formats correctly parsed', function() { expect('getfeatureinfo' in request).toBeTruthy();
var formats = ['text/plain', 'text/html', 'application/vnd.ogc.gml']; var formats = ['text/plain', 'text/html', 'application/vnd.ogc.gml'];
expect(request.getfeatureinfo.formats).toEqual(formats); expect(request.getfeatureinfo.formats).toEqual(formats);
}); expect('describelayer' in request).toBeTruthy();
it('got DescribeLayer request', function() { expect('getlegendgraphic' in request).toBeTruthy();
expect('describelayer' in request).toBeTruthy(); expect(exception).toBeTruthy();
}); expect(exception.formats).toEqual(['application/vnd.ogc.se_xml']);
it('got GetLegendGraphic request', function() { expect(userSymbols).toBeTruthy();
expect('getlegendgraphic' in request).toBeTruthy(); expect(userSymbols.supportSLD).toBeTruthy();
}); expect(userSymbols.userLayer).toBeTruthy();
it('exception property exists', function() { expect(userSymbols.userStyle).toBeTruthy();
expect(exception).toBeTruthy(); expect(userSymbols.remoteWFS).toBeTruthy();
}); });
it('Exception Format parsed', function() {
expect(exception.formats).toEqual(['application/vnd.ogc.se_xml']);
});
it('userSymbols property exists', function() {
expect(userSymbols).toBeTruthy();
});
it('supportSLD parsed', function() {
expect(userSymbols.supportSLD).toBeTruthy();
});
it('userLayer parsed', function() {
expect(userSymbols.userLayer).toBeTruthy();
});
it('userStyle parsed', function() {
expect(userSymbols.userStyle).toBeTruthy();
});
it('remoteWFS parsed', function() {
expect(userSymbols.remoteWFS).toBeTruthy();
}); });
}); });
describe('test ogc', function() { describe('test ogc', function() {
var obj, capability, attribution, keywords, metadataURLs, url; it('Test ogc', function() {
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml'; var obj, capability, attribution, keywords, metadataURLs;
goog.net.XhrIo.send(url, function(e) { runs(function() {
var xhr = e.target; var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1/ogcsample.xml';
obj = parser.read(xhr.getResponseXml()); goog.net.XhrIo.send(url, function(e) {
capability = obj.capability; var xhr = e.target;
attribution = capability.layers[2].attribution; obj = parser.read(xhr.getResponseXml());
keywords = capability.layers[0].keywords; capability = obj.capability;
metadataURLs = capability.layers[0].metadataURLs; attribution = capability.layers[2].attribution;
}); keywords = capability.layers[0].keywords;
it('attribution title parsed correctly.', function() { metadataURLs = capability.layers[0].metadataURLs;
expect(attribution.title).toEqual('State College University'); });
}); });
it('attribution href parsed correctly.', function() { waitsFor(function() {
expect(attribution.href).toEqual('http://www.university.edu/'); return (obj !== undefined);
}); }, 'XHR timeout', 1000);
it('attribution logo url parsed correctly.', function() { runs(function() {
var url = 'http://www.university.edu/icons/logo.gif'; expect(attribution.title).toEqual('State College University');
expect(attribution.logo.href).toEqual(url); expect(attribution.href).toEqual('http://www.university.edu/');
}); var url = 'http://www.university.edu/icons/logo.gif';
it('attribution logo format parsed correctly.', function() { expect(attribution.logo.href).toEqual(url);
expect(attribution.logo.format).toEqual('image/gif'); expect(attribution.logo.format).toEqual('image/gif');
}); expect(attribution.logo.width).toEqual('100');
it('attribution logo width parsed correctly.', function() { expect(attribution.logo.height).toEqual('100');
expect(attribution.logo.width).toEqual('100'); expect(keywords.length).toEqual(3);
}); expect(keywords[0].value).toEqual('road');
it('attribution logo height parsed correctly.', function() { expect(metadataURLs.length).toEqual(2);
expect(attribution.logo.height).toEqual('100'); expect(metadataURLs[0].type).toEqual('FGDC');
}); expect(metadataURLs[0].format).toEqual('text/plain');
it('layer has 3 keywords.', function() { var href = 'http://www.university.edu/metadata/roads.txt';
expect(keywords.length).toEqual(3); expect(metadataURLs[0].href).toEqual(href);
}); expect(Math.round(capability.layers[0].minScale)).toEqual(250000);
it('1st keyword parsed correctly.', function() { expect(Math.round(capability.layers[0].maxScale)).toEqual(1000);
expect(keywords[0].value).toEqual('road'); expect(capability.layers[1].minScale).toBeUndefined();
}); expect(capability.layers[1].maxScale).toBeUndefined();
it('layer has 2 metadata urls.', function() { });
expect(metadataURLs.length).toEqual(2);
});
it('type parsed correctly.', function() {
expect(metadataURLs[0].type).toEqual('FGDC');
});
it('format parsed correctly.', function() {
expect(metadataURLs[0].format).toEqual('text/plain');
});
it('href parsed correctly.', function() {
var href = 'http://www.university.edu/metadata/roads.txt';
expect(metadataURLs[0].href).toEqual(href);
});
it('layer.minScale is correct', function() {
expect(Math.round(capability.layers[0].minScale)).toEqual(250000);
});
it('layer.maxScale is correct', function() {
expect(Math.round(capability.layers[0].maxScale)).toEqual(1000);
});
it('layer.minScale for max="Infinity" is correct', function() {
expect(capability.layers[1].minScale).toBeUndefined();
});
it('layer.maxScale for min="0" is correct', function() {
expect(capability.layers[1].maxScale).toBeUndefined();
}); });
}); });
test/spec/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.test.js
+52 -53
View File
@@ -8,63 +8,62 @@ describe('ol.parser.ogc.wmscapabilities_v1_1_1_wmsc', function() {
}); });
describe('test read', function() { describe('test read', function() {
var obj, tilesets, tileset, url; it('Test read', function() {
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/wmsc.xml'; var obj, tilesets, tileset;
goog.net.XhrIo.send(url, function(e) { runs(function() {
var xhr = e.target; var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/wmsc.xml';
obj = parser.read(xhr.getResponseXml()); goog.net.XhrIo.send(url, function(e) {
tilesets = obj.capability.vendorSpecific.tileSets; var xhr = e.target;
tileset = tilesets[0]; obj = parser.read(xhr.getResponseXml());
}); tilesets = obj.capability.vendorSpecific.tileSets;
it('We expect 2 tilesets to be parsed', function() { tileset = tilesets[0];
expect(tilesets.length).toEqual(2); });
}); });
it('BBOX correctly parsed', function() { waitsFor(function() {
var bbox = [-13697515.466796875, 5165920.118906248, return (obj !== undefined);
-13619243.94984375, 5244191.635859374]; }, 'XHR timeout', 1000);
expect(tileset.bbox['EPSG:900913'].bbox).toEqual(bbox); runs(function() {
}); expect(tilesets.length).toEqual(2);
it('Format correctly parsed', function() { var bbox = [-13697515.466796875, 5165920.118906248,
expect(tileset.format).toEqual('image/png'); -13619243.94984375, 5244191.635859374];
}); expect(tileset.bbox['EPSG:900913'].bbox).toEqual(bbox);
it('Height correctly parsed', function() { expect(tileset.format).toEqual('image/png');
expect(tileset.height).toEqual(256); expect(tileset.height).toEqual(256);
}); expect(tileset.width).toEqual(256);
it('Width correctly parsed', function() { expect(tileset.layers).toEqual('medford:hydro');
expect(tileset.width).toEqual(256); expect(tileset.srs['EPSG:900913']).toBeTruthy();
}); var resolutions = [156543.03390625, 78271.516953125, 39135.7584765625,
it('Layers correctly parsed', function() { 19567.87923828125, 9783.939619140625, 4891.9698095703125,
expect(tileset.layers).toEqual('medford:hydro'); 2445.9849047851562, 1222.9924523925781, 611.4962261962891,
}); 305.74811309814453, 152.87405654907226, 76.43702827453613,
it('SRS correctly parsed', function() { 38.218514137268066, 19.109257068634033, 9.554628534317017,
expect(tileset.srs['EPSG:900913']).toBeTruthy(); 4.777314267158508, 2.388657133579254, 1.194328566789627,
}); 0.5971642833948135, 0.29858214169740677, 0.14929107084870338,
it('Resolutions correctly parsed', function() { 0.07464553542435169, 0.037322767712175846, 0.018661383856087923,
var resolutions = [156543.03390625, 78271.516953125, 39135.7584765625, 0.009330691928043961, 0.004665345964021981];
19567.87923828125, 9783.939619140625, 4891.9698095703125, expect(tileset.resolutions).toEqual(resolutions);
2445.9849047851562, 1222.9924523925781, 611.4962261962891, expect(tileset.styles).toEqual('');
305.74811309814453, 152.87405654907226, 76.43702827453613, });
38.218514137268066, 19.109257068634033, 9.554628534317017,
4.777314267158508, 2.388657133579254, 1.194328566789627,
0.5971642833948135, 0.29858214169740677, 0.14929107084870338,
0.07464553542435169, 0.037322767712175846, 0.018661383856087923,
0.009330691928043961, 0.004665345964021981];
expect(tileset.resolutions).toEqual(resolutions);
});
it('Styles correctly parsed', function() {
expect(tileset.styles).toEqual('');
}); });
}); });
describe('test fallback', function() { describe('test fallback', function() {
var obj, url; it('Test fallback', function() {
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/fallback.xml'; var obj;
goog.net.XhrIo.send(url, function(e) { runs(function() {
var xhr = e.target; var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_1_1_WMSC/' +
obj = parser.read(xhr.getResponseXml()); 'fallback.xml';
}); goog.net.XhrIo.send(url, function(e) {
it('layers parsed with allowFallback true', function() { var xhr = e.target;
expect(obj.capability.layers.length).toEqual(2); obj = parser.read(xhr.getResponseXml());
});
});
waitsFor(function() {
return (obj !== undefined);
}, 'XHR timeout', 1000);
runs(function() {
expect(obj.capability.layers.length).toEqual(2);
});
}); });
}); });
test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js
+138 -279
View File
@@ -4,293 +4,152 @@ describe('ol.parser.ogc.wmscapabilities_v1_3_0', function() {
var parser = new ol.parser.ogc.WMSCapabilities(); var parser = new ol.parser.ogc.WMSCapabilities();
var obj, capability, layers = {}, rootlayer, identifiers, authorities;
var featurelist, time, elevation, service, contactinfo, personPrimary, addr;
var request, exception, attribution, keywords, metadataURLs, url;
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/ogcsample.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
obj = parser.read(xhr.getResponseXml());
capability = obj.capability;
for (var i = 0, len = capability.layers.length; i < len; i++) {
if ('name' in capability.layers[i]) {
layers[capability.layers[i].name] = capability.layers[i];
}
}
rootlayer = capability.layers[capability.layers.length - 1];
identifiers = layers['ROADS_RIVERS'].identifiers;
authorities = layers['ROADS_RIVERS'].authorityURLs;
featurelist = layers['ROADS_RIVERS'].featureListURL;
time = layers['Clouds'].dimensions.time;
elevation = layers['Pressure'].dimensions.elevation;
service = obj.service;
contactinfo = service.contactInformation;
personPrimary = contactinfo.personPrimary;
addr = contactinfo.contactAddress;
request = obj.capability.request;
exception = obj.capability.exception;
attribution = capability.layers[2].attribution;
keywords = capability.layers[0].keywords;
metadataURLs = capability.layers[0].metadataURLs;
});
describe('test read exception', function() { describe('test read exception', function() {
var result, url;
url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/exceptionsample.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
result = parser.read(xhr.getResponseXml());
});
it('Error reported correctly', function() { it('Error reported correctly', function() {
expect(!!result.error).toBe(true); var result;
runs(function() {
var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/' +
'exceptionsample.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
result = parser.read(xhr.getResponseXml());
});
});
waitsFor(function() {
return (result !== undefined);
}, 'XHR timeout', 1000);
runs(function() {
expect(!!result.error).toBe(true);
});
}); });
}); });
describe('test layers', function() { describe('test read', function() {
it('SRS parsed correctly for root layer', function() { it('Test read', function() {
expect(rootlayer.srs).toEqual({'CRS:84': true}); var obj, capability, layers = {}, rootlayer, identifiers, authorities;
}); var featurelist, time, elevation, service, contactinfo, personPrimary,
it('Inheritance of SRS handled correctly when adding SRSes', function() { addr, request, exception, attribution, keywords, metadataURLs;
var srs = {'CRS:84': true, 'EPSG:26986': true}; runs(function() {
expect(layers['ROADS_RIVERS'].srs).toEqual(srs); var url = 'spec/ol/parser/ogc/xml/wmscapabilities_v1_3_0/ogcsample.xml';
}); goog.net.XhrIo.send(url, function(e) {
it('Inheritance of SRS handled correctly when redeclaring an' + var xhr = e.target;
' inherited SRS', function() { obj = parser.read(xhr.getResponseXml());
capability = obj.capability;
for (var i = 0, len = capability.layers.length; i < len; i++) {
if ('name' in capability.layers[i]) {
layers[capability.layers[i].name] = capability.layers[i];
}
}
rootlayer = capability.layers[capability.layers.length - 1];
identifiers = layers['ROADS_RIVERS'].identifiers;
authorities = layers['ROADS_RIVERS'].authorityURLs;
featurelist = layers['ROADS_RIVERS'].featureListURL;
time = layers['Clouds'].dimensions.time;
elevation = layers['Pressure'].dimensions.elevation;
service = obj.service;
contactinfo = service.contactInformation;
personPrimary = contactinfo.personPrimary;
addr = contactinfo.contactAddress;
request = obj.capability.request;
exception = obj.capability.exception;
attribution = capability.layers[2].attribution;
keywords = capability.layers[0].keywords;
metadataURLs = capability.layers[0].metadataURLs;
});
});
waitsFor(function() {
return (obj !== undefined);
}, 'XHR timeout', 1000);
runs(function() {
expect(rootlayer.srs).toEqual({'CRS:84': true});
var srs = {'CRS:84': true, 'EPSG:26986': true};
expect(layers['ROADS_RIVERS'].srs).toEqual(srs);
expect(layers['Temperature'].srs).toEqual({'CRS:84': true}); expect(layers['Temperature'].srs).toEqual({'CRS:84': true});
}); var infoFormats = ['text/xml', 'text/plain', 'text/html'];
it('infoFormats set correctly on layer', function() { expect(layers['Temperature'].infoFormats).toEqual(infoFormats);
var infoFormats = ['text/xml', 'text/plain', 'text/html']; var bbox = layers['ROADS_RIVERS'].bbox['EPSG:26986'];
expect(layers['Temperature'].infoFormats).toEqual(infoFormats); expect(bbox.bbox).toEqual([189000, 834000, 285000, 962000]);
}); expect(bbox.res).toEqual({x: 1, y: 1});
it('Correct resolution and bbox from BoundingBox', function() { bbox = layers['ROADS_RIVERS'].bbox['CRS:84'];
var bbox = layers['ROADS_RIVERS'].bbox['EPSG:26986']; expect(bbox.bbox).toEqual([-71.63, 41.75, -70.78, 42.90]);
expect(bbox.bbox).toEqual([189000, 834000, 285000, 962000]); expect(bbox.res).toEqual({x: 0.01, y: 0.01});
expect(bbox.res).toEqual({x: 1, y: 1}); bbox = layers['ROADS_1M'].bbox['EPSG:26986'];
}); expect(bbox.bbox).toEqual([189000, 834000, 285000, 962000]);
it('Correct resolution and bbox from BoundingBox (override)', function() { expect(bbox.res).toEqual({x: 1, y: 1});
var bbox = layers['ROADS_RIVERS'].bbox['CRS:84']; expect(identifiers).toBeTruthy();
expect(bbox.bbox).toEqual([-71.63, 41.75, -70.78, 42.90]); expect('DIF_ID' in identifiers).toBeTruthy();
expect(bbox.res).toEqual({x: 0.01, y: 0.01}); expect(identifiers['DIF_ID']).toEqual('123456');
}); expect('DIF_ID' in authorities).toBeTruthy();
it('Correctly inherited bbox and resolution', function() { var url = 'http://gcmd.gsfc.nasa.gov/difguide/whatisadif.html';
var bbox = layers['ROADS_1M'].bbox['EPSG:26986']; expect(authorities['DIF_ID']).toEqual(url);
expect(bbox.bbox).toEqual([189000, 834000, 285000, 962000]); expect(featurelist).toBeTruthy();
expect(bbox.res).toEqual({x: 1, y: 1}); expect(featurelist.format).toEqual('XML');
}); url = 'http://www.university.edu/data/roads_rivers.gml';
it('got identifiers from layer ROADS_RIVERS', function() { expect(featurelist.href).toEqual(url);
expect(identifiers).toBeTruthy(); expect(layers['Pressure'].queryable).toBeTruthy();
}); expect(layers['ozone_image'].queryable).toBeFalsy();
it('authority attribute from Identifiers parsed correctly', function() { expect(layers['population'].cascaded).toEqual(1);
expect('DIF_ID' in identifiers).toBeTruthy(); expect(layers['ozone_image'].fixedWidth).toEqual(512);
}); expect(layers['ozone_image'].fixedHeight).toEqual(256);
it('Identifier value parsed correctly', function() { expect(layers['ozone_image'].opaque).toBeTruthy();
expect(identifiers['DIF_ID']).toEqual('123456'); expect(layers['ozone_image'].noSubsets).toBeTruthy();
}); expect(time['default']).toEqual('2000-08-22');
it('AuthorityURLs parsed and inherited correctly', function() { expect(time.values.length).toEqual(1);
expect('DIF_ID' in authorities).toBeTruthy(); expect(time.values[0]).toEqual('1999-01-01/2000-08-22/P1D');
}); expect(elevation.units).toEqual('CRS:88');
it('OnlineResource in AuthorityURLs parsed correctly', function() { expect(elevation['default']).toEqual('0');
var url = 'http://gcmd.gsfc.nasa.gov/difguide/whatisadif.html'; expect(elevation.nearestVal).toBeTruthy();
expect(authorities['DIF_ID']).toEqual(url); expect(elevation.multipleVal).toBeFalsy();
}); expect(elevation.values).toEqual(['0', '1000', '3000', '5000',
it('layer has FeatureListURL', function() { '10000']);
expect(featurelist).toBeTruthy(); expect(contactinfo).toBeTruthy();
}); expect(personPrimary).toBeTruthy();
it('FeatureListURL format parsed correctly', function() { expect(personPrimary.person).toEqual('Jeff Smith');
expect(featurelist.format).toEqual('XML'); expect(personPrimary.organization).toEqual('NASA');
}); expect(contactinfo.position).toEqual('Computer Scientist');
it('FeatureListURL OnlineResource parsed correctly', function() { expect(addr).toBeTruthy();
var url = 'http://www.university.edu/data/roads_rivers.gml'; expect(addr.type).toEqual('postal');
expect(featurelist.href).toEqual(url); expect(addr.address).toEqual('NASA Goddard Space Flight Center');
}); expect(addr.city).toEqual('Greenbelt');
it('queryable property inherited correctly', function() { expect(addr.stateOrProvince).toEqual('MD');
expect(layers['Pressure'].queryable).toBeTruthy(); expect(addr.postcode).toEqual('20771');
}); expect(addr.country).toEqual('USA');
it('queryable property has correct default value', function() { expect(contactinfo.phone).toEqual('+1 301 555-1212');
expect(layers['ozone_image'].queryable).toBeFalsy(); expect(contactinfo.email).toEqual('user@host.com');
}); expect('fees' in service).toBeFalsy();
it('cascaded property parsed correctly', function() { expect('accessConstraints' in service).toBeFalsy();
expect(layers['population'].cascaded).toEqual(1); expect(request).toBeTruthy();
}); expect('getmap' in request).toBeTruthy();
it('fixedWidth property correctly parsed', function() { expect('getfeatureinfo' in request).toBeTruthy();
expect(layers['ozone_image'].fixedWidth).toEqual(512); var formats = ['text/xml', 'text/plain', 'text/html'];
}); expect(request.getfeatureinfo.formats).toEqual(formats);
it('fixedHeight property correctly parsed', function() { expect(exception).toBeTruthy();
expect(layers['ozone_image'].fixedHeight).toEqual(256); formats = ['XML', 'INIMAGE', 'BLANK'];
}); expect(exception.formats).toEqual(formats);
it('opaque property parsed correctly', function() { expect(attribution.title).toEqual('State College University');
expect(layers['ozone_image'].opaque).toBeTruthy(); expect(attribution.href).toEqual('http://www.university.edu/');
}); url = 'http://www.university.edu/icons/logo.gif';
it('noSubsets property parsed correctly', function() { expect(attribution.logo.href).toEqual(url);
expect(layers['ozone_image'].noSubsets).toBeTruthy(); expect(attribution.logo.format).toEqual('image/gif');
expect(attribution.logo.width).toEqual('100');
expect(attribution.logo.height).toEqual('100');
expect(keywords.length).toEqual(3);
expect(keywords[0].value).toEqual('road');
expect(metadataURLs.length).toEqual(2);
expect(metadataURLs[0].type).toEqual('FGDC:1998');
expect(metadataURLs[0].format).toEqual('text/plain');
url = 'http://www.university.edu/metadata/roads.txt';
expect(metadataURLs[0].href).toEqual(url);
var minScale = 250000;
expect(capability.layers[0].minScale).toEqual(minScale.toPrecision(16));
var maxScale = 1000;
expect(capability.layers[0].maxScale).toEqual(maxScale.toPrecision(16));
expect(obj.service.layerLimit).toEqual(16);
expect(obj.service.maxHeight).toEqual(2048);
expect(obj.service.maxWidth).toEqual(2048);
});
}); });
}); });
describe('test dimensions', function() {
it('Default time value parsed correctly', function() {
expect(time['default']).toEqual('2000-08-22');
});
it('Currect number of time extent values/periods', function() {
expect(time.values.length).toEqual(1);
});
it('Time extent values parsed correctly', function() {
expect(time.values[0]).toEqual('1999-01-01/2000-08-22/P1D');
});
it('Dimension units parsed correctly', function() {
expect(elevation.units).toEqual('CRS:88');
});
it('Default elevation value parsed correctly', function() {
expect(elevation['default']).toEqual('0');
});
it('NearestValue parsed correctly', function() {
expect(elevation.nearestVal).toBeTruthy();
});
it('Absense of MultipleValues handled correctly', function() {
expect(elevation.multipleVal).toBeFalsy();
});
it('Parsing of comma-separated values done correctly', function() {
expect(elevation.values).toEqual(['0', '1000', '3000', '5000', '10000']);
});
});
describe('test contact info', function() {
it('object contains contactInformation property', function() {
expect(contactinfo).toBeTruthy();
});
it('object contains personPrimary property', function() {
expect(personPrimary).toBeTruthy();
});
it('ContactPerson parsed correctly', function() {
expect(personPrimary.person).toEqual('Jeff Smith');
});
it('ContactOrganization parsed correctly', function() {
expect(personPrimary.organization).toEqual('NASA');
});
it('ContactPosition parsed correctly', function() {
expect(contactinfo.position).toEqual('Computer Scientist');
});
it('object contains contactAddress property', function() {
expect(addr).toBeTruthy();
});
it('AddressType parsed correctly', function() {
expect(addr.type).toEqual('postal');
});
it('Address parsed correctly', function() {
expect(addr.address).toEqual('NASA Goddard Space Flight Center');
});
it('City parsed correctly', function() {
expect(addr.city).toEqual('Greenbelt');
});
it('StateOrProvince parsed correctly', function() {
expect(addr.stateOrProvince).toEqual('MD');
});
it('PostCode parsed correctly', function() {
expect(addr.postcode).toEqual('20771');
});
it('Country parsed correctly', function() {
expect(addr.country).toEqual('USA');
});
it('ContactVoiceTelephone parsed correctly', function() {
expect(contactinfo.phone).toEqual('+1 301 555-1212');
});
it('ContactElectronicMailAddress parsed correctly', function() {
expect(contactinfo.email).toEqual('user@host.com');
});
});
describe('test fees and constraints', function() {
it('Fees=none handled correctly', function() {
expect('fees' in service).toBeFalsy();
});
it('AccessConstraints=none handled correctly', function() {
expect('accessConstraints' in service).toBeFalsy();
});
});
describe('test requests', function() {
it('request property exists', function() {
expect(request).toBeTruthy();
});
it('got GetMap request', function() {
expect('getmap' in request).toBeTruthy();
});
it('got GetFeatureInfo request', function() {
expect('getfeatureinfo' in request).toBeTruthy();
});
it('GetFeatureInfo formats correctly parsed', function() {
var formats = ['text/xml', 'text/plain', 'text/html'];
expect(request.getfeatureinfo.formats).toEqual(formats);
});
it('exception property exists', function() {
expect(exception).toBeTruthy();
});
it('Exception Format parsed', function() {
var formats = ['XML', 'INIMAGE', 'BLANK'];
expect(exception.formats).toEqual(formats);
});
});
describe('test ogc', function() {
it('attribution title parsed correctly.', function() {
expect(attribution.title).toEqual('State College University');
});
it('attribution href parsed correctly.', function() {
expect(attribution.href).toEqual('http://www.university.edu/');
});
it('attribution logo url parsed correctly.', function() {
var url = 'http://www.university.edu/icons/logo.gif';
expect(attribution.logo.href).toEqual(url);
});
it('attribution logo format parsed correctly.', function() {
expect(attribution.logo.format).toEqual('image/gif');
});
it('attribution logo width parsed correctly.', function() {
expect(attribution.logo.width).toEqual('100');
});
it('attribution logo height parsed correctly.', function() {
expect(attribution.logo.height).toEqual('100');
});
it('layer has 3 keywords.', function() {
expect(keywords.length).toEqual(3);
});
it('1st keyword parsed correctly.', function() {
expect(keywords[0].value).toEqual('road');
});
it('layer has 2 metadata urls.', function() {
expect(metadataURLs.length).toEqual(2);
});
it('type parsed correctly.', function() {
expect(metadataURLs[0].type).toEqual('FGDC:1998');
});
it('format parsed correctly.', function() {
expect(metadataURLs[0].format).toEqual('text/plain');
});
it('href parsed correctly.', function() {
var url = 'http://www.university.edu/metadata/roads.txt';
expect(metadataURLs[0].href).toEqual(url);
});
it('layer.minScale is correct', function() {
var minScale = 250000;
expect(capability.layers[0].minScale).toEqual(minScale.toPrecision(16));
});
it('layer.maxScale is correct', function() {
var maxScale = 1000;
expect(capability.layers[0].maxScale).toEqual(maxScale.toPrecision(16));
});
});
describe('test WMS 1.3 specials', function() {
it('LayerLimit parsed correctly', function() {
expect(obj.service.layerLimit).toEqual(16);
});
it('MaxHeight parsed correctly', function() {
expect(obj.service.maxHeight).toEqual(2048);
});
it('MaxWidth parsed correctly', function() {
expect(obj.service.maxWidth).toEqual(2048);
});
});
}); });
goog.require('goog.net.XhrIo'); goog.require('goog.net.XhrIo');