Rename _ol_style_Circle_ to CircleStyle

This commit is contained in:
Tim Schaub
2018-01-11 13:27:54 -07:00
parent 16c8d2c246
commit 14ddcf843d
37 changed files with 133 additions and 133 deletions

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_Circle_ from '../src/ol/style/Circle.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';
@@ -19,7 +19,7 @@ var redLayer = new VectorLayer({
features: [new Feature(new Point([0, 0]))]
}),
style: new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
fill: new Fill({
color: 'rgba(255,0,0,0.8)'
}),
@@ -37,7 +37,7 @@ var greenLayer = new VectorLayer({
features: [new Feature(new Point([250, 433.013]))]
}),
style: new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
fill: new Fill({
color: 'rgba(0,255,0,0.8)'
}),
@@ -54,7 +54,7 @@ var blueLayer = new VectorLayer({
features: [new Feature(new Point([500, 0]))]
}),
style: new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
fill: new Fill({
color: 'rgba(0,0,255,0.8)'
}),

View File

@@ -6,7 +6,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -23,7 +23,7 @@ var style = new Style({
color: '#319FD3',
width: 1
}),
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 5,
fill: new Fill({
color: 'rgba(255, 255, 255, 0.6)'

View File

@@ -7,7 +7,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -41,7 +41,7 @@ var clusters = new VectorLayer({
var style = styleCache[size];
if (!style) {
style = new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 10,
stroke: new Stroke({
color: '#fff'

View File

@@ -11,7 +11,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -19,7 +19,7 @@ import Style from '../src/ol/style/Style.js';
var defaultStyle = {
'Point': new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
fill: new Fill({
color: 'rgba(255,255,0,0.5)'
}),
@@ -46,7 +46,7 @@ var defaultStyle = {
})
}),
'MultiPoint': new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
fill: new Fill({
color: 'rgba(255,0,255,0.5)'
}),

View File

@@ -11,7 +11,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_Circle_ from '../src/ol/style/Circle.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';
@@ -19,7 +19,7 @@ import Style from '../src/ol/style/Style.js';
var defaultStyle = {
'Point': new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
fill: new Fill({
color: 'rgba(255,255,0,0.5)'
}),
@@ -46,7 +46,7 @@ var defaultStyle = {
})
}),
'MultiPoint': new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
fill: new Fill({
color: 'rgba(255,0,255,0.5)'
}),

View File

@@ -7,7 +7,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -27,7 +27,7 @@ var vector = new VectorLayer({
color: '#ffcc33',
width: 2
}),
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 7,
fill: new Fill({
color: '#ffcc33'

View File

@@ -4,7 +4,7 @@ import MultiPoint from '../src/ol/geom/MultiPoint.js';
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 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';
@@ -24,7 +24,7 @@ var map = new Map({
});
var imageStyle = new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 5,
snapToPixel: false,
fill: new Fill({color: 'yellow'}),
@@ -33,7 +33,7 @@ var imageStyle = new Style({
});
var headInnerImageStyle = new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 2,
snapToPixel: false,
fill: new Fill({color: 'blue'})
@@ -41,7 +41,7 @@ var headInnerImageStyle = new Style({
});
var headOuterImageStyle = new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 5,
snapToPixel: false,
fill: new Fill({color: 'black'})

View File

@@ -9,7 +9,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -86,7 +86,7 @@ function styleFunction(feature, resolution) {
var size = feature.get('features').length;
if (size > 1) {
style = new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: feature.get('radius'),
fill: new Fill({
color: [255, 153, 0, Math.min(0.8, 0.4 + (size / maxFeatureCount))]
@@ -107,7 +107,7 @@ function styleFunction(feature, resolution) {
function selectStyleFunction(feature) {
var styles = [new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: feature.get('radius'),
fill: invisibleFill
})

View File

@@ -10,7 +10,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -67,7 +67,7 @@ function flash(feature) {
var opacity = easeOut(1 - elapsedRatio);
var style = new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: radius,
snapToPixel: false,
stroke: new Stroke({

View File

@@ -7,7 +7,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_Circle_ from '../src/ol/style/Circle.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';
@@ -97,7 +97,7 @@ var styles = {
})
}),
'geoMarker': new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 7,
snapToPixel: false,
fill: new Fill({color: 'black'}),

View File

@@ -8,13 +8,13 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
var image = new _ol_style_Circle_({
var image = new CircleStyle({
radius: 5,
fill: null,
stroke: new Stroke({color: 'red', width: 1})
@@ -66,7 +66,7 @@ var styles = {
fill: new Fill({
color: 'magenta'
}),
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 10,
fill: null,
stroke: new Stroke({

View File

@@ -8,7 +8,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -68,7 +68,7 @@ geolocation.on('change:accuracyGeometry', function() {
var positionFeature = new Feature();
positionFeature.setStyle(new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 6,
fill: new Fill({
color: '#3399CC'

View File

@@ -5,7 +5,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_Circle_ from '../src/ol/style/Circle.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';
@@ -19,7 +19,7 @@ var raster = new TileLayer({
var style = {
'Point': new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
fill: new Fill({
color: 'rgba(255,255,0,0.4)'
}),

View File

@@ -9,7 +9,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -158,7 +158,7 @@ var stroke = new Stroke({
});
var style = new Style({
stroke: stroke,
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 5,
fill: null,
stroke: stroke
@@ -179,7 +179,7 @@ var featureOverlay = new VectorLayer({
source: new VectorSource(),
map: map,
style: new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 5,
fill: new Fill({
color: 'rgba(255,0,0,0.9)'

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_Circle_ from '../src/ol/style/Circle.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';
@@ -22,7 +22,7 @@ var styleFunction = function(feature) {
var style = styleCache[radius];
if (!style) {
style = new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: radius,
fill: new Fill({
color: 'rgba(255, 153, 0, 0.4)'

View File

@@ -10,7 +10,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -32,7 +32,7 @@ var vector = new VectorLayer({
color: '#ffcc33',
width: 2
}),
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 7,
fill: new Fill({
color: '#ffcc33'
@@ -189,7 +189,7 @@ function addInteraction() {
lineDash: [10, 10],
width: 2
}),
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 5,
stroke: new Stroke({
color: 'rgba(0, 0, 0, 0.7)'

View File

@@ -6,7 +6,7 @@ import Modify from '../src/ol/interaction/Modify.js';
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 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';
@@ -14,7 +14,7 @@ import Style from '../src/ol/style/Style.js';
var styleFunction = (function() {
var styles = {};
var image = new _ol_style_Circle_({
var image = new CircleStyle({
radius: 5,
fill: null,
stroke: new Stroke({color: 'orange', width: 2})
@@ -194,7 +194,7 @@ var overlayStyle = (function() {
styles['Point'] = [
new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 7,
fill: new Fill({
color: [0, 153, 255, 1]

View File

@@ -4,7 +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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -27,7 +27,7 @@ var styles = [
})
}),
new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 5,
fill: new Fill({
color: 'orange'

View File

@@ -2,7 +2,7 @@ import LineString from '../src/ol/geom/LineString.js';
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 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';
@@ -16,7 +16,7 @@ var stroke = new Stroke({color: 'black'});
var style = new Style({
fill: fill,
stroke: stroke,
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 10,
fill: fill,
stroke: stroke

View File

@@ -8,7 +8,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -27,7 +27,7 @@ var vector = new VectorLayer({
color: '#ffcc33',
width: 2
}),
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 7,
fill: new Fill({
color: '#ffcc33'

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 AtlasManager from '../src/ol/style/AtlasManager.js';
import _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -47,7 +47,7 @@ for (i = 0; i < symbolInfo.length; ++i) {
var info = symbolInfo[i];
for (j = 0; j < radiuses.length; ++j) {
// circle symbol
symbols.push(new _ol_style_Circle_({
symbols.push(new CircleStyle({
opacity: info.opacity,
scale: info.scale,
radius: radiuses[j],

View File

@@ -5,7 +5,7 @@ import LineString from '../src/ol/geom/LineString.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_Circle_ from '../src/ol/style/Circle.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';
@@ -25,14 +25,14 @@ for (var i = 0; i < count; ++i) {
var styles = {
'10': new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 5,
fill: new Fill({color: '#666666'}),
stroke: new Stroke({color: '#bada55', width: 1})
})
}),
'20': new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 10,
fill: new Fill({color: '#666666'}),
stroke: new Stroke({color: '#bada55', width: 1})
@@ -102,7 +102,7 @@ var stroke = new Stroke({
});
var style = new Style({
stroke: stroke,
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 10,
stroke: stroke
})

View File

@@ -16,7 +16,7 @@ import VectorSource from '../src/ol/source/Vector.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 _ol_style_Circle_ from '../src/ol/style/Circle.js';
import CircleStyle from '../src/ol/style/Circle.js';
import Text from '../src/ol/style/Text.js';
import MousePosition from '../src/ol/control/MousePosition.js';
@@ -29,7 +29,7 @@ var nodesLayer = new VectorLayer({
source: nodes,
style: function(f) {
var style = new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 8,
fill: new Fill({color: 'rgba(255, 0, 0, 0.2)'}),
stroke: new Stroke({color: 'red', width: 1})

View File

@@ -5,7 +5,7 @@ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -172,7 +172,7 @@ var vectorLines = new VectorLayer({
// Points
function pointStyleFunction(feature, resolution) {
return new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 10,
fill: new Fill({color: 'rgba(255, 0, 0, 0.1)'}),
stroke: new Stroke({color: 'red', width: 1})

View File

@@ -8,7 +8,7 @@ import _ol_loadingstrategy_ 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 _ol_style_Circle_ from '../src/ol/style/Circle.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';
@@ -66,7 +66,7 @@ var styles = {
},
'natural': {
'tree': new Style({
image: new _ol_style_Circle_({
image: new CircleStyle({
radius: 2,
fill: new Fill({
color: 'rgba(140, 208, 95, 1.0)'