@@ -35,7 +35,7 @@ function render(osm) { - console.log('initing Map...'); + if (window.console && window.console.log) console.log('initing Map...'); var t = new Date().getTime(); var styles = [ @@ -274,7 +274,7 @@ ]) ]; - console.log('styles created in', new Date().getTime() - t, 'ms'); + if (window.console && window.console.log) console.log('styles created in', new Date().getTime() - t, 'ms'); t = new Date().getTime(); var highwayCases = { @@ -333,7 +333,7 @@ )*/ ]; - console.log('layers created in', new Date().getTime() - t, 'ms'); + if (window.console && window.console.log) console.log('layers created in', new Date().getTime() - t, 'ms'); t = new Date().getTime(); ////////// TODO/FIXME still not really sure where projection should happen @@ -349,7 +349,7 @@ coord[1] = y; } - console.log('nodes projected in', new Date().getTime() - t, 'ms'); + if (window.console && window.console.log) console.log('nodes projected in', new Date().getTime() - t, 'ms'); ////////// index.html @@ -32,7 +32,7 @@ com.stamen.osm.POLYGON_TAGS = { com.stamen.osm.OSM = function(responseXML) { - if (console && console.log) console.log('initing OSM object...'); + if (window.console && window.console.log) console.log('initing OSM object...'); var t = new Date().getTime(); this.nodes = []; @@ -49,7 +49,7 @@ com.stamen.osm.OSM = function(responseXML) { maxLon: parseFloat(boundsXML.attributes.getNamedItem('maxlon').value) }; - if (console && console.log) console.log('got bounds ' + this.bounds); + if (window.console && window.console.log) console.log('got bounds ' + this.bounds); // so we only have to loop over the xml nodes once // (for when we're parsing node refs in ways) @@ -76,7 +76,7 @@ com.stamen.osm.OSM = function(responseXML) { nodeHash[id] = node; } - if (console && console.log) console.log('got ' + this.nodes.length + ' nodes'); + if (window.console && window.console.log) console.log('got ' + this.nodes.length + ' nodes'); var wayXMLs = responseXML.getElementsByTagName("way"); for (var i = 0; i < wayXMLs.length; i++) { @@ -92,7 +92,7 @@ com.stamen.osm.OSM = function(responseXML) { coordinates.push(theNode.geometry.coordinates); } else { - if (console && console.log) console.log('node ref ' + ref + ' not found'); + if (window.console && window.console.log) console.log('node ref ' + ref + ' not found'); } } @@ -118,10 +118,10 @@ com.stamen.osm.OSM = function(responseXML) { } // for each way - if (console && console.log) console.log('got ' + this.ways.length + ' ways'); - if (console && console.log) console.log('got ' + this.areas.length + ' areas'); + if (window.console && window.console.log) console.log('got ' + this.ways.length + ' ways'); + if (window.console && window.console.log) console.log('got ' + this.areas.length + ' areas'); - if (console && console.log) console.log('done initing OSM object... ' + (new Date().getTime() - t) + ' ms'); + if (window.console && window.console.log) console.log('done initing OSM object... ' + (new Date().getTime() - t) + ' ms'); }; osm.js @@ -35,7 +35,7 @@ com.stamen.vectormap.Map.prototype = { // this is the most naive implementation of a render loop I could think of render: function(canvas) { var t = new Date().getTime(); - if (console && console.log) console.log('starting rendering...'); + if (window.console && window.console.log) console.log('starting rendering...'); var ctx = canvas.getContext('2d'); ctx.clearRect(0,0,canvas.width,canvas.height); if (this.bgColor) { @@ -64,7 +64,7 @@ com.stamen.vectormap.Map.prototype = { } // features } // styles } // layers - if (console && console.log) console.log('done rendering... ' + (new Date().getTime() - t) + ' ms'); + if (window.console && window.console.log) console.log('done rendering... ' + (new Date().getTime() - t) + ' ms'); } }; vectormap.js 087f4211e4038e9c0c1d3c3cf01ee57d1892064c Tom Carden tom@tom-carden.co.uk http://github.com/RandomEtc/js-vector-maps/commit/4d1a00c607d47b02d9d7549d904bf3a3be98a17a 4d1a00c607d47b02d9d7549d904bf3a3be98a17a 2009-06-06T23:40:41-07:00 2009-06-06T23:40:41-07:00 fix errors in firefox if firebug isn't enabled 31828cab7423b2e1eb631532942cf56d5760813b Tom Carden tom@tom-carden.co.uk