From dd72408a88b9fb9531acc29c34386ffb8287e5a8 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Thu, 15 Aug 2013 14:07:11 -0400 Subject: [PATCH] Dependencies --- examples/kml-timezones.js | 1 - examples/topojson.js | 1 - src/ol/style/fillsymbolizer.js | 1 + src/ol/style/iconsymbolizer.js | 2 +- src/ol/style/shapesymbolizer.js | 2 +- src/ol/style/strokesymbolizer.js | 3 ++- src/ol/style/textsymbolizer.js | 1 + test/spec/ol/parser/kml.test.js | 2 ++ test/spec/ol/style/shapeliteral.test.js | 1 + test/spec/ol/style/shapesymbolizer.test.js | 1 - test/spec/ol/style/strokesymbolizer.test.js | 1 + test/spec/ol/style/style.test.js | 5 +++++ 12 files changed, 15 insertions(+), 6 deletions(-) diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js index 8eaf41243e..530e4b32fc 100644 --- a/examples/kml-timezones.js +++ b/examples/kml-timezones.js @@ -8,7 +8,6 @@ goog.require('ol.parser.KML'); goog.require('ol.source.Stamen'); goog.require('ol.source.Vector'); goog.require('ol.style.Fill'); -goog.require('ol.style.Rule'); goog.require('ol.style.Stroke'); goog.require('ol.style.Style'); diff --git a/examples/topojson.js b/examples/topojson.js index 75a4187120..aaf48265b7 100644 --- a/examples/topojson.js +++ b/examples/topojson.js @@ -7,7 +7,6 @@ goog.require('ol.parser.TopoJSON'); goog.require('ol.source.TileJSON'); goog.require('ol.source.Vector'); goog.require('ol.style.Fill'); -goog.require('ol.style.Rule'); goog.require('ol.style.Stroke'); goog.require('ol.style.Style'); diff --git a/src/ol/style/fillsymbolizer.js b/src/ol/style/fillsymbolizer.js index 5303027498..603aa34a5a 100644 --- a/src/ol/style/fillsymbolizer.js +++ b/src/ol/style/fillsymbolizer.js @@ -1,6 +1,7 @@ goog.provide('ol.style.Fill'); goog.require('goog.asserts'); +goog.require('ol.Feature'); goog.require('ol.expr'); goog.require('ol.expr.Expression'); goog.require('ol.expr.Literal'); diff --git a/src/ol/style/iconsymbolizer.js b/src/ol/style/iconsymbolizer.js index 992f0b1dc5..c112f341de 100644 --- a/src/ol/style/iconsymbolizer.js +++ b/src/ol/style/iconsymbolizer.js @@ -1,13 +1,13 @@ goog.provide('ol.style.Icon'); goog.require('goog.asserts'); +goog.require('ol.Feature'); goog.require('ol.expr'); goog.require('ol.expr.Expression'); goog.require('ol.expr.Literal'); goog.require('ol.geom.GeometryType'); goog.require('ol.style.IconLiteral'); goog.require('ol.style.Point'); -goog.require('ol.style.PointLiteral'); diff --git a/src/ol/style/shapesymbolizer.js b/src/ol/style/shapesymbolizer.js index bf526e98ec..29281bb002 100644 --- a/src/ol/style/shapesymbolizer.js +++ b/src/ol/style/shapesymbolizer.js @@ -1,13 +1,13 @@ goog.provide('ol.style.Shape'); goog.require('goog.asserts'); +goog.require('ol.Feature'); goog.require('ol.expr'); goog.require('ol.expr.Expression'); goog.require('ol.expr.Literal'); goog.require('ol.geom.GeometryType'); goog.require('ol.style.Fill'); goog.require('ol.style.Point'); -goog.require('ol.style.PointLiteral'); goog.require('ol.style.ShapeLiteral'); goog.require('ol.style.ShapeType'); goog.require('ol.style.Stroke'); diff --git a/src/ol/style/strokesymbolizer.js b/src/ol/style/strokesymbolizer.js index 009fee0349..ef14a01f54 100644 --- a/src/ol/style/strokesymbolizer.js +++ b/src/ol/style/strokesymbolizer.js @@ -2,12 +2,13 @@ goog.provide('ol.style.Stroke'); goog.provide('ol.style.StrokeDefaults'); goog.require('goog.asserts'); +goog.require('ol.Feature'); goog.require('ol.expr'); goog.require('ol.expr.Expression'); goog.require('ol.expr.Literal'); goog.require('ol.geom.GeometryType'); goog.require('ol.style.LineLiteral'); -goog.require('ol.style.Literal'); +goog.require('ol.style.PolygonLiteral'); goog.require('ol.style.Symbolizer'); diff --git a/src/ol/style/textsymbolizer.js b/src/ol/style/textsymbolizer.js index 1f1961687b..9cc4d9bb83 100644 --- a/src/ol/style/textsymbolizer.js +++ b/src/ol/style/textsymbolizer.js @@ -1,6 +1,7 @@ goog.provide('ol.style.Text'); goog.require('goog.asserts'); +goog.require('ol.Feature'); goog.require('ol.expr'); goog.require('ol.expr.Expression'); goog.require('ol.expr.Literal'); diff --git a/test/spec/ol/parser/kml.test.js b/test/spec/ol/parser/kml.test.js index b9b2e840c6..98535a6fc8 100644 --- a/test/spec/ol/parser/kml.test.js +++ b/test/spec/ol/parser/kml.test.js @@ -346,6 +346,8 @@ goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); goog.require('ol.parser.KML'); goog.require('ol.style.Fill'); +goog.require('ol.style.Icon'); +goog.require('ol.style.IconLiteral'); goog.require('ol.style.LineLiteral'); goog.require('ol.style.PolygonLiteral'); goog.require('ol.style.Stroke'); diff --git a/test/spec/ol/style/shapeliteral.test.js b/test/spec/ol/style/shapeliteral.test.js index 20fa315909..b1e4804280 100644 --- a/test/spec/ol/style/shapeliteral.test.js +++ b/test/spec/ol/style/shapeliteral.test.js @@ -91,3 +91,4 @@ describe('ol.style.ShapeLiteral', function() { }); goog.require('ol.style.ShapeLiteral'); +goog.require('ol.style.ShapeType'); diff --git a/test/spec/ol/style/shapesymbolizer.test.js b/test/spec/ol/style/shapesymbolizer.test.js index ceb7cd8be3..7831c81d00 100644 --- a/test/spec/ol/style/shapesymbolizer.test.js +++ b/test/spec/ol/style/shapesymbolizer.test.js @@ -196,7 +196,6 @@ goog.require('ol.Feature'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.Point'); goog.require('ol.expr'); -goog.require('ol.expr.Literal'); goog.require('ol.style.Fill'); goog.require('ol.style.Shape'); goog.require('ol.style.ShapeLiteral'); diff --git a/test/spec/ol/style/strokesymbolizer.test.js b/test/spec/ol/style/strokesymbolizer.test.js index e2ada5e0fb..1ea72c8e93 100644 --- a/test/spec/ol/style/strokesymbolizer.test.js +++ b/test/spec/ol/style/strokesymbolizer.test.js @@ -186,5 +186,6 @@ goog.require('ol.Feature'); goog.require('ol.expr'); goog.require('ol.expr.Literal'); goog.require('ol.geom.GeometryType'); +goog.require('ol.geom.LineString'); goog.require('ol.style.Stroke'); goog.require('ol.style.LineLiteral'); diff --git a/test/spec/ol/style/style.test.js b/test/spec/ol/style/style.test.js index d392a93d1c..4de7224614 100644 --- a/test/spec/ol/style/style.test.js +++ b/test/spec/ol/style/style.test.js @@ -280,12 +280,17 @@ describe('ol.style.Style', function() { }); goog.require('ol.Feature'); +goog.require('ol.expr'); goog.require('ol.geom.LineString'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); +goog.require('ol.style.Fill'); +goog.require('ol.style.LineLiteral'); goog.require('ol.style.PolygonLiteral'); goog.require('ol.style.Rule'); goog.require('ol.style.Shape'); goog.require('ol.style.ShapeLiteral'); +goog.require('ol.style.Stroke'); +goog.require('ol.style.StrokeDefaults'); goog.require('ol.style.Style'); goog.require('ol.style.TextLiteral');