ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_style_Image_ to ImageStyle

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 13:29:59 -07:00
parent 66182f4cfb
commit 893d134e36
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/style/Icon.js
View File

@@ -10,7 +10,7 @@ import EventType from '../events/EventType.js';
import IconAnchorUnits from '../style/IconAnchorUnits.js';
import IconImage from '../style/IconImage.js';
import IconOrigin from '../style/IconOrigin.js';
import _ol_style_Image_ from '../style/Image.js';
import ImageStyle from '../style/Image.js';
/**
* @classdesc
@@ -162,7 +162,7 @@ var Icon = function(opt_options) {
var snapToPixel = options.snapToPixel !== undefined ?
options.snapToPixel : true;
_ol_style_Image_.call(this, {
ImageStyle.call(this, {
opacity: opacity,
rotation: rotation,
scale: scale,
@@ -172,7 +172,7 @@ var Icon = function(opt_options) {
};
inherits(Icon, _ol_style_Image_);
inherits(Icon, ImageStyle);
/**

46
src/ol/style/Image.js
View File

@@ -12,7 +12,7 @@
* @param {ol.StyleImageOptions} options Options.
* @api
*/
var _ol_style_Image_ = function(options) {
var ImageStyle = function(options) {
/**
* @private
@@ -52,7 +52,7 @@ var _ol_style_Image_ = function(options) {
* @return {number} Opacity.
* @api
*/
_ol_style_Image_.prototype.getOpacity = function() {
ImageStyle.prototype.getOpacity = function() {
return this.opacity_;
};
@@ -62,7 +62,7 @@ _ol_style_Image_.prototype.getOpacity = function() {
* @return {boolean} Rotate with map.
* @api
*/
_ol_style_Image_.prototype.getRotateWithView = function() {
ImageStyle.prototype.getRotateWithView = function() {
return this.rotateWithView_;
};
@@ -72,7 +72,7 @@ _ol_style_Image_.prototype.getRotateWithView = function() {
* @return {number} Rotation.
* @api
*/
_ol_style_Image_.prototype.getRotation = function() {
ImageStyle.prototype.getRotation = function() {
return this.rotation_;
};
@@ -82,7 +82,7 @@ _ol_style_Image_.prototype.getRotation = function() {
* @return {number} Scale.
* @api
*/
_ol_style_Image_.prototype.getScale = function() {
ImageStyle.prototype.getScale = function() {
return this.scale_;
};
@@ -92,7 +92,7 @@ _ol_style_Image_.prototype.getScale = function() {
* @return {boolean} The symbolizer should snap to a pixel.
* @api
*/
_ol_style_Image_.prototype.getSnapToPixel = function() {
ImageStyle.prototype.getSnapToPixel = function() {
return this.snapToPixel_;
};
@@ -103,7 +103,7 @@ _ol_style_Image_.prototype.getSnapToPixel = function() {
* @abstract
* @return {Array.<number>} Anchor.
*/
_ol_style_Image_.prototype.getAnchor = function() {};
ImageStyle.prototype.getAnchor = function() {};
/**
@@ -112,7 +112,7 @@ _ol_style_Image_.prototype.getAnchor = function() {};
* @param {number} pixelRatio Pixel ratio.
* @return {HTMLCanvasElement|HTMLVideoElement|Image} Image element.
*/
_ol_style_Image_.prototype.getImage = function(pixelRatio) {};
ImageStyle.prototype.getImage = function(pixelRatio) {};
/**
@@ -120,28 +120,28 @@ _ol_style_Image_.prototype.getImage = function(pixelRatio) {};
* @param {number} pixelRatio Pixel ratio.
* @return {HTMLCanvasElement|HTMLVideoElement|Image} Image element.
*/
_ol_style_Image_.prototype.getHitDetectionImage = function(pixelRatio) {};
ImageStyle.prototype.getHitDetectionImage = function(pixelRatio) {};
/**
* @abstract
* @return {ol.ImageState} Image state.
*/
_ol_style_Image_.prototype.getImageState = function() {};
ImageStyle.prototype.getImageState = function() {};
/**
* @abstract
* @return {ol.Size} Image size.
*/
_ol_style_Image_.prototype.getImageSize = function() {};
ImageStyle.prototype.getImageSize = function() {};
/**
* @abstract
* @return {ol.Size} Size of the hit-detection image.
*/
_ol_style_Image_.prototype.getHitDetectionImageSize = function() {};
ImageStyle.prototype.getHitDetectionImageSize = function() {};
/**
@@ -149,7 +149,7 @@ _ol_style_Image_.prototype.getHitDetectionImageSize = function() {};
* @abstract
* @return {Array.<number>} Origin.
*/
_ol_style_Image_.prototype.getOrigin = function() {};
ImageStyle.prototype.getOrigin = function() {};
/**
@@ -157,7 +157,7 @@ _ol_style_Image_.prototype.getOrigin = function() {};
* @abstract
* @return {ol.Size} Size.
*/
_ol_style_Image_.prototype.getSize = function() {};
ImageStyle.prototype.getSize = function() {};
/**
@@ -166,7 +166,7 @@ _ol_style_Image_.prototype.getSize = function() {};
* @param {number} opacity Opacity.
* @api
*/
_ol_style_Image_.prototype.setOpacity = function(opacity) {
ImageStyle.prototype.setOpacity = function(opacity) {
this.opacity_ = opacity;
};
@@ -176,7 +176,7 @@ _ol_style_Image_.prototype.setOpacity = function(opacity) {
*
* @param {boolean} rotateWithView Rotate with map.
*/
_ol_style_Image_.prototype.setRotateWithView = function(rotateWithView) {
ImageStyle.prototype.setRotateWithView = function(rotateWithView) {
this.rotateWithView_ = rotateWithView;
};
@@ -187,7 +187,7 @@ _ol_style_Image_.prototype.setRotateWithView = function(rotateWithView) {
* @param {number} rotation Rotation.
* @api
*/
_ol_style_Image_.prototype.setRotation = function(rotation) {
ImageStyle.prototype.setRotation = function(rotation) {
this.rotation_ = rotation;
};
@@ -198,7 +198,7 @@ _ol_style_Image_.prototype.setRotation = function(rotation) {
* @param {number} scale Scale.
* @api
*/
_ol_style_Image_.prototype.setScale = function(scale) {
ImageStyle.prototype.setScale = function(scale) {
this.scale_ = scale;
};
@@ -208,7 +208,7 @@ _ol_style_Image_.prototype.setScale = function(scale) {
*
* @param {boolean} snapToPixel Snap to pixel?
*/
_ol_style_Image_.prototype.setSnapToPixel = function(snapToPixel) {
ImageStyle.prototype.setSnapToPixel = function(snapToPixel) {
this.snapToPixel_ = snapToPixel;
};
@@ -220,14 +220,14 @@ _ol_style_Image_.prototype.setSnapToPixel = function(snapToPixel) {
* @return {ol.EventsKey|undefined} Listener key.
* @template T
*/
_ol_style_Image_.prototype.listenImageChange = function(listener, thisArg) {};
ImageStyle.prototype.listenImageChange = function(listener, thisArg) {};
/**
* Load not yet loaded URI.
* @abstract
*/
_ol_style_Image_.prototype.load = function() {};
ImageStyle.prototype.load = function() {};
/**
@@ -236,5 +236,5 @@ _ol_style_Image_.prototype.load = function() {};
* @param {T} thisArg Value to use as `this` when executing `listener`.
* @template T
*/
_ol_style_Image_.prototype.unlistenImageChange = function(listener, thisArg) {};
export default _ol_style_Image_;
ImageStyle.prototype.unlistenImageChange = function(listener, thisArg) {};
export default ImageStyle;

6
src/ol/style/RegularShape.js
View File

@@ -7,7 +7,7 @@ import {createCanvasContext2D} from '../dom.js';
import _ol_has_ from '../has.js';
import ImageState from '../ImageState.js';
import _ol_render_canvas_ from '../render/canvas.js';
import _ol_style_Image_ from '../style/Image.js';
import ImageStyle from '../style/Image.js';
/**
* @classdesc
@@ -126,7 +126,7 @@ var RegularShape = function(options) {
var rotateWithView = options.rotateWithView !== undefined ?
options.rotateWithView : false;
_ol_style_Image_.call(this, {
ImageStyle.call(this, {
opacity: 1,
rotateWithView: rotateWithView,
rotation: options.rotation !== undefined ? options.rotation : 0,
@@ -135,7 +135,7 @@ var RegularShape = function(options) {
});
};
inherits(RegularShape, _ol_style_Image_);
inherits(RegularShape, ImageStyle);
/**

4
test/spec/ol/render/webgl/imagereplay.test.js
View File

@@ -1,13 +1,13 @@
import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js';
import Point from '../../../../../src/ol/geom/Point.js';
import _ol_render_webgl_ImageReplay_ from '../../../../../src/ol/render/webgl/ImageReplay.js';
import _ol_style_Image_ from '../../../../../src/ol/style/Image.js';
import ImageStyle from '../../../../../src/ol/style/Image.js';
describe('ol.render.webgl.ImageReplay', function() {
var replay;
var createImageStyle = function(image) {
var imageStyle = new _ol_style_Image_({
var imageStyle = new ImageStyle({
opacity: 0.1,
rotateWithView: true,
rotation: 1.5,