@@ -728,7 +728,7 @@ ol.render.canvas.Immediate.prototype.drawText = goog.abstractMethod;
|
|||||||
ol.render.canvas.Immediate.prototype.flush = function() {
|
ol.render.canvas.Immediate.prototype.flush = function() {
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var zs = Object.keys(this.callbacksByZIndex_).map(Number);
|
var zs = Object.keys(this.callbacksByZIndex_).map(Number);
|
||||||
goog.array.sort(zs);
|
zs.sort();
|
||||||
var i, ii, callbacks, j, jj;
|
var i, ii, callbacks, j, jj;
|
||||||
for (i = 0, ii = zs.length; i < ii; ++i) {
|
for (i = 0, ii = zs.length; i < ii; ++i) {
|
||||||
callbacks = this.callbacksByZIndex_[zs[i].toString()];
|
callbacks = this.callbacksByZIndex_[zs[i].toString()];
|
||||||
|
|||||||
@@ -1979,7 +1979,7 @@ ol.render.canvas.ReplayGroup.prototype.replay = function(
|
|||||||
|
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var zs = Object.keys(this.replaysByZIndex_).map(Number);
|
var zs = Object.keys(this.replaysByZIndex_).map(Number);
|
||||||
goog.array.sort(zs);
|
zs.sort();
|
||||||
|
|
||||||
// setup clipping so that the parts of over-simplified geometries are not
|
// setup clipping so that the parts of over-simplified geometries are not
|
||||||
// visible outside the current extent when panning
|
// visible outside the current extent when panning
|
||||||
@@ -2035,7 +2035,7 @@ ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ = function(
|
|||||||
featureCallback, opt_hitExtent) {
|
featureCallback, opt_hitExtent) {
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var zs = Object.keys(this.replaysByZIndex_).map(Number);
|
var zs = Object.keys(this.replaysByZIndex_).map(Number);
|
||||||
goog.array.sort(zs, function(a, b) { return b - a; });
|
zs.sort(function(a, b) { return b - a; });
|
||||||
|
|
||||||
var i, ii, j, replays, replay, result;
|
var i, ii, j, replays, replay, result;
|
||||||
for (i = 0, ii = zs.length; i < ii; ++i) {
|
for (i = 0, ii = zs.length; i < ii; ++i) {
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
goog.provide('ol.render.webgl.Immediate');
|
goog.provide('ol.render.webgl.Immediate');
|
||||||
goog.require('goog.array');
|
|
||||||
goog.require('ol.extent');
|
goog.require('ol.extent');
|
||||||
goog.require('ol.render.VectorContext');
|
goog.require('ol.render.VectorContext');
|
||||||
goog.require('ol.render.webgl.ImageReplay');
|
goog.require('ol.render.webgl.ImageReplay');
|
||||||
@@ -80,7 +79,7 @@ goog.inherits(ol.render.webgl.Immediate, ol.render.VectorContext);
|
|||||||
ol.render.webgl.Immediate.prototype.flush = function() {
|
ol.render.webgl.Immediate.prototype.flush = function() {
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var zs = Object.keys(this.callbacksByZIndex_).map(Number);
|
var zs = Object.keys(this.callbacksByZIndex_).map(Number);
|
||||||
goog.array.sort(zs);
|
zs.sort();
|
||||||
var i, ii, callbacks, j, jj;
|
var i, ii, callbacks, j, jj;
|
||||||
for (i = 0, ii = zs.length; i < ii; ++i) {
|
for (i = 0, ii = zs.length; i < ii; ++i) {
|
||||||
callbacks = this.callbacksByZIndex_[zs[i].toString()];
|
callbacks = this.callbacksByZIndex_[zs[i].toString()];
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
goog.provide('ol.renderer.canvas.TileLayer');
|
goog.provide('ol.renderer.canvas.TileLayer');
|
||||||
|
|
||||||
goog.require('goog.array');
|
|
||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('goog.vec.Mat4');
|
goog.require('goog.vec.Mat4');
|
||||||
goog.require('ol.Size');
|
goog.require('ol.Size');
|
||||||
@@ -365,7 +364,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
|
|||||||
|
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var zs = Object.keys(tilesToDrawByZ).map(Number);
|
var zs = Object.keys(tilesToDrawByZ).map(Number);
|
||||||
goog.array.sort(zs);
|
zs.sort();
|
||||||
var opaque = tileSource.getOpaque();
|
var opaque = tileSource.getOpaque();
|
||||||
var origin = ol.extent.getTopLeft(tileGrid.getTileCoordExtent(
|
var origin = ol.extent.getTopLeft(tileGrid.getTileCoordExtent(
|
||||||
[z, canvasTileRange.minX, canvasTileRange.maxY],
|
[z, canvasTileRange.minX, canvasTileRange.maxY],
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
goog.provide('ol.renderer.canvas.VectorLayer');
|
goog.provide('ol.renderer.canvas.VectorLayer');
|
||||||
|
|
||||||
goog.require('goog.array');
|
|
||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('goog.events');
|
goog.require('goog.events');
|
||||||
goog.require('ol.ViewHint');
|
goog.require('ol.ViewHint');
|
||||||
@@ -300,7 +299,7 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
|
|||||||
function(feature) {
|
function(feature) {
|
||||||
features.push(feature);
|
features.push(feature);
|
||||||
}, this);
|
}, this);
|
||||||
goog.array.sort(features, vectorLayerRenderOrder);
|
features.sort(vectorLayerRenderOrder);
|
||||||
features.forEach(renderFeature, this);
|
features.forEach(renderFeature, this);
|
||||||
} else {
|
} else {
|
||||||
vectorSource.forEachFeatureInExtent(extent, renderFeature, this);
|
vectorSource.forEachFeatureInExtent(extent, renderFeature, this);
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
goog.provide('ol.renderer.dom.TileLayer');
|
goog.provide('ol.renderer.dom.TileLayer');
|
||||||
|
|
||||||
goog.require('goog.array');
|
|
||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('goog.dom');
|
goog.require('goog.dom');
|
||||||
goog.require('goog.style');
|
goog.require('goog.style');
|
||||||
@@ -178,7 +177,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
|
|||||||
|
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var zs = Object.keys(tilesToDrawByZ).map(Number);
|
var zs = Object.keys(tilesToDrawByZ).map(Number);
|
||||||
goog.array.sort(zs);
|
zs.sort();
|
||||||
|
|
||||||
/** @type {Object.<number, boolean>} */
|
/** @type {Object.<number, boolean>} */
|
||||||
var newTileLayerZKeys = {};
|
var newTileLayerZKeys = {};
|
||||||
@@ -204,7 +203,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
|
|||||||
|
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var tileLayerZKeys = Object.keys(this.tileLayerZs_).map(Number);
|
var tileLayerZKeys = Object.keys(this.tileLayerZs_).map(Number);
|
||||||
goog.array.sort(tileLayerZKeys);
|
tileLayerZKeys.sort();
|
||||||
|
|
||||||
var i, ii, j, origin, resolution;
|
var i, ii, j, origin, resolution;
|
||||||
var transform = goog.vec.Mat4.createNumber();
|
var transform = goog.vec.Mat4.createNumber();
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
goog.provide('ol.renderer.dom.VectorLayer');
|
goog.provide('ol.renderer.dom.VectorLayer');
|
||||||
|
|
||||||
goog.require('goog.array');
|
|
||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('goog.events');
|
goog.require('goog.events');
|
||||||
goog.require('goog.vec.Mat4');
|
goog.require('goog.vec.Mat4');
|
||||||
@@ -308,7 +307,7 @@ ol.renderer.dom.VectorLayer.prototype.prepareFrame =
|
|||||||
function(feature) {
|
function(feature) {
|
||||||
features.push(feature);
|
features.push(feature);
|
||||||
}, this);
|
}, this);
|
||||||
goog.array.sort(features, vectorLayerRenderOrder);
|
features.sort(vectorLayerRenderOrder);
|
||||||
features.forEach(renderFeature, this);
|
features.forEach(renderFeature, this);
|
||||||
} else {
|
} else {
|
||||||
vectorSource.forEachFeatureInExtent(extent, renderFeature, this);
|
vectorSource.forEachFeatureInExtent(extent, renderFeature, this);
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
goog.provide('ol.renderer.webgl.TileLayer');
|
goog.provide('ol.renderer.webgl.TileLayer');
|
||||||
|
|
||||||
goog.require('goog.array');
|
|
||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('goog.vec.Mat4');
|
goog.require('goog.vec.Mat4');
|
||||||
goog.require('goog.vec.Vec4');
|
goog.require('goog.vec.Vec4');
|
||||||
@@ -297,7 +296,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
|
|||||||
|
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var zs = Object.keys(tilesToDrawByZ).map(Number);
|
var zs = Object.keys(tilesToDrawByZ).map(Number);
|
||||||
goog.array.sort(zs);
|
zs.sort();
|
||||||
var u_tileOffset = goog.vec.Vec4.createFloat32();
|
var u_tileOffset = goog.vec.Vec4.createFloat32();
|
||||||
var i, ii, sx, sy, tileKey, tilesToDraw, tx, ty;
|
var i, ii, sx, sy, tileKey, tilesToDraw, tx, ty;
|
||||||
for (i = 0, ii = zs.length; i < ii; ++i) {
|
for (i = 0, ii = zs.length; i < ii; ++i) {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
goog.provide('ol.renderer.webgl.VectorLayer');
|
goog.provide('ol.renderer.webgl.VectorLayer');
|
||||||
|
|
||||||
goog.require('goog.array');
|
|
||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('goog.events');
|
goog.require('goog.events');
|
||||||
goog.require('ol.ViewHint');
|
goog.require('ol.ViewHint');
|
||||||
@@ -276,7 +275,7 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame =
|
|||||||
function(feature) {
|
function(feature) {
|
||||||
features.push(feature);
|
features.push(feature);
|
||||||
}, this);
|
}, this);
|
||||||
goog.array.sort(features, vectorLayerRenderOrder);
|
features.sort(vectorLayerRenderOrder);
|
||||||
features.forEach(renderFeature, this);
|
features.forEach(renderFeature, this);
|
||||||
} else {
|
} else {
|
||||||
vectorSource.forEachFeatureInExtent(extent, renderFeature, this);
|
vectorSource.forEachFeatureInExtent(extent, renderFeature, this);
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
goog.provide('ol.tilegrid.WMTS');
|
goog.provide('ol.tilegrid.WMTS');
|
||||||
|
|
||||||
goog.require('goog.array');
|
|
||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('ol.proj');
|
goog.require('ol.proj');
|
||||||
goog.require('ol.tilegrid.TileGrid');
|
goog.require('ol.tilegrid.TileGrid');
|
||||||
@@ -104,7 +103,7 @@ ol.tilegrid.WMTS.createFromCapabilitiesMatrixSet =
|
|||||||
// swap origin x and y coordinates if axis orientation is lat/long
|
// swap origin x and y coordinates if axis orientation is lat/long
|
||||||
var switchOriginXY = projection.getAxisOrientation().substr(0, 2) == 'ne';
|
var switchOriginXY = projection.getAxisOrientation().substr(0, 2) == 'ne';
|
||||||
|
|
||||||
goog.array.sort(matrixSet[matrixIdsPropName], function(a, b) {
|
matrixSet[matrixIdsPropName].sort(function(a, b) {
|
||||||
return b[scaleDenominatorPropName] - a[scaleDenominatorPropName];
|
return b[scaleDenominatorPropName] - a[scaleDenominatorPropName];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user