Skip to content

Commit

Permalink
Fixing IE failure, fixing various lint errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tmcw
tmcw committed Dec 6, 2011
1 parent 7fcb444 commit f249b95
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 63 deletions.
63 changes: 32 additions & 31 deletions modestmaps.js
View file
Expand Up @@ -1428,8 +1428,10 @@ var mm = com.modestmaps = {
// use this coordinate for generating keys, parents and children:
var tileCoord = startCoord.copy();

for (tileCoord.column = startCoord.column; tileCoord.column <= endCoord.column; tileCoord.column++) {
for (tileCoord.row = startCoord.row; tileCoord.row <= endCoord.row; tileCoord.row++) {
for (tileCoord.column = startCoord.column;
tileCoord.column <= endCoord.column; tileCoord.column++) {
for (tileCoord.row = startCoord.row;
tileCoord.row <= endCoord.row; tileCoord.row++) {
var validKeys = this.inventoryVisibleTile(levelElement, tileCoord);

while (validKeys.length) {
Expand All @@ -1439,7 +1441,7 @@ var mm = com.modestmaps = {
}

// i from i to zoom-5 are levels that would be scaled too big,
// i from zoom+2 to levels.length are levels that would be
// i from zoom + 2 to levels. length are levels that would be
// scaled too small (and tiles would be too numerous)
for (var name in this.levels) {
if (this.levels.hasOwnProperty(name)) {
Expand All @@ -1466,8 +1468,8 @@ var mm = com.modestmaps = {
var minLevel = startCoord.zoom - 5;
var maxLevel = startCoord.zoom + 2;

for (var zoom = minLevel; zoom < maxLevel; zoom++) {
this.adjustVisibleLevel(this.levels[zoom], zoom, validTileKeys);
for (var z = minLevel; z < maxLevel; z++) {
this.adjustVisibleLevel(this.levels[z], z, validTileKeys);
}

// cancel requests that aren't visible:
Expand Down Expand Up @@ -1498,7 +1500,7 @@ var mm = com.modestmaps = {
var tile = this.tiles[tile_key];

// ensure it's in the DOM:
if(tile.parentNode != layer_element) {
if (tile.parentNode != layer_element) {
layer_element.appendChild(tile);
}

Expand All @@ -1509,20 +1511,20 @@ var mm = com.modestmaps = {
* Check that the needed tile has even been requested at all.
*/
if (!this.requestManager.hasRequest(tile_key)) {
var tile = this.provider.getTile(tile_coord);
if (typeof tile == 'string') {
this.addTileImage(tile_key, tile_coord, tile);
var tileToRequest = this.provider.getTile(tile_coord);
if (typeof tileToRequest == 'string') {
this.addTileImage(tile_key, tile_coord, tileToRequest);
// tile must be truish
} else if (tile) {
this.addTileElement(tile_key, tile_coord, tile);
} else if (tileToRequest) {
this.addTileElement(tile_key, tile_coord, tileToRequest);
}
}

// look for a parent tile in our image cache
var tileCovered = false;
var maxStepsOut = tile_coord.zoom;

for(var pz = 1; pz <= maxStepsOut; pz++) {
for (var pz = 1; pz <= maxStepsOut; pz++) {
var parent_coord = tile_coord.zoomBy(-pz).container();
var parent_key = parent_coord.toKey();

Expand All @@ -1539,12 +1541,12 @@ var mm = com.modestmaps = {
}
} else if (!this.requestManager.hasRequest(parent_key)) {
// force load of parent tiles we don't already have
var tile = this.provider.getTile(parent_coord);
var tileToAdd = this.provider.getTile(parent_coord);

if (typeof tile == 'string') {
this.addTileImage(parent_key, parent_coord, tile);
if (typeof tileToAdd == 'string') {
this.addTileImage(parent_key, parent_coord, tileToAdd);
} else {
this.addTileElement(parent_key, parent_coord, tile);
this.addTileElement(parent_key, parent_coord, tileToAdd);
}
}
} else {
Expand Down Expand Up @@ -1748,18 +1750,17 @@ var mm = com.modestmaps = {
return this._redraw;
},

/*
* keeps cache below max size
* (called every time we receive a new tile and add it to the cache)
*/
// keeps cache below max size
// (called every time we receive a new tile and add it to the cache)
checkCache: function() {
var numTilesOnScreen = this.parent.getElementsByTagName('img').length;
var maxTiles = Math.max(numTilesOnScreen, this.maxTileCacheSize);

if (this.tileCacheSize > maxTiles) {
// sort from newest (highest) to oldest (lowest)
this.recentTiles.sort(function(t1, t2) {
return t2.lastTouchedTime < t1.lastTouchedTime ? -1 : t2.lastTouchedTime > t1.lastTouchedTime ? 1 : 0;
return t2.lastTouchedTime < t1.lastTouchedTime ? -1 :
t2.lastTouchedTime > t1.lastTouchedTime ? 1 : 0;
});
}

Expand Down Expand Up @@ -1794,8 +1795,8 @@ var mm = com.modestmaps = {
if (!firstProvider) {
this.requestManager.clear();

for(var name in this.levels) {
if(this.levels.hasOwnProperty(name)) {
for (var name in this.levels) {
if (this.levels.hasOwnProperty(name)) {
var level = this.levels[name];

while (level.firstChild) {
Expand Down Expand Up @@ -1847,13 +1848,13 @@ var mm = com.modestmaps = {
return r1 ? 1 : r2 ? -1 : 0;
};
},

destroy: function() {
this.requestManager.clear();
this.requestManager.removeCallback('requestcomplete', this.getTileComplete());
// TODO: does requestManager need a destroy function too?
this.provider = null;
this.parent.parentNode.removeChild(this.parent);
this.parent.parentNode.removeChild(this.parent);
this.map = null;
}

Expand Down Expand Up @@ -1907,14 +1908,14 @@ var mm = com.modestmaps = {
this.projection = new MM.MercatorProjection(0,
MM.deriveTransformation(-Math.PI, Math.PI, 0, 0,
Math.PI, Math.PI, 1, 0,
-Math.PI, -Math.PI, 0, 1)),
-Math.PI, -Math.PI, 0, 1));
this.tileSize = new MM.Point(256, 256);

// default 0-18 zoom level
// with infinite horizontal pan and clamped vertical pan
this.coordLimits = [
new MM.Coordinate(0,-Infinity,0), // top left outer
new MM.Coordinate(1,Infinity,0).zoomTo(18), // bottom right inner
new MM.Coordinate(1,Infinity,0).zoomTo(18) // bottom right inner
];

// eyes towards null island
Expand Down Expand Up @@ -1952,8 +1953,8 @@ var mm = com.modestmaps = {
} else {
this.eventHandlers = eventHandlers;
if (eventHandlers instanceof Array) {
for (var i = 0; i < eventHandlers.length; i++) {
eventHandlers[i].init(this);
for (var j = 0; j < eventHandlers.length; j++) {
eventHandlers[j].init(this);
}
}
}
Expand Down Expand Up @@ -2316,7 +2317,7 @@ var mm = com.modestmaps = {

// clear existing layer at this index
if (index < this.layers.length) {
this.layers[index].destroy()
this.layers[index].destroy();
}

// pass it on.
Expand Down Expand Up @@ -2479,7 +2480,7 @@ var mm = com.modestmaps = {
if (this.autoSize) {
// maybe the parent size has changed?
var w = this.parent.offsetWidth,
h = this.parent.offsetHeight
h = this.parent.offsetHeight;
this.dimensions = new MM.Point(w,h);
if (w <= 0 || h <= 0) {
return;
Expand Down
2 changes: 1 addition & 1 deletion modestmaps.min.js
View file

Large diffs are not rendered by default.

51 changes: 26 additions & 25 deletions src/layer.js
View file
Expand Up @@ -79,8 +79,10 @@
// use this coordinate for generating keys, parents and children:
var tileCoord = startCoord.copy();

for (tileCoord.column = startCoord.column; tileCoord.column <= endCoord.column; tileCoord.column++) {
for (tileCoord.row = startCoord.row; tileCoord.row <= endCoord.row; tileCoord.row++) {
for (tileCoord.column = startCoord.column;
tileCoord.column <= endCoord.column; tileCoord.column++) {
for (tileCoord.row = startCoord.row;
tileCoord.row <= endCoord.row; tileCoord.row++) {
var validKeys = this.inventoryVisibleTile(levelElement, tileCoord);

while (validKeys.length) {
Expand All @@ -90,7 +92,7 @@
}

// i from i to zoom-5 are levels that would be scaled too big,
// i from zoom+2 to levels.length are levels that would be
// i from zoom + 2 to levels. length are levels that would be
// scaled too small (and tiles would be too numerous)
for (var name in this.levels) {
if (this.levels.hasOwnProperty(name)) {
Expand All @@ -117,8 +119,8 @@
var minLevel = startCoord.zoom - 5;
var maxLevel = startCoord.zoom + 2;

for (var zoom = minLevel; zoom < maxLevel; zoom++) {
this.adjustVisibleLevel(this.levels[zoom], zoom, validTileKeys);
for (var z = minLevel; z < maxLevel; z++) {
this.adjustVisibleLevel(this.levels[z], z, validTileKeys);
}

// cancel requests that aren't visible:
Expand Down Expand Up @@ -149,7 +151,7 @@
var tile = this.tiles[tile_key];

// ensure it's in the DOM:
if(tile.parentNode != layer_element) {
if (tile.parentNode != layer_element) {
layer_element.appendChild(tile);
}

Expand All @@ -160,20 +162,20 @@
* Check that the needed tile has even been requested at all.
*/
if (!this.requestManager.hasRequest(tile_key)) {
var tile = this.provider.getTile(tile_coord);
if (typeof tile == 'string') {
this.addTileImage(tile_key, tile_coord, tile);
var tileToRequest = this.provider.getTile(tile_coord);
if (typeof tileToRequest == 'string') {
this.addTileImage(tile_key, tile_coord, tileToRequest);
// tile must be truish
} else if (tile) {
this.addTileElement(tile_key, tile_coord, tile);
} else if (tileToRequest) {
this.addTileElement(tile_key, tile_coord, tileToRequest);
}
}

// look for a parent tile in our image cache
var tileCovered = false;
var maxStepsOut = tile_coord.zoom;

for(var pz = 1; pz <= maxStepsOut; pz++) {
for (var pz = 1; pz <= maxStepsOut; pz++) {
var parent_coord = tile_coord.zoomBy(-pz).container();
var parent_key = parent_coord.toKey();

Expand All @@ -190,12 +192,12 @@
}
} else if (!this.requestManager.hasRequest(parent_key)) {
// force load of parent tiles we don't already have
var tile = this.provider.getTile(parent_coord);
var tileToAdd = this.provider.getTile(parent_coord);

if (typeof tile == 'string') {
this.addTileImage(parent_key, parent_coord, tile);
if (typeof tileToAdd == 'string') {
this.addTileImage(parent_key, parent_coord, tileToAdd);
} else {
this.addTileElement(parent_key, parent_coord, tile);
this.addTileElement(parent_key, parent_coord, tileToAdd);
}
}
} else {
Expand Down Expand Up @@ -399,18 +401,17 @@
return this._redraw;
},

/*
* keeps cache below max size
* (called every time we receive a new tile and add it to the cache)
*/
// keeps cache below max size
// (called every time we receive a new tile and add it to the cache)
checkCache: function() {
var numTilesOnScreen = this.parent.getElementsByTagName('img').length;
var maxTiles = Math.max(numTilesOnScreen, this.maxTileCacheSize);

if (this.tileCacheSize > maxTiles) {
// sort from newest (highest) to oldest (lowest)
this.recentTiles.sort(function(t1, t2) {
return t2.lastTouchedTime < t1.lastTouchedTime ? -1 : t2.lastTouchedTime > t1.lastTouchedTime ? 1 : 0;
return t2.lastTouchedTime < t1.lastTouchedTime ? -1 :
t2.lastTouchedTime > t1.lastTouchedTime ? 1 : 0;
});
}

Expand Down Expand Up @@ -445,8 +446,8 @@
if (!firstProvider) {
this.requestManager.clear();

for(var name in this.levels) {
if(this.levels.hasOwnProperty(name)) {
for (var name in this.levels) {
if (this.levels.hasOwnProperty(name)) {
var level = this.levels[name];

while (level.firstChild) {
Expand Down Expand Up @@ -498,13 +499,13 @@
return r1 ? 1 : r2 ? -1 : 0;
};
},

destroy: function() {
this.requestManager.clear();
this.requestManager.removeCallback('requestcomplete', this.getTileComplete());
// TODO: does requestManager need a destroy function too?
this.provider = null;
this.parent.parentNode.removeChild(this.parent);
this.parent.parentNode.removeChild(this.parent);
this.map = null;
}

Expand Down
12 changes: 6 additions & 6 deletions src/map.js
View file
Expand Up @@ -47,14 +47,14 @@
this.projection = new MM.MercatorProjection(0,
MM.deriveTransformation(-Math.PI, Math.PI, 0, 0,
Math.PI, Math.PI, 1, 0,
-Math.PI, -Math.PI, 0, 1)),
-Math.PI, -Math.PI, 0, 1));
this.tileSize = new MM.Point(256, 256);

// default 0-18 zoom level
// with infinite horizontal pan and clamped vertical pan
this.coordLimits = [
new MM.Coordinate(0,-Infinity,0), // top left outer
new MM.Coordinate(1,Infinity,0).zoomTo(18), // bottom right inner
new MM.Coordinate(1,Infinity,0).zoomTo(18) // bottom right inner
];

// eyes towards null island
Expand Down Expand Up @@ -92,8 +92,8 @@
} else {
this.eventHandlers = eventHandlers;
if (eventHandlers instanceof Array) {
for (var i = 0; i < eventHandlers.length; i++) {
eventHandlers[i].init(this);
for (var j = 0; j < eventHandlers.length; j++) {
eventHandlers[j].init(this);
}
}
}
Expand Down Expand Up @@ -456,7 +456,7 @@

// clear existing layer at this index
if (index < this.layers.length) {
this.layers[index].destroy()
this.layers[index].destroy();
}

// pass it on.
Expand Down Expand Up @@ -619,7 +619,7 @@
if (this.autoSize) {
// maybe the parent size has changed?
var w = this.parent.offsetWidth,
h = this.parent.offsetHeight
h = this.parent.offsetHeight;
this.dimensions = new MM.Point(w,h);
if (w <= 0 || h <= 0) {
return;
Expand Down

0 comments on commit f249b95

Please sign in to comment.