diff --git a/examples/accessible.js b/examples/accessible.js
index f6ec256354..b55f292db1 100644
--- a/examples/accessible.js
+++ b/examples/accessible.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -12,7 +12,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/attributions.js b/examples/attributions.js
index b0c5aa0356..b3d1f46e06 100644
--- a/examples/attributions.js
+++ b/examples/attributions.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import Attribution from '../src/ol/control/Attribution.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -14,7 +14,7 @@ var map = new _ol_Map_({
source: new _ol_source_OSM_()
})
],
- controls: _ol_control_.defaults({attribution: false}).extend([attribution]),
+ controls: defaultControls({attribution: false}).extend([attribution]),
target: 'map',
view: new _ol_View_({
center: [0, 0],
diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js
index fe3f7e39b3..390fd763d8 100644
--- a/examples/canvas-tiles.js
+++ b/examples/canvas-tiles.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -21,7 +21,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/center.js b/examples/center.js
index 7c1c32d509..f52dc717e2 100644
--- a/examples/center.js
+++ b/examples/center.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import GeoJSON from '../src/ol/format/GeoJSON.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -50,7 +50,7 @@ var map = new _ol_Map_({
vectorLayer
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/custom-controls.js b/examples/custom-controls.js
index ab6e8ceb8f..e0b2295b47 100644
--- a/examples/custom-controls.js
+++ b/examples/custom-controls.js
@@ -1,7 +1,7 @@
import {inherits} from '../src/ol/index.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import Control from '../src/ol/control/Control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -58,7 +58,7 @@ inherits(app.RotateNorthControl, Control);
var map = new _ol_Map_({
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/device-orientation.js b/examples/device-orientation.js
index 90a653ab6a..0f2a1d4b6a 100644
--- a/examples/device-orientation.js
+++ b/examples/device-orientation.js
@@ -1,7 +1,7 @@
// NOCOMPILE
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_math_ from '../src/ol/math.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -17,7 +17,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js
index de1e5de4fe..cf60f5a644 100644
--- a/examples/epsg-4326.js
+++ b/examples/epsg-4326.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import ScaleLine from '../src/ol/control/ScaleLine.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
@@ -19,7 +19,7 @@ var layers = [
];
var map = new _ol_Map_({
- controls: _ol_control_.defaults().extend([
+ controls: defaultControls().extend([
new ScaleLine({
units: 'degrees'
})
diff --git a/examples/export-map.js b/examples/export-map.js
index df03f94c81..0b79d2a0e7 100644
--- a/examples/export-map.js
+++ b/examples/export-map.js
@@ -2,7 +2,7 @@
// this example uses FileSaver.js for which we don't have an externs file.
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import GeoJSON from '../src/ol/format/GeoJSON.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -22,7 +22,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/export-pdf.js b/examples/export-pdf.js
index e12cf7a5ea..61ff04c2e9 100644
--- a/examples/export-pdf.js
+++ b/examples/export-pdf.js
@@ -1,7 +1,7 @@
// NOCOMPILE
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import WKT from '../src/ol/format/WKT.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -29,7 +29,7 @@ var vector = new _ol_layer_Vector_({
var map = new _ol_Map_({
layers: [raster, vector],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/feature-animation.js b/examples/feature-animation.js
index 15b18b8bf6..2586623745 100644
--- a/examples/feature-animation.js
+++ b/examples/feature-animation.js
@@ -2,7 +2,7 @@ import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_Observable_ from '../src/ol/Observable.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import {easeOut} from '../src/ol/easing.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
@@ -23,7 +23,7 @@ var map = new _ol_Map_({
})
})
],
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js
index 55d455a025..e0fef69336 100644
--- a/examples/full-screen-drag-rotate-and-zoom.js
+++ b/examples/full-screen-drag-rotate-and-zoom.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import FullScreen from '../src/ol/control/FullScreen.js';
import _ol_interaction_ from '../src/ol/interaction.js';
import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
@@ -9,7 +9,7 @@ import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
var map = new _ol_Map_({
- controls: _ol_control_.defaults().extend([
+ controls: defaultControls().extend([
new FullScreen()
]),
interactions: _ol_interaction_.defaults().extend([
diff --git a/examples/full-screen-source.js b/examples/full-screen-source.js
index 3260e1e5c4..832d75a26f 100644
--- a/examples/full-screen-source.js
+++ b/examples/full-screen-source.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import FullScreen from '../src/ol/control/FullScreen.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -12,7 +12,7 @@ var view = new _ol_View_({
});
var map = new _ol_Map_({
- controls: _ol_control_.defaults().extend([
+ controls: defaultControls().extend([
new FullScreen({
source: 'fullscreen'
})
diff --git a/examples/full-screen.js b/examples/full-screen.js
index a8ed090a79..c9c16a7067 100644
--- a/examples/full-screen.js
+++ b/examples/full-screen.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import FullScreen from '../src/ol/control/FullScreen.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
@@ -12,7 +12,7 @@ var view = new _ol_View_({
});
var map = new _ol_Map_({
- controls: _ol_control_.defaults().extend([
+ controls: defaultControls().extend([
new FullScreen()
]),
layers: [
diff --git a/examples/geojson.js b/examples/geojson.js
index a3d548526a..85eda66855 100644
--- a/examples/geojson.js
+++ b/examples/geojson.js
@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import GeoJSON from '../src/ol/format/GeoJSON.js';
import Circle from '../src/ol/geom/Circle.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
@@ -179,7 +179,7 @@ var map = new _ol_Map_({
vectorLayer
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/geolocation-orientation.js b/examples/geolocation-orientation.js
index e16e27d849..e8079f1a9c 100644
--- a/examples/geolocation-orientation.js
+++ b/examples/geolocation-orientation.js
@@ -2,7 +2,7 @@ import Geolocation from '../src/ol/Geolocation.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_Overlay_ from '../src/ol/Overlay.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import LineString from '../src/ol/geom/LineString.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {fromLonLat} from '../src/ol/proj.js';
@@ -22,7 +22,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/geolocation.js b/examples/geolocation.js
index a08c074da7..6fe013f697 100644
--- a/examples/geolocation.js
+++ b/examples/geolocation.js
@@ -2,7 +2,7 @@ import _ol_Feature_ from '../src/ol/Feature.js';
import Geolocation from '../src/ol/Geolocation.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -25,7 +25,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/igc.js b/examples/igc.js
index 4b8c617f72..43c970b005 100644
--- a/examples/igc.js
+++ b/examples/igc.js
@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import IGC from '../src/ol/format/IGC.js';
import LineString from '../src/ol/geom/LineString.js';
import Point from '../src/ol/geom/Point.js';
@@ -98,7 +98,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/layer-clipping-webgl.js b/examples/layer-clipping-webgl.js
index 31079f67b8..bcbd3bd1ca 100644
--- a/examples/layer-clipping-webgl.js
+++ b/examples/layer-clipping-webgl.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_has_ from '../src/ol/has.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -21,7 +21,7 @@ if (!_ol_has_.WEBGL) {
layers: [osm],
renderer: /** @type {Array
} */ (['webgl', 'canvas']),
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/layer-clipping.js b/examples/layer-clipping.js
index d3da23da0c..231a1556b1 100644
--- a/examples/layer-clipping.js
+++ b/examples/layer-clipping.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -11,7 +11,7 @@ var osm = new _ol_layer_Tile_({
var map = new _ol_Map_({
layers: [osm],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/layer-swipe.js b/examples/layer-swipe.js
index 5f5b91cb15..d7fbb995c1 100644
--- a/examples/layer-swipe.js
+++ b/examples/layer-swipe.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -18,7 +18,7 @@ var bing = new _ol_layer_Tile_({
var map = new _ol_Map_({
layers: [osm, bing],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js
index 7b1cfe593f..d469e0182d 100644
--- a/examples/localized-openstreetmap.js
+++ b/examples/localized-openstreetmap.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -34,7 +34,7 @@ var map = new _ol_Map_({
openSeaMapLayer
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/min-max-resolution.js b/examples/min-max-resolution.js
index 3a90a6fc43..204f555bdd 100644
--- a/examples/min-max-resolution.js
+++ b/examples/min-max-resolution.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
@@ -26,7 +26,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/mouse-position.js b/examples/mouse-position.js
index 070838ddf4..e0aaed2a4f 100644
--- a/examples/mouse-position.js
+++ b/examples/mouse-position.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import MousePosition from '../src/ol/control/MousePosition.js';
import _ol_coordinate_ from '../src/ol/coordinate.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
@@ -17,7 +17,7 @@ var mousePositionControl = new MousePosition({
});
var map = new _ol_Map_({
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/moveend.js b/examples/moveend.js
index 96d83d8f65..e622d1d3d8 100644
--- a/examples/moveend.js
+++ b/examples/moveend.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import * as _ol_extent_ from '../src/ol/extent.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {toLonLat} from '../src/ol/proj.js';
@@ -14,7 +14,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js
index f407bed8cc..1301f16b56 100644
--- a/examples/navigation-controls.js
+++ b/examples/navigation-controls.js
@@ -1,13 +1,13 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import ZoomToExtent from '../src/ol/control/ZoomToExtent.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
var map = new _ol_Map_({
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/overviewmap-custom.js b/examples/overviewmap-custom.js
index d7cf1bb648..b7c5d8ed79 100644
--- a/examples/overviewmap-custom.js
+++ b/examples/overviewmap-custom.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import OverviewMap from '../src/ol/control/OverviewMap.js';
import _ol_interaction_ from '../src/ol/interaction.js';
import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
@@ -25,7 +25,7 @@ var overviewMapControl = new OverviewMap({
});
var map = new _ol_Map_({
- controls: _ol_control_.defaults().extend([
+ controls: defaultControls().extend([
overviewMapControl
]),
interactions: _ol_interaction_.defaults().extend([
diff --git a/examples/overviewmap.js b/examples/overviewmap.js
index 1b8f09a982..cbcc7e1091 100644
--- a/examples/overviewmap.js
+++ b/examples/overviewmap.js
@@ -1,12 +1,12 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import OverviewMap from '../src/ol/control/OverviewMap.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
var map = new _ol_Map_({
- controls: _ol_control_.defaults().extend([
+ controls: defaultControls().extend([
new OverviewMap()
]),
layers: [
diff --git a/examples/permalink.js b/examples/permalink.js
index 7e0d5a82b1..9602a09af5 100644
--- a/examples/permalink.js
+++ b/examples/permalink.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -29,7 +29,7 @@ var map = new _ol_Map_({
source: new _ol_source_OSM_()
})
],
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/rotation.js b/examples/rotation.js
index eee8790545..00fae82586 100644
--- a/examples/rotation.js
+++ b/examples/rotation.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -12,7 +12,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/scale-line.js b/examples/scale-line.js
index cc1f716917..50ca60c3d6 100644
--- a/examples/scale-line.js
+++ b/examples/scale-line.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import ScaleLine from '../src/ol/control/ScaleLine.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -9,7 +9,7 @@ import _ol_source_OSM_ from '../src/ol/source/OSM.js';
var scaleLineControl = new ScaleLine();
var map = new _ol_Map_({
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/teleport.js b/examples/teleport.js
index f0a2e8762e..5717a11ba4 100644
--- a/examples/teleport.js
+++ b/examples/teleport.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -11,7 +11,7 @@ var map = new _ol_Map_({
source: new _ol_source_OSM_()
})
],
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/vector-osm.js b/examples/vector-osm.js
index 3b0c2de29e..534c6c49c7 100644
--- a/examples/vector-osm.js
+++ b/examples/vector-osm.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import OSMXML from '../src/ol/format/OSMXML.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -125,7 +125,7 @@ var raster = new _ol_layer_Tile_({
map = new _ol_Map_({
layers: [raster, vector],
target: document.getElementById('map'),
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js
index bc203611cb..47cbcb2864 100644
--- a/examples/wms-custom-proj.js
+++ b/examples/wms-custom-proj.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import ScaleLine from '../src/ol/control/ScaleLine.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {addProjection, addCoordinateTransforms, transform} from '../src/ol/proj.js';
@@ -70,7 +70,7 @@ var layers = [
];
var map = new _ol_Map_({
- controls: _ol_control_.defaults().extend([
+ controls: defaultControls().extend([
new ScaleLine({
units: 'metric'
})
diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js
index 95ebb489c5..2323a265f2 100644
--- a/examples/wms-image-custom-proj.js
+++ b/examples/wms-image-custom-proj.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import ScaleLine from '../src/ol/control/ScaleLine.js';
import _ol_layer_Image_ from '../src/ol/layer/Image.js';
import {fromLonLat} from '../src/ol/proj.js';
@@ -64,7 +64,7 @@ var layers = [
];
var map = new _ol_Map_({
- controls: _ol_control_.defaults().extend([
+ controls: defaultControls().extend([
new ScaleLine()
]),
layers: layers,
diff --git a/examples/wmts-ign.js b/examples/wmts-ign.js
index 05ae0aea85..91eda85edc 100644
--- a/examples/wmts-ign.js
+++ b/examples/wmts-ign.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import * as _ol_extent_ from '../src/ol/extent.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {fromLonLat, get as getProjection} from '../src/ol/proj.js';
@@ -10,7 +10,7 @@ import _ol_tilegrid_WMTS_ from '../src/ol/tilegrid/WMTS.js';
var map = new _ol_Map_({
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/examples/wmts.js b/examples/wmts.js
index 12edcc515e..1264482894 100644
--- a/examples/wmts.js
+++ b/examples/wmts.js
@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.js';
-import _ol_control_ from '../src/ol/control.js';
+import {defaults as defaultControls} from '../src/ol/control.js';
import * as _ol_extent_ from '../src/ol/extent.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {get as getProjection} from '../src/ol/proj.js';
@@ -48,7 +48,7 @@ var map = new _ol_Map_({
})
],
target: 'map',
- controls: _ol_control_.defaults({
+ controls: defaultControls({
attributionOptions: {
collapsible: false
}
diff --git a/src/ol/CanvasMap.js b/src/ol/CanvasMap.js
index 663595b65b..5795d9ff8c 100644
--- a/src/ol/CanvasMap.js
+++ b/src/ol/CanvasMap.js
@@ -4,7 +4,7 @@
import {inherits} from './index.js';
import _ol_PluggableMap_ from './PluggableMap.js';
import _ol_PluginType_ from './PluginType.js';
-import _ol_control_ from './control.js';
+import {defaults as defaultControls} from './control.js';
import _ol_interaction_ from './interaction.js';
import _ol_obj_ from './obj.js';
import _ol_plugins_ from './plugins.js';
@@ -76,7 +76,7 @@ var _ol_CanvasMap_ = function(options) {
options = _ol_obj_.assign({}, options);
delete options.renderer;
if (!options.controls) {
- options.controls = _ol_control_.defaults();
+ options.controls = defaultControls();
}
if (!options.interactions) {
options.interactions = _ol_interaction_.defaults();
diff --git a/src/ol/Map.js b/src/ol/Map.js
index 40b7cd33e5..176201f6d3 100644
--- a/src/ol/Map.js
+++ b/src/ol/Map.js
@@ -4,7 +4,7 @@
import {inherits} from './index.js';
import _ol_PluggableMap_ from './PluggableMap.js';
import _ol_PluginType_ from './PluginType.js';
-import _ol_control_ from './control.js';
+import {defaults as defaultControls} from './control.js';
import _ol_interaction_ from './interaction.js';
import _ol_obj_ from './obj.js';
import _ol_plugins_ from './plugins.js';
@@ -87,7 +87,7 @@ _ol_plugins_.registerMultiple(_ol_PluginType_.LAYER_RENDERER, [
var _ol_Map_ = function(options) {
options = _ol_obj_.assign({}, options);
if (!options.controls) {
- options.controls = _ol_control_.defaults();
+ options.controls = defaultControls();
}
if (!options.interactions) {
options.interactions = _ol_interaction_.defaults();
diff --git a/src/ol/control.js b/src/ol/control.js
index 401862a606..7184291adc 100644
--- a/src/ol/control.js
+++ b/src/ol/control.js
@@ -5,7 +5,6 @@ import _ol_Collection_ from './Collection.js';
import Attribution from './control/Attribution.js';
import Rotate from './control/Rotate.js';
import Zoom from './control/Zoom.js';
-var _ol_control_ = {};
/**
@@ -20,7 +19,7 @@ var _ol_control_ = {};
* @return {ol.Collection.} Controls.
* @api
*/
-_ol_control_.defaults = function(opt_options) {
+export function defaults(opt_options) {
var options = opt_options ? opt_options : {};
@@ -44,5 +43,4 @@ _ol_control_.defaults = function(opt_options) {
return controls;
-};
-export default _ol_control_;
+}