Rename _ol_style_Fill_ to Fill

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

@@ -9,7 +9,7 @@ import Polygon from '../../../../../src/ol/geom/Polygon.js';
 import VectorContext from '../../../../../src/ol/render/VectorContext.js';
 import CanvasImmediateRenderer from '../../../../../src/ol/render/canvas/Immediate.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';
@@ -42,7 +42,7 @@ describe('ol.render.canvas.Immediate', function() {
       sinon.spy(context, 'setFillStrokeStyle');
       sinon.spy(context, 'setImageStyle');
       sinon.spy(context, 'setTextStyle');
-      var fill = new _ol_style_Fill_({});
+      var fill = new Fill({});
       var stroke = new _ol_style_Stroke_({});
       var text = new _ol_style_Text_({});
       var image = new _ol_style_Circle_({});

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

@@ -4,7 +4,7 @@ import Circle from '../../../../../src/ol/geom/Circle.js';
 import _ol_render_webgl_CircleReplay_ from '../../../../../src/ol/render/webgl/CircleReplay.js';
 import _ol_render_webgl_circlereplay_defaultshader_ from '../../../../../src/ol/render/webgl/circlereplay/defaultshader.js';
 import _ol_render_webgl_circlereplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/circlereplay/defaultshader/Locations.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';
 
 describe('ol.render.webgl.CircleReplay', function() {
@@ -14,7 +14,7 @@ describe('ol.render.webgl.CircleReplay', function() {
     color: [0, 255, 0, 0.4]
   });
 
-  var fillStyle = new _ol_style_Fill_({
+  var fillStyle = new Fill({
     color: [255, 0, 0, 1]
   });
 

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

@@ -13,7 +13,7 @@ import _ol_render_webgl_Immediate_ from '../../../../../src/ol/render/webgl/Imme
 import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/webgl/LineStringReplay.js';
 import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/PolygonReplay.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';
 
@@ -23,7 +23,7 @@ describe('ol.render.webgl.Immediate', function() {
     context = new _ol_render_webgl_Immediate_({}, [0, 0], 0, 0, [0, 0], [-180, -90, 180, 90], 1);
     style = new Style({
       image: new _ol_style_Circle_(),
-      fill: new _ol_style_Fill_(),
+      fill: new Fill(),
       stroke: new _ol_style_Stroke_()
     });
     circle = new Circle([0, 0], 5);

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

@@ -7,13 +7,13 @@ import _ol_render_webgl_polygonreplay_defaultshader_ from '../../../../../src/ol
 import _ol_render_webgl_polygonreplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/polygonreplay/defaultshader/Locations.js';
 import LinkedList from '../../../../../src/ol/structs/LinkedList.js';
 import RBush from '../../../../../src/ol/structs/RBush.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';
 
 describe('ol.render.webgl.PolygonReplay', function() {
   var replay;
 
-  var fillStyle = new _ol_style_Fill_({
+  var fillStyle = new Fill({
     color: [0, 0, 255, 0.5]
   });
   var strokeStyle = new _ol_style_Stroke_({
@@ -435,7 +435,7 @@ describe('ol.render.webgl.PolygonReplay', function() {
     });
 
     it('draws the elements in batches if there are multiple fill styles', function() {
-      var fillStyle2 = new _ol_style_Fill_({
+      var fillStyle2 = new Fill({
         color: [0, 255, 0, 1]
       });
       replay.setFillStrokeStyle(fillStyle, strokeStyle);

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

@@ -1,7 +1,7 @@
 import {createCanvasContext2D} from '../../../../../src/ol/dom.js';
 import Point from '../../../../../src/ol/geom/Point.js';
 import _ol_render_webgl_TextReplay_ from '../../../../../src/ol/render/webgl/TextReplay.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 _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
 
@@ -37,7 +37,7 @@ describe('ol.render.webgl.TextReplay', function() {
 
     beforeEach(function() {
       textStyle1 = createTextStyle(
-          new _ol_style_Fill_({
+          new Fill({
             color: [0, 0, 0, 1]
           }),
           new _ol_style_Stroke_({
@@ -51,7 +51,7 @@ describe('ol.render.webgl.TextReplay', function() {
           }),
           'someText');
       textStyle2 = createTextStyle(
-          new _ol_style_Fill_({
+          new Fill({
             color: [255, 255, 255, 1]
           }),
           new _ol_style_Stroke_({
@@ -62,7 +62,7 @@ describe('ol.render.webgl.TextReplay', function() {
       );
       textStyle3 = createTextStyle(null, null, 'someText');
       textStyle4 = createTextStyle(
-          new _ol_style_Fill_({
+          new Fill({
             color: [0, 0, 0, 1]
           }),
           new _ol_style_Stroke_({
@@ -115,7 +115,7 @@ describe('ol.render.webgl.TextReplay', function() {
   describe('#drawText', function() {
     beforeEach(function() {
       var textStyle = createTextStyle(
-          new _ol_style_Fill_({
+          new Fill({
             color: [0, 0, 0, 1]
           }),
           null, 'someText');
@@ -171,7 +171,7 @@ describe('ol.render.webgl.TextReplay', function() {
   describe('#addCharToAtlas_', function() {
     beforeEach(function() {
       var textStyle = createTextStyle(
-          new _ol_style_Fill_({
+          new Fill({
             color: [0, 0, 0, 1]
           }),
           null, 'someText');
@@ -209,7 +209,7 @@ describe('ol.render.webgl.TextReplay', function() {
   describe('#getTextSize_', function() {
     beforeEach(function() {
       var textStyle = createTextStyle(
-          new _ol_style_Fill_({
+          new Fill({
             color: [0, 0, 0, 1]
           }),
           null, 'someText');
@@ -261,7 +261,7 @@ describe('ol.render.webgl.TextReplay', function() {
   describe('#getAtlas_', function() {
     beforeEach(function() {
       var textStyle = createTextStyle(
-          new _ol_style_Fill_({
+          new Fill({
             color: [0, 0, 0, 1]
           }),
           null, 'someText');