diff --git a/test/spec/ol/format/esrijsonformat.test.js b/test/spec/ol/format/esrijsonformat.test.js index 0b24013817..ded24d1e4a 100644 --- a/test/spec/ol/format/esrijsonformat.test.js +++ b/test/spec/ol/format/esrijsonformat.test.js @@ -67,24 +67,22 @@ describe('ol.format.EsriJSON', function() { var multiPolygonEsriJSON = { geometry: { - rings: [ - [ - [0, 1], - [1, 4], - [4, 3], - [3, 0] - ], [ - [2, 2], - [3, 2], - [3, 3], - [2, 3] - ], [ - [10, 1], - [11, 5], - [14, 3], - [13, 0] - ] - ] + rings: [[ + [0, 1], + [1, 4], + [4, 3], + [3, 0] + ], [ + [2, 2], + [3, 2], + [3, 3], + [2, 3] + ], [ + [10, 1], + [11, 5], + [14, 3], + [13, 0] + ]] } }; @@ -93,62 +91,60 @@ describe('ol.format.EsriJSON', function() { }; var data = { - features: [ - { - attributes: { - 'LINK_ID': 573730499, - 'RP_TYPE': 14, - 'RP_FUNC': 0, - 'DIRECTION': 2, - 'LOGKOD': '', - 'CHANGED': '', - 'USERID': '', - 'ST_NAME': '', - 'L_REFADDR': '', - 'L_NREFADDR': '', - 'R_REFADDR': '', - 'R_NREFADDR': '', - 'SPEED_CAT': '7', - 'ZIPCODE': '59330', - 'SHAPE_LEN': 46.3826 - }, - geometry: { - paths: [[ - [1549497.66985, 6403707.96], - [1549491.1, 6403710.1], - [1549488.03995, 6403716.7504], - [1549488.5401, 6403724.5504], - [1549494.37985, 6403733.54], - [1549499.6799, 6403738.0504], - [1549506.22, 6403739.2504] - ]] - } - }, { - attributes: { - 'LINK_ID': 30760556, - 'RP_TYPE': 12, - 'RP_FUNC': 1, - 'DIRECTION': 0, - 'LOGKOD': '', - 'CHANGED': '', - 'USERID': '', - 'ST_NAME': 'BRUNNSGATAN', - 'L_REFADDR': '24', - 'L_NREFADDR': '16', - 'R_REFADDR': '', - 'R_NREFADDR': '', - 'SPEED_CAT': '7', - 'ZIPCODE': '59330', - 'SHAPE_LEN': 70.3106 - }, - geometry: { - paths: [[ - [1549754.2769, 6403854.8024], - [1549728.45985, 6403920.2] - ]] - } + features: [{ + attributes: { + 'LINK_ID': 573730499, + 'RP_TYPE': 14, + 'RP_FUNC': 0, + 'DIRECTION': 2, + 'LOGKOD': '', + 'CHANGED': '', + 'USERID': '', + 'ST_NAME': '', + 'L_REFADDR': '', + 'L_NREFADDR': '', + 'R_REFADDR': '', + 'R_NREFADDR': '', + 'SPEED_CAT': '7', + 'ZIPCODE': '59330', + 'SHAPE_LEN': 46.3826 + }, + geometry: { + paths: [[ + [1549497.66985, 6403707.96], + [1549491.1, 6403710.1], + [1549488.03995, 6403716.7504], + [1549488.5401, 6403724.5504], + [1549494.37985, 6403733.54], + [1549499.6799, 6403738.0504], + [1549506.22, 6403739.2504] + ]] } - ] + }, { + attributes: { + 'LINK_ID': 30760556, + 'RP_TYPE': 12, + 'RP_FUNC': 1, + 'DIRECTION': 0, + 'LOGKOD': '', + 'CHANGED': '', + 'USERID': '', + 'ST_NAME': 'BRUNNSGATAN', + 'L_REFADDR': '24', + 'L_NREFADDR': '16', + 'R_REFADDR': '', + 'R_NREFADDR': '', + 'SPEED_CAT': '7', + 'ZIPCODE': '59330', + 'SHAPE_LEN': 70.3106 + }, + geometry: { + paths: [[ + [1549754.2769, 6403854.8024], + [1549728.45985, 6403920.2] + ]] + } + }] }; describe('#readFeature', function() { diff --git a/test/spec/ol/format/geojsonformat.test.js b/test/spec/ol/format/geojsonformat.test.js index 6160a69b9e..95358095df 100644 --- a/test/spec/ol/format/geojsonformat.test.js +++ b/test/spec/ol/format/geojsonformat.test.js @@ -71,66 +71,64 @@ describe('ol.format.GeoJSON', function() { var data = { 'type': 'FeatureCollection', - 'features': [ - { - 'type': 'Feature', - 'properties': { - 'LINK_ID': 573730499, - 'RP_TYPE': 14, - 'RP_FUNC': 0, - 'DIRECTION': 2, - 'LOGKOD': '', - 'CHANGED': '', - 'USERID': '', - 'ST_NAME': '', - 'L_REFADDR': '', - 'L_NREFADDR': '', - 'R_REFADDR': '', - 'R_NREFADDR': '', - 'SPEED_CAT': '7', - 'ZIPCODE': '59330', - 'SHAPE_LEN': 46.3826 - }, - 'geometry': { - 'type': 'LineString', - 'coordinates': [ - [1549497.66985, 6403707.96], - [1549491.1, 6403710.1], - [1549488.03995, 6403716.7504], - [1549488.5401, 6403724.5504], - [1549494.37985, 6403733.54], - [1549499.6799, 6403738.0504], - [1549506.22, 6403739.2504] - ] - } - }, { - 'type': 'Feature', - 'properties': { - 'LINK_ID': 30760556, - 'RP_TYPE': 12, - 'RP_FUNC': 1, - 'DIRECTION': 0, - 'LOGKOD': '', - 'CHANGED': '', - 'USERID': '', - 'ST_NAME': 'BRUNNSGATAN', - 'L_REFADDR': '24', - 'L_NREFADDR': '16', - 'R_REFADDR': '', - 'R_NREFADDR': '', - 'SPEED_CAT': '7', - 'ZIPCODE': '59330', - 'SHAPE_LEN': 70.3106 - }, - 'geometry': { - 'type': 'LineString', - 'coordinates': [ - [1549754.2769, 6403854.8024], - [1549728.45985, 6403920.2] - ] - } + 'features': [{ + 'type': 'Feature', + 'properties': { + 'LINK_ID': 573730499, + 'RP_TYPE': 14, + 'RP_FUNC': 0, + 'DIRECTION': 2, + 'LOGKOD': '', + 'CHANGED': '', + 'USERID': '', + 'ST_NAME': '', + 'L_REFADDR': '', + 'L_NREFADDR': '', + 'R_REFADDR': '', + 'R_NREFADDR': '', + 'SPEED_CAT': '7', + 'ZIPCODE': '59330', + 'SHAPE_LEN': 46.3826 + }, + 'geometry': { + 'type': 'LineString', + 'coordinates': [ + [1549497.66985, 6403707.96], + [1549491.1, 6403710.1], + [1549488.03995, 6403716.7504], + [1549488.5401, 6403724.5504], + [1549494.37985, 6403733.54], + [1549499.6799, 6403738.0504], + [1549506.22, 6403739.2504] + ] } - ] + }, { + 'type': 'Feature', + 'properties': { + 'LINK_ID': 30760556, + 'RP_TYPE': 12, + 'RP_FUNC': 1, + 'DIRECTION': 0, + 'LOGKOD': '', + 'CHANGED': '', + 'USERID': '', + 'ST_NAME': 'BRUNNSGATAN', + 'L_REFADDR': '24', + 'L_NREFADDR': '16', + 'R_REFADDR': '', + 'R_NREFADDR': '', + 'SPEED_CAT': '7', + 'ZIPCODE': '59330', + 'SHAPE_LEN': 70.3106 + }, + 'geometry': { + 'type': 'LineString', + 'coordinates': [ + [1549754.2769, 6403854.8024], + [1549728.45985, 6403920.2] + ] + } + }] }; describe('#readFeature', function() { diff --git a/test/spec/ol/pointer/mousesource.test.js b/test/spec/ol/pointer/mousesource.test.js index ec6bde2800..224a9d9e26 100644 --- a/test/spec/ol/pointer/mousesource.test.js +++ b/test/spec/ol/pointer/mousesource.test.js @@ -63,14 +63,12 @@ describe('ol.pointer.MouseSource', function() { }); function simulateTouchEvent(type, x, y) { - var touches = [ - { - identifier: 4, - clientX: x, - clientY: y, - target: target - } - ]; + var touches = [{ + identifier: 4, + clientX: x, + clientY: y, + target: target + }]; var event = new goog.events.BrowserEvent({ type: type, diff --git a/test/spec/ol/sphere/sphere.test.js b/test/spec/ol/sphere/sphere.test.js index 3544a47c10..323793921e 100644 --- a/test/spec/ol/sphere/sphere.test.js +++ b/test/spec/ol/sphere/sphere.test.js @@ -7,83 +7,67 @@ goog.provide('ol.test.Sphere'); describe('ol.Sphere', function() { var sphere = new ol.Sphere(6371); - var expected = [ - { - c1: [0, 0], - c2: [0, 0], - haversineDistance: 0 - }, - { - c1: [0, 0], - c2: [45, 45], - haversineDistance: 6671.695598673525 - }, - { - c1: [0, 0], - c2: [-45, 45], - haversineDistance: 6671.695598673525 - }, - { - c1: [0, 0], - c2: [-45, -45], - haversineDistance: 6671.695598673525 - }, - { - c1: [0, 0], - c2: [45, -45], - haversineDistance: 6671.695598673525 - }, - { - c1: [45, 45], - c2: [45, 45], - haversineDistance: 0 - }, - { - c1: [45, 45], - c2: [-45, 45], - haversineDistance: 6671.695598673525 - }, - { - c1: [45, 45], - c2: [-45, -45], - haversineDistance: 13343.391197347048 - }, - { - c1: [45, 45], - c2: [45, -45], - haversineDistance: 10007.543398010286 - }, - { - c1: [-45, 45], - c2: [-45, 45], - haversineDistance: 0 - }, - { - c1: [-45, 45], - c2: [-45, -45], - haversineDistance: 10007.543398010286 - }, - { - c1: [-45, 45], - c2: [45, -45], - haversineDistance: 13343.391197347048 - }, - { - c1: [-45, -45], - c2: [-45, -45], - haversineDistance: 0 - }, - { - c1: [-45, -45], - c2: [45, -45], - haversineDistance: 6671.695598673525 - }, - { - c1: [45, -45], - c2: [45, -45], - haversineDistance: 0 - } - ]; + var expected = [{ + c1: [0, 0], + c2: [0, 0], + haversineDistance: 0 + }, { + c1: [0, 0], + c2: [45, 45], + haversineDistance: 6671.695598673525 + }, { + c1: [0, 0], + c2: [-45, 45], + haversineDistance: 6671.695598673525 + }, { + c1: [0, 0], + c2: [-45, -45], + haversineDistance: 6671.695598673525 + }, { + c1: [0, 0], + c2: [45, -45], + haversineDistance: 6671.695598673525 + }, { + c1: [45, 45], + c2: [45, 45], + haversineDistance: 0 + }, { + c1: [45, 45], + c2: [-45, 45], + haversineDistance: 6671.695598673525 + }, { + c1: [45, 45], + c2: [-45, -45], + haversineDistance: 13343.391197347048 + }, { + c1: [45, 45], + c2: [45, -45], + haversineDistance: 10007.543398010286 + }, { + c1: [-45, 45], + c2: [-45, 45], + haversineDistance: 0 + }, { + c1: [-45, 45], + c2: [-45, -45], + haversineDistance: 10007.543398010286 + }, { + c1: [-45, 45], + c2: [45, -45], + haversineDistance: 13343.391197347048 + }, { + c1: [-45, -45], + c2: [-45, -45], + haversineDistance: 0 + }, { + c1: [-45, -45], + c2: [45, -45], + haversineDistance: 6671.695598673525 + }, { + c1: [45, -45], + c2: [45, -45], + haversineDistance: 0 + }]; describe('haversineDistance', function() {