Permalink
Browse files

heroku marker investigation

  • Loading branch information...
1 parent baa88f3 commit e25e453c342e2cfe2c6619a4254f2be9d32488e6 @yonromai committed Jun 2, 2012
Showing with 6 additions and 14 deletions.
  1. +2 −2 index.html
  2. +3 −11 js/complexcity.js
  3. +1 −1 js/confighelpers.js
View
@@ -141,15 +141,15 @@
- <div id="map" style="z-index:1; position:relative; margin-top: 0px;">
+ <div id="map" style="z-index:1; position:relative; margin-top: 0px;" class='hide'>
<div class="alert alert-info" style="z-index:1; position:absolute; margin-top: +40px; width: 96.5%;">
<button class="close" data-dismiss="alert" data-dismiss="alert">×</button>
You want a custom plot? Go <a data-toggle="modal" href="#newplot">Plot > New Plot</a> :)
</div>
</div>
- <div id='graph_loading' class="hero-unit hide">
+ <div id='graph_loading' class="hero-unit">
<h2>Rendering Map</h2>
<p>Please wait while the map is being rendered.</p>
<hr>
View
@@ -2,8 +2,8 @@
// NOTE: time unit is second and distance unit is meter
define([
- "/js/lib/modestmaps.js",
- "/js/modestmaps.markers.js",
+ "order!/js/lib/modestmaps.js",
+ "order!/js/modestmaps.markers.js",
"js/confighelpers.js",
"/js/nodes.js",
"/js/spotlight.js"
@@ -118,15 +118,7 @@ function plotMap(graph) {
map.addLayer(selectedNodes);
var markers;
- try {
- markers = new MM.MarkerLayer();
- } catch (e) {
- if (e instanceof TypeError){
- setTimeout(function(){plotMap(graph)}, 500); // FIXME: bad bad bad... set retry policy
- return;
- }
- throw e;
- }
+ markers = new MM.MarkerLayer();
map.addLayer(markers);
View
@@ -1,6 +1,6 @@
var Plot = function(){
- this.graph = '/data/shanghaiNetwork-150.json';
+ this.graph = '/data/shanghaiNetwork-2500.json';
this.allowedMeans = {
road: true,
bus: true,

0 comments on commit e25e453

Please sign in to comment.