diff --git a/src/ol/geom/circle.js b/src/ol/geom/circle.js index 1df979d6b0..e0c7916c06 100644 --- a/src/ol/geom/circle.js +++ b/src/ol/geom/circle.js @@ -4,7 +4,6 @@ goog.require('goog.asserts'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.SimpleGeometry'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.deflate'); diff --git a/src/ol/geom/flat/areaflatgeom.js b/src/ol/geom/flat/areaflatgeom.js index 54479f0fe1..eb0b1e4275 100644 --- a/src/ol/geom/flat/areaflatgeom.js +++ b/src/ol/geom/flat/areaflatgeom.js @@ -1,7 +1,5 @@ goog.provide('ol.geom.flat.area'); -goog.require('ol.geom.flat'); - /** * @param {Array.} flatCoordinates Flat coordinates. diff --git a/src/ol/geom/flat/closestflatgeom.js b/src/ol/geom/flat/closestflatgeom.js index ec9b0eb993..9170d2478c 100644 --- a/src/ol/geom/flat/closestflatgeom.js +++ b/src/ol/geom/flat/closestflatgeom.js @@ -2,7 +2,6 @@ goog.provide('ol.geom.flat.closest'); goog.require('goog.asserts'); goog.require('goog.math'); -goog.require('ol.geom.flat'); goog.require('ol.math'); diff --git a/src/ol/geom/flat/containsflatgeom.js b/src/ol/geom/flat/containsflatgeom.js index e0d43c4da4..5b5c93aacb 100644 --- a/src/ol/geom/flat/containsflatgeom.js +++ b/src/ol/geom/flat/containsflatgeom.js @@ -1,7 +1,6 @@ goog.provide('ol.geom.flat.contains'); goog.require('goog.asserts'); -goog.require('ol.geom.flat'); /** diff --git a/src/ol/geom/flat/interiorpointflatgeom.js b/src/ol/geom/flat/interiorpointflatgeom.js index cf7144c6dd..bc8d108222 100644 --- a/src/ol/geom/flat/interiorpointflatgeom.js +++ b/src/ol/geom/flat/interiorpointflatgeom.js @@ -1,7 +1,6 @@ goog.provide('ol.geom.flat.interiorpoint'); goog.require('goog.asserts'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.contains'); diff --git a/src/ol/geom/flat/interpolateflatgeom.js b/src/ol/geom/flat/interpolateflatgeom.js index 6a7a54031d..dcfb16e2cb 100644 --- a/src/ol/geom/flat/interpolateflatgeom.js +++ b/src/ol/geom/flat/interpolateflatgeom.js @@ -3,7 +3,6 @@ goog.provide('ol.geom.flat.interpolate'); goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.math'); -goog.require('ol.geom.flat'); /** diff --git a/src/ol/geom/flat/lengthflatgeom.js b/src/ol/geom/flat/lengthflatgeom.js index 52d053c4d8..ac1c685504 100644 --- a/src/ol/geom/flat/lengthflatgeom.js +++ b/src/ol/geom/flat/lengthflatgeom.js @@ -1,7 +1,5 @@ goog.provide('ol.geom.flat.length'); -goog.require('ol.geom.flat'); - /** * @param {Array.} flatCoordinates Flat coordinates. diff --git a/src/ol/geom/flat/orientflatgeom.js b/src/ol/geom/flat/orientflatgeom.js index 75e5527824..48c7dd5008 100644 --- a/src/ol/geom/flat/orientflatgeom.js +++ b/src/ol/geom/flat/orientflatgeom.js @@ -1,6 +1,5 @@ goog.provide('ol.geom.flat.orient'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.reverse'); diff --git a/src/ol/geom/flat/simplifyflatgeom.js b/src/ol/geom/flat/simplifyflatgeom.js index 5dbde27b28..b5f2032040 100644 --- a/src/ol/geom/flat/simplifyflatgeom.js +++ b/src/ol/geom/flat/simplifyflatgeom.js @@ -26,7 +26,6 @@ goog.provide('ol.geom.flat.simplify'); -goog.require('ol.geom.flat'); goog.require('ol.math'); diff --git a/src/ol/geom/flatgeom.js b/src/ol/geom/flatgeom.js deleted file mode 100644 index d94568448a..0000000000 --- a/src/ol/geom/flatgeom.js +++ /dev/null @@ -1 +0,0 @@ -goog.provide('ol.geom.flat'); diff --git a/src/ol/geom/linearring.js b/src/ol/geom/linearring.js index 034b98b520..389ccf561e 100644 --- a/src/ol/geom/linearring.js +++ b/src/ol/geom/linearring.js @@ -3,7 +3,6 @@ goog.provide('ol.geom.LinearRing'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.SimpleGeometry'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.area'); goog.require('ol.geom.flat.closest'); goog.require('ol.geom.flat.deflate'); diff --git a/src/ol/geom/linestring.js b/src/ol/geom/linestring.js index cc41ed8b38..83bed93c14 100644 --- a/src/ol/geom/linestring.js +++ b/src/ol/geom/linestring.js @@ -5,7 +5,6 @@ goog.require('goog.asserts'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.SimpleGeometry'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.closest'); goog.require('ol.geom.flat.deflate'); goog.require('ol.geom.flat.inflate'); diff --git a/src/ol/geom/multilinestring.js b/src/ol/geom/multilinestring.js index e67178979e..a415be1ed2 100644 --- a/src/ol/geom/multilinestring.js +++ b/src/ol/geom/multilinestring.js @@ -6,7 +6,6 @@ goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.LineString'); goog.require('ol.geom.SimpleGeometry'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.closest'); goog.require('ol.geom.flat.deflate'); goog.require('ol.geom.flat.inflate'); diff --git a/src/ol/geom/multipoint.js b/src/ol/geom/multipoint.js index 890a75458d..54c7a8e170 100644 --- a/src/ol/geom/multipoint.js +++ b/src/ol/geom/multipoint.js @@ -6,7 +6,6 @@ goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.Point'); goog.require('ol.geom.SimpleGeometry'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.deflate'); goog.require('ol.geom.flat.inflate'); goog.require('ol.math'); diff --git a/src/ol/geom/multipolygon.js b/src/ol/geom/multipolygon.js index b1dd3bad80..bf694bc460 100644 --- a/src/ol/geom/multipolygon.js +++ b/src/ol/geom/multipolygon.js @@ -7,7 +7,6 @@ goog.require('ol.geom.GeometryType'); goog.require('ol.geom.MultiPoint'); goog.require('ol.geom.Polygon'); goog.require('ol.geom.SimpleGeometry'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.area'); goog.require('ol.geom.flat.center'); goog.require('ol.geom.flat.closest'); diff --git a/src/ol/geom/point.js b/src/ol/geom/point.js index 86b7617877..19275c48f4 100644 --- a/src/ol/geom/point.js +++ b/src/ol/geom/point.js @@ -4,7 +4,6 @@ goog.require('goog.asserts'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.SimpleGeometry'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.deflate'); goog.require('ol.math'); diff --git a/src/ol/geom/polygon.js b/src/ol/geom/polygon.js index a8a633c4b0..1ab9f13818 100644 --- a/src/ol/geom/polygon.js +++ b/src/ol/geom/polygon.js @@ -7,7 +7,6 @@ goog.require('ol.geom.GeometryType'); goog.require('ol.geom.LinearRing'); goog.require('ol.geom.Point'); goog.require('ol.geom.SimpleGeometry'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.area'); goog.require('ol.geom.flat.closest'); goog.require('ol.geom.flat.contains'); diff --git a/src/ol/geom/simplegeometry.js b/src/ol/geom/simplegeometry.js index 5ca2a609fc..e1841008d3 100644 --- a/src/ol/geom/simplegeometry.js +++ b/src/ol/geom/simplegeometry.js @@ -5,7 +5,6 @@ goog.require('goog.functions'); goog.require('goog.object'); goog.require('ol.extent'); goog.require('ol.geom.Geometry'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.transform'); diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index 84cf7ae0b6..2abdb6e2e5 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -11,7 +11,6 @@ goog.require('goog.vec.Mat4'); goog.require('ol.BrowserFeature'); goog.require('ol.color'); goog.require('ol.extent'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.transform'); goog.require('ol.render.IVectorContext'); goog.require('ol.render.canvas'); diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 2e3320c761..47b9e4e2be 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -16,7 +16,6 @@ goog.require('ol.array'); goog.require('ol.color'); goog.require('ol.extent'); goog.require('ol.extent.Relationship'); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.simplify'); goog.require('ol.geom.flat.transform'); goog.require('ol.render.IReplayGroup'); diff --git a/test/spec/ol/geom/flat/areaflatgeom.test.js b/test/spec/ol/geom/flat/areaflatgeom.test.js index 18a87e28d3..afd0b8abdf 100644 --- a/test/spec/ol/geom/flat/areaflatgeom.test.js +++ b/test/spec/ol/geom/flat/areaflatgeom.test.js @@ -29,5 +29,4 @@ describe('ol.geom.flat.area', function() { }); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.area'); diff --git a/test/spec/ol/geom/flat/closestflatgeom.test.js b/test/spec/ol/geom/flat/closestflatgeom.test.js index d9b972b180..e583ed0c1f 100644 --- a/test/spec/ol/geom/flat/closestflatgeom.test.js +++ b/test/spec/ol/geom/flat/closestflatgeom.test.js @@ -143,5 +143,4 @@ describe('ol.geom.flat.closest', function() { }); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.closest'); diff --git a/test/spec/ol/geom/flat/deflateflatgeom.test.js b/test/spec/ol/geom/flat/deflateflatgeom.test.js index b29d7cf81c..75ff97e7dd 100644 --- a/test/spec/ol/geom/flat/deflateflatgeom.test.js +++ b/test/spec/ol/geom/flat/deflateflatgeom.test.js @@ -36,5 +36,4 @@ describe('ol.geom.flat.deflate', function() { }); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.deflate'); diff --git a/test/spec/ol/geom/flat/flipflatgeom.test.js b/test/spec/ol/geom/flat/flipflatgeom.test.js index 0a47e35c6e..ec5da63962 100644 --- a/test/spec/ol/geom/flat/flipflatgeom.test.js +++ b/test/spec/ol/geom/flat/flipflatgeom.test.js @@ -35,5 +35,4 @@ describe('ol.geom.flat.flip', function() { }); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.flip'); diff --git a/test/spec/ol/geom/flat/inflateflatgeom.test.js b/test/spec/ol/geom/flat/inflateflatgeom.test.js index fd6c4eb1e0..478aecd034 100644 --- a/test/spec/ol/geom/flat/inflateflatgeom.test.js +++ b/test/spec/ol/geom/flat/inflateflatgeom.test.js @@ -23,5 +23,4 @@ describe('ol.geom.flat.inflate', function() { }); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.inflate'); diff --git a/test/spec/ol/geom/flat/interpolateflatgeom.test.js b/test/spec/ol/geom/flat/interpolateflatgeom.test.js index 3d05b52214..13cdf9f0ca 100644 --- a/test/spec/ol/geom/flat/interpolateflatgeom.test.js +++ b/test/spec/ol/geom/flat/interpolateflatgeom.test.js @@ -46,5 +46,4 @@ describe('ol.geom.flat.interpolate', function() { }); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.interpolate'); diff --git a/test/spec/ol/geom/flat/orientflatgeom.test.js b/test/spec/ol/geom/flat/orientflatgeom.test.js index 010d25d33b..c8842eb5b2 100644 --- a/test/spec/ol/geom/flat/orientflatgeom.test.js +++ b/test/spec/ol/geom/flat/orientflatgeom.test.js @@ -22,5 +22,4 @@ describe('ol.geom.flat.orient', function() { }); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.orient'); diff --git a/test/spec/ol/geom/flat/reverseflatgeom.js b/test/spec/ol/geom/flat/reverseflatgeom.js index 83bd2309c1..a2c8fa0038 100644 --- a/test/spec/ol/geom/flat/reverseflatgeom.js +++ b/test/spec/ol/geom/flat/reverseflatgeom.js @@ -127,5 +127,4 @@ describe('ol.geom.flat.reverse', function() { }); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.reverse'); diff --git a/test/spec/ol/geom/flat/simplifyflatgeom.test.js b/test/spec/ol/geom/flat/simplifyflatgeom.test.js index c18029a5c4..abc4a12b7d 100644 --- a/test/spec/ol/geom/flat/simplifyflatgeom.test.js +++ b/test/spec/ol/geom/flat/simplifyflatgeom.test.js @@ -355,5 +355,4 @@ describe('ol.geom.flat.simplify', function() { }); -goog.require('ol.geom.flat'); goog.require('ol.geom.flat.simplify'); diff --git a/test/spec/ol/geom/flatgeom.test.js b/test/spec/ol/geom/flatgeom.test.js deleted file mode 100644 index 8f7de0e59b..0000000000 --- a/test/spec/ol/geom/flatgeom.test.js +++ /dev/null @@ -1,8 +0,0 @@ -goog.provide('ol.test.geom.flat'); - - -describe('ol.geom.flat', function() { -}); - - -goog.require('ol.geom.flat');