Compare commits
8 Commits
release-2.
...
release-2.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
572d78fb4d | ||
|
|
1d948fc914 | ||
|
|
449b85966e | ||
|
|
1223ea339d | ||
|
|
d0f8fa3ecf | ||
|
|
e9a349e4f1 | ||
|
|
8b4592e71a | ||
|
|
7c5afe1acf |
@@ -425,4 +425,4 @@
|
||||
* When asking questions or reporting issues, make sure to include the output of
|
||||
* OpenLayers.VERSION_NUMBER in the question or issue-description.
|
||||
*/
|
||||
OpenLayers.VERSION_NUMBER="Release 2.13-rc1";
|
||||
OpenLayers.VERSION_NUMBER="Release 2.13-rc3";
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
* full text of the license. */
|
||||
|
||||
/**
|
||||
* @requires OpenLayers/Control.js
|
||||
* @requires OpenLayers/Handler/Drag.js
|
||||
* @requires OpenLayers/Handler/Keyboard.js
|
||||
*/
|
||||
|
||||
@@ -147,7 +147,7 @@ OpenLayers.Handler.Feature = OpenLayers.Class(OpenLayers.Handler, {
|
||||
* evt - {Event}
|
||||
*/
|
||||
touchmove: function(evt) {
|
||||
OpenLayers.Event.stop(evt);
|
||||
OpenLayers.Event.preventDefault(evt);
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -278,7 +278,7 @@ OpenLayers.Handler.Feature = OpenLayers.Class(OpenLayers.Handler, {
|
||||
if(type === "touchstart") {
|
||||
// stop the event to prevent Android Webkit from
|
||||
// "flashing" the map div
|
||||
OpenLayers.Event.stop(evt);
|
||||
OpenLayers.Event.preventDefault(evt);
|
||||
}
|
||||
var inNew = (this.feature != this.lastFeature);
|
||||
if(this.geometryTypeMatches(this.feature)) {
|
||||
|
||||
@@ -1100,7 +1100,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
|
||||
this.events.triggerEvent("tileloadstart", {tile: tile});
|
||||
this.numLoadingTiles++;
|
||||
if (!this.singleTile && this.backBuffer && this.gridResolution === this.backBufferResolution) {
|
||||
OpenLayers.Element.addClass(tile.imgDiv, replacingCls);
|
||||
OpenLayers.Element.addClass(tile.getTile(), replacingCls);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1112,13 +1112,14 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
|
||||
aborted: aborted
|
||||
});
|
||||
if (!this.singleTile && !aborted && this.backBuffer && this.gridResolution === this.backBufferResolution) {
|
||||
if (OpenLayers.Element.getStyle(tile.imgDiv, 'display') === 'none') {
|
||||
var tileDiv = tile.getTile();
|
||||
if (OpenLayers.Element.getStyle(tileDiv, 'display') === 'none') {
|
||||
var bufferTile = document.getElementById(tile.id + '_bb');
|
||||
if (bufferTile) {
|
||||
bufferTile.parentNode.removeChild(bufferTile);
|
||||
}
|
||||
}
|
||||
OpenLayers.Element.removeClass(tile.imgDiv, replacingCls);
|
||||
OpenLayers.Element.removeClass(tileDiv, replacingCls);
|
||||
}
|
||||
//if that was the last tile, then trigger a 'loadend' on the layer
|
||||
if (this.numLoadingTiles === 0) {
|
||||
|
||||
@@ -7,7 +7,7 @@ var OpenLayers = {
|
||||
/**
|
||||
* Constant: VERSION_NUMBER
|
||||
*/
|
||||
VERSION_NUMBER: "Release 2.13-rc1",
|
||||
VERSION_NUMBER: "Release 2.13-rc3",
|
||||
|
||||
/**
|
||||
* Constant: singleFile
|
||||
|
||||
@@ -175,7 +175,7 @@ OpenLayers.TileManager = OpenLayers.Class({
|
||||
* evt - {Object} Listener argument
|
||||
*/
|
||||
move: function(evt) {
|
||||
this.updateTimeout(evt.object, this.moveDelay);
|
||||
this.updateTimeout(evt.object, this.moveDelay, true);
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -272,11 +272,16 @@ OpenLayers.TileManager = OpenLayers.Class({
|
||||
* Parameters:
|
||||
* map - {<OpenLayers.Map>} The map to update the timeout for
|
||||
* delay - {Number} The delay to apply
|
||||
* nice - {Boolean} If true, the timeout function will only be created if
|
||||
* the tilequeue is not empty. This is used by the move handler to
|
||||
* avoid impacts on dragging performance. For other events, the tile
|
||||
* queue may not be populated yet, so we need to set the timer
|
||||
* regardless of the queue size.
|
||||
*/
|
||||
updateTimeout: function(map, delay) {
|
||||
updateTimeout: function(map, delay, nice) {
|
||||
window.clearTimeout(this.tileQueueId[map.id]);
|
||||
var tileQueue = this.tileQueue[map.id];
|
||||
if (tileQueue.length) {
|
||||
if (!nice || tileQueue.length) {
|
||||
this.tileQueueId[map.id] = window.setTimeout(
|
||||
OpenLayers.Function.bind(function() {
|
||||
this.drawTilesFromQueue(map);
|
||||
|
||||
@@ -866,11 +866,17 @@ OpenLayers.Util.destinationVincenty = function(lonlat, brng, dist) {
|
||||
* url - {String} Optional url used to extract the query string.
|
||||
* If url is null or is not supplied, query string is taken
|
||||
* from the page location.
|
||||
* options - {Object} Additional options. Optional.
|
||||
*
|
||||
* Valid options:
|
||||
* splitArgs - {Boolean} Split comma delimited params into arrays? Default is
|
||||
* true.
|
||||
*
|
||||
* Returns:
|
||||
* {Object} An object of key/value pairs from the query string.
|
||||
*/
|
||||
OpenLayers.Util.getParameters = function(url) {
|
||||
OpenLayers.Util.getParameters = function(url, options) {
|
||||
options = options || {};
|
||||
// if no url specified, take it from the location bar
|
||||
url = (url === null || url === undefined) ? window.location.href : url;
|
||||
|
||||
@@ -906,7 +912,9 @@ OpenLayers.Util.getParameters = function(url) {
|
||||
}
|
||||
|
||||
// follow OGC convention of comma delimited values
|
||||
value = value.split(",");
|
||||
if (options.splitArgs !== false) {
|
||||
value = value.split(",");
|
||||
}
|
||||
|
||||
//if there's only one value, do not return as array
|
||||
if (value.length == 1) {
|
||||
@@ -1299,7 +1307,8 @@ OpenLayers.Util.isEquivalentUrl = function(url1, url2, options) {
|
||||
OpenLayers.Util.applyDefaults(options, {
|
||||
ignoreCase: true,
|
||||
ignorePort80: true,
|
||||
ignoreHash: true
|
||||
ignoreHash: true,
|
||||
splitArgs: false
|
||||
});
|
||||
|
||||
var urlObj1 = OpenLayers.Util.createUrlObject(url1, options);
|
||||
@@ -1340,6 +1349,8 @@ OpenLayers.Util.isEquivalentUrl = function(url1, url2, options) {
|
||||
* ignoreCase - {Boolean} lowercase url,
|
||||
* ignorePort80 - {Boolean} don't include explicit port if port is 80,
|
||||
* ignoreHash - {Boolean} Don't include part of url after the hash (#).
|
||||
* splitArgs - {Boolean} Split comma delimited params into arrays? Default is
|
||||
* true.
|
||||
*
|
||||
* Returns:
|
||||
* {Object} An object with separate url, a, port, host, and args parsed out
|
||||
@@ -1395,7 +1406,8 @@ OpenLayers.Util.createUrlObject = function(url, options) {
|
||||
var qMark = url.indexOf("?");
|
||||
queryString = (qMark != -1) ? url.substr(qMark) : "";
|
||||
}
|
||||
urlObject.args = OpenLayers.Util.getParameters(queryString);
|
||||
urlObject.args = OpenLayers.Util.getParameters(queryString,
|
||||
{splitArgs: options.splitArgs});
|
||||
|
||||
// pathname
|
||||
//
|
||||
|
||||
@@ -783,7 +783,7 @@
|
||||
}
|
||||
|
||||
function test_Util_isEquivalentUrl(t) {
|
||||
t.plan(9);
|
||||
t.plan(10);
|
||||
|
||||
var url1, url2, options;
|
||||
|
||||
@@ -846,6 +846,11 @@
|
||||
url2 = new Array(window.location.pathname.split("/").length-1).join("../")+"foo/bar";
|
||||
|
||||
t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "absolute and relative path without host works for "+url2)
|
||||
|
||||
//ARGS
|
||||
url1 = "foo.html?bbox=1,2,3,4",
|
||||
url2 = url1;
|
||||
t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "equal urls with comma delimited params are equal");
|
||||
}
|
||||
|
||||
function test_createUrlObject(t) {
|
||||
|
||||
@@ -506,7 +506,7 @@ a.olControlZoomOut {
|
||||
}
|
||||
|
||||
/* when replacing tiles, do not show tile and backbuffer at the same time */
|
||||
.olTileImage.olTileReplacing {
|
||||
.olTileReplacing {
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user