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

Replace goog.getUid with ol.getUid

Browse Source
This commit is contained in:
Peter Robins
2016-07-20 10:50:16 +00:00
parent 29230d48b3
commit f8f2cd11d5
40 changed files with 104 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/render/canvas/canvasreplay.js
View File

@@ -265,7 +265,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
case ol.render.canvas.Instruction.BEGIN_GEOMETRY:
feature = /** @type {ol.Feature|ol.render.Feature} */ (instruction[1]);
if ((skipFeatures &&
skippedFeaturesHash[goog.getUid(feature).toString()]) ||
skippedFeaturesHash[ol.getUid(feature).toString()]) ||
!feature.getGeometry()) {
i = /** @type {number} */ (instruction[2]);
} else if (opt_hitExtent !== undefined && !ol.extent.intersects(

2
src/ol/render/vector.js
View File

@@ -13,7 +13,7 @@ goog.require('ol.style.Style');
* @return {number} Order.
*/
ol.renderer.vector.defaultOrder = function(feature1, feature2) {
return goog.getUid(feature1) - goog.getUid(feature2);
return ol.getUid(feature1) - ol.getUid(feature2);
};

10
src/ol/render/webgl/webglreplay.js
View File

@@ -471,7 +471,7 @@ ol.render.webgl.ImageReplay.prototype.createTextures_ = function(textures, image
for (i = 0; i < ii; ++i) {
image = images[i];
uid = goog.getUid(image).toString();
uid = ol.getUid(image).toString();
if (uid in texturePerImage) {
texture = texturePerImage[uid];
} else {
@@ -677,7 +677,7 @@ ol.render.webgl.ImageReplay.prototype.drawReplaySkipping_ = function(gl, skipped
this.startIndices_[featureIndex] <= groupEnd) {
var feature = this.startIndicesFeature_[featureIndex];
var featureUid = goog.getUid(feature).toString();
var featureUid = ol.getUid(feature).toString();
if (skippedFeaturesHash[featureUid] !== undefined) {
// feature should be skipped
if (start !== end) {
@@ -805,7 +805,7 @@ ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayOneByOne_ = function
this.startIndices_[featureIndex] >= groupStart) {
start = this.startIndices_[featureIndex];
feature = this.startIndicesFeature_[featureIndex];
featureUid = goog.getUid(feature).toString();
featureUid = ol.getUid(feature).toString();
if (skippedFeaturesHash[featureUid] === undefined &&
feature.getGeometry() &&
@@ -872,7 +872,7 @@ ol.render.webgl.ImageReplay.prototype.setImageStyle = function(imageStyle) {
this.images_.push(image);
} else {
currentImage = this.images_[this.images_.length - 1];
if (goog.getUid(currentImage) != goog.getUid(image)) {
if (ol.getUid(currentImage) != ol.getUid(image)) {
this.groupIndices_.push(this.indices_.length);
goog.asserts.assert(this.groupIndices_.length === this.images_.length,
'number of groupIndices and images match');
@@ -885,7 +885,7 @@ ol.render.webgl.ImageReplay.prototype.setImageStyle = function(imageStyle) {
} else {
currentImage =
this.hitDetectionImages_[this.hitDetectionImages_.length - 1];
if (goog.getUid(currentImage) != goog.getUid(hitDetectionImage)) {
if (ol.getUid(currentImage) != ol.getUid(hitDetectionImage)) {
this.hitDetectionGroupIndices_.push(this.indices_.length);
goog.asserts.assert(this.hitDetectionGroupIndices_.length ===
this.hitDetectionImages_.length,