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

Transformed

Browse Source
This commit is contained in:
Tim Schaub
2017-12-11 16:29:33 -07:00
parent 1cdb6a66f0
commit 7f47883c48
737 changed files with 22216 additions and 21609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/layer/Base.js
+61 -50
View File
@@ -1,11 +1,11 @@
goog.provide('ol.layer.Base');
goog.require('ol');
goog.require('ol.Object');
goog.require('ol.layer.Property');
goog.require('ol.math');
goog.require('ol.obj');
/**
* @module ol/layer/Base
*/
import _ol_ from '../index.js';
import _ol_Object_ from '../Object.js';
import _ol_layer_Property_ from '../layer/Property.js';
import _ol_math_ from '../math.js';
import _ol_obj_ from '../obj.js';
/**
* @classdesc
@@ -21,23 +21,23 @@ goog.require('ol.obj');
* @param {olx.layer.BaseOptions} options Layer options.
* @api
*/
ol.layer.Base = function(options) {
var _ol_layer_Base_ = function(options) {
ol.Object.call(this);
_ol_Object_.call(this);
/**
* @type {Object.<string, *>}
*/
var properties = ol.obj.assign({}, options);
properties[ol.layer.Property.OPACITY] =
var properties = _ol_obj_.assign({}, options);
properties[_ol_layer_Property_.OPACITY] =
options.opacity !== undefined ? options.opacity : 1;
properties[ol.layer.Property.VISIBLE] =
properties[_ol_layer_Property_.VISIBLE] =
options.visible !== undefined ? options.visible : true;
properties[ol.layer.Property.Z_INDEX] =
properties[_ol_layer_Property_.Z_INDEX] =
options.zIndex !== undefined ? options.zIndex : 0;
properties[ol.layer.Property.MAX_RESOLUTION] =
properties[_ol_layer_Property_.MAX_RESOLUTION] =
options.maxResolution !== undefined ? options.maxResolution : Infinity;
properties[ol.layer.Property.MIN_RESOLUTION] =
properties[_ol_layer_Property_.MIN_RESOLUTION] =
options.minResolution !== undefined ? options.minResolution : 0;
this.setProperties(properties);
@@ -59,14 +59,15 @@ ol.layer.Base = function(options) {
this.type;
};
ol.inherits(ol.layer.Base, ol.Object);
_ol_.inherits(_ol_layer_Base_, _ol_Object_);
/**
* Get the layer type (used when creating a layer renderer).
* @return {ol.LayerType} The layer type.
*/
ol.layer.Base.prototype.getType = function() {
_ol_layer_Base_.prototype.getType = function() {
return this.type;
};
@@ -74,8 +75,8 @@ ol.layer.Base.prototype.getType = function() {
/**
* @return {ol.LayerState} Layer state.
*/
ol.layer.Base.prototype.getLayerState = function() {
this.state_.opacity = ol.math.clamp(this.getOpacity(), 0, 1);
_ol_layer_Base_.prototype.getLayerState = function() {
this.state_.opacity = _ol_math_.clamp(this.getOpacity(), 0, 1);
this.state_.sourceState = this.getSourceState();
this.state_.visible = this.getVisible();
this.state_.extent = this.getExtent();
@@ -93,7 +94,7 @@ ol.layer.Base.prototype.getLayerState = function() {
* modified in place).
* @return {Array.<ol.layer.Layer>} Array of layers.
*/
ol.layer.Base.prototype.getLayersArray = function(opt_array) {};
_ol_layer_Base_.prototype.getLayersArray = function(opt_array) {};
/**
@@ -102,7 +103,7 @@ ol.layer.Base.prototype.getLayersArray = function(opt_array) {};
* states (to be modified in place).
* @return {Array.<ol.LayerState>} List of layer states.
*/
ol.layer.Base.prototype.getLayerStatesArray = function(opt_states) {};
_ol_layer_Base_.prototype.getLayerStatesArray = function(opt_states) {};
/**
@@ -112,9 +113,10 @@ ol.layer.Base.prototype.getLayerStatesArray = function(opt_states) {};
* @observable
* @api
*/
ol.layer.Base.prototype.getExtent = function() {
return /** @type {ol.Extent|undefined} */ (
this.get(ol.layer.Property.EXTENT));
_ol_layer_Base_.prototype.getExtent = function() {
return (
/** @type {ol.Extent|undefined} */ this.get(_ol_layer_Property_.EXTENT)
);
};
@@ -124,9 +126,10 @@ ol.layer.Base.prototype.getExtent = function() {
* @observable
* @api
*/
ol.layer.Base.prototype.getMaxResolution = function() {
return /** @type {number} */ (
this.get(ol.layer.Property.MAX_RESOLUTION));
_ol_layer_Base_.prototype.getMaxResolution = function() {
return (
/** @type {number} */ this.get(_ol_layer_Property_.MAX_RESOLUTION)
);
};
@@ -136,9 +139,10 @@ ol.layer.Base.prototype.getMaxResolution = function() {
* @observable
* @api
*/
ol.layer.Base.prototype.getMinResolution = function() {
return /** @type {number} */ (
this.get(ol.layer.Property.MIN_RESOLUTION));
_ol_layer_Base_.prototype.getMinResolution = function() {
return (
/** @type {number} */ this.get(_ol_layer_Property_.MIN_RESOLUTION)
);
};
@@ -148,8 +152,10 @@ ol.layer.Base.prototype.getMinResolution = function() {
* @observable
* @api
*/
ol.layer.Base.prototype.getOpacity = function() {
return /** @type {number} */ (this.get(ol.layer.Property.OPACITY));
_ol_layer_Base_.prototype.getOpacity = function() {
return (
/** @type {number} */ this.get(_ol_layer_Property_.OPACITY)
);
};
@@ -157,7 +163,7 @@ ol.layer.Base.prototype.getOpacity = function() {
* @abstract
* @return {ol.source.State} Source state.
*/
ol.layer.Base.prototype.getSourceState = function() {};
_ol_layer_Base_.prototype.getSourceState = function() {};
/**
@@ -166,8 +172,10 @@ ol.layer.Base.prototype.getSourceState = function() {};
* @observable
* @api
*/
ol.layer.Base.prototype.getVisible = function() {
return /** @type {boolean} */ (this.get(ol.layer.Property.VISIBLE));
_ol_layer_Base_.prototype.getVisible = function() {
return (
/** @type {boolean} */ this.get(_ol_layer_Property_.VISIBLE)
);
};
@@ -178,8 +186,10 @@ ol.layer.Base.prototype.getVisible = function() {
* @observable
* @api
*/
ol.layer.Base.prototype.getZIndex = function() {
return /** @type {number} */ (this.get(ol.layer.Property.Z_INDEX));
_ol_layer_Base_.prototype.getZIndex = function() {
return (
/** @type {number} */ this.get(_ol_layer_Property_.Z_INDEX)
);
};
@@ -190,8 +200,8 @@ ol.layer.Base.prototype.getZIndex = function() {
* @observable
* @api
*/
ol.layer.Base.prototype.setExtent = function(extent) {
this.set(ol.layer.Property.EXTENT, extent);
_ol_layer_Base_.prototype.setExtent = function(extent) {
this.set(_ol_layer_Property_.EXTENT, extent);
};
@@ -201,8 +211,8 @@ ol.layer.Base.prototype.setExtent = function(extent) {
* @observable
* @api
*/
ol.layer.Base.prototype.setMaxResolution = function(maxResolution) {
this.set(ol.layer.Property.MAX_RESOLUTION, maxResolution);
_ol_layer_Base_.prototype.setMaxResolution = function(maxResolution) {
this.set(_ol_layer_Property_.MAX_RESOLUTION, maxResolution);
};
@@ -212,8 +222,8 @@ ol.layer.Base.prototype.setMaxResolution = function(maxResolution) {
* @observable
* @api
*/
ol.layer.Base.prototype.setMinResolution = function(minResolution) {
this.set(ol.layer.Property.MIN_RESOLUTION, minResolution);
_ol_layer_Base_.prototype.setMinResolution = function(minResolution) {
this.set(_ol_layer_Property_.MIN_RESOLUTION, minResolution);
};
@@ -223,8 +233,8 @@ ol.layer.Base.prototype.setMinResolution = function(minResolution) {
* @observable
* @api
*/
ol.layer.Base.prototype.setOpacity = function(opacity) {
this.set(ol.layer.Property.OPACITY, opacity);
_ol_layer_Base_.prototype.setOpacity = function(opacity) {
this.set(_ol_layer_Property_.OPACITY, opacity);
};
@@ -234,8 +244,8 @@ ol.layer.Base.prototype.setOpacity = function(opacity) {
* @observable
* @api
*/
ol.layer.Base.prototype.setVisible = function(visible) {
this.set(ol.layer.Property.VISIBLE, visible);
_ol_layer_Base_.prototype.setVisible = function(visible) {
this.set(_ol_layer_Property_.VISIBLE, visible);
};
@@ -246,6 +256,7 @@ ol.layer.Base.prototype.setVisible = function(visible) {
* @observable
* @api
*/
ol.layer.Base.prototype.setZIndex = function(zindex) {
this.set(ol.layer.Property.Z_INDEX, zindex);
_ol_layer_Base_.prototype.setZIndex = function(zindex) {
this.set(_ol_layer_Property_.Z_INDEX, zindex);
};
export default _ol_layer_Base_;
src/ol/layer/Group.js
+56 -52
View File
@@ -1,18 +1,18 @@
goog.provide('ol.layer.Group');
goog.require('ol');
goog.require('ol.Collection');
goog.require('ol.CollectionEventType');
goog.require('ol.Object');
goog.require('ol.ObjectEventType');
goog.require('ol.asserts');
goog.require('ol.events');
goog.require('ol.events.EventType');
goog.require('ol.extent');
goog.require('ol.layer.Base');
goog.require('ol.obj');
goog.require('ol.source.State');
/**
* @module ol/layer/Group
*/
import _ol_ from '../index.js';
import _ol_Collection_ from '../Collection.js';
import _ol_CollectionEventType_ from '../CollectionEventType.js';
import _ol_Object_ from '../Object.js';
import _ol_ObjectEventType_ from '../ObjectEventType.js';
import _ol_asserts_ from '../asserts.js';
import _ol_events_ from '../events.js';
import _ol_events_EventType_ from '../events/EventType.js';
import _ol_extent_ from '../extent.js';
import _ol_layer_Base_ from '../layer/Base.js';
import _ol_obj_ from '../obj.js';
import _ol_source_State_ from '../source/State.js';
/**
* @classdesc
@@ -25,16 +25,16 @@ goog.require('ol.source.State');
* @param {olx.layer.GroupOptions=} opt_options Layer options.
* @api
*/
ol.layer.Group = function(opt_options) {
var _ol_layer_Group_ = function(opt_options) {
var options = opt_options || {};
var baseOptions = /** @type {olx.layer.GroupOptions} */
(ol.obj.assign({}, options));
(_ol_obj_.assign({}, options));
delete baseOptions.layers;
var layers = options.layers;
ol.layer.Base.call(this, baseOptions);
_ol_layer_Base_.call(this, baseOptions);
/**
* @private
@@ -48,32 +48,33 @@ ol.layer.Group = function(opt_options) {
*/
this.listenerKeys_ = {};
ol.events.listen(this,
ol.Object.getChangeEventType(ol.layer.Group.Property_.LAYERS),
_ol_events_.listen(this,
_ol_Object_.getChangeEventType(_ol_layer_Group_.Property_.LAYERS),
this.handleLayersChanged_, this);
if (layers) {
if (Array.isArray(layers)) {
layers = new ol.Collection(layers.slice(), {unique: true});
layers = new _ol_Collection_(layers.slice(), {unique: true});
} else {
ol.asserts.assert(layers instanceof ol.Collection,
_ol_asserts_.assert(layers instanceof _ol_Collection_,
43); // Expected `layers` to be an array or an `ol.Collection`
layers = layers;
}
} else {
layers = new ol.Collection(undefined, {unique: true});
layers = new _ol_Collection_(undefined, {unique: true});
}
this.setLayers(layers);
};
ol.inherits(ol.layer.Group, ol.layer.Base);
_ol_.inherits(_ol_layer_Group_, _ol_layer_Base_);
/**
* @private
*/
ol.layer.Group.prototype.handleLayerChange_ = function() {
_ol_layer_Group_.prototype.handleLayerChange_ = function() {
this.changed();
};
@@ -82,30 +83,30 @@ ol.layer.Group.prototype.handleLayerChange_ = function() {
* @param {ol.events.Event} event Event.
* @private
*/
ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
this.layersListenerKeys_.forEach(ol.events.unlistenByKey);
_ol_layer_Group_.prototype.handleLayersChanged_ = function(event) {
this.layersListenerKeys_.forEach(_ol_events_.unlistenByKey);
this.layersListenerKeys_.length = 0;
var layers = this.getLayers();
this.layersListenerKeys_.push(
ol.events.listen(layers, ol.CollectionEventType.ADD,
_ol_events_.listen(layers, _ol_CollectionEventType_.ADD,
this.handleLayersAdd_, this),
ol.events.listen(layers, ol.CollectionEventType.REMOVE,
_ol_events_.listen(layers, _ol_CollectionEventType_.REMOVE,
this.handleLayersRemove_, this));
for (var id in this.listenerKeys_) {
this.listenerKeys_[id].forEach(ol.events.unlistenByKey);
this.listenerKeys_[id].forEach(_ol_events_.unlistenByKey);
}
ol.obj.clear(this.listenerKeys_);
_ol_obj_.clear(this.listenerKeys_);
var layersArray = layers.getArray();
var i, ii, layer;
for (i = 0, ii = layersArray.length; i < ii; i++) {
layer = layersArray[i];
this.listenerKeys_[ol.getUid(layer).toString()] = [
ol.events.listen(layer, ol.ObjectEventType.PROPERTYCHANGE,
this.listenerKeys_[_ol_.getUid(layer).toString()] = [
_ol_events_.listen(layer, _ol_ObjectEventType_.PROPERTYCHANGE,
this.handleLayerChange_, this),
ol.events.listen(layer, ol.events.EventType.CHANGE,
_ol_events_.listen(layer, _ol_events_EventType_.CHANGE,
this.handleLayerChange_, this)
];
}
@@ -118,13 +119,13 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
* @param {ol.Collection.Event} collectionEvent Collection event.
* @private
*/
ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
_ol_layer_Group_.prototype.handleLayersAdd_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.element);
var key = ol.getUid(layer).toString();
var key = _ol_.getUid(layer).toString();
this.listenerKeys_[key] = [
ol.events.listen(layer, ol.ObjectEventType.PROPERTYCHANGE,
_ol_events_.listen(layer, _ol_ObjectEventType_.PROPERTYCHANGE,
this.handleLayerChange_, this),
ol.events.listen(layer, ol.events.EventType.CHANGE,
_ol_events_.listen(layer, _ol_events_EventType_.CHANGE,
this.handleLayerChange_, this)
];
this.changed();
@@ -135,10 +136,10 @@ ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
* @param {ol.Collection.Event} collectionEvent Collection event.
* @private
*/
ol.layer.Group.prototype.handleLayersRemove_ = function(collectionEvent) {
_ol_layer_Group_.prototype.handleLayersRemove_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.element);
var key = ol.getUid(layer).toString();
this.listenerKeys_[key].forEach(ol.events.unlistenByKey);
var key = _ol_.getUid(layer).toString();
this.listenerKeys_[key].forEach(_ol_events_.unlistenByKey);
delete this.listenerKeys_[key];
this.changed();
};
@@ -152,9 +153,11 @@ ol.layer.Group.prototype.handleLayersRemove_ = function(collectionEvent) {
* @observable
* @api
*/
ol.layer.Group.prototype.getLayers = function() {
return /** @type {!ol.Collection.<ol.layer.Base>} */ (this.get(
ol.layer.Group.Property_.LAYERS));
_ol_layer_Group_.prototype.getLayers = function() {
return (
/** @type {!ol.Collection.<ol.layer.Base>} */ this.get(
_ol_layer_Group_.Property_.LAYERS)
);
};
@@ -166,15 +169,15 @@ ol.layer.Group.prototype.getLayers = function() {
* @observable
* @api
*/
ol.layer.Group.prototype.setLayers = function(layers) {
this.set(ol.layer.Group.Property_.LAYERS, layers);
_ol_layer_Group_.prototype.setLayers = function(layers) {
this.set(_ol_layer_Group_.Property_.LAYERS, layers);
};
/**
* @inheritDoc
*/
ol.layer.Group.prototype.getLayersArray = function(opt_array) {
_ol_layer_Group_.prototype.getLayersArray = function(opt_array) {
var array = opt_array !== undefined ? opt_array : [];
this.getLayers().forEach(function(layer) {
layer.getLayersArray(array);
@@ -186,7 +189,7 @@ ol.layer.Group.prototype.getLayersArray = function(opt_array) {
/**
* @inheritDoc
*/
ol.layer.Group.prototype.getLayerStatesArray = function(opt_states) {
_ol_layer_Group_.prototype.getLayerStatesArray = function(opt_states) {
var states = opt_states !== undefined ? opt_states : [];
var pos = states.length;
@@ -207,7 +210,7 @@ ol.layer.Group.prototype.getLayerStatesArray = function(opt_states) {
layerState.minResolution, ownLayerState.minResolution);
if (ownLayerState.extent !== undefined) {
if (layerState.extent !== undefined) {
layerState.extent = ol.extent.getIntersection(
layerState.extent = _ol_extent_.getIntersection(
layerState.extent, ownLayerState.extent);
} else {
layerState.extent = ownLayerState.extent;
@@ -222,14 +225,15 @@ ol.layer.Group.prototype.getLayerStatesArray = function(opt_states) {
/**
* @inheritDoc
*/
ol.layer.Group.prototype.getSourceState = function() {
return ol.source.State.READY;
_ol_layer_Group_.prototype.getSourceState = function() {
return _ol_source_State_.READY;
};
/**
* @enum {string}
* @private
*/
ol.layer.Group.Property_ = {
_ol_layer_Group_.Property_ = {
LAYERS: 'layers'
};
export default _ol_layer_Group_;
src/ol/layer/Heatmap.js
+58 -51
View File
@@ -1,16 +1,16 @@
goog.provide('ol.layer.Heatmap');
goog.require('ol.events');
goog.require('ol');
goog.require('ol.Object');
goog.require('ol.dom');
goog.require('ol.layer.Vector');
goog.require('ol.math');
goog.require('ol.obj');
goog.require('ol.render.EventType');
goog.require('ol.style.Icon');
goog.require('ol.style.Style');
/**
* @module ol/layer/Heatmap
*/
import _ol_events_ from '../events.js';
import _ol_ from '../index.js';
import _ol_Object_ from '../Object.js';
import _ol_dom_ from '../dom.js';
import _ol_layer_Vector_ from '../layer/Vector.js';
import _ol_math_ from '../math.js';
import _ol_obj_ from '../obj.js';
import _ol_render_EventType_ from '../render/EventType.js';
import _ol_style_Icon_ from '../style/Icon.js';
import _ol_style_Style_ from '../style/Style.js';
/**
* @classdesc
@@ -25,17 +25,17 @@ goog.require('ol.style.Style');
* @param {olx.layer.HeatmapOptions=} opt_options Options.
* @api
*/
ol.layer.Heatmap = function(opt_options) {
var _ol_layer_Heatmap_ = function(opt_options) {
var options = opt_options ? opt_options : {};
var baseOptions = ol.obj.assign({}, options);
var baseOptions = _ol_obj_.assign({}, options);
delete baseOptions.gradient;
delete baseOptions.radius;
delete baseOptions.blur;
delete baseOptions.shadow;
delete baseOptions.weight;
ol.layer.Vector.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
_ol_layer_Vector_.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
/**
* @private
@@ -61,22 +61,22 @@ ol.layer.Heatmap = function(opt_options) {
*/
this.styleCache_ = null;
ol.events.listen(this,
ol.Object.getChangeEventType(ol.layer.Heatmap.Property_.GRADIENT),
_ol_events_.listen(this,
_ol_Object_.getChangeEventType(_ol_layer_Heatmap_.Property_.GRADIENT),
this.handleGradientChanged_, this);
this.setGradient(options.gradient ?
options.gradient : ol.layer.Heatmap.DEFAULT_GRADIENT);
options.gradient : _ol_layer_Heatmap_.DEFAULT_GRADIENT);
this.setBlur(options.blur !== undefined ? options.blur : 15);
this.setRadius(options.radius !== undefined ? options.radius : 8);
ol.events.listen(this,
ol.Object.getChangeEventType(ol.layer.Heatmap.Property_.BLUR),
_ol_events_.listen(this,
_ol_Object_.getChangeEventType(_ol_layer_Heatmap_.Property_.BLUR),
this.handleStyleChanged_, this);
ol.events.listen(this,
ol.Object.getChangeEventType(ol.layer.Heatmap.Property_.RADIUS),
_ol_events_.listen(this,
_ol_Object_.getChangeEventType(_ol_layer_Heatmap_.Property_.RADIUS),
this.handleStyleChanged_, this);
this.handleStyleChanged_();
@@ -93,14 +93,14 @@ ol.layer.Heatmap = function(opt_options) {
this.setStyle(function(feature, resolution) {
var weight = weightFunction(feature);
var opacity = weight !== undefined ? ol.math.clamp(weight, 0, 1) : 1;
var opacity = weight !== undefined ? _ol_math_.clamp(weight, 0, 1) : 1;
// cast to 8 bits
var index = (255 * opacity) | 0;
var style = this.styleCache_[index];
if (!style) {
style = [
new ol.style.Style({
image: new ol.style.Icon({
new _ol_style_Style_({
image: new _ol_style_Icon_({
opacity: opacity,
src: this.circleImage_
})
@@ -115,16 +115,17 @@ ol.layer.Heatmap = function(opt_options) {
// The render order is not relevant for a heatmap representation.
this.setRenderOrder(null);
ol.events.listen(this, ol.render.EventType.RENDER, this.handleRender_, this);
_ol_events_.listen(this, _ol_render_EventType_.RENDER, this.handleRender_, this);
};
ol.inherits(ol.layer.Heatmap, ol.layer.Vector);
_ol_.inherits(_ol_layer_Heatmap_, _ol_layer_Vector_);
/**
* @const
* @type {Array.<string>}
*/
ol.layer.Heatmap.DEFAULT_GRADIENT = ['#00f', '#0ff', '#0f0', '#ff0', '#f00'];
_ol_layer_Heatmap_.DEFAULT_GRADIENT = ['#00f', '#0ff', '#0f0', '#ff0', '#f00'];
/**
@@ -132,10 +133,10 @@ ol.layer.Heatmap.DEFAULT_GRADIENT = ['#00f', '#0ff', '#0f0', '#ff0', '#f00'];
* @return {Uint8ClampedArray} An array.
* @private
*/
ol.layer.Heatmap.createGradient_ = function(colors) {
_ol_layer_Heatmap_.createGradient_ = function(colors) {
var width = 1;
var height = 256;
var context = ol.dom.createCanvasContext2D(width, height);
var context = _ol_dom_.createCanvasContext2D(width, height);
var gradient = context.createLinearGradient(0, 0, width, height);
var step = 1 / (colors.length - 1);
@@ -154,12 +155,12 @@ ol.layer.Heatmap.createGradient_ = function(colors) {
* @return {string} Data URL for a circle.
* @private
*/
ol.layer.Heatmap.prototype.createCircle_ = function() {
_ol_layer_Heatmap_.prototype.createCircle_ = function() {
var radius = this.getRadius();
var blur = this.getBlur();
var halfSize = radius + blur + 1;
var size = 2 * halfSize;
var context = ol.dom.createCanvasContext2D(size, size);
var context = _ol_dom_.createCanvasContext2D(size, size);
context.shadowOffsetX = context.shadowOffsetY = this.shadow_;
context.shadowBlur = blur;
context.shadowColor = '#000';
@@ -177,8 +178,10 @@ ol.layer.Heatmap.prototype.createCircle_ = function() {
* @api
* @observable
*/
ol.layer.Heatmap.prototype.getBlur = function() {
return /** @type {number} */ (this.get(ol.layer.Heatmap.Property_.BLUR));
_ol_layer_Heatmap_.prototype.getBlur = function() {
return (
/** @type {number} */ this.get(_ol_layer_Heatmap_.Property_.BLUR)
);
};
@@ -188,9 +191,10 @@ ol.layer.Heatmap.prototype.getBlur = function() {
* @api
* @observable
*/
ol.layer.Heatmap.prototype.getGradient = function() {
return /** @type {Array.<string>} */ (
this.get(ol.layer.Heatmap.Property_.GRADIENT));
_ol_layer_Heatmap_.prototype.getGradient = function() {
return (
/** @type {Array.<string>} */ this.get(_ol_layer_Heatmap_.Property_.GRADIENT)
);
};
@@ -200,23 +204,25 @@ ol.layer.Heatmap.prototype.getGradient = function() {
* @api
* @observable
*/
ol.layer.Heatmap.prototype.getRadius = function() {
return /** @type {number} */ (this.get(ol.layer.Heatmap.Property_.RADIUS));
_ol_layer_Heatmap_.prototype.getRadius = function() {
return (
/** @type {number} */ this.get(_ol_layer_Heatmap_.Property_.RADIUS)
);
};
/**
* @private
*/
ol.layer.Heatmap.prototype.handleGradientChanged_ = function() {
this.gradient_ = ol.layer.Heatmap.createGradient_(this.getGradient());
_ol_layer_Heatmap_.prototype.handleGradientChanged_ = function() {
this.gradient_ = _ol_layer_Heatmap_.createGradient_(this.getGradient());
};
/**
* @private
*/
ol.layer.Heatmap.prototype.handleStyleChanged_ = function() {
_ol_layer_Heatmap_.prototype.handleStyleChanged_ = function() {
this.circleImage_ = this.createCircle_();
this.styleCache_ = new Array(256);
this.changed();
@@ -227,7 +233,7 @@ ol.layer.Heatmap.prototype.handleStyleChanged_ = function() {
* @param {ol.render.Event} event Post compose event
* @private
*/
ol.layer.Heatmap.prototype.handleRender_ = function(event) {
_ol_layer_Heatmap_.prototype.handleRender_ = function(event) {
var context = event.context;
var canvas = context.canvas;
var image = context.getImageData(0, 0, canvas.width, canvas.height);
@@ -251,8 +257,8 @@ ol.layer.Heatmap.prototype.handleRender_ = function(event) {
* @api
* @observable
*/
ol.layer.Heatmap.prototype.setBlur = function(blur) {
this.set(ol.layer.Heatmap.Property_.BLUR, blur);
_ol_layer_Heatmap_.prototype.setBlur = function(blur) {
this.set(_ol_layer_Heatmap_.Property_.BLUR, blur);
};
@@ -262,8 +268,8 @@ ol.layer.Heatmap.prototype.setBlur = function(blur) {
* @api
* @observable
*/
ol.layer.Heatmap.prototype.setGradient = function(colors) {
this.set(ol.layer.Heatmap.Property_.GRADIENT, colors);
_ol_layer_Heatmap_.prototype.setGradient = function(colors) {
this.set(_ol_layer_Heatmap_.Property_.GRADIENT, colors);
};
@@ -273,8 +279,8 @@ ol.layer.Heatmap.prototype.setGradient = function(colors) {
* @api
* @observable
*/
ol.layer.Heatmap.prototype.setRadius = function(radius) {
this.set(ol.layer.Heatmap.Property_.RADIUS, radius);
_ol_layer_Heatmap_.prototype.setRadius = function(radius) {
this.set(_ol_layer_Heatmap_.Property_.RADIUS, radius);
};
@@ -282,8 +288,9 @@ ol.layer.Heatmap.prototype.setRadius = function(radius) {
* @enum {string}
* @private
*/
ol.layer.Heatmap.Property_ = {
_ol_layer_Heatmap_.Property_ = {
BLUR: 'blur',
GRADIENT: 'gradient',
RADIUS: 'radius'
};
export default _ol_layer_Heatmap_;
src/ol/layer/Image.js
+13 -11
View File
@@ -1,9 +1,9 @@
goog.provide('ol.layer.Image');
goog.require('ol');
goog.require('ol.LayerType');
goog.require('ol.layer.Layer');
/**
* @module ol/layer/Image
*/
import _ol_ from '../index.js';
import _ol_LayerType_ from '../LayerType.js';
import _ol_layer_Layer_ from '../layer/Layer.js';
/**
* @classdesc
@@ -19,19 +19,20 @@ goog.require('ol.layer.Layer');
* @param {olx.layer.ImageOptions=} opt_options Layer options.
* @api
*/
ol.layer.Image = function(opt_options) {
var _ol_layer_Image_ = function(opt_options) {
var options = opt_options ? opt_options : {};
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (options));
_ol_layer_Layer_.call(this, /** @type {olx.layer.LayerOptions} */ (options));
/**
* The layer type.
* @protected
* @type {ol.LayerType}
*/
this.type = ol.LayerType.IMAGE;
this.type = _ol_LayerType_.IMAGE;
};
ol.inherits(ol.layer.Image, ol.layer.Layer);
_ol_.inherits(_ol_layer_Image_, _ol_layer_Layer_);
/**
@@ -40,4 +41,5 @@ ol.inherits(ol.layer.Image, ol.layer.Layer);
* @return {ol.source.Image} Source.
* @api
*/
ol.layer.Image.prototype.getSource;
_ol_layer_Image_.prototype.getSource;
export default _ol_layer_Image_;
src/ol/layer/Layer.js
+42 -40
View File
@@ -1,15 +1,15 @@
goog.provide('ol.layer.Layer');
goog.require('ol.events');
goog.require('ol.events.EventType');
goog.require('ol');
goog.require('ol.Object');
goog.require('ol.layer.Base');
goog.require('ol.layer.Property');
goog.require('ol.obj');
goog.require('ol.render.EventType');
goog.require('ol.source.State');
/**
* @module ol/layer/Layer
*/
import _ol_events_ from '../events.js';
import _ol_events_EventType_ from '../events/EventType.js';
import _ol_ from '../index.js';
import _ol_Object_ from '../Object.js';
import _ol_layer_Base_ from '../layer/Base.js';
import _ol_layer_Property_ from '../layer/Property.js';
import _ol_obj_ from '../obj.js';
import _ol_render_EventType_ from '../render/EventType.js';
import _ol_source_State_ from '../source/State.js';
/**
* @classdesc
@@ -33,12 +33,12 @@ goog.require('ol.source.State');
* @param {olx.layer.LayerOptions} options Layer options.
* @api
*/
ol.layer.Layer = function(options) {
var _ol_layer_Layer_ = function(options) {
var baseOptions = ol.obj.assign({}, options);
var baseOptions = _ol_obj_.assign({}, options);
delete baseOptions.source;
ol.layer.Base.call(this, /** @type {olx.layer.BaseOptions} */ (baseOptions));
_ol_layer_Base_.call(this, /** @type {olx.layer.BaseOptions} */ (baseOptions));
/**
* @private
@@ -62,14 +62,15 @@ ol.layer.Layer = function(options) {
this.setMap(options.map);
}
ol.events.listen(this,
ol.Object.getChangeEventType(ol.layer.Property.SOURCE),
_ol_events_.listen(this,
_ol_Object_.getChangeEventType(_ol_layer_Property_.SOURCE),
this.handleSourcePropertyChange_, this);
var source = options.source ? options.source : null;
this.setSource(source);
};
ol.inherits(ol.layer.Layer, ol.layer.Base);
_ol_.inherits(_ol_layer_Layer_, _ol_layer_Base_);
/**
@@ -80,7 +81,7 @@ ol.inherits(ol.layer.Layer, ol.layer.Base);
* @param {number} resolution Resolution.
* @return {boolean} The layer is visible at the given resolution.
*/
ol.layer.Layer.visibleAtResolution = function(layerState, resolution) {
_ol_layer_Layer_.visibleAtResolution = function(layerState, resolution) {
return layerState.visible && resolution >= layerState.minResolution &&
resolution < layerState.maxResolution;
};
@@ -89,7 +90,7 @@ ol.layer.Layer.visibleAtResolution = function(layerState, resolution) {
/**
* @inheritDoc
*/
ol.layer.Layer.prototype.getLayersArray = function(opt_array) {
_ol_layer_Layer_.prototype.getLayersArray = function(opt_array) {
var array = opt_array ? opt_array : [];
array.push(this);
return array;
@@ -99,7 +100,7 @@ ol.layer.Layer.prototype.getLayersArray = function(opt_array) {
/**
* @inheritDoc
*/
ol.layer.Layer.prototype.getLayerStatesArray = function(opt_states) {
_ol_layer_Layer_.prototype.getLayerStatesArray = function(opt_states) {
var states = opt_states ? opt_states : [];
states.push(this.getLayerState());
return states;
@@ -112,8 +113,8 @@ ol.layer.Layer.prototype.getLayerStatesArray = function(opt_states) {
* @observable
* @api
*/
ol.layer.Layer.prototype.getSource = function() {
var source = this.get(ol.layer.Property.SOURCE);
_ol_layer_Layer_.prototype.getSource = function() {
var source = this.get(_ol_layer_Property_.SOURCE);
return /** @type {ol.source.Source} */ (source) || null;
};
@@ -121,16 +122,16 @@ ol.layer.Layer.prototype.getSource = function() {
/**
* @inheritDoc
*/
ol.layer.Layer.prototype.getSourceState = function() {
_ol_layer_Layer_.prototype.getSourceState = function() {
var source = this.getSource();
return !source ? ol.source.State.UNDEFINED : source.getState();
return !source ? _ol_source_State_.UNDEFINED : source.getState();
};
/**
* @private
*/
ol.layer.Layer.prototype.handleSourceChange_ = function() {
_ol_layer_Layer_.prototype.handleSourceChange_ = function() {
this.changed();
};
@@ -138,15 +139,15 @@ ol.layer.Layer.prototype.handleSourceChange_ = function() {
/**
* @private
*/
ol.layer.Layer.prototype.handleSourcePropertyChange_ = function() {
_ol_layer_Layer_.prototype.handleSourcePropertyChange_ = function() {
if (this.sourceChangeKey_) {
ol.events.unlistenByKey(this.sourceChangeKey_);
_ol_events_.unlistenByKey(this.sourceChangeKey_);
this.sourceChangeKey_ = null;
}
var source = this.getSource();
if (source) {
this.sourceChangeKey_ = ol.events.listen(source,
ol.events.EventType.CHANGE, this.handleSourceChange_, this);
this.sourceChangeKey_ = _ol_events_.listen(source,
_ol_events_EventType_.CHANGE, this.handleSourceChange_, this);
}
this.changed();
};
@@ -164,29 +165,29 @@ ol.layer.Layer.prototype.handleSourcePropertyChange_ = function() {
* @param {ol.PluggableMap} map Map.
* @api
*/
ol.layer.Layer.prototype.setMap = function(map) {
_ol_layer_Layer_.prototype.setMap = function(map) {
if (this.mapPrecomposeKey_) {
ol.events.unlistenByKey(this.mapPrecomposeKey_);
_ol_events_.unlistenByKey(this.mapPrecomposeKey_);
this.mapPrecomposeKey_ = null;
}
if (!map) {
this.changed();
}
if (this.mapRenderKey_) {
ol.events.unlistenByKey(this.mapRenderKey_);
_ol_events_.unlistenByKey(this.mapRenderKey_);
this.mapRenderKey_ = null;
}
if (map) {
this.mapPrecomposeKey_ = ol.events.listen(
map, ol.render.EventType.PRECOMPOSE, function(evt) {
this.mapPrecomposeKey_ = _ol_events_.listen(
map, _ol_render_EventType_.PRECOMPOSE, function(evt) {
var layerState = this.getLayerState();
layerState.managed = false;
layerState.zIndex = Infinity;
evt.frameState.layerStatesArray.push(layerState);
evt.frameState.layerStates[ol.getUid(this)] = layerState;
evt.frameState.layerStates[_ol_.getUid(this)] = layerState;
}, this);
this.mapRenderKey_ = ol.events.listen(
this, ol.events.EventType.CHANGE, map.render, map);
this.mapRenderKey_ = _ol_events_.listen(
this, _ol_events_EventType_.CHANGE, map.render, map);
this.changed();
}
};
@@ -198,6 +199,7 @@ ol.layer.Layer.prototype.setMap = function(map) {
* @observable
* @api
*/
ol.layer.Layer.prototype.setSource = function(source) {
this.set(ol.layer.Property.SOURCE, source);
_ol_layer_Layer_.prototype.setSource = function(source) {
this.set(_ol_layer_Property_.SOURCE, source);
};
export default _ol_layer_Layer_;
src/ol/layer/Property.js
+6 -3
View File
@@ -1,9 +1,10 @@
goog.provide('ol.layer.Property');
/**
* @module ol/layer/Property
*/
/**
* @enum {string}
*/
ol.layer.Property = {
var _ol_layer_Property_ = {
OPACITY: 'opacity',
VISIBLE: 'visible',
EXTENT: 'extent',
@@ -12,3 +13,5 @@ ol.layer.Property = {
MIN_RESOLUTION: 'minResolution',
SOURCE: 'source'
};
export default _ol_layer_Property_;
src/ol/layer/Tile.js
+28 -23
View File
@@ -1,11 +1,11 @@
goog.provide('ol.layer.Tile');
goog.require('ol');
goog.require('ol.LayerType');
goog.require('ol.layer.Layer');
goog.require('ol.layer.TileProperty');
goog.require('ol.obj');
/**
* @module ol/layer/Tile
*/
import _ol_ from '../index.js';
import _ol_LayerType_ from '../LayerType.js';
import _ol_layer_Layer_ from '../layer/Layer.js';
import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
import _ol_obj_ from '../obj.js';
/**
* @classdesc
@@ -21,14 +21,14 @@ goog.require('ol.obj');
* @param {olx.layer.TileOptions=} opt_options Tile layer options.
* @api
*/
ol.layer.Tile = function(opt_options) {
var _ol_layer_Tile_ = function(opt_options) {
var options = opt_options ? opt_options : {};
var baseOptions = ol.obj.assign({}, options);
var baseOptions = _ol_obj_.assign({}, options);
delete baseOptions.preload;
delete baseOptions.useInterimTilesOnError;
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
_ol_layer_Layer_.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
this.setPreload(options.preload !== undefined ? options.preload : 0);
this.setUseInterimTilesOnError(options.useInterimTilesOnError !== undefined ?
@@ -39,10 +39,11 @@ ol.layer.Tile = function(opt_options) {
* @protected
* @type {ol.LayerType}
*/
this.type = ol.LayerType.TILE;
this.type = _ol_LayerType_.TILE;
};
ol.inherits(ol.layer.Tile, ol.layer.Layer);
_ol_.inherits(_ol_layer_Tile_, _ol_layer_Layer_);
/**
@@ -51,8 +52,10 @@ ol.inherits(ol.layer.Tile, ol.layer.Layer);
* @observable
* @api
*/
ol.layer.Tile.prototype.getPreload = function() {
return /** @type {number} */ (this.get(ol.layer.TileProperty.PRELOAD));
_ol_layer_Tile_.prototype.getPreload = function() {
return (
/** @type {number} */ this.get(_ol_layer_TileProperty_.PRELOAD)
);
};
@@ -62,7 +65,7 @@ ol.layer.Tile.prototype.getPreload = function() {
* @return {ol.source.Tile} Source.
* @api
*/
ol.layer.Tile.prototype.getSource;
_ol_layer_Tile_.prototype.getSource;
/**
@@ -71,8 +74,8 @@ ol.layer.Tile.prototype.getSource;
* @observable
* @api
*/
ol.layer.Tile.prototype.setPreload = function(preload) {
this.set(ol.layer.TileProperty.PRELOAD, preload);
_ol_layer_Tile_.prototype.setPreload = function(preload) {
this.set(_ol_layer_TileProperty_.PRELOAD, preload);
};
@@ -82,9 +85,10 @@ ol.layer.Tile.prototype.setPreload = function(preload) {
* @observable
* @api
*/
ol.layer.Tile.prototype.getUseInterimTilesOnError = function() {
return /** @type {boolean} */ (
this.get(ol.layer.TileProperty.USE_INTERIM_TILES_ON_ERROR));
_ol_layer_Tile_.prototype.getUseInterimTilesOnError = function() {
return (
/** @type {boolean} */ this.get(_ol_layer_TileProperty_.USE_INTERIM_TILES_ON_ERROR)
);
};
@@ -94,7 +98,8 @@ ol.layer.Tile.prototype.getUseInterimTilesOnError = function() {
* @observable
* @api
*/
ol.layer.Tile.prototype.setUseInterimTilesOnError = function(useInterimTilesOnError) {
_ol_layer_Tile_.prototype.setUseInterimTilesOnError = function(useInterimTilesOnError) {
this.set(
ol.layer.TileProperty.USE_INTERIM_TILES_ON_ERROR, useInterimTilesOnError);
_ol_layer_TileProperty_.USE_INTERIM_TILES_ON_ERROR, useInterimTilesOnError);
};
export default _ol_layer_Tile_;
src/ol/layer/TileProperty.js
+6 -3
View File
@@ -1,9 +1,12 @@
goog.provide('ol.layer.TileProperty');
/**
* @module ol/layer/TileProperty
*/
/**
* @enum {string}
*/
ol.layer.TileProperty = {
var _ol_layer_TileProperty_ = {
PRELOAD: 'preload',
USE_INTERIM_TILES_ON_ERROR: 'useInterimTilesOnError'
};
export default _ol_layer_TileProperty_;
src/ol/layer/Vector.js
+36 -33
View File
@@ -1,12 +1,12 @@
goog.provide('ol.layer.Vector');
goog.require('ol');
goog.require('ol.LayerType');
goog.require('ol.layer.Layer');
goog.require('ol.layer.VectorRenderType');
goog.require('ol.obj');
goog.require('ol.style.Style');
/**
* @module ol/layer/Vector
*/
import _ol_ from '../index.js';
import _ol_LayerType_ from '../LayerType.js';
import _ol_layer_Layer_ from '../layer/Layer.js';
import _ol_layer_VectorRenderType_ from '../layer/VectorRenderType.js';
import _ol_obj_ from '../obj.js';
import _ol_style_Style_ from '../style/Style.js';
/**
* @classdesc
@@ -21,17 +21,17 @@ goog.require('ol.style.Style');
* @param {olx.layer.VectorOptions=} opt_options Options.
* @api
*/
ol.layer.Vector = function(opt_options) {
var _ol_layer_Vector_ = function(opt_options) {
var options = opt_options ?
opt_options : /** @type {olx.layer.VectorOptions} */ ({});
var baseOptions = ol.obj.assign({}, options);
var baseOptions = _ol_obj_.assign({}, options);
delete baseOptions.style;
delete baseOptions.renderBuffer;
delete baseOptions.updateWhileAnimating;
delete baseOptions.updateWhileInteracting;
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
_ol_layer_Layer_.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
/**
* @private
@@ -80,23 +80,24 @@ ol.layer.Vector = function(opt_options) {
* @private
* @type {ol.layer.VectorTileRenderType|string}
*/
this.renderMode_ = options.renderMode || ol.layer.VectorRenderType.VECTOR;
this.renderMode_ = options.renderMode || _ol_layer_VectorRenderType_.VECTOR;
/**
* The layer type.
* @protected
* @type {ol.LayerType}
*/
this.type = ol.LayerType.VECTOR;
this.type = _ol_LayerType_.VECTOR;
};
ol.inherits(ol.layer.Vector, ol.layer.Layer);
_ol_.inherits(_ol_layer_Vector_, _ol_layer_Layer_);
/**
* @return {boolean} Declutter.
*/
ol.layer.Vector.prototype.getDeclutter = function() {
_ol_layer_Vector_.prototype.getDeclutter = function() {
return this.declutter_;
};
@@ -104,7 +105,7 @@ ol.layer.Vector.prototype.getDeclutter = function() {
/**
* @param {boolean} declutter Declutter.
*/
ol.layer.Vector.prototype.setDeclutter = function(declutter) {
_ol_layer_Vector_.prototype.setDeclutter = function(declutter) {
this.declutter_ = declutter;
};
@@ -112,7 +113,7 @@ ol.layer.Vector.prototype.setDeclutter = function(declutter) {
/**
* @return {number|undefined} Render buffer.
*/
ol.layer.Vector.prototype.getRenderBuffer = function() {
_ol_layer_Vector_.prototype.getRenderBuffer = function() {
return this.renderBuffer_;
};
@@ -121,9 +122,10 @@ ol.layer.Vector.prototype.getRenderBuffer = function() {
* @return {function(ol.Feature, ol.Feature): number|null|undefined} Render
* order.
*/
ol.layer.Vector.prototype.getRenderOrder = function() {
return /** @type {ol.RenderOrderFunction|null|undefined} */ (
this.get(ol.layer.Vector.Property_.RENDER_ORDER));
_ol_layer_Vector_.prototype.getRenderOrder = function() {
return (
/** @type {ol.RenderOrderFunction|null|undefined} */ this.get(_ol_layer_Vector_.Property_.RENDER_ORDER)
);
};
@@ -133,7 +135,7 @@ ol.layer.Vector.prototype.getRenderOrder = function() {
* @return {ol.source.Vector} Source.
* @api
*/
ol.layer.Vector.prototype.getSource;
_ol_layer_Vector_.prototype.getSource;
/**
@@ -143,7 +145,7 @@ ol.layer.Vector.prototype.getSource;
* Layer style.
* @api
*/
ol.layer.Vector.prototype.getStyle = function() {
_ol_layer_Vector_.prototype.getStyle = function() {
return this.style_;
};
@@ -153,7 +155,7 @@ ol.layer.Vector.prototype.getStyle = function() {
* @return {ol.StyleFunction|undefined} Layer style function.
* @api
*/
ol.layer.Vector.prototype.getStyleFunction = function() {
_ol_layer_Vector_.prototype.getStyleFunction = function() {
return this.styleFunction_;
};
@@ -162,7 +164,7 @@ ol.layer.Vector.prototype.getStyleFunction = function() {
* @return {boolean} Whether the rendered layer should be updated while
* animating.
*/
ol.layer.Vector.prototype.getUpdateWhileAnimating = function() {
_ol_layer_Vector_.prototype.getUpdateWhileAnimating = function() {
return this.updateWhileAnimating_;
};
@@ -171,7 +173,7 @@ ol.layer.Vector.prototype.getUpdateWhileAnimating = function() {
* @return {boolean} Whether the rendered layer should be updated while
* interacting.
*/
ol.layer.Vector.prototype.getUpdateWhileInteracting = function() {
_ol_layer_Vector_.prototype.getUpdateWhileInteracting = function() {
return this.updateWhileInteracting_;
};
@@ -180,8 +182,8 @@ ol.layer.Vector.prototype.getUpdateWhileInteracting = function() {
* @param {ol.RenderOrderFunction|null|undefined} renderOrder
* Render order.
*/
ol.layer.Vector.prototype.setRenderOrder = function(renderOrder) {
this.set(ol.layer.Vector.Property_.RENDER_ORDER, renderOrder);
_ol_layer_Vector_.prototype.setRenderOrder = function(renderOrder) {
this.set(_ol_layer_Vector_.Property_.RENDER_ORDER, renderOrder);
};
@@ -196,10 +198,10 @@ ol.layer.Vector.prototype.setRenderOrder = function(renderOrder) {
* style Layer style.
* @api
*/
ol.layer.Vector.prototype.setStyle = function(style) {
this.style_ = style !== undefined ? style : ol.style.Style.defaultFunction;
_ol_layer_Vector_.prototype.setStyle = function(style) {
this.style_ = style !== undefined ? style : _ol_style_Style_.defaultFunction;
this.styleFunction_ = style === null ?
undefined : ol.style.Style.createFunction(this.style_);
undefined : _ol_style_Style_.createFunction(this.style_);
this.changed();
};
@@ -207,7 +209,7 @@ ol.layer.Vector.prototype.setStyle = function(style) {
/**
* @return {ol.layer.VectorRenderType|string} The render mode.
*/
ol.layer.Vector.prototype.getRenderMode = function() {
_ol_layer_Vector_.prototype.getRenderMode = function() {
return this.renderMode_;
};
@@ -216,6 +218,7 @@ ol.layer.Vector.prototype.getRenderMode = function() {
* @enum {string}
* @private
*/
ol.layer.Vector.Property_ = {
_ol_layer_Vector_.Property_ = {
RENDER_ORDER: 'renderOrder'
};
export default _ol_layer_Vector_;
src/ol/layer/VectorRenderType.js
+6 -3
View File
@@ -1,5 +1,6 @@
goog.provide('ol.layer.VectorRenderType');
/**
* @module ol/layer/VectorRenderType
*/
/**
* @enum {string}
* Render mode for vector layers:
@@ -10,7 +11,9 @@ goog.provide('ol.layer.VectorRenderType');
* even during animations, but slower performance.
* @api
*/
ol.layer.VectorRenderType = {
var _ol_layer_VectorRenderType_ = {
IMAGE: 'image',
VECTOR: 'vector'
};
export default _ol_layer_VectorRenderType_;
src/ol/layer/VectorTile.js
+37 -32
View File
@@ -1,13 +1,13 @@
goog.provide('ol.layer.VectorTile');
goog.require('ol');
goog.require('ol.LayerType');
goog.require('ol.asserts');
goog.require('ol.layer.TileProperty');
goog.require('ol.layer.Vector');
goog.require('ol.layer.VectorTileRenderType');
goog.require('ol.obj');
/**
* @module ol/layer/VectorTile
*/
import _ol_ from '../index.js';
import _ol_LayerType_ from '../LayerType.js';
import _ol_asserts_ from '../asserts.js';
import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
import _ol_layer_Vector_ from '../layer/Vector.js';
import _ol_layer_VectorTileRenderType_ from '../layer/VectorTileRenderType.js';
import _ol_obj_ from '../obj.js';
/**
* @classdesc
@@ -21,25 +21,25 @@ goog.require('ol.obj');
* @param {olx.layer.VectorTileOptions=} opt_options Options.
* @api
*/
ol.layer.VectorTile = function(opt_options) {
var _ol_layer_VectorTile_ = function(opt_options) {
var options = opt_options ? opt_options : {};
var renderMode = options.renderMode || ol.layer.VectorTileRenderType.HYBRID;
ol.asserts.assert(renderMode == undefined ||
renderMode == ol.layer.VectorTileRenderType.IMAGE ||
renderMode == ol.layer.VectorTileRenderType.HYBRID ||
renderMode == ol.layer.VectorTileRenderType.VECTOR,
var renderMode = options.renderMode || _ol_layer_VectorTileRenderType_.HYBRID;
_ol_asserts_.assert(renderMode == undefined ||
renderMode == _ol_layer_VectorTileRenderType_.IMAGE ||
renderMode == _ol_layer_VectorTileRenderType_.HYBRID ||
renderMode == _ol_layer_VectorTileRenderType_.VECTOR,
28); // `renderMode` must be `'image'`, `'hybrid'` or `'vector'`
if (options.declutter && renderMode == ol.layer.VectorTileRenderType.IMAGE) {
renderMode = ol.layer.VectorTileRenderType.HYBRID;
if (options.declutter && renderMode == _ol_layer_VectorTileRenderType_.IMAGE) {
renderMode = _ol_layer_VectorTileRenderType_.HYBRID;
}
options.renderMode = renderMode;
var baseOptions = ol.obj.assign({}, options);
var baseOptions = _ol_obj_.assign({}, options);
delete baseOptions.preload;
delete baseOptions.useInterimTilesOnError;
ol.layer.Vector.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
_ol_layer_Vector_.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
this.setPreload(options.preload ? options.preload : 0);
this.setUseInterimTilesOnError(options.useInterimTilesOnError ?
@@ -50,10 +50,11 @@ ol.layer.VectorTile = function(opt_options) {
* @protected
* @type {ol.LayerType}
*/
this.type = ol.LayerType.VECTOR_TILE;
this.type = _ol_LayerType_.VECTOR_TILE;
};
ol.inherits(ol.layer.VectorTile, ol.layer.Vector);
_ol_.inherits(_ol_layer_VectorTile_, _ol_layer_Vector_);
/**
@@ -62,8 +63,10 @@ ol.inherits(ol.layer.VectorTile, ol.layer.Vector);
* @observable
* @api
*/
ol.layer.VectorTile.prototype.getPreload = function() {
return /** @type {number} */ (this.get(ol.layer.TileProperty.PRELOAD));
_ol_layer_VectorTile_.prototype.getPreload = function() {
return (
/** @type {number} */ this.get(_ol_layer_TileProperty_.PRELOAD)
);
};
@@ -73,9 +76,10 @@ ol.layer.VectorTile.prototype.getPreload = function() {
* @observable
* @api
*/
ol.layer.VectorTile.prototype.getUseInterimTilesOnError = function() {
return /** @type {boolean} */ (
this.get(ol.layer.TileProperty.USE_INTERIM_TILES_ON_ERROR));
_ol_layer_VectorTile_.prototype.getUseInterimTilesOnError = function() {
return (
/** @type {boolean} */ this.get(_ol_layer_TileProperty_.USE_INTERIM_TILES_ON_ERROR)
);
};
@@ -85,8 +89,8 @@ ol.layer.VectorTile.prototype.getUseInterimTilesOnError = function() {
* @observable
* @api
*/
ol.layer.VectorTile.prototype.setPreload = function(preload) {
this.set(ol.layer.TileProperty.PRELOAD, preload);
_ol_layer_VectorTile_.prototype.setPreload = function(preload) {
this.set(_ol_layer_TileProperty_.PRELOAD, preload);
};
@@ -96,9 +100,9 @@ ol.layer.VectorTile.prototype.setPreload = function(preload) {
* @observable
* @api
*/
ol.layer.VectorTile.prototype.setUseInterimTilesOnError = function(useInterimTilesOnError) {
_ol_layer_VectorTile_.prototype.setUseInterimTilesOnError = function(useInterimTilesOnError) {
this.set(
ol.layer.TileProperty.USE_INTERIM_TILES_ON_ERROR, useInterimTilesOnError);
_ol_layer_TileProperty_.USE_INTERIM_TILES_ON_ERROR, useInterimTilesOnError);
};
@@ -108,4 +112,5 @@ ol.layer.VectorTile.prototype.setUseInterimTilesOnError = function(useInterimTil
* @return {ol.source.VectorTile} Source.
* @api
*/
ol.layer.VectorTile.prototype.getSource;
_ol_layer_VectorTile_.prototype.getSource;
export default _ol_layer_VectorTile_;
src/ol/layer/VectorTileRenderType.js
+6 -3
View File
@@ -1,5 +1,6 @@
goog.provide('ol.layer.VectorTileRenderType');
/**
* @module ol/layer/VectorTileRenderType
*/
/**
* @enum {string}
* Render mode for vector tiles:
@@ -13,8 +14,10 @@ goog.provide('ol.layer.VectorTileRenderType');
* even during animations, but slower performance than the other options.
* @api
*/
ol.layer.VectorTileRenderType = {
var _ol_layer_VectorTileRenderType_ = {
IMAGE: 'image',
HYBRID: 'hybrid',
VECTOR: 'vector'
};
export default _ol_layer_VectorTileRenderType_;