Rename _ol_style_Style_ to Style

test/spec/ol/feature.test.js

@@ -1,7 +1,7 @@
 import Feature from '../../../src/ol/Feature.js';
 import Point from '../../../src/ol/geom/Point.js';
 import _ol_obj_ from '../../../src/ol/obj.js';
-import _ol_style_Style_ from '../../../src/ol/style/Style.js';
+import Style from '../../../src/ol/style/Style.js';
 
 
 describe('ol.Feature', function() {
@@ -298,7 +298,7 @@ describe('ol.Feature', function() {
 
   describe('#setStyle()', function() {
 
-    var style = new _ol_style_Style_();
+    var style = new Style();
 
     var styleFunction = function(feature, resolution) {
       return resolution;
@@ -355,7 +355,7 @@ describe('ol.Feature', function() {
 
   describe('#getStyle()', function() {
 
-    var style = new _ol_style_Style_();
+    var style = new Style();
 
     var styleFunction = function(resolution) {
       return null;
@@ -403,7 +403,7 @@ describe('ol.Feature', function() {
       feature.setGeometryName('geom');
       var geometry = new Point([1, 2]);
       feature.setGeometry(geometry);
-      var style = new _ol_style_Style_({});
+      var style = new Style({});
       feature.setStyle(style);
       feature.set('barkey', 'barval');
 
@@ -448,7 +448,7 @@ describe('ol.Feature', function() {
 });
 
 describe('ol.Feature.createStyleFunction()', function() {
-  var style = new _ol_style_Style_();
+  var style = new Style();
 
   it('creates a feature style function from a single style', function() {
     var styleFunction = Feature.createStyleFunction(style);

test/spec/ol/format/kml.test.js

@@ -19,7 +19,7 @@ import _ol_style_Icon_ from '../../../../src/ol/style/Icon.js';
 import IconAnchorUnits from '../../../../src/ol/style/IconAnchorUnits.js';
 import IconOrigin from '../../../../src/ol/style/IconOrigin.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_style_Text_ from '../../../../src/ol/style/Text.js';
 import _ol_xml_ from '../../../../src/ol/xml.js';
 
@@ -30,7 +30,7 @@ describe('ol.format.KML', function() {
 
   describe('using defaultStyle', function() {
 
-    var dfltStyle = new _ol_style_Style_();
+    var dfltStyle = new Style();
 
     beforeEach(function() {
       format = new KML({
@@ -61,7 +61,7 @@ describe('ol.format.KML', function() {
         expect(styleArray).to.be.an(Array);
         expect(styleArray).to.have.length(1);
         var style = styleArray[0];
-        expect(style).to.be.an(_ol_style_Style_);
+        expect(style).to.be.an(Style);
         expect(style).to.be(dfltStyle);
       });
     });
@@ -1719,7 +1719,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           expect(style.getFill()).to.be(KML.DEFAULT_FILL_STYLE_);
           expect(style.getFill().getColor()).to.eql([255, 255, 255, 1]);
           expect(style.getImage()).to.be(KML.DEFAULT_IMAGE_STYLE_);
@@ -1752,7 +1752,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           expect(style.getFill()).to.be(KML.DEFAULT_FILL_STYLE_);
           expect(style.getStroke()).to.be(KML.DEFAULT_STROKE_STYLE_);
           var imageStyle = style.getImage();
@@ -1832,7 +1832,7 @@ describe('ol.format.KML', function() {
             expect(styleArray).to.be.an(Array);
             expect(styleArray).to.have.length(1);
             var style = styleArray[0];
-            expect(style).to.be.an(_ol_style_Style_);
+            expect(style).to.be.an(Style);
             expect(style.getFill()).to.be(KML.DEFAULT_FILL_STYLE_);
             expect(style.getStroke()).to.be(KML.DEFAULT_STROKE_STYLE_);
             var imageStyle = style.getImage();
@@ -1903,7 +1903,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           expect(style.getFill()).to.be(KML.DEFAULT_FILL_STYLE_);
           expect(style.getStroke()).to.be(KML.DEFAULT_STROKE_STYLE_);
           var imageStyle = style.getImage();
@@ -1939,7 +1939,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           expect(style.getFill()).to.be(KML.DEFAULT_FILL_STYLE_);
           expect(style.getImage()).to.be(KML.DEFAULT_IMAGE_STYLE_);
           expect(style.getStroke()).to.be(KML.DEFAULT_STROKE_STYLE_);
@@ -1974,7 +1974,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           expect(style.getFill()).to.be(KML.DEFAULT_FILL_STYLE_);
           expect(style.getImage()).to.be(KML.DEFAULT_IMAGE_STYLE_);
           var strokeStyle = style.getStroke();
@@ -2006,7 +2006,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           var fillStyle = style.getFill();
           expect(fillStyle).to.be.an(_ol_style_Fill_);
           expect(fillStyle.getColor()).to.eql([0x78, 0x56, 0x34, 0x12 / 255]);
@@ -2043,7 +2043,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           var fillStyle = style.getFill();
           expect(fillStyle).to.be.an(_ol_style_Fill_);
           expect(fillStyle.getColor()).to.eql([0x78, 0x56, 0x34, 0x12 / 255]);
@@ -2082,7 +2082,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           expect(style.getFill()).to.be(null);
           expect(style.getImage()).to.be(KML.DEFAULT_IMAGE_STYLE_);
           var strokeStyle = style.getStroke();
@@ -2119,7 +2119,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           var fillStyle = style.getFill();
           expect(fillStyle).to.be.an(_ol_style_Fill_);
           expect(fillStyle.getColor()).to.eql([0x78, 0x56, 0x34, 0x12 / 255]);
@@ -2157,7 +2157,7 @@ describe('ol.format.KML', function() {
               expect(styleArray).to.be.an(Array);
               expect(styleArray).to.have.length(1);
               var style = styleArray[0];
-              expect(style).to.be.an(_ol_style_Style_);
+              expect(style).to.be.an(Style);
               expect(style.getFill()).to.be(null);
               expect(style.getImage()).to.be(KML.DEFAULT_IMAGE_STYLE_);
               expect(style.getStroke()).to.be(null);
@@ -2210,7 +2210,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(2);
           var style = styleArray[1];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           expect(style.getText().getText()).to.eql(f.getProperties()['name']);
         });
 
@@ -2259,12 +2259,12 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(2);
           var style = styleArray[1];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           expect(style.getText().getText()).to.eql(f.getProperties()['name']);
         });
 
         it('can write an feature\'s icon style', function() {
-          var style = new _ol_style_Style_({
+          var style = new Style({
             image: new _ol_style_Icon_({
               anchor: [0.25, 36],
               anchorOrigin: 'top-left',
@@ -2313,7 +2313,7 @@ describe('ol.format.KML', function() {
 
         it('does not write styles when writeStyles option is false', function() {
           format = new KML({writeStyles: false});
-          var style = new _ol_style_Style_({
+          var style = new Style({
             image: new _ol_style_Icon_({
               src: 'http://foo.png'
             })
@@ -2334,7 +2334,7 @@ describe('ol.format.KML', function() {
         });
 
         it('skips image styles that are not icon styles', function() {
-          var style = new _ol_style_Style_({
+          var style = new Style({
             image: new _ol_style_Circle_({
               radius: 4,
               fill: new _ol_style_Fill_({
@@ -2360,7 +2360,7 @@ describe('ol.format.KML', function() {
         });
 
         it('can write an feature\'s text style', function() {
-          var style = new _ol_style_Style_({
+          var style = new Style({
             text: new _ol_style_Text_({
               scale: 0.5,
               text: 'foo',
@@ -2392,7 +2392,7 @@ describe('ol.format.KML', function() {
         });
 
         it('can write an feature\'s stroke style', function() {
-          var style = new _ol_style_Style_({
+          var style = new Style({
             stroke: new _ol_style_Stroke_({
               color: '#112233',
               width: 2
@@ -2420,7 +2420,7 @@ describe('ol.format.KML', function() {
         });
 
         it('can write an feature\'s fill style', function() {
-          var style = new _ol_style_Style_({
+          var style = new Style({
             fill: new _ol_style_Fill_({
               color: 'rgba(12, 34, 223, 0.7)'
             })
@@ -2446,7 +2446,7 @@ describe('ol.format.KML', function() {
         });
 
         it('can write multiple features with Style', function() {
-          var style = new _ol_style_Style_({
+          var style = new Style({
             fill: new _ol_style_Fill_({
               color: 'rgba(12, 34, 223, 0.7)'
             })
@@ -2513,7 +2513,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var s = styleArray[0];
-          expect(s).to.be.an(_ol_style_Style_);
+          expect(s).to.be.an(Style);
           expect(s.getFill()).not.to.be(null);
           expect(s.getFill().getColor()).to.eql([0, 0, 0, 0]);
         });
@@ -2546,7 +2546,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var s = styleArray[0];
-          expect(s).to.be.an(_ol_style_Style_);
+          expect(s).to.be.an(Style);
           expect(s).to.be(KML.DEFAULT_STYLE_);
 
         });
@@ -2587,7 +2587,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var s = styleArray[0];
-          expect(s).to.be.an(_ol_style_Style_);
+          expect(s).to.be.an(Style);
           expect(s.getFill()).not.to.be(null);
           expect(s.getFill().getColor()).to.eql([0, 0, 0, 0]);
         });
@@ -2621,7 +2621,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var s = styleArray[0];
-          expect(s).to.be.an(_ol_style_Style_);
+          expect(s).to.be.an(Style);
           expect(s.getFill()).not.to.be(null);
           expect(s.getFill().getColor()).to.eql([0, 0, 0, 0]);
         });
@@ -2655,7 +2655,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var s = styleArray[0];
-          expect(s).to.be.an(_ol_style_Style_);
+          expect(s).to.be.an(Style);
           expect(s).to.be(KML.DEFAULT_STYLE_);
         });
 
@@ -2689,7 +2689,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var s = styleArray[0];
-          expect(s).to.be.an(_ol_style_Style_);
+          expect(s).to.be.an(Style);
           expect(s.getFill()).not.to.be(null);
           expect(s.getFill().getColor()).to.eql([120, 86, 52, 18 / 255]);
         });
@@ -2722,7 +2722,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           var fillStyle = style.getFill();
           expect(fillStyle).to.be.an(_ol_style_Fill_);
           expect(fillStyle.getColor()).to.eql([0x78, 0x56, 0x34, 0x12 / 255]);
@@ -2754,7 +2754,7 @@ describe('ol.format.KML', function() {
           expect(styleArray).to.be.an(Array);
           expect(styleArray).to.have.length(1);
           var style = styleArray[0];
-          expect(style).to.be.an(_ol_style_Style_);
+          expect(style).to.be.an(Style);
           var fillStyle = style.getFill();
           expect(fillStyle).to.be.an(_ol_style_Fill_);
           expect(fillStyle.getColor()).to.eql([0x78, 0x56, 0x34, 0x12 / 255]);
@@ -3207,7 +3207,7 @@ describe('ol.format.KML', function() {
         var styleArray = styleFunction.call(f, 0);
         expect(styleArray).to.be.an(Array);
         var style = styleArray[0];
-        expect(style).to.be.an(_ol_style_Style_);
+        expect(style).to.be.an(Style);
         var imageStyle = style.getImage();
         expect(imageStyle).to.be.an(_ol_style_Icon_);
         expect(imageStyle.getSrc()).to.eql('http://maps.google.com/mapfiles/kml/shapes/star.png');

test/spec/ol/layer/vector.test.js

@@ -1,14 +1,14 @@
 import Layer from '../../../../src/ol/layer/Layer.js';
 import VectorLayer from '../../../../src/ol/layer/Vector.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';
 
 
 describe('ol.layer.Vector', function() {
 
   describe('constructor', function() {
     var source = new VectorSource();
-    var style = new _ol_style_Style_();
+    var style = new Style();
 
     it('creates a new layer', function() {
       var layer = new VectorLayer({source: source});
@@ -58,7 +58,7 @@ describe('ol.layer.Vector', function() {
       layer = new VectorLayer({
         source: new VectorSource()
       });
-      style = new _ol_style_Style_();
+      style = new Style();
     });
 
     it('allows the style to be set after construction', function() {
@@ -74,10 +74,10 @@ describe('ol.layer.Vector', function() {
     });
 
     it('updates the internal style function', function() {
-      expect(layer.getStyleFunction()).to.be(_ol_style_Style_.defaultFunction);
+      expect(layer.getStyleFunction()).to.be(Style.defaultFunction);
       layer.setStyle(style);
       expect(layer.getStyleFunction()).not.to.be(
-          _ol_style_Style_.defaultFunction);
+          Style.defaultFunction);
     });
 
     it('allows setting an null style', function() {
@@ -89,8 +89,8 @@ describe('ol.layer.Vector', function() {
     it('sets the default style when passing undefined', function() {
       layer.setStyle(style);
       layer.setStyle(undefined);
-      expect(layer.getStyle()).to.be(_ol_style_Style_.defaultFunction);
-      expect(layer.getStyleFunction()).to.be(_ol_style_Style_.defaultFunction);
+      expect(layer.getStyle()).to.be(Style.defaultFunction);
+      expect(layer.getStyleFunction()).to.be(Style.defaultFunction);
     });
 
   });
@@ -98,14 +98,14 @@ describe('ol.layer.Vector', function() {
   describe('#getStyle()', function() {
 
     var source = new VectorSource();
-    var style = new _ol_style_Style_();
+    var style = new Style();
 
     it('returns what is provided to setStyle', function() {
       var layer = new VectorLayer({
         source: source
       });
 
-      expect(layer.getStyle()).to.be(_ol_style_Style_.defaultFunction);
+      expect(layer.getStyle()).to.be(Style.defaultFunction);
 
       layer.setStyle(style);
       expect(layer.getStyle()).to.be(style);

test/spec/ol/render/canvas/immediate.test.js

@@ -11,7 +11,7 @@ import CanvasImmediateRenderer from '../../../../../src/ol/render/canvas/Immedia
 import _ol_style_Circle_ from '../../../../../src/ol/style/Circle.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_style_Text_ from '../../../../../src/ol/style/Text.js';
 
 
@@ -46,7 +46,7 @@ describe('ol.render.canvas.Immediate', function() {
       var stroke = new _ol_style_Stroke_({});
       var text = new _ol_style_Text_({});
       var image = new _ol_style_Circle_({});
-      var style = new _ol_style_Style_({
+      var style = new Style({
         fill: fill,
         stroke: stroke,
         image: image,

test/spec/ol/render/webgl/immediate.test.js

@@ -15,13 +15,13 @@ import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/
 import _ol_style_Circle_ from '../../../../../src/ol/style/Circle.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';
 
 describe('ol.render.webgl.Immediate', function() {
   var context, style, circle, line, multiLine, point, multiPoint, polygon, multiPolygon;
   beforeEach(function() {
     context = new _ol_render_webgl_Immediate_({}, [0, 0], 0, 0, [0, 0], [-180, -90, 180, 90], 1);
-    style = new _ol_style_Style_({
+    style = new Style({
       image: new _ol_style_Circle_(),
       fill: new _ol_style_Fill_(),
       stroke: new _ol_style_Stroke_()

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_({})

test/spec/ol/style/style.test.js

@@ -1,6 +1,6 @@
 import Feature from '../../../../src/ol/Feature.js';
 import Point from '../../../../src/ol/geom/Point.js';
-import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
+import Style from '../../../../src/ol/style/Style.js';
 import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
 import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
 import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -36,14 +36,14 @@ describe('ol.style.Style', function() {
   describe('#clone', function() {
 
     it('creates a new ol.style.Style', function() {
-      var original = new _ol_style_Style_();
+      var original = new Style();
       var clone = original.clone();
-      expect(clone).to.be.an(_ol_style_Style_);
+      expect(clone).to.be.an(Style);
       expect(clone).to.not.be(original);
     });
 
     it('copies all values', function() {
-      var original = new _ol_style_Style_({
+      var original = new Style({
         geometry: new Point([0, 0, 0]),
         fill: new _ol_style_Fill_({
           color: '#319FD3'
@@ -69,7 +69,7 @@ describe('ol.style.Style', function() {
     });
 
     it('the clone does not reference the same objects as the original', function() {
-      var original = new _ol_style_Style_({
+      var original = new Style({
         geometry: new Point([0, 0, 0]),
         fill: new _ol_style_Fill_({
           color: '#319FD3'
@@ -107,7 +107,7 @@ describe('ol.style.Style', function() {
   describe('#setZIndex', function() {
 
     it('sets the zIndex', function() {
-      var style = new _ol_style_Style_();
+      var style = new Style();
 
       style.setZIndex(0.7);
       expect(style.getZIndex()).to.be(0.7);
@@ -115,7 +115,7 @@ describe('ol.style.Style', function() {
   });
 
   describe('#getFill', function() {
-    var style = new _ol_style_Style_({
+    var style = new Style({
       fill: testFill
     });
 
@@ -125,7 +125,7 @@ describe('ol.style.Style', function() {
   });
 
   describe('#setFill', function() {
-    var style = new _ol_style_Style_();
+    var style = new Style();
 
     it('sets the fill style of a style', function() {
       style.setFill(testFill);
@@ -134,7 +134,7 @@ describe('ol.style.Style', function() {
   });
 
   describe('#getImage', function() {
-    var style = new _ol_style_Style_({
+    var style = new Style({
       image: testImage
     });
 
@@ -144,7 +144,7 @@ describe('ol.style.Style', function() {
   });
 
   describe('#setImage', function() {
-    var style = new _ol_style_Style_();
+    var style = new Style();
 
     it('sets the image style of a style', function() {
       style.setImage(testImage);
@@ -153,7 +153,7 @@ describe('ol.style.Style', function() {
   });
 
   describe('#getStroke', function() {
-    var style = new _ol_style_Style_({
+    var style = new Style({
       stroke: testStroke
     });
 
@@ -163,7 +163,7 @@ describe('ol.style.Style', function() {
   });
 
   describe('#setStroke', function() {
-    var style = new _ol_style_Style_();
+    var style = new Style();
 
     it('sets the stroke style of a style', function() {
       style.setStroke(testStroke);
@@ -172,7 +172,7 @@ describe('ol.style.Style', function() {
   });
 
   describe('#getText', function() {
-    var style = new _ol_style_Style_({
+    var style = new Style({
       text: testText
     });
 
@@ -182,7 +182,7 @@ describe('ol.style.Style', function() {
   });
 
   describe('#setText', function() {
-    var style = new _ol_style_Style_();
+    var style = new Style();
 
     it('sets the text style of a style', function() {
       style.setText(testText);
@@ -191,7 +191,7 @@ describe('ol.style.Style', function() {
   });
 
   describe('#setGeometry', function() {
-    var style = new _ol_style_Style_();
+    var style = new Style();
 
     it('creates a geometry function from a string', function() {
       var feature = new Feature();
@@ -221,7 +221,7 @@ describe('ol.style.Style', function() {
   describe('#getGeometry', function() {
 
     it('returns whatever was passed to setGeometry', function() {
-      var style = new _ol_style_Style_();
+      var style = new Style();
       style.setGeometry('foo');
       expect(style.getGeometry()).to.eql('foo');
       var geom = new Point([1, 2]);
@@ -241,15 +241,15 @@ describe('ol.style.Style', function() {
 });
 
 describe('ol.style.Style.createFunction()', function() {
-  var style = new _ol_style_Style_();
+  var style = new Style();
 
   it('creates a style function from a single style', function() {
-    var styleFunction = _ol_style_Style_.createFunction(style);
+    var styleFunction = Style.createFunction(style);
     expect(styleFunction()).to.eql([style]);
   });
 
   it('creates a style function from an array of styles', function() {
-    var styleFunction = _ol_style_Style_.createFunction([style]);
+    var styleFunction = Style.createFunction([style]);
     expect(styleFunction()).to.eql([style]);
   });
 
@@ -257,13 +257,13 @@ describe('ol.style.Style.createFunction()', function() {
     var original = function() {
       return [style];
     };
-    var styleFunction = _ol_style_Style_.createFunction(original);
+    var styleFunction = Style.createFunction(original);
     expect(styleFunction).to.be(original);
   });
 
   it('throws on (some) unexpected input', function() {
     expect(function() {
-      _ol_style_Style_.createFunction({bogus: 'input'});
+      Style.createFunction({bogus: 'input'});
     }).to.throwException();
   });