Rename _ol_source_ImageStatic_ to Static

examples/reprojection-image.js

@@ -4,7 +4,7 @@ import {getCenter} from '../src/ol/extent.js';
 import ImageLayer from '../src/ol/layer/Image.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import {transform} from '../src/ol/proj.js';
-import _ol_source_ImageStatic_ from '../src/ol/source/ImageStatic.js';
+import Static from '../src/ol/source/ImageStatic.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import {register} from '../src/ol/proj/proj4.js';
 import proj4 from 'proj4';
@@ -23,7 +23,7 @@ var map = new Map({
       source: new _ol_source_OSM_()
     }),
     new ImageLayer({
-      source: new _ol_source_ImageStatic_({
+      source: new Static({
         url: 'https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/' +
                'British_National_Grid.svg/2000px-British_National_Grid.svg.png',
         crossOrigin: '',

examples/static-image.js

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import ImageLayer from '../src/ol/layer/Image.js';
 import _ol_proj_Projection_ from '../src/ol/proj/Projection.js';
-import _ol_source_ImageStatic_ from '../src/ol/source/ImageStatic.js';
+import Static from '../src/ol/source/ImageStatic.js';
 
 
 // Map views always need a projection.  Here we just want to map image
@@ -19,7 +19,7 @@ var projection = new _ol_proj_Projection_({
 var map = new Map({
   layers: [
     new ImageLayer({
-      source: new _ol_source_ImageStatic_({
+      source: new Static({
         attributions: '© <a href="http://xkcd.com/license.html">xkcd</a>',
         url: 'https://imgs.xkcd.com/comics/online_communities.png',
         projection: projection,

src/ol/source/ImageStatic.js

@@ -20,7 +20,7 @@ import ImageSource from '../source/Image.js';
  * @param {olx.source.ImageStaticOptions} options Options.
  * @api
  */
-var _ol_source_ImageStatic_ = function(options) {
+var Static = function(options) {
   var imageExtent = options.imageExtent;
 
   var crossOrigin = options.crossOrigin !== undefined ?
@@ -52,13 +52,13 @@ var _ol_source_ImageStatic_ = function(options) {
 
 };
 
-inherits(_ol_source_ImageStatic_, ImageSource);
+inherits(Static, ImageSource);
 
 
 /**
  * @inheritDoc
  */
-_ol_source_ImageStatic_.prototype.getImageInternal = function(extent, resolution, pixelRatio, projection) {
+Static.prototype.getImageInternal = function(extent, resolution, pixelRatio, projection) {
   if (intersects(extent, this.image_.getExtent())) {
     return this.image_;
   }
@@ -69,7 +69,7 @@ _ol_source_ImageStatic_.prototype.getImageInternal = function(extent, resolution
 /**
  * @inheritDoc
  */
-_ol_source_ImageStatic_.prototype.handleImageChange = function(evt) {
+Static.prototype.handleImageChange = function(evt) {
   if (this.image_.getState() == ImageState.LOADED) {
     var imageExtent = this.image_.getExtent();
     var image = this.image_.getImage();
@@ -93,4 +93,4 @@ _ol_source_ImageStatic_.prototype.handleImageChange = function(evt) {
   }
   ImageSource.prototype.handleImageChange.call(this, evt);
 };
-export default _ol_source_ImageStatic_;
+export default Static;

test/rendering/ol/layer/image.test.js

@@ -3,7 +3,7 @@ import View from '../../../../src/ol/View.js';
 import ImageLayer from '../../../../src/ol/layer/Image.js';
 import _ol_obj_ from '../../../../src/ol/obj.js';
 import {get as getProjection, transform, transformExtent} from '../../../../src/ol/proj.js';
-import _ol_source_ImageStatic_ from '../../../../src/ol/source/ImageStatic.js';
+import Static from '../../../../src/ol/source/ImageStatic.js';
 import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
 
 
@@ -65,7 +65,7 @@ describe('ol.rendering.layer.Image', function() {
     var source;
 
     beforeEach(function() {
-      source = new _ol_source_ImageStatic_({
+      source = new Static({
         url: 'rendering/ol/data/tiles/osm/5/5/12.png',
         imageExtent: _ol_tilegrid_.createXYZ().getTileCoordExtent(
             [5, 5, -12 - 1]),
@@ -95,7 +95,7 @@ describe('ol.rendering.layer.Image', function() {
     var source;
 
     beforeEach(function() {
-      source = new _ol_source_ImageStatic_({
+      source = new Static({
         url: 'rendering/ol/data/tiles/osm/5/5/12.png',
         imageExtent: transformExtent(
             [-123, 37, -122, 38], 'EPSG:4326', 'EPSG:3857')

test/rendering/ol/reproj/image.test.js

@@ -2,7 +2,7 @@ import _ol_events_ from '../../../../src/ol/events.js';
 import {get as getProjection} from '../../../../src/ol/proj.js';
 import _ol_proj_EPSG3857_ from '../../../../src/ol/proj/EPSG3857.js';
 import _ol_reproj_Image_ from '../../../../src/ol/reproj/Image.js';
-import _ol_source_ImageStatic_ from '../../../../src/ol/source/ImageStatic.js';
+import Static from '../../../../src/ol/source/ImageStatic.js';
 import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
 
 
@@ -35,7 +35,7 @@ describe('ol.rendering.reproj.Image', function() {
 
   describe('image reprojections from EPSG:3857', function() {
     beforeEach(function() {
-      source = new _ol_source_ImageStatic_({
+      source = new Static({
         url: 'rendering/ol/data/tiles/osm/5/5/12.png',
         imageExtent: _ol_tilegrid_.createXYZ().getTileCoordExtent([5, 5, -13]),
         projection: getProjection('EPSG:3857')

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

@@ -2,7 +2,7 @@ import Map from '../../../../../src/ol/Map.js';
 import View from '../../../../../src/ol/View.js';
 import ImageLayer from '../../../../../src/ol/layer/Image.js';
 import _ol_proj_Projection_ from '../../../../../src/ol/proj/Projection.js';
-import _ol_source_ImageStatic_ from '../../../../../src/ol/source/ImageStatic.js';
+import Static from '../../../../../src/ol/source/ImageStatic.js';
 
 
 describe('ol.renderer.canvas.ImageLayer', function() {
@@ -20,7 +20,7 @@ describe('ol.renderer.canvas.ImageLayer', function() {
       target.style.width = '100px';
       target.style.height = '100px';
       document.body.appendChild(target);
-      source = new _ol_source_ImageStatic_({
+      source = new Static({
         url: 'spec/ol/data/dot.png',
         projection: projection,
         imageExtent: [0, 0, 20, 20]

test/spec/ol/source/imagestatic.test.js

@@ -1,4 +1,4 @@
-import _ol_source_ImageStatic_ from '../../../../src/ol/source/ImageStatic.js';
+import Static from '../../../../src/ol/source/ImageStatic.js';
 import {get as getProjection} from '../../../../src/ol/proj.js';
 
 
@@ -17,7 +17,7 @@ describe('ol.source.ImageStatic', function() {
   describe('#getImage', function() {
 
     it('scales image to fit imageExtent', function(done) {
-      var source = new _ol_source_ImageStatic_({
+      var source = new Static({
         url: 'spec/ol/source/images/12-655-1583.png',
         imageExtent: [
           -13629027.891360067, 4539747.983913189,
@@ -37,7 +37,7 @@ describe('ol.source.ImageStatic', function() {
     });
 
     it('respects imageSize', function(done) {
-      var source = new _ol_source_ImageStatic_({
+      var source = new Static({
         url: 'spec/ol/source/images/12-655-1583.png',
         imageExtent: [
           -13629027.891360067, 4539747.983913189,
@@ -58,7 +58,7 @@ describe('ol.source.ImageStatic', function() {
     });
 
     it('triggers image load events', function(done) {
-      var source = new _ol_source_ImageStatic_({
+      var source = new Static({
         url: 'spec/ol/source/images/12-655-1583.png',
         imageExtent: [
           -13629027.891360067, 4539747.983913189,

test/spec/ol/source/raster.test.js

@@ -3,7 +3,7 @@ import TileState from '../../../../src/ol/TileState.js';
 import View from '../../../../src/ol/View.js';
 import ImageLayer from '../../../../src/ol/layer/Image.js';
 import _ol_proj_Projection_ from '../../../../src/ol/proj/Projection.js';
-import _ol_source_ImageStatic_ from '../../../../src/ol/source/ImageStatic.js';
+import Static from '../../../../src/ol/source/ImageStatic.js';
 import RasterSource from '../../../../src/ol/source/Raster.js';
 import Source from '../../../../src/ol/source/Source.js';
 import TileSource from '../../../../src/ol/source/Tile.js';
@@ -35,17 +35,17 @@ where('Uint8ClampedArray').describe('ol.source.Raster', function() {
 
     var extent = [-1, -1, 1, 1];
 
-    redSource = new _ol_source_ImageStatic_({
+    redSource = new Static({
       url: red,
       imageExtent: extent
     });
 
-    greenSource = new _ol_source_ImageStatic_({
+    greenSource = new Static({
       url: green,
       imageExtent: extent
     });
 
-    blueSource = new _ol_source_ImageStatic_({
+    blueSource = new Static({
       url: blue,
       imageExtent: extent
     });