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
test/spec/ol/layer/layer.test.js
View File

@@ -398,7 +398,7 @@ describe('ol.layer.Layer', function() {
expect(frameState.layerStatesArray.length).to.be(1);
var layerState = frameState.layerStatesArray[0];
expect(layerState.layer).to.equal(layer);
expect(frameState.layerStates[goog.getUid(layer)]).to.equal(layerState);
expect(frameState.layerStates[ol.getUid(layer)]).to.equal(layerState);
});
});

2
test/spec/ol/layer/layergroup.test.js
View File

@@ -284,7 +284,7 @@ describe('ol.layer.Group', function() {
layers.push(layer);
expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(1);
var listeners = layerGroup.listenerKeys_[goog.getUid(layer)];
var listeners = layerGroup.listenerKeys_[ol.getUid(layer)];
expect(listeners.length).to.eql(2);
expect(typeof listeners[0]).to.be('object');
expect(typeof listeners[1]).to.be('object');

2
test/spec/ol/net.test.js
View File

@@ -17,7 +17,7 @@ describe('ol.net', function() {
expect(removeChild.called).to.be(true);
done();
};
key = 'olc_' + goog.getUid(callback);
key = 'olc_' + ol.getUid(callback);
return callback;
}

2
test/spec/ol/renderer/canvas/canvasmaprenderer.test.js
View File

@@ -121,7 +121,7 @@ describe('ol.renderer.canvas.Map', function() {
layerRenderer.getImage = function() {
return null;
};
renderer.layerRenderers_[goog.getUid(layer)] = layerRenderer;
renderer.layerRenderers_[ol.getUid(layer)] = layerRenderer;
});
});

2
test/spec/ol/renderer/canvas/canvasvectorlayerrenderer.test.js
View File

@@ -83,7 +83,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
rotation: 0
}
};
frameState.layerStates[goog.getUid(layer)] = {};
frameState.layerStates[ol.getUid(layer)] = {};
renderer.forEachFeatureAtCoordinate(
coordinate, frameState, spy, undefined);
expect(spy.callCount).to.be(1);

2
test/spec/ol/renderer/canvas/canvasvectortilelayerrenderer.test.js
View File

@@ -170,7 +170,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
rotation: 0
}
};
frameState.layerStates[goog.getUid(layer)] = {};
frameState.layerStates[ol.getUid(layer)] = {};
renderer.renderedTiles = [new TileClass([0, 0, -1])];
renderer.forEachFeatureAtCoordinate(
coordinate, frameState, spy, undefined);

2
test/spec/ol/style/iconstyle.test.js
View File

@@ -18,7 +18,7 @@ describe('ol.style.Icon', function() {
imgSize: size
});
expect(ol.style.IconImage_.get(
canvas, goog.getUid(canvas), size, '').getImage()).to.eql(canvas);
canvas, ol.getUid(canvas), size, '').getImage()).to.eql(canvas);
});
it('imgSize overrides img.width and img.height', function(done) {