From 25946b45418000fd57272af1fe6a0cfae7ec959c Mon Sep 17 00:00:00 2001 From: Marc Jansen Date: Tue, 19 Dec 2017 08:45:00 +0100 Subject: [PATCH] Rename _ol_layer_Tile_ to TileLayer --- examples/accessible.js | 4 ++-- examples/animation.js | 4 ++-- examples/arcgis-image.js | 4 ++-- examples/arcgis-tiled.js | 6 +++--- examples/attributions.js | 4 ++-- examples/bing-maps.js | 4 ++-- examples/box-selection.js | 4 ++-- examples/button-title.js | 4 ++-- examples/canvas-tiles.js | 6 +++--- examples/cartodb.js | 6 +++--- examples/center.js | 4 ++-- examples/cluster.js | 4 ++-- examples/custom-controls.js | 4 ++-- examples/custom-interactions.js | 4 ++-- examples/d3.js | 4 ++-- examples/device-orientation.js | 4 ++-- examples/drag-and-drop-image-vector.js | 4 ++-- examples/drag-and-drop.js | 4 ++-- examples/drag-rotate-and-zoom.js | 4 ++-- examples/draw-and-modify-features.js | 4 ++-- examples/draw-features.js | 4 ++-- examples/draw-freehand.js | 4 ++-- examples/draw-shapes.js | 4 ++-- examples/dynamic-data.js | 4 ++-- examples/earthquake-clusters.js | 4 ++-- examples/earthquake-custom-symbol.js | 4 ++-- examples/epsg-4326.js | 4 ++-- examples/export-map.js | 4 ++-- examples/export-pdf.js | 4 ++-- examples/extent-interaction.js | 4 ++-- examples/feature-animation.js | 4 ++-- examples/feature-move-animation.js | 4 ++-- examples/flight-animation.js | 4 ++-- examples/full-screen-drag-rotate-and-zoom.js | 4 ++-- examples/full-screen-source.js | 4 ++-- examples/full-screen.js | 4 ++-- examples/geojson-vt.js | 4 ++-- examples/geojson.js | 4 ++-- examples/geolocation-orientation.js | 4 ++-- examples/geolocation.js | 4 ++-- examples/getfeatureinfo-tile.js | 4 ++-- examples/gpx.js | 4 ++-- examples/graticule.js | 4 ++-- examples/heatmap-earthquakes.js | 4 ++-- examples/here-maps.js | 4 ++-- examples/hit-tolerance.js | 4 ++-- examples/icon-color.js | 4 ++-- examples/icon-negative.js | 4 ++-- examples/icon.js | 4 ++-- examples/igc.js | 4 ++-- examples/image-filter.js | 4 ++-- examples/jsts.js | 4 ++-- examples/kml-earthquakes.js | 4 ++-- examples/kml-timezones.js | 4 ++-- examples/kml.js | 4 ++-- examples/layer-clipping-webgl.js | 4 ++-- examples/layer-clipping.js | 4 ++-- examples/layer-extent.js | 6 +++--- examples/layer-group.js | 8 ++++---- examples/layer-spy.js | 6 +++--- examples/layer-swipe.js | 6 +++--- examples/lazy-source.js | 4 ++-- examples/line-arrows.js | 4 ++-- examples/localized-openstreetmap.js | 6 +++--- examples/magnify.js | 4 ++-- examples/measure.js | 4 ++-- examples/min-max-resolution.js | 6 +++--- examples/min-zoom.js | 4 ++-- examples/mobile-full-screen.js | 4 ++-- examples/modify-features.js | 4 ++-- examples/mouse-position.js | 4 ++-- examples/mousewheel-zoom.js | 4 ++-- examples/moveend.js | 4 ++-- examples/navigation-controls.js | 4 ++-- examples/overlay.js | 4 ++-- examples/overviewmap-custom.js | 6 +++--- examples/overviewmap.js | 4 ++-- examples/permalink.js | 4 ++-- examples/pinch-zoom.js | 4 ++-- examples/popup.js | 4 ++-- examples/preload.js | 6 +++--- examples/raster.js | 4 ++-- examples/region-growing.js | 4 ++-- examples/reprojection-by-code.js | 6 +++--- examples/reprojection-image.js | 4 ++-- examples/reprojection-wgs84.js | 4 ++-- examples/reprojection.js | 18 +++++++++--------- examples/reusable-source.js | 4 ++-- examples/rotation.js | 4 ++-- examples/scale-line.js | 4 ++-- examples/scaleline-indiana-east.js | 4 ++-- examples/sea-level.js | 4 ++-- examples/select-features.js | 4 ++-- examples/semi-transparent-layer.js | 6 +++--- examples/shaded-relief.js | 4 ++-- examples/side-by-side.js | 4 ++-- examples/simple.js | 4 ++-- examples/snap.js | 4 ++-- examples/stamen.js | 6 +++--- examples/street-labels.js | 4 ++-- examples/teleport.js | 4 ++-- examples/tile-load-events.js | 4 ++-- examples/tile-transitions.js | 6 +++--- examples/tilejson.js | 4 ++-- examples/tileutfgrid.js | 6 +++--- examples/tissot.js | 6 +++--- examples/topojson.js | 4 ++-- examples/topolis.js | 4 ++-- examples/translate-features.js | 4 ++-- examples/turf.js | 4 ++-- examples/vector-esri-edit.js | 4 ++-- examples/vector-esri.js | 4 ++-- examples/vector-labels.js | 4 ++-- examples/vector-osm.js | 4 ++-- examples/vector-wfs-getfeature.js | 4 ++-- examples/vector-wfs.js | 4 ++-- examples/wkt.js | 4 ++-- examples/wms-custom-proj.js | 6 +++--- examples/wms-custom-tilegrid-512x256.js | 6 +++--- examples/wms-image.js | 4 ++-- examples/wms-no-proj.js | 4 ++-- examples/wms-tiled-wrap-180.js | 6 +++--- examples/wms-tiled.js | 6 +++--- examples/wms-time.js | 6 +++--- examples/wmts-dimensions.js | 6 +++--- examples/wmts-hidpi.js | 4 ++-- examples/wmts-ign.js | 4 ++-- examples/wmts-layer-from-capabilities.js | 6 +++--- examples/wmts.js | 6 +++--- examples/xyz-esri-4326-512.js | 4 ++-- examples/xyz-esri.js | 4 ++-- examples/xyz-retina.js | 6 +++--- examples/xyz.js | 4 ++-- examples/zoom-constrained.js | 4 ++-- examples/zoomify.js | 4 ++-- examples/zoomslider.js | 4 ++-- src/ol/layer/Tile.js | 16 ++++++++-------- src/ol/source/Raster.js | 4 ++-- test/rendering/ol/layer/clip.test.js | 4 ++-- test/rendering/ol/layer/tile.test.js | 4 ++-- test/rendering/ol/source/tilewms.test.js | 18 +++++++++--------- test/spec/ol/control/attribution.test.js | 8 ++++---- test/spec/ol/layer/tile.test.js | 6 +++--- test/spec/ol/map.test.js | 14 +++++++------- test/spec/ol/renderer/canvas/map.test.js | 4 ++-- test/spec/ol/renderer/canvas/tilelayer.test.js | 6 +++--- test/spec/ol/renderer/layer.test.js | 4 ++-- 147 files changed, 350 insertions(+), 350 deletions(-) diff --git a/examples/accessible.js b/examples/accessible.js index b55f292db1..eff1b30126 100644 --- a/examples/accessible.js +++ b/examples/accessible.js @@ -1,13 +1,13 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/animation.js b/examples/animation.js index bfcb09268d..313126e2ea 100644 --- a/examples/animation.js +++ b/examples/animation.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import {easeIn, easeOut} from '../src/ol/easing.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -19,7 +19,7 @@ var view = new _ol_View_({ var map = new _ol_Map_({ target: 'map', layers: [ - new _ol_layer_Tile_({ + new TileLayer({ preload: 4, source: new _ol_source_OSM_() }) diff --git a/examples/arcgis-image.js b/examples/arcgis-image.js index 9d09864e80..8fb0a0ea63 100644 --- a/examples/arcgis-image.js +++ b/examples/arcgis-image.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Image_ from '../src/ol/layer/Image.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_ImageArcGISRest_ from '../src/ol/source/ImageArcGISRest.js'; @@ -9,7 +9,7 @@ var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' + 'Specialty/ESRI_StateCityHighway_USA/MapServer'; var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), new _ol_layer_Image_({ diff --git a/examples/arcgis-tiled.js b/examples/arcgis-tiled.js index 5032cd590e..bff2e8680f 100644 --- a/examples/arcgis-tiled.js +++ b/examples/arcgis-tiled.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_TileArcGISRest_ from '../src/ol/source/TileArcGISRest.js'; @@ -8,10 +8,10 @@ var url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' + 'Specialty/ESRI_StateCityHighway_USA/MapServer'; var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), - new _ol_layer_Tile_({ + new TileLayer({ extent: [-13884991, 2870341, -7455066, 6338219], source: new _ol_source_TileArcGISRest_({ url: url diff --git a/examples/attributions.js b/examples/attributions.js index b3d1f46e06..c0a0ce9f0b 100644 --- a/examples/attributions.js +++ b/examples/attributions.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var attribution = new Attribution({ @@ -10,7 +10,7 @@ var attribution = new Attribution({ }); var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/bing-maps.js b/examples/bing-maps.js index a5c0f9d433..cfd8132086 100644 --- a/examples/bing-maps.js +++ b/examples/bing-maps.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; @@ -15,7 +15,7 @@ var styles = [ var layers = []; var i, ii; for (i = 0, ii = styles.length; i < ii; ++i) { - layers.push(new _ol_layer_Tile_({ + layers.push(new TileLayer({ visible: false, preload: Infinity, source: new _ol_source_BingMaps_({ diff --git a/examples/box-selection.js b/examples/box-selection.js index 958c565db2..30e2018944 100644 --- a/examples/box-selection.js +++ b/examples/box-selection.js @@ -4,7 +4,7 @@ import _ol_events_condition_ from '../src/ol/events/condition.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import DragBox from '../src/ol/interaction/DragBox.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -18,7 +18,7 @@ var vectorSource = new _ol_source_Vector_({ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), new _ol_layer_Vector_({ diff --git a/examples/button-title.js b/examples/button-title.js index 01edba09d1..e19245c185 100644 --- a/examples/button-title.js +++ b/examples/button-title.js @@ -1,11 +1,11 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js index 390fd763d8..91bf379be6 100644 --- a/examples/canvas-tiles.js +++ b/examples/canvas-tiles.js @@ -1,7 +1,7 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_TileDebug_ from '../src/ol/source/TileDebug.js'; @@ -10,10 +10,10 @@ import _ol_source_TileDebug_ from '../src/ol/source/TileDebug.js'; var osmSource = new _ol_source_OSM_(); var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: osmSource }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileDebug_({ projection: 'EPSG:3857', tileGrid: osmSource.getTileGrid() diff --git a/examples/cartodb.js b/examples/cartodb.js index de959d0d67..f97ac79f57 100644 --- a/examples/cartodb.js +++ b/examples/cartodb.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_CartoDB_ from '../src/ol/source/CartoDB.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -22,10 +22,10 @@ var cartoDBSource = new _ol_source_CartoDB_({ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), - new _ol_layer_Tile_({ + new TileLayer({ source: cartoDBSource }) ], diff --git a/examples/center.js b/examples/center.js index f52dc717e2..16363d69d3 100644 --- a/examples/center.js +++ b/examples/center.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -44,7 +44,7 @@ var view = new _ol_View_({ }); var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), vectorLayer diff --git a/examples/cluster.js b/examples/cluster.js index b991ccd5f3..271e0b9378 100644 --- a/examples/cluster.js +++ b/examples/cluster.js @@ -2,7 +2,7 @@ import _ol_Feature_ from '../src/ol/Feature.js'; import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_Cluster_ from '../src/ol/source/Cluster.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -63,7 +63,7 @@ var clusters = new _ol_layer_Vector_({ } }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/custom-controls.js b/examples/custom-controls.js index e0b2295b47..abe81b6271 100644 --- a/examples/custom-controls.js +++ b/examples/custom-controls.js @@ -3,7 +3,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -66,7 +66,7 @@ var map = new _ol_Map_({ new app.RotateNorthControl() ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/custom-interactions.js b/examples/custom-interactions.js index c3ba857f38..b91d25b2a3 100644 --- a/examples/custom-interactions.js +++ b/examples/custom-interactions.js @@ -7,7 +7,7 @@ import Point from '../src/ol/geom/Point.js'; import Polygon from '../src/ol/geom/Polygon.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import _ol_interaction_Pointer_ from '../src/ol/interaction/Pointer.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -147,7 +147,7 @@ var polygonFeature = new _ol_Feature_( var map = new _ol_Map_({ interactions: defaultInteractions().extend([new app.Drag()]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure' }) diff --git a/examples/d3.js b/examples/d3.js index 867f239693..67fbc9defa 100644 --- a/examples/d3.js +++ b/examples/d3.js @@ -3,7 +3,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat, toLonLat} from '../src/ol/proj.js'; import _ol_source_ImageCanvas_ from '../src/ol/source/ImageCanvas.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; @@ -11,7 +11,7 @@ import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_Stamen_({ layer: 'watercolor' }) diff --git a/examples/device-orientation.js b/examples/device-orientation.js index 0f2a1d4b6a..3a49779683 100644 --- a/examples/device-orientation.js +++ b/examples/device-orientation.js @@ -2,7 +2,7 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_math_ from '../src/ol/math.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -12,7 +12,7 @@ var view = new _ol_View_({ }); var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + 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 c4a1588e17..d662ebe641 100644 --- a/examples/drag-and-drop-image-vector.js +++ b/examples/drag-and-drop-image-vector.js @@ -8,7 +8,7 @@ import TopoJSON from '../src/ol/format/TopoJSON.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import DragAndDrop from '../src/ol/interaction/DragAndDrop.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js'; @@ -96,7 +96,7 @@ var dragAndDropInteraction = new DragAndDrop({ var map = new _ol_Map_({ interactions: defaultInteractions().extend([dragAndDropInteraction]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_BingMaps_({ imagerySet: 'Aerial', key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js index d66526e0c6..93b31415b3 100644 --- a/examples/drag-and-drop.js +++ b/examples/drag-and-drop.js @@ -7,7 +7,7 @@ import KML from '../src/ol/format/KML.js'; import TopoJSON from '../src/ol/format/TopoJSON.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import DragAndDrop from '../src/ol/interaction/DragAndDrop.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -96,7 +96,7 @@ var dragAndDropInteraction = new DragAndDrop({ var map = new _ol_Map_({ interactions: defaultInteractions().extend([dragAndDropInteraction]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_BingMaps_({ imagerySet: 'Aerial', key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' diff --git a/examples/drag-rotate-and-zoom.js b/examples/drag-rotate-and-zoom.js index fb5d78b749..042e63584c 100644 --- a/examples/drag-rotate-and-zoom.js +++ b/examples/drag-rotate-and-zoom.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -11,7 +11,7 @@ var map = new _ol_Map_({ new DragRotateAndZoom() ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/draw-and-modify-features.js b/examples/draw-and-modify-features.js index c7ee66ffe8..d97935fcbf 100644 --- a/examples/draw-and-modify-features.js +++ b/examples/draw-and-modify-features.js @@ -3,7 +3,7 @@ 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'; import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -12,7 +12,7 @@ import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/draw-features.js b/examples/draw-features.js index 3ff87ddb22..6928db8aa8 100644 --- a/examples/draw-features.js +++ b/examples/draw-features.js @@ -1,12 +1,12 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Draw from '../src/ol/interaction/Draw.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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 raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/draw-freehand.js b/examples/draw-freehand.js index 540bb8c942..e723905c2b 100644 --- a/examples/draw-freehand.js +++ b/examples/draw-freehand.js @@ -1,12 +1,12 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Draw from '../src/ol/interaction/Draw.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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 raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/draw-shapes.js b/examples/draw-shapes.js index 535064d8b3..7fbeed5cd1 100644 --- a/examples/draw-shapes.js +++ b/examples/draw-shapes.js @@ -2,12 +2,12 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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 raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js index 7d2cc0c624..a61765f24a 100644 --- a/examples/dynamic-data.js +++ b/examples/dynamic-data.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Fill_ from '../src/ol/style/Fill.js'; @@ -12,7 +12,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/earthquake-clusters.js b/examples/earthquake-clusters.js index d91525ab9d..67dec35292 100644 --- a/examples/earthquake-clusters.js +++ b/examples/earthquake-clusters.js @@ -4,7 +4,7 @@ import * as _ol_extent_ from '../src/ol/extent.js'; import KML from '../src/ol/format/KML.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_Cluster_ from '../src/ol/source/Cluster.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; @@ -134,7 +134,7 @@ vector = new _ol_layer_Vector_({ style: styleFunction }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_Stamen_({ layer: 'toner' }) diff --git a/examples/earthquake-custom-symbol.js b/examples/earthquake-custom-symbol.js index c989bb341f..29cf87e9fc 100644 --- a/examples/earthquake-custom-symbol.js +++ b/examples/earthquake-custom-symbol.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_render_ from '../src/ol/render.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; @@ -62,7 +62,7 @@ var vector = new _ol_layer_Vector_({ style: styleFunction }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_Stamen_({ layer: 'toner' }) diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js index cf60f5a644..87007422df 100644 --- a/examples/epsg-4326.js +++ b/examples/epsg-4326.js @@ -2,12 +2,12 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileWMS_({ url: 'https://ahocevar.com/geoserver/wms', params: { diff --git a/examples/export-map.js b/examples/export-map.js index 0b79d2a0e7..10974831d4 100644 --- a/examples/export-map.js +++ b/examples/export-map.js @@ -4,14 +4,14 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), new _ol_layer_Vector_({ diff --git a/examples/export-pdf.js b/examples/export-pdf.js index 61ff04c2e9..191469da47 100644 --- a/examples/export-pdf.js +++ b/examples/export-pdf.js @@ -3,12 +3,12 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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 raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/extent-interaction.js b/examples/extent-interaction.js index 655bb9e138..1aaa87832b 100644 --- a/examples/extent-interaction.js +++ b/examples/extent-interaction.js @@ -3,7 +3,7 @@ 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'; import _ol_interaction_Extent_ from '../src/ol/interaction/Extent.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -15,7 +15,7 @@ var vectorSource = new _ol_source_Vector_({ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), new _ol_layer_Vector_({ diff --git a/examples/feature-animation.js b/examples/feature-animation.js index 2586623745..8a9024ab06 100644 --- a/examples/feature-animation.js +++ b/examples/feature-animation.js @@ -5,7 +5,7 @@ import _ol_View_ from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import {easeOut} from '../src/ol/easing.js'; import Point from '../src/ol/geom/Point.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -17,7 +17,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_({ wrapX: false }) diff --git a/examples/feature-move-animation.js b/examples/feature-move-animation.js index 644b9425e5..94dfc78568 100644 --- a/examples/feature-move-animation.js +++ b/examples/feature-move-animation.js @@ -3,7 +3,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -137,7 +137,7 @@ var map = new _ol_Map_({ maxZoom: 19 }), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_BingMaps_({ imagerySet: 'AerialWithLabels', key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' diff --git a/examples/flight-animation.js b/examples/flight-animation.js index 0b32c3de68..88c3a8e63e 100644 --- a/examples/flight-animation.js +++ b/examples/flight-animation.js @@ -3,7 +3,7 @@ import _ol_Feature_ from '../src/ol/Feature.js'; import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import LineString from '../src/ol/geom/LineString.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -12,7 +12,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_Stamen_({ layer: 'toner' }) diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js index 6590316db3..4edb4af1a0 100644 --- a/examples/full-screen-drag-rotate-and-zoom.js +++ b/examples/full-screen-drag-rotate-and-zoom.js @@ -4,7 +4,7 @@ import {defaults as defaultControls} from '../src/ol/control.js'; import FullScreen from '../src/ol/control/FullScreen.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; @@ -16,7 +16,7 @@ var map = new _ol_Map_({ new DragRotateAndZoom() ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_BingMaps_({ key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5', imagerySet: 'Aerial' diff --git a/examples/full-screen-source.js b/examples/full-screen-source.js index 832d75a26f..aa85075580 100644 --- a/examples/full-screen-source.js +++ b/examples/full-screen-source.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -18,7 +18,7 @@ var map = new _ol_Map_({ }) ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/full-screen.js b/examples/full-screen.js index c9c16a7067..f0cddb2cbd 100644 --- a/examples/full-screen.js +++ b/examples/full-screen.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; @@ -16,7 +16,7 @@ var map = new _ol_Map_({ new FullScreen() ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_BingMaps_({ key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5', imagerySet: 'Aerial' diff --git a/examples/geojson-vt.js b/examples/geojson-vt.js index fad9a58d3c..f017dbea76 100644 --- a/examples/geojson-vt.js +++ b/examples/geojson-vt.js @@ -4,7 +4,7 @@ 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'; import _ol_source_VectorTile_ from '../src/ol/source/VectorTile.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_VectorTile_ from '../src/ol/layer/VectorTile.js'; import _ol_proj_Projection_ from '../src/ol/proj/Projection.js'; @@ -55,7 +55,7 @@ var tilePixels = new _ol_proj_Projection_({ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/geojson.js b/examples/geojson.js index 85eda66855..1bf9fd40a1 100644 --- a/examples/geojson.js +++ b/examples/geojson.js @@ -4,7 +4,7 @@ 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'; import Circle from '../src/ol/geom/Circle.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -173,7 +173,7 @@ var vectorLayer = new _ol_layer_Vector_({ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), vectorLayer diff --git a/examples/geolocation-orientation.js b/examples/geolocation-orientation.js index e8079f1a9c..17a013222a 100644 --- a/examples/geolocation-orientation.js +++ b/examples/geolocation-orientation.js @@ -4,7 +4,7 @@ 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'; import LineString from '../src/ol/geom/LineString.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -17,7 +17,7 @@ var view = new _ol_View_({ // creating the map var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/geolocation.js b/examples/geolocation.js index 6fe013f697..b67c4fa652 100644 --- a/examples/geolocation.js +++ b/examples/geolocation.js @@ -4,7 +4,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -20,7 +20,7 @@ var view = new _ol_View_({ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/getfeatureinfo-tile.js b/examples/getfeatureinfo-tile.js index 11cbb4039e..1d733698ef 100644 --- a/examples/getfeatureinfo-tile.js +++ b/examples/getfeatureinfo-tile.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; @@ -11,7 +11,7 @@ var wmsSource = new _ol_source_TileWMS_({ crossOrigin: 'anonymous' }); -var wmsLayer = new _ol_layer_Tile_({ +var wmsLayer = new TileLayer({ source: wmsSource }); diff --git a/examples/gpx.js b/examples/gpx.js index c0def97c58..d3f58fbf53 100644 --- a/examples/gpx.js +++ b/examples/gpx.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GPX from '../src/ol/format/GPX.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -10,7 +10,7 @@ import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_BingMaps_({ imagerySet: 'Aerial', key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' diff --git a/examples/graticule.js b/examples/graticule.js index 357a2c2243..a067fbfa60 100644 --- a/examples/graticule.js +++ b/examples/graticule.js @@ -1,7 +1,7 @@ import Graticule from '../src/ol/Graticule.js'; import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; @@ -9,7 +9,7 @@ import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_({ wrapX: false }) diff --git a/examples/heatmap-earthquakes.js b/examples/heatmap-earthquakes.js index d3851061fb..30ee8b9677 100644 --- a/examples/heatmap-earthquakes.js +++ b/examples/heatmap-earthquakes.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -29,7 +29,7 @@ vector.getSource().on('addfeature', function(event) { event.feature.set('weight', magnitude - 5); }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_Stamen_({ layer: 'toner' }) diff --git a/examples/here-maps.js b/examples/here-maps.js index 4906916dfb..9305e94c55 100644 --- a/examples/here-maps.js +++ b/examples/here-maps.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; var appId = 'kDm0Jq1K4Ak7Bwtn8uvk'; @@ -56,7 +56,7 @@ var layers = []; var i, ii; for (i = 0, ii = hereLayers.length; i < ii; ++i) { var layerDesc = hereLayers[i]; - layers.push(new _ol_layer_Tile_({ + layers.push(new TileLayer({ visible: false, preload: Infinity, source: new _ol_source_XYZ_({ diff --git a/examples/hit-tolerance.js b/examples/hit-tolerance.js index 2e61c4a6dc..49aca7c0cc 100644 --- a/examples/hit-tolerance.js +++ b/examples/hit-tolerance.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -9,7 +9,7 @@ import LineString from '../src/ol/geom/LineString.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/icon-color.js b/examples/icon-color.js index 500d102b25..4bc2c8b3fd 100644 --- a/examples/icon-color.js +++ b/examples/icon-color.js @@ -2,7 +2,7 @@ import _ol_Feature_ from '../src/ol/Feature.js'; import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; @@ -56,7 +56,7 @@ var vectorLayer = new _ol_layer_Vector_({ source: vectorSource }); -var rasterLayer = new _ol_layer_Tile_({ +var rasterLayer = new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure', crossOrigin: '' diff --git a/examples/icon-negative.js b/examples/icon-negative.js index 6abd58f4fc..8d20793cdc 100644 --- a/examples/icon-negative.js +++ b/examples/icon-negative.js @@ -3,7 +3,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -28,7 +28,7 @@ iconFeature.set('style', createStyle('data/icon.png', undefined)); var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_Stamen_({layer: 'watercolor'}) }), new _ol_layer_Vector_({ diff --git a/examples/icon.js b/examples/icon.js index 10eef9da9e..676d53bd79 100644 --- a/examples/icon.js +++ b/examples/icon.js @@ -3,7 +3,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_View_ from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -37,7 +37,7 @@ var vectorLayer = new _ol_layer_Vector_({ source: vectorSource }); -var rasterLayer = new _ol_layer_Tile_({ +var rasterLayer = new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure', crossOrigin: '' diff --git a/examples/igc.js b/examples/igc.js index 43c970b005..597ad34f79 100644 --- a/examples/igc.js +++ b/examples/igc.js @@ -5,7 +5,7 @@ import {defaults as defaultControls} from '../src/ol/control.js'; import IGC from '../src/ol/format/IGC.js'; import LineString from '../src/ol/geom/LineString.js'; import Point from '../src/ol/geom/Point.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -82,7 +82,7 @@ vectorSource.on('addfeature', function(event) { var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_({ attributions: [ 'All maps © OpenCycleMap', diff --git a/examples/image-filter.js b/examples/image-filter.js index 16121c931d..9b862a4f5b 100644 --- a/examples/image-filter.js +++ b/examples/image-filter.js @@ -1,12 +1,12 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'; -var imagery = new _ol_layer_Tile_({ +var imagery = new TileLayer({ source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'}) }); diff --git a/examples/jsts.js b/examples/jsts.js index 038f2e6294..ad9bb06423 100644 --- a/examples/jsts.js +++ b/examples/jsts.js @@ -3,7 +3,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -37,7 +37,7 @@ var vectorLayer = new _ol_layer_Vector_({ source: source }); -var rasterLayer = new _ol_layer_Tile_({ +var rasterLayer = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js index a526641253..4b15ed4f3d 100644 --- a/examples/kml-earthquakes.js +++ b/examples/kml-earthquakes.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -48,7 +48,7 @@ var vector = new _ol_layer_Vector_({ style: styleFunction }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_Stamen_({ layer: 'toner' }) diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js index 0439f5e329..701a27484a 100644 --- a/examples/kml-timezones.js +++ b/examples/kml-timezones.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -55,7 +55,7 @@ var vector = new _ol_layer_Vector_({ style: styleFunction }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_Stamen_({ layer: 'toner' }) diff --git a/examples/kml.js b/examples/kml.js index e8225d29c1..f108af9698 100644 --- a/examples/kml.js +++ b/examples/kml.js @@ -1,12 +1,12 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import KML from '../src/ol/format/KML.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_BingMaps_({ imagerySet: 'Aerial', key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' diff --git a/examples/layer-clipping-webgl.js b/examples/layer-clipping-webgl.js index bcbd3bd1ca..0a2a3869c9 100644 --- a/examples/layer-clipping-webgl.js +++ b/examples/layer-clipping-webgl.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; if (!_ol_has_.WEBGL) { @@ -13,7 +13,7 @@ if (!_ol_has_.WEBGL) { info.style.display = ''; } else { - var osm = new _ol_layer_Tile_({ + var osm = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/layer-clipping.js b/examples/layer-clipping.js index 231a1556b1..086c23d643 100644 --- a/examples/layer-clipping.js +++ b/examples/layer-clipping.js @@ -1,10 +1,10 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var osm = new _ol_layer_Tile_({ +var osm = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/layer-extent.js b/examples/layer-extent.js index af3f2b2a99..f3ed19c1c4 100644 --- a/examples/layer-extent.js +++ b/examples/layer-extent.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {transformExtent} from '../src/ol/proj.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; @@ -15,14 +15,14 @@ var extents = { Sweden: transform([11.02737, 55.36174, 23.90338, 69.10625]) }; -var base = new _ol_layer_Tile_({ +var base = new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.world-light.json?secure', crossOrigin: 'anonymous' }) }); -var overlay = new _ol_layer_Tile_({ +var overlay = new TileLayer({ extent: extents.India, source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.world-black.json?secure', diff --git a/examples/layer-group.js b/examples/layer-group.js index fcbd8371eb..bef15b69a9 100644 --- a/examples/layer-group.js +++ b/examples/layer-group.js @@ -1,24 +1,24 @@ import _ol_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 _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), new _ol_layer_Group_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.20110804-hoa-foodinsecurity-3month.json?secure', crossOrigin: 'anonymous' }) }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.world-borders-light.json?secure', crossOrigin: 'anonymous' diff --git a/examples/layer-spy.js b/examples/layer-spy.js index bea9855bae..a57365d662 100644 --- a/examples/layer-spy.js +++ b/examples/layer-spy.js @@ -1,16 +1,16 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'; -var roads = new _ol_layer_Tile_({ +var roads = new TileLayer({ source: new _ol_source_BingMaps_({key: key, imagerySet: 'Road'}) }); -var imagery = new _ol_layer_Tile_({ +var imagery = new TileLayer({ source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'}) }); diff --git a/examples/layer-swipe.js b/examples/layer-swipe.js index d7fbb995c1..56fe1513da 100644 --- a/examples/layer-swipe.js +++ b/examples/layer-swipe.js @@ -1,14 +1,14 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var osm = new _ol_layer_Tile_({ +var osm = new TileLayer({ source: new _ol_source_OSM_() }); -var bing = new _ol_layer_Tile_({ +var bing = new TileLayer({ source: new _ol_source_BingMaps_({ key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5', imagerySet: 'Aerial' diff --git a/examples/lazy-source.js b/examples/lazy-source.js index 90a3455d57..91d809216f 100644 --- a/examples/lazy-source.js +++ b/examples/lazy-source.js @@ -1,11 +1,11 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var source = new _ol_source_OSM_(); -var layer = new _ol_layer_Tile_(); +var layer = new TileLayer(); var map = new _ol_Map_({ layers: [layer], diff --git a/examples/line-arrows.js b/examples/line-arrows.js index 4360f856ee..c546419776 100644 --- a/examples/line-arrows.js +++ b/examples/line-arrows.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -10,7 +10,7 @@ import _ol_style_Icon_ from '../src/ol/style/Icon.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js index d469e0182d..d5ac41519d 100644 --- a/examples/localized-openstreetmap.js +++ b/examples/localized-openstreetmap.js @@ -1,11 +1,11 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var openCycleMapLayer = new _ol_layer_Tile_({ +var openCycleMapLayer = new TileLayer({ source: new _ol_source_OSM_({ attributions: [ 'All maps © OpenCycleMap', @@ -16,7 +16,7 @@ var openCycleMapLayer = new _ol_layer_Tile_({ }) }); -var openSeaMapLayer = new _ol_layer_Tile_({ +var openSeaMapLayer = new TileLayer({ source: new _ol_source_OSM_({ attributions: [ 'All maps © OpenSeaMap', diff --git a/examples/magnify.js b/examples/magnify.js index 1226dc8f08..e819772ecb 100644 --- a/examples/magnify.js +++ b/examples/magnify.js @@ -1,12 +1,12 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'; -var imagery = new _ol_layer_Tile_({ +var imagery = new TileLayer({ source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'}) }); diff --git a/examples/measure.js b/examples/measure.js index a519eb6346..e2e6779d8a 100644 --- a/examples/measure.js +++ b/examples/measure.js @@ -6,7 +6,7 @@ import _ol_View_ from '../src/ol/View.js'; import LineString from '../src/ol/geom/LineString.js'; import Polygon from '../src/ol/geom/Polygon.js'; import Draw from '../src/ol/interaction/Draw.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -16,7 +16,7 @@ import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/min-max-resolution.js b/examples/min-max-resolution.js index 204f555bdd..b1a21293d1 100644 --- a/examples/min-max-resolution.js +++ b/examples/min-max-resolution.js @@ -1,7 +1,7 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; @@ -11,12 +11,12 @@ import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; */ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_(), minResolution: 200, maxResolution: 2000 }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy.json?secure', crossOrigin: 'anonymous' diff --git a/examples/min-zoom.js b/examples/min-zoom.js index 1db9857cd4..012449cdc8 100644 --- a/examples/min-zoom.js +++ b/examples/min-zoom.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var viewport = document.getElementById('map'); @@ -20,7 +20,7 @@ var view = new _ol_View_({ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/mobile-full-screen.js b/examples/mobile-full-screen.js index 26e56ae028..4cb8143006 100644 --- a/examples/mobile-full-screen.js +++ b/examples/mobile-full-screen.js @@ -1,7 +1,7 @@ import Geolocation from '../src/ol/Geolocation.js'; import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; @@ -12,7 +12,7 @@ var view = new _ol_View_({ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_BingMaps_({ key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5', imagerySet: 'Road' diff --git a/examples/modify-features.js b/examples/modify-features.js index 1e9cb7160a..dd24a3884e 100644 --- a/examples/modify-features.js +++ b/examples/modify-features.js @@ -4,13 +4,13 @@ import GeoJSON from '../src/ol/format/GeoJSON.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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 raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/mouse-position.js b/examples/mouse-position.js index e0aaed2a4f..7222722612 100644 --- a/examples/mouse-position.js +++ b/examples/mouse-position.js @@ -3,7 +3,7 @@ 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'; import _ol_coordinate_ from '../src/ol/coordinate.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var mousePositionControl = new MousePosition({ @@ -23,7 +23,7 @@ var map = new _ol_Map_({ } }).extend([mousePositionControl]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/mousewheel-zoom.js b/examples/mousewheel-zoom.js index 57cdd565c1..3a91429154 100644 --- a/examples/mousewheel-zoom.js +++ b/examples/mousewheel-zoom.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -13,7 +13,7 @@ var map = new _ol_Map_({ }) ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/moveend.js b/examples/moveend.js index e622d1d3d8..692a3b60c4 100644 --- a/examples/moveend.js +++ b/examples/moveend.js @@ -2,14 +2,14 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {toLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js index 1301f16b56..2b4d10b6fa 100644 --- a/examples/navigation-controls.js +++ b/examples/navigation-controls.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -20,7 +20,7 @@ var map = new _ol_Map_({ }) ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/overlay.js b/examples/overlay.js index b820fbf49b..3724a7d97d 100644 --- a/examples/overlay.js +++ b/examples/overlay.js @@ -2,12 +2,12 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_coordinate_ from '../src/ol/coordinate.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat, toLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var layer = new _ol_layer_Tile_({ +var layer = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/overviewmap-custom.js b/examples/overviewmap-custom.js index 57628698d2..77c20bce51 100644 --- a/examples/overviewmap-custom.js +++ b/examples/overviewmap-custom.js @@ -4,7 +4,7 @@ import {defaults as defaultControls} from '../src/ol/control.js'; import OverviewMap from '../src/ol/control/OverviewMap.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -12,7 +12,7 @@ var overviewMapControl = new OverviewMap({ // see in overviewmap-custom.html to see the custom CSS used className: 'ol-overviewmap ol-custom-overviewmap', layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_({ 'url': 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' + '?apikey=0e6fc415256d4fbb9b5166a718591d71' @@ -32,7 +32,7 @@ var map = new _ol_Map_({ new DragRotateAndZoom() ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/overviewmap.js b/examples/overviewmap.js index cbcc7e1091..3a57e81905 100644 --- a/examples/overviewmap.js +++ b/examples/overviewmap.js @@ -2,7 +2,7 @@ import _ol_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 _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var map = new _ol_Map_({ @@ -10,7 +10,7 @@ var map = new _ol_Map_({ new OverviewMap() ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/permalink.js b/examples/permalink.js index 9602a09af5..94d0b92bf0 100644 --- a/examples/permalink.js +++ b/examples/permalink.js @@ -1,7 +1,7 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; // default zoom, center and rotation @@ -25,7 +25,7 @@ if (window.location.hash !== '') { var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/pinch-zoom.js b/examples/pinch-zoom.js index efff493faf..32ff36a057 100644 --- a/examples/pinch-zoom.js +++ b/examples/pinch-zoom.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -13,7 +13,7 @@ var map = new _ol_Map_({ }) ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/popup.js b/examples/popup.js index f561b097a4..cb06cf7127 100644 --- a/examples/popup.js +++ b/examples/popup.js @@ -2,7 +2,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_coordinate_ from '../src/ol/coordinate.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {toLonLat} from '../src/ol/proj.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; @@ -43,7 +43,7 @@ closer.onclick = function() { */ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy.json?secure', crossOrigin: 'anonymous' diff --git a/examples/preload.js b/examples/preload.js index 8ae65a9643..8e9ba9ea41 100644 --- a/examples/preload.js +++ b/examples/preload.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; @@ -11,7 +11,7 @@ var view = new _ol_View_({ var map1 = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ preload: Infinity, source: new _ol_source_BingMaps_({ key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5', @@ -25,7 +25,7 @@ var map1 = new _ol_Map_({ var map2 = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ preload: 0, // default value source: new _ol_source_BingMaps_({ key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5', diff --git a/examples/raster.js b/examples/raster.js index 11f1bb6875..ca4bc8d4be 100644 --- a/examples/raster.js +++ b/examples/raster.js @@ -3,7 +3,7 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_Raster_ from '../src/ol/source/Raster.js'; @@ -112,7 +112,7 @@ raster.on('afteroperations', function(event) { var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: bing }), new _ol_layer_Image_({ diff --git a/examples/region-growing.js b/examples/region-growing.js index b3c0923da3..857bab326a 100644 --- a/examples/region-growing.js +++ b/examples/region-growing.js @@ -2,7 +2,7 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_Raster_ from '../src/ol/source/Raster.js'; @@ -74,7 +74,7 @@ function next4Edges(edge) { var key = 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5'; -var imagery = new _ol_layer_Tile_({ +var imagery = new TileLayer({ source: new _ol_source_BingMaps_({key: key, imagerySet: 'Aerial'}) }); diff --git a/examples/reprojection-by-code.js b/examples/reprojection-by-code.js index 451836c0f0..63ac586e7e 100644 --- a/examples/reprojection-by-code.js +++ b/examples/reprojection-by-code.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {get as getProjection, getTransform} from '../src/ol/proj.js'; import {register} from '../src/ol/proj/proj4.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -11,7 +11,7 @@ import proj4 from 'proj4'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], @@ -100,7 +100,7 @@ searchButton.onclick = function(event) { */ renderEdgesCheckbox.onchange = function() { map.getLayers().forEach(function(layer) { - if (layer instanceof _ol_layer_Tile_) { + if (layer instanceof TileLayer) { var source = layer.getSource(); if (source instanceof _ol_source_TileImage_) { source.setRenderReprojectionEdges(renderEdgesCheckbox.checked); diff --git a/examples/reprojection-image.js b/examples/reprojection-image.js index b11ef49bc4..8cf34257dc 100644 --- a/examples/reprojection-image.js +++ b/examples/reprojection-image.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {transform} from '../src/ol/proj.js'; import _ol_source_ImageStatic_ from '../src/ol/source/ImageStatic.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -19,7 +19,7 @@ var imageExtent = [0, 0, 700000, 1300000]; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), new _ol_layer_Image_({ diff --git a/examples/reprojection-wgs84.js b/examples/reprojection-wgs84.js index f99eafdc96..481da6e1cd 100644 --- a/examples/reprojection-wgs84.js +++ b/examples/reprojection-wgs84.js @@ -1,11 +1,11 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/reprojection.js b/examples/reprojection.js index 376e38f942..d78ecd2a7d 100644 --- a/examples/reprojection.js +++ b/examples/reprojection.js @@ -2,7 +2,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import _ol_format_WMTSCapabilities_ from '../src/ol/format/WMTSCapabilities.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {get as getProjection} from '../src/ol/proj.js'; import {register} from '../src/ol/proj/proj4.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -58,7 +58,7 @@ proj54009.setExtent([-18e6, -9e6, 18e6, 9e6]); var layers = {}; -layers['bng'] = new _ol_layer_Tile_({ +layers['bng'] = new TileLayer({ source: new _ol_source_XYZ_({ projection: 'EPSG:27700', url: 'https://tileserver.maptiler.com/miniscale/{z}/{x}/{y}.png', @@ -67,11 +67,11 @@ layers['bng'] = new _ol_layer_Tile_({ }) }); -layers['osm'] = new _ol_layer_Tile_({ +layers['osm'] = new TileLayer({ source: new _ol_source_OSM_() }); -layers['wms4326'] = new _ol_layer_Tile_({ +layers['wms4326'] = new TileLayer({ source: new _ol_source_TileWMS_({ url: 'https://ahocevar.com/geoserver/wms', crossOrigin: '', @@ -83,7 +83,7 @@ layers['wms4326'] = new _ol_layer_Tile_({ }) }); -layers['wms21781'] = new _ol_layer_Tile_({ +layers['wms21781'] = new TileLayer({ source: new _ol_source_TileWMS_({ attributions: '© Pixelmap 1:1000000 / geo.admin.ch', @@ -111,12 +111,12 @@ fetch(url).then(function(response) { options.crossOrigin = ''; options.projection = 'EPSG:3413'; options.wrapX = false; - layers['wmts3413'] = new _ol_layer_Tile_({ + layers['wmts3413'] = new TileLayer({ source: new _ol_source_WMTS_(/** @type {!olx.source.WMTSOptions} */ (options)) }); }); -layers['grandcanyon'] = new _ol_layer_Tile_({ +layers['grandcanyon'] = new TileLayer({ source: new _ol_source_XYZ_({ url: 'https://tileserver.maptiler.com/grandcanyon@2x/{z}/{x}/{y}.png', crossOrigin: '', @@ -134,7 +134,7 @@ for (var i = 0, ii = resolutions.length; i < ii; ++i) { resolutions[i] = startResolution / Math.pow(2, i); } -layers['states'] = new _ol_layer_Tile_({ +layers['states'] = new TileLayer({ source: new _ol_source_TileWMS_({ url: 'https://ahocevar.com/geoserver/wms', crossOrigin: '', @@ -200,7 +200,7 @@ viewProjSelect.onchange = function() { updateViewProjection(); var updateRenderEdgesOnLayer = function(layer) { - if (layer instanceof _ol_layer_Tile_) { + if (layer instanceof TileLayer) { var source = layer.getSource(); if (source instanceof _ol_source_TileImage_) { source.setRenderReprojectionEdges(renderEdges); diff --git a/examples/reusable-source.js b/examples/reusable-source.js index de03599762..72f2ef0436 100644 --- a/examples/reusable-source.js +++ b/examples/reusable-source.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; var urls = [ @@ -15,7 +15,7 @@ var source = new _ol_source_XYZ_(); var map = new _ol_Map_({ target: 'map', layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: source }) ], diff --git a/examples/rotation.js b/examples/rotation.js index 00fae82586..b90c39c4da 100644 --- a/examples/rotation.js +++ b/examples/rotation.js @@ -1,13 +1,13 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/scale-line.js b/examples/scale-line.js index 50ca60c3d6..8c8a51a855 100644 --- a/examples/scale-line.js +++ b/examples/scale-line.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -17,7 +17,7 @@ var map = new _ol_Map_({ scaleLineControl ]), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/scaleline-indiana-east.js b/examples/scaleline-indiana-east.js index d203095eaa..3634fec7c3 100644 --- a/examples/scaleline-indiana-east.js +++ b/examples/scaleline-indiana-east.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import ScaleLine from '../src/ol/control/ScaleLine.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat, transformExtent} from '../src/ol/proj.js'; import {register} from '../src/ol/proj/proj4.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -20,7 +20,7 @@ register(proj4); var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/sea-level.js b/examples/sea-level.js index 12b42d5a6d..fc2d841f19 100644 --- a/examples/sea-level.js +++ b/examples/sea-level.js @@ -2,7 +2,7 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_Raster_ from '../src/ol/source/Raster.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; @@ -38,7 +38,7 @@ var raster = new _ol_source_Raster_({ var map = new _ol_Map_({ target: 'map', layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_XYZ_({ url: 'https://api.mapbox.com/styles/v1/tschaub/ciutc102t00c62js5fqd47kqw/tiles/256/{z}/{x}/{y}?access_token=' + key }) diff --git a/examples/select-features.js b/examples/select-features.js index 6d1a0d8039..2f90ac845d 100644 --- a/examples/select-features.js +++ b/examples/select-features.js @@ -3,12 +3,12 @@ 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'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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 raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/semi-transparent-layer.js b/examples/semi-transparent-layer.js index ed16abc2cb..8ef4ef2520 100644 --- a/examples/semi-transparent-layer.js +++ b/examples/semi-transparent-layer.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -8,10 +8,10 @@ import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.va-quake-aug.json?secure', crossOrigin: 'anonymous' diff --git a/examples/shaded-relief.js b/examples/shaded-relief.js index b98d9ca3f7..fcd492305c 100644 --- a/examples/shaded-relief.js +++ b/examples/shaded-relief.js @@ -2,7 +2,7 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_Raster_ from '../src/ol/source/Raster.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; @@ -117,7 +117,7 @@ var raster = new _ol_source_Raster_({ var map = new _ol_Map_({ target: 'map', layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), new _ol_layer_Image_({ diff --git a/examples/side-by-side.js b/examples/side-by-side.js index 8ee526103a..94ae0a30e1 100644 --- a/examples/side-by-side.js +++ b/examples/side-by-side.js @@ -1,10 +1,10 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_has_ from '../src/ol/has.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; -var layer = new _ol_layer_Tile_({ +var layer = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/simple.js b/examples/simple.js index 45fe7ecfa1..c444b6789c 100644 --- a/examples/simple.js +++ b/examples/simple.js @@ -1,12 +1,12 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/snap.js b/examples/snap.js index 87f3e741b1..55345c6057 100644 --- a/examples/snap.js +++ b/examples/snap.js @@ -4,7 +4,7 @@ import Draw from '../src/ol/interaction/Draw.js'; import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -13,7 +13,7 @@ import _ol_style_Fill_ from '../src/ol/style/Fill.js'; import _ol_style_Stroke_ from '../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../src/ol/style/Style.js'; -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/stamen.js b/examples/stamen.js index f81f3535a9..6b24717c67 100644 --- a/examples/stamen.js +++ b/examples/stamen.js @@ -1,18 +1,18 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.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_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_Stamen_({ layer: 'watercolor' }) }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_Stamen_({ layer: 'terrain-labels' }) diff --git a/examples/street-labels.js b/examples/street-labels.js index acc7330bbf..d0f52b2a58 100644 --- a/examples/street-labels.js +++ b/examples/street-labels.js @@ -2,7 +2,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -22,7 +22,7 @@ var style = new _ol_style_Style_({ var viewExtent = [1817379, 6139595, 1827851, 6143616]; var map = new _ol_Map_({ - layers: [new _ol_layer_Tile_({ + layers: [new TileLayer({ source: new _ol_source_BingMaps_({ key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5', imagerySet: 'Aerial' diff --git a/examples/teleport.js b/examples/teleport.js index 5717a11ba4..6bd86d767c 100644 --- a/examples/teleport.js +++ b/examples/teleport.js @@ -1,13 +1,13 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }) ], diff --git a/examples/tile-load-events.js b/examples/tile-load-events.js index b829b4688e..6b6b60a1b8 100644 --- a/examples/tile-load-events.js +++ b/examples/tile-load-events.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; @@ -95,7 +95,7 @@ source.on('tileloaderror', function() { var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({source: source}) + new TileLayer({source: source}) ], target: 'map', view: new _ol_View_({ diff --git a/examples/tile-transitions.js b/examples/tile-transitions.js index 7a1d310c4e..8f2864442b 100644 --- a/examples/tile-transitions.js +++ b/examples/tile-transitions.js @@ -1,15 +1,15 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; var url = 'https://{a-c}.tiles.mapbox.com/v3/mapbox.world-bright/{z}/{x}/{y}.png'; -var withTransition = new _ol_layer_Tile_({ +var withTransition = new TileLayer({ source: new _ol_source_XYZ_({url: url}) }); -var withoutTransition = new _ol_layer_Tile_({ +var withoutTransition = new TileLayer({ source: new _ol_source_XYZ_({url: url, transition: 0}), visible: false }); diff --git a/examples/tilejson.js b/examples/tilejson.js index ee1b53fe98..7568b52a49 100644 --- a/examples/tilejson.js +++ b/examples/tilejson.js @@ -1,12 +1,12 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure', crossOrigin: 'anonymous' diff --git a/examples/tileutfgrid.js b/examples/tileutfgrid.js index d30b92cf19..77875b114a 100644 --- a/examples/tileutfgrid.js +++ b/examples/tileutfgrid.js @@ -1,13 +1,13 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_Overlay_ from '../src/ol/Overlay.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; import _ol_source_TileUTFGrid_ from '../src/ol/source/TileUTFGrid.js'; var key = 'pk.eyJ1IjoiYWhvY2V2YXIiLCJhIjoiRk1kMWZaSSJ9.E5BkluenyWQMsBLsuByrmg'; -var mapLayer = new _ol_layer_Tile_({ +var mapLayer = new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v4/mapbox.geography-class.json?secure&access_token=' + key }) @@ -18,7 +18,7 @@ var gridSource = new _ol_source_TileUTFGrid_({ url: 'https://api.tiles.mapbox.com/v4/mapbox.geography-class.json?secure&access_token=' + key }); -var gridLayer = new _ol_layer_Tile_({source: gridSource}); +var gridLayer = new TileLayer({source: gridSource}); var view = new _ol_View_({ center: [0, 0], diff --git a/examples/tissot.js b/examples/tissot.js index 0f7561483c..772d2aae0c 100644 --- a/examples/tissot.js +++ b/examples/tissot.js @@ -3,7 +3,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_Sphere_ from '../src/ol/Sphere.js'; import _ol_View_ from '../src/ol/View.js'; import Polygon from '../src/ol/geom/Polygon.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -18,7 +18,7 @@ var vectorLayer3857 = new _ol_layer_Vector_({ var map4326 = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileWMS_({ url: 'https://ahocevar.com/geoserver/wms', params: { @@ -39,7 +39,7 @@ var map4326 = new _ol_Map_({ var map3857 = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileWMS_({ url: 'https://ahocevar.com/geoserver/wms', params: { diff --git a/examples/topojson.js b/examples/topojson.js index e38db9bbbd..cd4ec1dc56 100644 --- a/examples/topojson.js +++ b/examples/topojson.js @@ -1,7 +1,7 @@ import _ol_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_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.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 raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_TileJSON_({ url: 'https://api.tiles.mapbox.com/v3/mapbox.world-dark.json?secure' }) diff --git a/examples/topolis.js b/examples/topolis.js index e57c7687f0..5a5e239d70 100644 --- a/examples/topolis.js +++ b/examples/topolis.js @@ -9,7 +9,7 @@ import LineString from '../src/ol/geom/LineString.js'; import Polygon from '../src/ol/geom/Polygon.js'; import Draw from '../src/ol/interaction/Draw.js'; import _ol_interaction_Snap_ from '../src/ol/interaction/Snap.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -20,7 +20,7 @@ import _ol_style_Circle_ from '../src/ol/style/Circle.js'; import _ol_style_Text_ from '../src/ol/style/Text.js'; import MousePosition from '../src/ol/control/MousePosition.js'; -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/translate-features.js b/examples/translate-features.js index 7bef304ccf..b70a55d304 100644 --- a/examples/translate-features.js +++ b/examples/translate-features.js @@ -4,13 +4,13 @@ import GeoJSON from '../src/ol/format/GeoJSON.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; import _ol_interaction_Translate_ from '../src/ol/interaction/Translate.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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 raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/turf.js b/examples/turf.js index d53aa6a293..1e01770b4f 100644 --- a/examples/turf.js +++ b/examples/turf.js @@ -3,7 +3,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import {fromLonLat} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -42,7 +42,7 @@ var vectorLayer = new _ol_layer_Vector_({ source: source }); -var rasterLayer = new _ol_layer_Tile_({ +var rasterLayer = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/vector-esri-edit.js b/examples/vector-esri-edit.js index 325d43d123..fa6ea8fe23 100644 --- a/examples/vector-esri-edit.js +++ b/examples/vector-esri-edit.js @@ -5,7 +5,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import Draw from '../src/ol/interaction/Draw.js'; import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js'; import _ol_interaction_Select_ from '../src/ol/interaction/Select.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js'; import {fromLonLat} from '../src/ol/proj.js'; @@ -53,7 +53,7 @@ var vector = new _ol_layer_Vector_({ source: vectorSource }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_XYZ_({ attributions: 'Tiles © ArcGIS', diff --git a/examples/vector-esri.js b/examples/vector-esri.js index 830455b844..21e119d032 100644 --- a/examples/vector-esri.js +++ b/examples/vector-esri.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import EsriJSON from '../src/ol/format/EsriJSON.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js'; import {fromLonLat} from '../src/ol/proj.js'; @@ -95,7 +95,7 @@ var vector = new _ol_layer_Vector_({ } }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_XYZ_({ attributions: 'Tiles © ArcGIS', diff --git a/examples/vector-labels.js b/examples/vector-labels.js index ffe12c6d68..ca527cd634 100644 --- a/examples/vector-labels.js +++ b/examples/vector-labels.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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'; @@ -191,7 +191,7 @@ var vectorPoints = new _ol_layer_Vector_({ var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), vectorPolygons, diff --git a/examples/vector-osm.js b/examples/vector-osm.js index 534c6c49c7..525c7468b9 100644 --- a/examples/vector-osm.js +++ b/examples/vector-osm.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js'; import {transformExtent} from '../src/ol/proj.js'; @@ -115,7 +115,7 @@ var vector = new _ol_layer_Vector_({ } }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_BingMaps_({ imagerySet: 'Aerial', key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' diff --git a/examples/vector-wfs-getfeature.js b/examples/vector-wfs-getfeature.js index 88ed061556..5bb6502fd1 100644 --- a/examples/vector-wfs-getfeature.js +++ b/examples/vector-wfs-getfeature.js @@ -3,7 +3,7 @@ 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'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; import _ol_source_Vector_ from '../src/ol/source/Vector.js'; @@ -22,7 +22,7 @@ var vector = new _ol_layer_Vector_({ }) }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_BingMaps_({ imagerySet: 'Aerial', key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' diff --git a/examples/vector-wfs.js b/examples/vector-wfs.js index 8e242b28f9..7336dbab4d 100644 --- a/examples/vector-wfs.js +++ b/examples/vector-wfs.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../src/ol/layer/Vector.js'; import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; @@ -32,7 +32,7 @@ var vector = new _ol_layer_Vector_({ }) }); -var raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_BingMaps_({ imagerySet: 'Aerial', key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5' diff --git a/examples/wkt.js b/examples/wkt.js index d53364658d..d97b814778 100644 --- a/examples/wkt.js +++ b/examples/wkt.js @@ -1,12 +1,12 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import WKT from '../src/ol/format/WKT.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; 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 raster = new _ol_layer_Tile_({ +var raster = new TileLayer({ source: new _ol_source_OSM_() }); diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index 47cbcb2864..b7e9ba1172 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {addProjection, addCoordinateTransforms, transform} from '../src/ol/proj.js'; import _ol_proj_Projection_ from '../src/ol/proj/Projection.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; @@ -42,7 +42,7 @@ addCoordinateTransforms('EPSG:4326', projection, var extent = [420000, 30000, 900000, 350000]; var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ extent: extent, source: new _ol_source_TileWMS_({ url: 'https://wms.geo.admin.ch/', @@ -56,7 +56,7 @@ var layers = [ serverType: 'mapserver' }) }), - new _ol_layer_Tile_({ + new TileLayer({ extent: extent, source: new _ol_source_TileWMS_({ url: 'https://wms.geo.admin.ch/', diff --git a/examples/wms-custom-tilegrid-512x256.js b/examples/wms-custom-tilegrid-512x256.js index dbd96b6977..88d62161ad 100644 --- a/examples/wms-custom-tilegrid-512x256.js +++ b/examples/wms-custom-tilegrid-512x256.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {get as getProjection} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; @@ -21,10 +21,10 @@ var tileGrid = new _ol_tilegrid_TileGrid_({ }); var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileWMS_({ url: 'https://ahocevar.com/geoserver/wms', params: {'LAYERS': 'topp:states', 'TILED': true}, diff --git a/examples/wms-image.js b/examples/wms-image.js index 8890fb57aa..bb3334eb76 100644 --- a/examples/wms-image.js +++ b/examples/wms-image.js @@ -1,13 +1,13 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), new _ol_layer_Image_({ diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js index 78ad7f1894..83eadac2cf 100644 --- a/examples/wms-no-proj.js +++ b/examples/wms-no-proj.js @@ -1,14 +1,14 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_proj_Projection_ from '../src/ol/proj/Projection.js'; import _ol_source_ImageWMS_ from '../src/ol/source/ImageWMS.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileWMS_({ attributions: '© Pixelmap 1:1000000 / geo.admin.ch', diff --git a/examples/wms-tiled-wrap-180.js b/examples/wms-tiled-wrap-180.js index c5f46b27d0..0a98df634d 100644 --- a/examples/wms-tiled-wrap-180.js +++ b/examples/wms-tiled-wrap-180.js @@ -1,15 +1,15 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_TileWMS_({ url: 'https://ahocevar.com/geoserver/ne/wms', params: {'LAYERS': 'ne:ne_10m_admin_0_countries', 'TILED': true}, diff --git a/examples/wms-tiled.js b/examples/wms-tiled.js index 467e12091a..dfa6a0c38c 100644 --- a/examples/wms-tiled.js +++ b/examples/wms-tiled.js @@ -1,15 +1,15 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), - new _ol_layer_Tile_({ + new TileLayer({ extent: [-13884991, 2870341, -7455066, 6338219], source: new _ol_source_TileWMS_({ url: 'https://ahocevar.com/geoserver/wms', diff --git a/examples/wms-time.js b/examples/wms-time.js index 8385da96f8..dcb62fe87a 100644 --- a/examples/wms-time.js +++ b/examples/wms-time.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {transformExtent} from '../src/ol/proj.js'; import _ol_source_Stamen_ from '../src/ol/source/Stamen.js'; import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js'; @@ -16,12 +16,12 @@ var frameRate = 0.5; // frames per second var animationId = null; var layers = [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_Stamen_({ layer: 'terrain' }) }), - new _ol_layer_Tile_({ + new TileLayer({ extent: extent, source: new _ol_source_TileWMS_({ attributions: ['Iowa State University'], diff --git a/examples/wmts-dimensions.js b/examples/wmts-dimensions.js index 767b50896c..fbded1d6f0 100644 --- a/examples/wmts-dimensions.js +++ b/examples/wmts-dimensions.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import * as _ol_extent_ from '../src/ol/extent.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {get as getProjection} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_WMTS_ from '../src/ol/source/WMTS.js'; @@ -51,10 +51,10 @@ var map = new _ol_Map_({ zoom: 6 }), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), - new _ol_layer_Tile_({ + new TileLayer({ opacity: 0.5, source: wmtsSource }) diff --git a/examples/wmts-hidpi.js b/examples/wmts-hidpi.js index 65a49263a0..afd94da884 100644 --- a/examples/wmts-hidpi.js +++ b/examples/wmts-hidpi.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_WMTS_ from '../src/ol/source/WMTS.js'; @@ -33,7 +33,7 @@ fetch(capabilitiesUrl).then(function(response) { style: 'normal' }); options.tilePixelRatio = tilePixelRatio; - map.addLayer(new _ol_layer_Tile_({ + map.addLayer(new TileLayer({ source: new _ol_source_WMTS_(/** @type {!olx.source.WMTSOptions} */ (options)) })); }); diff --git a/examples/wmts-ign.js b/examples/wmts-ign.js index 91eda85edc..6f902ac0c8 100644 --- a/examples/wmts-ign.js +++ b/examples/wmts-ign.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat, get as getProjection} from '../src/ol/proj.js'; import _ol_source_WMTS_ from '../src/ol/source/WMTS.js'; import _ol_tilegrid_WMTS_ from '../src/ol/tilegrid/WMTS.js'; @@ -54,7 +54,7 @@ var ign_source = new _ol_source_WMTS_({ 'theme/geoportal/img/logo_gp.gif">' }); -var ign = new _ol_layer_Tile_({ +var ign = new TileLayer({ source: ign_source }); diff --git a/examples/wmts-layer-from-capabilities.js b/examples/wmts-layer-from-capabilities.js index 1db2bda3f4..218a932285 100644 --- a/examples/wmts-layer-from-capabilities.js +++ b/examples/wmts-layer-from-capabilities.js @@ -1,7 +1,7 @@ import _ol_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_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_WMTS_ from '../src/ol/source/WMTS.js'; @@ -19,11 +19,11 @@ fetch('data/WMTSCapabilities.xml').then(function(response) { map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_(), opacity: 0.7 }), - new _ol_layer_Tile_({ + new TileLayer({ opacity: 1, source: new _ol_source_WMTS_(/** @type {!olx.source.WMTSOptions} */ (options)) }) diff --git a/examples/wmts.js b/examples/wmts.js index 1264482894..f8fdce6cfd 100644 --- a/examples/wmts.js +++ b/examples/wmts.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {get as getProjection} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_WMTS_ from '../src/ol/source/WMTS.js'; @@ -22,11 +22,11 @@ for (var z = 0; z < 14; ++z) { var map = new _ol_Map_({ layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_(), opacity: 0.7 }), - new _ol_layer_Tile_({ + new TileLayer({ opacity: 0.7, source: new _ol_source_WMTS_({ attributions: 'Tiles © ArcGIS', diff --git a/examples/xyz-retina.js b/examples/xyz-retina.js index ef83f28721..2e30bc7b72 100644 --- a/examples/xyz-retina.js +++ b/examples/xyz-retina.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import {transform, transformExtent} from '../src/ol/proj.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; @@ -12,10 +12,10 @@ var mapExtent = [-112.261791, 35.983744, -112.113981, 36.132062]; var map = new _ol_Map_({ target: 'map', layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_OSM_() }), - new _ol_layer_Tile_({ + new TileLayer({ extent: transformExtent(mapExtent, 'EPSG:4326', 'EPSG:3857'), source: new _ol_source_XYZ_({ attributions: 'Tiles © USGS, rendered with ' + diff --git a/examples/xyz.js b/examples/xyz.js index ceb1b8bb85..611e74458f 100644 --- a/examples/xyz.js +++ b/examples/xyz.js @@ -1,13 +1,13 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../src/ol/source/XYZ.js'; var map = new _ol_Map_({ target: 'map', layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_XYZ_({ url: 'https://{a-c}.tile.thunderforest.com/cycle/{z}/{x}/{y}.png' + '?apikey=0e6fc415256d4fbb9b5166a718591d71' diff --git a/examples/zoom-constrained.js b/examples/zoom-constrained.js index a9bd845e24..2928ef09bb 100644 --- a/examples/zoom-constrained.js +++ b/examples/zoom-constrained.js @@ -1,13 +1,13 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js'; var map = new _ol_Map_({ target: 'map', layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_BingMaps_({ key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5', imagerySet: 'Aerial' diff --git a/examples/zoomify.js b/examples/zoomify.js index d205b0ece2..a48638bed3 100644 --- a/examples/zoomify.js +++ b/examples/zoomify.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_Zoomify_ from '../src/ol/source/Zoomify.js'; var imgWidth = 9911; @@ -10,7 +10,7 @@ var zoomifyUrl = 'http://vips.vtech.fr/cgi-bin/iipsrv.fcgi?zoomify=' + '/mnt/MD1/AD00/plan_CHU-4HD-01/FOND.TIF/'; var iipUrl = 'http://vips.vtech.fr/cgi-bin/iipsrv.fcgi?FIF=' + '/mnt/MD1/AD00/plan_CHU-4HD-01/FOND.TIF' + '&JTL={z},{tileIndex}'; -var layer = new _ol_layer_Tile_({ +var layer = new TileLayer({ source: new _ol_source_Zoomify_({ url: zoomifyUrl, size: [imgWidth, imgHeight], diff --git a/examples/zoomslider.js b/examples/zoomslider.js index a2b364e1f0..bb0a438acc 100644 --- a/examples/zoomslider.js +++ b/examples/zoomslider.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import ZoomSlider from '../src/ol/control/ZoomSlider.js'; -import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; +import TileLayer from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -15,7 +15,7 @@ var createMap = function(divId) { var source, layer, map, zoomslider; source = new _ol_source_OSM_(); - layer = new _ol_layer_Tile_({ + layer = new TileLayer({ source: source }); map = new _ol_Map_({ diff --git a/src/ol/layer/Tile.js b/src/ol/layer/Tile.js index 4f788d2a9b..7656a4ddbb 100644 --- a/src/ol/layer/Tile.js +++ b/src/ol/layer/Tile.js @@ -21,7 +21,7 @@ import _ol_obj_ from '../obj.js'; * @param {olx.layer.TileOptions=} opt_options Tile layer options. * @api */ -var _ol_layer_Tile_ = function(opt_options) { +var TileLayer = function(opt_options) { var options = opt_options ? opt_options : {}; var baseOptions = _ol_obj_.assign({}, options); @@ -43,7 +43,7 @@ var _ol_layer_Tile_ = function(opt_options) { }; -inherits(_ol_layer_Tile_, _ol_layer_Layer_); +inherits(TileLayer, _ol_layer_Layer_); /** @@ -52,7 +52,7 @@ inherits(_ol_layer_Tile_, _ol_layer_Layer_); * @observable * @api */ -_ol_layer_Tile_.prototype.getPreload = function() { +TileLayer.prototype.getPreload = function() { return ( /** @type {number} */ this.get(_ol_layer_TileProperty_.PRELOAD) ); @@ -65,7 +65,7 @@ _ol_layer_Tile_.prototype.getPreload = function() { * @return {ol.source.Tile} Source. * @api */ -_ol_layer_Tile_.prototype.getSource; +TileLayer.prototype.getSource; /** @@ -74,7 +74,7 @@ _ol_layer_Tile_.prototype.getSource; * @observable * @api */ -_ol_layer_Tile_.prototype.setPreload = function(preload) { +TileLayer.prototype.setPreload = function(preload) { this.set(_ol_layer_TileProperty_.PRELOAD, preload); }; @@ -85,7 +85,7 @@ _ol_layer_Tile_.prototype.setPreload = function(preload) { * @observable * @api */ -_ol_layer_Tile_.prototype.getUseInterimTilesOnError = function() { +TileLayer.prototype.getUseInterimTilesOnError = function() { return ( /** @type {boolean} */ this.get(_ol_layer_TileProperty_.USE_INTERIM_TILES_ON_ERROR) ); @@ -98,8 +98,8 @@ _ol_layer_Tile_.prototype.getUseInterimTilesOnError = function() { * @observable * @api */ -_ol_layer_Tile_.prototype.setUseInterimTilesOnError = function(useInterimTilesOnError) { +TileLayer.prototype.setUseInterimTilesOnError = function(useInterimTilesOnError) { this.set( _ol_layer_TileProperty_.USE_INTERIM_TILES_ON_ERROR, useInterimTilesOnError); }; -export default _ol_layer_Tile_; +export default TileLayer; diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js index 7efc4be015..b39a704cd4 100644 --- a/src/ol/source/Raster.js +++ b/src/ol/source/Raster.js @@ -11,7 +11,7 @@ import EventType from '../events/EventType.js'; import {Processor} from 'pixelworks'; import {equals, getCenter, getHeight, getWidth} from '../extent.js'; import _ol_layer_Image_ from '../layer/Image.js'; -import _ol_layer_Tile_ from '../layer/Tile.js'; +import TileLayer from '../layer/Tile.js'; import _ol_obj_ from '../obj.js'; import _ol_renderer_canvas_ImageLayer_ from '../renderer/canvas/ImageLayer.js'; import _ol_renderer_canvas_TileLayer_ from '../renderer/canvas/TileLayer.js'; @@ -412,7 +412,7 @@ _ol_source_Raster_.createImageRenderer_ = function(source) { * @private */ _ol_source_Raster_.createTileRenderer_ = function(source) { - var layer = new _ol_layer_Tile_({source: source}); + var layer = new TileLayer({source: source}); return new _ol_renderer_canvas_TileLayer_(layer); }; diff --git a/test/rendering/ol/layer/clip.test.js b/test/rendering/ol/layer/clip.test.js index efd4f1f72d..04a0cea4db 100644 --- a/test/rendering/ol/layer/clip.test.js +++ b/test/rendering/ol/layer/clip.test.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import MultiPolygon from '../../../../src/ol/geom/MultiPolygon.js'; -import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js'; +import TileLayer from '../../../../src/ol/layer/Tile.js'; import _ol_source_XYZ_ from '../../../../src/ol/source/XYZ.js'; import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js'; import _ol_style_Style_ from '../../../../src/ol/style/Style.js'; @@ -60,7 +60,7 @@ describe('layer clipping', function() { transition: 0 }); - var layer = new _ol_layer_Tile_({ + var layer = new TileLayer({ source: source }); diff --git a/test/rendering/ol/layer/tile.test.js b/test/rendering/ol/layer/tile.test.js index 2f4711b2b6..e793c7e967 100644 --- a/test/rendering/ol/layer/tile.test.js +++ b/test/rendering/ol/layer/tile.test.js @@ -2,7 +2,7 @@ import _ol_Map_ from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; import * as _ol_extent_ from '../../../../src/ol/extent.js'; import Point from '../../../../src/ol/geom/Point.js'; -import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js'; +import TileLayer from '../../../../src/ol/layer/Tile.js'; import _ol_obj_ from '../../../../src/ol/obj.js'; import {transform} from '../../../../src/ol/proj.js'; import _ol_source_TileImage_ from '../../../../src/ol/source/TileImage.js'; @@ -66,7 +66,7 @@ describe('ol.rendering.layer.Tile', function() { source: source }; _ol_obj_.assign(options, layerOptions[i] || layerOptions); - map.addLayer(new _ol_layer_Tile_(options)); + map.addLayer(new TileLayer(options)); }); } diff --git a/test/rendering/ol/source/tilewms.test.js b/test/rendering/ol/source/tilewms.test.js index bff0c67b60..30d6f75e92 100644 --- a/test/rendering/ol/source/tilewms.test.js +++ b/test/rendering/ol/source/tilewms.test.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../../../../src/ol/Map.js'; import _ol_View_ from '../../../../src/ol/View.js'; -import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js'; +import TileLayer from '../../../../src/ol/layer/Tile.js'; import _ol_source_TileWMS_ from '../../../../src/ol/source/TileWMS.js'; describe('ol.rendering.source.TileWMS', function() { @@ -62,7 +62,7 @@ describe('ol.rendering.source.TileWMS', function() { tilesLoaded(source, function() { expectResemble(map, 'rendering/ol/source/expected/0_1.canvas.png', IMAGE_TOLERANCE, done); }); - map.addLayer(new _ol_layer_Tile_({ + map.addLayer(new TileLayer({ source: source })); }); @@ -74,7 +74,7 @@ describe('ol.rendering.source.TileWMS', function() { tilesLoaded(source, function() { expectResemble(map, 'rendering/ol/source/expected/0_1.webgl.png', IMAGE_TOLERANCE, done); }); - map.addLayer(new _ol_layer_Tile_({ + map.addLayer(new TileLayer({ source: source })); }); @@ -87,7 +87,7 @@ describe('ol.rendering.source.TileWMS', function() { tilesLoaded(source, function() { expectResemble(map, 'rendering/ol/source/expected/0_2.canvas.png', IMAGE_TOLERANCE, done); }); - map.addLayer(new _ol_layer_Tile_({ + map.addLayer(new TileLayer({ source: source })); }); @@ -99,7 +99,7 @@ describe('ol.rendering.source.TileWMS', function() { tilesLoaded(source, function() { expectResemble(map, 'rendering/ol/source/expected/0_2.webgl.png', IMAGE_TOLERANCE, done); }); - map.addLayer(new _ol_layer_Tile_({ + map.addLayer(new TileLayer({ source: source })); }); @@ -113,7 +113,7 @@ describe('ol.rendering.source.TileWMS', function() { tilesLoaded(source, function() { expectResemble(map, 'rendering/ol/source/expected/20_1.canvas.png', IMAGE_TOLERANCE, done); }); - map.addLayer(new _ol_layer_Tile_({ + map.addLayer(new TileLayer({ source: source })); }); @@ -125,7 +125,7 @@ describe('ol.rendering.source.TileWMS', function() { tilesLoaded(source, function() { expectResemble(map, 'rendering/ol/source/expected/20_1.webgl.png', IMAGE_TOLERANCE, done); }); - map.addLayer(new _ol_layer_Tile_({ + map.addLayer(new TileLayer({ source: source })); }); @@ -138,7 +138,7 @@ describe('ol.rendering.source.TileWMS', function() { tilesLoaded(source, function() { expectResemble(map, 'rendering/ol/source/expected/20_2.canvas.png', IMAGE_TOLERANCE, done); }); - map.addLayer(new _ol_layer_Tile_({ + map.addLayer(new TileLayer({ source: source })); }); @@ -150,7 +150,7 @@ describe('ol.rendering.source.TileWMS', function() { tilesLoaded(source, function() { expectResemble(map, 'rendering/ol/source/expected/20_2.webgl.png', IMAGE_TOLERANCE, done); }); - map.addLayer(new _ol_layer_Tile_({ + map.addLayer(new TileLayer({ source: source })); }); diff --git a/test/spec/ol/control/attribution.test.js b/test/spec/ol/control/attribution.test.js index 0ea32bb523..b0d6e9357d 100644 --- a/test/spec/ol/control/attribution.test.js +++ b/test/spec/ol/control/attribution.test.js @@ -2,7 +2,7 @@ import _ol_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'; -import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js'; +import TileLayer from '../../../../src/ol/layer/Tile.js'; import _ol_source_Tile_ from '../../../../src/ol/source/Tile.js'; import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js'; @@ -20,21 +20,21 @@ describe('ol.control.Attribution', function() { collapsible: false })], layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_Tile_({ projection: 'EPSG:3857', tileGrid: _ol_tilegrid_.createXYZ(), attributions: 'foo' }) }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_Tile_({ projection: 'EPSG:3857', tileGrid: _ol_tilegrid_.createXYZ(), attributions: 'bar' }) }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_Tile_({ projection: 'EPSG:3857', tileGrid: _ol_tilegrid_.createXYZ(), diff --git a/test/spec/ol/layer/tile.test.js b/test/spec/ol/layer/tile.test.js index 340b510037..cf25cb899f 100644 --- a/test/spec/ol/layer/tile.test.js +++ b/test/spec/ol/layer/tile.test.js @@ -1,4 +1,4 @@ -import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js'; +import TileLayer from '../../../../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../../../../src/ol/source/OSM.js'; @@ -9,7 +9,7 @@ describe('ol.layer.Tile', function() { var layer; beforeEach(function() { - layer = new _ol_layer_Tile_({ + layer = new TileLayer({ source: new _ol_source_OSM_() }); }); @@ -19,7 +19,7 @@ describe('ol.layer.Tile', function() { }); it('creates an instance', function() { - expect(layer).to.be.a(_ol_layer_Tile_); + expect(layer).to.be.a(TileLayer); }); it('provides default preload', function() { diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js index d86c39e844..5480bd6c8e 100644 --- a/test/spec/ol/map.test.js +++ b/test/spec/ol/map.test.js @@ -10,7 +10,7 @@ import DoubleClickZoom from '../../../src/ol/interaction/DoubleClickZoom.js'; import Interaction from '../../../src/ol/interaction/Interaction.js'; import _ol_interaction_MouseWheelZoom_ from '../../../src/ol/interaction/MouseWheelZoom.js'; import _ol_interaction_PinchZoom_ from '../../../src/ol/interaction/PinchZoom.js'; -import _ol_layer_Tile_ from '../../../src/ol/layer/Tile.js'; +import TileLayer from '../../../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../../../src/ol/layer/Vector.js'; import _ol_renderer_canvas_IntermediateCanvas_ from '../../../src/ol/renderer/canvas/IntermediateCanvas.js'; import _ol_source_Vector_ from '../../../src/ol/source/Vector.js'; @@ -56,7 +56,7 @@ describe('ol.Map', function() { describe('#addLayer()', function() { it('adds a layer to the map', function() { var map = new _ol_Map_({}); - var layer = new _ol_layer_Tile_(); + var layer = new TileLayer(); map.addLayer(layer); expect(map.getLayers().item(0)).to.be(layer); @@ -64,7 +64,7 @@ describe('ol.Map', function() { it('throws if a layer is added twice', function() { var map = new _ol_Map_({}); - var layer = new _ol_layer_Tile_(); + var layer = new TileLayer(); map.addLayer(layer); var call = function() { @@ -124,7 +124,7 @@ describe('ol.Map', function() { target: target, view: view, layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_XYZ_({ url: '#{x}/{y}/{z}' }) @@ -264,13 +264,13 @@ describe('ol.Map', function() { zoom: 1 }), layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_XYZ_() }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_XYZ_() }), - new _ol_layer_Tile_({ + new TileLayer({ source: new _ol_source_XYZ_() }) ] diff --git a/test/spec/ol/renderer/canvas/map.test.js b/test/spec/ol/renderer/canvas/map.test.js index 30f5fe27da..eb8393a940 100644 --- a/test/spec/ol/renderer/canvas/map.test.js +++ b/test/spec/ol/renderer/canvas/map.test.js @@ -3,7 +3,7 @@ import _ol_Feature_ from '../../../../../src/ol/Feature.js'; import _ol_Map_ from '../../../../../src/ol/Map.js'; import _ol_View_ from '../../../../../src/ol/View.js'; import Point from '../../../../../src/ol/geom/Point.js'; -import _ol_layer_Tile_ from '../../../../../src/ol/layer/Tile.js'; +import TileLayer from '../../../../../src/ol/layer/Tile.js'; import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js'; import _ol_renderer_canvas_Layer_ from '../../../../../src/ol/renderer/canvas/Layer.js'; import _ol_renderer_canvas_Map_ from '../../../../../src/ol/renderer/canvas/Map.js'; @@ -120,7 +120,7 @@ describe('ol.renderer.canvas.Map', function() { }); it('doesn\'t fail with layer with no source', function() { - map.addLayer(new _ol_layer_Tile_()); + map.addLayer(new TileLayer()); map.renderSync(); expect(function() { map.forEachFeatureAtPixel(map.getPixelFromCoordinate([0, 0]), diff --git a/test/spec/ol/renderer/canvas/tilelayer.test.js b/test/spec/ol/renderer/canvas/tilelayer.test.js index f2090d2a2b..27136e0213 100644 --- a/test/spec/ol/renderer/canvas/tilelayer.test.js +++ b/test/spec/ol/renderer/canvas/tilelayer.test.js @@ -1,6 +1,6 @@ import _ol_Map_ from '../../../../../src/ol/Map.js'; import _ol_View_ from '../../../../../src/ol/View.js'; -import _ol_layer_Tile_ from '../../../../../src/ol/layer/Tile.js'; +import TileLayer from '../../../../../src/ol/layer/Tile.js'; import {get as getProjection} from '../../../../../src/ol/proj.js'; import _ol_renderer_Map_ from '../../../../../src/ol/renderer/Map.js'; import _ol_renderer_canvas_TileLayer_ from '../../../../../src/ol/renderer/canvas/TileLayer.js'; @@ -29,7 +29,7 @@ describe('ol.renderer.canvas.TileLayer', function() { }); map = new _ol_Map_({ target: target, - layers: [new _ol_layer_Tile_({ + layers: [new TileLayer({ source: source })], view: new _ol_View_({ @@ -70,7 +70,7 @@ describe('ol.renderer.canvas.TileLayer', function() { }); it('uses correct draw scale when rotating (HiDPI)', function() { - var layer = new _ol_layer_Tile_({ + var layer = new TileLayer({ source: new _ol_source_XYZ_({ tileSize: 1 }) diff --git a/test/spec/ol/renderer/layer.test.js b/test/spec/ol/renderer/layer.test.js index e2ddcf5ed7..9017a068d7 100644 --- a/test/spec/ol/renderer/layer.test.js +++ b/test/spec/ol/renderer/layer.test.js @@ -2,7 +2,7 @@ import _ol_Image_ from '../../../../src/ol/Image.js'; import _ol_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 _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js'; +import TileLayer from '../../../../src/ol/layer/Tile.js'; import _ol_renderer_Layer_ from '../../../../src/ol/renderer/Layer.js'; import _ol_source_XYZ_ from '../../../../src/ol/source/XYZ.js'; import _ol_tilecoord_ from '../../../../src/ol/tilecoord.js'; @@ -111,7 +111,7 @@ describe('ol.renderer.Layer', function() { target: target, view: view, layers: [ - new _ol_layer_Tile_({ + new TileLayer({ source: source }) ]