diff --git a/examples/center.js b/examples/center.js index 809ebdab13..ff1d158678 100644 --- a/examples/center.js +++ b/examples/center.js @@ -2,8 +2,6 @@ goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.control'); goog.require('ol.format.GeoJSON'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.SimpleGeometry'); goog.require('ol.layer.Tile'); goog.require('ol.layer.Vector'); goog.require('ol.source.OSM'); diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js index ddce7bb2d6..3db4aea822 100644 --- a/examples/dynamic-data.js +++ b/examples/dynamic-data.js @@ -1,4 +1,3 @@ -goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.geom.MultiPoint'); diff --git a/examples/flight-animation.js b/examples/flight-animation.js index c48b97071e..349febe36d 100644 --- a/examples/flight-animation.js +++ b/examples/flight-animation.js @@ -1,5 +1,4 @@ // NOCOMPILE -goog.require('ol.Attribution'); goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.View'); diff --git a/examples/igc.js b/examples/igc.js index d2684b7297..f1eefe1fe6 100644 --- a/examples/igc.js +++ b/examples/igc.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.View'); diff --git a/examples/jsts.js b/examples/jsts.js index e28748b009..2cd7a8d81d 100644 --- a/examples/jsts.js +++ b/examples/jsts.js @@ -1,6 +1,5 @@ // NOCOMPILE // this example uses JSTS for which we don't have an externs file. -goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.format.GeoJSON'); diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js index e57397357d..99a4b65f23 100644 --- a/examples/localized-openstreetmap.js +++ b/examples/localized-openstreetmap.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.control'); diff --git a/examples/mapbox-vector-tiles-advanced.js b/examples/mapbox-vector-tiles-advanced.js index b960ad8964..174b2badc0 100644 --- a/examples/mapbox-vector-tiles-advanced.js +++ b/examples/mapbox-vector-tiles-advanced.js @@ -1,4 +1,4 @@ -goog.require('ol.Attribution'); +/* eslint-disable openlayers-internal/no-unused-requires */ goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.format.MVT'); diff --git a/examples/mapbox-vector-tiles.js b/examples/mapbox-vector-tiles.js index ed3688bd4e..2f5ea4f352 100644 --- a/examples/mapbox-vector-tiles.js +++ b/examples/mapbox-vector-tiles.js @@ -1,4 +1,5 @@ -goog.require('ol.Attribution'); +/* eslint-disable openlayers-internal/no-unused-requires */ + goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.format.MVT'); @@ -9,6 +10,7 @@ goog.require('ol.style.Icon'); goog.require('ol.style.Stroke'); goog.require('ol.style.Style'); goog.require('ol.style.Text'); +goog.require('ol.tilegrid'); var key = 'pk.eyJ1IjoiYWhvY2V2YXIiLCJhIjoiRk1kMWZaSSJ9.E5BkluenyWQMsBLsuByrmg'; diff --git a/examples/osm-vector-tiles.js b/examples/osm-vector-tiles.js index bef1e300e1..db47ac2054 100644 --- a/examples/osm-vector-tiles.js +++ b/examples/osm-vector-tiles.js @@ -7,6 +7,7 @@ goog.require('ol.source.VectorTile'); goog.require('ol.style.Fill'); goog.require('ol.style.Stroke'); goog.require('ol.style.Style'); +goog.require('ol.tilegrid'); var format = new ol.format.TopoJSON(); diff --git a/examples/reprojection.js b/examples/reprojection.js index 9423393942..3f34180b04 100644 --- a/examples/reprojection.js +++ b/examples/reprojection.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.extent'); diff --git a/examples/snap.js b/examples/snap.js index bbcb151651..a439333c4e 100644 --- a/examples/snap.js +++ b/examples/snap.js @@ -1,6 +1,5 @@ goog.require('ol.Map'); goog.require('ol.View'); -goog.require('ol.interaction'); goog.require('ol.interaction.Draw'); goog.require('ol.interaction.Modify'); goog.require('ol.interaction.Select'); diff --git a/examples/static-image.js b/examples/static-image.js index b14da703cb..c365555fb5 100644 --- a/examples/static-image.js +++ b/examples/static-image.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.extent'); diff --git a/examples/translate-features.js b/examples/translate-features.js index f992af47fe..a2c5939cb8 100644 --- a/examples/translate-features.js +++ b/examples/translate-features.js @@ -1,4 +1,3 @@ -goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.format.GeoJSON'); diff --git a/examples/turf.js b/examples/turf.js index 95af811366..61ce74cfc9 100644 --- a/examples/turf.js +++ b/examples/turf.js @@ -1,6 +1,5 @@ // NOCOMPILE // this example uses turf.js for which we don't have an externs file. -goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.format.GeoJSON'); diff --git a/examples/vector-esri-edit.js b/examples/vector-esri-edit.js index da05168994..71eae1c9db 100644 --- a/examples/vector-esri-edit.js +++ b/examples/vector-esri-edit.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.format.EsriJSON'); @@ -12,6 +11,7 @@ goog.require('ol.loadingstrategy'); goog.require('ol.proj'); goog.require('ol.source.Vector'); goog.require('ol.source.XYZ'); +goog.require('ol.tilegrid'); var serviceUrl = 'http://services.arcgis.com/rOo16HdIMeOBI4Mb/arcgis/rest/' + diff --git a/examples/vector-esri.js b/examples/vector-esri.js index 480d0bf729..28a56a55fb 100644 --- a/examples/vector-esri.js +++ b/examples/vector-esri.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.format.EsriJSON'); @@ -11,6 +10,7 @@ goog.require('ol.source.XYZ'); goog.require('ol.style.Fill'); goog.require('ol.style.Stroke'); goog.require('ol.style.Style'); +goog.require('ol.tilegrid'); var serviceUrl = 'http://sampleserver3.arcgisonline.com/ArcGIS/rest/services/' + diff --git a/examples/vector-osm.js b/examples/vector-osm.js index 5849220877..b81a1f3bf2 100644 --- a/examples/vector-osm.js +++ b/examples/vector-osm.js @@ -12,6 +12,7 @@ goog.require('ol.style.Circle'); goog.require('ol.style.Fill'); goog.require('ol.style.Stroke'); goog.require('ol.style.Style'); +goog.require('ol.tilegrid'); var styles = { 'amenity': { diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index 8ce9d94b4a..32a333edd6 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.control'); diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js index 7a24533753..2b754d2d19 100644 --- a/examples/wms-image-custom-proj.js +++ b/examples/wms-image-custom-proj.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.control'); diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js index e1652306a5..f5d09752e5 100644 --- a/examples/wms-no-proj.js +++ b/examples/wms-no-proj.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.layer.Image'); diff --git a/examples/wmts-dimensions.js b/examples/wmts-dimensions.js index 2efe20835f..2e500ebeac 100644 --- a/examples/wmts-dimensions.js +++ b/examples/wmts-dimensions.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.extent'); diff --git a/examples/wmts.js b/examples/wmts.js index 0dedcff9fa..eae0196561 100644 --- a/examples/wmts.js +++ b/examples/wmts.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.control'); diff --git a/examples/xyz-retina.js b/examples/xyz-retina.js index f5e6c46871..86043a47b6 100644 --- a/examples/xyz-retina.js +++ b/examples/xyz-retina.js @@ -1,4 +1,3 @@ -goog.require('ol.Attribution'); goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.layer.Tile'); diff --git a/examples/zoomify.js b/examples/zoomify.js index d9d89ab2e4..85ffb74402 100644 --- a/examples/zoomify.js +++ b/examples/zoomify.js @@ -1,7 +1,6 @@ goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.layer.Tile'); -goog.require('ol.proj'); goog.require('ol.proj.Projection'); goog.require('ol.source.Zoomify'); diff --git a/package.json b/package.json index 2392356c89..a9069d4535 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "browserify": "13.1.0", "closure-util": "1.15.0", "derequire": "2.0.3", + "eslint-plugin-openlayers-internal": "file:rules", "fs-extra": "0.30.0", "glob": "7.0.5", "handlebars": "4.0.5", @@ -82,6 +83,9 @@ "goog": false, "proj4": false }, + "plugins": [ + "openlayers-internal" + ], "rules": { "no-console": [ 2, @@ -91,7 +95,11 @@ ] } ], - "no-constant-condition": 0 + "no-constant-condition": 0, + "openlayers-internal/no-duplicate-requires": 2, + "openlayers-internal/no-unused-requires": 2, + "openlayers-internal/requires-first": 2, + "openlayers-internal/valid-requires": 2 } }, "ext": [ diff --git a/rules/.eslintrc b/rules/.eslintrc new file mode 100644 index 0000000000..6c191c19c8 --- /dev/null +++ b/rules/.eslintrc @@ -0,0 +1,8 @@ +{ + "env": { + "es6": true + }, + "rules": { + "strict": [2, "global"] + } +} diff --git a/rules/index.js b/rules/index.js new file mode 100644 index 0000000000..f625cac35b --- /dev/null +++ b/rules/index.js @@ -0,0 +1,10 @@ +'use strict'; + +module.exports = { + rules: { + 'no-duplicate-requires': require('./no-duplicate-requires').rule, + 'no-unused-requires': require('./no-unused-requires').rule, + 'requires-first': require('./requires-first').rule, + 'valid-requires': require('./valid-requires').rule + } +}; diff --git a/rules/no-duplicate-requires.js b/rules/no-duplicate-requires.js new file mode 100644 index 0000000000..6e7d965bec --- /dev/null +++ b/rules/no-duplicate-requires.js @@ -0,0 +1,48 @@ +'use strict'; + +const util = require('./util'); + +exports.rule = { + meta: { + docs: { + description: 'disallow duplicate goog.require() calls' + }, + fixable: 'code' + }, + + create: function(context) { + const alreadyRequired = {}; + + return { + ExpressionStatement: function(statement) { + if (util.isRequireStatement(statement)) { + const expression = statement.expression; + + if (!expression.arguments[0]) { + return; + } + const name = expression.arguments[0].value; + + if (alreadyRequired[name]) { + const source = context.getSourceCode(); + + return context.report({ + node: statement, + message: `Duplicate goog.require('${name}')`, + fix: function(fixer) { + const afterToken = source.getTokenAfter(statement); + const range = [ + statement.range[0], + afterToken ? afterToken.range[0] : statement.range[1] + ]; + return fixer.removeRange(range); + } + }); + } + alreadyRequired[name] = true; + } + } + }; + } + +}; diff --git a/rules/no-unused-requires.js b/rules/no-unused-requires.js new file mode 100644 index 0000000000..2436bb4447 --- /dev/null +++ b/rules/no-unused-requires.js @@ -0,0 +1,113 @@ +'use strict'; + +const util = require('./util'); + +function getName(node) { + if (node.type !== 'MemberExpression') { + return; + } + if (node.property.type !== 'Identifier' || node.property.computed) { + return; + } + let objectName; + if (node.object.type === 'Identifier' && !node.object.computed) { + objectName = node.object.name; + } else if (node.object.type === 'MemberExpression' && !node.object.computed) { + objectName = getName(node.object); + } + if (!objectName) { + return; + } + return `${objectName}.${node.property.name}`; +} + +exports.rule = { + meta: { + docs: { + description: 'disallow unused goog.require() calls' + }, + fixable: 'code' + }, + + create: function(context) { + + // a lookup of goog.require() nodes by argument + const requireStatements = {}; + + // used names from member expressions that match the goog.require() arg + const usedNames = {}; + + return { + + ExpressionStatement: function(statement) { + if (util.isRequireStatement(statement)) { + const expression = statement.expression; + const arg = expression.arguments[0]; + if (!arg || !arg.value) { + return; + } + + const name = arg.value; + const ancestors = context.getAncestors(); + const parent = ancestors[ancestors.length - 1]; + if (!parent) { + return; + } + + requireStatements[name] = statement; + } + }, + + MemberExpression: function(node) { + const name = getName(node); + if (name in requireStatements) { + const requiredAncestor = context.getAncestors().some(ancestorNode => !!requireStatements[getName(ancestorNode)]); + if (!requiredAncestor) { + usedNames[name] = true; + } + } + }, + + Identifier: function(node) { + const name = node.name; + if (name in requireStatements) { + const ancestors = context.getAncestors(); + if (ancestors.length && ancestors[0].type === 'MemberExpression') { + const requiredAncestor = context.getAncestors().some(ancestorNode => !!requireStatements[getName(ancestorNode)]); + if (!requiredAncestor) { + usedNames[name] = true; + } + } else { + usedNames[name] = true; + } + } + }, + + 'Program:exit': function(node) { + const source = context.getSourceCode(); + + for (let name in requireStatements) { + + if (!usedNames[name]) { + const unusedRequire = requireStatements[name]; + + context.report({ + node: unusedRequire, + message: `Unused ${source.getText(unusedRequire)}`, + fix: function(fixer) { + const afterToken = source.getTokenAfter(unusedRequire); + const range = [ + unusedRequire.range[0], + afterToken ? afterToken.range[0] : unusedRequire.range[1] + ]; + return fixer.removeRange(range); + } + }); + + } + } + } + + }; + } +}; diff --git a/rules/package.json b/rules/package.json new file mode 100644 index 0000000000..5ff7b3b4db --- /dev/null +++ b/rules/package.json @@ -0,0 +1,6 @@ +{ + "name": "eslint-plugin-openlayers-internal", + "version": "1.0.0", + "description": "Custom ESLint rules for the OpenLayers project", + "main": "index.js" +} diff --git a/rules/requires-first.js b/rules/requires-first.js new file mode 100644 index 0000000000..1031a70887 --- /dev/null +++ b/rules/requires-first.js @@ -0,0 +1,30 @@ +'use strict'; + +const util = require('./util'); + +exports.rule = { + meta: { + docs: { + description: 'require that all goog.require() precede other statements (except goog.provide())' + } + }, + + create: function(context) { + return { + Program: function(program) { + let otherSeen = false; + + program.body.forEach(statement => { + if (util.isRequireStatement(statement)) { + if (otherSeen) { + return context.report(statement, 'Expected goog.require() to precede other statements'); + } + } else if (!util.isProvideStatement(statement)) { + otherSeen = true; + } + }); + + } + }; + } +}; diff --git a/rules/util.js b/rules/util.js new file mode 100644 index 0000000000..605a5d7a9e --- /dev/null +++ b/rules/util.js @@ -0,0 +1,30 @@ +'use strict'; + +function isGoogCallExpression(node, name) { + const callee = node.callee; + return callee && callee.type === 'MemberExpression' && + callee.object.type === 'Identifier' && callee.object.name === 'goog' && + callee.property.type === 'Identifier' && !callee.property.computed && + callee.property.name === name; +} + +function isGoogStatement(node, name) { + return node.expression && node.expression.type === 'CallExpression' && + isGoogCallExpression(node.expression, name); +} + +exports.isProvideExpression = function(node) { + return isGoogCallExpression(node, 'provide'); +}; + +exports.isProvideStatement = function(node) { + return isGoogStatement(node, 'provide'); +}; + +exports.isRequireExpression = function(node) { + return isGoogCallExpression(node, 'require'); +}; + +exports.isRequireStatement = function(node) { + return isGoogStatement(node, 'require'); +}; diff --git a/rules/valid-requires.js b/rules/valid-requires.js new file mode 100644 index 0000000000..e98a4e00aa --- /dev/null +++ b/rules/valid-requires.js @@ -0,0 +1,38 @@ +'use strict'; + +const util = require('./util'); + +exports.rule = { + meta: { + docs: { + description: 'require that all goog.require() have a valid arg and appear at the top level' + } + }, + + create: function(context) { + return { + CallExpression: function(expression) { + if (util.isRequireExpression(expression)) { + const ancestors = context.getAncestors(); + const parent = ancestors[ancestors.length - 1]; + if (parent.type !== 'ExpressionStatement') { + return context.report(expression, 'Expected goog.require() to in an expression statement'); + } + + if (ancestors.length !== 2) { + return context.report(expression, 'Expected goog.require() to be at the top level'); + } + + if (expression.arguments.length !== 1) { + return context.report(expression, 'Expected one argument for goog.require()'); + } + + const arg = expression.arguments[0]; + if (arg.type !== 'Literal' || !arg.value || typeof arg.value !== 'string') { + return context.report(expression, 'Expected goog.require() to be called with a string'); + } + } + } + }; + } +}; diff --git a/src/ol/attribution.js b/src/ol/attribution.js index ffd96e29ac..2297b075f3 100644 --- a/src/ol/attribution.js +++ b/src/ol/attribution.js @@ -2,6 +2,7 @@ goog.provide('ol.Attribution'); goog.require('ol.TileRange'); goog.require('ol.math'); +goog.require('ol.tilegrid'); /** diff --git a/src/ol/control/attribution.js b/src/ol/control/attribution.js index c5820016bf..0963d4060f 100644 --- a/src/ol/control/attribution.js +++ b/src/ol/control/attribution.js @@ -4,7 +4,6 @@ goog.provide('ol.control.Attribution'); goog.require('ol'); goog.require('ol.dom'); -goog.require('ol.Attribution'); goog.require('ol.control.Control'); goog.require('ol.css'); goog.require('ol.events'); diff --git a/src/ol/control/mouseposition.js b/src/ol/control/mouseposition.js index 5f415621e3..bcfaae0873 100644 --- a/src/ol/control/mouseposition.js +++ b/src/ol/control/mouseposition.js @@ -7,7 +7,6 @@ goog.require('ol.events.EventType'); goog.require('ol.Object'); goog.require('ol.control.Control'); goog.require('ol.proj'); -goog.require('ol.proj.Projection'); /** diff --git a/src/ol/control/overviewmap.js b/src/ol/control/overviewmap.js index 874021aff2..7d368eb373 100644 --- a/src/ol/control/overviewmap.js +++ b/src/ol/control/overviewmap.js @@ -10,7 +10,6 @@ goog.require('ol.Object'); goog.require('ol.ObjectEventType'); goog.require('ol.Overlay'); goog.require('ol.OverlayPositioning'); -goog.require('ol.View'); goog.require('ol.ViewProperty'); goog.require('ol.control.Control'); goog.require('ol.coordinate'); diff --git a/src/ol/featureloader.js b/src/ol/featureloader.js index 5e295bac72..26c42432b9 100644 --- a/src/ol/featureloader.js +++ b/src/ol/featureloader.js @@ -1,10 +1,7 @@ goog.provide('ol.featureloader'); goog.require('ol.TileState'); -goog.require('ol.VectorTile'); goog.require('ol.format.FormatType'); -goog.require('ol.proj'); -goog.require('ol.proj.Projection'); goog.require('ol.xml'); diff --git a/src/ol/format/gml3.js b/src/ol/format/gml3.js index fb8f687e4a..12fa3683eb 100644 --- a/src/ol/format/gml3.js +++ b/src/ol/format/gml3.js @@ -2,7 +2,6 @@ goog.provide('ol.format.GML3'); goog.require('ol'); goog.require('ol.array'); -goog.require('ol.Feature'); goog.require('ol.extent'); goog.require('ol.format.Feature'); goog.require('ol.format.GMLBase'); @@ -10,10 +9,8 @@ goog.require('ol.format.XSD'); goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryLayout'); goog.require('ol.geom.LineString'); -goog.require('ol.geom.LinearRing'); goog.require('ol.geom.MultiLineString'); goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); goog.require('ol.obj'); goog.require('ol.proj'); diff --git a/src/ol/format/gmlbase.js b/src/ol/format/gmlbase.js index 2952e3745a..d035752f63 100644 --- a/src/ol/format/gmlbase.js +++ b/src/ol/format/gmlbase.js @@ -7,7 +7,6 @@ goog.require('ol.array'); goog.require('ol.Feature'); goog.require('ol.format.Feature'); goog.require('ol.format.XMLFeature'); -goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryLayout'); goog.require('ol.geom.LineString'); goog.require('ol.geom.LinearRing'); diff --git a/src/ol/format/kml.js b/src/ol/format/kml.js index 71bccceb57..1f119b8665 100644 --- a/src/ol/format/kml.js +++ b/src/ol/format/kml.js @@ -13,7 +13,6 @@ goog.require('ol.color'); goog.require('ol.format.Feature'); goog.require('ol.format.XMLFeature'); goog.require('ol.format.XSD'); -goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryCollection'); goog.require('ol.geom.GeometryLayout'); goog.require('ol.geom.GeometryType'); @@ -31,7 +30,6 @@ goog.require('ol.style.Fill'); goog.require('ol.style.Icon'); goog.require('ol.style.IconAnchorUnits'); goog.require('ol.style.IconOrigin'); -goog.require('ol.style.Image'); goog.require('ol.style.Stroke'); goog.require('ol.style.Style'); goog.require('ol.style.Text'); diff --git a/src/ol/format/mvt.js b/src/ol/format/mvt.js index c8c877f66e..1d85c0a78c 100644 --- a/src/ol/format/mvt.js +++ b/src/ol/format/mvt.js @@ -2,12 +2,10 @@ goog.provide('ol.format.MVT'); -goog.require('ol.Feature'); goog.require('ol.ext.pbf'); goog.require('ol.ext.vectortile'); goog.require('ol.format.Feature'); goog.require('ol.format.FormatType'); -goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryLayout'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.LineString'); @@ -15,7 +13,6 @@ goog.require('ol.geom.MultiLineString'); goog.require('ol.geom.MultiPoint'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); -goog.require('ol.proj'); goog.require('ol.proj.Projection'); goog.require('ol.proj.Units'); goog.require('ol.render.Feature'); diff --git a/src/ol/format/wfs.js b/src/ol/format/wfs.js index 5fc8d3eb64..b76bbbf747 100644 --- a/src/ol/format/wfs.js +++ b/src/ol/format/wfs.js @@ -4,14 +4,6 @@ goog.require('ol'); goog.require('ol.format.GML3'); goog.require('ol.format.GMLBase'); goog.require('ol.format.ogc.filter'); -goog.require('ol.format.ogc.filter.Bbox'); -goog.require('ol.format.ogc.filter.ComparisonBinary'); -goog.require('ol.format.ogc.filter.Intersects'); -goog.require('ol.format.ogc.filter.LogicalBinary'); -goog.require('ol.format.ogc.filter.Not'); -goog.require('ol.format.ogc.filter.IsBetween'); -goog.require('ol.format.ogc.filter.IsNull'); -goog.require('ol.format.ogc.filter.IsLike'); goog.require('ol.format.XMLFeature'); goog.require('ol.format.XSD'); goog.require('ol.geom.Geometry'); diff --git a/src/ol/format/wkt.js b/src/ol/format/wkt.js index 7e7cad0c44..8cc1a3eb3a 100644 --- a/src/ol/format/wkt.js +++ b/src/ol/format/wkt.js @@ -4,7 +4,6 @@ goog.require('ol'); goog.require('ol.Feature'); goog.require('ol.format.Feature'); goog.require('ol.format.TextFeature'); -goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryCollection'); goog.require('ol.geom.GeometryType'); goog.require('ol.geom.LineString'); diff --git a/src/ol/format/xmlfeature.js b/src/ol/format/xmlfeature.js index c0a5cc32d0..db5ceac57f 100644 --- a/src/ol/format/xmlfeature.js +++ b/src/ol/format/xmlfeature.js @@ -3,7 +3,6 @@ goog.provide('ol.format.XMLFeature'); goog.require('ol.array'); goog.require('ol.format.Feature'); goog.require('ol.format.FormatType'); -goog.require('ol.proj'); goog.require('ol.xml'); diff --git a/src/ol/geolocation.js b/src/ol/geolocation.js index 1f52beb762..688e270a17 100644 --- a/src/ol/geolocation.js +++ b/src/ol/geolocation.js @@ -5,7 +5,6 @@ goog.provide('ol.Geolocation'); goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.Object'); -goog.require('ol.geom.Geometry'); goog.require('ol.geom.Polygon'); goog.require('ol.has'); goog.require('ol.math'); diff --git a/src/ol/imagebase.js b/src/ol/imagebase.js index c8103f19e2..bba68288da 100644 --- a/src/ol/imagebase.js +++ b/src/ol/imagebase.js @@ -3,7 +3,6 @@ goog.provide('ol.ImageState'); goog.require('ol.events.EventTarget'); goog.require('ol.events.EventType'); -goog.require('ol.Attribution'); /** diff --git a/src/ol/interaction/doubleclickzoom.js b/src/ol/interaction/doubleclickzoom.js index 24bb329773..acb5f55966 100644 --- a/src/ol/interaction/doubleclickzoom.js +++ b/src/ol/interaction/doubleclickzoom.js @@ -1,6 +1,5 @@ goog.provide('ol.interaction.DoubleClickZoom'); -goog.require('ol.MapBrowserEvent'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.interaction.Interaction'); diff --git a/src/ol/interaction/dragpan.js b/src/ol/interaction/dragpan.js index a6454c1cf4..fcad8b3af6 100644 --- a/src/ol/interaction/dragpan.js +++ b/src/ol/interaction/dragpan.js @@ -1,7 +1,5 @@ goog.provide('ol.interaction.DragPan'); -goog.require('ol.Kinetic'); - goog.require('ol.ViewHint'); goog.require('ol.coordinate'); goog.require('ol.functions'); diff --git a/src/ol/interaction/draw.js b/src/ol/interaction/draw.js index 25c46e3f93..bd811df36a 100644 --- a/src/ol/interaction/draw.js +++ b/src/ol/interaction/draw.js @@ -5,9 +5,7 @@ goog.provide('ol.interaction.DrawMode'); goog.require('ol.events'); goog.require('ol.events.Event'); -goog.require('ol.Collection'); goog.require('ol.Feature'); -goog.require('ol.MapBrowserEvent'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.Object'); goog.require('ol.coordinate'); @@ -21,7 +19,6 @@ goog.require('ol.geom.MultiPoint'); goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); -goog.require('ol.geom.SimpleGeometry'); goog.require('ol.interaction.InteractionProperty'); goog.require('ol.interaction.Pointer'); goog.require('ol.layer.Vector'); diff --git a/src/ol/interaction/interaction.js b/src/ol/interaction/interaction.js index 2138534efe..b5fafb7281 100644 --- a/src/ol/interaction/interaction.js +++ b/src/ol/interaction/interaction.js @@ -4,7 +4,6 @@ goog.provide('ol.interaction.Interaction'); goog.provide('ol.interaction.InteractionProperty'); goog.require('ol'); -goog.require('ol.MapBrowserEvent'); goog.require('ol.Object'); goog.require('ol.animation'); goog.require('ol.easing'); diff --git a/src/ol/interaction/modify.js b/src/ol/interaction/modify.js index e75cce885c..34d37b93c8 100644 --- a/src/ol/interaction/modify.js +++ b/src/ol/interaction/modify.js @@ -15,12 +15,7 @@ goog.require('ol.coordinate'); goog.require('ol.events.condition'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.MultiLineString'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); goog.require('ol.interaction.Pointer'); goog.require('ol.layer.Vector'); goog.require('ol.source.Vector'); diff --git a/src/ol/interaction/snap.js b/src/ol/interaction/snap.js index cc8de4e282..5c1927375c 100644 --- a/src/ol/interaction/snap.js +++ b/src/ol/interaction/snap.js @@ -3,18 +3,15 @@ goog.provide('ol.interaction.SnapProperty'); goog.require('ol'); goog.require('ol.Collection'); -goog.require('ol.Feature'); goog.require('ol.Object'); goog.require('ol.Observable'); goog.require('ol.coordinate'); goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); -goog.require('ol.geom.Geometry'); goog.require('ol.interaction.Pointer'); goog.require('ol.functions'); goog.require('ol.obj'); -goog.require('ol.source.Vector'); goog.require('ol.source.VectorEvent'); goog.require('ol.source.VectorEventType'); goog.require('ol.structs.RBush'); diff --git a/src/ol/interaction/translate.js b/src/ol/interaction/translate.js index fe706601ba..e0530949e0 100644 --- a/src/ol/interaction/translate.js +++ b/src/ol/interaction/translate.js @@ -1,7 +1,6 @@ goog.provide('ol.interaction.Translate'); goog.provide('ol.interaction.TranslateEvent'); -goog.require('ol.events'); goog.require('ol.events.Event'); goog.require('ol.array'); goog.require('ol.interaction.Pointer'); diff --git a/src/ol/layer/base.js b/src/ol/layer/base.js index b1e4ebc55a..5abb592007 100644 --- a/src/ol/layer/base.js +++ b/src/ol/layer/base.js @@ -5,7 +5,6 @@ goog.require('ol'); goog.require('ol.Object'); goog.require('ol.math'); goog.require('ol.obj'); -goog.require('ol.source.State'); /** diff --git a/src/ol/layer/vector.js b/src/ol/layer/vector.js index 1cc0d0c8c7..e4681b9aca 100644 --- a/src/ol/layer/vector.js +++ b/src/ol/layer/vector.js @@ -3,7 +3,6 @@ goog.provide('ol.layer.Vector'); goog.require('ol'); goog.require('ol.layer.Layer'); goog.require('ol.obj'); -goog.require('ol.style.Style'); /** diff --git a/src/ol/map.js b/src/ol/map.js index 227c728c09..37d19f6fbc 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -31,7 +31,6 @@ goog.require('ol.interaction'); goog.require('ol.layer.Group'); goog.require('ol.transform'); goog.require('ol.obj'); -goog.require('ol.proj'); goog.require('ol.proj.common'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.canvas.Map'); diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index 4599dea048..76d671810d 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -8,7 +8,6 @@ goog.require('ol.MapEvent'); goog.require('ol.events'); goog.require('ol.events.EventTarget'); goog.require('ol.events.EventType'); -goog.require('ol.pointer.PointerEvent'); goog.require('ol.pointer.PointerEventHandler'); diff --git a/src/ol/object.js b/src/ol/object.js index c9bd22c6b6..518b910733 100644 --- a/src/ol/object.js +++ b/src/ol/object.js @@ -3,7 +3,6 @@ goog.provide('ol.ObjectEvent'); goog.provide('ol.ObjectEventType'); goog.require('ol.Observable'); -goog.require('ol.events'); goog.require('ol.events.Event'); goog.require('ol.obj'); diff --git a/src/ol/overlay.js b/src/ol/overlay.js index 82f93f2048..68895fcd25 100644 --- a/src/ol/overlay.js +++ b/src/ol/overlay.js @@ -2,7 +2,6 @@ goog.provide('ol.Overlay'); goog.provide('ol.OverlayPositioning'); goog.require('ol.events'); -goog.require('ol.Map'); goog.require('ol.MapEventType'); goog.require('ol.Object'); goog.require('ol.animation'); diff --git a/src/ol/pointer/pointerevent.js b/src/ol/pointer/pointerevent.js index c0c190728f..6274330539 100644 --- a/src/ol/pointer/pointerevent.js +++ b/src/ol/pointer/pointerevent.js @@ -31,7 +31,6 @@ goog.provide('ol.pointer.PointerEvent'); -goog.require('ol.events'); goog.require('ol.events.Event'); diff --git a/src/ol/render/canvas/replay.js b/src/ol/render/canvas/replay.js index c9351c8858..1de3481ca2 100644 --- a/src/ol/render/canvas/replay.js +++ b/src/ol/render/canvas/replay.js @@ -8,7 +8,6 @@ goog.provide('ol.render.canvas.PolygonReplay'); goog.provide('ol.render.canvas.ReplayGroup'); goog.provide('ol.render.canvas.TextReplay'); -goog.require('ol.transform'); goog.require('ol'); goog.require('ol.array'); goog.require('ol.color'); @@ -20,9 +19,11 @@ goog.require('ol.geom.flat.simplify'); goog.require('ol.geom.flat.transform'); goog.require('ol.has'); goog.require('ol.obj'); -goog.require('ol.render.IReplayGroup'); +goog.require('ol.render.ReplayGroup'); goog.require('ol.render.VectorContext'); goog.require('ol.render.canvas'); +goog.require('ol.render.replay'); +goog.require('ol.transform'); /** @@ -1806,15 +1807,15 @@ ol.render.canvas.TextReplay.prototype.setTextStyle = function(textStyle) { /** * @constructor - * @implements {ol.render.IReplayGroup} + * @extends {ol.render.ReplayGroup} * @param {number} tolerance Tolerance. * @param {ol.Extent} maxExtent Max extent. * @param {number} resolution Resolution. * @param {number=} opt_renderBuffer Optional rendering buffer. * @struct */ -ol.render.canvas.ReplayGroup = function( - tolerance, maxExtent, resolution, opt_renderBuffer) { +ol.render.canvas.ReplayGroup = function(tolerance, maxExtent, resolution, opt_renderBuffer) { + ol.render.ReplayGroup.call(this); /** * @private @@ -1860,6 +1861,7 @@ ol.render.canvas.ReplayGroup = function( this.hitDetectionTransform_ = ol.transform.create(); }; +ol.inherits(ol.render.canvas.ReplayGroup, ol.render.ReplayGroup); /** @@ -1969,7 +1971,7 @@ ol.render.canvas.ReplayGroup.prototype.isEmpty = function() { * @param {Object.} skippedFeaturesHash Ids of features * to skip. * @param {Array.=} opt_replayTypes Ordered replay types - * to replay. Default is {@link ol.render.REPLAY_ORDER} + * to replay. Default is {@link ol.render.replay.ORDER} */ ol.render.canvas.ReplayGroup.prototype.replay = function(context, pixelRatio, transform, viewRotation, skippedFeaturesHash, opt_replayTypes) { @@ -1997,7 +1999,7 @@ ol.render.canvas.ReplayGroup.prototype.replay = function(context, pixelRatio, context.closePath(); context.clip(); - var replayTypes = opt_replayTypes ? opt_replayTypes : ol.render.REPLAY_ORDER; + var replayTypes = opt_replayTypes ? opt_replayTypes : ol.render.replay.ORDER; var i, ii, j, jj, replays, replay; for (i = 0, ii = zs.length; i < ii; ++i) { replays = this.replaysByZIndex_[zs[i].toString()]; @@ -2040,8 +2042,8 @@ ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ = function( var i, ii, j, replays, replay, result; for (i = 0, ii = zs.length; i < ii; ++i) { replays = this.replaysByZIndex_[zs[i].toString()]; - for (j = ol.render.REPLAY_ORDER.length - 1; j >= 0; --j) { - replay = replays[ol.render.REPLAY_ORDER[j]]; + for (j = ol.render.replay.ORDER.length - 1; j >= 0; --j) { + replay = replays[ol.render.replay.ORDER[j]]; if (replay !== undefined) { result = replay.replayHitDetection(context, transform, viewRotation, skippedFeaturesHash, featureCallback, opt_hitExtent); diff --git a/src/ol/render/event.js b/src/ol/render/event.js index 9f439c00d9..d454b99f93 100644 --- a/src/ol/render/event.js +++ b/src/ol/render/event.js @@ -2,7 +2,6 @@ goog.provide('ol.render.Event'); goog.provide('ol.render.EventType'); goog.require('ol.events.Event'); -goog.require('ol.render.VectorContext'); /** diff --git a/src/ol/render/ireplaygroup.js b/src/ol/render/ireplaygroup.js deleted file mode 100644 index 24c37c7ead..0000000000 --- a/src/ol/render/ireplaygroup.js +++ /dev/null @@ -1,54 +0,0 @@ -goog.provide('ol.render.IReplayGroup'); - -goog.require('ol.render.VectorContext'); - - -/** - * @enum {string} - */ -ol.render.ReplayType = { - IMAGE: 'Image', - LINE_STRING: 'LineString', - POLYGON: 'Polygon', - TEXT: 'Text' -}; - - -/** - * @const - * @type {Array.} - */ -ol.render.REPLAY_ORDER = [ - ol.render.ReplayType.POLYGON, - ol.render.ReplayType.LINE_STRING, - ol.render.ReplayType.IMAGE, - ol.render.ReplayType.TEXT -]; - - -/** - * @interface - */ -ol.render.IReplayGroup = function() { -}; - - -/* eslint-disable valid-jsdoc */ -// TODO: enable valid-jsdoc for @interface methods when this issue is resolved -// https://github.com/eslint/eslint/issues/4887 - - -/** - * @param {number|undefined} zIndex Z index. - * @param {ol.render.ReplayType} replayType Replay type. - * @return {ol.render.VectorContext} Replay. - */ -ol.render.IReplayGroup.prototype.getReplay = function(zIndex, replayType) { -}; - - -/** - * @return {boolean} Is empty. - */ -ol.render.IReplayGroup.prototype.isEmpty = function() { -}; diff --git a/src/ol/render/replay.js b/src/ol/render/replay.js new file mode 100644 index 0000000000..3803f79f0c --- /dev/null +++ b/src/ol/render/replay.js @@ -0,0 +1,15 @@ +goog.provide('ol.render.replay'); + +goog.require('ol.render.ReplayType'); + + +/** + * @const + * @type {Array.} + */ +ol.render.replay.ORDER = [ + ol.render.ReplayType.POLYGON, + ol.render.ReplayType.LINE_STRING, + ol.render.ReplayType.IMAGE, + ol.render.ReplayType.TEXT +]; diff --git a/src/ol/render/replaygroup.js b/src/ol/render/replaygroup.js new file mode 100644 index 0000000000..6f7b286021 --- /dev/null +++ b/src/ol/render/replaygroup.js @@ -0,0 +1,24 @@ +goog.provide('ol.render.ReplayGroup'); + + +/** + * Base class for replay groups. + * @constructor + */ +ol.render.ReplayGroup = function() {}; + + +/** + * @abstract + * @param {number|undefined} zIndex Z index. + * @param {ol.render.ReplayType} replayType Replay type. + * @return {ol.render.VectorContext} Replay. + */ +ol.render.ReplayGroup.prototype.getReplay = function(zIndex, replayType) {}; + + +/** + * @abstract + * @return {boolean} Is empty. + */ +ol.render.ReplayGroup.prototype.isEmpty = function() {}; diff --git a/src/ol/render/replaytype.js b/src/ol/render/replaytype.js new file mode 100644 index 0000000000..28d37e2ae1 --- /dev/null +++ b/src/ol/render/replaytype.js @@ -0,0 +1,12 @@ +goog.provide('ol.render.ReplayType'); + + +/** + * @enum {string} + */ +ol.render.ReplayType = { + IMAGE: 'Image', + LINE_STRING: 'LineString', + POLYGON: 'Polygon', + TEXT: 'Text' +}; diff --git a/src/ol/render/webgl/imagereplay/index.js b/src/ol/render/webgl/imagereplay/index.js index 12663bcb4d..56ebfb7f42 100644 --- a/src/ol/render/webgl/imagereplay/index.js +++ b/src/ol/render/webgl/imagereplay/index.js @@ -1,12 +1,13 @@ goog.provide('ol.render.webgl.ImageReplay'); goog.provide('ol.render.webgl.ReplayGroup'); -goog.require('ol.transform'); goog.require('ol.extent'); goog.require('ol.obj'); -goog.require('ol.render.IReplayGroup'); +goog.require('ol.render.ReplayGroup'); goog.require('ol.render.VectorContext'); +goog.require('ol.render.replay'); goog.require('ol.render.webgl.imagereplay.defaultshader'); +goog.require('ol.transform'); goog.require('ol.vec.Mat4'); goog.require('ol.webgl'); goog.require('ol.webgl.Buffer'); @@ -907,14 +908,14 @@ ol.render.webgl.ImageReplay.prototype.setImageStyle = function(imageStyle) { /** * @constructor - * @implements {ol.render.IReplayGroup} + * @extends {ol.render.ReplayGroup} * @param {number} tolerance Tolerance. * @param {ol.Extent} maxExtent Max extent. * @param {number=} opt_renderBuffer Render buffer. * @struct */ -ol.render.webgl.ReplayGroup = function( - tolerance, maxExtent, opt_renderBuffer) { +ol.render.webgl.ReplayGroup = function(tolerance, maxExtent, opt_renderBuffer) { + ol.render.ReplayGroup.call(this); /** * @type {ol.Extent} @@ -942,6 +943,7 @@ ol.render.webgl.ReplayGroup = function( this.replays_ = {}; }; +ol.inherits(ol.render.webgl.ReplayGroup, ol.render.ReplayGroup); /** @@ -1014,8 +1016,8 @@ ol.render.webgl.ReplayGroup.prototype.replay = function(context, center, resolution, rotation, size, pixelRatio, opacity, skippedFeaturesHash) { var i, ii, replay; - for (i = 0, ii = ol.render.REPLAY_ORDER.length; i < ii; ++i) { - replay = this.replays_[ol.render.REPLAY_ORDER[i]]; + for (i = 0, ii = ol.render.replay.ORDER.length; i < ii; ++i) { + replay = this.replays_[ol.render.replay.ORDER[i]]; if (replay !== undefined) { replay.replay(context, center, resolution, rotation, size, pixelRatio, @@ -1048,8 +1050,8 @@ ol.render.webgl.ReplayGroup.prototype.replayHitDetection_ = function(context, center, resolution, rotation, size, pixelRatio, opacity, skippedFeaturesHash, featureCallback, oneByOne, opt_hitExtent) { var i, replay, result; - for (i = ol.render.REPLAY_ORDER.length - 1; i >= 0; --i) { - replay = this.replays_[ol.render.REPLAY_ORDER[i]]; + for (i = ol.render.replay.ORDER.length - 1; i >= 0; --i) { + replay = this.replays_[ol.render.replay.ORDER[i]]; if (replay !== undefined) { result = replay.replay(context, center, resolution, rotation, size, pixelRatio, opacity, diff --git a/src/ol/render/webgl/immediate.js b/src/ol/render/webgl/immediate.js index c65ad5119b..726e52698b 100644 --- a/src/ol/render/webgl/immediate.js +++ b/src/ol/render/webgl/immediate.js @@ -1,8 +1,9 @@ goog.provide('ol.render.webgl.Immediate'); + goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); +goog.require('ol.render.ReplayType'); goog.require('ol.render.VectorContext'); -goog.require('ol.render.webgl.ImageReplay'); goog.require('ol.render.webgl.ReplayGroup'); diff --git a/src/ol/renderer/canvas/imagelayer.js b/src/ol/renderer/canvas/imagelayer.js index 367936a656..e09d713dfe 100644 --- a/src/ol/renderer/canvas/imagelayer.js +++ b/src/ol/renderer/canvas/imagelayer.js @@ -2,11 +2,9 @@ goog.provide('ol.renderer.canvas.ImageLayer'); goog.require('ol.transform'); goog.require('ol.functions'); -goog.require('ol.ImageBase'); goog.require('ol.ViewHint'); goog.require('ol.dom'); goog.require('ol.extent'); -goog.require('ol.layer.Image'); goog.require('ol.proj'); goog.require('ol.renderer.canvas.Layer'); goog.require('ol.source.ImageVector'); diff --git a/src/ol/renderer/canvas/map.js b/src/ol/renderer/canvas/map.js index 7ced0bde93..ba48b69218 100644 --- a/src/ol/renderer/canvas/map.js +++ b/src/ol/renderer/canvas/map.js @@ -19,7 +19,6 @@ goog.require('ol.render.canvas'); goog.require('ol.render.canvas.Immediate'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.canvas.ImageLayer'); -goog.require('ol.renderer.canvas.Layer'); goog.require('ol.renderer.canvas.TileLayer'); goog.require('ol.renderer.canvas.VectorLayer'); goog.require('ol.renderer.canvas.VectorTileLayer'); diff --git a/src/ol/renderer/canvas/tilelayer.js b/src/ol/renderer/canvas/tilelayer.js index 932275acc0..225ad34650 100644 --- a/src/ol/renderer/canvas/tilelayer.js +++ b/src/ol/renderer/canvas/tilelayer.js @@ -11,7 +11,6 @@ goog.require('ol.extent'); goog.require('ol.render.EventType'); goog.require('ol.renderer.canvas.Layer'); goog.require('ol.size'); -goog.require('ol.source.Tile'); /** diff --git a/src/ol/renderer/canvas/vectorlayer.js b/src/ol/renderer/canvas/vectorlayer.js index 8bc0057c7f..92287cc9b5 100644 --- a/src/ol/renderer/canvas/vectorlayer.js +++ b/src/ol/renderer/canvas/vectorlayer.js @@ -1,16 +1,13 @@ goog.provide('ol.renderer.canvas.VectorLayer'); -goog.require('ol.events'); goog.require('ol.ViewHint'); goog.require('ol.dom'); goog.require('ol.extent'); -goog.require('ol.layer.Vector'); goog.require('ol.render.EventType'); goog.require('ol.render.canvas'); goog.require('ol.render.canvas.ReplayGroup'); goog.require('ol.renderer.canvas.Layer'); goog.require('ol.renderer.vector'); -goog.require('ol.source.Vector'); /** diff --git a/src/ol/renderer/canvas/vectortilelayer.js b/src/ol/renderer/canvas/vectortilelayer.js index 0106ec561f..9683b105b0 100644 --- a/src/ol/renderer/canvas/vectortilelayer.js +++ b/src/ol/renderer/canvas/vectortilelayer.js @@ -1,21 +1,18 @@ goog.provide('ol.renderer.canvas.VectorTileLayer'); -goog.require('ol.events'); -goog.require('ol.transform'); -goog.require('ol.Feature'); -goog.require('ol.VectorTile'); goog.require('ol.array'); goog.require('ol.extent'); -goog.require('ol.layer.VectorTile'); goog.require('ol.proj'); goog.require('ol.proj.Units'); goog.require('ol.render.EventType'); +goog.require('ol.render.ReplayType'); goog.require('ol.render.canvas'); goog.require('ol.render.canvas.ReplayGroup'); +goog.require('ol.render.replay'); goog.require('ol.renderer.canvas.TileLayer'); goog.require('ol.renderer.vector'); goog.require('ol.size'); -goog.require('ol.source.VectorTile'); +goog.require('ol.transform'); /** @@ -23,7 +20,7 @@ goog.require('ol.source.VectorTile'); * @type {!Object.>} */ ol.renderer.canvas.IMAGE_REPLAYS = { - 'image': ol.render.REPLAY_ORDER, + 'image': ol.render.replay.ORDER, 'hybrid': [ol.render.ReplayType.POLYGON, ol.render.ReplayType.LINE_STRING] }; @@ -34,7 +31,7 @@ ol.renderer.canvas.IMAGE_REPLAYS = { */ ol.renderer.canvas.VECTOR_REPLAYS = { 'hybrid': [ol.render.ReplayType.IMAGE, ol.render.ReplayType.TEXT], - 'vector': ol.render.REPLAY_ORDER + 'vector': ol.render.replay.ORDER }; diff --git a/src/ol/renderer/dom/imagelayer.js b/src/ol/renderer/dom/imagelayer.js index a8bc3c0616..6a2315292f 100644 --- a/src/ol/renderer/dom/imagelayer.js +++ b/src/ol/renderer/dom/imagelayer.js @@ -1,11 +1,9 @@ goog.provide('ol.renderer.dom.ImageLayer'); goog.require('ol.transform'); -goog.require('ol.ImageBase'); goog.require('ol.ViewHint'); goog.require('ol.dom'); goog.require('ol.extent'); -goog.require('ol.layer.Image'); goog.require('ol.proj'); goog.require('ol.renderer.dom.Layer'); diff --git a/src/ol/renderer/dom/map.js b/src/ol/renderer/dom/map.js index 219daf2b10..3a27afe015 100644 --- a/src/ol/renderer/dom/map.js +++ b/src/ol/renderer/dom/map.js @@ -18,7 +18,6 @@ goog.require('ol.render.EventType'); goog.require('ol.render.canvas.Immediate'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.dom.ImageLayer'); -goog.require('ol.renderer.dom.Layer'); goog.require('ol.renderer.dom.TileLayer'); goog.require('ol.renderer.dom.VectorLayer'); goog.require('ol.source.State'); diff --git a/src/ol/renderer/dom/tilelayer.js b/src/ol/renderer/dom/tilelayer.js index d297d2afad..3bd2762f41 100644 --- a/src/ol/renderer/dom/tilelayer.js +++ b/src/ol/renderer/dom/tilelayer.js @@ -11,10 +11,8 @@ goog.require('ol.ViewHint'); goog.require('ol.array'); goog.require('ol.dom'); goog.require('ol.extent'); -goog.require('ol.layer.Tile'); goog.require('ol.renderer.dom.Layer'); goog.require('ol.size'); -goog.require('ol.tilegrid.TileGrid'); /** diff --git a/src/ol/renderer/dom/vectorlayer.js b/src/ol/renderer/dom/vectorlayer.js index 70ac946023..1f0e2e4152 100644 --- a/src/ol/renderer/dom/vectorlayer.js +++ b/src/ol/renderer/dom/vectorlayer.js @@ -1,11 +1,9 @@ goog.provide('ol.renderer.dom.VectorLayer'); -goog.require('ol.events'); goog.require('ol.transform'); goog.require('ol.ViewHint'); goog.require('ol.dom'); goog.require('ol.extent'); -goog.require('ol.layer.Vector'); goog.require('ol.render.Event'); goog.require('ol.render.EventType'); goog.require('ol.render.canvas.Immediate'); diff --git a/src/ol/renderer/layer.js b/src/ol/renderer/layer.js index bc58a9ef53..341d4f94db 100644 --- a/src/ol/renderer/layer.js +++ b/src/ol/renderer/layer.js @@ -6,11 +6,9 @@ goog.require('ol'); goog.require('ol.functions'); goog.require('ol.ImageState'); goog.require('ol.Observable'); -goog.require('ol.TileRange'); goog.require('ol.TileState'); goog.require('ol.transform'); goog.require('ol.source.State'); -goog.require('ol.source.Tile'); /** diff --git a/src/ol/renderer/vector.js b/src/ol/renderer/vector.js index a7c1b16d44..8c98748c89 100644 --- a/src/ol/renderer/vector.js +++ b/src/ol/renderer/vector.js @@ -1,9 +1,7 @@ goog.provide('ol.renderer.vector'); -goog.require('ol.render.Feature'); -goog.require('ol.render.IReplayGroup'); +goog.require('ol.render.ReplayType'); goog.require('ol.style.ImageState'); -goog.require('ol.style.Style'); /** @@ -38,7 +36,7 @@ ol.renderer.vector.getTolerance = function(resolution, pixelRatio) { /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.geom.Circle} geometry Geometry. * @param {ol.style.Style} style Style. * @param {ol.Feature} feature Feature. @@ -64,7 +62,7 @@ ol.renderer.vector.renderCircleGeometry_ = function(replayGroup, geometry, style /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.Feature|ol.render.Feature} feature Feature. * @param {ol.style.Style} style Style. * @param {number} squaredTolerance Squared tolerance. @@ -101,7 +99,7 @@ ol.renderer.vector.renderFeature = function( /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.Feature|ol.render.Feature} feature Feature. * @param {ol.style.Style} style Style. * @param {number} squaredTolerance Squared tolerance. @@ -121,7 +119,7 @@ ol.renderer.vector.renderFeature_ = function( /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.geom.GeometryCollection} geometry Geometry. * @param {ol.style.Style} style Style. * @param {ol.Feature} feature Feature. @@ -139,7 +137,7 @@ ol.renderer.vector.renderGeometryCollectionGeometry_ = function(replayGroup, geo /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.geom.LineString|ol.render.Feature} geometry Geometry. * @param {ol.style.Style} style Style. * @param {ol.Feature|ol.render.Feature} feature Feature. @@ -164,7 +162,7 @@ ol.renderer.vector.renderLineStringGeometry_ = function(replayGroup, geometry, s /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.geom.MultiLineString|ol.render.Feature} geometry Geometry. * @param {ol.style.Style} style Style. * @param {ol.Feature|ol.render.Feature} feature Feature. @@ -191,7 +189,7 @@ ol.renderer.vector.renderMultiLineStringGeometry_ = function(replayGroup, geomet /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.geom.MultiPolygon} geometry Geometry. * @param {ol.style.Style} style Style. * @param {ol.Feature} feature Feature. @@ -219,7 +217,7 @@ ol.renderer.vector.renderMultiPolygonGeometry_ = function(replayGroup, geometry, /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.geom.Point|ol.render.Feature} geometry Geometry. * @param {ol.style.Style} style Style. * @param {ol.Feature|ol.render.Feature} feature Feature. @@ -248,7 +246,7 @@ ol.renderer.vector.renderPointGeometry_ = function(replayGroup, geometry, style, /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.geom.MultiPoint|ol.render.Feature} geometry Geometry. * @param {ol.style.Style} style Style. * @param {ol.Feature|ol.render.Feature} feature Feature. @@ -278,7 +276,7 @@ ol.renderer.vector.renderMultiPointGeometry_ = function(replayGroup, geometry, s /** - * @param {ol.render.IReplayGroup} replayGroup Replay group. + * @param {ol.render.ReplayGroup} replayGroup Replay group. * @param {ol.geom.Polygon|ol.render.Feature} geometry Geometry. * @param {ol.style.Style} style Style. * @param {ol.Feature|ol.render.Feature} feature Feature. @@ -308,7 +306,7 @@ ol.renderer.vector.renderPolygonGeometry_ = function(replayGroup, geometry, styl * @const * @private * @type {Object.} */ ol.renderer.vector.GEOMETRY_RENDERERS_ = { diff --git a/src/ol/renderer/webgl/imagelayer.js b/src/ol/renderer/webgl/imagelayer.js index e54dec1fcb..5cfcdaad3b 100644 --- a/src/ol/renderer/webgl/imagelayer.js +++ b/src/ol/renderer/webgl/imagelayer.js @@ -1,12 +1,10 @@ goog.provide('ol.renderer.webgl.ImageLayer'); goog.require('ol.transform'); -goog.require('ol.ImageBase'); goog.require('ol.ViewHint'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.functions'); -goog.require('ol.layer.Image'); goog.require('ol.proj'); goog.require('ol.renderer.webgl.Layer'); goog.require('ol.source.ImageVector'); diff --git a/src/ol/renderer/webgl/map.js b/src/ol/renderer/webgl/map.js index 71f338824b..e9de9908fb 100644 --- a/src/ol/renderer/webgl/map.js +++ b/src/ol/renderer/webgl/map.js @@ -8,7 +8,6 @@ goog.require('ol.array'); goog.require('ol.css'); goog.require('ol.dom'); goog.require('ol.events'); -goog.require('ol.events.Event'); goog.require('ol.layer.Image'); goog.require('ol.layer.Layer'); goog.require('ol.layer.Tile'); @@ -18,7 +17,6 @@ goog.require('ol.render.EventType'); goog.require('ol.render.webgl.Immediate'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.webgl.ImageLayer'); -goog.require('ol.renderer.webgl.Layer'); goog.require('ol.renderer.webgl.TileLayer'); goog.require('ol.renderer.webgl.VectorLayer'); goog.require('ol.source.State'); diff --git a/src/ol/renderer/webgl/tilelayer.js b/src/ol/renderer/webgl/tilelayer.js index 564d1fdf2d..1b9a09697e 100644 --- a/src/ol/renderer/webgl/tilelayer.js +++ b/src/ol/renderer/webgl/tilelayer.js @@ -8,7 +8,6 @@ goog.require('ol.TileRange'); goog.require('ol.TileState'); goog.require('ol.array'); goog.require('ol.extent'); -goog.require('ol.layer.Tile'); goog.require('ol.math'); goog.require('ol.renderer.webgl.Layer'); goog.require('ol.renderer.webgl.tilelayershader'); diff --git a/src/ol/renderer/webgl/vectorlayer.js b/src/ol/renderer/webgl/vectorlayer.js index 9c6f5dc0db..82061f115a 100644 --- a/src/ol/renderer/webgl/vectorlayer.js +++ b/src/ol/renderer/webgl/vectorlayer.js @@ -1,9 +1,7 @@ goog.provide('ol.renderer.webgl.VectorLayer'); -goog.require('ol.events'); goog.require('ol.ViewHint'); goog.require('ol.extent'); -goog.require('ol.layer.Vector'); goog.require('ol.transform'); goog.require('ol.render.webgl.ReplayGroup'); goog.require('ol.renderer.vector'); diff --git a/src/ol/reproj/image.js b/src/ol/reproj/image.js index 7b929ec552..3774e303a4 100644 --- a/src/ol/reproj/image.js +++ b/src/ol/reproj/image.js @@ -5,7 +5,6 @@ goog.require('ol.events.EventType'); goog.require('ol.ImageBase'); goog.require('ol.ImageState'); goog.require('ol.extent'); -goog.require('ol.proj'); goog.require('ol.reproj'); goog.require('ol.reproj.Triangulation'); diff --git a/src/ol/reproj/tile.js b/src/ol/reproj/tile.js index 0ebbdf6fb3..9eeae35b25 100644 --- a/src/ol/reproj/tile.js +++ b/src/ol/reproj/tile.js @@ -7,7 +7,6 @@ goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.math'); goog.require('ol.obj'); -goog.require('ol.proj'); goog.require('ol.reproj'); goog.require('ol.reproj.Triangulation'); diff --git a/src/ol/source/bingmaps.js b/src/ol/source/bingmaps.js index 21f534e8f1..74b0628024 100644 --- a/src/ol/source/bingmaps.js +++ b/src/ol/source/bingmaps.js @@ -1,7 +1,6 @@ goog.provide('ol.source.BingMaps'); goog.require('ol.Attribution'); -goog.require('ol.TileRange'); goog.require('ol.TileUrlFunction'); goog.require('ol.extent'); goog.require('ol.net'); @@ -9,6 +8,7 @@ goog.require('ol.proj'); goog.require('ol.source.State'); goog.require('ol.source.TileImage'); goog.require('ol.tilecoord'); +goog.require('ol.tilegrid'); /** diff --git a/src/ol/source/imagearcgisrest.js b/src/ol/source/imagearcgisrest.js index e598c73167..cae2c0b250 100644 --- a/src/ol/source/imagearcgisrest.js +++ b/src/ol/source/imagearcgisrest.js @@ -6,7 +6,6 @@ goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.obj'); -goog.require('ol.proj'); goog.require('ol.source.Image'); goog.require('ol.uri'); diff --git a/src/ol/source/imagevector.js b/src/ol/source/imagevector.js index e8f82a33a5..ae7f643b06 100644 --- a/src/ol/source/imagevector.js +++ b/src/ol/source/imagevector.js @@ -8,8 +8,6 @@ goog.require('ol.extent'); goog.require('ol.render.canvas.ReplayGroup'); goog.require('ol.renderer.vector'); goog.require('ol.source.ImageCanvas'); -goog.require('ol.source.Vector'); -goog.require('ol.style.Style'); /** diff --git a/src/ol/source/imagewms.js b/src/ol/source/imagewms.js index aac0cba38e..5b0f1a3e8c 100644 --- a/src/ol/source/imagewms.js +++ b/src/ol/source/imagewms.js @@ -10,7 +10,6 @@ goog.require('ol.extent'); goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.source.Image'); -goog.require('ol.source.wms'); goog.require('ol.source.wms.ServerType'); goog.require('ol.string'); goog.require('ol.uri'); diff --git a/src/ol/source/tile.js b/src/ol/source/tile.js index 49e502b3bd..ccb6a2909c 100644 --- a/src/ol/source/tile.js +++ b/src/ol/source/tile.js @@ -1,16 +1,15 @@ goog.provide('ol.source.Tile'); goog.provide('ol.source.TileEvent'); -goog.require('ol.events.Event'); goog.require('ol'); goog.require('ol.TileCache'); -goog.require('ol.TileRange'); goog.require('ol.TileState'); +goog.require('ol.events.Event'); goog.require('ol.proj'); goog.require('ol.size'); goog.require('ol.source.Source'); goog.require('ol.tilecoord'); -goog.require('ol.tilegrid.TileGrid'); +goog.require('ol.tilegrid'); /** @@ -283,7 +282,7 @@ ol.source.Tile.prototype.getTileCoordForTileUrlFunction = function(tileCoord, op opt_projection : this.getProjection(); var tileGrid = this.getTileGridForProjection(projection); if (this.getWrapX() && projection.isGlobal()) { - tileCoord = ol.tilecoord.wrapX(tileCoord, tileGrid, projection); + tileCoord = ol.tilegrid.wrapX(tileGrid, tileCoord, projection); } return ol.tilecoord.withinExtentAndZ(tileCoord, tileGrid) ? tileCoord : null; }; diff --git a/src/ol/source/tilearcgisrest.js b/src/ol/source/tilearcgisrest.js index e4edbe5d88..ef8f3f0bdb 100644 --- a/src/ol/source/tilearcgisrest.js +++ b/src/ol/source/tilearcgisrest.js @@ -4,7 +4,6 @@ goog.require('ol'); goog.require('ol.extent'); goog.require('ol.obj'); goog.require('ol.math'); -goog.require('ol.proj'); goog.require('ol.size'); goog.require('ol.source.TileImage'); goog.require('ol.tilecoord'); diff --git a/src/ol/source/tileimage.js b/src/ol/source/tileimage.js index d5abe6337f..d9f7d72c3d 100644 --- a/src/ol/source/tileimage.js +++ b/src/ol/source/tileimage.js @@ -8,6 +8,7 @@ goog.require('ol.events.EventType'); goog.require('ol.proj'); goog.require('ol.reproj.Tile'); goog.require('ol.source.UrlTile'); +goog.require('ol.tilegrid'); /** diff --git a/src/ol/source/tilejson.js b/src/ol/source/tilejson.js index f8267530fc..18f6fbdbca 100644 --- a/src/ol/source/tilejson.js +++ b/src/ol/source/tilejson.js @@ -8,13 +8,13 @@ goog.provide('ol.source.TileJSON'); goog.provide('ol.tilejson'); goog.require('ol.Attribution'); -goog.require('ol.TileRange'); goog.require('ol.TileUrlFunction'); goog.require('ol.extent'); goog.require('ol.net'); goog.require('ol.proj'); goog.require('ol.source.State'); goog.require('ol.source.TileImage'); +goog.require('ol.tilegrid'); /** diff --git a/src/ol/source/tileutfgrid.js b/src/ol/source/tileutfgrid.js index aba70e5ef8..c11c500345 100644 --- a/src/ol/source/tileutfgrid.js +++ b/src/ol/source/tileutfgrid.js @@ -12,6 +12,7 @@ goog.require('ol.net'); goog.require('ol.proj'); goog.require('ol.source.State'); goog.require('ol.source.Tile'); +goog.require('ol.tilegrid'); /** diff --git a/src/ol/source/tilewms.js b/src/ol/source/tilewms.js index e887e99c8b..ad8070074d 100644 --- a/src/ol/source/tilewms.js +++ b/src/ol/source/tilewms.js @@ -11,7 +11,6 @@ goog.require('ol.math'); goog.require('ol.proj'); goog.require('ol.size'); goog.require('ol.source.TileImage'); -goog.require('ol.source.wms'); goog.require('ol.source.wms.ServerType'); goog.require('ol.tilecoord'); goog.require('ol.string'); diff --git a/src/ol/source/urltile.js b/src/ol/source/urltile.js index 69e1b7c0ef..33b8071e5a 100644 --- a/src/ol/source/urltile.js +++ b/src/ol/source/urltile.js @@ -1,6 +1,5 @@ goog.provide('ol.source.UrlTile'); -goog.require('ol.events'); goog.require('ol.TileState'); goog.require('ol.TileUrlFunction'); goog.require('ol.source.Tile'); diff --git a/src/ol/source/vector.js b/src/ol/source/vector.js index 1d3f3dc814..dbefbe8352 100644 --- a/src/ol/source/vector.js +++ b/src/ol/source/vector.js @@ -7,7 +7,6 @@ goog.provide('ol.source.VectorEventType'); goog.require('ol'); goog.require('ol.Collection'); -goog.require('ol.Feature'); goog.require('ol.ObjectEventType'); goog.require('ol.array'); goog.require('ol.events'); @@ -17,7 +16,6 @@ goog.require('ol.extent'); goog.require('ol.featureloader'); goog.require('ol.loadingstrategy'); goog.require('ol.obj'); -goog.require('ol.proj'); goog.require('ol.source.Source'); goog.require('ol.source.State'); goog.require('ol.structs.RBush'); diff --git a/src/ol/source/xyz.js b/src/ol/source/xyz.js index 0bf11bdbcb..a0f31bddda 100644 --- a/src/ol/source/xyz.js +++ b/src/ol/source/xyz.js @@ -1,6 +1,7 @@ goog.provide('ol.source.XYZ'); goog.require('ol.source.TileImage'); +goog.require('ol.tilegrid'); /** diff --git a/src/ol/source/zoomify.js b/src/ol/source/zoomify.js index daf1464ecb..cba5e88750 100644 --- a/src/ol/source/zoomify.js +++ b/src/ol/source/zoomify.js @@ -5,7 +5,6 @@ goog.require('ol.ImageTile'); goog.require('ol.TileState'); goog.require('ol.dom'); goog.require('ol.extent'); -goog.require('ol.proj'); goog.require('ol.source.TileImage'); goog.require('ol.tilegrid.TileGrid'); diff --git a/src/ol/style/circle.js b/src/ol/style/circle.js index 64cdae2401..af6029ae29 100644 --- a/src/ol/style/circle.js +++ b/src/ol/style/circle.js @@ -6,10 +6,8 @@ goog.require('ol.colorlike'); goog.require('ol.dom'); goog.require('ol.has'); goog.require('ol.render.canvas'); -goog.require('ol.style.Fill'); goog.require('ol.style.Image'); goog.require('ol.style.ImageState'); -goog.require('ol.style.Stroke'); /** diff --git a/src/ol/style/regularshape.js b/src/ol/style/regularshape.js index 9ea83b5881..25175234bc 100644 --- a/src/ol/style/regularshape.js +++ b/src/ol/style/regularshape.js @@ -6,11 +6,8 @@ goog.require('ol.colorlike'); goog.require('ol.dom'); goog.require('ol.has'); goog.require('ol.render.canvas'); -goog.require('ol.style.AtlasManager'); -goog.require('ol.style.Fill'); goog.require('ol.style.Image'); goog.require('ol.style.ImageState'); -goog.require('ol.style.Stroke'); /** diff --git a/src/ol/style/style.js b/src/ol/style/style.js index 91aec95aa1..e19e814963 100644 --- a/src/ol/style/style.js +++ b/src/ol/style/style.js @@ -1,10 +1,8 @@ goog.provide('ol.style.Style'); -goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryType'); goog.require('ol.style.Circle'); goog.require('ol.style.Fill'); -goog.require('ol.style.Image'); goog.require('ol.style.Stroke'); diff --git a/src/ol/tile.js b/src/ol/tile.js index 7c283eb759..706e2087ed 100644 --- a/src/ol/tile.js +++ b/src/ol/tile.js @@ -1,7 +1,6 @@ goog.provide('ol.Tile'); goog.provide('ol.TileState'); -goog.require('ol.events'); goog.require('ol.events.EventTarget'); goog.require('ol.events.EventType'); diff --git a/src/ol/tilecache.js b/src/ol/tilecache.js index 86fd2c4d9c..8ca6d4b478 100644 --- a/src/ol/tilecache.js +++ b/src/ol/tilecache.js @@ -1,6 +1,5 @@ goog.provide('ol.TileCache'); -goog.require('ol.TileRange'); goog.require('ol.structs.LRUCache'); goog.require('ol.tilecoord'); diff --git a/src/ol/tilecoord.js b/src/ol/tilecoord.js index 60da04b7ec..d9291f2643 100644 --- a/src/ol/tilecoord.js +++ b/src/ol/tilecoord.js @@ -1,7 +1,5 @@ goog.provide('ol.tilecoord'); -goog.require('ol.extent'); - /** * @enum {number} @@ -92,27 +90,6 @@ ol.tilecoord.quadKey = function(tileCoord) { }; -/** - * @param {ol.TileCoord} tileCoord Tile coordinate. - * @param {ol.tilegrid.TileGrid} tileGrid Tile grid. - * @param {ol.proj.Projection} projection Projection. - * @return {ol.TileCoord} Tile coordinate. - */ -ol.tilecoord.wrapX = function(tileCoord, tileGrid, projection) { - var z = tileCoord[0]; - var center = tileGrid.getTileCoordCenter(tileCoord); - var projectionExtent = ol.tilegrid.extentFromProjection(projection); - if (!ol.extent.containsCoordinate(projectionExtent, center)) { - var worldWidth = ol.extent.getWidth(projectionExtent); - var worldsAway = Math.ceil((projectionExtent[0] - center[0]) / worldWidth); - center[0] += worldWidth * worldsAway; - return tileGrid.getTileCoordForCoordAndZ(center, z); - } else { - return tileCoord; - } -}; - - /** * @param {ol.TileCoord} tileCoord Tile coordinate. * @param {!ol.tilegrid.TileGrid} tileGrid Tile grid. diff --git a/src/ol/tilegrid/index.js b/src/ol/tilegrid/index.js new file mode 100644 index 0000000000..ac643dd884 --- /dev/null +++ b/src/ol/tilegrid/index.js @@ -0,0 +1,155 @@ +goog.provide('ol.tilegrid'); + +goog.require('ol.extent'); +goog.require('ol.extent.Corner'); +goog.require('ol.obj'); +goog.require('ol.proj'); +goog.require('ol.proj.METERS_PER_UNIT'); +goog.require('ol.proj.Units'); +goog.require('ol.tilegrid.TileGrid'); + + +/** + * @param {ol.proj.Projection} projection Projection. + * @return {!ol.tilegrid.TileGrid} Default tile grid for the passed projection. + */ +ol.tilegrid.getForProjection = function(projection) { + var tileGrid = projection.getDefaultTileGrid(); + if (!tileGrid) { + tileGrid = ol.tilegrid.createForProjection(projection); + projection.setDefaultTileGrid(tileGrid); + } + return tileGrid; +}; + + +/** + * @param {ol.tilegrid.TileGrid} tileGrid Tile grid. + * @param {ol.TileCoord} tileCoord Tile coordinate. + * @param {ol.proj.Projection} projection Projection. + * @return {ol.TileCoord} Tile coordinate. + */ +ol.tilegrid.wrapX = function(tileGrid, tileCoord, projection) { + var z = tileCoord[0]; + var center = tileGrid.getTileCoordCenter(tileCoord); + var projectionExtent = ol.tilegrid.extentFromProjection(projection); + if (!ol.extent.containsCoordinate(projectionExtent, center)) { + var worldWidth = ol.extent.getWidth(projectionExtent); + var worldsAway = Math.ceil((projectionExtent[0] - center[0]) / worldWidth); + center[0] += worldWidth * worldsAway; + return tileGrid.getTileCoordForCoordAndZ(center, z); + } else { + return tileCoord; + } +}; + + +/** + * @param {ol.Extent} extent Extent. + * @param {number=} opt_maxZoom Maximum zoom level (default is + * ol.DEFAULT_MAX_ZOOM). + * @param {number|ol.Size=} opt_tileSize Tile size (default uses + * ol.DEFAULT_TILE_SIZE). + * @param {ol.extent.Corner=} opt_corner Extent corner (default is + * ol.extent.Corner.TOP_LEFT). + * @return {!ol.tilegrid.TileGrid} TileGrid instance. + */ +ol.tilegrid.createForExtent = function(extent, opt_maxZoom, opt_tileSize, opt_corner) { + var corner = opt_corner !== undefined ? + opt_corner : ol.extent.Corner.TOP_LEFT; + + var resolutions = ol.tilegrid.resolutionsFromExtent( + extent, opt_maxZoom, opt_tileSize); + + return new ol.tilegrid.TileGrid({ + extent: extent, + origin: ol.extent.getCorner(extent, corner), + resolutions: resolutions, + tileSize: opt_tileSize + }); +}; + + +/** + * Creates a tile grid with a standard XYZ tiling scheme. + * @param {olx.tilegrid.XYZOptions=} opt_options Tile grid options. + * @return {ol.tilegrid.TileGrid} Tile grid instance. + * @api + */ +ol.tilegrid.createXYZ = function(opt_options) { + var options = /** @type {olx.tilegrid.TileGridOptions} */ ({}); + ol.obj.assign(options, opt_options !== undefined ? + opt_options : /** @type {olx.tilegrid.XYZOptions} */ ({})); + if (options.extent === undefined) { + options.extent = ol.proj.get('EPSG:3857').getExtent(); + } + options.resolutions = ol.tilegrid.resolutionsFromExtent( + options.extent, options.maxZoom, options.tileSize); + delete options.maxZoom; + + return new ol.tilegrid.TileGrid(options); +}; + + +/** + * Create a resolutions array from an extent. A zoom factor of 2 is assumed. + * @param {ol.Extent} extent Extent. + * @param {number=} opt_maxZoom Maximum zoom level (default is + * ol.DEFAULT_MAX_ZOOM). + * @param {number|ol.Size=} opt_tileSize Tile size (default uses + * ol.DEFAULT_TILE_SIZE). + * @return {!Array.} Resolutions array. + */ +ol.tilegrid.resolutionsFromExtent = function(extent, opt_maxZoom, opt_tileSize) { + var maxZoom = opt_maxZoom !== undefined ? + opt_maxZoom : ol.DEFAULT_MAX_ZOOM; + + var height = ol.extent.getHeight(extent); + var width = ol.extent.getWidth(extent); + + var tileSize = ol.size.toSize(opt_tileSize !== undefined ? + opt_tileSize : ol.DEFAULT_TILE_SIZE); + var maxResolution = Math.max( + width / tileSize[0], height / tileSize[1]); + + var length = maxZoom + 1; + var resolutions = new Array(length); + for (var z = 0; z < length; ++z) { + resolutions[z] = maxResolution / Math.pow(2, z); + } + return resolutions; +}; + + +/** + * @param {ol.ProjectionLike} projection Projection. + * @param {number=} opt_maxZoom Maximum zoom level (default is + * ol.DEFAULT_MAX_ZOOM). + * @param {ol.Size=} opt_tileSize Tile size (default uses ol.DEFAULT_TILE_SIZE). + * @param {ol.extent.Corner=} opt_corner Extent corner (default is + * ol.extent.Corner.BOTTOM_LEFT). + * @return {!ol.tilegrid.TileGrid} TileGrid instance. + */ +ol.tilegrid.createForProjection = function(projection, opt_maxZoom, opt_tileSize, opt_corner) { + var extent = ol.tilegrid.extentFromProjection(projection); + return ol.tilegrid.createForExtent( + extent, opt_maxZoom, opt_tileSize, opt_corner); +}; + + +/** + * Generate a tile grid extent from a projection. If the projection has an + * extent, it is used. If not, a global extent is assumed. + * @param {ol.ProjectionLike} projection Projection. + * @return {ol.Extent} Extent. + */ +ol.tilegrid.extentFromProjection = function(projection) { + projection = ol.proj.get(projection); + var extent = projection.getExtent(); + if (!extent) { + var half = 180 * ol.proj.METERS_PER_UNIT[ol.proj.Units.DEGREES] / + projection.getMetersPerUnit(); + extent = ol.extent.createOrUpdate(-half, -half, half, half); + } + return extent; +}; diff --git a/src/ol/tilegrid.jsdoc b/src/ol/tilegrid/index.jsdoc similarity index 100% rename from src/ol/tilegrid.jsdoc rename to src/ol/tilegrid/index.jsdoc diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index 79930a3f4b..9971bdbdd3 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -4,13 +4,7 @@ goog.require('ol'); goog.require('ol.TileRange'); goog.require('ol.array'); goog.require('ol.extent'); -goog.require('ol.extent.Corner'); goog.require('ol.math'); -goog.require('ol.obj'); -goog.require('ol.proj'); -goog.require('ol.proj.METERS_PER_UNIT'); -goog.require('ol.proj.Projection'); -goog.require('ol.proj.Units'); goog.require('ol.size'); goog.require('ol.tilecoord'); @@ -508,128 +502,3 @@ ol.tilegrid.TileGrid.prototype.calculateTileRanges_ = function(extent) { } this.fullTileRanges_ = fullTileRanges; }; - - -/** - * @param {ol.proj.Projection} projection Projection. - * @return {!ol.tilegrid.TileGrid} Default tile grid for the passed projection. - */ -ol.tilegrid.getForProjection = function(projection) { - var tileGrid = projection.getDefaultTileGrid(); - if (!tileGrid) { - tileGrid = ol.tilegrid.createForProjection(projection); - projection.setDefaultTileGrid(tileGrid); - } - return tileGrid; -}; - - -/** - * @param {ol.Extent} extent Extent. - * @param {number=} opt_maxZoom Maximum zoom level (default is - * ol.DEFAULT_MAX_ZOOM). - * @param {number|ol.Size=} opt_tileSize Tile size (default uses - * ol.DEFAULT_TILE_SIZE). - * @param {ol.extent.Corner=} opt_corner Extent corner (default is - * ol.extent.Corner.TOP_LEFT). - * @return {!ol.tilegrid.TileGrid} TileGrid instance. - */ -ol.tilegrid.createForExtent = function(extent, opt_maxZoom, opt_tileSize, opt_corner) { - var corner = opt_corner !== undefined ? - opt_corner : ol.extent.Corner.TOP_LEFT; - - var resolutions = ol.tilegrid.resolutionsFromExtent( - extent, opt_maxZoom, opt_tileSize); - - return new ol.tilegrid.TileGrid({ - extent: extent, - origin: ol.extent.getCorner(extent, corner), - resolutions: resolutions, - tileSize: opt_tileSize - }); -}; - - -/** - * Creates a tile grid with a standard XYZ tiling scheme. - * @param {olx.tilegrid.XYZOptions=} opt_options Tile grid options. - * @return {ol.tilegrid.TileGrid} Tile grid instance. - * @api - */ -ol.tilegrid.createXYZ = function(opt_options) { - var options = /** @type {olx.tilegrid.TileGridOptions} */ ({}); - ol.obj.assign(options, opt_options !== undefined ? - opt_options : /** @type {olx.tilegrid.XYZOptions} */ ({})); - if (options.extent === undefined) { - options.extent = ol.proj.get('EPSG:3857').getExtent(); - } - options.resolutions = ol.tilegrid.resolutionsFromExtent( - options.extent, options.maxZoom, options.tileSize); - delete options.maxZoom; - - return new ol.tilegrid.TileGrid(options); -}; - - -/** - * Create a resolutions array from an extent. A zoom factor of 2 is assumed. - * @param {ol.Extent} extent Extent. - * @param {number=} opt_maxZoom Maximum zoom level (default is - * ol.DEFAULT_MAX_ZOOM). - * @param {number|ol.Size=} opt_tileSize Tile size (default uses - * ol.DEFAULT_TILE_SIZE). - * @return {!Array.} Resolutions array. - */ -ol.tilegrid.resolutionsFromExtent = function(extent, opt_maxZoom, opt_tileSize) { - var maxZoom = opt_maxZoom !== undefined ? - opt_maxZoom : ol.DEFAULT_MAX_ZOOM; - - var height = ol.extent.getHeight(extent); - var width = ol.extent.getWidth(extent); - - var tileSize = ol.size.toSize(opt_tileSize !== undefined ? - opt_tileSize : ol.DEFAULT_TILE_SIZE); - var maxResolution = Math.max( - width / tileSize[0], height / tileSize[1]); - - var length = maxZoom + 1; - var resolutions = new Array(length); - for (var z = 0; z < length; ++z) { - resolutions[z] = maxResolution / Math.pow(2, z); - } - return resolutions; -}; - - -/** - * @param {ol.ProjectionLike} projection Projection. - * @param {number=} opt_maxZoom Maximum zoom level (default is - * ol.DEFAULT_MAX_ZOOM). - * @param {ol.Size=} opt_tileSize Tile size (default uses ol.DEFAULT_TILE_SIZE). - * @param {ol.extent.Corner=} opt_corner Extent corner (default is - * ol.extent.Corner.BOTTOM_LEFT). - * @return {!ol.tilegrid.TileGrid} TileGrid instance. - */ -ol.tilegrid.createForProjection = function(projection, opt_maxZoom, opt_tileSize, opt_corner) { - var extent = ol.tilegrid.extentFromProjection(projection); - return ol.tilegrid.createForExtent( - extent, opt_maxZoom, opt_tileSize, opt_corner); -}; - - -/** - * Generate a tile grid extent from a projection. If the projection has an - * extent, it is used. If not, a global extent is assumed. - * @param {ol.ProjectionLike} projection Projection. - * @return {ol.Extent} Extent. - */ -ol.tilegrid.extentFromProjection = function(projection) { - projection = ol.proj.get(projection); - var extent = projection.getExtent(); - if (!extent) { - var half = 180 * ol.proj.METERS_PER_UNIT[ol.proj.Units.DEGREES] / - projection.getMetersPerUnit(); - extent = ol.extent.createOrUpdate(-half, -half, half, half); - } - return extent; -}; diff --git a/src/ol/typedefs.js b/src/ol/typedefs.js index 40742dbe3d..b9a529af0d 100644 --- a/src/ol/typedefs.js +++ b/src/ol/typedefs.js @@ -607,7 +607,7 @@ ol.TilePriorityFunction; * renderedRenderOrder: (null|function(ol.Feature, ol.Feature):number), * renderedTileRevision: number, * renderedRevision: number, - * replayGroup: ol.render.IReplayGroup, + * replayGroup: ol.render.ReplayGroup, * skippedFeatures: Array.}} */ ol.TileReplayState; diff --git a/src/ol/vectortile.js b/src/ol/vectortile.js index 88a4bc171c..2e8d9f3b6d 100644 --- a/src/ol/vectortile.js +++ b/src/ol/vectortile.js @@ -3,7 +3,6 @@ goog.provide('ol.VectorTile'); goog.require('ol.Tile'); goog.require('ol.TileState'); goog.require('ol.dom'); -goog.require('ol.proj.Projection'); /** diff --git a/src/ol/view.js b/src/ol/view.js index b71ea3b169..afeb8cf404 100644 --- a/src/ol/view.js +++ b/src/ol/view.js @@ -14,7 +14,6 @@ goog.require('ol.geom.Polygon'); goog.require('ol.geom.SimpleGeometry'); goog.require('ol.proj'); goog.require('ol.proj.METERS_PER_UNIT'); -goog.require('ol.proj.Projection'); goog.require('ol.proj.Units'); diff --git a/src/ol/webgl/context.js b/src/ol/webgl/context.js index 1a5f084e2d..5870be1635 100644 --- a/src/ol/webgl/context.js +++ b/src/ol/webgl/context.js @@ -6,7 +6,6 @@ goog.require('ol.array'); goog.require('ol.events'); goog.require('ol.obj'); goog.require('ol.webgl'); -goog.require('ol.webgl.Buffer'); goog.require('ol.webgl.WebGLContextEventType'); diff --git a/test/node/.eslintrc b/test/node/.eslintrc index 60b5f72125..efd65c09ef 100644 --- a/test/node/.eslintrc +++ b/test/node/.eslintrc @@ -2,5 +2,8 @@ "env": { "es6": true, "mocha": true + }, + "rules": { + "strict": [2, "global"] } } diff --git a/test/node/one-provide.js b/test/node/one-provide.js index 9205746ca6..83d25309bd 100644 --- a/test/node/one-provide.js +++ b/test/node/one-provide.js @@ -1,3 +1,5 @@ +'use strict'; + const assert = require('assert'); const fs = require('fs'); const glob = require('glob'); diff --git a/test/spec/ol/array.test.js b/test/spec/ol/array.test.js index 8902731b0e..8bb4f5e624 100644 --- a/test/spec/ol/array.test.js +++ b/test/spec/ol/array.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.array'); +goog.require('ol.array'); + + describe('ol.array', function() { describe('binarySearch', function() { @@ -589,5 +592,3 @@ describe('ol.array', function() { }); }); - -goog.require('ol.array'); diff --git a/test/spec/ol/collection.test.js b/test/spec/ol/collection.test.js index 468f0eecae..9cfac96a0b 100644 --- a/test/spec/ol/collection.test.js +++ b/test/spec/ol/collection.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.Collection'); +goog.require('ol.events'); +goog.require('ol.Collection'); + + describe('ol.collection', function() { var collection; @@ -282,7 +286,3 @@ describe('ol.collection', function() { }); }); - - -goog.require('ol.events'); -goog.require('ol.Collection'); diff --git a/test/spec/ol/color.test.js b/test/spec/ol/color.test.js index 7de803cadb..0df4432ed0 100644 --- a/test/spec/ol/color.test.js +++ b/test/spec/ol/color.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.color'); +goog.require('ol.color'); + describe('ol.color', function() { @@ -151,6 +153,3 @@ describe('ol.color', function() { }); }); - - -goog.require('ol.color'); diff --git a/test/spec/ol/control/control.test.js b/test/spec/ol/control/control.test.js index 44d8d8e7cf..3b3b65d103 100644 --- a/test/spec/ol/control/control.test.js +++ b/test/spec/ol/control/control.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.control.Control'); +goog.require('ol.Map'); +goog.require('ol.control.Control'); + describe('ol.control.Control', function() { var map, control; @@ -49,6 +52,3 @@ describe('ol.control.Control\'s target', function() { }); }); }); - -goog.require('ol.Map'); -goog.require('ol.control.Control'); diff --git a/test/spec/ol/control/fullscreen.test.js b/test/spec/ol/control/fullscreen.test.js index 3429955b0b..be058dbdd5 100644 --- a/test/spec/ol/control/fullscreen.test.js +++ b/test/spec/ol/control/fullscreen.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.control.FullScreen'); +goog.require('ol.control.FullScreen'); + describe('ol.control.FullScreen', function() { describe('constructor', function() { @@ -12,5 +14,3 @@ describe('ol.control.FullScreen', function() { }); }); - -goog.require('ol.control.FullScreen'); diff --git a/test/spec/ol/control/mouseposition.test.js b/test/spec/ol/control/mouseposition.test.js index bf1d0029cd..32d5fba458 100644 --- a/test/spec/ol/control/mouseposition.test.js +++ b/test/spec/ol/control/mouseposition.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.control.MousePosition'); +goog.require('ol.control.MousePosition'); + describe('ol.control.MousePosition', function() { describe('constructor', function() { @@ -21,5 +23,3 @@ describe('ol.control.MousePosition', function() { }); }); - -goog.require('ol.control.MousePosition'); diff --git a/test/spec/ol/control/overviewmap.test.js b/test/spec/ol/control/overviewmap.test.js index f2cc8c5cbe..506ab69eaf 100644 --- a/test/spec/ol/control/overviewmap.test.js +++ b/test/spec/ol/control/overviewmap.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.control.OverviewMap'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.control.Control'); +goog.require('ol.control.OverviewMap'); + describe('ol.control.OverviewMap', function() { var map, target; @@ -85,8 +90,3 @@ describe('ol.control.OverviewMap', function() { }); }); - -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.control.Control'); -goog.require('ol.control.OverviewMap'); diff --git a/test/spec/ol/control/rotate.test.js b/test/spec/ol/control/rotate.test.js index 8766da436f..91da783693 100644 --- a/test/spec/ol/control/rotate.test.js +++ b/test/spec/ol/control/rotate.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.control.Rotate'); +goog.require('ol.control.Rotate'); + describe('ol.control.Rotate', function() { describe('constructor', function() { @@ -12,5 +14,3 @@ describe('ol.control.Rotate', function() { }); }); - -goog.require('ol.control.Rotate'); diff --git a/test/spec/ol/control/scaleline.test.js b/test/spec/ol/control/scaleline.test.js index 4748129d26..f59e4aa6cd 100644 --- a/test/spec/ol/control/scaleline.test.js +++ b/test/spec/ol/control/scaleline.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.control.ScaleLine'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.control.ScaleLine'); +goog.require('ol.proj'); + describe('ol.control.ScaleLine', function() { var mapDiv; var map; @@ -344,9 +349,3 @@ describe('ol.control.ScaleLine', function() { }); }); - - -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.control.ScaleLine'); -goog.require('ol.proj'); diff --git a/test/spec/ol/control/zoom.test.js b/test/spec/ol/control/zoom.test.js index 425b78a0dc..ae7eceb480 100644 --- a/test/spec/ol/control/zoom.test.js +++ b/test/spec/ol/control/zoom.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.control.Zoom'); +goog.require('ol.control.Zoom'); + describe('ol.control.Zoom', function() { describe('constructor', function() { @@ -12,5 +14,3 @@ describe('ol.control.Zoom', function() { }); }); - -goog.require('ol.control.Zoom'); diff --git a/test/spec/ol/control/zoomslider.test.js b/test/spec/ol/control/zoomslider.test.js index dc57331732..613f1ec976 100644 --- a/test/spec/ol/control/zoomslider.test.js +++ b/test/spec/ol/control/zoomslider.test.js @@ -1,6 +1,11 @@ /*global createMapDiv, disposeMap*/ goog.provide('ol.test.control.ZoomSlider'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.control.ZoomSlider'); +goog.require('ol.pointer.PointerEvent'); + describe('ol.control.ZoomSlider', function() { var map, target, zoomslider; @@ -170,8 +175,3 @@ describe('ol.control.ZoomSlider', function() { }); }); - -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.control.ZoomSlider'); -goog.require('ol.pointer.PointerEvent'); diff --git a/test/spec/ol/control/zoomtoextent.test.js b/test/spec/ol/control/zoomtoextent.test.js index 33a3a769b5..4296a78e8f 100644 --- a/test/spec/ol/control/zoomtoextent.test.js +++ b/test/spec/ol/control/zoomtoextent.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.control.ZoomToExtent'); +goog.require('ol.control.ZoomToExtent'); + describe('ol.control.ZoomToExtent', function() { describe('constructor', function() { @@ -12,5 +14,3 @@ describe('ol.control.ZoomToExtent', function() { }); }); - -goog.require('ol.control.ZoomToExtent'); diff --git a/test/spec/ol/coordinate.test.js b/test/spec/ol/coordinate.test.js index 1c5416037b..f0af6dbb78 100644 --- a/test/spec/ol/coordinate.test.js +++ b/test/spec/ol/coordinate.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.coordinate'); +goog.require('ol.coordinate'); + + describe('ol.coordinate', function() { describe('#add', function() { @@ -248,5 +251,3 @@ describe('ol.coordinate', function() { }); }); }); - -goog.require('ol.coordinate'); diff --git a/test/spec/ol/deviceorientation.test.js b/test/spec/ol/deviceorientation.test.js index 95bed8caf9..98530ad094 100644 --- a/test/spec/ol/deviceorientation.test.js +++ b/test/spec/ol/deviceorientation.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.DeviceOrientation'); +goog.require('ol.DeviceOrientation'); + + describe('ol.DeviceOrientation', function() { describe('constructor', function() { @@ -12,5 +15,3 @@ describe('ol.DeviceOrientation', function() { }); }); - -goog.require('ol.DeviceOrientation'); diff --git a/test/spec/ol/disposable.test.js b/test/spec/ol/disposable.test.js index 975f18b6cc..f42056543e 100644 --- a/test/spec/ol/disposable.test.js +++ b/test/spec/ol/disposable.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.Disposable'); +goog.require('ol.Disposable'); + + describe('ol.Disposable', function() { describe('constructor', function() { @@ -41,5 +44,3 @@ describe('ol.Disposable', function() { }); }); - -goog.require('ol.Disposable'); diff --git a/test/spec/ol/dom/dom.test.js b/test/spec/ol/dom/dom.test.js index 9a20b5ad7d..fadd68c173 100644 --- a/test/spec/ol/dom/dom.test.js +++ b/test/spec/ol/dom/dom.test.js @@ -1,6 +1,9 @@ /*global Modernizr*/ goog.provide('ol.test.dom'); +goog.require('goog.userAgent'); +goog.require('ol.transform'); +goog.require('ol.dom'); /*! modernizr 3.3.1 (Custom Build) | MIT * @@ -562,7 +565,3 @@ describe('ol.dom', function() { }); }); - -goog.require('goog.userAgent'); -goog.require('ol.transform'); -goog.require('ol.dom'); diff --git a/test/spec/ol/events.test.js b/test/spec/ol/events.test.js index dca9b70e68..9f74169196 100644 --- a/test/spec/ol/events.test.js +++ b/test/spec/ol/events.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.events'); +goog.require('ol.events'); +goog.require('ol.events.EventTarget'); + describe('ol.events', function() { var add, remove, target; @@ -219,7 +222,3 @@ describe('ol.events', function() { }); }); - - -goog.require('ol.events'); -goog.require('ol.events.EventTarget'); diff --git a/test/spec/ol/events/event.test.js b/test/spec/ol/events/event.test.js index 3f07a05dcd..37f4fa185b 100644 --- a/test/spec/ol/events/event.test.js +++ b/test/spec/ol/events/event.test.js @@ -1,5 +1,6 @@ goog.provide('ol.test.events.Event'); +goog.require('ol.events.Event'); describe('ol.events.Event', function() { @@ -47,6 +48,3 @@ describe('ol.events.Event', function() { }); }); - - -goog.require('ol.events.Event'); diff --git a/test/spec/ol/events/eventtarget.test.js b/test/spec/ol/events/eventtarget.test.js index 2d0cd19653..8649f9535c 100644 --- a/test/spec/ol/events/eventtarget.test.js +++ b/test/spec/ol/events/eventtarget.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.events.EventTarget'); +goog.require('ol.Disposable'); +goog.require('ol.events'); +goog.require('ol.events.Event'); +goog.require('ol.events.EventTarget'); + describe('ol.events.EventTarget', function() { var called, events, eventTarget, spy1, spy2, spy3; @@ -158,9 +163,3 @@ describe('ol.events.EventTarget', function() { }); }); }); - - -goog.require('ol.Disposable'); -goog.require('ol.events'); -goog.require('ol.events.Event'); -goog.require('ol.events.EventTarget'); diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index 9a173948a4..b8406104d8 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.extent'); +goog.require('ol.extent'); +goog.require('ol.proj'); + + describe('ol.extent', function() { describe('buffer', function() { @@ -862,7 +866,3 @@ describe('ol.extent', function() { }); }); - - -goog.require('ol.extent'); -goog.require('ol.proj'); diff --git a/test/spec/ol/feature.test.js b/test/spec/ol/feature.test.js index fc4ab12bf8..0e2b1c4a69 100644 --- a/test/spec/ol/feature.test.js +++ b/test/spec/ol/feature.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.Feature'); +goog.require('ol.Feature'); +goog.require('ol.geom.Point'); +goog.require('ol.obj'); +goog.require('ol.style.Style'); + + describe('ol.Feature', function() { describe('constructor', function() { @@ -460,9 +466,3 @@ describe('ol.Feature.createStyleFunction()', function() { }); }); - - -goog.require('ol.Feature'); -goog.require('ol.geom.Point'); -goog.require('ol.obj'); -goog.require('ol.style.Style'); diff --git a/test/spec/ol/featureloader.test.js b/test/spec/ol/featureloader.test.js index 7bbd5be2f1..f279bbad28 100644 --- a/test/spec/ol/featureloader.test.js +++ b/test/spec/ol/featureloader.test.js @@ -1,5 +1,14 @@ goog.provide('ol.test.featureloader'); +goog.require('ol.events'); +goog.require('ol.VectorTile'); +goog.require('ol.featureloader'); +goog.require('ol.format.GeoJSON'); +goog.require('ol.format.MVT'); +goog.require('ol.proj'); +goog.require('ol.source.Vector'); + + describe('ol.featureloader', function() { describe('ol.featureloader.xhr', function() { @@ -92,11 +101,3 @@ describe('ol.featureloader', function() { }); }); - -goog.require('ol.events'); -goog.require('ol.VectorTile'); -goog.require('ol.featureloader'); -goog.require('ol.format.GeoJSON'); -goog.require('ol.format.MVT'); -goog.require('ol.proj'); -goog.require('ol.source.Vector'); diff --git a/test/spec/ol/format/esrijson.test.js b/test/spec/ol/format/esrijson.test.js index 90ad9c46f0..83fc005c2b 100644 --- a/test/spec/ol/format/esrijson.test.js +++ b/test/spec/ol/format/esrijson.test.js @@ -1,5 +1,17 @@ goog.provide('ol.test.reader.EsriJSON'); +goog.require('ol.Feature'); +goog.require('ol.extent'); +goog.require('ol.format.EsriJSON'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.LinearRing'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.proj'); + describe('ol.format.EsriJSON', function() { @@ -1054,16 +1066,3 @@ describe('ol.format.EsriJSON', function() { }); }); - - -goog.require('ol.Feature'); -goog.require('ol.extent'); -goog.require('ol.format.EsriJSON'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.LinearRing'); -goog.require('ol.geom.MultiLineString'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.proj'); diff --git a/test/spec/ol/format/geojson.test.js b/test/spec/ol/format/geojson.test.js index d53fe8cc22..226b6540b4 100644 --- a/test/spec/ol/format/geojson.test.js +++ b/test/spec/ol/format/geojson.test.js @@ -1,5 +1,17 @@ goog.provide('ol.test.reader.GeoJSON'); +goog.require('ol.Feature'); +goog.require('ol.extent'); +goog.require('ol.format.GeoJSON'); +goog.require('ol.geom.Circle'); +goog.require('ol.geom.GeometryCollection'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.LinearRing'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.proj'); + describe('ol.format.GeoJSON', function() { @@ -769,16 +781,3 @@ describe('ol.format.GeoJSON', function() { }); }); - - -goog.require('ol.Feature'); -goog.require('ol.extent'); -goog.require('ol.format.GeoJSON'); -goog.require('ol.geom.Circle'); -goog.require('ol.geom.GeometryCollection'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.LinearRing'); -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.proj'); diff --git a/test/spec/ol/format/gml.test.js b/test/spec/ol/format/gml.test.js index 94eab7e373..8c83e7a9ac 100644 --- a/test/spec/ol/format/gml.test.js +++ b/test/spec/ol/format/gml.test.js @@ -1,5 +1,17 @@ goog.provide('ol.test.format.GML'); +goog.require('ol.format.GML'); +goog.require('ol.format.GML2'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.LinearRing'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.xml'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.proj'); + var readGeometry = function(format, text, opt_options) { var doc = ol.xml.parse(text); // we need an intermediate node for testing purposes @@ -1254,17 +1266,3 @@ describe('ol.format.GML3', function() { }); }); - - -goog.require('ol.format.GML'); -goog.require('ol.format.GML2'); -goog.require('ol.format.GML3'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.LinearRing'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.MultiLineString'); -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.xml'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.proj'); diff --git a/test/spec/ol/format/gpx.test.js b/test/spec/ol/format/gpx.test.js index eb6faf284f..a6f9dc7e63 100644 --- a/test/spec/ol/format/gpx.test.js +++ b/test/spec/ol/format/gpx.test.js @@ -1,5 +1,14 @@ goog.provide('ol.test.format.GPX'); +goog.require('ol.Feature'); +goog.require('ol.format.GPX'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.proj'); +goog.require('ol.xml'); + describe('ol.format.GPX', function() { var format; @@ -673,13 +682,3 @@ describe('ol.format.GPX', function() { }); }); - - -goog.require('ol.Feature'); -goog.require('ol.format.GPX'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.MultiLineString'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.proj'); -goog.require('ol.xml'); diff --git a/test/spec/ol/format/igc.test.js b/test/spec/ol/format/igc.test.js index e06d8c9c82..4ba0377d16 100644 --- a/test/spec/ol/format/igc.test.js +++ b/test/spec/ol/format/igc.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.format.IGC'); +goog.require('ol.format.IGC'); +goog.require('ol.Feature'); +goog.require('ol.proj'); + describe('ol.format.IGC', function() { @@ -130,7 +134,3 @@ describe('ol.format.IGC', function() { }); }); - -goog.require('ol.format.IGC'); -goog.require('ol.Feature'); -goog.require('ol.proj'); diff --git a/test/spec/ol/format/kml.test.js b/test/spec/ol/format/kml.test.js index 53a48060e0..3af8f22686 100644 --- a/test/spec/ol/format/kml.test.js +++ b/test/spec/ol/format/kml.test.js @@ -1,5 +1,27 @@ goog.provide('ol.test.format.KML'); +goog.require('ol.array'); +goog.require('ol.Feature'); +goog.require('ol.format.GeoJSON'); +goog.require('ol.format.KML'); +goog.require('ol.geom.GeometryCollection'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.LinearRing'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.style.Circle'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Icon'); +goog.require('ol.proj'); +goog.require('ol.proj.Projection'); +goog.require('ol.style.Stroke'); +goog.require('ol.style.Style'); +goog.require('ol.style.Text'); +goog.require('ol.xml'); + describe('ol.format.KML', function() { @@ -2867,26 +2889,3 @@ describe('ol.format.KML', function() { }); }); - - -goog.require('ol.array'); -goog.require('ol.Feature'); -goog.require('ol.format.GeoJSON'); -goog.require('ol.format.KML'); -goog.require('ol.geom.GeometryCollection'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.LinearRing'); -goog.require('ol.geom.MultiLineString'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.style.Circle'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Icon'); -goog.require('ol.proj'); -goog.require('ol.proj.Projection'); -goog.require('ol.style.Stroke'); -goog.require('ol.style.Style'); -goog.require('ol.style.Text'); -goog.require('ol.xml'); diff --git a/test/spec/ol/format/mvt.test.js b/test/spec/ol/format/mvt.test.js index eb2dc006a7..2d1683d3c7 100644 --- a/test/spec/ol/format/mvt.test.js +++ b/test/spec/ol/format/mvt.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.format.MVT'); +goog.require('ol.Feature'); +goog.require('ol.ext.pbf'); +goog.require('ol.ext.vectortile'); +goog.require('ol.format.MVT'); +goog.require('ol.render.Feature'); + where('ArrayBuffer').describe('ol.format.MVT', function() { var data; @@ -77,10 +83,3 @@ where('ArrayBuffer').describe('ol.format.MVT', function() { }); }); - - -goog.require('ol.Feature'); -goog.require('ol.ext.pbf'); -goog.require('ol.ext.vectortile'); -goog.require('ol.format.MVT'); -goog.require('ol.render.Feature'); diff --git a/test/spec/ol/format/osmxml.test.js b/test/spec/ol/format/osmxml.test.js index 81e56dc7f0..825bd0b754 100644 --- a/test/spec/ol/format/osmxml.test.js +++ b/test/spec/ol/format/osmxml.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.format.OSMXML'); +goog.require('ol.Feature'); +goog.require('ol.format.OSMXML'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.LineString'); +goog.require('ol.proj'); + describe('ol.format.OSMXML', function() { @@ -107,10 +113,3 @@ describe('ol.format.OSMXML', function() { }); }); - - -goog.require('ol.Feature'); -goog.require('ol.format.OSMXML'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.LineString'); -goog.require('ol.proj'); diff --git a/test/spec/ol/format/ows.test.js b/test/spec/ol/format/ows.test.js index fa2be4a366..069a2cc0f1 100644 --- a/test/spec/ol/format/ows.test.js +++ b/test/spec/ol/format/ows.test.js @@ -1,7 +1,9 @@ goog.provide('ol.test.format.OWS'); +goog.require('ol.format.OWS'); goog.require('ol.xml'); + describe('ol.format.OWS 1.1', function() { var parser = new ol.format.OWS(); @@ -152,5 +154,3 @@ describe('ol.format.OWS 1.1', function() { }); }); - -goog.require('ol.format.OWS'); diff --git a/test/spec/ol/format/polyline.test.js b/test/spec/ol/format/polyline.test.js index c0802a4bc1..18c22d4231 100644 --- a/test/spec/ol/format/polyline.test.js +++ b/test/spec/ol/format/polyline.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.format.Polyline'); +goog.require('ol.Feature'); +goog.require('ol.format.Polyline'); +goog.require('ol.geom.LineString'); +goog.require('ol.proj'); + describe('ol.format.Polyline', function() { var format; @@ -396,8 +401,3 @@ describe('ol.format.Polyline', function() { }); }); - -goog.require('ol.Feature'); -goog.require('ol.format.Polyline'); -goog.require('ol.geom.LineString'); -goog.require('ol.proj'); diff --git a/test/spec/ol/format/topojson.test.js b/test/spec/ol/format/topojson.test.js index df876986b0..4874c7a894 100644 --- a/test/spec/ol/format/topojson.test.js +++ b/test/spec/ol/format/topojson.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.format.TopoJSON'); +goog.require('ol.Feature'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.Polygon'); +goog.require('ol.format.Feature'); +goog.require('ol.proj'); +goog.require('ol.format.TopoJSON'); + var aruba = { type: 'Topology', transform: { @@ -172,10 +179,3 @@ describe('ol.format.TopoJSON', function() { }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.Polygon'); -goog.require('ol.format.Feature'); -goog.require('ol.proj'); -goog.require('ol.format.TopoJSON'); diff --git a/test/spec/ol/format/wfs.test.js b/test/spec/ol/format/wfs.test.js index 7a0b34d272..be299f04e9 100644 --- a/test/spec/ol/format/wfs.test.js +++ b/test/spec/ol/format/wfs.test.js @@ -1,5 +1,15 @@ goog.provide('ol.test.format.WFS'); + +goog.require('ol.Feature'); +goog.require('ol.format.GML2'); +goog.require('ol.format.WFS'); goog.require('ol.format.ogc.filter'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.Polygon'); +goog.require('ol.proj'); +goog.require('ol.xml'); describe('ol.format.WFS', function() { @@ -964,14 +974,3 @@ describe('ol.format.WFS', function() { }); }); - - -goog.require('ol.xml'); -goog.require('ol.Feature'); -goog.require('ol.geom.MultiLineString'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.Polygon'); -goog.require('ol.format.GML2'); -goog.require('ol.format.WFS'); -goog.require('ol.proj'); diff --git a/test/spec/ol/format/wkt.test.js b/test/spec/ol/format/wkt.test.js index 4ad74d8945..0afa4d0065 100644 --- a/test/spec/ol/format/wkt.test.js +++ b/test/spec/ol/format/wkt.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.format.WKT'); +goog.require('ol.Feature'); +goog.require('ol.geom.Point'); +goog.require('ol.format.WKT'); +goog.require('ol.proj'); + + describe('ol.format.WKT', function() { var format = new ol.format.WKT(); @@ -427,8 +433,3 @@ describe('ol.format.WKT', function() { }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.Point'); -goog.require('ol.format.WKT'); -goog.require('ol.proj'); diff --git a/test/spec/ol/format/wmscapabilities.test.js b/test/spec/ol/format/wmscapabilities.test.js index 8505866392..13089d3c96 100644 --- a/test/spec/ol/format/wmscapabilities.test.js +++ b/test/spec/ol/format/wmscapabilities.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.format.WMSCapabilities'); +goog.require('ol.format.WMSCapabilities'); + describe('ol.format.WMSCapabilities', function() { describe('when parsing ogcsample.xml', function() { @@ -144,5 +146,3 @@ describe('ol.format.WMSCapabilities', function() { }); }); - -goog.require('ol.format.WMSCapabilities'); diff --git a/test/spec/ol/format/wmsgetfeatureinfo.test.js b/test/spec/ol/format/wmsgetfeatureinfo.test.js index 7f31d90f28..766fd03cf7 100644 --- a/test/spec/ol/format/wmsgetfeatureinfo.test.js +++ b/test/spec/ol/format/wmsgetfeatureinfo.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.format.WMSGetFeatureInfo'); +goog.require('ol.format.WMSGetFeatureInfo'); + + describe('ol.format.WMSGetFeatureInfo', function() { describe('#readFormat', function() { @@ -213,6 +216,3 @@ describe('ol.format.WMSGetFeatureInfo', function() { }); }); }); - - -goog.require('ol.format.WMSGetFeatureInfo'); diff --git a/test/spec/ol/format/wmtscapabilities.test.js b/test/spec/ol/format/wmtscapabilities.test.js index c46c1050af..e27120b135 100644 --- a/test/spec/ol/format/wmtscapabilities.test.js +++ b/test/spec/ol/format/wmtscapabilities.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.format.WMTSCapabilities'); +goog.require('ol.format.WMTSCapabilities'); + + describe('ol.format.WMTSCapabilities', function() { describe('when parsing ogcsample.xml', function() { @@ -113,5 +116,3 @@ describe('ol.format.WMTSCapabilities', function() { }); }); - -goog.require('ol.format.WMTSCapabilities'); diff --git a/test/spec/ol/format/xsd.test.js b/test/spec/ol/format/xsd.test.js index 492b03c941..7448c4add2 100644 --- a/test/spec/ol/format/xsd.test.js +++ b/test/spec/ol/format/xsd.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.XSD'); +goog.require('ol.format.XSD'); + + describe('ol.format.XSD', function() { describe('readDateTime', function() { @@ -12,5 +15,3 @@ describe('ol.format.XSD', function() { }); }); - -goog.require('ol.format.XSD'); diff --git a/test/spec/ol/geolocation.test.js b/test/spec/ol/geolocation.test.js index 51994d14f4..4f06e2730d 100644 --- a/test/spec/ol/geolocation.test.js +++ b/test/spec/ol/geolocation.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.Geolocation'); +goog.require('ol.Geolocation'); + + describe('ol.Geolocation', function() { describe('constructor', function() { @@ -12,5 +15,3 @@ describe('ol.Geolocation', function() { }); }); - -goog.require('ol.Geolocation'); diff --git a/test/spec/ol/geom/circle.test.js b/test/spec/ol/geom/circle.test.js index 5e1f848117..0118f7af64 100644 --- a/test/spec/ol/geom/circle.test.js +++ b/test/spec/ol/geom/circle.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.geom.Circle'); +goog.require('ol.geom.Circle'); + describe('ol.geom.Circle', function() { @@ -273,6 +275,3 @@ describe('ol.geom.Circle', function() { }); }); - - -goog.require('ol.geom.Circle'); diff --git a/test/spec/ol/geom/flat/area.test.js b/test/spec/ol/geom/flat/area.test.js index aab7c9958d..501d69961d 100644 --- a/test/spec/ol/geom/flat/area.test.js +++ b/test/spec/ol/geom/flat/area.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.geom.flat.area'); +goog.require('ol.geom.flat.area'); + describe('ol.geom.flat.area', function() { describe('ol.geom.flat.area.linearRing', function() { @@ -28,5 +30,3 @@ describe('ol.geom.flat.area', function() { }); }); - -goog.require('ol.geom.flat.area'); diff --git a/test/spec/ol/geom/flat/center.test.js b/test/spec/ol/geom/flat/center.test.js index 6c30db3900..75f81ba34a 100644 --- a/test/spec/ol/geom/flat/center.test.js +++ b/test/spec/ol/geom/flat/center.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.geom.flat.center'); +goog.require('ol.geom.flat.center'); +goog.require('ol.geom.MultiPolygon'); + + describe('ol.geom.flat.center', function() { describe('ol.geom.flat.center.linearRingss', function() { @@ -52,6 +56,3 @@ describe('ol.geom.flat.center', function() { }); }); - -goog.require('ol.geom.flat.center'); -goog.require('ol.geom.MultiPolygon'); diff --git a/test/spec/ol/geom/flat/closest.test.js b/test/spec/ol/geom/flat/closest.test.js index e583ed0c1f..c96939899e 100644 --- a/test/spec/ol/geom/flat/closest.test.js +++ b/test/spec/ol/geom/flat/closest.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.geom.flat.closest'); +goog.require('ol.geom.flat.closest'); + describe('ol.geom.flat.closest', function() { @@ -141,6 +143,3 @@ describe('ol.geom.flat.closest', function() { }); }); - - -goog.require('ol.geom.flat.closest'); diff --git a/test/spec/ol/geom/flat/deflate.test.js b/test/spec/ol/geom/flat/deflate.test.js index 75ff97e7dd..e9fdac7f3c 100644 --- a/test/spec/ol/geom/flat/deflate.test.js +++ b/test/spec/ol/geom/flat/deflate.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.flat.deflate'); +goog.require('ol.geom.flat.deflate'); + + describe('ol.geom.flat.deflate', function() { describe('ol.geom.flat.deflate.coordinates', function() { @@ -35,5 +38,3 @@ describe('ol.geom.flat.deflate', function() { }); }); - -goog.require('ol.geom.flat.deflate'); diff --git a/test/spec/ol/geom/flat/flip.test.js b/test/spec/ol/geom/flat/flip.test.js index ec5da63962..dc51456d67 100644 --- a/test/spec/ol/geom/flat/flip.test.js +++ b/test/spec/ol/geom/flat/flip.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.flat.flip'); +goog.require('ol.geom.flat.flip'); + + describe('ol.geom.flat.flip', function() { describe('ol.geom.flat.flip.flipXY', function() { @@ -34,5 +37,3 @@ describe('ol.geom.flat.flip', function() { }); }); - -goog.require('ol.geom.flat.flip'); diff --git a/test/spec/ol/geom/flat/inflate.test.js b/test/spec/ol/geom/flat/inflate.test.js index 478aecd034..8e07e92db2 100644 --- a/test/spec/ol/geom/flat/inflate.test.js +++ b/test/spec/ol/geom/flat/inflate.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.flat.inflate'); +goog.require('ol.geom.flat.inflate'); + + describe('ol.geom.flat.inflate', function() { describe('ol.geom.flat.inflate.coordinates', function() { @@ -22,5 +25,3 @@ describe('ol.geom.flat.inflate', function() { }); }); - -goog.require('ol.geom.flat.inflate'); diff --git a/test/spec/ol/geom/flat/interpolate.test.js b/test/spec/ol/geom/flat/interpolate.test.js index 6639b7d99d..45745e4ec9 100644 --- a/test/spec/ol/geom/flat/interpolate.test.js +++ b/test/spec/ol/geom/flat/interpolate.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.flat.interpolate'); +goog.require('ol.geom.flat.interpolate'); + + describe('ol.geom.flat.interpolate', function() { describe('ol.geom.flat.interpolate.lineString', function() { @@ -77,5 +80,3 @@ describe('ol.geom.flat.interpolate', function() { }); }); - -goog.require('ol.geom.flat.interpolate'); diff --git a/test/spec/ol/geom/flat/intersectsextent.test.js b/test/spec/ol/geom/flat/intersectsextent.test.js index a4f25e962e..916a8f68ca 100644 --- a/test/spec/ol/geom/flat/intersectsextent.test.js +++ b/test/spec/ol/geom/flat/intersectsextent.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.flat.intersectsextent'); +goog.require('ol.geom.flat.intersectsextent'); + + describe('ol.geom.flat.intersectsextent', function() { describe('ol.geom.flat.intersectsextent.lineString', function() { @@ -89,5 +92,3 @@ describe('ol.geom.flat.intersectsextent', function() { }); }); }); - -goog.require('ol.geom.flat.intersectsextent'); diff --git a/test/spec/ol/geom/flat/length.test.js b/test/spec/ol/geom/flat/length.test.js index fa1dfc7f3b..f1adbcc586 100644 --- a/test/spec/ol/geom/flat/length.test.js +++ b/test/spec/ol/geom/flat/length.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.flat.length'); +goog.require('ol.geom.flat.length'); + + describe('ol.geom.flat.length', function() { describe('ol.geom.flat.length.lineString', function() { @@ -90,5 +93,3 @@ describe('ol.geom.flat.length', function() { }); }); - -goog.require('ol.geom.flat.length'); diff --git a/test/spec/ol/geom/flat/orient.test.js b/test/spec/ol/geom/flat/orient.test.js index f113eee8f4..21e2dcf299 100644 --- a/test/spec/ol/geom/flat/orient.test.js +++ b/test/spec/ol/geom/flat/orient.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.flat.orient'); +goog.require('ol.geom.flat.orient'); + + describe('ol.geom.flat.orient', function() { describe('ol.geom.flat.orient.linearRingIsClockwise()', function() { @@ -158,5 +161,3 @@ describe('ol.geom.flat.orient', function() { }); - -goog.require('ol.geom.flat.orient'); diff --git a/test/spec/ol/geom/flat/reverse.test.js b/test/spec/ol/geom/flat/reverse.test.js index a2c8fa0038..16d9a21182 100644 --- a/test/spec/ol/geom/flat/reverse.test.js +++ b/test/spec/ol/geom/flat/reverse.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.flat.reverse'); +goog.require('ol.geom.flat.reverse'); + + describe('ol.geom.flat.reverse', function() { describe('ol.geom.flat.reverse.coordinates', function() { @@ -126,5 +129,3 @@ describe('ol.geom.flat.reverse', function() { }); }); - -goog.require('ol.geom.flat.reverse'); diff --git a/test/spec/ol/geom/flat/segments.test.js b/test/spec/ol/geom/flat/segments.test.js index 18a70f56e7..98bcfe37ff 100644 --- a/test/spec/ol/geom/flat/segments.test.js +++ b/test/spec/ol/geom/flat/segments.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.flat.segments'); +goog.require('ol.geom.flat.segments'); + + describe('ol.geom.flat.segments', function() { describe('ol.geom.flat.segments.forEach', function() { @@ -53,5 +56,3 @@ describe('ol.geom.flat.segments', function() { }); }); }); - -goog.require('ol.geom.flat.segments'); diff --git a/test/spec/ol/geom/flat/simplify.test.js b/test/spec/ol/geom/flat/simplify.test.js index abc4a12b7d..c04e4aa8a2 100644 --- a/test/spec/ol/geom/flat/simplify.test.js +++ b/test/spec/ol/geom/flat/simplify.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.geom.simplify'); +goog.require('ol.geom.flat.simplify'); + describe('ol.geom.flat.simplify', function() { @@ -353,6 +355,3 @@ describe('ol.geom.flat.simplify', function() { }); }); - - -goog.require('ol.geom.flat.simplify'); diff --git a/test/spec/ol/geom/flat/transform.test.js b/test/spec/ol/geom/flat/transform.test.js index c268af60e5..b6397d32d3 100644 --- a/test/spec/ol/geom/flat/transform.test.js +++ b/test/spec/ol/geom/flat/transform.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.geom.flat.transform'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.flat.transform'); + + describe('ol.geom.flat.transform', function() { describe('ol.geom.flat.transform.transform2D', function() { @@ -127,6 +131,3 @@ describe('ol.geom.flat.transform', function() { }); }); - -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.flat.transform'); diff --git a/test/spec/ol/geom/geometrycollection.test.js b/test/spec/ol/geom/geometrycollection.test.js index 6fc5816d1e..ed491049b3 100644 --- a/test/spec/ol/geom/geometrycollection.test.js +++ b/test/spec/ol/geom/geometrycollection.test.js @@ -1,6 +1,10 @@ goog.provide('ol.test.geom.GeometryCollection'); -goog.require('ol.extent'); +goog.require('ol.geom.Geometry'); +goog.require('ol.geom.GeometryCollection'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); describe('ol.geom.GeometryCollection', function() { @@ -237,10 +241,3 @@ describe('ol.geom.GeometryCollection', function() { }); }); - - -goog.require('ol.geom.Geometry'); -goog.require('ol.geom.GeometryCollection'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); diff --git a/test/spec/ol/geom/linestring.test.js b/test/spec/ol/geom/linestring.test.js index c3e133bfd4..b235e070e9 100644 --- a/test/spec/ol/geom/linestring.test.js +++ b/test/spec/ol/geom/linestring.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.LineString'); +goog.require('ol.extent'); +goog.require('ol.geom.LineString'); + describe('ol.geom.LineString', function() { @@ -443,7 +446,3 @@ describe('ol.geom.LineString', function() { }); }); - - -goog.require('ol.extent'); -goog.require('ol.geom.LineString'); diff --git a/test/spec/ol/geom/multilinestring.test.js b/test/spec/ol/geom/multilinestring.test.js index a32dc7a96a..ec11d8d1c4 100644 --- a/test/spec/ol/geom/multilinestring.test.js +++ b/test/spec/ol/geom/multilinestring.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.geom.MultiLineString'); +goog.require('ol.extent'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.MultiLineString'); + describe('ol.geom.MultiLineString', function() { @@ -355,8 +359,3 @@ describe('ol.geom.MultiLineString', function() { }); }); - - -goog.require('ol.extent'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.MultiLineString'); diff --git a/test/spec/ol/geom/multipoint.test.js b/test/spec/ol/geom/multipoint.test.js index 44ae2e36bb..5dac2191d9 100644 --- a/test/spec/ol/geom/multipoint.test.js +++ b/test/spec/ol/geom/multipoint.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.geom.MultiPoint'); +goog.require('ol.extent'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.Point'); + describe('ol.geom.MultiPoint', function() { @@ -286,8 +290,3 @@ describe('ol.geom.MultiPoint', function() { }); }); - - -goog.require('ol.extent'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.Point'); diff --git a/test/spec/ol/geom/multipolygon.test.js b/test/spec/ol/geom/multipolygon.test.js index 2189cb4326..019ec9289a 100644 --- a/test/spec/ol/geom/multipolygon.test.js +++ b/test/spec/ol/geom/multipolygon.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.geom.MultiPolygon'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.Polygon'); + describe('ol.geom.MultiPolygon', function() { @@ -193,7 +196,3 @@ describe('ol.geom.MultiPolygon', function() { }); }); - - -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.Polygon'); diff --git a/test/spec/ol/geom/point.test.js b/test/spec/ol/geom/point.test.js index 18843125fe..b2863b6672 100644 --- a/test/spec/ol/geom/point.test.js +++ b/test/spec/ol/geom/point.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.geom.Point'); +goog.require('ol.geom.Point'); + describe('ol.geom.Point', function() { @@ -216,7 +218,3 @@ describe('ol.geom.Point', function() { }); }); - - -goog.require('ol.extent'); -goog.require('ol.geom.Point'); diff --git a/test/spec/ol/geom/polygon.test.js b/test/spec/ol/geom/polygon.test.js index 4756814038..06bb1785ef 100644 --- a/test/spec/ol/geom/polygon.test.js +++ b/test/spec/ol/geom/polygon.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.geom.Polygon'); +goog.require('ol.extent'); +goog.require('ol.geom.Circle'); +goog.require('ol.geom.LinearRing'); +goog.require('ol.geom.Polygon'); + describe('ol.geom.Polygon', function() { @@ -583,9 +588,3 @@ describe('ol.geom.Polygon', function() { }); }); - - -goog.require('ol.extent'); -goog.require('ol.geom.Circle'); -goog.require('ol.geom.LinearRing'); -goog.require('ol.geom.Polygon'); diff --git a/test/spec/ol/graticule.test.js b/test/spec/ol/graticule.test.js index 6f9b698fbe..3611c3c899 100644 --- a/test/spec/ol/graticule.test.js +++ b/test/spec/ol/graticule.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.Graticule'); +goog.require('ol.Graticule'); +goog.require('ol.Map'); +goog.require('ol.proj'); +goog.require('ol.style.Stroke'); + + describe('ol.Graticule', function() { var graticule; @@ -46,8 +52,3 @@ describe('ol.Graticule', function() { }); }); - -goog.require('ol.Graticule'); -goog.require('ol.Map'); -goog.require('ol.proj'); -goog.require('ol.style.Stroke'); diff --git a/test/spec/ol/imagetile.test.js b/test/spec/ol/imagetile.test.js index 46a44c251f..3ab8c35f64 100644 --- a/test/spec/ol/imagetile.test.js +++ b/test/spec/ol/imagetile.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.ImageTile'); +goog.require('ol.events'); +goog.require('ol.events.EventType'); +goog.require('ol.source.Image'); +goog.require('ol.ImageTile'); +goog.require('ol.TileState'); + + describe('ol.ImageTile', function() { describe('#load()', function() { @@ -57,9 +64,3 @@ describe('ol.ImageTile', function() { }); }); - -goog.require('ol.events'); -goog.require('ol.events.EventType'); -goog.require('ol.source.Image'); -goog.require('ol.ImageTile'); -goog.require('ol.TileState'); diff --git a/test/spec/ol/interaction/draganddrop.test.js b/test/spec/ol/interaction/draganddrop.test.js index 4e741336c2..330e2b9202 100644 --- a/test/spec/ol/interaction/draganddrop.test.js +++ b/test/spec/ol/interaction/draganddrop.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.interaction.DragAndDrop'); +goog.require('ol.interaction.DragAndDrop'); +goog.require('ol.View'); +goog.require('ol.events.Event'); +goog.require('ol.events.EventTarget'); +goog.require('ol.format.GeoJSON'); + + describe('ol.interaction.DragAndDrop', function() { var viewport, map, interaction; @@ -108,9 +115,3 @@ describe('ol.interaction.DragAndDrop', function() { }); }); - -goog.require('ol.interaction.DragAndDrop'); -goog.require('ol.View'); -goog.require('ol.events.Event'); -goog.require('ol.events.EventTarget'); -goog.require('ol.format.GeoJSON'); diff --git a/test/spec/ol/interaction/dragrotateandzoom.test.js b/test/spec/ol/interaction/dragrotateandzoom.test.js index a426dd366d..a84fb7712b 100644 --- a/test/spec/ol/interaction/dragrotateandzoom.test.js +++ b/test/spec/ol/interaction/dragrotateandzoom.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.interaction.DragRotateAndZoom'); +goog.require('ol.interaction.DragRotateAndZoom'); + describe('ol.interaction.DragRotateAndZoom', function() { describe('constructor', function() { @@ -12,5 +14,3 @@ describe('ol.interaction.DragRotateAndZoom', function() { }); }); - -goog.require('ol.interaction.DragRotateAndZoom'); diff --git a/test/spec/ol/interaction/dragzoom.test.js b/test/spec/ol/interaction/dragzoom.test.js index 7b9ea5f8d2..634ea66950 100644 --- a/test/spec/ol/interaction/dragzoom.test.js +++ b/test/spec/ol/interaction/dragzoom.test.js @@ -1,5 +1,15 @@ goog.provide('ol.test.interaction.DragZoom'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.extent'); +goog.require('ol.geom.Polygon'); +goog.require('ol.interaction.DragZoom'); +goog.require('ol.layer.Vector'); +goog.require('ol.render.Box'); +goog.require('ol.source.Vector'); + + describe('ol.interaction.DragZoom', function() { var target, map, source; @@ -106,12 +116,3 @@ describe('ol.interaction.DragZoom', function() { }); - -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.extent'); -goog.require('ol.geom.Polygon'); -goog.require('ol.interaction.DragZoom'); -goog.require('ol.layer.Vector'); -goog.require('ol.render.Box'); -goog.require('ol.source.Vector'); diff --git a/test/spec/ol/interaction/draw.test.js b/test/spec/ol/interaction/draw.test.js index d99d271b5d..0c8908c4b8 100644 --- a/test/spec/ol/interaction/draw.test.js +++ b/test/spec/ol/interaction/draw.test.js @@ -1,5 +1,25 @@ goog.provide('ol.test.interaction.Draw'); +goog.require('ol.array'); +goog.require('ol.events'); +goog.require('ol.Feature'); +goog.require('ol.Map'); +goog.require('ol.MapBrowserPointerEvent'); +goog.require('ol.View'); +goog.require('ol.geom.Circle'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.interaction.Draw'); +goog.require('ol.interaction.Interaction'); +goog.require('ol.layer.Vector'); +goog.require('ol.pointer.PointerEvent'); +goog.require('ol.source.Vector'); + + describe('ol.interaction.Draw', function() { var target, map, source; @@ -859,22 +879,3 @@ describe('ol.interaction.Draw', function() { }); }); - -goog.require('ol.array'); -goog.require('ol.events'); -goog.require('ol.Feature'); -goog.require('ol.Map'); -goog.require('ol.MapBrowserPointerEvent'); -goog.require('ol.View'); -goog.require('ol.geom.Circle'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.MultiLineString'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.interaction.Draw'); -goog.require('ol.interaction.Interaction'); -goog.require('ol.layer.Vector'); -goog.require('ol.pointer.PointerEvent'); -goog.require('ol.source.Vector'); diff --git a/test/spec/ol/interaction/interaction.test.js b/test/spec/ol/interaction/interaction.test.js index 7687bb4708..7c38d9a29f 100644 --- a/test/spec/ol/interaction/interaction.test.js +++ b/test/spec/ol/interaction/interaction.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.interaction.Interaction'); +goog.require('ol.events.EventTarget'); +goog.require('ol.Map'); +goog.require('ol.interaction.Interaction'); + + describe('ol.interaction.Interaction', function() { describe('constructor', function() { @@ -54,7 +59,3 @@ describe('ol.interaction.Interaction', function() { }); }); - -goog.require('ol.events.EventTarget'); -goog.require('ol.Map'); -goog.require('ol.interaction.Interaction'); diff --git a/test/spec/ol/interaction/keyboardpan.test.js b/test/spec/ol/interaction/keyboardpan.test.js index d4e8a79b48..74aa16aa4f 100644 --- a/test/spec/ol/interaction/keyboardpan.test.js +++ b/test/spec/ol/interaction/keyboardpan.test.js @@ -1,7 +1,11 @@ /*global createMapDiv, disposeMap*/ goog.provide('ol.test.interaction.KeyboardPan'); - +goog.require('ol.Map'); +goog.require('ol.MapBrowserEvent'); +goog.require('ol.View'); +goog.require('ol.events.Event'); +goog.require('ol.interaction.Interaction'); describe('ol.interaction.KeyboardPan', function() { var map; @@ -45,11 +49,3 @@ describe('ol.interaction.KeyboardPan', function() { }); }); - - -goog.require('ol.Map'); -goog.require('ol.MapBrowserEvent'); -goog.require('ol.View'); -goog.require('ol.events.Event'); -goog.require('ol.interaction.Interaction'); -goog.require('ol.interaction.KeyboardPan'); diff --git a/test/spec/ol/interaction/keyboardzoom.test.js b/test/spec/ol/interaction/keyboardzoom.test.js index 407f76a700..6acff82601 100644 --- a/test/spec/ol/interaction/keyboardzoom.test.js +++ b/test/spec/ol/interaction/keyboardzoom.test.js @@ -1,7 +1,11 @@ /*global createMapDiv, disposeMap*/ goog.provide('ol.test.interaction.KeyboardZoom'); - +goog.require('ol.Map'); +goog.require('ol.MapBrowserEvent'); +goog.require('ol.View'); +goog.require('ol.events.Event'); +goog.require('ol.interaction.Interaction'); describe('ol.interaction.KeyboardZoom', function() { var map; @@ -39,11 +43,3 @@ describe('ol.interaction.KeyboardZoom', function() { }); }); - - -goog.require('ol.Map'); -goog.require('ol.MapBrowserEvent'); -goog.require('ol.View'); -goog.require('ol.events.Event'); -goog.require('ol.interaction.Interaction'); -goog.require('ol.interaction.KeyboardZoom'); diff --git a/test/spec/ol/interaction/modify.test.js b/test/spec/ol/interaction/modify.test.js index 4bb3ba4fa3..cf77f81077 100644 --- a/test/spec/ol/interaction/modify.test.js +++ b/test/spec/ol/interaction/modify.test.js @@ -1,5 +1,22 @@ goog.provide('ol.test.interaction.Modify'); +goog.require('ol.events'); +goog.require('ol.Collection'); +goog.require('ol.Feature'); +goog.require('ol.Map'); +goog.require('ol.MapBrowserPointerEvent'); +goog.require('ol.View'); +goog.require('ol.events.condition'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.interaction.Modify'); +goog.require('ol.interaction.ModifyEvent'); +goog.require('ol.layer.Vector'); +goog.require('ol.pointer.PointerEvent'); +goog.require('ol.source.Vector'); + + describe('ol.interaction.Modify', function() { var target, map, source, features; @@ -503,19 +520,3 @@ describe('ol.interaction.Modify', function() { }); }); - -goog.require('ol.events'); -goog.require('ol.Collection'); -goog.require('ol.Feature'); -goog.require('ol.Map'); -goog.require('ol.MapBrowserPointerEvent'); -goog.require('ol.View'); -goog.require('ol.events.condition'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.interaction.Modify'); -goog.require('ol.interaction.ModifyEvent'); -goog.require('ol.layer.Vector'); -goog.require('ol.pointer.PointerEvent'); -goog.require('ol.source.Vector'); diff --git a/test/spec/ol/interaction/mousewheelzoom.test.js b/test/spec/ol/interaction/mousewheelzoom.test.js index 0010158c84..eeb8ee94b9 100644 --- a/test/spec/ol/interaction/mousewheelzoom.test.js +++ b/test/spec/ol/interaction/mousewheelzoom.test.js @@ -1,7 +1,11 @@ /*global createMapDiv, disposeMap*/ goog.provide('ol.test.interaction.MouseWheelZoom'); - +goog.require('ol.Map'); +goog.require('ol.MapBrowserEvent'); +goog.require('ol.View'); +goog.require('ol.events.Event'); +goog.require('ol.interaction.Interaction'); describe('ol.interaction.MouseWheelZoom', function() { var map; @@ -124,11 +128,3 @@ describe('ol.interaction.MouseWheelZoom', function() { }); }); - - -goog.require('ol.Map'); -goog.require('ol.MapBrowserEvent'); -goog.require('ol.View'); -goog.require('ol.events.Event'); -goog.require('ol.interaction.Interaction'); -goog.require('ol.interaction.MouseWheelZoom'); diff --git a/test/spec/ol/interaction/select.test.js b/test/spec/ol/interaction/select.test.js index 8540629f3f..f5ee9f040d 100644 --- a/test/spec/ol/interaction/select.test.js +++ b/test/spec/ol/interaction/select.test.js @@ -1,5 +1,18 @@ goog.provide('ol.test.interaction.Select'); +goog.require('ol.Collection'); +goog.require('ol.Feature'); +goog.require('ol.Map'); +goog.require('ol.MapBrowserPointerEvent'); +goog.require('ol.View'); +goog.require('ol.geom.Polygon'); +goog.require('ol.interaction.Select'); +goog.require('ol.interaction.Interaction'); +goog.require('ol.layer.Vector'); +goog.require('ol.pointer.PointerEvent'); +goog.require('ol.source.Vector'); + + describe('ol.interaction.Select', function() { var target, map, layer, source; @@ -431,15 +444,3 @@ describe('ol.interaction.Select', function() { }); }); }); - -goog.require('ol.Collection'); -goog.require('ol.Feature'); -goog.require('ol.Map'); -goog.require('ol.MapBrowserPointerEvent'); -goog.require('ol.View'); -goog.require('ol.geom.Polygon'); -goog.require('ol.interaction.Select'); -goog.require('ol.interaction.Interaction'); -goog.require('ol.layer.Vector'); -goog.require('ol.pointer.PointerEvent'); -goog.require('ol.source.Vector'); diff --git a/test/spec/ol/interaction/snap.test.js b/test/spec/ol/interaction/snap.test.js index 095418ab90..e97df75fa4 100644 --- a/test/spec/ol/interaction/snap.test.js +++ b/test/spec/ol/interaction/snap.test.js @@ -1,5 +1,14 @@ goog.provide('ol.test.interaction.Snap'); +goog.require('ol.Collection'); +goog.require('ol.Feature'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.LineString'); +goog.require('ol.interaction.Snap'); + + describe('ol.interaction.Snap', function() { describe('constructor', function() { @@ -123,11 +132,3 @@ describe('ol.interaction.Snap', function() { }); }); - -goog.require('ol.Collection'); -goog.require('ol.Feature'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.LineString'); -goog.require('ol.interaction.Snap'); diff --git a/test/spec/ol/interaction/translate.test.js b/test/spec/ol/interaction/translate.test.js index 1f83b06f3f..2d6e3971de 100644 --- a/test/spec/ol/interaction/translate.test.js +++ b/test/spec/ol/interaction/translate.test.js @@ -1,5 +1,18 @@ goog.provide('ol.test.interaction.Translate'); +goog.require('ol.Collection'); +goog.require('ol.Feature'); +goog.require('ol.Map'); +goog.require('ol.MapBrowserPointerEvent'); +goog.require('ol.View'); +goog.require('ol.geom.Point'); +goog.require('ol.interaction.Translate'); +goog.require('ol.interaction.Interaction'); +goog.require('ol.layer.Vector'); +goog.require('ol.pointer.PointerEvent'); +goog.require('ol.source.Vector'); + + describe('ol.interaction.Translate', function() { var target, map, source, features; @@ -107,15 +120,3 @@ describe('ol.interaction.Translate', function() { }); }); }); - -goog.require('ol.Collection'); -goog.require('ol.Feature'); -goog.require('ol.Map'); -goog.require('ol.MapBrowserPointerEvent'); -goog.require('ol.View'); -goog.require('ol.geom.Point'); -goog.require('ol.interaction.Translate'); -goog.require('ol.interaction.Interaction'); -goog.require('ol.layer.Vector'); -goog.require('ol.pointer.PointerEvent'); -goog.require('ol.source.Vector'); diff --git a/test/spec/ol/layer/group.test.js b/test/spec/ol/layer/group.test.js index f389779fc9..04ba125fb3 100644 --- a/test/spec/ol/layer/group.test.js +++ b/test/spec/ol/layer/group.test.js @@ -1,5 +1,15 @@ goog.provide('ol.test.layer.Group'); +goog.require('ol.array'); +goog.require('ol.Collection'); +goog.require('ol.extent'); +goog.require('ol.layer.Group'); +goog.require('ol.layer.Layer'); +goog.require('ol.obj'); +goog.require('ol.renderer.Map'); +goog.require('ol.source.Source'); + + describe('ol.layer.Group', function() { describe('constructor (defaults)', function() { @@ -488,13 +498,3 @@ describe('ol.layer.Group', function() { }); }); - -goog.require('ol.array'); -goog.require('ol.Collection'); -goog.require('ol.events'); -goog.require('ol.extent'); -goog.require('ol.layer.Group'); -goog.require('ol.layer.Layer'); -goog.require('ol.obj'); -goog.require('ol.renderer.Map'); -goog.require('ol.source.Source'); diff --git a/test/spec/ol/layer/heatmap.test.js b/test/spec/ol/layer/heatmap.test.js index 129b46026d..1ce8183672 100644 --- a/test/spec/ol/layer/heatmap.test.js +++ b/test/spec/ol/layer/heatmap.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.layer.Heatmap'); +goog.require('ol.layer.Heatmap'); + + describe('ol.layer.Heatmap', function() { describe('constructor', function() { @@ -12,5 +15,3 @@ describe('ol.layer.Heatmap', function() { }); }); - -goog.require('ol.layer.Heatmap'); diff --git a/test/spec/ol/layer/layer.test.js b/test/spec/ol/layer/layer.test.js index 5bb5539f5b..df9d419985 100644 --- a/test/spec/ol/layer/layer.test.js +++ b/test/spec/ol/layer/layer.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.layer.Layer'); +goog.require('ol.Map'); +goog.require('ol.layer.Layer'); +goog.require('ol.proj'); +goog.require('ol.render.Event'); +goog.require('ol.source.Source'); + + describe('ol.layer.Layer', function() { describe('constructor (defaults)', function() { @@ -431,9 +438,3 @@ describe('ol.layer.Layer', function() { }); }); - -goog.require('ol.Map'); -goog.require('ol.layer.Layer'); -goog.require('ol.proj'); -goog.require('ol.render.Event'); -goog.require('ol.source.Source'); diff --git a/test/spec/ol/layer/tile.test.js b/test/spec/ol/layer/tile.test.js index 98bf2f102d..df735a4d65 100644 --- a/test/spec/ol/layer/tile.test.js +++ b/test/spec/ol/layer/tile.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.layer.Tile'); +goog.require('ol.layer.Tile'); +goog.require('ol.source.OSM'); + + describe('ol.layer.Tile', function() { describe('constructor (defaults)', function() { @@ -31,6 +35,3 @@ describe('ol.layer.Tile', function() { }); }); - -goog.require('ol.layer.Tile'); -goog.require('ol.source.OSM'); diff --git a/test/spec/ol/layer/vector.test.js b/test/spec/ol/layer/vector.test.js index 6fd980a8e9..0474e7c0da 100644 --- a/test/spec/ol/layer/vector.test.js +++ b/test/spec/ol/layer/vector.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.layer.Vector'); +goog.require('ol.layer.Layer'); +goog.require('ol.layer.Vector'); +goog.require('ol.source.Vector'); +goog.require('ol.style.Style'); + + describe('ol.layer.Vector', function() { describe('constructor', function() { @@ -120,8 +126,3 @@ describe('ol.layer.Vector', function() { }); }); - -goog.require('ol.layer.Layer'); -goog.require('ol.layer.Vector'); -goog.require('ol.source.Vector'); -goog.require('ol.style.Style'); diff --git a/test/spec/ol/layer/vectortile.test.js b/test/spec/ol/layer/vectortile.test.js index 08ecc4c738..ebcfc04f11 100644 --- a/test/spec/ol/layer/vectortile.test.js +++ b/test/spec/ol/layer/vectortile.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.layer.VectorTile'); +goog.require('ol.layer.VectorTile'); +goog.require('ol.source.VectorTile'); + + describe('ol.layer.VectorTile', function() { describe('constructor (defaults)', function() { @@ -56,6 +60,3 @@ describe('ol.layer.VectorTile', function() { }); }); - -goog.require('ol.layer.VectorTile'); -goog.require('ol.source.VectorTile'); diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js index 7beac5be7d..a8647996d9 100644 --- a/test/spec/ol/map.test.js +++ b/test/spec/ol/map.test.js @@ -1,5 +1,17 @@ goog.provide('ol.test.Map'); +goog.require('ol.Map'); +goog.require('ol.MapEvent'); +goog.require('ol.Overlay'); +goog.require('ol.View'); +goog.require('ol.interaction'); +goog.require('ol.interaction.Interaction'); +goog.require('ol.interaction.DoubleClickZoom'); +goog.require('ol.interaction.MouseWheelZoom'); +goog.require('ol.layer.Tile'); +goog.require('ol.source.XYZ'); + + describe('ol.Map', function() { describe('constructor', function() { @@ -424,14 +436,3 @@ describe('ol.Map', function() { }); }); - -goog.require('ol.Map'); -goog.require('ol.MapEvent'); -goog.require('ol.Overlay'); -goog.require('ol.View'); -goog.require('ol.interaction'); -goog.require('ol.interaction.Interaction'); -goog.require('ol.interaction.DoubleClickZoom'); -goog.require('ol.interaction.MouseWheelZoom'); -goog.require('ol.layer.Tile'); -goog.require('ol.source.XYZ'); diff --git a/test/spec/ol/mapbrowserevent.test.js b/test/spec/ol/mapbrowserevent.test.js index c70362bf55..be7c1a5e8a 100644 --- a/test/spec/ol/mapbrowserevent.test.js +++ b/test/spec/ol/mapbrowserevent.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.MapBrowserEventHandler'); +goog.require('ol.events'); +goog.require('ol.Map'); +goog.require('ol.MapBrowserEventHandler'); +goog.require('ol.pointer.PointerEvent'); + + describe('ol.MapBrowserEventHandler', function() { describe('#emulateClick_', function() { var clock; @@ -110,8 +116,3 @@ describe('ol.MapBrowserEventHandler', function() { }); }); - -goog.require('ol.events'); -goog.require('ol.Map'); -goog.require('ol.MapBrowserEventHandler'); -goog.require('ol.pointer.PointerEvent'); diff --git a/test/spec/ol/math.test.js b/test/spec/ol/math.test.js index daba6d1619..c200152574 100644 --- a/test/spec/ol/math.test.js +++ b/test/spec/ol/math.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.math'); +goog.require('ol.math'); + describe('ol.math.clamp', function() { @@ -197,6 +199,3 @@ describe('ol.math.modulo', function() { }); }); }); - - -goog.require('ol.math'); diff --git a/test/spec/ol/net.test.js b/test/spec/ol/net.test.js index a37ea3bdb3..ede3630aa5 100644 --- a/test/spec/ol/net.test.js +++ b/test/spec/ol/net.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.net'); +goog.require('ol.net'); + describe('ol.net', function() { @@ -84,6 +86,3 @@ describe('ol.net', function() { }); }); - - -goog.require('ol.net'); diff --git a/test/spec/ol/object.test.js b/test/spec/ol/object.test.js index e27897f785..3a331f044c 100644 --- a/test/spec/ol/object.test.js +++ b/test/spec/ol/object.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.Object'); +goog.require('ol.Object'); +goog.require('ol.events'); + + describe('ol.Object', function() { var o; @@ -237,7 +241,3 @@ describe('ol.Object', function() { }); }); - - -goog.require('ol.Object'); -goog.require('ol.events'); diff --git a/test/spec/ol/objectutil.test.js b/test/spec/ol/objectutil.test.js index fc6f59ebf1..7b5204021b 100644 --- a/test/spec/ol/objectutil.test.js +++ b/test/spec/ol/objectutil.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.object'); +goog.require('ol.obj'); + + describe('ol.obj.assign()', function() { it('is an alias for Object.assign() where available', function() { @@ -62,5 +65,3 @@ describe('ol.obj.isEmpty()', function() { }); }); - -goog.require('ol.obj'); diff --git a/test/spec/ol/observable.test.js b/test/spec/ol/observable.test.js index 02925ebdb9..d960e943b0 100644 --- a/test/spec/ol/observable.test.js +++ b/test/spec/ol/observable.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.Observable'); +goog.require('ol.events.EventTarget'); +goog.require('ol.Observable'); + + describe('ol.Observable', function() { describe('constructor', function() { @@ -180,7 +184,3 @@ describe('ol.Observable', function() { }); }); - - -goog.require('ol.events.EventTarget'); -goog.require('ol.Observable'); diff --git a/test/spec/ol/ol.test.js b/test/spec/ol/ol.test.js index 56b8faa6c6..8ad3ba3dc6 100644 --- a/test/spec/ol/ol.test.js +++ b/test/spec/ol/ol.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test'); +goog.require('ol'); + + describe('ol', function() { describe('ol.assert', function() { @@ -33,5 +36,3 @@ describe('ol', function() { }); }); - -goog.require('ol'); diff --git a/test/spec/ol/overlay.test.js b/test/spec/ol/overlay.test.js index 156549d710..4323b7ce58 100644 --- a/test/spec/ol/overlay.test.js +++ b/test/spec/ol/overlay.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.Overlay'); +goog.require('ol.Map'); +goog.require('ol.Overlay'); +goog.require('ol.View'); + + describe('ol.Overlay', function() { var target, map; @@ -71,7 +76,3 @@ describe('ol.Overlay', function() { }); }); - -goog.require('ol.Map'); -goog.require('ol.Overlay'); -goog.require('ol.View'); diff --git a/test/spec/ol/pointer/mousesource.test.js b/test/spec/ol/pointer/mousesource.test.js index b45913f07e..10f64ed589 100644 --- a/test/spec/ol/pointer/mousesource.test.js +++ b/test/spec/ol/pointer/mousesource.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.pointer.MouseSource'); +goog.require('ol.events'); +goog.require('ol.events.EventTarget'); +goog.require('ol.has'); +goog.require('ol.pointer.PointerEventHandler'); +goog.require('ol.pointer.TouchSource'); + + describe('ol.pointer.MouseSource', function() { var handler; var target; @@ -88,11 +95,3 @@ describe('ol.pointer.MouseSource', function() { target.dispatchEvent(event); } }); - -goog.require('ol.events'); -goog.require('ol.events.EventTarget'); -goog.require('ol.has'); -goog.require('ol.pointer.MouseSource'); -goog.require('ol.pointer.PointerEvent'); -goog.require('ol.pointer.PointerEventHandler'); -goog.require('ol.pointer.TouchSource'); diff --git a/test/spec/ol/pointer/pointereventhandler.test.js b/test/spec/ol/pointer/pointereventhandler.test.js index 4d7012688f..80e7128a33 100644 --- a/test/spec/ol/pointer/pointereventhandler.test.js +++ b/test/spec/ol/pointer/pointereventhandler.test.js @@ -1,5 +1,13 @@ goog.provide('ol.test.pointer.PointerEventHandler'); +goog.require('ol.events'); +goog.require('ol.events.EventTarget'); +goog.require('ol.has'); +goog.require('ol.pointer.MouseSource'); +goog.require('ol.pointer.PointerEvent'); +goog.require('ol.pointer.PointerEventHandler'); + + describe('ol.pointer.PointerEventHandler', function() { var handler; var target; @@ -159,10 +167,3 @@ describe('ol.pointer.PointerEventHandler', function() { }); }); - -goog.require('ol.events'); -goog.require('ol.events.EventTarget'); -goog.require('ol.has'); -goog.require('ol.pointer.MouseSource'); -goog.require('ol.pointer.PointerEvent'); -goog.require('ol.pointer.PointerEventHandler'); diff --git a/test/spec/ol/pointer/touchsource.test.js b/test/spec/ol/pointer/touchsource.test.js index bd3014346d..968e5a5a9f 100644 --- a/test/spec/ol/pointer/touchsource.test.js +++ b/test/spec/ol/pointer/touchsource.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.pointer.TouchSource'); +goog.require('ol.events'); +goog.require('ol.events.Event'); +goog.require('ol.events.EventTarget'); +goog.require('ol.has'); +goog.require('ol.obj'); +goog.require('ol.pointer.PointerEventHandler'); describe('ol.pointer.TouchSource', function() { var handler; var target; @@ -126,12 +132,3 @@ describe('ol.pointer.TouchSource', function() { target.dispatchEvent(event); } }); - -goog.require('ol.events'); -goog.require('ol.events.Event'); -goog.require('ol.events.EventTarget'); -goog.require('ol.has'); -goog.require('ol.obj'); -goog.require('ol.pointer.PointerEvent'); -goog.require('ol.pointer.PointerEventHandler'); -goog.require('ol.pointer.TouchSource'); diff --git a/test/spec/ol/proj/epsg3857.test.js b/test/spec/ol/proj/epsg3857.test.js index 50255ddacb..9854d96c20 100644 --- a/test/spec/ol/proj/epsg3857.test.js +++ b/test/spec/ol/proj/epsg3857.test.js @@ -1,6 +1,7 @@ goog.provide('ol.test.proj.EPSG3857'); - +goog.require('ol.proj'); +goog.require('ol.proj.common'); describe('ol.proj.EPSG3857', function() { afterEach(function() { @@ -46,8 +47,3 @@ describe('ol.proj.EPSG3857', function() { }); }); - - -goog.require('ol.proj'); -goog.require('ol.proj.common'); -goog.require('ol.proj.EPSG3857'); diff --git a/test/spec/ol/proj/index.test.js b/test/spec/ol/proj/index.test.js index 6bae31d303..373825cd80 100644 --- a/test/spec/ol/proj/index.test.js +++ b/test/spec/ol/proj/index.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.proj'); +goog.require('ol.proj'); +goog.require('ol.proj.EPSG4326'); +goog.require('ol.proj.Projection'); +goog.require('ol.proj.common'); + + describe('ol.proj', function() { afterEach(function() { @@ -582,9 +588,3 @@ describe('ol.proj', function() { }); }); - - -goog.require('ol.proj'); -goog.require('ol.proj.EPSG4326'); -goog.require('ol.proj.Projection'); -goog.require('ol.proj.common'); diff --git a/test/spec/ol/render.test.js b/test/spec/ol/render.test.js index 890c8aa0f1..eb25af919b 100644 --- a/test/spec/ol/render.test.js +++ b/test/spec/ol/render.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.render'); +goog.require('ol.transform'); +goog.require('ol.render'); +goog.require('ol.render.canvas.Immediate'); describe('ol.render', function() { describe('toContext', function() { @@ -29,9 +32,3 @@ describe('ol.render', function() { }); }); - - -goog.require('ol.transform'); -goog.require('ol.render'); -goog.require('ol.render.canvas.Immediate'); -goog.require('ol.vec.Mat4'); diff --git a/test/spec/ol/render/box.test.js b/test/spec/ol/render/box.test.js index e5a27fccea..9d08a7ea93 100644 --- a/test/spec/ol/render/box.test.js +++ b/test/spec/ol/render/box.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.render.Box'); +goog.require('ol.Disposable'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.geom.Polygon'); +goog.require('ol.render.Box'); + + describe('ol.render.Box', function() { var box, map, target; @@ -67,9 +74,3 @@ describe('ol.render.Box', function() { }); }); - -goog.require('ol.Disposable'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.geom.Polygon'); -goog.require('ol.render.Box'); diff --git a/test/spec/ol/render/canvas/immediate.test.js b/test/spec/ol/render/canvas/immediate.test.js index c182fe5ed8..e4e326f0c2 100644 --- a/test/spec/ol/render/canvas/immediate.test.js +++ b/test/spec/ol/render/canvas/immediate.test.js @@ -1,5 +1,22 @@ goog.provide('ol.test.render.canvas.Immediate'); +goog.require('ol.geom.Circle'); +goog.require('ol.geom.GeometryCollection'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.render.VectorContext'); +goog.require('ol.render.canvas.Immediate'); +goog.require('ol.style.Circle'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Stroke'); +goog.require('ol.style.Style'); +goog.require('ol.style.Text'); + + describe('ol.render.canvas.Immediate', function() { function getMockContext() { @@ -274,19 +291,3 @@ describe('ol.render.canvas.Immediate', function() { }); }); }); - -goog.require('ol.geom.Circle'); -goog.require('ol.geom.GeometryCollection'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.MultiLineString'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.render.VectorContext'); -goog.require('ol.render.canvas.Immediate'); -goog.require('ol.style.Circle'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Stroke'); -goog.require('ol.style.Style'); -goog.require('ol.style.Text'); diff --git a/test/spec/ol/render/canvas/index.test.js b/test/spec/ol/render/canvas/index.test.js index f39f6a7e53..ff337352d1 100644 --- a/test/spec/ol/render/canvas/index.test.js +++ b/test/spec/ol/render/canvas/index.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.render.canvas'); +goog.require('ol.render.canvas'); + describe('ol.render.canvas', function() { @@ -19,7 +21,3 @@ describe('ol.render.canvas', function() { }); }); - - -goog.require('ol.render'); -goog.require('ol.render.canvas'); diff --git a/test/spec/ol/render/feature.test.js b/test/spec/ol/render/feature.test.js index 622cfaddc4..496989b24b 100644 --- a/test/spec/ol/render/feature.test.js +++ b/test/spec/ol/render/feature.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.render.Feature'); +goog.require('ol.render.Feature'); + + describe('ol.render.Feature', function() { var renderFeature; @@ -85,6 +88,3 @@ describe('ol.render.Feature', function() { }); }); - - -goog.require('ol.render.Feature'); diff --git a/test/spec/ol/render/webgl/replay.test.js b/test/spec/ol/render/webgl/replay.test.js index 77a5ccabb1..bf55e7ed20 100644 --- a/test/spec/ol/render/webgl/replay.test.js +++ b/test/spec/ol/render/webgl/replay.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.render.webgl.Replay'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.Point'); +goog.require('ol.render.webgl.ImageReplay'); +goog.require('ol.style.Image'); + + describe('ol.render.webgl.ImageReplay', function() { var replay; @@ -162,9 +168,3 @@ describe('ol.render.webgl.ImageReplay', function() { }); }); }); - -goog.require('ol.extent'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.Point'); -goog.require('ol.render.webgl.ImageReplay'); -goog.require('ol.style.Image'); diff --git a/test/spec/ol/renderer/canvas/layer.test.js b/test/spec/ol/renderer/canvas/layer.test.js index eb132a58cb..1eae42142e 100644 --- a/test/spec/ol/renderer/canvas/layer.test.js +++ b/test/spec/ol/renderer/canvas/layer.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.renderer.canvas.Layer'); +goog.require('ol.transform'); +goog.require('ol.layer.Image'); +goog.require('ol.renderer.Map'); +goog.require('ol.renderer.canvas.Layer'); + describe('ol.renderer.canvas.Layer', function() { @@ -59,10 +64,3 @@ describe('ol.renderer.canvas.Layer', function() { }); }); - - -goog.require('ol.render.canvas'); -goog.require('ol.transform'); -goog.require('ol.layer.Image'); -goog.require('ol.renderer.Map'); -goog.require('ol.renderer.canvas.Layer'); diff --git a/test/spec/ol/renderer/canvas/map.test.js b/test/spec/ol/renderer/canvas/map.test.js index 200892278b..b90f56b5d4 100644 --- a/test/spec/ol/renderer/canvas/map.test.js +++ b/test/spec/ol/renderer/canvas/map.test.js @@ -1,5 +1,16 @@ goog.provide('ol.test.renderer.canvas.Map'); +goog.require('ol.Feature'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.geom.Point'); +goog.require('ol.layer.Tile'); +goog.require('ol.layer.Vector'); +goog.require('ol.renderer.canvas.Layer'); +goog.require('ol.renderer.canvas.Map'); +goog.require('ol.source.Vector'); + + describe('ol.renderer.canvas.Map', function() { describe('constructor', function() { @@ -127,14 +138,3 @@ describe('ol.renderer.canvas.Map', function() { }); }); - - -goog.require('ol.Feature'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.geom.Point'); -goog.require('ol.layer.Tile'); -goog.require('ol.layer.Vector'); -goog.require('ol.renderer.canvas.Layer'); -goog.require('ol.renderer.canvas.Map'); -goog.require('ol.source.Vector'); diff --git a/test/spec/ol/renderer/canvas/replay.test.js b/test/spec/ol/renderer/canvas/replay.test.js index b36074bb42..bace66747d 100644 --- a/test/spec/ol/renderer/canvas/replay.test.js +++ b/test/spec/ol/renderer/canvas/replay.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.renderer.canvas.Replay'); +goog.require('ol.render.canvas.LineStringReplay'); +goog.require('ol.render.canvas.PolygonReplay'); +goog.require('ol.render.canvas.Replay'); +goog.require('ol.style.Stroke'); + + describe('ol.render.canvas.Replay', function() { describe('constructor', function() { @@ -121,8 +127,3 @@ describe('ol.render.canvas.PolygonReplay', function() { }); }); - -goog.require('ol.render.canvas.LineStringReplay'); -goog.require('ol.render.canvas.PolygonReplay'); -goog.require('ol.render.canvas.Replay'); -goog.require('ol.style.Stroke'); diff --git a/test/spec/ol/renderer/canvas/vectorlayer.test.js b/test/spec/ol/renderer/canvas/vectorlayer.test.js index 453931fc1c..34bf4f199c 100644 --- a/test/spec/ol/renderer/canvas/vectorlayer.test.js +++ b/test/spec/ol/renderer/canvas/vectorlayer.test.js @@ -1,5 +1,18 @@ goog.provide('ol.test.renderer.canvas.VectorLayer'); +goog.require('ol.Feature'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.extent'); +goog.require('ol.geom.Point'); +goog.require('ol.layer.Vector'); +goog.require('ol.proj'); +goog.require('ol.renderer.canvas.VectorLayer'); +goog.require('ol.source.Vector'); +goog.require('ol.style.Style'); +goog.require('ol.style.Text'); + + describe('ol.renderer.canvas.VectorLayer', function() { describe('constructor', function() { @@ -164,16 +177,3 @@ describe('ol.renderer.canvas.VectorLayer', function() { }); }); - - -goog.require('ol.Feature'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.extent'); -goog.require('ol.geom.Point'); -goog.require('ol.layer.Vector'); -goog.require('ol.proj'); -goog.require('ol.renderer.canvas.VectorLayer'); -goog.require('ol.source.Vector'); -goog.require('ol.style.Style'); -goog.require('ol.style.Text'); diff --git a/test/spec/ol/renderer/canvas/vectortilelayer.test.js b/test/spec/ol/renderer/canvas/vectortilelayer.test.js index 181fb6cdef..7c3de22187 100644 --- a/test/spec/ol/renderer/canvas/vectortilelayer.test.js +++ b/test/spec/ol/renderer/canvas/vectortilelayer.test.js @@ -1,5 +1,21 @@ goog.provide('ol.test.renderer.canvas.VectorTileLayer'); +goog.require('ol.Feature'); +goog.require('ol.Map'); +goog.require('ol.VectorTile'); +goog.require('ol.View'); +goog.require('ol.format.MVT'); +goog.require('ol.geom.Point'); +goog.require('ol.layer.VectorTile'); +goog.require('ol.proj'); +goog.require('ol.proj.Projection'); +goog.require('ol.renderer.canvas.VectorTileLayer'); +goog.require('ol.source.VectorTile'); +goog.require('ol.style.Style'); +goog.require('ol.style.Text'); +goog.require('ol.tilegrid'); + + describe('ol.renderer.canvas.VectorTileLayer', function() { describe('constructor', function() { @@ -180,18 +196,3 @@ describe('ol.renderer.canvas.VectorTileLayer', function() { }); }); - - -goog.require('ol.Feature'); -goog.require('ol.Map'); -goog.require('ol.VectorTile'); -goog.require('ol.View'); -goog.require('ol.format.MVT'); -goog.require('ol.geom.Point'); -goog.require('ol.layer.VectorTile'); -goog.require('ol.proj'); -goog.require('ol.proj.Projection'); -goog.require('ol.renderer.canvas.VectorTileLayer'); -goog.require('ol.source.VectorTile'); -goog.require('ol.style.Style'); -goog.require('ol.style.Text'); diff --git a/test/spec/ol/renderer/layer.test.js b/test/spec/ol/renderer/layer.test.js index a7a4b1e673..881fe4ac0a 100644 --- a/test/spec/ol/renderer/layer.test.js +++ b/test/spec/ol/renderer/layer.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.renderer.Layer'); +goog.require('ol.Image'); +goog.require('ol.layer.Layer'); +goog.require('ol.renderer.Layer'); + + describe('ol.renderer.Layer', function() { var renderer; var eventType = 'change'; @@ -78,7 +83,3 @@ describe('ol.renderer.Layer', function() { }); }); - -goog.require('ol.Image'); -goog.require('ol.layer.Layer'); -goog.require('ol.renderer.Layer'); diff --git a/test/spec/ol/renderer/map.test.js b/test/spec/ol/renderer/map.test.js index 02eee605c8..2b48d62b54 100644 --- a/test/spec/ol/renderer/map.test.js +++ b/test/spec/ol/renderer/map.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.renderer.Map'); +goog.require('ol.Disposable'); +goog.require('ol.Map'); +goog.require('ol.renderer.Map'); + + describe('ol.renderer.Map', function() { describe('constructor', function() { @@ -16,7 +21,3 @@ describe('ol.renderer.Map', function() { }); }); - -goog.require('ol.Disposable'); -goog.require('ol.Map'); -goog.require('ol.renderer.Map'); diff --git a/test/spec/ol/renderer/vector.test.js b/test/spec/ol/renderer/vector.test.js index 6f08af3b52..60f1244f66 100644 --- a/test/spec/ol/renderer/vector.test.js +++ b/test/spec/ol/renderer/vector.test.js @@ -1,5 +1,21 @@ goog.provide('ol.test.renderer.vector'); +goog.require('ol.events'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.render.canvas.ReplayGroup'); +goog.require('ol.renderer.vector'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Icon'); +goog.require('ol.style.Stroke'); +goog.require('ol.style.Style'); +goog.require('ol.Feature'); + + describe('ol.renderer.vector', function() { describe('#renderFeature', function() { var replayGroup; @@ -154,18 +170,3 @@ describe('ol.renderer.vector', function() { }); }); - -goog.require('ol.events'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.geom.MultiLineString'); -goog.require('ol.geom.MultiPoint'); -goog.require('ol.geom.MultiPolygon'); -goog.require('ol.render.canvas.ReplayGroup'); -goog.require('ol.renderer.vector'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Icon'); -goog.require('ol.style.Stroke'); -goog.require('ol.style.Style'); -goog.require('ol.Feature'); diff --git a/test/spec/ol/renderer/webgl/imagelayer.test.js b/test/spec/ol/renderer/webgl/imagelayer.test.js index b87b571838..b680cef075 100644 --- a/test/spec/ol/renderer/webgl/imagelayer.test.js +++ b/test/spec/ol/renderer/webgl/imagelayer.test.js @@ -1,5 +1,13 @@ goog.provide('ol.test.renderer.webgl.ImageLayer'); +goog.require('ol.transform'); +goog.require('ol.Map'); +goog.require('ol.proj.common'); +goog.require('ol.layer.Image'); +goog.require('ol.source.Image'); +goog.require('ol.renderer.webgl.ImageLayer'); + + describe('ol.renderer.webgl.ImageLayer', function() { describe('updateProjectionMatrix_', function() { var map; @@ -71,10 +79,3 @@ describe('ol.renderer.webgl.ImageLayer', function() { }); }); }); - -goog.require('ol.transform'); -goog.require('ol.Map'); -goog.require('ol.proj.common'); -goog.require('ol.layer.Image'); -goog.require('ol.source.Image'); -goog.require('ol.renderer.webgl.ImageLayer'); diff --git a/test/spec/ol/reproj/image.test.js b/test/spec/ol/reproj/image.test.js index b7ee4b8f58..85c567fb49 100644 --- a/test/spec/ol/reproj/image.test.js +++ b/test/spec/ol/reproj/image.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.reproj.Image'); +goog.require('ol.Image'); +goog.require('ol.events'); +goog.require('ol.proj'); +goog.require('ol.reproj.Image'); + + describe('ol.reproj.Image', function() { function createImage(pixelRatio) { return new ol.reproj.Image( @@ -52,9 +58,3 @@ describe('ol.reproj.Image', function() { image.load(); }); }); - - -goog.require('ol.Image'); -goog.require('ol.events'); -goog.require('ol.proj'); -goog.require('ol.reproj.Image'); diff --git a/test/spec/ol/reproj/reproj.test.js b/test/spec/ol/reproj/reproj.test.js index 74a26a408b..68e14be6b9 100644 --- a/test/spec/ol/reproj/reproj.test.js +++ b/test/spec/ol/reproj/reproj.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.reproj'); +goog.require('ol.reproj'); +goog.require('ol.proj'); + + describe('ol.reproj', function() { describe('#calculateSourceResolution', function() { @@ -40,7 +44,3 @@ describe('ol.reproj', function() { }); }); }); - - -goog.require('ol.reproj'); -goog.require('ol.proj'); diff --git a/test/spec/ol/reproj/tile.test.js b/test/spec/ol/reproj/tile.test.js index 10a022bef4..ffdde87d49 100644 --- a/test/spec/ol/reproj/tile.test.js +++ b/test/spec/ol/reproj/tile.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.reproj.Tile'); +goog.require('ol.ImageTile'); +goog.require('ol.events'); +goog.require('ol.proj'); +goog.require('ol.reproj.Tile'); +goog.require('ol.tilegrid'); + + describe('ol.reproj.Tile', function() { beforeEach(function() { proj4.defs('EPSG:27700', '+proj=tmerc +lat_0=49 +lon_0=-2 ' + @@ -92,9 +99,3 @@ describe('ol.reproj.Tile', function() { tile.load(); }); }); - - -goog.require('ol.ImageTile'); -goog.require('ol.events'); -goog.require('ol.proj'); -goog.require('ol.reproj.Tile'); diff --git a/test/spec/ol/reproj/triangulation.test.js b/test/spec/ol/reproj/triangulation.test.js index 3142498ff9..469d7fa533 100644 --- a/test/spec/ol/reproj/triangulation.test.js +++ b/test/spec/ol/reproj/triangulation.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.reproj.Triangulation'); +goog.require('ol.proj'); +goog.require('ol.reproj.Triangulation'); + + describe('ol.reproj.Triangulation', function() { beforeEach(function() { proj4.defs('EPSG:27700', '+proj=tmerc +lat_0=49 +lon_0=-2 ' + @@ -38,7 +42,3 @@ describe('ol.reproj.Triangulation', function() { }); }); }); - - -goog.require('ol.proj'); -goog.require('ol.reproj.Triangulation'); diff --git a/test/spec/ol/resolutionconstraint.test.js b/test/spec/ol/resolutionconstraint.test.js index b89df9bab5..5f0e5095d5 100644 --- a/test/spec/ol/resolutionconstraint.test.js +++ b/test/spec/ol/resolutionconstraint.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.ResolutionConstraint'); +goog.require('ol.ResolutionConstraint'); + + describe('ol.ResolutionConstraint', function() { describe('SnapToResolution', function() { @@ -238,5 +241,3 @@ describe('ol.ResolutionConstraint', function() { }); }); }); - -goog.require('ol.ResolutionConstraint'); diff --git a/test/spec/ol/rotationconstraint.test.js b/test/spec/ol/rotationconstraint.test.js index 509d26ae88..2e3a0f3cd4 100644 --- a/test/spec/ol/rotationconstraint.test.js +++ b/test/spec/ol/rotationconstraint.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.RotationConstraint'); +goog.require('ol.RotationConstraint'); + + describe('ol.RotationConstraint', function() { describe('SnapToZero', function() { @@ -32,5 +35,3 @@ describe('ol.RotationConstraint', function() { }); }); - -goog.require('ol.RotationConstraint'); diff --git a/test/spec/ol/size.test.js b/test/spec/ol/size.test.js index a09f071051..a6df2d9dde 100644 --- a/test/spec/ol/size.test.js +++ b/test/spec/ol/size.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.size'); +goog.require('ol.size'); + describe('ol.size', function() { @@ -75,5 +77,3 @@ describe('ol.size', function() { }); }); - -goog.require('ol.size'); diff --git a/test/spec/ol/source/bingmaps.test.js b/test/spec/ol/source/bingmaps.test.js index 326a814cbf..7726a76a23 100644 --- a/test/spec/ol/source/bingmaps.test.js +++ b/test/spec/ol/source/bingmaps.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.source.BingMaps'); +goog.require('ol.net'); +goog.require('ol.source.BingMaps'); +goog.require('ol.tilecoord'); +goog.require('ol.Observable'); + + describe('ol.source.BingMaps', function() { describe('#tileUrlFunction()', function() { @@ -70,9 +76,3 @@ describe('ol.source.BingMaps', function() { }); }); - - -goog.require('ol.net'); -goog.require('ol.source.BingMaps'); -goog.require('ol.tilecoord'); -goog.require('ol.Observable'); diff --git a/test/spec/ol/source/cluster.test.js b/test/spec/ol/source/cluster.test.js index 614d084004..f470290568 100644 --- a/test/spec/ol/source/cluster.test.js +++ b/test/spec/ol/source/cluster.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.source.ClusterSource'); +goog.require('ol.Feature'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.proj'); +goog.require('ol.source.Cluster'); +goog.require('ol.source.Source'); goog.require('ol.source.Vector'); describe('ol.source.Cluster', function() { @@ -57,11 +64,3 @@ describe('ol.source.Cluster', function() { }); }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.proj'); -goog.require('ol.source.Cluster'); -goog.require('ol.source.Source'); diff --git a/test/spec/ol/source/imagearcgisrest.test.js b/test/spec/ol/source/imagearcgisrest.test.js index 64ec8b3ebc..c2b89aa5f6 100644 --- a/test/spec/ol/source/imagearcgisrest.test.js +++ b/test/spec/ol/source/imagearcgisrest.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.source.ImageArcGISRest'); +goog.require('ol.source.ImageArcGISRest'); +goog.require('ol.proj'); + describe('ol.source.ImageArcGISRest', function() { @@ -180,6 +183,3 @@ describe('ol.source.ImageArcGISRest', function() { }); - -goog.require('ol.source.ImageArcGISRest'); -goog.require('ol.proj'); diff --git a/test/spec/ol/source/imagestatic.test.js b/test/spec/ol/source/imagestatic.test.js index 1d5cf2461f..ba0bfe99f5 100644 --- a/test/spec/ol/source/imagestatic.test.js +++ b/test/spec/ol/source/imagestatic.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.source.ImageStatic'); +goog.require('ol.source.ImageStatic'); +goog.require('ol.proj'); + + describe('ol.source.ImageStatic', function() { var extent, pixelRatio, projection, resolution; @@ -80,6 +84,3 @@ describe('ol.source.ImageStatic', function() { }); }); }); - -goog.require('ol.source.ImageStatic'); -goog.require('ol.proj'); diff --git a/test/spec/ol/source/imagewms.test.js b/test/spec/ol/source/imagewms.test.js index 960e32459d..84aaa30205 100644 --- a/test/spec/ol/source/imagewms.test.js +++ b/test/spec/ol/source/imagewms.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.source.ImageWMS'); +goog.require('ol.source.ImageWMS'); +goog.require('ol.proj'); + describe('ol.source.ImageWMS', function() { @@ -243,7 +246,3 @@ describe('ol.source.ImageWMS', function() { }); }); - - -goog.require('ol.source.ImageWMS'); -goog.require('ol.proj'); diff --git a/test/spec/ol/source/raster.test.js b/test/spec/ol/source/raster.test.js index 63828df528..bb4cb88ebf 100644 --- a/test/spec/ol/source/raster.test.js +++ b/test/spec/ol/source/raster.test.js @@ -1,5 +1,15 @@ goog.provide('ol.test.source.RasterSource'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.layer.Image'); +goog.require('ol.proj.Projection'); +goog.require('ol.source.ImageStatic'); +goog.require('ol.source.Raster'); +goog.require('ol.source.Source'); +goog.require('ol.source.Tile'); + + var red = 'data:image/gif;base64,R0lGODlhAQABAPAAAP8AAP///yH5BAAAAAAALAAAAAA' + 'BAAEAAAICRAEAOw=='; @@ -293,13 +303,3 @@ where('Uint8ClampedArray').describe('ol.source.Raster', function() { }); }); - -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.layer.Image'); -goog.require('ol.proj.Projection'); -goog.require('ol.source.Image'); -goog.require('ol.source.ImageStatic'); -goog.require('ol.source.Raster'); -goog.require('ol.source.Source'); -goog.require('ol.source.Tile'); diff --git a/test/spec/ol/source/source.test.js b/test/spec/ol/source/source.test.js index 1053ed203a..5badc773f2 100644 --- a/test/spec/ol/source/source.test.js +++ b/test/spec/ol/source/source.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.source.Source'); +goog.require('ol.Attribution'); +goog.require('ol.proj'); +goog.require('ol.source.Source'); + + describe('ol.source.Source', function() { describe('constructor', function() { @@ -161,7 +166,3 @@ describe('ol.source.Source', function() { }); }); - -goog.require('ol.Attribution'); -goog.require('ol.proj'); -goog.require('ol.source.Source'); diff --git a/test/spec/ol/source/stamen.test.js b/test/spec/ol/source/stamen.test.js index 189d16b139..7bfb6c1c3a 100644 --- a/test/spec/ol/source/stamen.test.js +++ b/test/spec/ol/source/stamen.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.source.Stamen'); +goog.require('ol.source.Stamen'); + + describe('ol.source.Stamen', function() { describe('constructor', function() { @@ -24,5 +27,3 @@ describe('ol.source.Stamen', function() { }); }); - -goog.require('ol.source.Stamen'); diff --git a/test/spec/ol/source/tile.test.js b/test/spec/ol/source/tile.test.js index 55abe426d8..1665302710 100644 --- a/test/spec/ol/source/tile.test.js +++ b/test/spec/ol/source/tile.test.js @@ -1,5 +1,14 @@ goog.provide('ol.test.source.TileSource'); +goog.require('ol.Tile'); +goog.require('ol.TileRange'); +goog.require('ol.proj'); +goog.require('ol.proj.Projection'); +goog.require('ol.source.Source'); +goog.require('ol.source.Tile'); +goog.require('ol.tilegrid.TileGrid'); + + describe('ol.source.Tile', function() { describe('constructor', function() { @@ -313,11 +322,3 @@ describe('ol.test.source.TileMock', function() { }); }); - -goog.require('ol.Tile'); -goog.require('ol.TileRange'); -goog.require('ol.proj'); -goog.require('ol.proj.Projection'); -goog.require('ol.source.Source'); -goog.require('ol.source.Tile'); -goog.require('ol.tilegrid.TileGrid'); diff --git a/test/spec/ol/source/tilearcgisrest.test.js b/test/spec/ol/source/tilearcgisrest.test.js index c709288af9..4aae593e76 100644 --- a/test/spec/ol/source/tilearcgisrest.test.js +++ b/test/spec/ol/source/tilearcgisrest.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.source.TileArcGISRest'); +goog.require('ol.ImageTile'); +goog.require('ol.source.TileArcGISRest'); +goog.require('ol.proj'); + describe('ol.source.TileArcGISRest', function() { @@ -260,7 +264,3 @@ describe('ol.source.TileArcGISRest', function() { }); }); - -goog.require('ol.ImageTile'); -goog.require('ol.source.TileArcGISRest'); -goog.require('ol.proj'); diff --git a/test/spec/ol/source/tileimage.test.js b/test/spec/ol/source/tileimage.test.js index a70d427b23..eda13462f1 100644 --- a/test/spec/ol/source/tileimage.test.js +++ b/test/spec/ol/source/tileimage.test.js @@ -1,5 +1,15 @@ goog.provide('ol.test.source.TileImageSource'); +goog.require('ol.ImageTile'); +goog.require('ol.TileUrlFunction'); +goog.require('ol.events'); +goog.require('ol.proj'); +goog.require('ol.proj.Projection'); +goog.require('ol.reproj.Tile'); +goog.require('ol.source.TileImage'); +goog.require('ol.tilegrid'); + + describe('ol.source.TileImage', function() { function createSource(opt_proj, opt_tileGrid) { var proj = opt_proj || 'EPSG:3857'; @@ -152,12 +162,3 @@ describe('ol.source.TileImage', function() { }); }); }); - -goog.require('ol.ImageTile'); -goog.require('ol.Tile'); -goog.require('ol.TileUrlFunction'); -goog.require('ol.events'); -goog.require('ol.proj'); -goog.require('ol.proj.Projection'); -goog.require('ol.reproj.Tile'); -goog.require('ol.source.TileImage'); diff --git a/test/spec/ol/source/tilejson.test.js b/test/spec/ol/source/tilejson.test.js index 7f6130e4d0..f66f17d4e7 100644 --- a/test/spec/ol/source/tilejson.test.js +++ b/test/spec/ol/source/tilejson.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.source.TileJSON'); +goog.require('ol.source.Source'); +goog.require('ol.source.TileJSON'); +goog.require('ol.Observable'); + describe('ol.source.TileJSON', function() { @@ -120,8 +124,3 @@ describe('ol.source.TileJSON', function() { }); }); - -goog.require('ol.events'); -goog.require('ol.source.Source'); -goog.require('ol.source.TileJSON'); -goog.require('ol.Observable'); diff --git a/test/spec/ol/source/tileutfgrid.test.js b/test/spec/ol/source/tileutfgrid.test.js index 5e913306d1..239da558ec 100644 --- a/test/spec/ol/source/tileutfgrid.test.js +++ b/test/spec/ol/source/tileutfgrid.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.source.TileUTFGrid'); +goog.require('ol.proj'); +goog.require('ol.source.Tile'); +goog.require('ol.source.TileUTFGrid'); +goog.require('ol.tilegrid.TileGrid'); + + describe('ol.source.TileUTFGrid', function() { var url = 'spec/ol/data/tileutfgrid.json'; @@ -284,10 +290,3 @@ describe('ol.source.TileUTFGrid', function() { }); }); - - -goog.require('ol.net'); -goog.require('ol.proj'); -goog.require('ol.source.Tile'); -goog.require('ol.source.TileUTFGrid'); -goog.require('ol.tilegrid.TileGrid'); diff --git a/test/spec/ol/source/tilewms.test.js b/test/spec/ol/source/tilewms.test.js index a879b09ec4..72f986e95a 100644 --- a/test/spec/ol/source/tilewms.test.js +++ b/test/spec/ol/source/tilewms.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.source.TileWMS'); +goog.require('ol.ImageTile'); +goog.require('ol.proj'); +goog.require('ol.source.TileWMS'); +goog.require('ol.tilegrid'); +goog.require('ol.tilegrid.TileGrid'); + describe('ol.source.TileWMS', function() { @@ -279,9 +285,3 @@ describe('ol.source.TileWMS', function() { }); }); }); - - -goog.require('ol.ImageTile'); -goog.require('ol.source.TileWMS'); -goog.require('ol.proj'); -goog.require('ol.tilegrid.TileGrid'); diff --git a/test/spec/ol/source/urltile.test.js b/test/spec/ol/source/urltile.test.js index d4de378da5..a94617c79f 100644 --- a/test/spec/ol/source/urltile.test.js +++ b/test/spec/ol/source/urltile.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.source.UrlTile'); +goog.require('ol.proj'); +goog.require('ol.source.UrlTile'); +goog.require('ol.tilegrid'); + describe('ol.source.UrlTile', function() { @@ -215,6 +219,3 @@ describe('ol.source.UrlTile', function() { }); }); - -goog.require('ol.proj'); -goog.require('ol.source.UrlTile'); diff --git a/test/spec/ol/source/vector.test.js b/test/spec/ol/source/vector.test.js index 46dfaebbc2..98bc4bce3e 100644 --- a/test/spec/ol/source/vector.test.js +++ b/test/spec/ol/source/vector.test.js @@ -1,5 +1,13 @@ goog.provide('ol.test.source.Vector'); +goog.require('ol.events'); +goog.require('ol.Collection'); +goog.require('ol.Feature'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.LineString'); +goog.require('ol.proj'); +goog.require('ol.source.Vector'); + describe('ol.source.Vector', function() { @@ -583,12 +591,3 @@ describe('ol.source.Vector', function() { }); }); - - -goog.require('ol.events'); -goog.require('ol.Collection'); -goog.require('ol.Feature'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.LineString'); -goog.require('ol.proj'); -goog.require('ol.source.Vector'); diff --git a/test/spec/ol/source/vectortile.test.js b/test/spec/ol/source/vectortile.test.js index 441c4f382d..b634c7a69c 100644 --- a/test/spec/ol/source/vectortile.test.js +++ b/test/spec/ol/source/vectortile.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.source.VectorTile'); +goog.require('ol.VectorTile'); +goog.require('ol.format.MVT'); +goog.require('ol.proj'); +goog.require('ol.source.VectorTile'); +goog.require('ol.tilegrid'); + describe('ol.source.VectorTile', function() { @@ -35,9 +41,3 @@ describe('ol.source.VectorTile', function() { }); }); - - -goog.require('ol.VectorTile'); -goog.require('ol.format.MVT'); -goog.require('ol.proj'); -goog.require('ol.source.VectorTile'); diff --git a/test/spec/ol/source/wmts.test.js b/test/spec/ol/source/wmts.test.js index e594fb992c..471e673ab3 100644 --- a/test/spec/ol/source/wmts.test.js +++ b/test/spec/ol/source/wmts.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.source.WMTS'); +goog.require('ol.format.WMTSCapabilities'); +goog.require('ol.proj'); +goog.require('ol.proj.Projection'); +goog.require('ol.tilegrid.WMTS'); +goog.require('ol.source.WMTS'); + + describe('ol.source.WMTS', function() { describe('when creating options from capabilities', function() { @@ -264,9 +271,3 @@ describe('ol.source.WMTS', function() { }); }); - -goog.require('ol.format.WMTSCapabilities'); -goog.require('ol.proj'); -goog.require('ol.proj.Projection'); -goog.require('ol.tilegrid.WMTS'); -goog.require('ol.source.WMTS'); diff --git a/test/spec/ol/source/xyz.test.js b/test/spec/ol/source/xyz.test.js index 232ff43131..47cd1c1643 100644 --- a/test/spec/ol/source/xyz.test.js +++ b/test/spec/ol/source/xyz.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.source.XYZ'); +goog.require('ol.source.Tile'); +goog.require('ol.source.TileImage'); +goog.require('ol.source.UrlTile'); +goog.require('ol.source.XYZ'); +goog.require('ol.tilegrid'); + describe('ol.source.XYZ', function() { @@ -186,8 +192,3 @@ describe('ol.source.XYZ', function() { }); }); - -goog.require('ol.source.Tile'); -goog.require('ol.source.TileImage'); -goog.require('ol.source.UrlTile'); -goog.require('ol.source.XYZ'); diff --git a/test/spec/ol/source/zoomify.test.js b/test/spec/ol/source/zoomify.test.js index 9d1fdbd69f..0eabc60b2c 100644 --- a/test/spec/ol/source/zoomify.test.js +++ b/test/spec/ol/source/zoomify.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.source.Zoomify'); +goog.require('ol.dom'); +goog.require('ol.events'); +goog.require('ol.proj.Projection'); +goog.require('ol.source.Zoomify'); +goog.require('ol.tilegrid.TileGrid'); + describe('ol.source.Zoomify', function() { var w = 1024; @@ -256,10 +262,3 @@ describe('ol.source.Zoomify', function() { }); }); - - -goog.require('ol.dom'); -goog.require('ol.events'); -goog.require('ol.proj.Projection'); -goog.require('ol.source.Zoomify'); -goog.require('ol.tilegrid.TileGrid'); diff --git a/test/spec/ol/sphere/index.test.js b/test/spec/ol/sphere/index.test.js index af1b0b0a91..ada238dd3e 100644 --- a/test/spec/ol/sphere/index.test.js +++ b/test/spec/ol/sphere/index.test.js @@ -3,6 +3,10 @@ goog.provide('ol.test.Sphere'); +goog.require('ol.Sphere'); +goog.require('ol.sphere.WGS84'); +goog.require('ol.format.WKT'); + describe('ol.Sphere', function() { @@ -103,8 +107,3 @@ describe('ol.Sphere', function() { }); }); - - -goog.require('ol.Sphere'); -goog.require('ol.sphere.WGS84'); -goog.require('ol.format.WKT'); diff --git a/test/spec/ol/string.test.js b/test/spec/ol/string.test.js index 87f6441b05..a32588bfeb 100644 --- a/test/spec/ol/string.test.js +++ b/test/spec/ol/string.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.string'); +goog.require('ol.string'); + + describe('ol.string', function() { describe('ol.string.padNumber', function() { @@ -69,6 +72,3 @@ describe('ol.string', function() { }); }); }); - - -goog.require('ol.string'); diff --git a/test/spec/ol/structs/lrucache.test.js b/test/spec/ol/structs/lrucache.test.js index 36f6cc3dca..3992448c5f 100644 --- a/test/spec/ol/structs/lrucache.test.js +++ b/test/spec/ol/structs/lrucache.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.LRUCache'); +goog.require('ol.structs.LRUCache'); + describe('ol.structs.LRUCache', function() { @@ -197,5 +199,3 @@ describe('ol.structs.LRUCache', function() { }); }); - -goog.require('ol.structs.LRUCache'); diff --git a/test/spec/ol/structs/priorityqueue.test.js b/test/spec/ol/structs/priorityqueue.test.js index a1e12ecdcd..1b3b5b4062 100644 --- a/test/spec/ol/structs/priorityqueue.test.js +++ b/test/spec/ol/structs/priorityqueue.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.structs.PriorityQueue'); +goog.require('ol.structs.PriorityQueue'); + describe('ol.structs.PriorityQueue', function() { @@ -205,6 +207,3 @@ describe('ol.structs.PriorityQueue', function() { }); }); - - -goog.require('ol.structs.PriorityQueue'); diff --git a/test/spec/ol/structs/rbush.test.js b/test/spec/ol/structs/rbush.test.js index d3d6c029f8..745b755c2d 100644 --- a/test/spec/ol/structs/rbush.test.js +++ b/test/spec/ol/structs/rbush.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.structs.RBush'); +goog.require('ol.structs.RBush'); + describe('ol.structs.RBush', function() { @@ -373,5 +375,3 @@ describe('ol.structs.RBush', function() { }); }); - -goog.require('ol.structs.RBush'); diff --git a/test/spec/ol/style.test.js b/test/spec/ol/style.test.js index e0a5f0c382..094c1ac8ad 100644 --- a/test/spec/ol/style.test.js +++ b/test/spec/ol/style.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.style.Style'); +goog.require('ol.Feature'); +goog.require('ol.geom.Point'); +goog.require('ol.style.Style'); + + describe('ol.style.Style', function() { describe('#setZIndex', function() { @@ -90,7 +95,3 @@ describe('ol.style.createStyleFunction()', function() { }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.Point'); -goog.require('ol.style.Style'); diff --git a/test/spec/ol/style/atlasmanager.test.js b/test/spec/ol/style/atlasmanager.test.js index 66f1ca11bd..2404326726 100644 --- a/test/spec/ol/style/atlasmanager.test.js +++ b/test/spec/ol/style/atlasmanager.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.style.AtlasManager'); +goog.require('ol.style.Atlas'); +goog.require('ol.style.AtlasManager'); + describe('ol.style.Atlas', function() { @@ -281,6 +284,3 @@ describe('ol.style.AtlasManager', function() { }); }); }); - -goog.require('ol.style.Atlas'); -goog.require('ol.style.AtlasManager'); diff --git a/test/spec/ol/style/circle.test.js b/test/spec/ol/style/circle.test.js index 20b42b142d..63c48ee653 100644 --- a/test/spec/ol/style/circle.test.js +++ b/test/spec/ol/style/circle.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.style.Circle'); +goog.require('ol.style.AtlasManager'); +goog.require('ol.style.Circle'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Stroke'); + describe('ol.style.Circle', function() { @@ -229,8 +234,3 @@ describe('ol.style.Circle', function() { }); }); - -goog.require('ol.style.AtlasManager'); -goog.require('ol.style.Circle'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Stroke'); diff --git a/test/spec/ol/style/icon.test.js b/test/spec/ol/style/icon.test.js index b13c24e79d..c3a967975f 100644 --- a/test/spec/ol/style/icon.test.js +++ b/test/spec/ol/style/icon.test.js @@ -1,6 +1,8 @@ goog.provide('ol.test.style.Icon'); goog.provide('ol.test.style.IconImageCache'); +goog.require('ol.events'); +goog.require('ol.style.IconImageCache'); goog.require('ol.style.Icon'); @@ -229,6 +231,3 @@ describe('ol.style.IconImageCache', function() { }); }); }); - -goog.require('ol.events'); -goog.require('ol.style.IconImageCache'); diff --git a/test/spec/ol/style/regularshape.test.js b/test/spec/ol/style/regularshape.test.js index 5c1a9a0029..2f53c24201 100644 --- a/test/spec/ol/style/regularshape.test.js +++ b/test/spec/ol/style/regularshape.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.style.RegularShape'); +goog.require('ol.style.AtlasManager'); +goog.require('ol.style.RegularShape'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Stroke'); + + describe('ol.style.RegularShape', function() { describe('#constructor', function() { @@ -294,8 +300,3 @@ describe('ol.style.RegularShape', function() { }); }); - -goog.require('ol.style.AtlasManager'); -goog.require('ol.style.RegularShape'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Stroke'); diff --git a/test/spec/ol/style/text.test.js b/test/spec/ol/style/text.test.js index 7e2b2f2b28..fb281cb92f 100644 --- a/test/spec/ol/style/text.test.js +++ b/test/spec/ol/style/text.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.style.Text'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Text'); + describe('ol.style.Text', function() { @@ -26,6 +29,3 @@ describe('ol.style.Text', function() { }); }); - -goog.require('ol.style.Fill'); -goog.require('ol.style.Text'); diff --git a/test/spec/ol/tilecoord.test.js b/test/spec/ol/tilecoord.test.js index 747ce63546..c940dd5bfa 100644 --- a/test/spec/ol/tilecoord.test.js +++ b/test/spec/ol/tilecoord.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.TileCoord'); +goog.require('ol.tilecoord'); +goog.require('ol.tilegrid.TileGrid'); + + describe('ol.TileCoord', function() { describe('create', function() { @@ -112,6 +116,3 @@ describe('ol.TileCoord', function() { }); }); - -goog.require('ol.tilecoord'); -goog.require('ol.tilegrid.TileGrid'); diff --git a/test/spec/ol/tilegrid/tilegrid.test.js b/test/spec/ol/tilegrid/tilegrid.test.js index 979069e059..d0b811ef9e 100644 --- a/test/spec/ol/tilegrid/tilegrid.test.js +++ b/test/spec/ol/tilegrid/tilegrid.test.js @@ -1,5 +1,15 @@ goog.provide('ol.test.TileGrid'); +goog.require('ol.TileRange'); +goog.require('ol.extent'); +goog.require('ol.proj'); +goog.require('ol.proj.EPSG3857'); +goog.require('ol.proj.METERS_PER_UNIT'); +goog.require('ol.proj.Projection'); +goog.require('ol.tilegrid'); +goog.require('ol.tilegrid.TileGrid'); + + describe('ol.tilegrid.TileGrid', function() { var extent; var resolutions; @@ -1092,11 +1102,3 @@ describe('ol.tilegrid.TileGrid', function() { }); }); }); - -goog.require('ol.extent'); -goog.require('ol.proj'); -goog.require('ol.proj.METERS_PER_UNIT'); -goog.require('ol.proj.EPSG3857'); -goog.require('ol.proj.Projection'); -goog.require('ol.TileRange'); -goog.require('ol.tilegrid.TileGrid'); diff --git a/test/spec/ol/tilegrid/wmts.test.js b/test/spec/ol/tilegrid/wmts.test.js index b8f9bef760..0e22e0b39c 100644 --- a/test/spec/ol/tilegrid/wmts.test.js +++ b/test/spec/ol/tilegrid/wmts.test.js @@ -1,5 +1,9 @@ goog.provide('ol.test.tilegrid.WMTS'); +goog.require('ol.format.WMTSCapabilities'); +goog.require('ol.tilegrid.WMTS'); + + describe('ol.tilegrid.WMTS', function() { describe('when creating tileGrid from capabilities', function() { @@ -53,6 +57,3 @@ describe('ol.tilegrid.WMTS', function() { }); }); }); - -goog.require('ol.format.WMTSCapabilities'); -goog.require('ol.tilegrid.WMTS'); diff --git a/test/spec/ol/tilequeue.test.js b/test/spec/ol/tilequeue.test.js index eda925675c..6e83242786 100644 --- a/test/spec/ol/tilequeue.test.js +++ b/test/spec/ol/tilequeue.test.js @@ -1,5 +1,12 @@ goog.provide('ol.test.TileQueue'); +goog.require('ol.ImageTile'); +goog.require('ol.Tile'); +goog.require('ol.TileQueue'); +goog.require('ol.source.Image'); +goog.require('ol.structs.PriorityQueue'); + + describe('ol.TileQueue', function() { function addRandomPriorityTiles(tq, num) { @@ -158,9 +165,3 @@ describe('ol.TileQueue', function() { }); }); - -goog.require('ol.ImageTile'); -goog.require('ol.Tile'); -goog.require('ol.TileQueue'); -goog.require('ol.source.Image'); -goog.require('ol.structs.PriorityQueue'); diff --git a/test/spec/ol/tilerange.test.js b/test/spec/ol/tilerange.test.js index 2c351feca4..2a12e9a60f 100644 --- a/test/spec/ol/tilerange.test.js +++ b/test/spec/ol/tilerange.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.TileRange'); +goog.require('ol.TileRange'); + + describe('ol.TileRange', function() { describe('constructor', function() { @@ -128,5 +131,3 @@ describe('ol.TileRange', function() { }); }); - -goog.require('ol.TileRange'); diff --git a/test/spec/ol/tileurlfunction.test.js b/test/spec/ol/tileurlfunction.test.js index 7a4fda2831..d4f1019ff1 100644 --- a/test/spec/ol/tileurlfunction.test.js +++ b/test/spec/ol/tileurlfunction.test.js @@ -1,5 +1,10 @@ goog.provide('ol.test.TileUrlFunction'); +goog.require('ol.TileUrlFunction'); +goog.require('ol.tilegrid'); +goog.require('ol.tilegrid.TileGrid'); + + describe('ol.TileUrlFunction', function() { describe('expandUrl', function() { @@ -104,6 +109,3 @@ describe('ol.TileUrlFunction', function() { }); }); - -goog.require('ol.TileUrlFunction'); -goog.require('ol.tilegrid.TileGrid'); diff --git a/test/spec/ol/transform.test.js b/test/spec/ol/transform.test.js index b838a91ae9..8c85561f78 100644 --- a/test/spec/ol/transform.test.js +++ b/test/spec/ol/transform.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.transform'); +goog.require('ol.transform'); + + describe('ol.transform', function() { function assertRoughlyEqual(t1, t2) { @@ -117,5 +120,3 @@ describe('ol.transform', function() { }); }); - -goog.require('ol.transform'); diff --git a/test/spec/ol/uri.test.js b/test/spec/ol/uri.test.js index 2d0fd40b7b..97ff5976d6 100644 --- a/test/spec/ol/uri.test.js +++ b/test/spec/ol/uri.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.uri'); +goog.require('ol.uri'); + + describe('ol.uri.appendParams()', function() { it('should append empty STYLES with =', function() { @@ -60,5 +63,3 @@ describe('ol.uri.appendParams()', function() { }); }); - -goog.require('ol.uri'); diff --git a/test/spec/ol/vec/mat4.test.js b/test/spec/ol/vec/mat4.test.js index f034926e3d..7d055fe960 100644 --- a/test/spec/ol/vec/mat4.test.js +++ b/test/spec/ol/vec/mat4.test.js @@ -1,5 +1,8 @@ goog.provide('ol.test.vec.Mat4'); +goog.require('ol.vec.Mat4'); + + describe('ol.vec.Mat4', function() { describe('ol.vec.Mat4.create()', function() { @@ -21,5 +24,3 @@ describe('ol.vec.Mat4', function() { }); }); - -goog.require('ol.vec.Mat4'); diff --git a/test/spec/ol/view.test.js b/test/spec/ol/view.test.js index 212bf445aa..ba006097fa 100644 --- a/test/spec/ol/view.test.js +++ b/test/spec/ol/view.test.js @@ -1,5 +1,11 @@ goog.provide('ol.test.View'); +goog.require('ol.View'); +goog.require('ol.extent'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.Point'); + + describe('ol.View', function() { describe('constructor (defaults)', function() { @@ -568,8 +574,3 @@ describe('ol.View', function() { }); }); }); - -goog.require('ol.View'); -goog.require('ol.extent'); -goog.require('ol.geom.LineString'); -goog.require('ol.geom.Point'); diff --git a/test/spec/ol/webgl/buffer.test.js b/test/spec/ol/webgl/buffer.test.js index 7d7153e32e..f9cfc66970 100644 --- a/test/spec/ol/webgl/buffer.test.js +++ b/test/spec/ol/webgl/buffer.test.js @@ -1,5 +1,7 @@ goog.provide('ol.test.webgl.Buffer'); +goog.require('ol.webgl.Buffer'); + describe('ol.webgl.Buffer', function() { @@ -51,5 +53,3 @@ describe('ol.webgl.Buffer', function() { }); }); - -goog.require('ol.webgl.Buffer'); diff --git a/test_rendering/spec/ol/layer/image.test.js b/test_rendering/spec/ol/layer/image.test.js index 7befd59253..60757d6b2d 100644 --- a/test_rendering/spec/ol/layer/image.test.js +++ b/test_rendering/spec/ol/layer/image.test.js @@ -1,5 +1,14 @@ goog.provide('ol.test.rendering.layer.Image'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.layer.Image'); +goog.require('ol.obj'); +goog.require('ol.proj'); +goog.require('ol.source.ImageStatic'); +goog.require('ol.tilegrid'); + + describe('ol.rendering.layer.Image', function() { var target, map; @@ -108,10 +117,3 @@ describe('ol.rendering.layer.Image', function() { }); }); - -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.layer.Image'); -goog.require('ol.obj'); -goog.require('ol.proj'); -goog.require('ol.source.ImageStatic'); diff --git a/test_rendering/spec/ol/layer/tile.test.js b/test_rendering/spec/ol/layer/tile.test.js index 7f03f2b87e..572c43700e 100644 --- a/test_rendering/spec/ol/layer/tile.test.js +++ b/test_rendering/spec/ol/layer/tile.test.js @@ -1,5 +1,19 @@ goog.provide('ol.test.rendering.layer.Tile'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.geom.Point'); +goog.require('ol.layer.Tile'); +goog.require('ol.obj'); +goog.require('ol.proj'); +goog.require('ol.source.TileImage'); +goog.require('ol.source.XYZ'); +goog.require('ol.style.Circle'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Stroke'); +goog.require('ol.tilegrid.TileGrid'); + + describe('ol.rendering.layer.Tile', function() { var target, map; @@ -247,16 +261,3 @@ describe('ol.rendering.layer.Tile', function() { }); }); }); - -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.geom.Point'); -goog.require('ol.layer.Tile'); -goog.require('ol.obj'); -goog.require('ol.proj'); -goog.require('ol.source.TileImage'); -goog.require('ol.source.XYZ'); -goog.require('ol.style.Circle'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Stroke'); -goog.require('ol.tilegrid.TileGrid'); diff --git a/test_rendering/spec/ol/layer/vector.test.js b/test_rendering/spec/ol/layer/vector.test.js index 95a7d5a678..e0acad7d7a 100644 --- a/test_rendering/spec/ol/layer/vector.test.js +++ b/test_rendering/spec/ol/layer/vector.test.js @@ -1,5 +1,14 @@ goog.provide('ol.test.rendering.layer.Vector'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.Feature'); +goog.require('ol.geom.Circle'); +goog.require('ol.geom.Polygon'); +goog.require('ol.layer.Vector'); +goog.require('ol.source.Vector'); + + describe('ol.rendering.layer.Vector', function() { var center, target, map; @@ -76,11 +85,3 @@ describe('ol.rendering.layer.Vector', function() { }); }); - -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.Feature'); -goog.require('ol.geom.Circle'); -goog.require('ol.geom.Polygon'); -goog.require('ol.layer.Vector'); -goog.require('ol.source.Vector'); diff --git a/test_rendering/spec/ol/layer/vectortile.test.js b/test_rendering/spec/ol/layer/vectortile.test.js index bb249babd1..215ccc44b4 100644 --- a/test_rendering/spec/ol/layer/vectortile.test.js +++ b/test_rendering/spec/ol/layer/vectortile.test.js @@ -1,5 +1,14 @@ goog.provide('ol.test.rendering.layer.VectorTile'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.format.MVT'); +goog.require('ol.layer.VectorTile'); +goog.require('ol.obj'); +goog.require('ol.source.VectorTile'); +goog.require('ol.tilegrid'); + + describe('ol.rendering.layer.VectorTile', function() { var target, map; @@ -73,10 +82,3 @@ describe('ol.rendering.layer.VectorTile', function() { }); }); - -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.format.MVT'); -goog.require('ol.layer.VectorTile'); -goog.require('ol.obj'); -goog.require('ol.source.VectorTile'); diff --git a/test_rendering/spec/ol/map.test.js b/test_rendering/spec/ol/map.test.js index ffb1846f0a..d8e35ba614 100644 --- a/test_rendering/spec/ol/map.test.js +++ b/test_rendering/spec/ol/map.test.js @@ -1,5 +1,13 @@ goog.provide('ol.test.rendering.Map'); +goog.require('ol.Feature'); +goog.require('ol.geom.Point'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.layer.Vector'); +goog.require('ol.source.Vector'); + + describe('ol.rendering.Map', function() { var target, map; @@ -114,10 +122,3 @@ describe('ol.rendering.Map', function() { }); }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.Point'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.layer.Vector'); -goog.require('ol.source.Vector'); diff --git a/test_rendering/spec/ol/render.test.js b/test_rendering/spec/ol/render.test.js index 6f15943f0f..1c2796512d 100644 --- a/test_rendering/spec/ol/render.test.js +++ b/test_rendering/spec/ol/render.test.js @@ -1,5 +1,17 @@ goog.provide('ol.test.rendering.render'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.Point'); +goog.require('ol.geom.Polygon'); +goog.require('ol.render'); +goog.require('ol.render.VectorContext'); +goog.require('ol.render.canvas.Immediate'); +goog.require('ol.style.Circle'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Stroke'); +goog.require('ol.style.Style'); + + describe('ol.render', function() { var context; @@ -126,14 +138,3 @@ describe('ol.render', function() { }); }); - -goog.require('ol.geom.LineString'); -goog.require('ol.geom.Point'); -goog.require('ol.geom.Polygon'); -goog.require('ol.render'); -goog.require('ol.render.VectorContext'); -goog.require('ol.render.canvas.Immediate'); -goog.require('ol.style.Circle'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Stroke'); -goog.require('ol.style.Style'); diff --git a/test_rendering/spec/ol/reproj/image.test.js b/test_rendering/spec/ol/reproj/image.test.js index 694ab07fb5..62a7f9223a 100644 --- a/test_rendering/spec/ol/reproj/image.test.js +++ b/test_rendering/spec/ol/reproj/image.test.js @@ -1,5 +1,13 @@ goog.provide('ol.test.rendering.reproj.Image'); +goog.require('ol.events'); +goog.require('ol.proj'); +goog.require('ol.proj.EPSG3857'); +goog.require('ol.reproj.Image'); +goog.require('ol.source.ImageStatic'); +goog.require('ol.tilegrid'); + + describe('ol.rendering.reproj.Image', function() { function testSingleImage(source, targetProj, @@ -52,9 +60,3 @@ describe('ol.rendering.reproj.Image', function() { }); }); }); - -goog.require('ol.events'); -goog.require('ol.proj'); -goog.require('ol.proj.EPSG3857'); -goog.require('ol.reproj.Image'); -goog.require('ol.source.ImageStatic'); diff --git a/test_rendering/spec/ol/reproj/tile.test.js b/test_rendering/spec/ol/reproj/tile.test.js index 041923d6a3..cce2b29035 100644 --- a/test_rendering/spec/ol/reproj/tile.test.js +++ b/test_rendering/spec/ol/reproj/tile.test.js @@ -1,5 +1,13 @@ goog.provide('ol.test.rendering.reproj.Tile'); +goog.require('ol.TileState'); +goog.require('ol.events'); +goog.require('ol.proj'); +goog.require('ol.reproj.Tile'); +goog.require('ol.source.XYZ'); +goog.require('ol.tilegrid'); + + describe('ol.rendering.reproj.Tile', function() { function testSingleTile(source, targetProjection, targetTileGrid, z, x, y, @@ -172,9 +180,3 @@ describe('ol.rendering.reproj.Tile', function() { }); }); }); - -goog.require('ol.events'); -goog.require('ol.proj'); -goog.require('ol.reproj.Tile'); -goog.require('ol.source.XYZ'); -goog.require('ol.TileState'); diff --git a/test_rendering/spec/ol/style/circle.test.js b/test_rendering/spec/ol/style/circle.test.js index 8066e7ebbc..a123db58f8 100644 --- a/test_rendering/spec/ol/style/circle.test.js +++ b/test_rendering/spec/ol/style/circle.test.js @@ -1,5 +1,17 @@ goog.provide('ol.test.rendering.style.Circle'); +goog.require('ol.Feature'); +goog.require('ol.geom.Point'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.layer.Vector'); +goog.require('ol.source.Vector'); +goog.require('ol.style.Circle'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Style'); +goog.require('ol.style.Stroke'); + + describe('ol.rendering.style.Circle', function() { var target, map, vectorSource; @@ -187,14 +199,3 @@ describe('ol.rendering.style.Circle', function() { }); }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.Point'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.layer.Vector'); -goog.require('ol.source.Vector'); -goog.require('ol.style.Circle'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Style'); -goog.require('ol.style.Stroke'); diff --git a/test_rendering/spec/ol/style/icon.test.js b/test_rendering/spec/ol/style/icon.test.js index 5549231b30..e55cc6071c 100644 --- a/test_rendering/spec/ol/style/icon.test.js +++ b/test_rendering/spec/ol/style/icon.test.js @@ -1,5 +1,15 @@ goog.provide('ol.test.rendering.style.Icon'); +goog.require('ol.Feature'); +goog.require('ol.geom.Point'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.layer.Vector'); +goog.require('ol.source.Vector'); +goog.require('ol.style.Icon'); +goog.require('ol.style.Style'); + + describe('ol.rendering.style.Icon', function() { var target, map, vectorSource; @@ -110,12 +120,3 @@ describe('ol.rendering.style.Icon', function() { }); }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.Point'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.layer.Vector'); -goog.require('ol.source.Vector'); -goog.require('ol.style.Icon'); -goog.require('ol.style.Style'); diff --git a/test_rendering/spec/ol/style/linestring.test.js b/test_rendering/spec/ol/style/linestring.test.js index 2c69a3c7c3..b3e14dbbdc 100644 --- a/test_rendering/spec/ol/style/linestring.test.js +++ b/test_rendering/spec/ol/style/linestring.test.js @@ -1,5 +1,15 @@ goog.provide('ol.test.rendering.style.LineString'); +goog.require('ol.Feature'); +goog.require('ol.geom.LineString'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.layer.Vector'); +goog.require('ol.source.Vector'); +goog.require('ol.style.Style'); +goog.require('ol.style.Stroke'); + + describe('ol.rendering.style.LineString', function() { var target, map, vectorSource; @@ -90,12 +100,3 @@ describe('ol.rendering.style.LineString', function() { }); }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.LineString'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.layer.Vector'); -goog.require('ol.source.Vector'); -goog.require('ol.style.Style'); -goog.require('ol.style.Stroke'); diff --git a/test_rendering/spec/ol/style/polygon.test.js b/test_rendering/spec/ol/style/polygon.test.js index afd205261e..4fc152fe20 100644 --- a/test_rendering/spec/ol/style/polygon.test.js +++ b/test_rendering/spec/ol/style/polygon.test.js @@ -1,5 +1,16 @@ goog.provide('ol.test.rendering.style.Polygon'); +goog.require('ol.Feature'); +goog.require('ol.geom.Polygon'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.layer.Vector'); +goog.require('ol.source.Vector'); +goog.require('ol.style.Fill'); +goog.require('ol.style.Style'); +goog.require('ol.style.Stroke'); + + describe('ol.rendering.style.Polygon', function() { var target, map, vectorSource; @@ -187,13 +198,3 @@ describe('ol.rendering.style.Polygon', function() { }); }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.Polygon'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.layer.Vector'); -goog.require('ol.source.Vector'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Style'); -goog.require('ol.style.Stroke'); diff --git a/test_rendering/spec/ol/style/regularshape.test.js b/test_rendering/spec/ol/style/regularshape.test.js index 8dfd3c35fa..e9e005c455 100644 --- a/test_rendering/spec/ol/style/regularshape.test.js +++ b/test_rendering/spec/ol/style/regularshape.test.js @@ -1,5 +1,17 @@ goog.provide('ol.test.rendering.style.RegularShape'); +goog.require('ol.Feature'); +goog.require('ol.geom.Point'); +goog.require('ol.Map'); +goog.require('ol.View'); +goog.require('ol.layer.Vector'); +goog.require('ol.source.Vector'); +goog.require('ol.style.Fill'); +goog.require('ol.style.RegularShape'); +goog.require('ol.style.Style'); +goog.require('ol.style.Stroke'); + + describe('ol.rendering.style.RegularShape', function() { var target, map, vectorSource; @@ -115,14 +127,3 @@ describe('ol.rendering.style.RegularShape', function() { }); }); }); - -goog.require('ol.Feature'); -goog.require('ol.geom.Point'); -goog.require('ol.Map'); -goog.require('ol.View'); -goog.require('ol.layer.Vector'); -goog.require('ol.source.Vector'); -goog.require('ol.style.Fill'); -goog.require('ol.style.RegularShape'); -goog.require('ol.style.Style'); -goog.require('ol.style.Stroke');