Rename _ol_style_Style_ to Style

test/spec/ol/renderer/canvas/map.test.js

@@ -9,7 +9,7 @@ import CanvasLayerRenderer from '../../../../../src/ol/renderer/canvas/Layer.js'
 import CanvasMapRenderer from '../../../../../src/ol/renderer/canvas/Map.js';
 import VectorSource from '../../../../../src/ol/source/Vector.js';
 import _ol_style_Icon_ from '../../../../../src/ol/style/Icon.js';
-import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
+import Style from '../../../../../src/ol/style/Style.js';
 
 describe('ol.renderer.canvas.Map', function() {
 
@@ -58,7 +58,7 @@ describe('ol.renderer.canvas.Map', function() {
             })
           ]
         }),
-        style: new _ol_style_Style_({
+        style: new Style({
           image: new _ol_style_Icon_({
             img: img,
             imgSize: [1, 1]

test/spec/ol/renderer/canvas/replay.test.js

@@ -14,7 +14,7 @@ import _ol_render_canvas_ReplayGroup_ from '../../../../../src/ol/render/canvas/
 import _ol_renderer_vector_ from '../../../../../src/ol/renderer/vector.js';
 import _ol_style_Fill_ from '../../../../../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
-import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
+import Style from '../../../../../src/ol/style/Style.js';
 import _ol_transform_ from '../../../../../src/ol/transform.js';
 
 describe('ol.render.canvas.ReplayGroup', function() {
@@ -37,17 +37,17 @@ describe('ol.render.canvas.ReplayGroup', function() {
           [[[90, 45], [90, 0], [0, 0], [0, 45], [90, 45]]]));
       feature3 = new Feature(new Polygon(
           [[[-90, -45], [-90, 45], [90, 45], [90, -45], [-90, -45]]]));
-      fill0 = new _ol_style_Style_({
+      fill0 = new Style({
         fill: new _ol_style_Fill_({color: 'black'})
       });
-      fill1 = new _ol_style_Style_({
+      fill1 = new Style({
         fill: new _ol_style_Fill_({color: 'red'})
       });
-      style1 = new _ol_style_Style_({
+      style1 = new Style({
         fill: new _ol_style_Fill_({color: 'black'}),
         stroke: new _ol_style_Stroke_({color: 'white', width: 1})
       });
-      style2 = new _ol_style_Style_({
+      style2 = new Style({
         fill: new _ol_style_Fill_({color: 'white'}),
         stroke: new _ol_style_Stroke_({color: 'black', width: 1, lineDash: [3, 6],
           lineDashOffset: 2})
@@ -216,7 +216,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
 
     it('calls the renderer function configured for the style', function() {
       var calls = [];
-      var style = new _ol_style_Style_({
+      var style = new Style({
         renderer: function(coords, state) {
           calls.push({
             coords: coords,

test/spec/ol/renderer/canvas/vectorlayer.test.js

@@ -10,7 +10,7 @@ import {get as getProjection} from '../../../../../src/ol/proj.js';
 import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
 import CanvasVectorLayerRenderer from '../../../../../src/ol/renderer/canvas/VectorLayer.js';
 import VectorSource from '../../../../../src/ol/source/Vector.js';
-import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
+import Style from '../../../../../src/ol/style/Style.js';
 import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
 
 
@@ -56,12 +56,12 @@ describe('ol.renderer.canvas.VectorLayer', function() {
         }),
         target: target
       });
-      var layerStyle = [new _ol_style_Style_({
+      var layerStyle = [new Style({
         text: new _ol_style_Text_({
           text: 'layer'
         })
       })];
-      var featureStyle = [new _ol_style_Style_({
+      var featureStyle = [new Style({
         text: new _ol_style_Text_({
           text: 'feature'
         })
@@ -93,7 +93,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
         }),
         target: target
       });
-      var layerStyle = new _ol_style_Style_({
+      var layerStyle = new Style({
         text: new _ol_style_Text_({
           text: 'layer',
           font: '12px "Unavailable Font",sans-serif'
@@ -124,7 +124,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
         }),
         target: target
       });
-      var layerStyle = new _ol_style_Style_({
+      var layerStyle = new Style({
         text: new _ol_style_Text_({
           text: 'layer',
           font: '12px sans-serif'
@@ -156,7 +156,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
         }),
         target: target
       });
-      var layerStyle = new _ol_style_Style_({
+      var layerStyle = new Style({
         text: new _ol_style_Text_({
           text: 'layer',
           font: '12px "Droid Sans",sans-serif'

test/spec/ol/renderer/canvas/vectortilelayer.test.js

@@ -16,7 +16,7 @@ import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
 import _ol_render_Feature_ from '../../../../../src/ol/render/Feature.js';
 import CanvasVectorTileLayerRenderer from '../../../../../src/ol/renderer/canvas/VectorTileLayer.js';
 import VectorTileSource from '../../../../../src/ol/source/VectorTile.js';
-import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
+import Style from '../../../../../src/ol/style/Style.js';
 import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
 import _ol_tilegrid_ from '../../../../../src/ol/tilegrid.js';
 
@@ -45,12 +45,12 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
         }),
         target: target
       });
-      layerStyle = [new _ol_style_Style_({
+      layerStyle = [new Style({
         text: new _ol_style_Text_({
           text: 'layer'
         })
       })];
-      var featureStyle = [new _ol_style_Style_({
+      var featureStyle = [new Style({
         text: new _ol_style_Text_({
           text: 'feature'
         })
@@ -133,7 +133,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
 
     it('renders replays with custom renderers as direct replays', function() {
       layer.renderMode_ = 'image';
-      layer.setStyle(new _ol_style_Style_({
+      layer.setStyle(new Style({
         renderer: function() {}
       }));
       var spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
@@ -216,7 +216,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
     it('works for multiple layers that use the same source', function() {
       var layer2 = new VectorTileLayer({
         source: source,
-        style: new _ol_style_Style_({
+        style: new Style({
           text: new _ol_style_Text_({
             text: 'layer2'
           })

test/spec/ol/renderer/vector.test.js

@@ -11,7 +11,7 @@ import _ol_renderer_vector_ from '../../../../src/ol/renderer/vector.js';
 import _ol_style_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 _ol_style_Style_ from '../../../../src/ol/style/Style.js';
+import Style from '../../../../src/ol/style/Style.js';
 import Feature from '../../../../src/ol/Feature.js';
 
 
@@ -27,7 +27,7 @@ describe('ol.renderer.vector', function() {
       iconStyle = new _ol_style_Icon_({
         src: 'http://example.com/icon.png'
       });
-      style = new _ol_style_Style_({
+      style = new Style({
         image: iconStyle,
         fill: new _ol_style_Fill_({}),
         stroke: new _ol_style_Stroke_({})