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

Use ol.inherits instead of goog.inherits

Browse Source
This commit is contained in:
Frederic Junod
2016-04-07 16:26:11 +02:00
parent 072728b083
commit e289bfbb7d
166 changed files with 448 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/canvasimagelayerrenderer.js
+2 -2
View File
@@ -21,7 +21,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.canvas.ImageLayer = function(imageLayer) {
goog.base(this, imageLayer);
ol.renderer.canvas.Layer.call(this, imageLayer);
/**
* @private
@@ -48,7 +48,7 @@ ol.renderer.canvas.ImageLayer = function(imageLayer) {
this.hitCanvasContext_ = null;
};
goog.inherits(ol.renderer.canvas.ImageLayer, ol.renderer.canvas.Layer);
ol.inherits(ol.renderer.canvas.ImageLayer, ol.renderer.canvas.Layer);
/**
src/ol/renderer/canvas/canvaslayerrenderer.js
+2 -2
View File
@@ -19,7 +19,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.canvas.Layer = function(layer) {
goog.base(this, layer);
ol.renderer.Layer.call(this, layer);
/**
* @private
@@ -28,7 +28,7 @@ ol.renderer.canvas.Layer = function(layer) {
this.transform_ = goog.vec.Mat4.createNumber();
};
goog.inherits(ol.renderer.canvas.Layer, ol.renderer.Layer);
ol.inherits(ol.renderer.canvas.Layer, ol.renderer.Layer);
/**
src/ol/renderer/canvas/canvasmaprenderer.js
+2 -2
View File
@@ -38,7 +38,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.canvas.Map = function(container, map) {
goog.base(this, container, map);
ol.renderer.Map.call(this, container, map);
/**
* @private
@@ -70,7 +70,7 @@ ol.renderer.canvas.Map = function(container, map) {
this.transform_ = goog.vec.Mat4.createNumber();
};
goog.inherits(ol.renderer.canvas.Map, ol.renderer.Map);
ol.inherits(ol.renderer.canvas.Map, ol.renderer.Map);
/**
src/ol/renderer/canvas/canvastilelayerrenderer.js
+2 -2
View File
@@ -23,7 +23,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.canvas.TileLayer = function(tileLayer) {
goog.base(this, tileLayer);
ol.renderer.canvas.Layer.call(this, tileLayer);
/**
* @protected
@@ -62,7 +62,7 @@ ol.renderer.canvas.TileLayer = function(tileLayer) {
this.zDirection = 0;
};
goog.inherits(ol.renderer.canvas.TileLayer, ol.renderer.canvas.Layer);
ol.inherits(ol.renderer.canvas.TileLayer, ol.renderer.canvas.Layer);
/**
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+2 -2
View File
@@ -21,7 +21,7 @@ goog.require('ol.source.Vector');
*/
ol.renderer.canvas.VectorLayer = function(vectorLayer) {
goog.base(this, vectorLayer);
ol.renderer.canvas.Layer.call(this, vectorLayer);
/**
* @private
@@ -66,7 +66,7 @@ ol.renderer.canvas.VectorLayer = function(vectorLayer) {
this.context_ = ol.dom.createCanvasContext2D();
};
goog.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer);
ol.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer);
/**
src/ol/renderer/canvas/canvasvectortilelayerrenderer.js
+3 -3
View File
@@ -47,7 +47,7 @@ ol.renderer.canvas.VECTOR_REPLAYS = {
*/
ol.renderer.canvas.VectorTileLayer = function(layer) {
goog.base(this, layer);
ol.renderer.canvas.TileLayer.call(this, layer);
/**
* @private
@@ -66,7 +66,7 @@ ol.renderer.canvas.VectorTileLayer = function(layer) {
layer.getRenderMode() == ol.layer.VectorTileRenderType.VECTOR ? 1 : 0;
};
goog.inherits(ol.renderer.canvas.VectorTileLayer, ol.renderer.canvas.TileLayer);
ol.inherits(ol.renderer.canvas.VectorTileLayer, ol.renderer.canvas.TileLayer);
/**
@@ -342,7 +342,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.handleStyleImageChange_ = function(
* @inheritDoc
*/
ol.renderer.canvas.VectorTileLayer.prototype.prepareFrame = function(frameState, layerState) {
var prepared = goog.base(this, 'prepareFrame', frameState, layerState);
var prepared = ol.renderer.canvas.TileLayer.prototype.prepareFrame.call(this, frameState, layerState);
if (prepared) {
var skippedFeatures = Object.keys(frameState.skippedFeatureUids_ || {});
for (var i = 0, ii = this.renderedTiles.length; i < ii; ++i) {