Merge pull request #7625 from fredj/named_export_control_interaction_defaults

Named export for ol/control and ol/interaction

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
     }

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],

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
     }

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
     }

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
     }

examples/custom-interactions.js

@@ -5,7 +5,7 @@ import _ol_View_ from '../src/ol/View.js';
 import LineString from '../src/ol/geom/LineString.js';
 import Point from '../src/ol/geom/Point.js';
 import Polygon from '../src/ol/geom/Polygon.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Pointer_ from '../src/ol/interaction/Pointer.js';
 import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
 import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -145,7 +145,7 @@ var polygonFeature = new _ol_Feature_(
 
 
 var map = new _ol_Map_({
-  interactions: _ol_interaction_.defaults().extend([new app.Drag()]),
+  interactions: defaultInteractions().extend([new app.Drag()]),
   layers: [
     new _ol_layer_Tile_({
       source: new _ol_source_TileJSON_({

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
     }

examples/drag-and-drop-image-vector.js

@@ -5,7 +5,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 import IGC from '../src/ol/format/IGC.js';
 import KML from '../src/ol/format/KML.js';
 import TopoJSON from '../src/ol/format/TopoJSON.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
 import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
 import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
@@ -94,7 +94,7 @@ var dragAndDropInteraction = new DragAndDrop({
 });
 
 var map = new _ol_Map_({
-  interactions: _ol_interaction_.defaults().extend([dragAndDropInteraction]),
+  interactions: defaultInteractions().extend([dragAndDropInteraction]),
   layers: [
     new _ol_layer_Tile_({
       source: new _ol_source_BingMaps_({

examples/drag-and-drop.js

@@ -5,7 +5,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 import IGC from '../src/ol/format/IGC.js';
 import KML from '../src/ol/format/KML.js';
 import TopoJSON from '../src/ol/format/TopoJSON.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
 import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
 import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -94,7 +94,7 @@ var dragAndDropInteraction = new DragAndDrop({
 });
 
 var map = new _ol_Map_({
-  interactions: _ol_interaction_.defaults().extend([dragAndDropInteraction]),
+  interactions: defaultInteractions().extend([dragAndDropInteraction]),
   layers: [
     new _ol_layer_Tile_({
       source: new _ol_source_BingMaps_({

examples/drag-rotate-and-zoom.js

@@ -1,13 +1,13 @@
 import _ol_Map_ from '../src/ol/Map.js';
 import _ol_View_ from '../src/ol/View.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.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_({
-  interactions: _ol_interaction_.defaults().extend([
+  interactions: defaultInteractions().extend([
     new DragRotateAndZoom()
   ]),
   layers: [

examples/earthquake-clusters.js

@@ -2,7 +2,7 @@ import _ol_Map_ from '../src/ol/Map.js';
 import _ol_View_ from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import KML from '../src/ol/format/KML.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
 import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -142,7 +142,7 @@ var raster = new _ol_layer_Tile_({
 
 var map = new _ol_Map_({
   layers: [raster, vector],
-  interactions: _ol_interaction_.defaults().extend([new _ol_interaction_Select_({
+  interactions: defaultInteractions().extend([new _ol_interaction_Select_({
     condition: function(evt) {
       return  evt.type == 'pointermove' ||
           evt.type == 'singleclick';

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'
     })

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
     }

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
     }

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
     }

examples/full-screen-drag-rotate-and-zoom.js

@@ -1,18 +1,18 @@
 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 {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
 import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
 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([
+  interactions: defaultInteractions().extend([
     new DragRotateAndZoom()
   ]),
   layers: [

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'
     })

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: [

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
     }

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
     }

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
     }

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
     }

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<ol.renderer.Type>} */ (['webgl', 'canvas']),
     target: 'map',
-    controls: _ol_control_.defaults({
+    controls: defaultControls({
       attributionOptions: {
         collapsible: false
       }

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
     }

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
     }

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
     }

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
     }

examples/modify-features.js

@@ -1,7 +1,7 @@
 import _ol_Map_ from '../src/ol/Map.js';
 import _ol_View_ from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
@@ -31,7 +31,7 @@ var modify = new _ol_interaction_Modify_({
 });
 
 var map = new _ol_Map_({
-  interactions: _ol_interaction_.defaults().extend([select, modify]),
+  interactions: defaultInteractions().extend([select, modify]),
   layers: [raster, vector],
   target: 'map',
   view: new _ol_View_({

examples/modify-test.js

@@ -1,7 +1,7 @@
 import _ol_Map_ from '../src/ol/Map.js';
 import _ol_View_ from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -232,7 +232,7 @@ var modify = new _ol_interaction_Modify_({
 });
 
 var map = new _ol_Map_({
-  interactions: _ol_interaction_.defaults().extend([select, modify]),
+  interactions: defaultInteractions().extend([select, modify]),
   layers: [layer],
   target: 'map',
   view: new _ol_View_({

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
     }

examples/mousewheel-zoom.js

@@ -1,13 +1,13 @@
 import _ol_Map_ from '../src/ol/Map.js';
 import _ol_View_ from '../src/ol/View.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_MouseWheelZoom_ from '../src/ol/interaction/MouseWheelZoom.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_({
-  interactions: _ol_interaction_.defaults({mouseWheelZoom: false}).extend([
+  interactions: defaultInteractions({mouseWheelZoom: false}).extend([
     new _ol_interaction_MouseWheelZoom_({
       constrainResolution: true // force zooming to a integer zoom
     })

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
     }

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
     }

examples/overviewmap-custom.js

@@ -1,8 +1,8 @@
 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 {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
 import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -25,10 +25,10 @@ var overviewMapControl = new OverviewMap({
 });
 
 var map = new _ol_Map_({
-  controls: _ol_control_.defaults().extend([
+  controls: defaultControls().extend([
     overviewMapControl
   ]),
-  interactions: _ol_interaction_.defaults().extend([
+  interactions: defaultInteractions().extend([
     new DragRotateAndZoom()
   ]),
   layers: [

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: [

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
     }

examples/pinch-zoom.js

@@ -1,13 +1,13 @@
 import _ol_Map_ from '../src/ol/Map.js';
 import _ol_View_ from '../src/ol/View.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_PinchZoom_ from '../src/ol/interaction/PinchZoom.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_({
-  interactions: _ol_interaction_.defaults({pinchZoom: false}).extend([
+  interactions: defaultInteractions({pinchZoom: false}).extend([
     new _ol_interaction_PinchZoom_({
       constrainResolution: true // force zooming to a integer zoom
     })

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
     }

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
     }

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
     }

examples/translate-features.js

@@ -1,7 +1,7 @@
 import _ol_Map_ from '../src/ol/Map.js';
 import _ol_View_ from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import _ol_interaction_Translate_ from '../src/ol/interaction/Translate.js';
 import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
@@ -28,7 +28,7 @@ var translate = new _ol_interaction_Translate_({
 });
 
 var map = new _ol_Map_({
-  interactions: _ol_interaction_.defaults().extend([select, translate]),
+  interactions: defaultInteractions().extend([select, translate]),
   layers: [raster, vector],
   target: 'map',
   view: new _ol_View_({

examples/vector-esri-edit.js

@@ -1,7 +1,7 @@
 import _ol_Map_ from '../src/ol/Map.js';
 import _ol_View_ from '../src/ol/View.js';
 import EsriJSON from '../src/ol/format/EsriJSON.js';
-import _ol_interaction_ from '../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
@@ -77,7 +77,7 @@ var modify = new _ol_interaction_Modify_({
 modify.setActive(false);
 
 var map = new _ol_Map_({
-  interactions: _ol_interaction_.defaults().extend([draw, select, modify]),
+  interactions: defaultInteractions().extend([draw, select, modify]),
   layers: [raster, vector],
   target: document.getElementById('map'),
   view: new _ol_View_({

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
     }

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'
     })

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,

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
     }

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
     }

src/ol/CanvasMap.js

@@ -4,8 +4,8 @@
 import {inherits} from './index.js';
 import _ol_PluggableMap_ from './PluggableMap.js';
 import _ol_PluginType_ from './PluginType.js';
-import _ol_control_ from './control.js';
-import _ol_interaction_ from './interaction.js';
+import {defaults as defaultControls} from './control.js';
+import {defaults as defaultInteractions} from './interaction.js';
 import _ol_obj_ from './obj.js';
 import _ol_plugins_ from './plugins.js';
 import _ol_renderer_canvas_ImageLayer_ from './renderer/canvas/ImageLayer.js';
@@ -76,10 +76,10 @@ 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();
+    options.interactions = defaultInteractions();
   }
 
   _ol_PluggableMap_.call(this, options);

src/ol/Map.js

@@ -4,8 +4,8 @@
 import {inherits} from './index.js';
 import _ol_PluggableMap_ from './PluggableMap.js';
 import _ol_PluginType_ from './PluginType.js';
-import _ol_control_ from './control.js';
-import _ol_interaction_ from './interaction.js';
+import {defaults as defaultControls} from './control.js';
+import {defaults as defaultInteractions} from './interaction.js';
 import _ol_obj_ from './obj.js';
 import _ol_plugins_ from './plugins.js';
 import _ol_renderer_canvas_ImageLayer_ from './renderer/canvas/ImageLayer.js';
@@ -87,10 +87,10 @@ _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();
+    options.interactions = defaultInteractions();
   }
 
   _ol_PluggableMap_.call(this, options);

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.<ol.control.Control>} 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_;
+}

src/ol/interaction.js

@@ -12,7 +12,6 @@ import _ol_interaction_KeyboardZoom_ from './interaction/KeyboardZoom.js';
 import _ol_interaction_MouseWheelZoom_ from './interaction/MouseWheelZoom.js';
 import _ol_interaction_PinchRotate_ from './interaction/PinchRotate.js';
 import _ol_interaction_PinchZoom_ from './interaction/PinchZoom.js';
-var _ol_interaction_ = {};
 
 
 /**
@@ -38,7 +37,7 @@ var _ol_interaction_ = {};
  * interactions to be used with the ol.Map constructor's interactions option.
  * @api
  */
-_ol_interaction_.defaults = function(opt_options) {
+export function defaults(opt_options) {
 
   var options = opt_options ? opt_options : {};
 
@@ -110,5 +109,4 @@ _ol_interaction_.defaults = function(opt_options) {
 
   return interactions;
 
-};
-export default _ol_interaction_;
+}

test/spec/ol/map.test.js

@@ -5,7 +5,7 @@ import _ol_Overlay_ from '../../../src/ol/Overlay.js';
 import _ol_View_ from '../../../src/ol/View.js';
 import Point from '../../../src/ol/geom/Point.js';
 import _ol_has_ from '../../../src/ol/has.js';
-import _ol_interaction_ from '../../../src/ol/interaction.js';
+import {defaults as defaultInteractions} from '../../../src/ol/interaction.js';
 import DoubleClickZoom from '../../../src/ol/interaction/DoubleClickZoom.js';
 import Interaction from '../../../src/ol/interaction/Interaction.js';
 import _ol_interaction_MouseWheelZoom_ from '../../../src/ol/interaction/MouseWheelZoom.js';
@@ -480,7 +480,7 @@ describe('ol.Map', function() {
     describe('create mousewheel interaction', function() {
       it('creates mousewheel interaction', function() {
         options.mouseWheelZoom = true;
-        var interactions = _ol_interaction_.defaults(options);
+        var interactions = defaultInteractions(options);
         expect(interactions.getLength()).to.eql(1);
         expect(interactions.item(0)).to.be.a(_ol_interaction_MouseWheelZoom_);
         expect(interactions.item(0).constrainResolution_).to.eql(false);
@@ -493,7 +493,7 @@ describe('ol.Map', function() {
     describe('create pinchZoom interaction', function() {
       it('creates pinchZoom interaction', function() {
         options.pinchZoom = true;
-        var interactions = _ol_interaction_.defaults(options);
+        var interactions = defaultInteractions(options);
         expect(interactions.getLength()).to.eql(1);
         expect(interactions.item(0)).to.be.a(_ol_interaction_PinchZoom_);
         expect(interactions.item(0).constrainResolution_).to.eql(false);
@@ -505,7 +505,7 @@ describe('ol.Map', function() {
         options.pinchZoom = true;
         options.mouseWheelZoom = true;
         options.constrainResolution = true;
-        var interactions = _ol_interaction_.defaults(options);
+        var interactions = defaultInteractions(options);
         expect(interactions.getLength()).to.eql(2);
         expect(interactions.item(0)).to.be.a(_ol_interaction_PinchZoom_);
         expect(interactions.item(0).constrainResolution_).to.eql(true);
@@ -522,7 +522,7 @@ describe('ol.Map', function() {
 
       describe('default zoomDelta', function() {
         it('create double click interaction with default delta', function() {
-          var interactions = _ol_interaction_.defaults(options);
+          var interactions = defaultInteractions(options);
           expect(interactions.getLength()).to.eql(1);
           expect(interactions.item(0)).to.be.a(DoubleClickZoom);
           expect(interactions.item(0).delta_).to.eql(1);
@@ -532,7 +532,7 @@ describe('ol.Map', function() {
       describe('set zoomDelta', function() {
         it('create double click interaction with set delta', function() {
           options.zoomDelta = 7;
-          var interactions = _ol_interaction_.defaults(options);
+          var interactions = defaultInteractions(options);
           expect(interactions.getLength()).to.eql(1);
           expect(interactions.item(0)).to.be.a(DoubleClickZoom);
           expect(interactions.item(0).delta_).to.eql(7);