From cda0fe6e41074ec7a81c064513606f297406a76a Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 23 Apr 2018 17:55:37 -0600 Subject: [PATCH] Re-export style constructors from ol/style --- examples/blend-modes.js | 5 +---- examples/canvas-gradient-pattern.js | 4 +--- examples/center.js | 5 +---- examples/cluster.js | 6 +----- examples/custom-interactions.js | 5 +---- examples/drag-and-drop-image-vector.js | 5 +---- examples/drag-and-drop.js | 5 +---- examples/draw-and-modify-features.js | 5 +---- examples/dynamic-data.js | 5 +---- examples/earthquake-clusters.js | 7 +------ examples/earthquake-custom-symbol.js | 5 +---- examples/feature-animation.js | 4 +--- examples/feature-move-animation.js | 6 +----- examples/flight-animation.js | 3 +-- examples/geojson.js | 5 +---- examples/geolocation.js | 5 +---- examples/gpx.js | 5 +---- examples/hit-tolerance.js | 3 +-- examples/icon-color.js | 3 +-- examples/icon-negative.js | 3 +-- examples/icon-sprite-webgl.js | 3 +-- examples/icon.js | 3 +-- examples/igc.js | 5 +---- examples/image-vector-layer.js | 5 +---- examples/kml-earthquakes.js | 5 +---- examples/kml-timezones.js | 4 +--- examples/layer-z-index.js | 5 +---- examples/line-arrows.js | 4 +--- examples/mapbox-vector-tiles-advanced.js | 6 +----- examples/mapbox-vector-tiles.js | 6 +----- examples/measure.js | 5 +---- examples/modify-test.js | 5 +---- examples/osm-vector-tiles.js | 4 +--- examples/polygon-styles.js | 5 +---- examples/regularshape.js | 5 +---- examples/render-geometry.js | 5 +---- examples/snap.js | 5 +---- examples/street-labels.js | 4 +--- examples/symbol-atlas-webgl.js | 7 +------ examples/synthetic-lines.js | 3 +-- examples/synthetic-points.js | 5 +---- examples/topojson.js | 4 +--- examples/topolis.js | 6 +----- examples/vector-esri.js | 4 +--- examples/vector-label-decluttering.js | 5 +---- examples/vector-labels.js | 6 +----- examples/vector-layer.js | 5 +---- examples/vector-osm.js | 5 +---- examples/vector-tile-selection.js | 4 +--- examples/vector-wfs-getfeature.js | 3 +-- examples/vector-wfs.js | 3 +-- src/ol/renderer/Map.js | 2 +- src/ol/style.js | 12 ++++++++++++ 53 files changed, 64 insertions(+), 188 deletions(-) diff --git a/examples/blend-modes.js b/examples/blend-modes.js index 7ee71cee8a..c1fe4d0ff5 100644 --- a/examples/blend-modes.js +++ b/examples/blend-modes.js @@ -4,10 +4,7 @@ import View from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; // Create separate layers for red, green an blue circles. diff --git a/examples/canvas-gradient-pattern.js b/examples/canvas-gradient-pattern.js index 5cc2d4e39c..33dc59f75a 100644 --- a/examples/canvas-gradient-pattern.js +++ b/examples/canvas-gradient-pattern.js @@ -6,9 +6,7 @@ import {DEVICE_PIXEL_RATIO} from '../src/ol/has.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {fromLonLat} from '../src/ol/proj.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Fill from '../src/ol/style/Fill.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Fill, Stroke, Style} from '../src/ol/style.js'; const canvas = document.createElement('canvas'); const context = canvas.getContext('2d'); diff --git a/examples/center.js b/examples/center.js index 784b72b5f3..9988cf43ce 100644 --- a/examples/center.js +++ b/examples/center.js @@ -4,10 +4,7 @@ import {defaults as defaultControls} from '../src/ol/control.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const source = new VectorSource({ url: 'data/geojson/switzerland.geojson', diff --git a/examples/cluster.js b/examples/cluster.js index c281826ed5..b74f9194ab 100644 --- a/examples/cluster.js +++ b/examples/cluster.js @@ -4,11 +4,7 @@ import View from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; -import Text from '../src/ol/style/Text.js'; +import {Circle as CircleStyle, Fill, Stroke, Style, Text} from '../src/ol/style.js'; const distance = document.getElementById('distance'); diff --git a/examples/custom-interactions.js b/examples/custom-interactions.js index 89fc735fc7..93df5dc2be 100644 --- a/examples/custom-interactions.js +++ b/examples/custom-interactions.js @@ -6,10 +6,7 @@ import {LineString, Point, Polygon} from '../src/ol/geom.js'; import {defaults as defaultInteractions, Pointer as PointerInteraction} from '../src/ol/interaction.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; +import {Fill, Icon, Stroke, Style} from '../src/ol/style.js'; /** diff --git a/examples/drag-and-drop-image-vector.js b/examples/drag-and-drop-image-vector.js index 785a2dfb14..27073e6622 100644 --- a/examples/drag-and-drop-image-vector.js +++ b/examples/drag-and-drop-image-vector.js @@ -4,10 +4,7 @@ import {GPX, GeoJSON, IGC, KML, TopoJSON} from '../src/ol/format.js'; import {defaults as defaultInteractions, DragAndDrop} from '../src/ol/interaction.js'; import {Vector as VectorLayer, Tile as TileLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const defaultStyle = { diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js index 2df96d3d4c..453e3abef3 100644 --- a/examples/drag-and-drop.js +++ b/examples/drag-and-drop.js @@ -4,10 +4,7 @@ import {GPX, GeoJSON, IGC, KML, TopoJSON} from '../src/ol/format.js'; import {defaults as defaultInteractions, DragAndDrop} from '../src/ol/interaction.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const defaultStyle = { diff --git a/examples/draw-and-modify-features.js b/examples/draw-and-modify-features.js index ce4e9d9564..0863a752fb 100644 --- a/examples/draw-and-modify-features.js +++ b/examples/draw-and-modify-features.js @@ -3,10 +3,7 @@ import View from '../src/ol/View.js'; import {Draw, Modify, Snap} from '../src/ol/interaction.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const raster = new TileLayer({ source: new OSM() diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js index 0b756ef537..4896250490 100644 --- a/examples/dynamic-data.js +++ b/examples/dynamic-data.js @@ -3,10 +3,7 @@ import View from '../src/ol/View.js'; import {MultiPoint, Point} from '../src/ol/geom.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const map = new Map({ diff --git a/examples/earthquake-clusters.js b/examples/earthquake-clusters.js index 819e174bb9..654e25a4f8 100644 --- a/examples/earthquake-clusters.js +++ b/examples/earthquake-clusters.js @@ -5,12 +5,7 @@ import KML from '../src/ol/format/KML.js'; import {defaults as defaultInteractions, Select} from '../src/ol/interaction.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; -import Text from '../src/ol/style/Text.js'; +import {Circle as CircleStyle, Fill, RegularShape, Stroke, Style, Text} from '../src/ol/style.js'; const earthquakeFill = new Fill({ diff --git a/examples/earthquake-custom-symbol.js b/examples/earthquake-custom-symbol.js index ae03230523..07692d0707 100644 --- a/examples/earthquake-custom-symbol.js +++ b/examples/earthquake-custom-symbol.js @@ -6,10 +6,7 @@ import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import {toContext} from '../src/ol/render.js'; import Stamen from '../src/ol/source/Stamen.js'; import VectorSource from '../src/ol/source/Vector.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'; -import Style from '../src/ol/style/Style.js'; +import {Fill, Icon, Stroke, Style} from '../src/ol/style.js'; const symbol = [[0, 0], [4, 2], [6, 0], [10, 5], [6, 3], [4, 5], [0, 0]]; diff --git a/examples/feature-animation.js b/examples/feature-animation.js index a91a6c9b7a..51998e5196 100644 --- a/examples/feature-animation.js +++ b/examples/feature-animation.js @@ -8,9 +8,7 @@ import Point from '../src/ol/geom/Point.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import {fromLonLat} from '../src/ol/proj.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'; +import {Circle as CircleStyle, Stroke, Style} from '../src/ol/style.js'; const map = new Map({ diff --git a/examples/feature-move-animation.js b/examples/feature-move-animation.js index c7d185bc54..9443a84d5e 100644 --- a/examples/feature-move-animation.js +++ b/examples/feature-move-animation.js @@ -6,11 +6,7 @@ import Point from '../src/ol/geom/Point.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import BingMaps from '../src/ol/source/BingMaps.js'; import VectorSource from '../src/ol/source/Vector.js'; -import CircleStyle from '../src/ol/style/Circle.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Icon, Stroke, Style} from '../src/ol/style.js'; // This long string is placed here due to jsFiddle limitations. // It is usually loaded with AJAX. diff --git a/examples/flight-animation.js b/examples/flight-animation.js index 6bd0c14840..a3a5b15685 100644 --- a/examples/flight-animation.js +++ b/examples/flight-animation.js @@ -6,8 +6,7 @@ import LineString from '../src/ol/geom/LineString.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import Stamen from '../src/ol/source/Stamen.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Stroke, Style} from '../src/ol/style.js'; const map = new Map({ layers: [ diff --git a/examples/geojson.js b/examples/geojson.js index 8f0e25aad8..3bc7a5706b 100644 --- a/examples/geojson.js +++ b/examples/geojson.js @@ -6,10 +6,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js'; import Circle from '../src/ol/geom/Circle.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const image = new CircleStyle({ diff --git a/examples/geolocation.js b/examples/geolocation.js index 2e9f984933..3063d09f6b 100644 --- a/examples/geolocation.js +++ b/examples/geolocation.js @@ -6,10 +6,7 @@ import {defaults as defaultControls} from '../src/ol/control.js'; import Point from '../src/ol/geom/Point.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const view = new View({ center: [0, 0], diff --git a/examples/gpx.js b/examples/gpx.js index b66197f700..98b8c05c5a 100644 --- a/examples/gpx.js +++ b/examples/gpx.js @@ -4,10 +4,7 @@ import GPX from '../src/ol/format/GPX.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import BingMaps from '../src/ol/source/BingMaps.js'; import VectorSource from '../src/ol/source/Vector.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const raster = new TileLayer({ source: new BingMaps({ diff --git a/examples/hit-tolerance.js b/examples/hit-tolerance.js index e5cee7458b..a337485f8e 100644 --- a/examples/hit-tolerance.js +++ b/examples/hit-tolerance.js @@ -4,8 +4,7 @@ import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Stroke from '../src/ol/style/Stroke.js'; +import {Stroke, Style} from '../src/ol/style.js'; const raster = new TileLayer({ source: new OSM() diff --git a/examples/icon-color.js b/examples/icon-color.js index 44baa44a4b..f7ffafe23e 100644 --- a/examples/icon-color.js +++ b/examples/icon-color.js @@ -6,8 +6,7 @@ import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import {fromLonLat} from '../src/ol/proj.js'; import TileJSON from '../src/ol/source/TileJSON.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Icon from '../src/ol/style/Icon.js'; -import Style from '../src/ol/style/Style.js'; +import {Icon, Style} from '../src/ol/style.js'; const rome = new Feature({ diff --git a/examples/icon-negative.js b/examples/icon-negative.js index d664d3f3e4..e123f96352 100644 --- a/examples/icon-negative.js +++ b/examples/icon-negative.js @@ -6,8 +6,7 @@ import Select from '../src/ol/interaction/Select.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import Stamen from '../src/ol/source/Stamen.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Icon from '../src/ol/style/Icon.js'; -import Style from '../src/ol/style/Style.js'; +import {Icon, Style} from '../src/ol/style.js'; function createStyle(src, img) { diff --git a/examples/icon-sprite-webgl.js b/examples/icon-sprite-webgl.js index d6305178d7..0ea50ca555 100644 --- a/examples/icon-sprite-webgl.js +++ b/examples/icon-sprite-webgl.js @@ -4,8 +4,7 @@ import View from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Icon from '../src/ol/style/Icon.js'; -import Style from '../src/ol/style/Style.js'; +import {Icon, Style} from '../src/ol/style.js'; const iconInfo = [{ diff --git a/examples/icon.js b/examples/icon.js index ce32ca969d..43010faf1c 100644 --- a/examples/icon.js +++ b/examples/icon.js @@ -6,8 +6,7 @@ import Point from '../src/ol/geom/Point.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import TileJSON from '../src/ol/source/TileJSON.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Icon from '../src/ol/style/Icon.js'; -import Style from '../src/ol/style/Style.js'; +import {Icon, Style} from '../src/ol/style.js'; const iconFeature = new Feature({ diff --git a/examples/igc.js b/examples/igc.js index 569bac4d5f..a8a8a44370 100644 --- a/examples/igc.js +++ b/examples/igc.js @@ -7,10 +7,7 @@ import {LineString, Point} from '../src/ol/geom.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import OSM, {ATTRIBUTION} from '../src/ol/source/OSM.js'; import VectorSource from '../src/ol/source/Vector.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const colors = { diff --git a/examples/image-vector-layer.js b/examples/image-vector-layer.js index 035660acb1..768ffa5198 100644 --- a/examples/image-vector-layer.js +++ b/examples/image-vector-layer.js @@ -3,10 +3,7 @@ import View from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Fill from '../src/ol/style/Fill.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; -import Text from '../src/ol/style/Text.js'; +import {Fill, Stroke, Style, Text} from '../src/ol/style.js'; const style = new Style({ diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js index bb1fbd7fe9..3ccd3ae988 100644 --- a/examples/kml-earthquakes.js +++ b/examples/kml-earthquakes.js @@ -4,10 +4,7 @@ import KML from '../src/ol/format/KML.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import Stamen from '../src/ol/source/Stamen.js'; import VectorSource from '../src/ol/source/Vector.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const styleCache = {}; diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js index 4db5cdceb0..7c60c0a01e 100644 --- a/examples/kml-timezones.js +++ b/examples/kml-timezones.js @@ -4,9 +4,7 @@ import KML from '../src/ol/format/KML.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import Stamen from '../src/ol/source/Stamen.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Fill from '../src/ol/style/Fill.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Fill, Stroke, Style} from '../src/ol/style.js'; /* diff --git a/examples/layer-z-index.js b/examples/layer-z-index.js index 56398592a8..12cbfc3b7c 100644 --- a/examples/layer-z-index.js +++ b/examples/layer-z-index.js @@ -4,10 +4,7 @@ import View from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Fill from '../src/ol/style/Fill.js'; -import RegularShape from '../src/ol/style/RegularShape.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Fill, RegularShape, Stroke, Style} from '../src/ol/style.js'; const stroke = new Stroke({color: 'black', width: 1}); diff --git a/examples/line-arrows.js b/examples/line-arrows.js index 7d7e5a96dd..e99b259d69 100644 --- a/examples/line-arrows.js +++ b/examples/line-arrows.js @@ -4,9 +4,7 @@ import Point from '../src/ol/geom/Point.js'; import Draw from '../src/ol/interaction/Draw.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; +import {Icon, Stroke, Style} from '../src/ol/style.js'; const raster = new TileLayer({ source: new OSM() diff --git a/examples/mapbox-vector-tiles-advanced.js b/examples/mapbox-vector-tiles-advanced.js index af2718af8c..0d52052dfc 100644 --- a/examples/mapbox-vector-tiles-advanced.js +++ b/examples/mapbox-vector-tiles-advanced.js @@ -4,11 +4,7 @@ import MVT from '../src/ol/format/MVT.js'; import VectorTileLayer from '../src/ol/layer/VectorTile.js'; import {get as getProjection} from '../src/ol/proj.js'; import VectorTileSource from '../src/ol/source/VectorTile.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'; -import Style from '../src/ol/style/Style.js'; -import Text from '../src/ol/style/Text.js'; +import {Fill, Icon, Stroke, Style, Text} from '../src/ol/style.js'; import TileGrid from '../src/ol/tilegrid/TileGrid.js'; diff --git a/examples/mapbox-vector-tiles.js b/examples/mapbox-vector-tiles.js index 33dc970fb6..a9dacd2e2b 100644 --- a/examples/mapbox-vector-tiles.js +++ b/examples/mapbox-vector-tiles.js @@ -3,11 +3,7 @@ import View from '../src/ol/View.js'; import MVT from '../src/ol/format/MVT.js'; import VectorTileLayer from '../src/ol/layer/VectorTile.js'; import VectorTileSource from '../src/ol/source/VectorTile.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'; -import Style from '../src/ol/style/Style.js'; -import Text from '../src/ol/style/Text.js'; +import {Fill, Icon, Stroke, Style, Text} from '../src/ol/style.js'; const key = 'pk.eyJ1IjoiYWhvY2V2YXIiLCJhIjoiRk1kMWZaSSJ9.E5BkluenyWQMsBLsuByrmg'; diff --git a/examples/measure.js b/examples/measure.js index 179f89ba49..d7d6b37ea7 100644 --- a/examples/measure.js +++ b/examples/measure.js @@ -7,10 +7,7 @@ import {LineString, Polygon} from '../src/ol/geom.js'; import Draw from '../src/ol/interaction/Draw.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const raster = new TileLayer({ diff --git a/examples/modify-test.js b/examples/modify-test.js index 56fbe2ac1d..f399546a03 100644 --- a/examples/modify-test.js +++ b/examples/modify-test.js @@ -4,10 +4,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js'; import {defaults as defaultInteractions, Modify, Select} from '../src/ol/interaction.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const styleFunction = (function() { diff --git a/examples/osm-vector-tiles.js b/examples/osm-vector-tiles.js index 29f50e200d..1d3f42d924 100644 --- a/examples/osm-vector-tiles.js +++ b/examples/osm-vector-tiles.js @@ -4,9 +4,7 @@ import TopoJSON from '../src/ol/format/TopoJSON.js'; import VectorTileLayer from '../src/ol/layer/VectorTile.js'; import {fromLonLat} from '../src/ol/proj.js'; import VectorTileSource from '../src/ol/source/VectorTile.js'; -import Fill from '../src/ol/style/Fill.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Fill, Stroke, Style} from '../src/ol/style.js'; const key = 'vector-tiles-5eJz6JX'; diff --git a/examples/polygon-styles.js b/examples/polygon-styles.js index 4af6880961..7f1a03e1c2 100644 --- a/examples/polygon-styles.js +++ b/examples/polygon-styles.js @@ -4,10 +4,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js'; import MultiPoint from '../src/ol/geom/MultiPoint.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const styles = [ /* We are using two different styles for the polygons: diff --git a/examples/regularshape.js b/examples/regularshape.js index cefff88c2b..6d26f9d3e3 100644 --- a/examples/regularshape.js +++ b/examples/regularshape.js @@ -4,10 +4,7 @@ import View from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Fill from '../src/ol/style/Fill.js'; -import RegularShape from '../src/ol/style/RegularShape.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Fill, RegularShape, Stroke, Style} from '../src/ol/style.js'; const stroke = new Stroke({color: 'black', width: 2}); diff --git a/examples/render-geometry.js b/examples/render-geometry.js index edd21bd0ca..d3e1be366a 100644 --- a/examples/render-geometry.js +++ b/examples/render-geometry.js @@ -1,9 +1,6 @@ import {LineString, Point, Polygon} from '../src/ol/geom.js'; import {toContext} from '../src/ol/render.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const canvas = document.getElementById('canvas'); diff --git a/examples/snap.js b/examples/snap.js index 7e101b18d8..cea9b3ee11 100644 --- a/examples/snap.js +++ b/examples/snap.js @@ -3,10 +3,7 @@ import View from '../src/ol/View.js'; import {Draw, Modify, Select, Snap} from '../src/ol/interaction.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const raster = new TileLayer({ source: new OSM() diff --git a/examples/street-labels.js b/examples/street-labels.js index 188f4ae09a..d05a70bfc3 100644 --- a/examples/street-labels.js +++ b/examples/street-labels.js @@ -5,9 +5,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import BingMaps from '../src/ol/source/BingMaps.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Fill from '../src/ol/style/Fill.js'; -import Style from '../src/ol/style/Style.js'; -import Text from '../src/ol/style/Text.js'; +import {Fill, Style, Text} from '../src/ol/style.js'; const style = new Style({ text: new Text({ diff --git a/examples/symbol-atlas-webgl.js b/examples/symbol-atlas-webgl.js index 9256fcf399..a86e79164c 100644 --- a/examples/symbol-atlas-webgl.js +++ b/examples/symbol-atlas-webgl.js @@ -4,12 +4,7 @@ import View from '../src/ol/View.js'; import Point from '../src/ol/geom/Point.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; -import AtlasManager from '../src/ol/style/AtlasManager.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'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {AtlasManager, Circle as CircleStyle, Fill, RegularShape, Stroke, Style} from '../src/ol/style.js'; const atlasManager = new AtlasManager({ // we increase the initial size so that all symbols fit into diff --git a/examples/synthetic-lines.js b/examples/synthetic-lines.js index 104f6703e3..c2ae45df83 100644 --- a/examples/synthetic-lines.js +++ b/examples/synthetic-lines.js @@ -4,8 +4,7 @@ import View from '../src/ol/View.js'; import LineString from '../src/ol/geom/LineString.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Stroke, Style} from '../src/ol/style.js'; const count = 10000; diff --git a/examples/synthetic-points.js b/examples/synthetic-points.js index 523322553d..5f04f1ba46 100644 --- a/examples/synthetic-points.js +++ b/examples/synthetic-points.js @@ -4,10 +4,7 @@ import View from '../src/ol/View.js'; import {LineString, Point} from '../src/ol/geom.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; const count = 20000; diff --git a/examples/topojson.js b/examples/topojson.js index 24ab70cdec..2a6c14e436 100644 --- a/examples/topojson.js +++ b/examples/topojson.js @@ -4,9 +4,7 @@ import TopoJSON from '../src/ol/format/TopoJSON.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import TileJSON from '../src/ol/source/TileJSON.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Fill from '../src/ol/style/Fill.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Fill, Stroke, Style} from '../src/ol/style.js'; const raster = new TileLayer({ diff --git a/examples/topolis.js b/examples/topolis.js index 2a3d8f88d1..86777e2023 100644 --- a/examples/topolis.js +++ b/examples/topolis.js @@ -8,11 +8,7 @@ import {Point, LineString, Polygon} from '../src/ol/geom.js'; import {Draw, Snap} from '../src/ol/interaction.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import CircleStyle from '../src/ol/style/Circle.js'; -import Text from '../src/ol/style/Text.js'; +import {Fill, Circle as CircleStyle, Stroke, Style, Text} from '../src/ol/style.js'; import MousePosition from '../src/ol/control/MousePosition.js'; const raster = new TileLayer({ diff --git a/examples/vector-esri.js b/examples/vector-esri.js index 1628a3d91d..729387a186 100644 --- a/examples/vector-esri.js +++ b/examples/vector-esri.js @@ -6,9 +6,7 @@ import {tile as tileStrategy} from '../src/ol/loadingstrategy.js'; import {fromLonLat} from '../src/ol/proj.js'; import VectorSource from '../src/ol/source/Vector.js'; import XYZ from '../src/ol/source/XYZ.js'; -import Fill from '../src/ol/style/Fill.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Fill, Stroke, Style} from '../src/ol/style.js'; import {createXYZ} from '../src/ol/tilegrid.js'; diff --git a/examples/vector-label-decluttering.js b/examples/vector-label-decluttering.js index cb340acbdf..dfc6afc65e 100644 --- a/examples/vector-label-decluttering.js +++ b/examples/vector-label-decluttering.js @@ -4,10 +4,7 @@ import {getWidth} from '../src/ol/extent.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Fill from '../src/ol/style/Fill.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; -import Text from '../src/ol/style/Text.js'; +import {Fill, Stroke, Style, Text} from '../src/ol/style.js'; const map = new Map({ target: 'map', diff --git a/examples/vector-labels.js b/examples/vector-labels.js index 73f1a10d08..04d5f8c998 100644 --- a/examples/vector-labels.js +++ b/examples/vector-labels.js @@ -3,11 +3,7 @@ import View from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.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'; -import Style from '../src/ol/style/Style.js'; -import Text from '../src/ol/style/Text.js'; +import {Circle as CircleStyle, Fill, Stroke, Style, Text} from '../src/ol/style.js'; let openSansAdded = false; diff --git a/examples/vector-layer.js b/examples/vector-layer.js index b942d86873..7e2e72c539 100644 --- a/examples/vector-layer.js +++ b/examples/vector-layer.js @@ -3,10 +3,7 @@ import View from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Fill from '../src/ol/style/Fill.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; -import Text from '../src/ol/style/Text.js'; +import {Fill, Stroke, Style, Text} from '../src/ol/style.js'; const style = new Style({ diff --git a/examples/vector-osm.js b/examples/vector-osm.js index 35c9465e84..9c18ffd660 100644 --- a/examples/vector-osm.js +++ b/examples/vector-osm.js @@ -7,10 +7,7 @@ import {bbox as bboxStrategy} from '../src/ol/loadingstrategy.js'; import {transformExtent} from '../src/ol/proj.js'; import BingMaps from '../src/ol/source/BingMaps.js'; import VectorSource from '../src/ol/source/Vector.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'; -import Style from '../src/ol/style/Style.js'; +import {Circle as CircleStyle, Fill, Stroke, Style} from '../src/ol/style.js'; let map = null; diff --git a/examples/vector-tile-selection.js b/examples/vector-tile-selection.js index 2f2fa41a44..22d5d52676 100644 --- a/examples/vector-tile-selection.js +++ b/examples/vector-tile-selection.js @@ -3,9 +3,7 @@ import View from '../src/ol/View.js'; import MVT from '../src/ol/format/MVT.js'; import VectorTileLayer from '../src/ol/layer/VectorTile.js'; import VectorTileSource from '../src/ol/source/VectorTile.js'; -import Style from '../src/ol/style/Style.js'; -import Fill from '../src/ol/style/Fill.js'; -import Stroke from '../src/ol/style/Stroke.js'; +import {Fill, Stroke, Style} from '../src/ol/style.js'; // lookup for selection objects let selection = {}; diff --git a/examples/vector-wfs-getfeature.js b/examples/vector-wfs-getfeature.js index 9d1a397773..a46043a59d 100644 --- a/examples/vector-wfs-getfeature.js +++ b/examples/vector-wfs-getfeature.js @@ -9,8 +9,7 @@ import {WFS, GeoJSON} from '../src/ol/format.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import BingMaps from '../src/ol/source/BingMaps.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Stroke, Style} from '../src/ol/style.js'; const vectorSource = new VectorSource(); diff --git a/examples/vector-wfs.js b/examples/vector-wfs.js index 8651c7a22d..970719ab30 100644 --- a/examples/vector-wfs.js +++ b/examples/vector-wfs.js @@ -5,8 +5,7 @@ import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import {bbox as bboxStrategy} from '../src/ol/loadingstrategy.js'; import BingMaps from '../src/ol/source/BingMaps.js'; import VectorSource from '../src/ol/source/Vector.js'; -import Stroke from '../src/ol/style/Stroke.js'; -import Style from '../src/ol/style/Style.js'; +import {Stroke, Style} from '../src/ol/style.js'; const vectorSource = new VectorSource({ diff --git a/src/ol/renderer/Map.js b/src/ol/renderer/Map.js index d58dd88f95..6053fb602d 100644 --- a/src/ol/renderer/Map.js +++ b/src/ol/renderer/Map.js @@ -9,7 +9,7 @@ import {getWidth} from '../extent.js'; import {TRUE, UNDEFINED} from '../functions.js'; import {visibleAtResolution} from '../layer/Layer.js'; import {shared as iconImageCache} from '../style/IconImageCache.js'; -import {compose as composeTransform, invert as invertTransform, setFromArray as transformSetFromArray} from '../transform.js'; import IconImageCache from '../style/IconImageCache.js'; +import {compose as composeTransform, invert as invertTransform, setFromArray as transformSetFromArray} from '../transform.js'; /** diff --git a/src/ol/style.js b/src/ol/style.js index f0aaad615d..c572868b05 100644 --- a/src/ol/style.js +++ b/src/ol/style.js @@ -13,3 +13,15 @@ * (module:ol/style/Style~Style|Array.)} StyleFunction * @api */ + +export {default as Atlas} from './style/Atlas.js'; +export {default as AtlasManager} from './style/AtlasManager.js'; +export {default as Circle} from './style/Circle.js'; +export {default as Fill} from './style/Fill.js'; +export {default as Icon} from './style/Icon.js'; +export {default as IconImage} from './style/IconImage.js'; +export {default as Image} from './style/Image.js'; +export {default as RegularShape} from './style/RegularShape.js'; +export {default as Stroke} from './style/Stroke.js'; +export {default as Style} from './style/Style.js'; +export {default as Text} from './style/Text.js';