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

Port parsers to new extents

Browse Source
This commit is contained in:
Tom Payne
2013-04-16 16:28:27 +02:00
parent 953f9c2e7a
commit f81658f542
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/parser/ogc/owscommon_v1.js
+4 -4
View File
@@ -1,5 +1,4 @@
goog.provide('ol.parser.ogc.OWSCommon_v1'); goog.provide('ol.parser.ogc.OWSCommon_v1');
goog.require('ol.Extent');
goog.require('ol.parser.XML'); goog.require('ol.parser.XML');
@@ -196,9 +195,10 @@ ol.parser.ogc.OWSCommon_v1 = function() {
var pointList = str.split(this.regExes.splitSpace); var pointList = str.split(this.regExes.splitSpace);
obj['right'] = pointList[0]; obj['right'] = pointList[0];
obj['top'] = pointList[1]; obj['top'] = pointList[1];
obj['bounds'] = new ol.Extent(parseFloat(obj['left']), obj['bounds'] = [
parseFloat(obj['bottom']), parseFloat(obj['right']), parseFloat(obj['left']), parseFloat(obj['right']),
parseFloat(obj['top'])); parseFloat(obj['bottom']), parseFloat(obj['top'])
];
delete obj['left']; delete obj['left'];
delete obj['bottom']; delete obj['bottom'];
delete obj['right']; delete obj['right'];
test/spec/ol/parser/geojson.test.js
+9 -9
View File
@@ -153,8 +153,8 @@ describe('ol.parser.GeoJSON', function() {
expect(first.get('name')).to.be('Afghanistan'); expect(first.get('name')).to.be('Afghanistan');
var firstGeom = first.getGeometry(); var firstGeom = first.getGeometry();
expect(firstGeom).to.be.a(ol.geom.Polygon); expect(firstGeom).to.be.a(ol.geom.Polygon);
expect(firstGeom.getBounds().equals( expect(ol.extent.equals(firstGeom.getBounds(),
new ol.Extent(60.52843, 29.318572, 75.158028, 38.486282))) [60.52843, 75.158028, 29.318572, 38.486282]))
.to.be(true); .to.be(true);
var last = result[178]; var last = result[178];
@@ -162,8 +162,8 @@ describe('ol.parser.GeoJSON', function() {
expect(last.get('name')).to.be('Zimbabwe'); expect(last.get('name')).to.be('Zimbabwe');
var lastGeom = last.getGeometry(); var lastGeom = last.getGeometry();
expect(lastGeom).to.be.a(ol.geom.Polygon); expect(lastGeom).to.be.a(ol.geom.Polygon);
expect(lastGeom.getBounds().equals( expect(ol.extent.equals(lastGeom.getBounds(),
new ol.Extent(25.264226, -22.271612, 32.849861, -15.507787))) [25.264226, 32.849861, -22.271612, -15.507787]))
.to.be(true); .to.be(true);
done(); done();
}); });
@@ -200,8 +200,8 @@ describe('ol.parser.GeoJSON', function() {
expect(first.get('name')).to.be('Afghanistan'); expect(first.get('name')).to.be('Afghanistan');
var firstGeom = first.getGeometry(); var firstGeom = first.getGeometry();
expect(firstGeom).to.be.a(ol.geom.Polygon); expect(firstGeom).to.be.a(ol.geom.Polygon);
expect(firstGeom.getBounds().equals( expect(ol.extent.equals(firstGeom.getBounds(),
new ol.Extent(60.52843, 29.318572, 75.158028, 38.486282))) [60.52843, 75.158028, 29.318572, 38.486282]))
.to.be(true); .to.be(true);
var last = result[178]; var last = result[178];
@@ -209,8 +209,8 @@ describe('ol.parser.GeoJSON', function() {
expect(last.get('name')).to.be('Zimbabwe'); expect(last.get('name')).to.be('Zimbabwe');
var lastGeom = last.getGeometry(); var lastGeom = last.getGeometry();
expect(lastGeom).to.be.a(ol.geom.Polygon); expect(lastGeom).to.be.a(ol.geom.Polygon);
expect(lastGeom.getBounds().equals( expect(ol.extent.equals(lastGeom.getBounds(),
new ol.Extent(25.264226, -22.271612, 32.849861, -15.507787))) [25.264226, 32.849861, -22.271612, -15.507787]))
.to.be(true); .to.be(true);
}); });
}); });
@@ -219,8 +219,8 @@ describe('ol.parser.GeoJSON', function() {
}); });
goog.require('ol.Extent');
goog.require('ol.Feature'); goog.require('ol.Feature');
goog.require('ol.extent');
goog.require('ol.geom.LinearRing'); goog.require('ol.geom.LinearRing');
goog.require('ol.geom.LineString'); goog.require('ol.geom.LineString');
goog.require('ol.geom.Point'); goog.require('ol.geom.Point');
test/spec/ol/parser/ogc/wmtscapabilities_v1_0_0.test.js
+5 -6
View File
@@ -99,11 +99,11 @@ describe('ol.parser.ogc.wmtscapabilities_v1_0_0', function() {
expect(layer.styles[1].legend).to.be(undefined); expect(layer.styles[1].legend).to.be(undefined);
expect(layer.tileMatrixSetLinks.length).to.eql(1); expect(layer.tileMatrixSetLinks.length).to.eql(1);
expect(layer.tileMatrixSetLinks[0].tileMatrixSet).to.eql('BigWorld'); expect(layer.tileMatrixSetLinks[0].tileMatrixSet).to.eql('BigWorld');
expect(wgs84Bbox instanceof ol.Extent).to.be.ok(); expect(wgs84Bbox).to.be.an(Array);
expect(wgs84Bbox.minX).to.eql(-180.0); expect(wgs84Bbox[0]).to.eql(-180.0);
expect(wgs84Bbox.maxX).to.eql(180.0); expect(wgs84Bbox[1]).to.eql(180.0);
expect(wgs84Bbox.minY).to.eql(-90.0); expect(wgs84Bbox[2]).to.eql(-90.0);
expect(wgs84Bbox.maxY).to.eql(90.0); expect(wgs84Bbox[3]).to.eql(90.0);
expect(layer.resourceUrls.hasOwnProperty('tile')).to.be.ok(); expect(layer.resourceUrls.hasOwnProperty('tile')).to.be.ok();
var format = 'image/png'; var format = 'image/png';
expect(layer.resourceUrls.tile.hasOwnProperty(format)).to.be.ok(); expect(layer.resourceUrls.tile.hasOwnProperty(format)).to.be.ok();
@@ -178,5 +178,4 @@ describe('ol.parser.ogc.wmtscapabilities_v1_0_0', function() {
}); });
goog.require('goog.net.XhrIo'); goog.require('goog.net.XhrIo');
goog.require('ol.Extent');
goog.require('ol.parser.ogc.WMTSCapabilities'); goog.require('ol.parser.ogc.WMTSCapabilities');