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

Backport types

Browse Source
This commit is contained in:
ahocevar
2018-03-18 23:20:32 +01:00
parent 2912a5d7a7
commit 98d0fc05c8
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/canvas/replaygroup.js
+5 -5
View File
@@ -334,7 +334,7 @@ ol.render.canvas.ReplayGroup.prototype.forEachFeatureAtCoordinate = function(
if (mask[i][j]) { if (mask[i][j]) {
if (imageData[(j * contextSize + i) * 4 + 3] > 0) { if (imageData[(j * contextSize + i) * 4 + 3] > 0) {
var result; var result;
if (!(declutteredFeatures && (replayType == ReplayType.IMAGE || replayType == ReplayType.TEXT)) || if (!(declutteredFeatures && (replayType == ol.render.ReplayType.IMAGE || replayType == ol.render.ReplayType.TEXT)) ||
declutteredFeatures.indexOf(feature) !== -1) { declutteredFeatures.indexOf(feature) !== -1) {
result = callback(feature); result = callback(feature);
} }
@@ -352,18 +352,18 @@ ol.render.canvas.ReplayGroup.prototype.forEachFeatureAtCoordinate = function(
/** @type {Array.<number>} */ /** @type {Array.<number>} */
var zs = Object.keys(this.replaysByZIndex_).map(Number); var zs = Object.keys(this.replaysByZIndex_).map(Number);
zs.sort(numberSafeCompareFunction); zs.sort(ol.array.numberSafeCompareFunction);
var i, j, replays, replay, result; var i, j, replays, replay, result;
for (i = zs.length - 1; i >= 0; --i) { for (i = zs.length - 1; i >= 0; --i) {
var zIndexKey = zs[i].toString(); var zIndexKey = zs[i].toString();
replays = this.replaysByZIndex_[zIndexKey]; replays = this.replaysByZIndex_[zIndexKey];
for (j = _ol_render_replay_.ORDER.length - 1; j >= 0; --j) { for (j = ol.render.replay.ORDER.length - 1; j >= 0; --j) {
replayType = _ol_render_replay_.ORDER[j]; replayType = ol.render.replay.ORDER[j];
replay = replays[replayType]; replay = replays[replayType];
if (replay !== undefined) { if (replay !== undefined) {
if (declutterReplays && if (declutterReplays &&
(replayType == ReplayType.IMAGE || replayType == ReplayType.TEXT)) { (replayType == ol.render.ReplayType.IMAGE || replayType == ol.render.ReplayType.TEXT)) {
var declutter = declutterReplays[zIndexKey]; var declutter = declutterReplays[zIndexKey];
if (!declutter) { if (!declutter) {
declutterReplays[zIndexKey] = [replay, transform.slice(0)]; declutterReplays[zIndexKey] = [replay, transform.slice(0)];
test/spec/ol/map.test.js
+4 -4
View File
@@ -197,8 +197,8 @@ describe('ol.Map', function() {
document.body.appendChild(target); document.body.appendChild(target);
map = new ol.Map({ map = new ol.Map({
target: target, target: target,
layers: [new ol.layer.Vector_({ layers: [new ol.layer.Vector({
source: new ol.source.Vector_({ source: new ol.source.Vector({
features: [new ol.Feature(new ol.geom.LineString([[-50, 0], [50, 0]]))] features: [new ol.Feature(new ol.geom.LineString([[-50, 0], [50, 0]]))]
}) })
})], })],
@@ -227,7 +227,7 @@ describe('ol.Map', function() {
it('returns an array of found features with declutter: true', function() { it('returns an array of found features with declutter: true', function() {
var layer = map.getLayers().item(0); var layer = map.getLayers().item(0);
map.removeLayer(layer); map.removeLayer(layer);
var otherLayer = new _ol_layer_Vector_({ var otherLayer = new ol.layer.Vector({
declutter: true, declutter: true,
source: layer.getSource() source: layer.getSource()
}); });
@@ -235,7 +235,7 @@ describe('ol.Map', function() {
map.renderSync(); map.renderSync();
var features = map.getFeaturesAtPixel([50, 50]); var features = map.getFeaturesAtPixel([50, 50]);
expect(features).to.be.an(Array); expect(features).to.be.an(Array);
expect(features[0]).to.be.an(_ol_Feature_); expect(features[0]).to.be.an(ol.Feature);
}); });
it('respects options', function() { it('respects options', function() {