From 40e9f0eaf24a1fea0312e95fab93f890731d83e8 Mon Sep 17 00:00:00 2001 From: Bart van den Eijnden Date: Mon, 23 Nov 2015 10:05:17 +0100 Subject: [PATCH 1/9] Fix up ol.format.GPX tests in IE --- test/spec/ol/format/gpxformat.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/spec/ol/format/gpxformat.test.js b/test/spec/ol/format/gpxformat.test.js index bf5c4eaca0..eea926db2f 100644 --- a/test/spec/ol/format/gpxformat.test.js +++ b/test/spec/ol/format/gpxformat.test.js @@ -567,10 +567,10 @@ describe('ol.format.GPX', function() { [[[0, 0], [2, 2], [4, 0], [0, 0]]]); var feature = new ol.Feature(polygon); var features = [feature]; - var gpx = format.writeFeatures(features); + var gpx = format.writeFeaturesNode(features); var expected = ''; - expect(gpx).to.be(expected); + expect(gpx).to.xmleql(ol.xml.parse(expected)); }); }); From b338c77726d1ee194b8a646aafb0140803d71fad Mon Sep 17 00:00:00 2001 From: Bart van den Eijnden Date: Mon, 23 Nov 2015 10:23:54 +0100 Subject: [PATCH 2/9] Fix up ol.source.TileArcGISRest tests in IE --- .../ol/source/tilearcgisrestsource.test.js | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/test/spec/ol/source/tilearcgisrestsource.test.js b/test/spec/ol/source/tilearcgisrestsource.test.js index 1fd8ec53ff..dc234b1df2 100644 --- a/test/spec/ol/source/tilearcgisrestsource.test.js +++ b/test/spec/ol/source/tilearcgisrestsource.test.js @@ -22,9 +22,11 @@ describe('ol.source.TileArcGISRest', function() { expect(uri.getDomain()).to.be('example.com'); expect(uri.getPath()).to.be('/MapServer/export'); var queryData = uri.getQueryData(); - expect(queryData.get('BBOX')).to.be( - '-10018754.171394622,-15028131.257091936,' + - '-5009377.085697311,-10018754.171394624'); + var bbox = queryData.get('BBOX').split(',').map(parseFloat); + expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9); + expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9); + expect(bbox[2]).roughlyEqual(-5009377.085697311, 1e-9); + expect(bbox[3]).roughlyEqual(-10018754.171394624, 1e-9); expect(queryData.get('FORMAT')).to.be('PNG32'); expect(queryData.get('SIZE')).to.be('256,256'); expect(queryData.get('IMAGESR')).to.be('3857'); @@ -54,9 +56,11 @@ describe('ol.source.TileArcGISRest', function() { expect(uri.getDomain()).to.match(/test[12]\.com/); expect(uri.getPath()).to.be('/MapServer/export'); var queryData = uri.getQueryData(); - expect(queryData.get('BBOX')).to.be( - '-10018754.171394622,-15028131.257091936,' + - '-5009377.085697311,-10018754.171394624'); + var bbox = queryData.get('BBOX').split(',').map(parseFloat); + expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9); + expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9); + expect(bbox[2]).roughlyEqual(-5009377.085697311, 1e-9); + expect(bbox[3]).roughlyEqual(-10018754.171394624, 1e-9); expect(queryData.get('FORMAT')).to.be('PNG32'); expect(queryData.get('SIZE')).to.be('256,256'); expect(queryData.get('IMAGESR')).to.be('3857'); @@ -75,9 +79,11 @@ describe('ol.source.TileArcGISRest', function() { expect(uri.getDomain()).to.be('example.com'); expect(uri.getPath()).to.be('/ImageServer/exportImage'); var queryData = uri.getQueryData(); - expect(queryData.get('BBOX')).to.be( - '-10018754.171394622,-15028131.257091936,' + - '-5009377.085697311,-10018754.171394624'); + var bbox = queryData.get('BBOX').split(',').map(parseFloat); + expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9); + expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9); + expect(bbox[2]).roughlyEqual(-5009377.085697311, 1e-9); + expect(bbox[3]).roughlyEqual(-10018754.171394624, 1e-9); expect(queryData.get('FORMAT')).to.be('PNG32'); expect(queryData.get('SIZE')).to.be('256,256'); expect(queryData.get('IMAGESR')).to.be('3857'); From a2d7f5693373a157a55ce77c1bd8db51768fd1af Mon Sep 17 00:00:00 2001 From: Bart van den Eijnden Date: Mon, 23 Nov 2015 10:38:19 +0100 Subject: [PATCH 3/9] Fix up ol.source.TileWMS tests in IE --- test/spec/ol/source/tilewmssource.test.js | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/test/spec/ol/source/tilewmssource.test.js b/test/spec/ol/source/tilewmssource.test.js index d5de725a24..53d0b026bb 100644 --- a/test/spec/ol/source/tilewmssource.test.js +++ b/test/spec/ol/source/tilewmssource.test.js @@ -34,9 +34,11 @@ describe('ol.source.TileWMS', function() { expect(uri.getDomain()).to.be('example.com'); expect(uri.getPath()).to.be('/wms'); var queryData = uri.getQueryData(); - expect(queryData.get('BBOX')).to.be( - '-10018754.171394622,-15028131.257091936,' + - '-5009377.085697311,-10018754.171394624'); + var bbox = queryData.get('BBOX').split(',').map(parseFloat); + expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9); + expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9); + expect(bbox[2]).roughlyEqual(-5009377.085697311, 1e-9); + expect(bbox[3]).roughlyEqual(-10018754.171394624, 1e-9); expect(queryData.get('CRS')).to.be('EPSG:3857'); expect(queryData.get('FORMAT')).to.be('image/png'); expect(queryData.get('HEIGHT')).to.be('256'); @@ -199,9 +201,11 @@ describe('ol.source.TileWMS', function() { expect(uri.getDomain()).to.be('example.com'); expect(uri.getPath()).to.be('/wms'); var queryData = uri.getQueryData(); - expect(queryData.get('BBOX')).to.be( - '-10018754.171394622,-15028131.257091936,' + - '-5009377.085697311,-10018754.171394624'); + var bbox = queryData.get('BBOX').split(',').map(parseFloat); + expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9); + expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9); + expect(bbox[2]).roughlyEqual(-5009377.085697311, 1e-9); + expect(bbox[3]).roughlyEqual(-10018754.171394624, 1e-9); expect(queryData.get('CRS')).to.be('EPSG:3857'); expect(queryData.get('FORMAT')).to.be('image/png'); expect(queryData.get('HEIGHT')).to.be('256'); @@ -231,9 +235,11 @@ describe('ol.source.TileWMS', function() { expect(uri.getDomain()).to.be('example.com'); expect(uri.getPath()).to.be('/wms'); var queryData = uri.getQueryData(); - expect(queryData.get('BBOX')).to.be( - '-10018754.171394622,-15028131.257091936,' + - '-5009377.085697311,-10018754.171394624'); + var bbox = queryData.get('BBOX').split(',').map(parseFloat); + expect(bbox[0]).roughlyEqual(-10018754.171394622, 1e-9); + expect(bbox[1]).roughlyEqual(-15028131.257091936, 1e-9); + expect(bbox[2]).roughlyEqual(-5009377.085697311, 1e-9); + expect(bbox[3]).roughlyEqual(-10018754.171394624, 1e-9); expect(queryData.get('CRS')).to.be('EPSG:3857'); expect(queryData.get('FORMAT')).to.be('image/png'); expect(queryData.get('HEIGHT')).to.be('256'); From 230f24208b8c28d716d6dfacff29e360e1ff2222 Mon Sep 17 00:00:00 2001 From: Bart van den Eijnden Date: Mon, 23 Nov 2015 14:03:18 +0100 Subject: [PATCH 4/9] Fix up EsriJSON format tests in IE9 --- test/index.html | 2 + test/spec/ol/format/esrijson/ksfields.json | 5259 +++++++++++++++++++- test/spec/ol/format/esrijsonformat.test.js | 12 +- 3 files changed, 5266 insertions(+), 7 deletions(-) diff --git a/test/index.html b/test/index.html index 70bdcab6ac..59abffd854 100644 --- a/test/index.html +++ b/test/index.html @@ -30,6 +30,8 @@