rewrote bus module

modules/bus.js

@@ -11,9 +11,12 @@ var ENTRIES = 6;
 
 /// VARS
 var CACHED = null;
-var TEMPLATE = '';
-fs.readFile('modules/bus/template.mustache', 'utf-8', function (err, data) {
-    TEMPLATE = data;
+var TEMPLATES = {};
+fs.readFile('modules/bus/outer.mustache', 'utf-8', function (err, data) {
+    TEMPLATES.outer = data;
+});
+fs.readFile('modules/bus/inner.mustache', 'utf-8', function (err, data) {
+    TEMPLATES.inner = data;
 });
 
 /// FUNS
@@ -24,7 +27,7 @@ function pad(n, width, z) {
 }
 
 function fetchData(stop, cb) {
-    var url = "http://62.154.206.87/efaws2/default/XML_DM_REQUEST?sessionID=0&requestID=0&language=de&useRealtime=1&coordOutputFormat=WGS84[DD.ddddd]&locationServerActive=1&mode=direct&dmLineSelectionAll=1&depType=STOPEVENTS&useAllStops=1&command=null&type_dm=stop&name_dm="+CITY+' '+stop+"&itdTime=2315&itdDate=20151116&mId=efa_rc2"
+    var url = "http://62.154.206.87/efaws2/default/XML_DM_REQUEST?sessionID=0&requestID=0&language=de&useRealtime=1&coordOutputFormat=WGS84[DD.ddddd]&locationServerActive=1&mode=direct&dmLineSelectionAll=1&depType=STOPEVENTS&useAllStops=1&command=null&type_dm=stop&name_dm="+CITY+' '+stop+"&mId=efa_rc2"
     httpreq.get(url, {binary: true}, function (err, res) {
         try {
             cb(XML.parse(iconv.decode(res.body, 'latin1')));
@@ -69,12 +72,13 @@ function update(io) {
     var done = 0;
     var context = [];
     var innerGetData = function (stop, i) {
+        var ns = normalizeStop(stop);
         getData(stop, ENTRIES, function (deps) {
-            context[i] = {stop: stop, deps: deps};
-            if (++done >= STOPS.length) {
-                io.emit('bus', Mustache.render(TEMPLATE, context));
+            try {
+                context[i] = {stop: stop, normalizedStop: ns, deps: deps};
+                io.emit('bus.'+ns, Mustache.render(TEMPLATES.inner, context[i]));
                 CACHED = context;
-            }
+            } catch (e) {console.log(e);}
             // calculate when to update next
             var d = new Date();
             var hour = d.getHours();
@@ -91,9 +95,17 @@ function update(io) {
     });
 }
 
+function normalizeStop(stop) {
+    return stop.replace(/[^a-zA-Z0-9_]/g,'');
+}
+
 module.exports = function (io) {
     update(io);
     io.on('connect', function (sock) {
-        sock.emit('bus', Mustache.render(TEMPLATE, CACHED));
+        sock.emit('bus', Mustache.render(TEMPLATES.outer, CACHED));
+        for (var i in CACHED) {
+            sock.emit('bus.'+CACHED[i].normalizedStop,
+                Mustache.render(TEMPLATES.inner, CACHED[i]));
+        }
     });
 }

modules/bus/inner.mustache

+<tr>
+    <th class="title" colspan="4">
+        <h3><img src="/modules/bus/bsv.svg"> {{stop}}</h3>
+    </th>
+</tr>
+<tr>
+    <th>Time</th>
+    <th>Line</th>
+    <th>Pltf</th>
+    <th>Direction</th>
+</tr>
+{{#deps}}
+    <tr>
+        <td class="time">
+            <span>{{hour}}:{{minute}}</span>
+            (<font class="until"></font>)
+        </td>
+        <td>{{{renderedLine}}}</td>
+        <td>{{platform}}</td>
+        <td>{{dir}}</td>
+    </tr>
+{{/deps}}

modules/bus/template.mustache → modules/bus/outer.mustache

@@ -8,27 +8,6 @@
         <col>
     </colgroup>
     {{#.}}
-        <tr>
-            <th class="title" colspan="4">
-                <h3><img src="/modules/bus/bsv.svg"> {{stop}}</h3>
-            </th>
-        </tr>
-        <tr>
-            <th>Time</th>
-            <th>Line</th>
-            <th>Pltf</th>
-            <th>Direction</th>
-        </tr>
-        {{#deps}}
-            <tr>
-                <td class="time">
-                    <span>{{hour}}:{{minute}}</span>
-                    (<font class="until"></font>)
-                </td>
-                <td>{{{renderedLine}}}</td>
-                <td>{{platform}}</td>
-                <td>{{dir}}</td>
-            </tr>
-        {{/deps}}
+        <tbody data-infodisplay-outlet="{{normalizedStop}}"></tbody>
     {{/.}}
 </table>