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

Merge remote-tracking branch 'upstream/master' into vector-api

Browse Source 
Conflicts:
	src/objectliterals.jsdoc
	src/ol/attribution.js
	src/ol/geom/geometry.js
	src/ol/geom/geometrycollection.js
	src/ol/geom/linestring.js
	src/ol/layer/vectorlayer.exports
	src/ol/layer/vectorlayer.js
	src/ol/map.js
	src/ol/proj/proj.js
	src/ol/renderer/canvas/canvasvectorlayerrenderer.js
	src/ol/source/imagewmssource.js
	src/ol/source/tilewmssource.js
	src/ol/source/vectorsource.exports
	src/ol/source/vectorsource.js
	src/ol/source/wmssource.js
	src/ol/style/style.js
	src/ol/tilegrid/tilegrid.js
	src/ol/tilegrid/wmtstilegrid.js
	src/ol/tilegrid/xyztilegrid.js
This commit is contained in:
Éric Lemoine
2013-12-13 12:46:55 +01:00
parent cbc71686df 93e605b119
commit 35d5158454
167 changed files with 678 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/layer/imagelayer.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.layer.Image ol.layer.LayerOptions
@exportSymbol ol.layer.Image
src/ol/layer/imagelayer.js
+1 -1
View File
@@ -8,7 +8,7 @@ goog.require('ol.source.Image');
/**
* @constructor
* @extends {ol.layer.Layer}
* @param {ol.layer.LayerOptions} options Layer options.
* @param {olx.layer.LayerOptions} options Layer options.
* @todo stability experimental
*/
ol.layer.Image = function(options) {
src/ol/layer/layer.js
+2 -2
View File
@@ -12,7 +12,7 @@ goog.require('ol.source.Source');
/**
* @constructor
* @extends {ol.layer.Base}
* @param {ol.layer.LayerOptions} options Layer options.
* @param {olx.layer.LayerOptions} options Layer options.
* @todo stability experimental
* @todo observable brightness {number} the brightness of the layer
* @todo observable contrast {number} the contrast of the layer
@@ -25,7 +25,7 @@ goog.require('ol.source.Source');
*/
ol.layer.Layer = function(options) {
var baseOptions = /** @type {ol.layer.LayerOptions} */
var baseOptions = /** @type {olx.layer.LayerOptions} */
(goog.object.clone(options));
delete baseOptions.source;
src/ol/layer/layerbase.js
+1 -37
View File
@@ -43,7 +43,7 @@ ol.layer.LayerState;
/**
* @constructor
* @extends {ol.Object}
* @param {ol.layer.BaseOptions} options Layer options.
* @param {olx.layer.BaseOptions} options Layer options.
*/
ol.layer.Base = function(options) {
@@ -71,22 +71,6 @@ ol.layer.Base = function(options) {
values.minResolution : 0;
this.setValues(values);
goog.events.listen(this, [
ol.Object.getChangeEventType(ol.layer.LayerProperty.BRIGHTNESS),
ol.Object.getChangeEventType(ol.layer.LayerProperty.CONTRAST),
ol.Object.getChangeEventType(ol.layer.LayerProperty.HUE),
ol.Object.getChangeEventType(ol.layer.LayerProperty.OPACITY),
ol.Object.getChangeEventType(ol.layer.LayerProperty.SATURATION),
ol.Object.getChangeEventType(ol.layer.LayerProperty.MAX_RESOLUTION),
ol.Object.getChangeEventType(ol.layer.LayerProperty.MIN_RESOLUTION)
],
this.handleLayerChange, false, this);
goog.events.listen(this,
ol.Object.getChangeEventType(ol.layer.LayerProperty.VISIBLE),
this.handleLayerVisibleChange, false, this);
};
goog.inherits(ol.layer.Base, ol.Object);
@@ -251,26 +235,6 @@ goog.exportProperty(
ol.layer.Base.prototype.getVisible);
/**
* @protected
*/
ol.layer.Base.prototype.handleLayerChange = function() {
if (this.getVisible() && this.getSourceState() == ol.source.State.READY) {
this.dispatchChangeEvent();
}
};
/**
* @protected
*/
ol.layer.Base.prototype.handleLayerVisibleChange = function() {
if (this.getSourceState() == ol.source.State.READY) {
this.dispatchChangeEvent();
}
};
/**
* Adjust the layer brightness. A value of -1 will render the layer completely
* black. A value of 0 will leave the brightness unchanged. A value of 1 will
src/ol/layer/layergroup.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.layer.Group ol.layer.GroupOptions
@exportSymbol ol.layer.Group
src/ol/layer/layergroup.js
+6 -14
View File
@@ -26,7 +26,7 @@ ol.layer.GroupProperty = {
/**
* @constructor
* @extends {ol.layer.Base}
* @param {ol.layer.GroupOptions=} opt_options Layer options.
* @param {olx.layer.GroupOptions=} opt_options Layer options.
* @todo stability experimental
* @todo observable layers {ol.Collection} collection of layers that are part
* of this group
@@ -34,7 +34,7 @@ ol.layer.GroupProperty = {
ol.layer.Group = function(opt_options) {
var options = goog.isDef(opt_options) ? opt_options : {};
var baseOptions = /** @type {ol.layer.GroupOptions} */
var baseOptions = /** @type {olx.layer.GroupOptions} */
(goog.object.clone(options));
delete baseOptions.layers;
@@ -70,23 +70,15 @@ goog.inherits(ol.layer.Group, ol.layer.Base);
/**
* @inheritDoc
* @private
*/
ol.layer.Group.prototype.handleLayerChange = function() {
ol.layer.Group.prototype.handleLayerChange_ = function() {
if (this.getVisible()) {
this.dispatchChangeEvent();
}
};
/**
* @inheritDoc
*/
ol.layer.Group.prototype.handleLayerVisibleChange = function() {
this.dispatchChangeEvent();
};
/**
* @param {goog.events.Event} event Event.
* @private
@@ -113,7 +105,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
layer = layersArray[i];
this.listenerKeys_[goog.getUid(layer).toString()] =
goog.events.listen(layer, goog.events.EventType.CHANGE,
this.handleLayerChange, false, this);
this.handleLayerChange_, false, this);
}
}
@@ -128,7 +120,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement());
this.listenerKeys_[goog.getUid(layer).toString()] = goog.events.listen(
layer, goog.events.EventType.CHANGE, this.handleLayerChange, false,
layer, goog.events.EventType.CHANGE, this.handleLayerChange_, false,
this);
this.dispatchChangeEvent();
};
src/ol/layer/tilelayer.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.layer.Tile ol.layer.TileOptions
@exportSymbol ol.layer.Tile
src/ol/layer/tilelayer.js
+1 -1
View File
@@ -16,7 +16,7 @@ ol.layer.TileProperty = {
/**
* @constructor
* @extends {ol.layer.Layer}
* @param {ol.layer.TileOptions} options Tile layer options.
* @param {olx.layer.TileOptions} options Tile layer options.
* @todo stability experimental
* @todo observable preload {number} the level to preload tiles up to
*/
src/ol/layer/vectorlayer.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.layer.Vector ol.layer.VectorOptions
@exportSymbol ol.layer.Vector
src/ol/layer/vectorlayer.js
+3 -3
View File
@@ -17,14 +17,14 @@ ol.layer.VectorProperty = {
/**
* @constructor
* @extends {ol.layer.Layer}
* @param {ol.layer.VectorOptions=} opt_options Options.
* @param {olx.layer.VectorOptions=} opt_options Options.
*/
ol.layer.Vector = function(opt_options) {
var options = goog.isDef(opt_options) ?
opt_options : /** @type {ol.layer.VectorOptions} */ ({});
opt_options : /** @type {olx.layer.VectorOptions} */ ({});
goog.base(this, /** @type {ol.layer.LayerOptions} */ (options));
goog.base(this, /** @type {olx.layer.LayerOptions} */ (options));
// FIXME veryify this
if (goog.isDef(options.styleFunction)) {