diff --git a/examples/accessible.js b/examples/accessible.js index eff1b30126..b46f865156 100644 --- a/examples/accessible.js +++ b/examples/accessible.js @@ -1,11 +1,11 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/animation.js b/examples/animation.js index 313126e2ea..d5a4752a26 100644 --- a/examples/animation.js +++ b/examples/animation.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {easeIn, easeOut} from '../src/ol/easing.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -16,7 +16,7 @@ var view = new _ol_View_({ zoom: 6 }); -var map = new _ol_Map_({ +var map = new Map({ target: 'map', layers: [ new TileLayer({ diff --git a/examples/arcgis-image.js b/examples/arcgis-image.js index 8fb0a0ea63..eddfc20c59 100644 --- a/examples/arcgis-image.js +++ b/examples/arcgis-image.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; @@ -20,7 +20,7 @@ var layers = [ }) }) ]; -var map = new _ol_Map_({ +var map = new Map({ layers: layers, target: 'map', view: new _ol_View_({ diff --git a/examples/arcgis-tiled.js b/examples/arcgis-tiled.js index bff2e8680f..4c49b65bfb 100644 --- a/examples/arcgis-tiled.js +++ b/examples/arcgis-tiled.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -18,7 +18,7 @@ var layers = [ }) }) ]; -var map = new _ol_Map_({ +var map = new Map({ layers: layers, target: 'map', view: new _ol_View_({ diff --git a/examples/attributions.js b/examples/attributions.js index c0a0ce9f0b..11f51535f7 100644 --- a/examples/attributions.js +++ b/examples/attributions.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import Attribution from '../src/ol/control/Attribution.js'; @@ -8,7 +8,7 @@ import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var attribution = new Attribution({ collapsible: false }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/bing-maps.js b/examples/bing-maps.js index cfd8132086..97405c2f0e 100644 --- a/examples/bing-maps.js +++ b/examples/bing-maps.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; @@ -27,7 +27,7 @@ for (i = 0, ii = styles.length; i < ii; ++i) { }) })); } -var map = new _ol_Map_({ +var map = new Map({ layers: layers, // Improve user experience by loading tiles while dragging/zooming. Will make // zooming choppy on mobile or slow devices. diff --git a/examples/blend-modes.js b/examples/blend-modes.js index ce68138d11..ba8cee2da7 100644 --- a/examples/blend-modes.js +++ b/examples/blend-modes.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -69,7 +69,7 @@ var blueLayer = new _ol_layer_Vector_({ // Create the map, the view is centered on the triangle. Zooming and panning is // restricted to a sane area -var map = new _ol_Map_({ +var map = new Map({ layers: [ redLayer, greenLayer, diff --git a/examples/box-selection.js b/examples/box-selection.js index 30e2018944..39fe91581c 100644 --- a/examples/box-selection.js +++ b/examples/box-selection.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_events_condition_ from '../src/ol/events/condition.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -16,7 +16,7 @@ var vectorSource = new _ol_source_Vector_({ }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/button-title.js b/examples/button-title.js index e19245c185..9f0356d15d 100644 --- a/examples/button-title.js +++ b/examples/button-title.js @@ -1,9 +1,9 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/canvas-gradient-pattern.js b/examples/canvas-gradient-pattern.js index 76f22d58a7..5ee1c17c49 100644 --- a/examples/canvas-gradient-pattern.js +++ b/examples/canvas-gradient-pattern.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -90,7 +90,7 @@ var vectorLayer = new _ol_layer_Vector_({ }); // … finally create a map with that layer. -var map = new _ol_Map_({ +var map = new Map({ layers: [ vectorLayer ], diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js index 91bf379be6..f6830225be 100644 --- a/examples/canvas-tiles.js +++ b/examples/canvas-tiles.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -8,7 +8,7 @@ import _ol_source_TileDebug_ from '../src/ol/source/TileDebug.js'; var osmSource = new _ol_source_OSM_(); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: osmSource diff --git a/examples/cartodb.js b/examples/cartodb.js index f97ac79f57..55fbb392be 100644 --- a/examples/cartodb.js +++ b/examples/cartodb.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_CartoDB_ from '../src/ol/source/CartoDB.js'; @@ -20,7 +20,7 @@ var cartoDBSource = new _ol_source_CartoDB_({ config: mapConfig }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/center.js b/examples/center.js index 16363d69d3..d73760d4b7 100644 --- a/examples/center.js +++ b/examples/center.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -42,7 +42,7 @@ var view = new _ol_View_({ center: [0, 0], zoom: 1 }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/cluster.js b/examples/cluster.js index 271e0b9378..6955466de5 100644 --- a/examples/cluster.js +++ b/examples/cluster.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -67,7 +67,7 @@ var raster = new TileLayer({ source: new _ol_source_OSM_() }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, clusters], target: 'map', view: new _ol_View_({ diff --git a/examples/color-manipulation.js b/examples/color-manipulation.js index 8202b84def..4abd88aa18 100644 --- a/examples/color-manipulation.js +++ b/examples/color-manipulation.js @@ -1,5 +1,5 @@ // NOCOMPILE -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import _ol_source_Raster_ from '../src/ol/source/Raster.js'; @@ -148,7 +148,7 @@ raster.on('beforeoperations', function(event) { } }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new _ol_layer_Image_({ source: raster diff --git a/examples/custom-controls.js b/examples/custom-controls.js index abe81b6271..6d7868bbec 100644 --- a/examples/custom-controls.js +++ b/examples/custom-controls.js @@ -1,5 +1,5 @@ import {inherits} from '../src/ol/index.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import Control from '../src/ol/control/Control.js'; @@ -57,7 +57,7 @@ inherits(app.RotateNorthControl, Control); // -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls({ attributionOptions: { collapsible: false diff --git a/examples/custom-interactions.js b/examples/custom-interactions.js index b91d25b2a3..3e4a4add3e 100644 --- a/examples/custom-interactions.js +++ b/examples/custom-interactions.js @@ -1,6 +1,6 @@ import {inherits} from '../src/ol/index.js'; import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import LineString from '../src/ol/geom/LineString.js'; import Point from '../src/ol/geom/Point.js'; @@ -144,7 +144,7 @@ var polygonFeature = new _ol_Feature_( [-1e6, 1e6], [-1e6, -1e6], [-3e6, -1e6]]])); -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions().extend([new app.Drag()]), layers: [ new TileLayer({ diff --git a/examples/d3.js b/examples/d3.js index 67fbc9defa..2caca226e3 100644 --- a/examples/d3.js +++ b/examples/d3.js @@ -1,5 +1,5 @@ // NOCOMPILE -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {getWidth, getCenter} from '../src/ol/extent.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; @@ -9,7 +9,7 @@ import _ol_source_ImageCanvas_ from '../src/ol/source/ImageCanvas.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_Stamen_({ diff --git a/examples/device-orientation.js b/examples/device-orientation.js index 825e61ac98..ea8ed3ee76 100644 --- a/examples/device-orientation.js +++ b/examples/device-orientation.js @@ -1,5 +1,5 @@ // NOCOMPILE -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -10,7 +10,7 @@ var view = new _ol_View_({ center: [0, 0], zoom: 2 }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/drag-and-drop-image-vector.js b/examples/drag-and-drop-image-vector.js index d662ebe641..3921612aa8 100644 --- a/examples/drag-and-drop-image-vector.js +++ b/examples/drag-and-drop-image-vector.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GPX from '../src/ol/format/GPX.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -93,7 +93,7 @@ var dragAndDropInteraction = new DragAndDrop({ ] }); -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions().extend([dragAndDropInteraction]), layers: [ new TileLayer({ diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js index 93b31415b3..15b56c27a5 100644 --- a/examples/drag-and-drop.js +++ b/examples/drag-and-drop.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GPX from '../src/ol/format/GPX.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -93,7 +93,7 @@ var dragAndDropInteraction = new DragAndDrop({ ] }); -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions().extend([dragAndDropInteraction]), layers: [ new TileLayer({ diff --git a/examples/drag-rotate-and-zoom.js b/examples/drag-rotate-and-zoom.js index 042e63584c..f9baf924f1 100644 --- a/examples/drag-rotate-and-zoom.js +++ b/examples/drag-rotate-and-zoom.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js'; @@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions().extend([ new DragRotateAndZoom() ]), diff --git a/examples/draw-and-modify-features.js b/examples/draw-and-modify-features.js index d97935fcbf..a39f91854a 100644 --- a/examples/draw-and-modify-features.js +++ b/examples/draw-and-modify-features.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Draw from '../src/ol/interaction/Draw.js'; import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js'; @@ -36,7 +36,7 @@ var vector = new _ol_layer_Vector_({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/draw-features.js b/examples/draw-features.js index 6928db8aa8..8b99e6d685 100644 --- a/examples/draw-features.js +++ b/examples/draw-features.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Draw from '../src/ol/interaction/Draw.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -16,7 +16,7 @@ var vector = new _ol_layer_Vector_({ source: source }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/draw-freehand.js b/examples/draw-freehand.js index e723905c2b..b570a63b14 100644 --- a/examples/draw-freehand.js +++ b/examples/draw-freehand.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Draw from '../src/ol/interaction/Draw.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -16,7 +16,7 @@ var vector = new _ol_layer_Vector_({ source: source }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/draw-shapes.js b/examples/draw-shapes.js index 7fbeed5cd1..a82ce47e82 100644 --- a/examples/draw-shapes.js +++ b/examples/draw-shapes.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Polygon from '../src/ol/geom/Polygon.js'; import Draw from '../src/ol/interaction/Draw.js'; @@ -17,7 +17,7 @@ var vector = new _ol_layer_Vector_({ source: source }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js index a61765f24a..86cc8fca60 100644 --- a/examples/dynamic-data.js +++ b/examples/dynamic-data.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import MultiPoint from '../src/ol/geom/MultiPoint.js'; import Point from '../src/ol/geom/Point.js'; @@ -10,7 +10,7 @@ import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/earthquake-clusters.js b/examples/earthquake-clusters.js index 67dec35292..7411111705 100644 --- a/examples/earthquake-clusters.js +++ b/examples/earthquake-clusters.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import 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'; @@ -140,7 +140,7 @@ var raster = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], interactions: defaultInteractions().extend([new _ol_interaction_Select_({ condition: function(evt) { diff --git a/examples/earthquake-custom-symbol.js b/examples/earthquake-custom-symbol.js index 29cf87e9fc..4f4e9953b0 100644 --- a/examples/earthquake-custom-symbol.js +++ b/examples/earthquake-custom-symbol.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; import Polygon from '../src/ol/geom/Polygon.js'; @@ -68,7 +68,7 @@ var raster = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js index 87007422df..242cbbb52d 100644 --- a/examples/epsg-4326.js +++ b/examples/epsg-4326.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import ScaleLine from '../src/ol/control/ScaleLine.js'; @@ -18,7 +18,7 @@ var layers = [ }) ]; -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls().extend([ new ScaleLine({ units: 'degrees' diff --git a/examples/export-map.js b/examples/export-map.js index 10974831d4..b5ddd68043 100644 --- a/examples/export-map.js +++ b/examples/export-map.js @@ -1,6 +1,6 @@ // NOCOMPILE // this example uses FileSaver.js for which we don't have an externs file. -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -9,7 +9,7 @@ import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/export-pdf.js b/examples/export-pdf.js index 191469da47..c52dbfceb0 100644 --- a/examples/export-pdf.js +++ b/examples/export-pdf.js @@ -1,5 +1,5 @@ // NOCOMPILE -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import WKT from '../src/ol/format/WKT.js'; @@ -26,7 +26,7 @@ var vector = new _ol_layer_Vector_({ }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', controls: defaultControls({ diff --git a/examples/extent-interaction.js b/examples/extent-interaction.js index 1aaa87832b..eef97204cf 100644 --- a/examples/extent-interaction.js +++ b/examples/extent-interaction.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_events_condition_ from '../src/ol/events/condition.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -13,7 +13,7 @@ var vectorSource = new _ol_source_Vector_({ format: new GeoJSON() }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/feature-animation.js b/examples/feature-animation.js index 8a9024ab06..9d1550626f 100644 --- a/examples/feature-animation.js +++ b/examples/feature-animation.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_Observable_ from '../src/ol/Observable.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; @@ -15,7 +15,7 @@ import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_({ diff --git a/examples/feature-move-animation.js b/examples/feature-move-animation.js index 94dfc78568..27e49a0ae7 100644 --- a/examples/feature-move-animation.js +++ b/examples/feature-move-animation.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Polyline from '../src/ol/format/Polyline.js'; import Point from '../src/ol/geom/Point.js'; @@ -127,7 +127,7 @@ var vectorLayer = new _ol_layer_Vector_({ }); var center = [-5639523.95, -3501274.52]; -var map = new _ol_Map_({ +var map = new Map({ target: document.getElementById('map'), loadTilesWhileAnimating: true, view: new _ol_View_({ diff --git a/examples/flight-animation.js b/examples/flight-animation.js index 88c3a8e63e..44e2b52128 100644 --- a/examples/flight-animation.js +++ b/examples/flight-animation.js @@ -1,6 +1,6 @@ // NOCOMPILE import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import LineString from '../src/ol/geom/LineString.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -10,7 +10,7 @@ import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_Stamen_({ diff --git a/examples/fractal.js b/examples/fractal.js index de34d736df..efa413b5a6 100644 --- a/examples/fractal.js +++ b/examples/fractal.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import LineString from '../src/ol/geom/LineString.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -23,7 +23,7 @@ var layer = new _ol_layer_Vector_({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [layer], target: 'map', view: new _ol_View_({ diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js index 4edb4af1a0..5df99c2132 100644 --- a/examples/full-screen-drag-rotate-and-zoom.js +++ b/examples/full-screen-drag-rotate-and-zoom.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import FullScreen from '../src/ol/control/FullScreen.js'; @@ -8,7 +8,7 @@ import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls().extend([ new FullScreen() ]), diff --git a/examples/full-screen-source.js b/examples/full-screen-source.js index aa85075580..e5d94aaf9f 100644 --- a/examples/full-screen-source.js +++ b/examples/full-screen-source.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import FullScreen from '../src/ol/control/FullScreen.js'; @@ -11,7 +11,7 @@ var view = new _ol_View_({ zoom: 14 }); -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls().extend([ new FullScreen({ source: 'fullscreen' diff --git a/examples/full-screen.js b/examples/full-screen.js index f0cddb2cbd..869ba66d68 100644 --- a/examples/full-screen.js +++ b/examples/full-screen.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import FullScreen from '../src/ol/control/FullScreen.js'; @@ -11,7 +11,7 @@ var view = new _ol_View_({ zoom: 14 }); -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls().extend([ new FullScreen() ]), diff --git a/examples/geojson-vt.js b/examples/geojson-vt.js index f017dbea76..dd1d6b10d0 100644 --- a/examples/geojson-vt.js +++ b/examples/geojson-vt.js @@ -1,5 +1,5 @@ // NOCOMPILE -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -53,7 +53,7 @@ var tilePixels = new _ol_proj_Projection_({ units: 'tile-pixels' }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/geojson.js b/examples/geojson.js index 1bf9fd40a1..f7776cbb4f 100644 --- a/examples/geojson.js +++ b/examples/geojson.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -171,7 +171,7 @@ var vectorLayer = new _ol_layer_Vector_({ style: styleFunction }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/geolocation-orientation.js b/examples/geolocation-orientation.js index 17a013222a..335c0ecf11 100644 --- a/examples/geolocation-orientation.js +++ b/examples/geolocation-orientation.js @@ -1,5 +1,5 @@ import Geolocation from '../src/ol/Geolocation.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; @@ -15,7 +15,7 @@ var view = new _ol_View_({ }); // creating the map -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/geolocation.js b/examples/geolocation.js index b67c4fa652..ab8e0d6e1f 100644 --- a/examples/geolocation.js +++ b/examples/geolocation.js @@ -1,6 +1,6 @@ import _ol_Feature_ from '../src/ol/Feature.js'; import Geolocation from '../src/ol/Geolocation.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import Point from '../src/ol/geom/Point.js'; @@ -18,7 +18,7 @@ var view = new _ol_View_({ zoom: 2 }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/getfeatureinfo-image.js b/examples/getfeatureinfo-image.js index 5f1d287d72..647ac359b0 100644 --- a/examples/getfeatureinfo-image.js +++ b/examples/getfeatureinfo-image.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js'; @@ -20,7 +20,7 @@ var view = new _ol_View_({ zoom: 1 }); -var map = new _ol_Map_({ +var map = new Map({ layers: [wmsLayer], target: 'map', view: view diff --git a/examples/getfeatureinfo-tile.js b/examples/getfeatureinfo-tile.js index 1d733698ef..0ec94b4b51 100644 --- a/examples/getfeatureinfo-tile.js +++ b/examples/getfeatureinfo-tile.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; @@ -20,7 +20,7 @@ var view = new _ol_View_({ zoom: 1 }); -var map = new _ol_Map_({ +var map = new Map({ layers: [wmsLayer], target: 'map', view: view diff --git a/examples/gpx.js b/examples/gpx.js index d3f58fbf53..b5d1529a25 100644 --- a/examples/gpx.js +++ b/examples/gpx.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GPX from '../src/ol/format/GPX.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -54,7 +54,7 @@ var vector = new _ol_layer_Vector_({ } }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/graticule.js b/examples/graticule.js index a067fbfa60..cd88513b44 100644 --- a/examples/graticule.js +++ b/examples/graticule.js @@ -1,5 +1,5 @@ import Graticule from '../src/ol/Graticule.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; @@ -7,7 +7,7 @@ import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_({ diff --git a/examples/heatmap-earthquakes.js b/examples/heatmap-earthquakes.js index 30ee8b9677..09fcfad319 100644 --- a/examples/heatmap-earthquakes.js +++ b/examples/heatmap-earthquakes.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; import HeatmapLayer from '../src/ol/layer/Heatmap.js'; @@ -35,7 +35,7 @@ var raster = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/here-maps.js b/examples/here-maps.js index 9305e94c55..feb994b014 100644 --- a/examples/here-maps.js +++ b/examples/here-maps.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; @@ -67,7 +67,7 @@ for (i = 0, ii = hereLayers.length; i < ii; ++i) { })); } -var map = new _ol_Map_({ +var map = new Map({ layers: layers, // Improve user experience by loading tiles while dragging/zooming. Will make // zooming choppy on mobile or slow devices. diff --git a/examples/hit-tolerance.js b/examples/hit-tolerance.js index 49aca7c0cc..1cab8284c3 100644 --- a/examples/hit-tolerance.js +++ b/examples/hit-tolerance.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer 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_({ style: style }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/icon-color.js b/examples/icon-color.js index 4bc2c8b3fd..1be4531fc4 100644 --- a/examples/icon-color.js +++ b/examples/icon-color.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -63,7 +63,7 @@ var rasterLayer = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [rasterLayer, vectorLayer], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/icon-negative.js b/examples/icon-negative.js index 8d20793cdc..2bf9b04a28 100644 --- a/examples/icon-negative.js +++ b/examples/icon-negative.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; @@ -26,7 +26,7 @@ function createStyle(src, img) { var iconFeature = new _ol_Feature_(new Point([0, 0])); iconFeature.set('style', createStyle('data/icon.png', undefined)); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_Stamen_({layer: 'watercolor'}) diff --git a/examples/icon-sprite-webgl.js b/examples/icon-sprite-webgl.js index 453ed3281a..3313f039f3 100644 --- a/examples/icon-sprite-webgl.js +++ b/examples/icon-sprite-webgl.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -79,7 +79,7 @@ var vector = new _ol_layer_Vector_({ source: vectorSource }); -var map = new _ol_Map_({ +var map = new Map({ renderer: /** @type {Array} */ (['webgl', 'canvas']), layers: [vector], target: document.getElementById('map'), diff --git a/examples/icon.js b/examples/icon.js index 676d53bd79..0c3535ddee 100644 --- a/examples/icon.js +++ b/examples/icon.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; @@ -44,7 +44,7 @@ var rasterLayer = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [rasterLayer, vectorLayer], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/igc.js b/examples/igc.js index 597ad34f79..c848e80217 100644 --- a/examples/igc.js +++ b/examples/igc.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import IGC from '../src/ol/format/IGC.js'; @@ -80,7 +80,7 @@ vectorSource.on('addfeature', function(event) { }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_({ diff --git a/examples/image-filter.js b/examples/image-filter.js index 9b862a4f5b..dcdc05680d 100644 --- a/examples/image-filter.js +++ b/examples/image-filter.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; @@ -10,7 +10,7 @@ var imagery = new TileLayer({ source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'}) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [imagery], target: 'map', view: new _ol_View_({ diff --git a/examples/image-load-events.js b/examples/image-load-events.js index 3ffc6715e5..84e91d5bcd 100644 --- a/examples/image-load-events.js +++ b/examples/image-load-events.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js'; @@ -94,7 +94,7 @@ source.on('imageloaderror', function() { progress.addLoaded(); }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new _ol_layer_Image_({source: source}) ], diff --git a/examples/image-vector-layer.js b/examples/image-vector-layer.js index 5af586662b..49b73b1495 100644 --- a/examples/image-vector-layer.js +++ b/examples/image-vector-layer.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -20,7 +20,7 @@ var style = new _ol_style_Style_({ text: new _ol_style_Text_() }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new _ol_layer_Vector_({ renderMode: 'image', diff --git a/examples/jsts.js b/examples/jsts.js index ad9bb06423..fcfd01bad6 100644 --- a/examples/jsts.js +++ b/examples/jsts.js @@ -1,6 +1,6 @@ // NOCOMPILE // this example uses JSTS for which we don't have an externs file. -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -41,7 +41,7 @@ var rasterLayer = new TileLayer({ source: new _ol_source_OSM_() }); -var map = new _ol_Map_({ +var map = new Map({ layers: [rasterLayer, vectorLayer], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js index 4b15ed4f3d..82d19ea1e5 100644 --- a/examples/kml-earthquakes.js +++ b/examples/kml-earthquakes.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -54,7 +54,7 @@ var raster = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js index 701a27484a..23db827d56 100644 --- a/examples/kml-timezones.js +++ b/examples/kml-timezones.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -61,7 +61,7 @@ var raster = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/kml.js b/examples/kml.js index f108af9698..1e78383f78 100644 --- a/examples/kml.js +++ b/examples/kml.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -20,7 +20,7 @@ var vector = new _ol_layer_Vector_({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/layer-clipping-webgl.js b/examples/layer-clipping-webgl.js index 0a2a3869c9..1ed0abeff2 100644 --- a/examples/layer-clipping-webgl.js +++ b/examples/layer-clipping-webgl.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import _ol_has_ from '../src/ol/has.js'; @@ -17,7 +17,7 @@ if (!_ol_has_.WEBGL) { source: new _ol_source_OSM_() }); - var map = new _ol_Map_({ + var map = new Map({ layers: [osm], renderer: /** @type {Array} */ (['webgl', 'canvas']), target: 'map', diff --git a/examples/layer-clipping.js b/examples/layer-clipping.js index 086c23d643..6396f18e9f 100644 --- a/examples/layer-clipping.js +++ b/examples/layer-clipping.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -8,7 +8,7 @@ var osm = new TileLayer({ source: new _ol_source_OSM_() }); -var map = new _ol_Map_({ +var map = new Map({ layers: [osm], target: 'map', controls: defaultControls({ diff --git a/examples/layer-extent.js b/examples/layer-extent.js index f3ed19c1c4..5a14be36fa 100644 --- a/examples/layer-extent.js +++ b/examples/layer-extent.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {transformExtent} from '../src/ol/proj.js'; @@ -30,7 +30,7 @@ var overlay = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [base, overlay], target: 'map', view: new _ol_View_({ diff --git a/examples/layer-group.js b/examples/layer-group.js index bef15b69a9..72a5c7dec6 100644 --- a/examples/layer-group.js +++ b/examples/layer-group.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Group_ from '../src/ol/layer/Group.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -6,7 +6,7 @@ import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/layer-spy.js b/examples/layer-spy.js index a57365d662..10c6eff9ef 100644 --- a/examples/layer-spy.js +++ b/examples/layer-spy.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; @@ -16,7 +16,7 @@ var imagery = new TileLayer({ var container = document.getElementById('map'); -var map = new _ol_Map_({ +var map = new Map({ layers: [roads, imagery], target: container, view: new _ol_View_({ diff --git a/examples/layer-swipe.js b/examples/layer-swipe.js index 56fe1513da..da1b0a0012 100644 --- a/examples/layer-swipe.js +++ b/examples/layer-swipe.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -15,7 +15,7 @@ var bing = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [osm, bing], target: 'map', controls: defaultControls({ diff --git a/examples/layer-z-index.js b/examples/layer-z-index.js index 8ac08bedde..bd03887db9 100644 --- a/examples/layer-z-index.js +++ b/examples/layer-z-index.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -69,7 +69,7 @@ var layers = []; layers.push(layer1); layers.push(layer2); -var map = new _ol_Map_({ +var map = new Map({ layers: layers, target: 'map', view: new _ol_View_({ diff --git a/examples/lazy-source.js b/examples/lazy-source.js index 91d809216f..93a16954d1 100644 --- a/examples/lazy-source.js +++ b/examples/lazy-source.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -7,7 +7,7 @@ var source = new _ol_source_OSM_(); var layer = new TileLayer(); -var map = new _ol_Map_({ +var map = new Map({ layers: [layer], target: 'map', view: new _ol_View_({ diff --git a/examples/line-arrows.js b/examples/line-arrows.js index c546419776..bb970d6d1f 100644 --- a/examples/line-arrows.js +++ b/examples/line-arrows.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import Draw from '../src/ol/interaction/Draw.js'; @@ -51,7 +51,7 @@ var vector = new _ol_layer_Vector_({ style: styleFunction }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js index d5ac41519d..5ad4e9459a 100644 --- a/examples/localized-openstreetmap.js +++ b/examples/localized-openstreetmap.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -28,7 +28,7 @@ var openSeaMapLayer = new TileLayer({ }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ openCycleMapLayer, openSeaMapLayer diff --git a/examples/magnify.js b/examples/magnify.js index e819772ecb..2f60d5333e 100644 --- a/examples/magnify.js +++ b/examples/magnify.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; @@ -12,7 +12,7 @@ var imagery = new TileLayer({ var container = document.getElementById('map'); -var map = new _ol_Map_({ +var map = new Map({ layers: [imagery], target: container, view: new _ol_View_({ diff --git a/examples/mapbox-vector-tiles-advanced.js b/examples/mapbox-vector-tiles-advanced.js index 32eeb82390..afacdeb9ff 100644 --- a/examples/mapbox-vector-tiles-advanced.js +++ b/examples/mapbox-vector-tiles-advanced.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import MVT from '../src/ol/format/MVT.js'; import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js'; @@ -30,7 +30,7 @@ function tileUrlFunction(tileCoord) { ((tileCoord[1] << tileCoord[0]) + tileCoord[2]) % 4, 1)); } -var map = new _ol_Map_({ +var map = new Map({ layers: [ new _ol_layer_VectorTile_({ source: new _ol_source_VectorTile_({ diff --git a/examples/mapbox-vector-tiles.js b/examples/mapbox-vector-tiles.js index 4ce08ba421..16677950aa 100644 --- a/examples/mapbox-vector-tiles.js +++ b/examples/mapbox-vector-tiles.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import MVT from '../src/ol/format/MVT.js'; import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js'; @@ -12,7 +12,7 @@ import _ol_style_Text_ from '../src/ol/style/Text.js'; var key = 'pk.eyJ1IjoiYWhvY2V2YXIiLCJhIjoiRk1kMWZaSSJ9.E5BkluenyWQMsBLsuByrmg'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new _ol_layer_VectorTile_({ declutter: true, diff --git a/examples/mapguide-untiled.js b/examples/mapguide-untiled.js index b3f5a3b6c2..afc000dad6 100644 --- a/examples/mapguide-untiled.js +++ b/examples/mapguide-untiled.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import _ol_source_ImageMapGuide_ from '../src/ol/source/ImageMapGuide.js'; @@ -12,7 +12,7 @@ var bounds = [ -87.595394059497067, 43.823852564430069 ]; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new _ol_layer_Image_({ extent: bounds, diff --git a/examples/measure.js b/examples/measure.js index 07717f8aa0..4a73e8842a 100644 --- a/examples/measure.js +++ b/examples/measure.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_Observable_ from '../src/ol/Observable.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import {getArea, getLength} from '../src/ol/sphere.js'; @@ -118,7 +118,7 @@ var pointerMoveHandler = function(evt) { }; -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/min-max-resolution.js b/examples/min-max-resolution.js index b1a21293d1..d191d7f5b7 100644 --- a/examples/min-max-resolution.js +++ b/examples/min-max-resolution.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -9,7 +9,7 @@ import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; /** * Create the map. */ -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_(), diff --git a/examples/min-zoom.js b/examples/min-zoom.js index 012449cdc8..366629504f 100644 --- a/examples/min-zoom.js +++ b/examples/min-zoom.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -18,7 +18,7 @@ var view = new _ol_View_({ zoom: initialZoom }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/mobile-full-screen.js b/examples/mobile-full-screen.js index 4cb8143006..20ae22f86c 100644 --- a/examples/mobile-full-screen.js +++ b/examples/mobile-full-screen.js @@ -1,5 +1,5 @@ import Geolocation from '../src/ol/Geolocation.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; @@ -10,7 +10,7 @@ var view = new _ol_View_({ zoom: 2 }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_BingMaps_({ diff --git a/examples/modify-features.js b/examples/modify-features.js index dd24a3884e..997be2d727 100644 --- a/examples/modify-features.js +++ b/examples/modify-features.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; @@ -30,7 +30,7 @@ var modify = new _ol_interaction_Modify_({ features: select.getFeatures() }); -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions().extend([select, modify]), layers: [raster, vector], target: 'map', diff --git a/examples/modify-test.js b/examples/modify-test.js index 787ef8c2b4..d886c6228d 100644 --- a/examples/modify-test.js +++ b/examples/modify-test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; @@ -231,7 +231,7 @@ var modify = new _ol_interaction_Modify_({ } }); -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions().extend([select, modify]), layers: [layer], target: 'map', diff --git a/examples/mouse-position.js b/examples/mouse-position.js index 7222722612..ef0d22fd37 100644 --- a/examples/mouse-position.js +++ b/examples/mouse-position.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import MousePosition from '../src/ol/control/MousePosition.js'; @@ -16,7 +16,7 @@ var mousePositionControl = new MousePosition({ undefinedHTML: ' ' }); -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls({ attributionOptions: { collapsible: false diff --git a/examples/mousewheel-zoom.js b/examples/mousewheel-zoom.js index 3a91429154..4775ffc437 100644 --- a/examples/mousewheel-zoom.js +++ b/examples/mousewheel-zoom.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import _ol_interaction_MouseWheelZoom_ from '../src/ol/interaction/MouseWheelZoom.js'; @@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions({mouseWheelZoom: false}).extend([ new _ol_interaction_MouseWheelZoom_({ constrainResolution: true // force zooming to a integer zoom diff --git a/examples/moveend.js b/examples/moveend.js index 692a3b60c4..fd3ee25d63 100644 --- a/examples/moveend.js +++ b/examples/moveend.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import * as _ol_extent_ from '../src/ol/extent.js'; @@ -7,7 +7,7 @@ import {toLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js index 2b4d10b6fa..f578dc1ff7 100644 --- a/examples/navigation-controls.js +++ b/examples/navigation-controls.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import ZoomToExtent from '../src/ol/control/ZoomToExtent.js'; @@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls({ attributionOptions: { collapsible: false diff --git a/examples/osm-vector-tiles.js b/examples/osm-vector-tiles.js index 78eec202b8..2be32d7518 100644 --- a/examples/osm-vector-tiles.js +++ b/examples/osm-vector-tiles.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TopoJSON from '../src/ol/format/TopoJSON.js'; import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js'; @@ -58,7 +58,7 @@ var roadStyle = function(feature) { return style; }; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new _ol_layer_VectorTile_({ source: new _ol_source_VectorTile_({ diff --git a/examples/overlay.js b/examples/overlay.js index 3724a7d97d..2caccaea2b 100644 --- a/examples/overlay.js +++ b/examples/overlay.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_coordinate_ from '../src/ol/coordinate.js'; @@ -11,7 +11,7 @@ var layer = new TileLayer({ source: new _ol_source_OSM_() }); -var map = new _ol_Map_({ +var map = new Map({ layers: [layer], target: 'map', view: new _ol_View_({ diff --git a/examples/overviewmap-custom.js b/examples/overviewmap-custom.js index 77c20bce51..3854633c9b 100644 --- a/examples/overviewmap-custom.js +++ b/examples/overviewmap-custom.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import OverviewMap from '../src/ol/control/OverviewMap.js'; @@ -24,7 +24,7 @@ var overviewMapControl = new OverviewMap({ collapsed: false }); -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls().extend([ overviewMapControl ]), diff --git a/examples/overviewmap.js b/examples/overviewmap.js index 3a57e81905..fc9ad0928f 100644 --- a/examples/overviewmap.js +++ b/examples/overviewmap.js @@ -1,11 +1,11 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import OverviewMap from '../src/ol/control/OverviewMap.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls().extend([ new OverviewMap() ]), diff --git a/examples/permalink.js b/examples/permalink.js index 94d0b92bf0..ea2f796be2 100644 --- a/examples/permalink.js +++ b/examples/permalink.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -23,7 +23,7 @@ if (window.location.hash !== '') { } } -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/pinch-zoom.js b/examples/pinch-zoom.js index 32ff36a057..02422fcd2a 100644 --- a/examples/pinch-zoom.js +++ b/examples/pinch-zoom.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import _ol_interaction_PinchZoom_ from '../src/ol/interaction/PinchZoom.js'; @@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions({pinchZoom: false}).extend([ new _ol_interaction_PinchZoom_({ constrainResolution: true // force zooming to a integer zoom diff --git a/examples/polygon-styles.js b/examples/polygon-styles.js index 32c1b0442f..0eee5c0647 100644 --- a/examples/polygon-styles.js +++ b/examples/polygon-styles.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import MultiPoint from '../src/ol/geom/MultiPoint.js'; @@ -89,7 +89,7 @@ var layer = new _ol_layer_Vector_({ style: styles }); -var map = new _ol_Map_({ +var map = new Map({ layers: [layer], target: 'map', view: new _ol_View_({ diff --git a/examples/popup.js b/examples/popup.js index cb06cf7127..f82abbbee0 100644 --- a/examples/popup.js +++ b/examples/popup.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_coordinate_ from '../src/ol/coordinate.js'; @@ -41,7 +41,7 @@ closer.onclick = function() { /** * Create the map. */ -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_TileJSON_({ diff --git a/examples/preload.js b/examples/preload.js index 8e9ba9ea41..a904f7c7cd 100644 --- a/examples/preload.js +++ b/examples/preload.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; @@ -9,7 +9,7 @@ var view = new _ol_View_({ zoom: 8 }); -var map1 = new _ol_Map_({ +var map1 = new Map({ layers: [ new TileLayer({ preload: Infinity, @@ -23,7 +23,7 @@ var map1 = new _ol_Map_({ view: view }); -var map2 = new _ol_Map_({ +var map2 = new Map({ layers: [ new TileLayer({ preload: 0, // default value diff --git a/examples/raster.js b/examples/raster.js index ca4bc8d4be..54c520f060 100644 --- a/examples/raster.js +++ b/examples/raster.js @@ -1,6 +1,6 @@ // NOCOMPILE // this example uses d3 for which we don't have an externs file. -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -110,7 +110,7 @@ raster.on('afteroperations', function(event) { schedulePlot(event.resolution, event.data.counts, event.data.threshold); }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: bing diff --git a/examples/region-growing.js b/examples/region-growing.js index 857bab326a..9fecac6eeb 100644 --- a/examples/region-growing.js +++ b/examples/region-growing.js @@ -1,5 +1,5 @@ // NOCOMPILE -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -94,7 +94,7 @@ var rasterImage = new _ol_layer_Image_({ source: raster }); -var map = new _ol_Map_({ +var map = new Map({ layers: [imagery, rasterImage], target: 'map', view: new _ol_View_({ diff --git a/examples/regularshape.js b/examples/regularshape.js index 8d736c184c..6659131740 100644 --- a/examples/regularshape.js +++ b/examples/regularshape.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -84,7 +84,7 @@ var vectorLayer = new _ol_layer_Vector_({ source: source }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ vectorLayer ], diff --git a/examples/reprojection-by-code.js b/examples/reprojection-by-code.js index 63ac586e7e..6546d2bf92 100644 --- a/examples/reprojection-by-code.js +++ b/examples/reprojection-by-code.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -9,7 +9,7 @@ import _ol_source_TileImage_ from '../src/ol/source/TileImage.js'; import proj4 from 'proj4'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/reprojection-image.js b/examples/reprojection-image.js index 8cf34257dc..5b0634bedd 100644 --- a/examples/reprojection-image.js +++ b/examples/reprojection-image.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {getCenter} from '../src/ol/extent.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; @@ -17,7 +17,7 @@ register(proj4); var imageExtent = [0, 0, 700000, 1300000]; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/reprojection-wgs84.js b/examples/reprojection-wgs84.js index 481da6e1cd..0e25eb8b14 100644 --- a/examples/reprojection-wgs84.js +++ b/examples/reprojection-wgs84.js @@ -1,9 +1,9 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/reprojection.js b/examples/reprojection.js index d78ecd2a7d..b7122e4003 100644 --- a/examples/reprojection.js +++ b/examples/reprojection.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import _ol_format_WMTSCapabilities_ from '../src/ol/format/WMTSCapabilities.js'; @@ -150,7 +150,7 @@ layers['states'] = new TileLayer({ }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ layers['osm'], layers['bng'] diff --git a/examples/reusable-source.js b/examples/reusable-source.js index 72f2ef0436..edd1f279f3 100644 --- a/examples/reusable-source.js +++ b/examples/reusable-source.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; @@ -12,7 +12,7 @@ var urls = [ var source = new _ol_source_XYZ_(); -var map = new _ol_Map_({ +var map = new Map({ target: 'map', layers: [ new TileLayer({ diff --git a/examples/rotation.js b/examples/rotation.js index b90c39c4da..39c3998be7 100644 --- a/examples/rotation.js +++ b/examples/rotation.js @@ -1,11 +1,11 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/scale-line.js b/examples/scale-line.js index 8c8a51a855..d0ed61ea0e 100644 --- a/examples/scale-line.js +++ b/examples/scale-line.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import ScaleLine from '../src/ol/control/ScaleLine.js'; @@ -8,7 +8,7 @@ import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var scaleLineControl = new ScaleLine(); -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls({ attributionOptions: { collapsible: false diff --git a/examples/scaleline-indiana-east.js b/examples/scaleline-indiana-east.js index 3634fec7c3..90d720988e 100644 --- a/examples/scaleline-indiana-east.js +++ b/examples/scaleline-indiana-east.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import ScaleLine from '../src/ol/control/ScaleLine.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -18,7 +18,7 @@ proj4.defs('Indiana-East', 'PROJCS["IN83-EF",GEOGCS["LL83",DATUM["NAD83",' + 'UNIT["Foot_US",0.30480060960122]]'); register(proj4); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/sea-level.js b/examples/sea-level.js index fc2d841f19..b7b0393f83 100644 --- a/examples/sea-level.js +++ b/examples/sea-level.js @@ -1,5 +1,5 @@ // NOCOMPILE -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -35,7 +35,7 @@ var raster = new _ol_source_Raster_({ operation: flood }); -var map = new _ol_Map_({ +var map = new Map({ target: 'map', layers: [ new TileLayer({ diff --git a/examples/select-features.js b/examples/select-features.js index 2f90ac845d..4bd97da826 100644 --- a/examples/select-features.js +++ b/examples/select-features.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_events_condition_ from '../src/ol/events/condition.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -19,7 +19,7 @@ var vector = new _ol_layer_Vector_({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/semi-transparent-layer.js b/examples/semi-transparent-layer.js index 8ef4ef2520..001ae812fa 100644 --- a/examples/semi-transparent-layer.js +++ b/examples/semi-transparent-layer.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; @@ -6,7 +6,7 @@ import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/shaded-relief.js b/examples/shaded-relief.js index fcd492305c..ba1c27d848 100644 --- a/examples/shaded-relief.js +++ b/examples/shaded-relief.js @@ -1,5 +1,5 @@ // NOCOMPILE -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -114,7 +114,7 @@ var raster = new _ol_source_Raster_({ operation: shade }); -var map = new _ol_Map_({ +var map = new Map({ target: 'map', layers: [ new TileLayer({ diff --git a/examples/side-by-side.js b/examples/side-by-side.js index 94ae0a30e1..51f28def41 100644 --- a/examples/side-by-side.js +++ b/examples/side-by-side.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_has_ from '../src/ol/has.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -13,14 +13,14 @@ var view = new _ol_View_({ zoom: 1 }); -var map1 = new _ol_Map_({ +var map1 = new Map({ target: 'canvasMap', layers: [layer], view: view }); if (_ol_has_.WEBGL) { - var map2 = new _ol_Map_({ + var map2 = new Map({ target: 'webglMap', renderer: /** @type {Array} */ (['webgl', 'canvas']), layers: [layer], diff --git a/examples/simple.js b/examples/simple.js index c444b6789c..4f83c069b6 100644 --- a/examples/simple.js +++ b/examples/simple.js @@ -1,10 +1,10 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/snap.js b/examples/snap.js index 55345c6057..d80e5fcb65 100644 --- a/examples/snap.js +++ b/examples/snap.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Draw from '../src/ol/interaction/Draw.js'; import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js'; @@ -36,7 +36,7 @@ var vector = new _ol_layer_Vector_({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/sphere-mollweide.js b/examples/sphere-mollweide.js index c317e1f479..3c01d6c753 100644 --- a/examples/sphere-mollweide.js +++ b/examples/sphere-mollweide.js @@ -1,5 +1,5 @@ import Graticule from '../src/ol/Graticule.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -22,7 +22,7 @@ var sphereMollweideProjection = new _ol_proj_Projection_({ worldExtent: [-179, -89.99, 179, 89.99] }); -var map = new _ol_Map_({ +var map = new Map({ keyboardEventTarget: document, layers: [ new _ol_layer_Vector_({ diff --git a/examples/stamen.js b/examples/stamen.js index 6b24717c67..77fa88d3fc 100644 --- a/examples/stamen.js +++ b/examples/stamen.js @@ -1,11 +1,11 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_Stamen_({ diff --git a/examples/static-image.js b/examples/static-image.js index 67b21a8b4d..27e24ccf32 100644 --- a/examples/static-image.js +++ b/examples/static-image.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; @@ -16,7 +16,7 @@ var projection = new _ol_proj_Projection_({ extent: extent }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new _ol_layer_Image_({ source: new _ol_source_ImageStatic_({ diff --git a/examples/street-labels.js b/examples/street-labels.js index d0f52b2a58..0d0d516856 100644 --- a/examples/street-labels.js +++ b/examples/street-labels.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -21,7 +21,7 @@ var style = new _ol_style_Style_({ }); var viewExtent = [1817379, 6139595, 1827851, 6143616]; -var map = new _ol_Map_({ +var map = new Map({ layers: [new TileLayer({ source: new _ol_source_BingMaps_({ key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5', diff --git a/examples/symbol-atlas-webgl.js b/examples/symbol-atlas-webgl.js index 6044ecdc4b..142402fdd0 100644 --- a/examples/symbol-atlas-webgl.js +++ b/examples/symbol-atlas-webgl.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -106,7 +106,7 @@ var vector = new _ol_layer_Vector_({ source: vectorSource }); -var map = new _ol_Map_({ +var map = new Map({ renderer: /** @type {Array} */ (['webgl', 'canvas']), layers: [vector], target: document.getElementById('map'), diff --git a/examples/synthetic-lines.js b/examples/synthetic-lines.js index 9d34490d3b..7c0acd9452 100644 --- a/examples/synthetic-lines.js +++ b/examples/synthetic-lines.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import LineString from '../src/ol/geom/LineString.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -54,7 +54,7 @@ var view = new _ol_View_({ zoom: 0 }); -var map = new _ol_Map_({ +var map = new Map({ layers: [vector], target: 'map', view: view diff --git a/examples/synthetic-points.js b/examples/synthetic-points.js index 1cfaf21789..85cda5b939 100644 --- a/examples/synthetic-points.js +++ b/examples/synthetic-points.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import LineString from '../src/ol/geom/LineString.js'; import Point from '../src/ol/geom/Point.js'; @@ -51,7 +51,7 @@ var vector = new _ol_layer_Vector_({ } }); -var map = new _ol_Map_({ +var map = new Map({ layers: [vector], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/teleport.js b/examples/teleport.js index 6bd86d767c..2f295e9220 100644 --- a/examples/teleport.js +++ b/examples/teleport.js @@ -1,11 +1,11 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/tile-load-events.js b/examples/tile-load-events.js index 6b6b60a1b8..eca8c96a9d 100644 --- a/examples/tile-load-events.js +++ b/examples/tile-load-events.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; @@ -93,7 +93,7 @@ source.on('tileloaderror', function() { progress.addLoaded(); }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({source: source}) ], diff --git a/examples/tile-transitions.js b/examples/tile-transitions.js index 8f2864442b..63f06d4a31 100644 --- a/examples/tile-transitions.js +++ b/examples/tile-transitions.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; @@ -14,7 +14,7 @@ var withoutTransition = new TileLayer({ visible: false }); -var map = new _ol_Map_({ +var map = new Map({ layers: [withTransition, withoutTransition], target: 'map', view: new _ol_View_({ diff --git a/examples/tilejson.js b/examples/tilejson.js index 7568b52a49..2c0bb5dc80 100644 --- a/examples/tilejson.js +++ b/examples/tilejson.js @@ -1,10 +1,10 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_TileJSON_({ diff --git a/examples/tileutfgrid.js b/examples/tileutfgrid.js index 77875b114a..dd10accc1e 100644 --- a/examples/tileutfgrid.js +++ b/examples/tileutfgrid.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -26,7 +26,7 @@ var view = new _ol_View_({ }); var mapElement = document.getElementById('map'); -var map = new _ol_Map_({ +var map = new Map({ layers: [mapLayer, gridLayer], target: mapElement, view: view diff --git a/examples/tissot.js b/examples/tissot.js index 43fdd0c13e..bcab30871e 100644 --- a/examples/tissot.js +++ b/examples/tissot.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {circular as circularPolygon} from '../src/ol/geom/Polygon.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -15,7 +15,7 @@ var vectorLayer3857 = new _ol_layer_Vector_({ source: new _ol_source_Vector_() }); -var map4326 = new _ol_Map_({ +var map4326 = new Map({ layers: [ new TileLayer({ source: new _ol_source_TileWMS_({ @@ -36,7 +36,7 @@ var map4326 = new _ol_Map_({ }) }); -var map3857 = new _ol_Map_({ +var map3857 = new Map({ layers: [ new TileLayer({ source: new _ol_source_TileWMS_({ diff --git a/examples/topojson.js b/examples/topojson.js index cd4ec1dc56..2f032c2227 100644 --- a/examples/topojson.js +++ b/examples/topojson.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TopoJSON from '../src/ol/format/TopoJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -39,7 +39,7 @@ var vector = new _ol_layer_Vector_({ style: style }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/topolis.js b/examples/topolis.js index 5a5e239d70..f8825241b9 100644 --- a/examples/topolis.js +++ b/examples/topolis.js @@ -2,7 +2,7 @@ // this example uses topolis and toastr for which we don't have an externs file. import _ol_Feature_ from '../src/ol/Feature.js'; -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import LineString from '../src/ol/geom/LineString.js'; @@ -95,7 +95,7 @@ var facesLayer = new _ol_layer_Vector_({ } }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, facesLayer, edgesLayer, nodesLayer], target: 'map', view: new _ol_View_({ diff --git a/examples/translate-features.js b/examples/translate-features.js index b70a55d304..ad160edb2f 100644 --- a/examples/translate-features.js +++ b/examples/translate-features.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; @@ -27,7 +27,7 @@ var translate = new _ol_interaction_Translate_({ features: select.getFeatures() }); -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions().extend([select, translate]), layers: [raster, vector], target: 'map', diff --git a/examples/turf.js b/examples/turf.js index 1e01770b4f..367d56799d 100644 --- a/examples/turf.js +++ b/examples/turf.js @@ -1,6 +1,6 @@ // NOCOMPILE // this example uses turf.js for which we don't have an externs file. -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -46,7 +46,7 @@ var rasterLayer = new TileLayer({ source: new _ol_source_OSM_() }); -var map = new _ol_Map_({ +var map = new Map({ layers: [rasterLayer, vectorLayer], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/vector-esri-edit.js b/examples/vector-esri-edit.js index fa6ea8fe23..4bf81e81a8 100644 --- a/examples/vector-esri-edit.js +++ b/examples/vector-esri-edit.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import EsriJSON from '../src/ol/format/EsriJSON.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; @@ -76,7 +76,7 @@ var modify = new _ol_interaction_Modify_({ }); modify.setActive(false); -var map = new _ol_Map_({ +var map = new Map({ interactions: defaultInteractions().extend([draw, select, modify]), layers: [raster, vector], target: document.getElementById('map'), diff --git a/examples/vector-esri.js b/examples/vector-esri.js index 21e119d032..9527dcb48b 100644 --- a/examples/vector-esri.js +++ b/examples/vector-esri.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import EsriJSON from '../src/ol/format/EsriJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -104,7 +104,7 @@ var raster = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/vector-label-decluttering.js b/examples/vector-label-decluttering.js index dc1a1c92ca..a07cf3cbb0 100644 --- a/examples/vector-label-decluttering.js +++ b/examples/vector-label-decluttering.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; @@ -9,7 +9,7 @@ import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Text_ from '../src/ol/style/Text.js'; -var map = new _ol_Map_({ +var map = new Map({ target: 'map', view: new _ol_View_({ center: [0, 0], diff --git a/examples/vector-labels.js b/examples/vector-labels.js index ca527cd634..7be75285db 100644 --- a/examples/vector-labels.js +++ b/examples/vector-labels.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -189,7 +189,7 @@ var vectorPoints = new _ol_layer_Vector_({ style: pointStyleFunction }); -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_() diff --git a/examples/vector-layer.js b/examples/vector-layer.js index 53b340a584..8ee3e64083 100644 --- a/examples/vector-layer.js +++ b/examples/vector-layer.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; @@ -40,7 +40,7 @@ var vectorLayer = new _ol_layer_Vector_({ } }); -var map = new _ol_Map_({ +var map = new Map({ layers: [vectorLayer], target: 'map', view: new _ol_View_({ diff --git a/examples/vector-osm.js b/examples/vector-osm.js index 525c7468b9..546a9d32d0 100644 --- a/examples/vector-osm.js +++ b/examples/vector-osm.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import OSMXML from '../src/ol/format/OSMXML.js'; @@ -122,7 +122,7 @@ var raster = new TileLayer({ }) }); -map = new _ol_Map_({ +map = new Map({ layers: [raster, vector], target: document.getElementById('map'), controls: defaultControls({ diff --git a/examples/vector-tile-info.js b/examples/vector-tile-info.js index c1dcaee573..4f2f81f789 100644 --- a/examples/vector-tile-info.js +++ b/examples/vector-tile-info.js @@ -1,10 +1,10 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import MVT from '../src/ol/format/MVT.js'; import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js'; import _ol_source_VectorTile_ from '../src/ol/source/VectorTile.js'; -var map = new _ol_Map_({ +var map = new Map({ target: 'map', view: new _ol_View_({ center: [0, 0], diff --git a/examples/vector-wfs-getfeature.js b/examples/vector-wfs-getfeature.js index 5bb6502fd1..9374bac482 100644 --- a/examples/vector-wfs-getfeature.js +++ b/examples/vector-wfs-getfeature.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_format_filter_ from '../src/ol/format/filter.js'; import WFS from '../src/ol/format/WFS.js'; @@ -29,7 +29,7 @@ var raster = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/vector-wfs.js b/examples/vector-wfs.js index 7336dbab4d..7cb0f376b1 100644 --- a/examples/vector-wfs.js +++ b/examples/vector-wfs.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -39,7 +39,7 @@ var raster = new TileLayer({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: document.getElementById('map'), view: new _ol_View_({ diff --git a/examples/wkt.js b/examples/wkt.js index d97b814778..6b633535eb 100644 --- a/examples/wkt.js +++ b/examples/wkt.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import WKT from '../src/ol/format/WKT.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -27,7 +27,7 @@ var vector = new _ol_layer_Vector_({ }) }); -var map = new _ol_Map_({ +var map = new Map({ layers: [raster, vector], target: 'map', view: new _ol_View_({ diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index b7e9ba1172..b7db20a68e 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import ScaleLine from '../src/ol/control/ScaleLine.js'; @@ -69,7 +69,7 @@ var layers = [ }) ]; -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls().extend([ new ScaleLine({ units: 'metric' diff --git a/examples/wms-custom-tilegrid-512x256.js b/examples/wms-custom-tilegrid-512x256.js index 88d62161ad..4028c8cc5e 100644 --- a/examples/wms-custom-tilegrid-512x256.js +++ b/examples/wms-custom-tilegrid-512x256.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -33,7 +33,7 @@ var layers = [ }) }) ]; -var map = new _ol_Map_({ +var map = new Map({ layers: layers, target: 'map', view: new _ol_View_({ diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js index 2323a265f2..c989059f4e 100644 --- a/examples/wms-image-custom-proj.js +++ b/examples/wms-image-custom-proj.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import ScaleLine from '../src/ol/control/ScaleLine.js'; @@ -63,7 +63,7 @@ var layers = [ }) ]; -var map = new _ol_Map_({ +var map = new Map({ controls: defaultControls().extend([ new ScaleLine() ]), diff --git a/examples/wms-image.js b/examples/wms-image.js index bb3334eb76..0acba5342f 100644 --- a/examples/wms-image.js +++ b/examples/wms-image.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -20,7 +20,7 @@ var layers = [ }) }) ]; -var map = new _ol_Map_({ +var map = new Map({ layers: layers, target: 'map', view: new _ol_View_({ diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js index 83eadac2cf..a304a1cca7 100644 --- a/examples/wms-no-proj.js +++ b/examples/wms-no-proj.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -42,7 +42,7 @@ var projection = new _ol_proj_Projection_({ units: 'm' }); -var map = new _ol_Map_({ +var map = new Map({ layers: layers, target: 'map', view: new _ol_View_({ diff --git a/examples/wms-tiled-wrap-180.js b/examples/wms-tiled-wrap-180.js index 0a98df634d..d6955ecf0d 100644 --- a/examples/wms-tiled-wrap-180.js +++ b/examples/wms-tiled-wrap-180.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -17,7 +17,7 @@ var layers = [ }) }) ]; -var map = new _ol_Map_({ +var map = new Map({ layers: layers, target: 'map', view: new _ol_View_({ diff --git a/examples/wms-tiled.js b/examples/wms-tiled.js index dfa6a0c38c..767fe2c61a 100644 --- a/examples/wms-tiled.js +++ b/examples/wms-tiled.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -20,7 +20,7 @@ var layers = [ }) }) ]; -var map = new _ol_Map_({ +var map = new Map({ layers: layers, target: 'map', view: new _ol_View_({ diff --git a/examples/wms-time.js b/examples/wms-time.js index dcb62fe87a..e253c1c64e 100644 --- a/examples/wms-time.js +++ b/examples/wms-time.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -30,7 +30,7 @@ var layers = [ }) }) ]; -var map = new _ol_Map_({ +var map = new Map({ layers: layers, target: 'map', view: new _ol_View_({ diff --git a/examples/wmts-dimensions.js b/examples/wmts-dimensions.js index fbded1d6f0..3a9a4c12b1 100644 --- a/examples/wmts-dimensions.js +++ b/examples/wmts-dimensions.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -43,7 +43,7 @@ var wmtsSource = new _ol_source_WMTS_({ } }); -var map = new _ol_Map_({ +var map = new Map({ target: 'map', view: new _ol_View_({ projection: projection, diff --git a/examples/wmts-hidpi.js b/examples/wmts-hidpi.js index afd94da884..db0b689f98 100644 --- a/examples/wmts-hidpi.js +++ b/examples/wmts-hidpi.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_format_WMTSCapabilities_ from '../src/ol/format/WMTSCapabilities.js'; import _ol_has_ from '../src/ol/has.js'; @@ -15,7 +15,7 @@ var hiDPI = _ol_has_.DEVICE_PIXEL_RATIO > 1; var layer = hiDPI ? 'bmaphidpi' : 'geolandbasemap'; var tilePixelRatio = hiDPI ? 2 : 1; -var map = new _ol_Map_({ +var map = new Map({ target: 'map', view: new _ol_View_({ center: [1823849, 6143760], diff --git a/examples/wmts-ign.js b/examples/wmts-ign.js index 6f902ac0c8..a9a1ca5fe5 100644 --- a/examples/wmts-ign.js +++ b/examples/wmts-ign.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import * as _ol_extent_ from '../src/ol/extent.js'; @@ -8,7 +8,7 @@ import _ol_source_WMTS_ from '../src/ol/source/WMTS.js'; import _ol_tilegrid_WMTS_ from '../src/ol/tilegrid/WMTS.js'; -var map = new _ol_Map_({ +var map = new Map({ target: 'map', controls: defaultControls({ attributionOptions: { diff --git a/examples/wmts-layer-from-capabilities.js b/examples/wmts-layer-from-capabilities.js index 218a932285..e316a9fdcb 100644 --- a/examples/wmts-layer-from-capabilities.js +++ b/examples/wmts-layer-from-capabilities.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_format_WMTSCapabilities_ from '../src/ol/format/WMTSCapabilities.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -17,7 +17,7 @@ fetch('data/WMTSCapabilities.xml').then(function(response) { matrixSet: 'EPSG:3857' }); - map = new _ol_Map_({ + map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_(), diff --git a/examples/wmts.js b/examples/wmts.js index f8fdce6cfd..7ca572e21e 100644 --- a/examples/wmts.js +++ b/examples/wmts.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import * as _ol_extent_ from '../src/ol/extent.js'; @@ -20,7 +20,7 @@ for (var z = 0; z < 14; ++z) { matrixIds[z] = z; } -var map = new _ol_Map_({ +var map = new Map({ layers: [ new TileLayer({ source: new _ol_source_OSM_(), diff --git a/examples/xyz-esri-4326-512.js b/examples/xyz-esri-4326-512.js index 95bc7d52e9..57be2af393 100644 --- a/examples/xyz-esri-4326-512.js +++ b/examples/xyz-esri-4326-512.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; @@ -9,7 +9,7 @@ var tileSize = 512; var urlTemplate = 'https://services.arcgisonline.com/arcgis/rest/services/' + 'ESRI_Imagery_World_2D/MapServer/tile/{z}/{y}/{x}'; -var map = new _ol_Map_({ +var map = new Map({ target: 'map', layers: [ new TileLayer({ diff --git a/examples/xyz-esri.js b/examples/xyz-esri.js index 11e00df967..4405a7db4c 100644 --- a/examples/xyz-esri.js +++ b/examples/xyz-esri.js @@ -1,11 +1,11 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; -var map = new _ol_Map_({ +var map = new Map({ target: 'map', layers: [ new TileLayer({ diff --git a/examples/xyz-retina.js b/examples/xyz-retina.js index 2e30bc7b72..8130aa79f6 100644 --- a/examples/xyz-retina.js +++ b/examples/xyz-retina.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {transform, transformExtent} from '../src/ol/proj.js'; @@ -9,7 +9,7 @@ var mapMinZoom = 1; var mapMaxZoom = 15; var mapExtent = [-112.261791, 35.983744, -112.113981, 36.132062]; -var map = new _ol_Map_({ +var map = new Map({ target: 'map', layers: [ new TileLayer({ diff --git a/examples/xyz.js b/examples/xyz.js index 611e74458f..3ead7f102f 100644 --- a/examples/xyz.js +++ b/examples/xyz.js @@ -1,10 +1,10 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; -var map = new _ol_Map_({ +var map = new Map({ target: 'map', layers: [ new TileLayer({ diff --git a/examples/zoom-constrained.js b/examples/zoom-constrained.js index 2928ef09bb..cba1f2ef63 100644 --- a/examples/zoom-constrained.js +++ b/examples/zoom-constrained.js @@ -1,10 +1,10 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; -var map = new _ol_Map_({ +var map = new Map({ target: 'map', layers: [ new TileLayer({ diff --git a/examples/zoomify.js b/examples/zoomify.js index a48638bed3..9424b58ed0 100644 --- a/examples/zoomify.js +++ b/examples/zoomify.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_Zoomify_ from '../src/ol/source/Zoomify.js'; @@ -20,7 +20,7 @@ var layer = new TileLayer({ var extent = [0, -imgHeight, imgWidth, 0]; -var map = new _ol_Map_({ +var map = new Map({ layers: [layer], target: 'map', view: new _ol_View_({ diff --git a/examples/zoomslider.js b/examples/zoomslider.js index bb0a438acc..3b571e2cad 100644 --- a/examples/zoomslider.js +++ b/examples/zoomslider.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../src/ol/Map.js'; +import Map from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import ZoomSlider from '../src/ol/control/ZoomSlider.js'; import TileLayer from '../src/ol/layer/Tile.js'; @@ -18,7 +18,7 @@ var createMap = function(divId) { layer = new TileLayer({ source: source }); - map = new _ol_Map_({ + map = new Map({ layers: [layer], target: divId, view: new _ol_View_({ diff --git a/src/ol/Map.js b/src/ol/Map.js index 11ff129c17..d07a57e91f 100644 --- a/src/ol/Map.js +++ b/src/ol/Map.js @@ -41,7 +41,7 @@ registerMultiple(PluginType.LAYER_RENDERER, [ * The map is the core component of OpenLayers. For a map to render, a view, * one or more layers, and a target container are needed: * - * var map = new ol.Map({ + * var map = new Map({ * view: new ol.View({ * center: [0, 0], * zoom: 1 @@ -84,7 +84,7 @@ registerMultiple(PluginType.LAYER_RENDERER, [ * @fires ol.render.Event#precompose * @api */ -var _ol_Map_ = function(options) { +var Map = function(options) { options = _ol_obj_.assign({}, options); if (!options.controls) { options.controls = defaultControls(); @@ -96,6 +96,6 @@ var _ol_Map_ = function(options) { PluggableMap.call(this, options); }; -inherits(_ol_Map_, PluggableMap); +inherits(Map, PluggableMap); -export default _ol_Map_; +export default Map; diff --git a/test/rendering/ol/layer/clip.test.js b/test/rendering/ol/layer/clip.test.js index 04a0cea4db..72756f80f4 100644 --- a/test/rendering/ol/layer/clip.test.js +++ b/test/rendering/ol/layer/clip.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import MultiPolygon from '../../../../src/ol/geom/MultiPolygon.js'; import TileLayer from '../../../../src/ol/layer/Tile.js'; @@ -38,7 +38,7 @@ describe('layer clipping', function() { var map = null; beforeEach(function() { - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: createMapDiv(256, 256), view: new _ol_View_({ diff --git a/test/rendering/ol/layer/image.test.js b/test/rendering/ol/layer/image.test.js index 0f69dc441d..1d44b466ae 100644 --- a/test/rendering/ol/layer/image.test.js +++ b/test/rendering/ol/layer/image.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Image_ from '../../../../src/ol/layer/Image.js'; import _ol_obj_ from '../../../../src/ol/obj.js'; @@ -12,7 +12,7 @@ describe('ol.rendering.layer.Image', function() { var map; function createMap(renderer) { - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: createMapDiv(50, 50), renderer: renderer, diff --git a/test/rendering/ol/layer/tile.test.js b/test/rendering/ol/layer/tile.test.js index e793c7e967..937b6eeaa5 100644 --- a/test/rendering/ol/layer/tile.test.js +++ b/test/rendering/ol/layer/tile.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import * as _ol_extent_ from '../../../../src/ol/extent.js'; import Point from '../../../../src/ol/geom/Point.js'; @@ -20,7 +20,7 @@ describe('ol.rendering.layer.Tile', function() { function createMap(renderer, opt_center, opt_size, opt_pixelRatio, opt_resolutions) { var size = opt_size !== undefined ? opt_size : [50, 50]; - map = new _ol_Map_({ + map = new Map({ pixelRatio: opt_pixelRatio || 1, target: createMapDiv(size[0], size[1]), renderer: renderer, diff --git a/test/rendering/ol/layer/vector.test.js b/test/rendering/ol/layer/vector.test.js index 2d594d97b6..8abc6e5dcb 100644 --- a/test/rendering/ol/layer/vector.test.js +++ b/test/rendering/ol/layer/vector.test.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import GeoJSON from '../../../../src/ol/format/GeoJSON.js'; import Circle from '../../../../src/ol/geom/Circle.js'; @@ -21,7 +21,7 @@ describe('ol.rendering.layer.Vector', function() { var map; function createMap(renderer) { - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: createMapDiv(80, 80), renderer: renderer, @@ -431,7 +431,7 @@ describe('ol.rendering.layer.Vector', function() { var map2; beforeEach(function() { - map2 = new _ol_Map_({ + map2 = new Map({ pixelRatio: 1, target: createMapDiv(128, 128), view: new _ol_View_({ @@ -520,7 +520,7 @@ describe('ol.rendering.layer.Vector', function() { projection: 'EPSG:4326' }); - map3 = new _ol_Map_({ + map3 = new Map({ pixelRatio: 1, layers: [layer], target: createMapDiv(100, 100), diff --git a/test/rendering/ol/layer/vectortile.test.js b/test/rendering/ol/layer/vectortile.test.js index 6ea5607e09..a75f5f62db 100644 --- a/test/rendering/ol/layer/vectortile.test.js +++ b/test/rendering/ol/layer/vectortile.test.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import MVT from '../../../../src/ol/format/MVT.js'; import Point from '../../../../src/ol/geom/Point.js'; @@ -21,7 +21,7 @@ describe('ol.rendering.layer.VectorTile', function() { function createMap(renderer, opt_pixelRatio, opt_size) { var size = opt_size || 50; - map = new _ol_Map_({ + map = new Map({ pixelRatio: opt_pixelRatio || 1, target: createMapDiv(size, size), renderer: renderer, diff --git a/test/rendering/ol/map.test.js b/test/rendering/ol/map.test.js index 04e7023703..2abc786fd9 100644 --- a/test/rendering/ol/map.test.js +++ b/test/rendering/ol/map.test.js @@ -1,6 +1,6 @@ import _ol_Feature_ from '../../../src/ol/Feature.js'; import Point from '../../../src/ol/geom/Point.js'; -import _ol_Map_ from '../../../src/ol/Map.js'; +import Map from '../../../src/ol/Map.js'; import _ol_View_ from '../../../src/ol/View.js'; import _ol_layer_Vector_ from '../../../src/ol/layer/Vector.js'; import _ol_source_Vector_ from '../../../src/ol/source/Vector.js'; @@ -18,7 +18,7 @@ describe('ol.rendering.Map', function() { }) }); - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: createMapDiv(50, 50), renderer: renderer, diff --git a/test/rendering/ol/source/raster.test.js b/test/rendering/ol/source/raster.test.js index 053edb178a..56926916ab 100644 --- a/test/rendering/ol/source/raster.test.js +++ b/test/rendering/ol/source/raster.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Image_ from '../../../../src/ol/layer/Image.js'; import _ol_source_Raster_ from '../../../../src/ol/source/Raster.js'; @@ -28,7 +28,7 @@ where('Uint8ClampedArray').describe('ol.rendering.source.Raster', function() { var map; function createMap(renderer, pixelRatio) { - map = new _ol_Map_({ + map = new Map({ target: createMapDiv(200, 200), pixelRatio: pixelRatio, renderer: renderer, diff --git a/test/rendering/ol/source/tilewms.test.js b/test/rendering/ol/source/tilewms.test.js index 30d6f75e92..d23e4a8600 100644 --- a/test/rendering/ol/source/tilewms.test.js +++ b/test/rendering/ol/source/tilewms.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import TileLayer from '../../../../src/ol/layer/Tile.js'; import _ol_source_TileWMS_ from '../../../../src/ol/source/TileWMS.js'; @@ -25,7 +25,7 @@ describe('ol.rendering.source.TileWMS', function() { var map; function createMap(renderer, pixelRatio) { - map = new _ol_Map_({ + map = new Map({ target: createMapDiv(200, 200), pixelRatio: pixelRatio, renderer: renderer, diff --git a/test/rendering/ol/style/circle.test.js b/test/rendering/ol/style/circle.test.js index 421d7cd6fa..47f5b5b062 100644 --- a/test/rendering/ol/style/circle.test.js +++ b/test/rendering/ol/style/circle.test.js @@ -1,7 +1,7 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js'; import Point from '../../../../src/ol/geom/Point.js'; import MultiPoint from '../../../../src/ol/geom/MultiPoint.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js'; import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; @@ -21,7 +21,7 @@ describe('ol.rendering.style.Circle', function() { source: vectorSource }); - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: createMapDiv(50, 50), renderer: renderer, diff --git a/test/rendering/ol/style/icon.test.js b/test/rendering/ol/style/icon.test.js index ab0bd311bb..c641268708 100644 --- a/test/rendering/ol/style/icon.test.js +++ b/test/rendering/ol/style/icon.test.js @@ -1,6 +1,6 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js'; import Point from '../../../../src/ol/geom/Point.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js'; import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; @@ -27,7 +27,7 @@ describe('ol.rendering.style.Icon', function() { source: vectorSource }); - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: createMapDiv(width ? width : 50, height ? height : 50), renderer: renderer, diff --git a/test/rendering/ol/style/linestring.test.js b/test/rendering/ol/style/linestring.test.js index a24d6335a2..31659070c5 100644 --- a/test/rendering/ol/style/linestring.test.js +++ b/test/rendering/ol/style/linestring.test.js @@ -1,6 +1,6 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js'; import LineString from '../../../../src/ol/geom/LineString.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js'; import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; @@ -18,7 +18,7 @@ describe('ol.rendering.style.LineString', function() { source: vectorSource }); - map = new _ol_Map_({ + map = new Map({ pixelRatio: opt_pixelRatio || 1, target: createMapDiv(50, 50), renderer: renderer, diff --git a/test/rendering/ol/style/polygon.test.js b/test/rendering/ol/style/polygon.test.js index 4dc767f2e2..16286da724 100644 --- a/test/rendering/ol/style/polygon.test.js +++ b/test/rendering/ol/style/polygon.test.js @@ -1,6 +1,6 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js'; import Polygon from '../../../../src/ol/geom/Polygon.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js'; import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; @@ -21,7 +21,7 @@ describe('ol.rendering.style.Polygon', function() { source: vectorSource }); - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: createMapDiv(size, size), renderer: renderer, diff --git a/test/rendering/ol/style/regularshape.test.js b/test/rendering/ol/style/regularshape.test.js index 7718f2e18f..2e07707274 100644 --- a/test/rendering/ol/style/regularshape.test.js +++ b/test/rendering/ol/style/regularshape.test.js @@ -1,6 +1,6 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js'; import Point from '../../../../src/ol/geom/Point.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js'; import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; @@ -20,7 +20,7 @@ describe('ol.rendering.style.RegularShape', function() { source: vectorSource }); - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: createMapDiv(50, 50), renderer: renderer, diff --git a/test/rendering/ol/style/text.test.js b/test/rendering/ol/style/text.test.js index 55fe207ade..1a570fcdb2 100644 --- a/test/rendering/ol/style/text.test.js +++ b/test/rendering/ol/style/text.test.js @@ -4,7 +4,7 @@ import MultiLineString from '../../../../src/ol/geom/MultiLineString.js'; import MultiPolygon from '../../../../src/ol/geom/MultiPolygon.js'; import Point from '../../../../src/ol/geom/Point.js'; import Polygon from '../../../../src/ol/geom/Polygon.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js'; import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js'; @@ -24,7 +24,7 @@ describe('ol.rendering.style.Text', function() { source: vectorSource }); - map = new _ol_Map_({ + map = new Map({ pixelRatio: pixelRatio, target: createMapDiv(200 / pixelRatio, 200 / pixelRatio), renderer: renderer, diff --git a/test/spec/ol/control/attribution.test.js b/test/spec/ol/control/attribution.test.js index b0d6e9357d..58adf01584 100644 --- a/test/spec/ol/control/attribution.test.js +++ b/test/spec/ol/control/attribution.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_Tile_ from '../../../../src/ol/Tile.js'; import _ol_View_ from '../../../../src/ol/View.js'; import Attribution from '../../../../src/ol/control/Attribution.js'; @@ -13,7 +13,7 @@ describe('ol.control.Attribution', function() { var target = document.createElement('div'); target.style.width = target.style.height = '100px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target, controls: [new Attribution({ collapsed: false, diff --git a/test/spec/ol/control/control.test.js b/test/spec/ol/control/control.test.js index 7c4fa035b1..2991ff77c1 100644 --- a/test/spec/ol/control/control.test.js +++ b/test/spec/ol/control/control.test.js @@ -1,11 +1,11 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import Control from '../../../../src/ol/control/Control.js'; describe('ol.control.Control', function() { var map, control; beforeEach(function() { - map = new _ol_Map_({ + map = new Map({ target: document.createElement('div') }); var element = document.createElement('DIV'); diff --git a/test/spec/ol/control/overviewmap.test.js b/test/spec/ol/control/overviewmap.test.js index d7a976fcdf..b88c13c256 100644 --- a/test/spec/ol/control/overviewmap.test.js +++ b/test/spec/ol/control/overviewmap.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import Control from '../../../../src/ol/control/Control.js'; import OverviewMap from '../../../../src/ol/control/OverviewMap.js'; @@ -9,7 +9,7 @@ describe('ol.control.OverviewMap', function() { beforeEach(function() { target = document.createElement('div'); document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target }); }); diff --git a/test/spec/ol/control/scaleline.test.js b/test/spec/ol/control/scaleline.test.js index 64f3e55864..09bcef16b2 100644 --- a/test/spec/ol/control/scaleline.test.js +++ b/test/spec/ol/control/scaleline.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import ScaleLine from '../../../../src/ol/control/ScaleLine.js'; import {fromLonLat} from '../../../../src/ol/proj.js'; @@ -9,7 +9,7 @@ describe('ol.control.ScaleLine', function() { beforeEach(function() { var target = document.createElement('div'); document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target }); }); diff --git a/test/spec/ol/control/zoomslider.test.js b/test/spec/ol/control/zoomslider.test.js index c097385367..6ac48ccc17 100644 --- a/test/spec/ol/control/zoomslider.test.js +++ b/test/spec/ol/control/zoomslider.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import ZoomSlider from '../../../../src/ol/control/ZoomSlider.js'; import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js'; @@ -10,7 +10,7 @@ describe('ol.control.ZoomSlider', function() { target = document.createElement('div'); document.body.appendChild(target); zoomslider = new ZoomSlider(); - map = new _ol_Map_({ + map = new Map({ target: target, controls: [zoomslider] }); @@ -89,7 +89,7 @@ describe('ol.control.ZoomSlider', function() { var map; beforeEach(function() { - map = new _ol_Map_({ + map = new Map({ target: createMapDiv(500, 100), view: new _ol_View_({ center: [0, 0], diff --git a/test/spec/ol/graticule.test.js b/test/spec/ol/graticule.test.js index ff8d6a7a1e..c57d73d3f0 100644 --- a/test/spec/ol/graticule.test.js +++ b/test/spec/ol/graticule.test.js @@ -1,5 +1,5 @@ import Graticule from '../../../src/ol/Graticule.js'; -import _ol_Map_ from '../../../src/ol/Map.js'; +import Map from '../../../src/ol/Map.js'; import {get as getProjection} from '../../../src/ol/proj.js'; import _ol_style_Stroke_ from '../../../src/ol/style/Stroke.js'; import _ol_style_Text_ from '../../../src/ol/style/Text.js'; @@ -9,7 +9,7 @@ describe('ol.Graticule', function() { function createGraticule() { graticule = new Graticule({ - map: new _ol_Map_({}) + map: new Map({}) }); } @@ -31,7 +31,7 @@ describe('ol.Graticule', function() { it('creates a graticule with labels', function() { graticule = new Graticule({ - map: new _ol_Map_({}), + map: new Map({}), showLabels: true }); var extent = [-25614353.926475704, -7827151.696402049, @@ -63,7 +63,7 @@ describe('ol.Graticule', function() { color: 'rebeccapurple' }); var styledGraticule = new Graticule({ - map: new _ol_Map_({}), + map: new Map({}), strokeStyle: customStrokeStyle }); var actualStyle = styledGraticule.strokeStyle_; @@ -76,7 +76,7 @@ describe('ol.Graticule', function() { var latLabelStyle = new _ol_style_Text_(); var lonLabelStyle = new _ol_style_Text_(); graticule = new Graticule({ - map: new _ol_Map_({}), + map: new Map({}), showLabels: true, lonLabelFormatter: function(lon) { return 'lon: ' + lon.toString(); diff --git a/test/spec/ol/interaction/dragrotateandzoom.test.js b/test/spec/ol/interaction/dragrotateandzoom.test.js index 6001a94111..b122b80066 100644 --- a/test/spec/ol/interaction/dragrotateandzoom.test.js +++ b/test/spec/ol/interaction/dragrotateandzoom.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js'; import _ol_View_ from '../../../../src/ol/View.js'; import DragRotateAndZoom from '../../../../src/ol/interaction/DragRotateAndZoom.js'; @@ -37,7 +37,7 @@ describe('ol.interaction.DragRotateAndZoom', function() { var source = new _ol_source_Vector_(); var layer = new _ol_layer_Vector_({source: source}); interaction = new DragRotateAndZoom(); - map = new _ol_Map_({ + map = new Map({ target: target, layers: [layer], interactions: [interaction], diff --git a/test/spec/ol/interaction/dragzoom.test.js b/test/spec/ol/interaction/dragzoom.test.js index 5007d28fd1..435824d9c7 100644 --- a/test/spec/ol/interaction/dragzoom.test.js +++ b/test/spec/ol/interaction/dragzoom.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import * as _ol_extent_ from '../../../../src/ol/extent.js'; import {fromExtent as polygonFromExtent} from '../../../../src/ol/geom/Polygon.js'; @@ -26,7 +26,7 @@ describe('ol.interaction.DragZoom', function() { document.body.appendChild(target); source = new _ol_source_Vector_(); var layer = new _ol_layer_Vector_({source: source}); - map = new _ol_Map_({ + map = new Map({ target: target, layers: [layer], view: new _ol_View_({ diff --git a/test/spec/ol/interaction/draw.test.js b/test/spec/ol/interaction/draw.test.js index ca17954216..a38677e010 100644 --- a/test/spec/ol/interaction/draw.test.js +++ b/test/spec/ol/interaction/draw.test.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js'; import _ol_View_ from '../../../../src/ol/View.js'; import {equals} from '../../../../src/ol/array.js'; @@ -36,7 +36,7 @@ describe('ol.interaction.Draw', function() { document.body.appendChild(target); source = new _ol_source_Vector_(); var layer = new _ol_layer_Vector_({source: source}); - map = new _ol_Map_({ + map = new Map({ target: target, layers: [layer], view: new _ol_View_({ diff --git a/test/spec/ol/interaction/extent.test.js b/test/spec/ol/interaction/extent.test.js index 50f36cf17b..dfdb6b8d81 100644 --- a/test/spec/ol/interaction/extent.test.js +++ b/test/spec/ol/interaction/extent.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_interaction_Extent_ from '../../../../src/ol/interaction/Extent.js'; @@ -13,7 +13,7 @@ describe('ol.interaction.Extent', function() { beforeEach(function() { var target = createMapDiv(width, height); - map = new _ol_Map_({ + map = new Map({ target: target, layers: [], view: new _ol_View_({ diff --git a/test/spec/ol/interaction/interaction.test.js b/test/spec/ol/interaction/interaction.test.js index 5a0d2054ab..743d2f65bf 100644 --- a/test/spec/ol/interaction/interaction.test.js +++ b/test/spec/ol/interaction/interaction.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import EventTarget from '../../../../src/ol/events/EventTarget.js'; import Interaction from '../../../../src/ol/interaction/Interaction.js'; @@ -26,7 +26,7 @@ describe('ol.interaction.Interaction', function() { describe('#getMap()', function() { it('retrieves the associated map', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var interaction = new Interaction({}); interaction.setMap(map); expect(interaction.getMap()).to.be(map); @@ -42,7 +42,7 @@ describe('ol.interaction.Interaction', function() { describe('#setMap()', function() { it('allows a map to be set', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var interaction = new Interaction({}); interaction.setMap(map); expect(interaction.getMap()).to.be(map); diff --git a/test/spec/ol/interaction/keyboardpan.test.js b/test/spec/ol/interaction/keyboardpan.test.js index 9a2ded0a35..2250cb94be 100644 --- a/test/spec/ol/interaction/keyboardpan.test.js +++ b/test/spec/ol/interaction/keyboardpan.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js'; import _ol_View_ from '../../../../src/ol/View.js'; import Event from '../../../../src/ol/events/Event.js'; @@ -8,7 +8,7 @@ describe('ol.interaction.KeyboardPan', function() { var map; beforeEach(function() { - map = new _ol_Map_({ + map = new Map({ target: createMapDiv(100, 100), view: new _ol_View_({ center: [0, 0], diff --git a/test/spec/ol/interaction/keyboardzoom.test.js b/test/spec/ol/interaction/keyboardzoom.test.js index 93abe60482..23c9b67f1c 100644 --- a/test/spec/ol/interaction/keyboardzoom.test.js +++ b/test/spec/ol/interaction/keyboardzoom.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js'; import _ol_View_ from '../../../../src/ol/View.js'; import Event from '../../../../src/ol/events/Event.js'; @@ -8,7 +8,7 @@ describe('ol.interaction.KeyboardZoom', function() { var map; beforeEach(function() { - map = new _ol_Map_({ + map = new Map({ target: createMapDiv(100, 100), view: new _ol_View_({ center: [0, 0], diff --git a/test/spec/ol/interaction/modify.test.js b/test/spec/ol/interaction/modify.test.js index e3165c68a4..58ca38a682 100644 --- a/test/spec/ol/interaction/modify.test.js +++ b/test/spec/ol/interaction/modify.test.js @@ -1,6 +1,6 @@ import _ol_Collection_ from '../../../../src/ol/Collection.js'; import _ol_Feature_ from '../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_events_ from '../../../../src/ol/events.js'; @@ -47,7 +47,7 @@ describe('ol.interaction.Modify', function() { var layer = new _ol_layer_Vector_({source: source}); - map = new _ol_Map_({ + map = new Map({ target: target, layers: [layer], view: new _ol_View_({ diff --git a/test/spec/ol/interaction/mousewheelzoom.test.js b/test/spec/ol/interaction/mousewheelzoom.test.js index a1594f452e..852142ecda 100644 --- a/test/spec/ol/interaction/mousewheelzoom.test.js +++ b/test/spec/ol/interaction/mousewheelzoom.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js'; import _ol_View_ from '../../../../src/ol/View.js'; import Event from '../../../../src/ol/events/Event.js'; @@ -12,7 +12,7 @@ describe('ol.interaction.MouseWheelZoom', function() { beforeEach(function() { interaction = new _ol_interaction_MouseWheelZoom_(); - map = new _ol_Map_({ + map = new Map({ target: createMapDiv(100, 100), interactions: [interaction], view: new _ol_View_({ diff --git a/test/spec/ol/interaction/select.test.js b/test/spec/ol/interaction/select.test.js index f09f67cad9..8c5785acdb 100644 --- a/test/spec/ol/interaction/select.test.js +++ b/test/spec/ol/interaction/select.test.js @@ -1,6 +1,6 @@ import _ol_Collection_ from '../../../../src/ol/Collection.js'; import _ol_Feature_ from '../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import MapBrowserEventType from '../../../../src/ol/MapBrowserEventType.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js'; import _ol_View_ from '../../../../src/ol/View.js'; @@ -59,7 +59,7 @@ describe('ol.interaction.Select', function() { layer = new _ol_layer_Vector_({source: source}); - map = new _ol_Map_({ + map = new Map({ target: target, layers: [layer], view: new _ol_View_({ diff --git a/test/spec/ol/interaction/snap.test.js b/test/spec/ol/interaction/snap.test.js index b7f47ec8a7..443a2a87aa 100644 --- a/test/spec/ol/interaction/snap.test.js +++ b/test/spec/ol/interaction/snap.test.js @@ -1,6 +1,6 @@ import _ol_Collection_ from '../../../../src/ol/Collection.js'; import _ol_Feature_ from '../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import Circle from '../../../../src/ol/geom/Circle.js'; import Point from '../../../../src/ol/geom/Point.js'; @@ -36,7 +36,7 @@ describe('ol.interaction.Snap', function() { style.height = height + 'px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target, view: new _ol_View_({ projection: 'EPSG:4326', diff --git a/test/spec/ol/interaction/translate.test.js b/test/spec/ol/interaction/translate.test.js index 053d722543..e0e158aba6 100644 --- a/test/spec/ol/interaction/translate.test.js +++ b/test/spec/ol/interaction/translate.test.js @@ -1,6 +1,6 @@ import _ol_Collection_ from '../../../../src/ol/Collection.js'; import _ol_Feature_ from '../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js'; import _ol_View_ from '../../../../src/ol/View.js'; import Point from '../../../../src/ol/geom/Point.js'; @@ -34,7 +34,7 @@ describe('ol.interaction.Translate', function() { })]; source.addFeatures(features); var layer = new _ol_layer_Vector_({source: source}); - map = new _ol_Map_({ + map = new Map({ target: target, layers: [layer], view: new _ol_View_({ diff --git a/test/spec/ol/layer/layer.test.js b/test/spec/ol/layer/layer.test.js index 6b1af6b305..1ae8063886 100644 --- a/test/spec/ol/layer/layer.test.js +++ b/test/spec/ol/layer/layer.test.js @@ -1,5 +1,5 @@ import {getUid} from '../../../../src/ol/index.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js'; import {get as getProjection} from '../../../../src/ol/proj.js'; import _ol_render_Event_ from '../../../../src/ol/render/Event.js'; @@ -387,7 +387,7 @@ describe('ol.layer.Layer', function() { var map; beforeEach(function() { - map = new _ol_Map_({}); + map = new Map({}); }); describe('with map in constructor options', function() { diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js index 5480bd6c8e..1fbca53691 100644 --- a/test/spec/ol/map.test.js +++ b/test/spec/ol/map.test.js @@ -1,5 +1,5 @@ import _ol_Feature_ from '../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../src/ol/Map.js'; +import Map from '../../../src/ol/Map.js'; import MapEvent from '../../../src/ol/MapEvent.js'; import Overlay from '../../../src/ol/Overlay.js'; import _ol_View_ from '../../../src/ol/View.js'; @@ -20,12 +20,12 @@ describe('ol.Map', function() { describe('constructor', function() { it('creates a new map', function() { - var map = new _ol_Map_({}); - expect(map).to.be.a(_ol_Map_); + var map = new Map({}); + expect(map).to.be.a(Map); }); it('creates a set of default interactions', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var interactions = map.getInteractions(); var length = interactions.getLength(); expect(length).to.be.greaterThan(0); @@ -36,14 +36,14 @@ describe('ol.Map', function() { }); it('creates the viewport', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var viewport = map.getViewport(); var className = 'ol-viewport' + (_ol_has_.TOUCH ? ' ol-touch' : ''); expect(viewport.className).to.be(className); }); it('creates the overlay containers', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var container = map.getOverlayContainer(); expect(container.className).to.be('ol-overlaycontainer'); @@ -55,7 +55,7 @@ describe('ol.Map', function() { describe('#addLayer()', function() { it('adds a layer to the map', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var layer = new TileLayer(); map.addLayer(layer); @@ -63,7 +63,7 @@ describe('ol.Map', function() { }); it('throws if a layer is added twice', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var layer = new TileLayer(); map.addLayer(layer); @@ -76,7 +76,7 @@ describe('ol.Map', function() { describe('#addInteraction()', function() { it('adds an interaction to the map', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var interaction = new Interaction({}); var before = map.getInteractions().getLength(); @@ -89,7 +89,7 @@ describe('ol.Map', function() { describe('#removeInteraction()', function() { it('removes an interaction from the map', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var interaction = new Interaction({}); var before = map.getInteractions().getLength(); @@ -120,7 +120,7 @@ describe('ol.Map', function() { view = new _ol_View_({ projection: 'EPSG:4326' }); - map = new _ol_Map_({ + map = new Map({ target: target, view: view, layers: [ @@ -193,7 +193,7 @@ describe('ol.Map', function() { target = document.createElement('div'); target.style.width = target.style.height = '100px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target, layers: [new _ol_layer_Vector_({ source: new _ol_source_Vector_({ @@ -257,7 +257,7 @@ describe('ol.Map', function() { style.height = '180px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target, view: new _ol_View_({ center: [0, 0], @@ -312,7 +312,7 @@ describe('ol.Map', function() { style.width = '360px'; style.height = '180px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target, view: new _ol_View_({ projection: 'EPSG:4326', @@ -417,7 +417,7 @@ describe('ol.Map', function() { var map; beforeEach(function() { - map = new _ol_Map_({ + map = new Map({ target: document.createElement('div') }); }); @@ -437,7 +437,7 @@ describe('ol.Map', function() { var map; beforeEach(function() { - map = new _ol_Map_({ + map = new Map({ target: document.createElement('div') }); expect(map.handleResize_).to.be.ok(); @@ -560,7 +560,7 @@ describe('ol.Map', function() { it('works with touchend events', function() { - var map = new _ol_Map_({ + var map = new Map({ target: target }); @@ -592,7 +592,7 @@ describe('ol.Map', function() { style.width = '360px'; style.height = '180px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target, view: new _ol_View_({ projection: 'EPSG:4326', diff --git a/test/spec/ol/mapbrowserevent.test.js b/test/spec/ol/mapbrowserevent.test.js index 9958964fa1..a5c80ca175 100644 --- a/test/spec/ol/mapbrowserevent.test.js +++ b/test/spec/ol/mapbrowserevent.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../src/ol/Map.js'; +import Map from '../../../src/ol/Map.js'; import MapBrowserEventHandler from '../../../src/ol/MapBrowserEventHandler.js'; import _ol_events_ from '../../../src/ol/events.js'; import _ol_has_ from '../../../src/ol/has.js'; @@ -16,7 +16,7 @@ describe('ol.MapBrowserEventHandler', function() { beforeEach(function() { clock = sinon.useFakeTimers(); target = document.createElement('DIV'); - handler = new MapBrowserEventHandler(new _ol_Map_({ + handler = new MapBrowserEventHandler(new Map({ target: target })); @@ -99,7 +99,7 @@ describe('ol.MapBrowserEventHandler', function() { var handler; beforeEach(function() { - handler = new MapBrowserEventHandler(new _ol_Map_({})); + handler = new MapBrowserEventHandler(new Map({})); }); it('is null if no "down" type event has been handled', function() { @@ -119,8 +119,8 @@ describe('ol.MapBrowserEventHandler', function() { var moveToleranceHandler; var pointerdownAt0; beforeEach(function() { - defaultHandler = new MapBrowserEventHandler(new _ol_Map_({})); - moveToleranceHandler = new MapBrowserEventHandler(new _ol_Map_({}), 8); + defaultHandler = new MapBrowserEventHandler(new Map({})); + moveToleranceHandler = new MapBrowserEventHandler(new Map({}), 8); pointerdownAt0 = new _ol_pointer_PointerEvent_('pointerdown', {}, { clientX: 0, clientY: 0 diff --git a/test/spec/ol/overlay.test.js b/test/spec/ol/overlay.test.js index 7adf87f578..9c8bd619c0 100644 --- a/test/spec/ol/overlay.test.js +++ b/test/spec/ol/overlay.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../src/ol/Map.js'; +import Map from '../../../src/ol/Map.js'; import Overlay from '../../../src/ol/Overlay.js'; import _ol_View_ from '../../../src/ol/View.js'; @@ -20,7 +20,7 @@ describe('ol.Overlay', function() { style.height = height + 'px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target, view: new _ol_View_({ projection: 'EPSG:4326', diff --git a/test/spec/ol/render/box.test.js b/test/spec/ol/render/box.test.js index 9fed4c2f71..2c8e398e38 100644 --- a/test/spec/ol/render/box.test.js +++ b/test/spec/ol/render/box.test.js @@ -1,5 +1,5 @@ import _ol_Disposable_ from '../../../../src/ol/Disposable.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import Polygon from '../../../../src/ol/geom/Polygon.js'; import _ol_render_Box_ from '../../../../src/ol/render/Box.js'; @@ -15,7 +15,7 @@ describe('ol.render.Box', function() { target = document.createElement('div'); document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ target: target, view: new _ol_View_({ center: [0, 0], diff --git a/test/spec/ol/renderer/canvas/imagelayer.test.js b/test/spec/ol/renderer/canvas/imagelayer.test.js index 0c64966ae2..17bd6e6ec1 100644 --- a/test/spec/ol/renderer/canvas/imagelayer.test.js +++ b/test/spec/ol/renderer/canvas/imagelayer.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../../src/ol/Map.js'; +import Map from '../../../../../src/ol/Map.js'; import _ol_View_ from '../../../../../src/ol/View.js'; import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js'; import _ol_proj_Projection_ from '../../../../../src/ol/proj/Projection.js'; @@ -25,7 +25,7 @@ describe('ol.renderer.canvas.ImageLayer', function() { projection: projection, imageExtent: [0, 0, 20, 20] }); - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: target, layers: [new _ol_layer_Image_({ diff --git a/test/spec/ol/renderer/canvas/map.test.js b/test/spec/ol/renderer/canvas/map.test.js index eb8393a940..4ec1266a8a 100644 --- a/test/spec/ol/renderer/canvas/map.test.js +++ b/test/spec/ol/renderer/canvas/map.test.js @@ -1,6 +1,6 @@ import {getUid} from '../../../../../src/ol/index.js'; import _ol_Feature_ from '../../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../../src/ol/Map.js'; +import Map from '../../../../../src/ol/Map.js'; import _ol_View_ from '../../../../../src/ol/View.js'; import Point from '../../../../../src/ol/geom/Point.js'; import TileLayer from '../../../../../src/ol/layer/Tile.js'; @@ -16,7 +16,7 @@ describe('ol.renderer.canvas.Map', function() { describe('constructor', function() { it('creates a new instance', function() { - var map = new _ol_Map_({ + var map = new Map({ target: document.createElement('div') }); var renderer = new _ol_renderer_canvas_Map_(map.viewport_, map); @@ -34,7 +34,7 @@ describe('ol.renderer.canvas.Map', function() { target.style.width = '100px'; target.style.height = '100px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ pixelRatio: 1, target: target, view: new _ol_View_({ @@ -167,7 +167,7 @@ describe('ol.renderer.canvas.Map', function() { var layer, map, renderer; beforeEach(function() { - map = new _ol_Map_({}); + map = new Map({}); map.on('postcompose', function() {}); layer = new _ol_layer_Vector_({ source: new _ol_source_Vector_({wrapX: true}) diff --git a/test/spec/ol/renderer/canvas/tilelayer.test.js b/test/spec/ol/renderer/canvas/tilelayer.test.js index 27136e0213..f8bcd02453 100644 --- a/test/spec/ol/renderer/canvas/tilelayer.test.js +++ b/test/spec/ol/renderer/canvas/tilelayer.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../../src/ol/Map.js'; +import Map from '../../../../../src/ol/Map.js'; import _ol_View_ from '../../../../../src/ol/View.js'; import TileLayer from '../../../../../src/ol/layer/Tile.js'; import {get as getProjection} from '../../../../../src/ol/proj.js'; @@ -27,7 +27,7 @@ describe('ol.renderer.canvas.TileLayer', function() { tile = e.tile; done(); }); - map = new _ol_Map_({ + map = new Map({ target: target, layers: [new TileLayer({ source: source diff --git a/test/spec/ol/renderer/canvas/vectorlayer.test.js b/test/spec/ol/renderer/canvas/vectorlayer.test.js index 2d91cfd06b..8444fa83ac 100644 --- a/test/spec/ol/renderer/canvas/vectorlayer.test.js +++ b/test/spec/ol/renderer/canvas/vectorlayer.test.js @@ -1,6 +1,6 @@ import {getUid} from '../../../../../src/ol/index.js'; import _ol_Feature_ from '../../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../../src/ol/Map.js'; +import Map from '../../../../../src/ol/Map.js'; import _ol_View_ from '../../../../../src/ol/View.js'; import * as _ol_extent_ from '../../../../../src/ol/extent.js'; import Point from '../../../../../src/ol/geom/Point.js'; @@ -49,7 +49,7 @@ describe('ol.renderer.canvas.VectorLayer', function() { target.style.width = '256px'; target.style.height = '256px'; document.body.appendChild(target); - var map = new _ol_Map_({ + var map = new Map({ view: new _ol_View_({ center: [0, 0], zoom: 0 @@ -86,7 +86,7 @@ describe('ol.renderer.canvas.VectorLayer', function() { it('does not re-render for unavailable fonts', function(done) { _ol_obj_.clear(_ol_render_canvas_.checkedFonts_); - var map = new _ol_Map_({ + var map = new Map({ view: new _ol_View_({ center: [0, 0], zoom: 0 @@ -117,7 +117,7 @@ describe('ol.renderer.canvas.VectorLayer', function() { it('does not re-render for available fonts', function(done) { _ol_obj_.clear(_ol_render_canvas_.checkedFonts_); - var map = new _ol_Map_({ + var map = new Map({ view: new _ol_View_({ center: [0, 0], zoom: 0 @@ -149,7 +149,7 @@ describe('ol.renderer.canvas.VectorLayer', function() { it('re-renders for fonts that become available', function(done) { _ol_obj_.clear(_ol_render_canvas_.checkedFonts_); head.appendChild(font); - var map = new _ol_Map_({ + var map = new Map({ view: new _ol_View_({ center: [0, 0], zoom: 0 diff --git a/test/spec/ol/renderer/canvas/vectortilelayer.test.js b/test/spec/ol/renderer/canvas/vectortilelayer.test.js index da6d0af867..46163d858e 100644 --- a/test/spec/ol/renderer/canvas/vectortilelayer.test.js +++ b/test/spec/ol/renderer/canvas/vectortilelayer.test.js @@ -1,7 +1,7 @@ import {getUid, inherits} from '../../../../../src/ol/index.js'; import _ol_obj_ from '../../../../../src/ol/obj.js'; import _ol_Feature_ from '../../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../../src/ol/Map.js'; +import Map from '../../../../../src/ol/Map.js'; import _ol_TileState_ from '../../../../../src/ol/TileState.js'; import _ol_VectorImageTile_ from '../../../../../src/ol/VectorImageTile.js'; import _ol_VectorTile_ from '../../../../../src/ol/VectorTile.js'; @@ -38,7 +38,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() { target.style.width = '256px'; target.style.height = '256px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ view: new _ol_View_({ center: [0, 0], zoom: 0 @@ -355,7 +355,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() { minZoom: 14, maxZoom: 14 }); - var map = new _ol_Map_({ + var map = new Map({ target: target, layers: [ new _ol_layer_VectorTile_({ diff --git a/test/spec/ol/renderer/layer.test.js b/test/spec/ol/renderer/layer.test.js index 9017a068d7..3a9a936850 100644 --- a/test/spec/ol/renderer/layer.test.js +++ b/test/spec/ol/renderer/layer.test.js @@ -1,5 +1,5 @@ import _ol_Image_ from '../../../../src/ol/Image.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js'; import TileLayer from '../../../../src/ol/layer/Tile.js'; @@ -107,7 +107,7 @@ describe('ol.renderer.Layer', function() { url: '#{x}/{y}/{z}' }); - map = new _ol_Map_({ + map = new Map({ target: target, view: view, layers: [ diff --git a/test/spec/ol/renderer/map.test.js b/test/spec/ol/renderer/map.test.js index a6386e4121..4ac5ca4adb 100644 --- a/test/spec/ol/renderer/map.test.js +++ b/test/spec/ol/renderer/map.test.js @@ -1,5 +1,5 @@ import _ol_Disposable_ from '../../../../src/ol/Disposable.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_renderer_Map_ from '../../../../src/ol/renderer/Map.js'; @@ -8,7 +8,7 @@ describe('ol.renderer.Map', function() { describe('constructor', function() { it('createst an instance', function() { - var map = new _ol_Map_({}); + var map = new Map({}); var renderer = new _ol_renderer_Map_(null, map); expect(renderer).to.be.a(_ol_renderer_Map_); expect(renderer).to.be.a(_ol_Disposable_); diff --git a/test/spec/ol/renderer/webgl/imagelayer.test.js b/test/spec/ol/renderer/webgl/imagelayer.test.js index ff9b23b5eb..684f1667be 100644 --- a/test/spec/ol/renderer/webgl/imagelayer.test.js +++ b/test/spec/ol/renderer/webgl/imagelayer.test.js @@ -1,5 +1,5 @@ import _ol_transform_ from '../../../../../src/ol/transform.js'; -import _ol_Map_ from '../../../../../src/ol/Map.js'; +import Map from '../../../../../src/ol/Map.js'; import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js'; import _ol_source_Image_ from '../../../../../src/ol/source/Image.js'; import _ol_renderer_webgl_ImageLayer_ from '../../../../../src/ol/renderer/webgl/ImageLayer.js'; @@ -18,7 +18,7 @@ describe('ol.renderer.webgl.ImageLayer', function() { var imageExtent; beforeEach(function() { - map = new _ol_Map_({ + map = new Map({ target: document.createElement('div') }); var layer = new _ol_layer_Image_({ diff --git a/test/spec/ol/source/raster.test.js b/test/spec/ol/source/raster.test.js index e2206490fb..02f9726123 100644 --- a/test/spec/ol/source/raster.test.js +++ b/test/spec/ol/source/raster.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_TileState_ from '../../../../src/ol/TileState.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_layer_Image_ from '../../../../src/ol/layer/Image.js'; @@ -58,7 +58,7 @@ where('Uint8ClampedArray').describe('ol.source.Raster', function() { } }); - map = new _ol_Map_({ + map = new Map({ target: target, view: new _ol_View_({ resolutions: [1], @@ -323,7 +323,7 @@ where('Uint8ClampedArray').describe('ol.source.Raster', function() { } }); - map2 = new _ol_Map_({ + map2 = new Map({ target: target, view: new _ol_View_({ center: [0, 0], diff --git a/test/spec/ol/source/vector.test.js b/test/spec/ol/source/vector.test.js index 0b65661b29..1e4aac7aa2 100644 --- a/test/spec/ol/source/vector.test.js +++ b/test/spec/ol/source/vector.test.js @@ -1,7 +1,7 @@ import _ol_events_ from '../../../../src/ol/events.js'; import _ol_Collection_ from '../../../../src/ol/Collection.js'; import _ol_Feature_ from '../../../../src/ol/Feature.js'; -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import Point from '../../../../src/ol/geom/Point.js'; import LineString from '../../../../src/ol/geom/LineString.js'; @@ -438,7 +438,7 @@ describe('ol.source.Vector', function() { var div = document.createElement('div'); div.style.width = div.style.height = '100px'; document.body.appendChild(div); - var map = new _ol_Map_({ + var map = new Map({ target: div, layers: [ new _ol_layer_Vector_({ diff --git a/test/spec/ol/source/vectortile.test.js b/test/spec/ol/source/vectortile.test.js index c9ee4f4743..12917f48d9 100644 --- a/test/spec/ol/source/vectortile.test.js +++ b/test/spec/ol/source/vectortile.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../../src/ol/Map.js'; +import Map from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import _ol_VectorImageTile_ from '../../../../src/ol/VectorImageTile.js'; import _ol_VectorTile_ from '../../../../src/ol/VectorTile.js'; @@ -109,7 +109,7 @@ describe('ol.source.VectorTile', function() { target.style.width = target.style.height = '100px'; document.body.appendChild(target); - map = new _ol_Map_({ + map = new Map({ layers: [ new _ol_layer_VectorTile_({ extent: extent, diff --git a/test/spec/ol/view.test.js b/test/spec/ol/view.test.js index c20c94f3db..19743e9815 100644 --- a/test/spec/ol/view.test.js +++ b/test/spec/ol/view.test.js @@ -1,4 +1,4 @@ -import _ol_Map_ from '../../../src/ol/Map.js'; +import Map from '../../../src/ol/Map.js'; import _ol_View_ from '../../../src/ol/View.js'; import _ol_ViewHint_ from '../../../src/ol/ViewHint.js'; import * as _ol_extent_ from '../../../src/ol/extent.js'; @@ -1208,7 +1208,7 @@ describe('ol.View', function() { target = document.createElement('div'); target.style.width = '200px'; target.style.height = '150px'; - map = new _ol_Map_({ + map = new Map({ target: target }); document.body.appendChild(target);