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

Move Layer into ol.layer namespace.

Browse Source
This commit is contained in:
Tim Schaub
2012-09-24 17:08:36 +02:00
parent 57d75ace5d
commit 1f9e2aa3c4
10 changed files with 267 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/renderer/dom/layer.js
View File

@@ -9,7 +9,7 @@ goog.require('ol.renderer.Layer');
* @constructor
* @extends {ol.renderer.Layer}
* @param {ol.renderer.Map} mapRenderer Map renderer.
* @param {ol.Layer} layer Layer.
* @param {ol.layer.Layer} layer Layer.
* @param {!Element} target Target.
*/
ol.renderer.dom.Layer = function(mapRenderer, layer, target) {

22
src/ol/renderer/layer.js
View File

@@ -2,8 +2,8 @@ goog.provide('ol.renderer.Layer');
goog.require('goog.events');
goog.require('goog.events.EventType');
goog.require('ol.Layer');
goog.require('ol.LayerProperty');
goog.require('ol.layer.Layer');
goog.require('ol.layer.LayerProperty');
goog.require('ol.Object');
@@ -12,7 +12,7 @@ goog.require('ol.Object');
* @constructor
* @extends {ol.Object}
* @param {ol.renderer.Map} mapRenderer Map renderer.
* @param {ol.Layer} layer Layer.
* @param {ol.layer.Layer} layer Layer.
*/
ol.renderer.Layer = function(mapRenderer, layer) {
@@ -26,35 +26,35 @@ ol.renderer.Layer = function(mapRenderer, layer) {
/**
* @private
* @type {ol.Layer}
* @type {ol.layer.Layer}
*/
this.layer_ = layer;
goog.events.listen(this.layer_,
ol.Object.getChangedEventType(ol.LayerProperty.BRIGHTNESS),
ol.Object.getChangedEventType(ol.layer.LayerProperty.BRIGHTNESS),
this.handleLayerBrightnessChange, false, this);
goog.events.listen(this.layer_,
ol.Object.getChangedEventType(ol.LayerProperty.CONTRAST),
ol.Object.getChangedEventType(ol.layer.LayerProperty.CONTRAST),
this.handleLayerContrastChange, false, this);
goog.events.listen(this.layer_,
ol.Object.getChangedEventType(ol.LayerProperty.HUE),
ol.Object.getChangedEventType(ol.layer.LayerProperty.HUE),
this.handleLayerHueChange, false, this);
goog.events.listen(this.layer_, goog.events.EventType.LOAD,
this.handleLayerLoad, false, this);
goog.events.listen(this.layer_,
ol.Object.getChangedEventType(ol.LayerProperty.OPACITY),
ol.Object.getChangedEventType(ol.layer.LayerProperty.OPACITY),
this.handleLayerOpacityChange, false, this);
goog.events.listen(this.layer_,
ol.Object.getChangedEventType(ol.LayerProperty.SATURATION),
ol.Object.getChangedEventType(ol.layer.LayerProperty.SATURATION),
this.handleLayerSaturationChange, false, this);
goog.events.listen(this.layer_,
ol.Object.getChangedEventType(ol.LayerProperty.VISIBLE),
ol.Object.getChangedEventType(ol.layer.LayerProperty.VISIBLE),
this.handleLayerVisibleChange, false, this);
};
@@ -62,7 +62,7 @@ goog.inherits(ol.renderer.Layer, ol.Object);
/**
* @return {ol.Layer} Layer.
* @return {ol.layer.Layer} Layer.
*/
ol.renderer.Layer.prototype.getLayer = function() {
return this.layer_;

18
src/ol/renderer/map.js
View File

@@ -97,7 +97,7 @@ goog.inherits(ol.renderer.Map, goog.Disposable);
/**
* @param {ol.Layer} layer Layer.
* @param {ol.layer.Layer} layer Layer.
* @protected
*/
ol.renderer.Map.prototype.addLayer = function(layer) {
@@ -113,7 +113,7 @@ ol.renderer.Map.prototype.canRotate = goog.functions.FALSE;
/**
* @param {ol.Layer} layer Layer.
* @param {ol.layer.Layer} layer Layer.
* @protected
* @return {ol.renderer.Layer} layerRenderer Layer renderer.
*/
@@ -136,7 +136,7 @@ ol.renderer.Map.prototype.disposeInternal = function() {
/**
* @param {function(this: T, ol.Layer, ol.renderer.Layer, number)} f Function.
* @param {function(this: T, ol.layer.Layer, ol.renderer.Layer, number)} f Function.
* @param {T=} opt_obj Object.
* @template T
*/
@@ -164,7 +164,7 @@ ol.renderer.Map.prototype.getCoordinateFromPixel = function(pixel) {
/**
* @param {ol.Layer} layer Layer.
* @param {ol.layer.Layer} layer Layer.
* @protected
* @return {ol.renderer.Layer} Layer renderer.
*/
@@ -215,7 +215,7 @@ ol.renderer.Map.prototype.handleCenterChanged = function() {
* @protected
*/
ol.renderer.Map.prototype.handleLayersAdd = function(collectionEvent) {
var layer = /** @type {ol.Layer} */ collectionEvent.elem;
var layer = /** @type {ol.layer.Layer} */ collectionEvent.elem;
this.addLayer(layer);
};
@@ -251,7 +251,7 @@ ol.renderer.Map.prototype.handleLayersChanged = function() {
* @protected
*/
ol.renderer.Map.prototype.handleLayersRemove = function(collectionEvent) {
var layer = /** @type {ol.Layer} */ collectionEvent.elem;
var layer = /** @type {ol.layer.Layer} */ collectionEvent.elem;
this.removeLayer(layer);
};
@@ -281,7 +281,7 @@ ol.renderer.Map.prototype.handleSizeChanged = function() {
/**
* @param {ol.Layer} layer Layer.
* @param {ol.layer.Layer} layer Layer.
* @protected
*/
ol.renderer.Map.prototype.removeLayer = function(layer) {
@@ -290,7 +290,7 @@ ol.renderer.Map.prototype.removeLayer = function(layer) {
/**
* @param {ol.Layer} layer Layer.
* @param {ol.layer.Layer} layer Layer.
* @return {ol.renderer.Layer} Layer renderer.
* @protected
*/
@@ -321,7 +321,7 @@ ol.renderer.Map.prototype.render = function() {
/**
* @param {ol.Layer} layer Layer.
* @param {ol.layer.Layer} layer Layer.
* @param {ol.renderer.Layer} layerRenderer Layer renderer.
* @protected
*/

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

@@ -1,7 +1,7 @@
goog.provide('ol.renderer.webgl.Layer');
goog.require('goog.vec.Mat4');
goog.require('ol.Layer');
goog.require('ol.layer.Layer');
goog.require('ol.renderer.Layer');
@@ -10,7 +10,7 @@ goog.require('ol.renderer.Layer');
* @constructor
* @extends {ol.renderer.Layer}
* @param {ol.renderer.Map} mapRenderer Map renderer.
* @param {ol.Layer} layer Layer.
* @param {ol.layer.Layer} layer Layer.
*/
ol.renderer.webgl.Layer = function(mapRenderer, layer) {
goog.base(this, mapRenderer, layer);

2
src/ol/renderer/webgl/map.js
View File

@@ -17,7 +17,7 @@ goog.require('goog.events.EventType');
goog.require('goog.functions');
goog.require('goog.style');
goog.require('goog.webgl');
goog.require('ol.Layer');
goog.require('ol.layer.Layer');
goog.require('ol.Map');
goog.require('ol.TileLayer');
goog.require('ol.renderer.webgl.FragmentShader');