ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_style_Fill_ to Fill

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 13:23:27 -07:00
parent 4f4c90fc20
commit dc6ae2293d
65 changed files with 268 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/blend-modes.js
View File

@@ -5,7 +5,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -20,7 +20,7 @@ var redLayer = new VectorLayer({
}),
style: new Style({
image: new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,0,0,0.8)'
}),
stroke: new _ol_style_Stroke_({
@@ -38,7 +38,7 @@ var greenLayer = new VectorLayer({
}),
style: new Style({
image: new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0,255,0,0.8)'
}),
stroke: new _ol_style_Stroke_({
@@ -55,7 +55,7 @@ var blueLayer = new VectorLayer({
}),
style: new Style({
image: new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0,0,255,0.8)'
}),
stroke: new _ol_style_Stroke_({

4
examples/canvas-gradient-pattern.js
View File

@@ -6,7 +6,7 @@ import _ol_has_ 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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -57,7 +57,7 @@ var pattern = (function() {
}());
// Generate style for gradient or pattern fill
var fill = new _ol_style_Fill_();
var fill = new Fill();
var style = new Style({
fill: fill,
stroke: new _ol_style_Stroke_({

6
examples/center.js
View File

@@ -7,7 +7,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -16,7 +16,7 @@ var source = new VectorSource({
format: new GeoJSON()
});
var style = new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.6)'
}),
stroke: new _ol_style_Stroke_({
@@ -25,7 +25,7 @@ var style = new Style({
}),
image: new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.6)'
}),
stroke: new _ol_style_Stroke_({

6
examples/cluster.js
View File

@@ -8,7 +8,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
import _ol_style_Text_ from '../src/ol/style/Text.js';
@@ -46,13 +46,13 @@ var clusters = new VectorLayer({
stroke: new _ol_style_Stroke_({
color: '#fff'
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#3399CC'
})
}),
text: new _ol_style_Text_({
text: size.toString(),
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#fff'
})
})

4
examples/custom-interactions.js
View File

@@ -11,7 +11,7 @@ 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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -168,7 +168,7 @@ var map = new Map({
width: 3,
color: [255, 0, 0, 1]
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: [0, 0, 255, 0.6]
})
})

10
examples/drag-and-drop-image-vector.js
View File

@@ -12,7 +12,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -20,7 +20,7 @@ import Style from '../src/ol/style/Style.js';
var defaultStyle = {
'Point': new Style({
image: new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,255,0,0.5)'
}),
radius: 5,
@@ -37,7 +37,7 @@ var defaultStyle = {
})
}),
'Polygon': new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0,255,255,0.5)'
}),
stroke: new _ol_style_Stroke_({
@@ -47,7 +47,7 @@ var defaultStyle = {
}),
'MultiPoint': new Style({
image: new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,0,255,0.5)'
}),
radius: 5,
@@ -64,7 +64,7 @@ var defaultStyle = {
})
}),
'MultiPolygon': new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0,0,255,0.5)'
}),
stroke: new _ol_style_Stroke_({

10
examples/drag-and-drop.js
View File

@@ -12,7 +12,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -20,7 +20,7 @@ import Style from '../src/ol/style/Style.js';
var defaultStyle = {
'Point': new Style({
image: new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,255,0,0.5)'
}),
radius: 5,
@@ -37,7 +37,7 @@ var defaultStyle = {
})
}),
'Polygon': new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0,255,255,0.5)'
}),
stroke: new _ol_style_Stroke_({
@@ -47,7 +47,7 @@ var defaultStyle = {
}),
'MultiPoint': new Style({
image: new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,0,255,0.5)'
}),
radius: 5,
@@ -64,7 +64,7 @@ var defaultStyle = {
})
}),
'MultiPolygon': new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0,0,255,0.5)'
}),
stroke: new _ol_style_Stroke_({

6
examples/draw-and-modify-features.js
View File

@@ -8,7 +8,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -20,7 +20,7 @@ var source = new VectorSource();
var vector = new VectorLayer({
source: source,
style: new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.2)'
}),
stroke: new _ol_style_Stroke_({
@@ -29,7 +29,7 @@ var vector = new VectorLayer({
}),
image: new _ol_style_Circle_({
radius: 7,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#ffcc33'
})
})

8
examples/dynamic-data.js
View File

@@ -5,7 +5,7 @@ import Point from '../src/ol/geom/Point.js';
import TileLayer from '../src/ol/layer/Tile.js';
import 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';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -27,7 +27,7 @@ var imageStyle = new Style({
image: new _ol_style_Circle_({
radius: 5,
snapToPixel: false,
fill: new _ol_style_Fill_({color: 'yellow'}),
fill: new Fill({color: 'yellow'}),
stroke: new _ol_style_Stroke_({color: 'red', width: 1})
})
});
@@ -36,7 +36,7 @@ var headInnerImageStyle = new Style({
image: new _ol_style_Circle_({
radius: 2,
snapToPixel: false,
fill: new _ol_style_Fill_({color: 'blue'})
fill: new Fill({color: 'blue'})
})
});
@@ -44,7 +44,7 @@ var headOuterImageStyle = new Style({
image: new _ol_style_Circle_({
radius: 5,
snapToPixel: false,
fill: new _ol_style_Fill_({color: 'black'})
fill: new Fill({color: 'black'})
})
});

10
examples/earthquake-clusters.js
View File

@@ -10,28 +10,28 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
import _ol_style_Text_ from '../src/ol/style/Text.js';
var earthquakeFill = new _ol_style_Fill_({
var earthquakeFill = new Fill({
color: 'rgba(255, 153, 0, 0.8)'
});
var earthquakeStroke = new _ol_style_Stroke_({
color: 'rgba(255, 204, 0, 0.2)',
width: 1
});
var textFill = new _ol_style_Fill_({
var textFill = new Fill({
color: '#fff'
});
var textStroke = new _ol_style_Stroke_({
color: 'rgba(0, 0, 0, 0.6)',
width: 3
});
var invisibleFill = new _ol_style_Fill_({
var invisibleFill = new Fill({
color: 'rgba(255, 255, 255, 0.01)'
});
@@ -88,7 +88,7 @@ function styleFunction(feature, resolution) {
style = new Style({
image: new _ol_style_Circle_({
radius: feature.get('radius'),
fill: new _ol_style_Fill_({
fill: new Fill({
color: [255, 153, 0, Math.min(0.8, 0.4 + (size / maxFeatureCount))]
})
}),

4
examples/earthquake-custom-symbol.js
View File

@@ -7,7 +7,7 @@ import VectorLayer from '../src/ol/layer/Vector.js';
import _ol_render_ from '../src/ol/render.js';
import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -36,7 +36,7 @@ var styleFunction = function(feature) {
/** @type {CanvasRenderingContext2D} */ (canvas.getContext('2d')),
{size: [size, size], pixelRatio: 1});
vectorContext.setStyle(new Style({
fill: new _ol_style_Fill_({color: 'rgba(255, 153, 0, 0.4)'}),
fill: new Fill({color: 'rgba(255, 153, 0, 0.4)'}),
stroke: new _ol_style_Stroke_({color: 'rgba(255, 204, 0, 0.2)', width: 2})
}));
vectorContext.drawGeometry(new Polygon([symbol.map(scaleFunction)]));

4
examples/feature-move-animation.js
View File

@@ -8,7 +8,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -100,7 +100,7 @@ var styles = {
image: new _ol_style_Circle_({
radius: 7,
snapToPixel: false,
fill: new _ol_style_Fill_({color: 'black'}),
fill: new Fill({color: 'black'}),
stroke: new _ol_style_Stroke_({
color: 'white', width: 2
})

10
examples/geojson.js
View File

@@ -9,7 +9,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -44,7 +44,7 @@ var styles = {
color: 'yellow',
width: 1
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 0, 0.1)'
})
}),
@@ -54,7 +54,7 @@ var styles = {
lineDash: [4],
width: 3
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0, 0, 255, 0.1)'
})
}),
@@ -63,7 +63,7 @@ var styles = {
color: 'magenta',
width: 2
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'magenta'
}),
image: new _ol_style_Circle_({
@@ -79,7 +79,7 @@ var styles = {
color: 'red',
width: 2
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,0,0,0.2)'
})
})

4
examples/geolocation.js
View File

@@ -9,7 +9,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -70,7 +70,7 @@ var positionFeature = new Feature();
positionFeature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 6,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#3399CC'
}),
stroke: new _ol_style_Stroke_({

4
examples/gpx.js
View File

@@ -6,7 +6,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -20,7 +20,7 @@ var raster = new TileLayer({
var style = {
'Point': new Style({
image: new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,255,0,0.4)'
}),
radius: 5,

4
examples/igc.js
View File

@@ -10,7 +10,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -181,7 +181,7 @@ var featureOverlay = new VectorLayer({
style: new Style({
image: new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,0,0,0.9)'
})
})

6
examples/image-vector-layer.js
View File

@@ -3,14 +3,14 @@ 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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
import _ol_style_Text_ from '../src/ol/style/Text.js';
var style = new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.6)'
}),
stroke: new _ol_style_Stroke_({
@@ -49,7 +49,7 @@ var featureOverlay = new VectorLayer({
color: '#f00',
width: 1
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,0,0,0.1)'
})
})

4
examples/kml-earthquakes.js
View File

@@ -6,7 +6,7 @@ import VectorLayer from '../src/ol/layer/Vector.js';
import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -24,7 +24,7 @@ var styleFunction = function(feature) {
style = new Style({
image: new _ol_style_Circle_({
radius: radius,
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 153, 0, 0.4)'
}),
stroke: new _ol_style_Stroke_({

4
examples/kml-timezones.js
View File

@@ -5,7 +5,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import Stamen from '../src/ol/source/Stamen.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -36,7 +36,7 @@ var styleFunction = function(feature) {
}
var opacity = 0.75 * (1 - delta / 12);
return new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: [0xff, 0xff, 0x33, opacity]
}),
stroke: new _ol_style_Stroke_({

8
examples/layer-z-index.js
View File

@@ -4,7 +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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -15,7 +15,7 @@ var stroke = new _ol_style_Stroke_({color: 'black', width: 1});
var styles = {
'square': new Style({
image: new _ol_style_RegularShape_({
fill: new _ol_style_Fill_({color: 'blue'}),
fill: new Fill({color: 'blue'}),
stroke: stroke,
points: 4,
radius: 80,
@@ -24,7 +24,7 @@ var styles = {
}),
'triangle': new Style({
image: new _ol_style_RegularShape_({
fill: new _ol_style_Fill_({color: 'red'}),
fill: new Fill({color: 'red'}),
stroke: stroke,
points: 3,
radius: 80,
@@ -34,7 +34,7 @@ var styles = {
}),
'star': new Style({
image: new _ol_style_RegularShape_({
fill: new _ol_style_Fill_({color: 'green'}),
fill: new Fill({color: 'green'}),
stroke: stroke,
points: 5,
radius: 80,

4
examples/mapbox-vector-tiles-advanced.js
View File

@@ -4,7 +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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -45,7 +45,7 @@ var map = new Map({
}),
tileUrlFunction: tileUrlFunction
}),
style: createMapboxStreetsV6Style(Style, _ol_style_Fill_, _ol_style_Stroke_, _ol_style_Icon_, _ol_style_Text_)
style: createMapboxStreetsV6Style(Style, Fill, _ol_style_Stroke_, _ol_style_Icon_, _ol_style_Text_)
})
],
target: 'map',

4
examples/mapbox-vector-tiles.js
View File

@@ -3,7 +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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -24,7 +24,7 @@ var map = new Map({
url: 'https://{a-d}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/' +
'{z}/{x}/{y}.vector.pbf?access_token=' + key
}),
style: createMapboxStreetsV6Style(Style, _ol_style_Fill_, _ol_style_Stroke_, _ol_style_Icon_, _ol_style_Text_)
style: createMapboxStreetsV6Style(Style, Fill, _ol_style_Stroke_, _ol_style_Icon_, _ol_style_Text_)
})
],
target: 'map',

10
examples/measure.js
View File

@@ -11,7 +11,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -25,7 +25,7 @@ var source = new VectorSource();
var vector = new VectorLayer({
source: source,
style: new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.2)'
}),
stroke: new _ol_style_Stroke_({
@@ -34,7 +34,7 @@ var vector = new VectorLayer({
}),
image: new _ol_style_Circle_({
radius: 7,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#ffcc33'
})
})
@@ -181,7 +181,7 @@ function addInteraction() {
source: source,
type: type,
style: new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.2)'
}),
stroke: new _ol_style_Stroke_({
@@ -194,7 +194,7 @@ function addInteraction() {
stroke: new _ol_style_Stroke_({
color: 'rgba(0, 0, 0, 0.7)'
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.2)'
})
})

12
examples/modify-test.js
View File

@@ -7,7 +7,7 @@ import Select from '../src/ol/interaction/Select.js';
import VectorLayer from '../src/ol/layer/Vector.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -25,7 +25,7 @@ var styleFunction = (function() {
color: 'blue',
width: 3
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0, 0, 255, 0.1)'
})
});
@@ -40,7 +40,7 @@ var styleFunction = (function() {
color: 'yellow',
width: 1
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 0, 0.1)'
})
});
@@ -49,7 +49,7 @@ var styleFunction = (function() {
color: 'red',
width: 3
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 0, 0, 0.1)'
}),
image: image
@@ -157,7 +157,7 @@ var overlayStyle = (function() {
var styles = {};
styles['Polygon'] = [
new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: [255, 255, 255, 0.5]
})
}),
@@ -196,7 +196,7 @@ var overlayStyle = (function() {
new Style({
image: new _ol_style_Circle_({
radius: 7,
fill: new _ol_style_Fill_({
fill: new Fill({
color: [0, 153, 255, 1]
}),
stroke: new _ol_style_Stroke_({

6
examples/osm-vector-tiles.js
View File

@@ -4,7 +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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -17,7 +17,7 @@ var roadColor = {
'highway': '#f39'
};
var buildingStyle = new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#666',
opacity: 0.4
}),
@@ -27,7 +27,7 @@ var buildingStyle = new Style({
})
});
var waterStyle = new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#9db9e8'
})
});

6
examples/polygon-styles.js
View File

@@ -5,7 +5,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -22,14 +22,14 @@ var styles = [
color: 'blue',
width: 3
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0, 0, 255, 0.1)'
})
}),
new Style({
image: new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'orange'
})
}),

4
examples/regularshape.js
View File

@@ -4,14 +4,14 @@ 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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
var stroke = new _ol_style_Stroke_({color: 'black', width: 2});
var fill = new _ol_style_Fill_({color: 'red'});
var fill = new Fill({color: 'red'});
var styles = {
'square': new Style({

4
examples/render-geometry.js
View File

@@ -3,7 +3,7 @@ import Point from '../src/ol/geom/Point.js';
import Polygon from '../src/ol/geom/Polygon.js';
import _ol_render_ from '../src/ol/render.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -11,7 +11,7 @@ import Style from '../src/ol/style/Style.js';
var canvas = document.getElementById('canvas');
var vectorContext = _ol_render_.toContext(canvas.getContext('2d'), {size: [100, 100]});
var fill = new _ol_style_Fill_({color: 'blue'});
var fill = new Fill({color: 'blue'});
var stroke = new _ol_style_Stroke_({color: 'black'});
var style = new Style({
fill: fill,

6
examples/snap.js
View File

@@ -9,7 +9,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -20,7 +20,7 @@ var raster = new TileLayer({
var vector = new VectorLayer({
source: new VectorSource(),
style: new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.2)'
}),
stroke: new _ol_style_Stroke_({
@@ -29,7 +29,7 @@ var vector = new VectorLayer({
}),
image: new _ol_style_Circle_({
radius: 7,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#ffcc33'
})
})

4
examples/street-labels.js
View File

@@ -6,7 +6,7 @@ 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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import Style from '../src/ol/style/Style.js';
import _ol_style_Text_ from '../src/ol/style/Text.js';
@@ -14,7 +14,7 @@ var style = new Style({
text: new _ol_style_Text_({
font: 'bold 11px "Open Sans", "Arial Unicode MS", "sans-serif"',
placement: 'line',
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'white'
})
})

6
examples/symbol-atlas-webgl.js
View File

@@ -6,7 +6,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -51,7 +51,7 @@ for (i = 0; i < symbolInfo.length; ++i) {
opacity: info.opacity,
scale: info.scale,
radius: radiuses[j],
fill: new _ol_style_Fill_({
fill: new Fill({
color: info.fillColor
}),
stroke: new _ol_style_Stroke_({
@@ -71,7 +71,7 @@ for (i = 0; i < symbolInfo.length; ++i) {
radius: radiuses[j],
radius2: radiuses[j] * 0.7,
angle: 1.4,
fill: new _ol_style_Fill_({
fill: new Fill({
color: info.fillColor
}),
stroke: new _ol_style_Stroke_({

6
examples/synthetic-points.js
View File

@@ -6,7 +6,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -27,14 +27,14 @@ var styles = {
'10': new Style({
image: new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({color: '#666666'}),
fill: new Fill({color: '#666666'}),
stroke: new _ol_style_Stroke_({color: '#bada55', width: 1})
})
}),
'20': new Style({
image: new _ol_style_Circle_({
radius: 10,
fill: new _ol_style_Fill_({color: '#666666'}),
fill: new Fill({color: '#666666'}),
stroke: new _ol_style_Stroke_({color: '#bada55', width: 1})
})
})

4
examples/topojson.js
View File

@@ -5,7 +5,7 @@ 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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -17,7 +17,7 @@ var raster = new TileLayer({
});
var style = new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.6)'
}),
stroke: new _ol_style_Stroke_({

12
examples/topolis.js
View File

@@ -15,7 +15,7 @@ import OSM from '../src/ol/source/OSM.js';
import VectorSource from '../src/ol/source/Vector.js';
import Style from '../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
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';
@@ -31,12 +31,12 @@ var nodesLayer = new VectorLayer({
var style = new Style({
image: new _ol_style_Circle_({
radius: 8,
fill: new _ol_style_Fill_({color: 'rgba(255, 0, 0, 0.2)'}),
fill: new Fill({color: 'rgba(255, 0, 0, 0.2)'}),
stroke: new _ol_style_Stroke_({color: 'red', width: 1})
}),
text: new _ol_style_Text_({
text: f.get('node').id.toString(),
fill: new _ol_style_Fill_({color: 'red'}),
fill: new Fill({color: 'red'}),
stroke: new _ol_style_Stroke_({
color: 'white',
width: 3
@@ -58,7 +58,7 @@ var edgesLayer = new VectorLayer({
}),
text: new _ol_style_Text_({
text: f.get('edge').id.toString(),
fill: new _ol_style_Fill_({color: 'blue'}),
fill: new Fill({color: 'blue'}),
stroke: new _ol_style_Stroke_({
color: 'white',
width: 2
@@ -78,13 +78,13 @@ var facesLayer = new VectorLayer({
color: 'black',
width: 1
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0, 255, 0, 0.2)'
}),
text: new _ol_style_Text_({
font: 'bold 12px sans-serif',
text: f.get('face').id.toString(),
fill: new _ol_style_Fill_({color: 'green'}),
fill: new Fill({color: 'green'}),
stroke: new _ol_style_Stroke_({
color: 'white',
width: 2

10
examples/vector-esri.js
View File

@@ -7,7 +7,7 @@ import _ol_loadingstrategy_ 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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
import _ol_tilegrid_ from '../src/ol/tilegrid.js';
@@ -21,7 +21,7 @@ var esrijsonFormat = new EsriJSON();
var styleCache = {
'ABANDONED': new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(225, 225, 225, 255)'
}),
stroke: new _ol_style_Stroke_({
@@ -30,7 +30,7 @@ var styleCache = {
})
}),
'GAS': new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 0, 0, 255)'
}),
stroke: new _ol_style_Stroke_({
@@ -39,7 +39,7 @@ var styleCache = {
})
}),
'OIL': new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(56, 168, 0, 255)'
}),
stroke: new _ol_style_Stroke_({
@@ -48,7 +48,7 @@ var styleCache = {
})
}),
'OILGAS': new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(168, 112, 0, 255)'
}),
stroke: new _ol_style_Stroke_({

6
examples/vector-label-decluttering.js
View File

@@ -4,7 +4,7 @@ import * as _ol_extent_ 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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
import _ol_style_Text_ from '../src/ol/style/Text.js';
@@ -38,7 +38,7 @@ var labelStyle = new Style({
text: new _ol_style_Text_({
font: '12px Calibri,sans-serif',
overflow: true,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#000'
}),
stroke: new _ol_style_Stroke_({
@@ -48,7 +48,7 @@ var labelStyle = new Style({
})
});
var countryStyle = new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.6)'
}),
stroke: new _ol_style_Stroke_({

8
examples/vector-labels.js
View File

@@ -6,7 +6,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
import _ol_style_Text_ from '../src/ol/style/Text.js';
@@ -114,7 +114,7 @@ var createTextStyle = function(feature, resolution, dom) {
textBaseline: baseline,
font: font,
text: getText(feature, resolution, dom),
fill: new _ol_style_Fill_({color: fillColor}),
fill: new Fill({color: fillColor}),
stroke: new _ol_style_Stroke_({color: outlineColor, width: outlineWidth}),
offsetX: offsetX,
offsetY: offsetY,
@@ -133,7 +133,7 @@ function polygonStyleFunction(feature, resolution) {
color: 'blue',
width: 1
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0, 0, 255, 0.1)'
}),
text: createTextStyle(feature, resolution, myDom.polygons)
@@ -174,7 +174,7 @@ function pointStyleFunction(feature, resolution) {
return new Style({
image: new _ol_style_Circle_({
radius: 10,
fill: new _ol_style_Fill_({color: 'rgba(255, 0, 0, 0.1)'}),
fill: new Fill({color: 'rgba(255, 0, 0, 0.1)'}),
stroke: new _ol_style_Stroke_({color: 'red', width: 1})
}),
text: createTextStyle(feature, resolution, myDom.points)

10
examples/vector-layer.js
View File

@@ -3,14 +3,14 @@ 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 _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
import _ol_style_Text_ from '../src/ol/style/Text.js';
var style = new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255, 255, 255, 0.6)'
}),
stroke: new _ol_style_Stroke_({
@@ -19,7 +19,7 @@ var style = new Style({
}),
text: new _ol_style_Text_({
font: '12px Calibri,sans-serif',
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#000'
}),
stroke: new _ol_style_Stroke_({
@@ -54,12 +54,12 @@ var highlightStyle = new Style({
color: '#f00',
width: 1
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,0,0,0.1)'
}),
text: new _ol_style_Text_({
font: '12px Calibri,sans-serif',
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#000'
}),
stroke: new _ol_style_Stroke_({

10
examples/vector-osm.js
View File

@@ -9,7 +9,7 @@ import {transformExtent} from '../src/ol/proj.js';
import BingMaps from '../src/ol/source/BingMaps.js';
import VectorSource from '../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../src/ol/style/Fill.js';
import Fill from '../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
import Style from '../src/ol/style/Style.js';
@@ -22,7 +22,7 @@ var styles = {
color: 'rgba(170, 170, 170, 1.0)',
width: 1
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(170, 170, 170, 0.3)'
})
})
@@ -34,7 +34,7 @@ var styles = {
color: 'rgba(246, 99, 79, 1.0)',
width: 1
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(246, 99, 79, 0.3)'
})
})
@@ -59,7 +59,7 @@ var styles = {
color: 'rgba(140, 208, 95, 1.0)',
width: 1
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(140, 208, 95, 0.3)'
})
})
@@ -68,7 +68,7 @@ var styles = {
'tree': new Style({
image: new _ol_style_Circle_({
radius: 2,
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(140, 208, 95, 1.0)'
}),
stroke: null