From a5d3e91f7d89e8469b94f721c2697c43ccf18500 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 23 Apr 2018 17:34:10 -0600 Subject: [PATCH] Re-export source constructors from ol/source --- examples/arcgis-image.js | 3 +-- examples/arcgis-tiled.js | 3 +-- examples/box-selection.js | 3 +-- examples/canvas-tiles.js | 3 +-- examples/cartodb.js | 3 +-- examples/center.js | 3 +-- examples/chaikin.js | 3 +-- examples/cluster.js | 4 +--- examples/color-manipulation.js | 3 +-- examples/custom-interactions.js | 3 +-- examples/d3.js | 3 +-- examples/drag-and-drop-image-vector.js | 3 +-- examples/drag-and-drop.js | 3 +-- examples/draw-and-modify-features.js | 3 +-- examples/draw-features.js | 3 +-- examples/draw-freehand.js | 3 +-- examples/draw-shapes.js | 3 +-- examples/earthquake-clusters.js | 4 +--- examples/export-map.js | 3 +-- examples/export-pdf.js | 3 +-- examples/extent-interaction.js | 3 +-- examples/feature-animation.js | 3 +-- examples/geojson.js | 3 +-- examples/geolocation.js | 3 +-- examples/hit-tolerance.js | 3 +-- examples/line-arrows.js | 3 +-- examples/measure.js | 3 +-- examples/modify-features.js | 3 +-- examples/reprojection.js | 5 +---- examples/shaded-relief.js | 6 ++---- examples/snap.js | 3 +-- examples/topolis.js | 3 +-- examples/turf.js | 3 +-- examples/vector-labels.js | 3 +-- examples/wkt.js | 3 +-- src/ol/source.js | 29 ++++++++++++++++++++++++++ 36 files changed, 65 insertions(+), 76 deletions(-) create mode 100644 src/ol/source.js diff --git a/examples/arcgis-image.js b/examples/arcgis-image.js index b644c1eb5f..b01a5488b1 100644 --- a/examples/arcgis-image.js +++ b/examples/arcgis-image.js @@ -2,8 +2,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import ImageLayer from '../src/ol/layer/Image.js'; -import OSM from '../src/ol/source/OSM.js'; -import ImageArcGISRest from '../src/ol/source/ImageArcGISRest.js'; +import {OSM, ImageArcGISRest} from '../src/ol/source.js'; const url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' + 'Specialty/ESRI_StateCityHighway_USA/MapServer'; diff --git a/examples/arcgis-tiled.js b/examples/arcgis-tiled.js index deef00549e..4377963891 100644 --- a/examples/arcgis-tiled.js +++ b/examples/arcgis-tiled.js @@ -1,8 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; -import OSM from '../src/ol/source/OSM.js'; -import TileArcGISRest from '../src/ol/source/TileArcGISRest.js'; +import {OSM, TileArcGISRest} from '../src/ol/source.js'; const url = 'https://sampleserver1.arcgisonline.com/ArcGIS/rest/services/' + 'Specialty/ESRI_StateCityHighway_USA/MapServer'; diff --git a/examples/box-selection.js b/examples/box-selection.js index 4090451a3f..3f03f9e244 100644 --- a/examples/box-selection.js +++ b/examples/box-selection.js @@ -6,8 +6,7 @@ import DragBox from '../src/ol/interaction/DragBox.js'; import Select from '../src/ol/interaction/Select.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const vectorSource = new VectorSource({ diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js index dc58b6ac8c..2a67861283 100644 --- a/examples/canvas-tiles.js +++ b/examples/canvas-tiles.js @@ -3,8 +3,7 @@ import View from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat} from '../src/ol/proj.js'; -import OSM from '../src/ol/source/OSM.js'; -import TileDebug from '../src/ol/source/TileDebug.js'; +import {OSM, TileDebug} from '../src/ol/source.js'; const osmSource = new OSM(); diff --git a/examples/cartodb.js b/examples/cartodb.js index 09c78eeba9..81a27bca1b 100644 --- a/examples/cartodb.js +++ b/examples/cartodb.js @@ -1,8 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; -import CartoDB from '../src/ol/source/CartoDB.js'; -import OSM from '../src/ol/source/OSM.js'; +import {CartoDB, OSM} from '../src/ol/source.js'; const mapConfig = { 'layers': [{ diff --git a/examples/center.js b/examples/center.js index 6850b5283c..3706c07591 100644 --- a/examples/center.js +++ b/examples/center.js @@ -4,8 +4,7 @@ import {defaults as defaultControls} from '../src/ol/control.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/chaikin.js b/examples/chaikin.js index e155020356..f35378ddc5 100644 --- a/examples/chaikin.js +++ b/examples/chaikin.js @@ -1,9 +1,8 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; -import OSM from '../src/ol/source/OSM.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import VectorSource from '../src/ol/source/Vector.js'; import Draw from '../src/ol/interaction/Draw.js'; import smooth from 'chaikin-smooth'; diff --git a/examples/cluster.js b/examples/cluster.js index 5edfdd796c..aecd5b45a1 100644 --- a/examples/cluster.js +++ b/examples/cluster.js @@ -4,9 +4,7 @@ import View from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import Cluster from '../src/ol/source/Cluster.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {Cluster, OSM, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/color-manipulation.js b/examples/color-manipulation.js index 1ee09c4634..22dae736fc 100644 --- a/examples/color-manipulation.js +++ b/examples/color-manipulation.js @@ -2,8 +2,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import ImageLayer from '../src/ol/layer/Image.js'; -import RasterSource from '../src/ol/source/Raster.js'; -import Stamen from '../src/ol/source/Stamen.js'; +import {Raster as RasterSource, Stamen} from '../src/ol/source.js'; /** diff --git a/examples/custom-interactions.js b/examples/custom-interactions.js index 0bffd948ed..fefeff6bf4 100644 --- a/examples/custom-interactions.js +++ b/examples/custom-interactions.js @@ -9,8 +9,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import PointerInteraction from '../src/ol/interaction/Pointer.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import TileJSON from '../src/ol/source/TileJSON.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {TileJSON, Vector as VectorSource} from '../src/ol/source.js'; import Fill from '../src/ol/style/Fill.js'; import Icon from '../src/ol/style/Icon.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/d3.js b/examples/d3.js index 050100bc18..8fb148be35 100644 --- a/examples/d3.js +++ b/examples/d3.js @@ -5,8 +5,7 @@ import {getWidth, getCenter} from '../src/ol/extent.js'; import ImageLayer from '../src/ol/layer/Image.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat, toLonLat} from '../src/ol/proj.js'; -import ImageCanvasSource from '../src/ol/source/ImageCanvas.js'; -import Stamen from '../src/ol/source/Stamen.js'; +import {ImageCanvas as ImageCanvasSource, Stamen} from '../src/ol/source.js'; const map = new Map({ diff --git a/examples/drag-and-drop-image-vector.js b/examples/drag-and-drop-image-vector.js index 84ff00979a..762818722c 100644 --- a/examples/drag-and-drop-image-vector.js +++ b/examples/drag-and-drop-image-vector.js @@ -9,8 +9,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import DragAndDrop from '../src/ol/interaction/DragAndDrop.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import TileLayer from '../src/ol/layer/Tile.js'; -import BingMaps from '../src/ol/source/BingMaps.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {BingMaps, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js index dafcdc47dc..cb92529cb9 100644 --- a/examples/drag-and-drop.js +++ b/examples/drag-and-drop.js @@ -9,8 +9,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import DragAndDrop from '../src/ol/interaction/DragAndDrop.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import BingMaps from '../src/ol/source/BingMaps.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {BingMaps, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/draw-and-modify-features.js b/examples/draw-and-modify-features.js index 4da34fced8..6a53939bff 100644 --- a/examples/draw-and-modify-features.js +++ b/examples/draw-and-modify-features.js @@ -5,8 +5,7 @@ import Modify from '../src/ol/interaction/Modify.js'; import Snap from '../src/ol/interaction/Snap.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/draw-features.js b/examples/draw-features.js index f40e7e9df1..6c70ac7ef4 100644 --- a/examples/draw-features.js +++ b/examples/draw-features.js @@ -3,8 +3,7 @@ import View from '../src/ol/View.js'; import Draw from '../src/ol/interaction/Draw.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const raster = new TileLayer({ source: new OSM() diff --git a/examples/draw-freehand.js b/examples/draw-freehand.js index 1ac4aa27c6..e25b137433 100644 --- a/examples/draw-freehand.js +++ b/examples/draw-freehand.js @@ -3,8 +3,7 @@ import View from '../src/ol/View.js'; import Draw from '../src/ol/interaction/Draw.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const raster = new TileLayer({ source: new OSM() diff --git a/examples/draw-shapes.js b/examples/draw-shapes.js index 8125b1428f..550c5fb82e 100644 --- a/examples/draw-shapes.js +++ b/examples/draw-shapes.js @@ -4,8 +4,7 @@ import Polygon from '../src/ol/geom/Polygon.js'; import Draw, {createRegularPolygon, createBox} from '../src/ol/interaction/Draw.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const raster = new TileLayer({ source: new OSM() diff --git a/examples/earthquake-clusters.js b/examples/earthquake-clusters.js index e9ff625c94..15c03d3f0c 100644 --- a/examples/earthquake-clusters.js +++ b/examples/earthquake-clusters.js @@ -6,9 +6,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js'; import Select from '../src/ol/interaction/Select.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import Cluster from '../src/ol/source/Cluster.js'; -import Stamen from '../src/ol/source/Stamen.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {Cluster, Stamen, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import RegularShape from '../src/ol/style/RegularShape.js'; diff --git a/examples/export-map.js b/examples/export-map.js index 710c225ef0..72c9596b96 100644 --- a/examples/export-map.js +++ b/examples/export-map.js @@ -6,8 +6,7 @@ import {defaults as defaultControls} from '../src/ol/control.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const map = new Map({ layers: [ diff --git a/examples/export-pdf.js b/examples/export-pdf.js index 205a3134c5..2587fd7cc6 100644 --- a/examples/export-pdf.js +++ b/examples/export-pdf.js @@ -6,8 +6,7 @@ import WKT from '../src/ol/format/WKT.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {unByKey} from '../src/ol/Observable.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const raster = new TileLayer({ source: new OSM() diff --git a/examples/extent-interaction.js b/examples/extent-interaction.js index 7b2b73e764..5722825d45 100644 --- a/examples/extent-interaction.js +++ b/examples/extent-interaction.js @@ -5,8 +5,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js'; import ExtentInteraction from '../src/ol/interaction/Extent.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const vectorSource = new VectorSource({ url: 'data/geojson/countries.geojson', diff --git a/examples/feature-animation.js b/examples/feature-animation.js index 439826721e..a66128d18b 100644 --- a/examples/feature-animation.js +++ b/examples/feature-animation.js @@ -8,8 +8,7 @@ import Point from '../src/ol/geom/Point.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {fromLonLat} from '../src/ol/proj.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Stroke from '../src/ol/style/Stroke.js'; import Style from '../src/ol/style/Style.js'; diff --git a/examples/geojson.js b/examples/geojson.js index 81d6b6ee45..f550b07a71 100644 --- a/examples/geojson.js +++ b/examples/geojson.js @@ -6,8 +6,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js'; import Circle from '../src/ol/geom/Circle.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/geolocation.js b/examples/geolocation.js index f048913a60..311e7572ed 100644 --- a/examples/geolocation.js +++ b/examples/geolocation.js @@ -6,8 +6,7 @@ import {defaults as defaultControls} from '../src/ol/control.js'; import Point from '../src/ol/geom/Point.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/hit-tolerance.js b/examples/hit-tolerance.js index e0e6a617e7..55924617df 100644 --- a/examples/hit-tolerance.js +++ b/examples/hit-tolerance.js @@ -2,8 +2,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import Feature from '../src/ol/Feature.js'; import LineString from '../src/ol/geom/LineString.js'; import Style from '../src/ol/style/Style.js'; diff --git a/examples/line-arrows.js b/examples/line-arrows.js index 91f01a726a..92ec879c52 100644 --- a/examples/line-arrows.js +++ b/examples/line-arrows.js @@ -4,8 +4,7 @@ import Point from '../src/ol/geom/Point.js'; import Draw from '../src/ol/interaction/Draw.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import Icon from '../src/ol/style/Icon.js'; import Stroke from '../src/ol/style/Stroke.js'; import Style from '../src/ol/style/Style.js'; diff --git a/examples/measure.js b/examples/measure.js index 413d146cea..6f34a12133 100644 --- a/examples/measure.js +++ b/examples/measure.js @@ -8,8 +8,7 @@ import Polygon from '../src/ol/geom/Polygon.js'; import Draw from '../src/ol/interaction/Draw.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/modify-features.js b/examples/modify-features.js index 35d47c0417..c766db2d91 100644 --- a/examples/modify-features.js +++ b/examples/modify-features.js @@ -6,8 +6,7 @@ import Modify from '../src/ol/interaction/Modify.js'; import Select from '../src/ol/interaction/Select.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const raster = new TileLayer({ diff --git a/examples/reprojection.js b/examples/reprojection.js index b7cf4d42ac..990bf33f91 100644 --- a/examples/reprojection.js +++ b/examples/reprojection.js @@ -5,11 +5,8 @@ import WMTSCapabilities from '../src/ol/format/WMTSCapabilities.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 OSM from '../src/ol/source/OSM.js'; -import TileImage from '../src/ol/source/TileImage.js'; -import TileWMS from '../src/ol/source/TileWMS.js'; +import {OSM, TileImage, TileWMS, XYZ} from '../src/ol/source.js'; import WMTS, {optionsFromCapabilities} from '../src/ol/source/WMTS.js'; -import XYZ from '../src/ol/source/XYZ.js'; import TileGrid from '../src/ol/tilegrid/TileGrid.js'; import proj4 from 'proj4'; diff --git a/examples/shaded-relief.js b/examples/shaded-relief.js index b7a821de2f..6947d715be 100644 --- a/examples/shaded-relief.js +++ b/examples/shaded-relief.js @@ -3,9 +3,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import ImageLayer from '../src/ol/layer/Image.js'; import TileLayer from '../src/ol/layer/Tile.js'; -import OSM from '../src/ol/source/OSM.js'; -import RasterSource from '../src/ol/source/Raster.js'; -import XYZ from '../src/ol/source/XYZ.js'; +import {OSM, Raster, XYZ} from '../src/ol/source.js'; /** @@ -108,7 +106,7 @@ const elevation = new XYZ({ transition: 0 }); -const raster = new RasterSource({ +const raster = new Raster({ sources: [elevation], operationType: 'image', operation: shade diff --git a/examples/snap.js b/examples/snap.js index 15fda2ded9..7a77a31781 100644 --- a/examples/snap.js +++ b/examples/snap.js @@ -6,8 +6,7 @@ import Select from '../src/ol/interaction/Select.js'; import Snap from '../src/ol/interaction/Snap.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/topolis.js b/examples/topolis.js index ee28f75f2e..1f8465ed16 100644 --- a/examples/topolis.js +++ b/examples/topolis.js @@ -11,8 +11,7 @@ import Draw from '../src/ol/interaction/Draw.js'; import Snap from '../src/ol/interaction/Snap.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import Style from '../src/ol/style/Style.js'; import Stroke from '../src/ol/style/Stroke.js'; import Fill from '../src/ol/style/Fill.js'; diff --git a/examples/turf.js b/examples/turf.js index 1eae5b307c..0f69af78f7 100644 --- a/examples/turf.js +++ b/examples/turf.js @@ -6,8 +6,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {fromLonLat} from '../src/ol/proj.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const source = new VectorSource(); diff --git a/examples/vector-labels.js b/examples/vector-labels.js index 220f4f973d..265d1537f2 100644 --- a/examples/vector-labels.js +++ b/examples/vector-labels.js @@ -3,8 +3,7 @@ import View from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; import Stroke from '../src/ol/style/Stroke.js'; diff --git a/examples/wkt.js b/examples/wkt.js index 72023313f1..169e637863 100644 --- a/examples/wkt.js +++ b/examples/wkt.js @@ -3,8 +3,7 @@ import View from '../src/ol/View.js'; import WKT from '../src/ol/format/WKT.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; -import OSM from '../src/ol/source/OSM.js'; -import VectorSource from '../src/ol/source/Vector.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; const raster = new TileLayer({ source: new OSM() diff --git a/src/ol/source.js b/src/ol/source.js new file mode 100644 index 0000000000..af44577570 --- /dev/null +++ b/src/ol/source.js @@ -0,0 +1,29 @@ +/** + * @module ol/source + */ + +export {default as BingMaps} from './source/BingMaps.js'; +export {default as CartoDB} from './source/CartoDB.js'; +export {default as Cluster} from './source/Cluster.js'; +export {default as Image} from './source/Image.js'; +export {default as ImageArcGISRest} from './source/ImageArcGISRest.js'; +export {default as ImageCanvas} from './source/ImageCanvas.js'; +export {default as ImageMapGuide} from './source/ImageMapGuide.js'; +export {default as ImageStatic} from './source/ImageStatic.js'; +export {default as ImageWMS} from './source/ImageWMS.js'; +export {default as OSM} from './source/OSM.js'; +export {default as Raster} from './source/Raster.js'; +export {default as Source} from './source/Source.js'; +export {default as Stamen} from './source/Stamen.js'; +export {default as Tile} from './source/Tile.js'; +export {default as TileArcGISRest} from './source/TileArcGISRest.js'; +export {default as TileDebug} from './source/TileDebug.js'; +export {default as TileImage} from './source/TileImage.js'; +export {default as TileJSON} from './source/TileJSON.js'; +export {default as TileUTFGrid} from './source/TileUTFGrid.js'; +export {default as TileWMS} from './source/TileWMS.js'; +export {default as UrlTile} from './source/UrlTile.js'; +export {default as Vector} from './source/Vector.js'; +export {default as WMTS} from './source/WMTS.js'; +export {default as XYZ} from './source/XYZ.js'; +export {default as Zoomify} from './source/Zoomify.js';