Named export for ol/control

This commit is contained in:
Frederic Junod
2017-12-17 18:53:50 +01:00
parent db3e885076
commit da67764437
39 changed files with 78 additions and 80 deletions

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -12,7 +12,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 Attribution from '../src/ol/control/Attribution.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.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_() source: new _ol_source_OSM_()
}) })
], ],
controls: _ol_control_.defaults({attribution: false}).extend([attribution]), controls: defaultControls({attribution: false}).extend([attribution]),
target: 'map', target: 'map',
view: new _ol_View_({ view: new _ol_View_({
center: [0, 0], center: [0, 0],

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -21,7 +21,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 GeoJSON from '../src/ol/format/GeoJSON.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -50,7 +50,7 @@ var map = new _ol_Map_({
vectorLayer vectorLayer
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,7 +1,7 @@
import {inherits} from '../src/ol/index.js'; import {inherits} from '../src/ol/index.js';
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 Control from '../src/ol/control/Control.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -58,7 +58,7 @@ inherits(app.RotateNorthControl, Control);
var map = new _ol_Map_({ var map = new _ol_Map_({
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,7 +1,7 @@
// NOCOMPILE // NOCOMPILE
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_math_ from '../src/ol/math.js'; import _ol_math_ from '../src/ol/math.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -17,7 +17,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 ScaleLine from '../src/ol/control/ScaleLine.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
@@ -19,7 +19,7 @@ var layers = [
]; ];
var map = new _ol_Map_({ var map = new _ol_Map_({
controls: _ol_control_.defaults().extend([ controls: defaultControls().extend([
new ScaleLine({ new ScaleLine({
units: 'degrees' units: 'degrees'
}) })

View File

@@ -2,7 +2,7 @@
// this example uses FileSaver.js for which we don't have an externs file. // this example uses FileSaver.js for which we don't have an externs file.
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 GeoJSON from '../src/ol/format/GeoJSON.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -22,7 +22,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,7 +1,7 @@
// NOCOMPILE // NOCOMPILE
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 WKT from '../src/ol/format/WKT.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.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_({ var map = new _ol_Map_({
layers: [raster, vector], layers: [raster, vector],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -2,7 +2,7 @@ import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_Observable_ from '../src/ol/Observable.js'; import _ol_Observable_ from '../src/ol/Observable.js';
import _ol_View_ from '../src/ol/View.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 {easeOut} from '../src/ol/easing.js';
import Point from '../src/ol/geom/Point.js'; import Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.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: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 FullScreen from '../src/ol/control/FullScreen.js';
import _ol_interaction_ from '../src/ol/interaction.js'; import _ol_interaction_ from '../src/ol/interaction.js';
import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.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_({ var map = new _ol_Map_({
controls: _ol_control_.defaults().extend([ controls: defaultControls().extend([
new FullScreen() new FullScreen()
]), ]),
interactions: _ol_interaction_.defaults().extend([ interactions: _ol_interaction_.defaults().extend([

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 FullScreen from '../src/ol/control/FullScreen.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.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_({ var map = new _ol_Map_({
controls: _ol_control_.defaults().extend([ controls: defaultControls().extend([
new FullScreen({ new FullScreen({
source: 'fullscreen' source: 'fullscreen'
}) })

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 FullScreen from '../src/ol/control/FullScreen.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.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_({ var map = new _ol_Map_({
controls: _ol_control_.defaults().extend([ controls: defaultControls().extend([
new FullScreen() new FullScreen()
]), ]),
layers: [ layers: [

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js'; import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 GeoJSON from '../src/ol/format/GeoJSON.js';
import Circle from '../src/ol/geom/Circle.js'; import Circle from '../src/ol/geom/Circle.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
@@ -179,7 +179,7 @@ var map = new _ol_Map_({
vectorLayer vectorLayer
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -2,7 +2,7 @@ import Geolocation from '../src/ol/Geolocation.js';
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_Overlay_ from '../src/ol/Overlay.js';
import _ol_View_ from '../src/ol/View.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 LineString from '../src/ol/geom/LineString.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
@@ -22,7 +22,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -2,7 +2,7 @@ import _ol_Feature_ from '../src/ol/Feature.js';
import Geolocation from '../src/ol/Geolocation.js'; import Geolocation from '../src/ol/Geolocation.js';
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 Point from '../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
@@ -25,7 +25,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,7 +1,7 @@
import _ol_Feature_ from '../src/ol/Feature.js'; import _ol_Feature_ from '../src/ol/Feature.js';
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 IGC from '../src/ol/format/IGC.js';
import LineString from '../src/ol/geom/LineString.js'; import LineString from '../src/ol/geom/LineString.js';
import Point from '../src/ol/geom/Point.js'; import Point from '../src/ol/geom/Point.js';
@@ -98,7 +98,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_has_ from '../src/ol/has.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -21,7 +21,7 @@ if (!_ol_has_.WEBGL) {
layers: [osm], layers: [osm],
renderer: /** @type {Array<ol.renderer.Type>} */ (['webgl', 'canvas']), renderer: /** @type {Array<ol.renderer.Type>} */ (['webgl', 'canvas']),
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.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_({ var map = new _ol_Map_({
layers: [osm], layers: [osm],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.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_({ var map = new _ol_Map_({
layers: [osm, bing], layers: [osm, bing],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -34,7 +34,7 @@ var map = new _ol_Map_({
openSeaMapLayer openSeaMapLayer
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
@@ -26,7 +26,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 MousePosition from '../src/ol/control/MousePosition.js';
import _ol_coordinate_ from '../src/ol/coordinate.js'; import _ol_coordinate_ from '../src/ol/coordinate.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
@@ -17,7 +17,7 @@ var mousePositionControl = new MousePosition({
}); });
var map = new _ol_Map_({ var map = new _ol_Map_({
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 * as _ol_extent_ from '../src/ol/extent.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {toLonLat} from '../src/ol/proj.js'; import {toLonLat} from '../src/ol/proj.js';
@@ -14,7 +14,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,13 +1,13 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 ZoomToExtent from '../src/ol/control/ZoomToExtent.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
var map = new _ol_Map_({ var map = new _ol_Map_({
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 OverviewMap from '../src/ol/control/OverviewMap.js';
import _ol_interaction_ from '../src/ol/interaction.js'; import _ol_interaction_ from '../src/ol/interaction.js';
import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js'; import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js';
@@ -25,7 +25,7 @@ var overviewMapControl = new OverviewMap({
}); });
var map = new _ol_Map_({ var map = new _ol_Map_({
controls: _ol_control_.defaults().extend([ controls: defaultControls().extend([
overviewMapControl overviewMapControl
]), ]),
interactions: _ol_interaction_.defaults().extend([ interactions: _ol_interaction_.defaults().extend([

View File

@@ -1,12 +1,12 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 OverviewMap from '../src/ol/control/OverviewMap.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
var map = new _ol_Map_({ var map = new _ol_Map_({
controls: _ol_control_.defaults().extend([ controls: defaultControls().extend([
new OverviewMap() new OverviewMap()
]), ]),
layers: [ layers: [

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.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_() source: new _ol_source_OSM_()
}) })
], ],
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js';
@@ -12,7 +12,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 ScaleLine from '../src/ol/control/ScaleLine.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.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 scaleLineControl = new ScaleLine();
var map = new _ol_Map_({ var map = new _ol_Map_({
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../src/ol/source/OSM.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_() source: new _ol_source_OSM_()
}) })
], ],
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 OSMXML from '../src/ol/format/OSMXML.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../src/ol/layer/Vector.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_({ map = new _ol_Map_({
layers: [raster, vector], layers: [raster, vector],
target: document.getElementById('map'), target: document.getElementById('map'),
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 ScaleLine from '../src/ol/control/ScaleLine.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {addProjection, addCoordinateTransforms, transform} from '../src/ol/proj.js'; import {addProjection, addCoordinateTransforms, transform} from '../src/ol/proj.js';
@@ -70,7 +70,7 @@ var layers = [
]; ];
var map = new _ol_Map_({ var map = new _ol_Map_({
controls: _ol_control_.defaults().extend([ controls: defaultControls().extend([
new ScaleLine({ new ScaleLine({
units: 'metric' units: 'metric'
}) })

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 ScaleLine from '../src/ol/control/ScaleLine.js';
import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js';
import {fromLonLat} from '../src/ol/proj.js'; import {fromLonLat} from '../src/ol/proj.js';
@@ -64,7 +64,7 @@ var layers = [
]; ];
var map = new _ol_Map_({ var map = new _ol_Map_({
controls: _ol_control_.defaults().extend([ controls: defaultControls().extend([
new ScaleLine() new ScaleLine()
]), ]),
layers: layers, layers: layers,

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 * as _ol_extent_ from '../src/ol/extent.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {fromLonLat, get as getProjection} from '../src/ol/proj.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_({ var map = new _ol_Map_({
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../src/ol/Map.js'; import _ol_Map_ from '../src/ol/Map.js';
import _ol_View_ from '../src/ol/View.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 * as _ol_extent_ from '../src/ol/extent.js';
import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js';
import {get as getProjection} from '../src/ol/proj.js'; import {get as getProjection} from '../src/ol/proj.js';
@@ -48,7 +48,7 @@ var map = new _ol_Map_({
}) })
], ],
target: 'map', target: 'map',
controls: _ol_control_.defaults({ controls: defaultControls({
attributionOptions: { attributionOptions: {
collapsible: false collapsible: false
} }

View File

@@ -4,7 +4,7 @@
import {inherits} from './index.js'; import {inherits} from './index.js';
import _ol_PluggableMap_ from './PluggableMap.js'; import _ol_PluggableMap_ from './PluggableMap.js';
import _ol_PluginType_ from './PluginType.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_interaction_ from './interaction.js';
import _ol_obj_ from './obj.js'; import _ol_obj_ from './obj.js';
import _ol_plugins_ from './plugins.js'; import _ol_plugins_ from './plugins.js';
@@ -76,7 +76,7 @@ var _ol_CanvasMap_ = function(options) {
options = _ol_obj_.assign({}, options); options = _ol_obj_.assign({}, options);
delete options.renderer; delete options.renderer;
if (!options.controls) { if (!options.controls) {
options.controls = _ol_control_.defaults(); options.controls = defaultControls();
} }
if (!options.interactions) { if (!options.interactions) {
options.interactions = _ol_interaction_.defaults(); options.interactions = _ol_interaction_.defaults();

View File

@@ -4,7 +4,7 @@
import {inherits} from './index.js'; import {inherits} from './index.js';
import _ol_PluggableMap_ from './PluggableMap.js'; import _ol_PluggableMap_ from './PluggableMap.js';
import _ol_PluginType_ from './PluginType.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_interaction_ from './interaction.js';
import _ol_obj_ from './obj.js'; import _ol_obj_ from './obj.js';
import _ol_plugins_ from './plugins.js'; import _ol_plugins_ from './plugins.js';
@@ -87,7 +87,7 @@ _ol_plugins_.registerMultiple(_ol_PluginType_.LAYER_RENDERER, [
var _ol_Map_ = function(options) { var _ol_Map_ = function(options) {
options = _ol_obj_.assign({}, options); options = _ol_obj_.assign({}, options);
if (!options.controls) { if (!options.controls) {
options.controls = _ol_control_.defaults(); options.controls = defaultControls();
} }
if (!options.interactions) { if (!options.interactions) {
options.interactions = _ol_interaction_.defaults(); options.interactions = _ol_interaction_.defaults();

View File

@@ -5,7 +5,6 @@ import _ol_Collection_ from './Collection.js';
import Attribution from './control/Attribution.js'; import Attribution from './control/Attribution.js';
import Rotate from './control/Rotate.js'; import Rotate from './control/Rotate.js';
import Zoom from './control/Zoom.js'; import Zoom from './control/Zoom.js';
var _ol_control_ = {};
/** /**
@@ -20,7 +19,7 @@ var _ol_control_ = {};
* @return {ol.Collection.<ol.control.Control>} Controls. * @return {ol.Collection.<ol.control.Control>} Controls.
* @api * @api
*/ */
_ol_control_.defaults = function(opt_options) { export function defaults(opt_options) {
var options = opt_options ? opt_options : {}; var options = opt_options ? opt_options : {};
@@ -44,5 +43,4 @@ _ol_control_.defaults = function(opt_options) {
return controls; return controls;
}; }
export default _ol_control_;