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

Rename _ol_LayerType_ to LayerType

Browse Source
This commit is contained in:
Frederic Junod
2017-12-18 16:43:10 +01:00
parent 30a9c49bf0
commit c64aada38f
11 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/layer/Image.js
View File

@@ -2,7 +2,7 @@
* @module ol/layer/Image * @module ol/layer/Image
*/ */
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_LayerType_ from '../LayerType.js'; import LayerType from '../LayerType.js';
import _ol_layer_Layer_ from '../layer/Layer.js'; import _ol_layer_Layer_ from '../layer/Layer.js';
/** /**
@@ -28,7 +28,7 @@ var _ol_layer_Image_ = function(opt_options) {
* @protected * @protected
* @type {ol.LayerType} * @type {ol.LayerType}
*/ */
this.type = _ol_LayerType_.IMAGE; this.type = LayerType.IMAGE;
}; };

4
src/ol/layer/Tile.js
View File

@@ -2,7 +2,7 @@
* @module ol/layer/Tile * @module ol/layer/Tile
*/ */
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_LayerType_ from '../LayerType.js'; import LayerType from '../LayerType.js';
import _ol_layer_Layer_ from '../layer/Layer.js'; import _ol_layer_Layer_ from '../layer/Layer.js';
import _ol_layer_TileProperty_ from '../layer/TileProperty.js'; import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
import _ol_obj_ from '../obj.js'; import _ol_obj_ from '../obj.js';
@@ -39,7 +39,7 @@ var _ol_layer_Tile_ = function(opt_options) {
* @protected * @protected
* @type {ol.LayerType} * @type {ol.LayerType}
*/ */
this.type = _ol_LayerType_.TILE; this.type = LayerType.TILE;
}; };

4
src/ol/layer/Vector.js
View File

@@ -2,7 +2,7 @@
* @module ol/layer/Vector * @module ol/layer/Vector
*/ */
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_LayerType_ from '../LayerType.js'; import LayerType from '../LayerType.js';
import _ol_layer_Layer_ from '../layer/Layer.js'; import _ol_layer_Layer_ from '../layer/Layer.js';
import _ol_layer_VectorRenderType_ from '../layer/VectorRenderType.js'; import _ol_layer_VectorRenderType_ from '../layer/VectorRenderType.js';
import _ol_obj_ from '../obj.js'; import _ol_obj_ from '../obj.js';
@@ -97,7 +97,7 @@ var _ol_layer_Vector_ = function(opt_options) {
* @protected * @protected
* @type {ol.LayerType} * @type {ol.LayerType}
*/ */
this.type = _ol_LayerType_.VECTOR; this.type = LayerType.VECTOR;
}; };

4
src/ol/layer/VectorTile.js
View File

@@ -2,7 +2,7 @@
* @module ol/layer/VectorTile * @module ol/layer/VectorTile
*/ */
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_LayerType_ from '../LayerType.js'; import LayerType from '../LayerType.js';
import {assert} from '../asserts.js'; import {assert} from '../asserts.js';
import _ol_layer_TileProperty_ from '../layer/TileProperty.js'; import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
import _ol_layer_Vector_ from '../layer/Vector.js'; import _ol_layer_Vector_ from '../layer/Vector.js';
@@ -50,7 +50,7 @@ var _ol_layer_VectorTile_ = function(opt_options) {
* @protected * @protected
* @type {ol.LayerType} * @type {ol.LayerType}
*/ */
this.type = _ol_LayerType_.VECTOR_TILE; this.type = LayerType.VECTOR_TILE;
}; };

8
src/ol/renderer/canvas/ImageLayer.js
View File

@@ -4,7 +4,7 @@
import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js';
import {inherits} from '../../index.js'; import {inherits} from '../../index.js';
import _ol_ImageCanvas_ from '../../ImageCanvas.js'; import _ol_ImageCanvas_ from '../../ImageCanvas.js';
import _ol_LayerType_ from '../../LayerType.js'; import LayerType from '../../LayerType.js';
import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_ViewHint_ from '../../ViewHint.js';
import _ol_array_ from '../../array.js'; import _ol_array_ from '../../array.js';
import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js'; import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js';
@@ -60,8 +60,8 @@ inherits(_ol_renderer_canvas_ImageLayer_, _ol_renderer_canvas_IntermediateCanvas
* @return {boolean} The renderer can render the layer. * @return {boolean} The renderer can render the layer.
*/ */
_ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) { _ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) {
return type === RendererType.CANVAS && (layer.getType() === _ol_LayerType_.IMAGE || return type === RendererType.CANVAS && (layer.getType() === LayerType.IMAGE ||
layer.getType() === _ol_LayerType_.VECTOR && layer.getType() === LayerType.VECTOR &&
/** @type {ol.layer.Vector} */ (layer).getRenderMode() === _ol_layer_VectorRenderType_.IMAGE); /** @type {ol.layer.Vector} */ (layer).getRenderMode() === _ol_layer_VectorRenderType_.IMAGE);
}; };
@@ -74,7 +74,7 @@ _ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) {
*/ */
_ol_renderer_canvas_ImageLayer_['create'] = function(mapRenderer, layer) { _ol_renderer_canvas_ImageLayer_['create'] = function(mapRenderer, layer) {
var renderer = new _ol_renderer_canvas_ImageLayer_(/** @type {ol.layer.Image} */ (layer)); var renderer = new _ol_renderer_canvas_ImageLayer_(/** @type {ol.layer.Image} */ (layer));
if (layer.getType() === _ol_LayerType_.VECTOR) { if (layer.getType() === LayerType.VECTOR) {
var candidates = _ol_plugins_.getLayerRendererPlugins(); var candidates = _ol_plugins_.getLayerRendererPlugins();
for (var i = 0, ii = candidates.length; i < ii; ++i) { for (var i = 0, ii = candidates.length; i < ii; ++i) {
var candidate = /** @type {Object.<string, Function>} */ (candidates[i]); var candidate = /** @type {Object.<string, Function>} */ (candidates[i]);

4
src/ol/renderer/canvas/TileLayer.js
View File

@@ -2,7 +2,7 @@
* @module ol/renderer/canvas/TileLayer * @module ol/renderer/canvas/TileLayer
*/ */
import {getUid, inherits} from '../../index.js'; import {getUid, inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js'; import LayerType from '../../LayerType.js';
import TileRange from '../../TileRange.js'; import TileRange from '../../TileRange.js';
import _ol_TileState_ from '../../TileState.js'; import _ol_TileState_ from '../../TileState.js';
import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_ViewHint_ from '../../ViewHint.js';
@@ -88,7 +88,7 @@ inherits(_ol_renderer_canvas_TileLayer_, _ol_renderer_canvas_IntermediateCanvas_
* @return {boolean} The renderer can render the layer. * @return {boolean} The renderer can render the layer.
*/ */
_ol_renderer_canvas_TileLayer_['handles'] = function(type, layer) { _ol_renderer_canvas_TileLayer_['handles'] = function(type, layer) {
return type === RendererType.CANVAS && layer.getType() === _ol_LayerType_.TILE; return type === RendererType.CANVAS && layer.getType() === LayerType.TILE;
}; };

4
src/ol/renderer/canvas/VectorLayer.js
View File

@@ -2,7 +2,7 @@
* @module ol/renderer/canvas/VectorLayer * @module ol/renderer/canvas/VectorLayer
*/ */
import {getUid, inherits} from '../../index.js'; import {getUid, inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js'; import LayerType from '../../LayerType.js';
import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_ViewHint_ from '../../ViewHint.js';
import {createCanvasContext2D} from '../../dom.js'; import {createCanvasContext2D} from '../../dom.js';
import _ol_events_ from '../../events.js'; import _ol_events_ from '../../events.js';
@@ -93,7 +93,7 @@ inherits(_ol_renderer_canvas_VectorLayer_, _ol_renderer_canvas_Layer_);
* @return {boolean} The renderer can render the layer. * @return {boolean} The renderer can render the layer.
*/ */
_ol_renderer_canvas_VectorLayer_['handles'] = function(type, layer) { _ol_renderer_canvas_VectorLayer_['handles'] = function(type, layer) {
return type === RendererType.CANVAS && layer.getType() === _ol_LayerType_.VECTOR; return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR;
}; };

4
src/ol/renderer/canvas/VectorTileLayer.js
View File

@@ -2,7 +2,7 @@
* @module ol/renderer/canvas/VectorTileLayer * @module ol/renderer/canvas/VectorTileLayer
*/ */
import {getUid, inherits} from '../../index.js'; import {getUid, inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js'; import LayerType from '../../LayerType.js';
import _ol_TileState_ from '../../TileState.js'; import _ol_TileState_ from '../../TileState.js';
import {createCanvasContext2D} from '../../dom.js'; import {createCanvasContext2D} from '../../dom.js';
import _ol_events_ from '../../events.js'; import _ol_events_ from '../../events.js';
@@ -78,7 +78,7 @@ inherits(_ol_renderer_canvas_VectorTileLayer_, _ol_renderer_canvas_TileLayer_);
* @return {boolean} The renderer can render the layer. * @return {boolean} The renderer can render the layer.
*/ */
_ol_renderer_canvas_VectorTileLayer_['handles'] = function(type, layer) { _ol_renderer_canvas_VectorTileLayer_['handles'] = function(type, layer) {
return type === RendererType.CANVAS && layer.getType() === _ol_LayerType_.VECTOR_TILE; return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR_TILE;
}; };

4
src/ol/renderer/webgl/ImageLayer.js
View File

@@ -3,7 +3,7 @@
*/ */
import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js';
import {inherits, nullFunction} from '../../index.js'; import {inherits, nullFunction} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js'; import LayerType from '../../LayerType.js';
import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_ViewHint_ from '../../ViewHint.js';
import {createCanvasContext2D} from '../../dom.js'; import {createCanvasContext2D} from '../../dom.js';
import {getIntersection, isEmpty} from '../../extent.js'; import {getIntersection, isEmpty} from '../../extent.js';
@@ -56,7 +56,7 @@ inherits(_ol_renderer_webgl_ImageLayer_, _ol_renderer_webgl_Layer_);
* @return {boolean} The renderer can render the layer. * @return {boolean} The renderer can render the layer.
*/ */
_ol_renderer_webgl_ImageLayer_['handles'] = function(type, layer) { _ol_renderer_webgl_ImageLayer_['handles'] = function(type, layer) {
return type === RendererType.WEBGL && layer.getType() === _ol_LayerType_.IMAGE; return type === RendererType.WEBGL && layer.getType() === LayerType.IMAGE;
}; };

4
src/ol/renderer/webgl/TileLayer.js
View File

@@ -5,7 +5,7 @@
// FIXME animated shaders! check in redraw // FIXME animated shaders! check in redraw
import {inherits} from '../../index.js'; import {inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js'; import LayerType from '../../LayerType.js';
import TileRange from '../../TileRange.js'; import TileRange from '../../TileRange.js';
import _ol_TileState_ from '../../TileState.js'; import _ol_TileState_ from '../../TileState.js';
import _ol_array_ from '../../array.js'; import _ol_array_ from '../../array.js';
@@ -96,7 +96,7 @@ inherits(_ol_renderer_webgl_TileLayer_, _ol_renderer_webgl_Layer_);
* @return {boolean} The renderer can render the layer. * @return {boolean} The renderer can render the layer.
*/ */
_ol_renderer_webgl_TileLayer_['handles'] = function(type, layer) { _ol_renderer_webgl_TileLayer_['handles'] = function(type, layer) {
return type === RendererType.WEBGL && layer.getType() === _ol_LayerType_.TILE; return type === RendererType.WEBGL && layer.getType() === LayerType.TILE;
}; };

4
src/ol/renderer/webgl/VectorLayer.js
View File

@@ -2,7 +2,7 @@
* @module ol/renderer/webgl/VectorLayer * @module ol/renderer/webgl/VectorLayer
*/ */
import {getUid, inherits} from '../../index.js'; import {getUid, inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js'; import LayerType from '../../LayerType.js';
import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_ViewHint_ from '../../ViewHint.js';
import {buffer, containsExtent, createEmpty} from '../../extent.js'; import {buffer, containsExtent, createEmpty} from '../../extent.js';
import _ol_render_webgl_ReplayGroup_ from '../../render/webgl/ReplayGroup.js'; import _ol_render_webgl_ReplayGroup_ from '../../render/webgl/ReplayGroup.js';
@@ -77,7 +77,7 @@ inherits(_ol_renderer_webgl_VectorLayer_, _ol_renderer_webgl_Layer_);
* @return {boolean} The renderer can render the layer. * @return {boolean} The renderer can render the layer.
*/ */
_ol_renderer_webgl_VectorLayer_['handles'] = function(type, layer) { _ol_renderer_webgl_VectorLayer_['handles'] = function(type, layer) {
return type === RendererType.WEBGL && layer.getType() === _ol_LayerType_.VECTOR; return type === RendererType.WEBGL && layer.getType() === LayerType.VECTOR;
}; };