separated updateScale_tresh() action

Author: kuanb

public/js/stops.js

@@ -235,7 +235,9 @@ function resizeCircles () {
 };
 
 function toggleStopTypes () {
+	toggleLoad("on");
 	if (globals.lastcall.vis !== null) {
+		console.log("Running long toggle process.");
 	  var early = $("#param_stoptype_early")[0].checked;
 	  var ontime = $("#param_stoptype_ontime")[0].checked;
 	  var late = $("#param_stoptype_late")[0].checked;
@@ -270,7 +272,9 @@ function toggleStopTypes () {
 		});
 
 		redrawStops();
+		console.log("Finished long toggle process.");
 	}
+	toggleLoad("off");
 };
 
 function getCounts (aspect, stop) {

server.js

@@ -65,41 +65,48 @@ app.get('/api/arrivals', function (req, res) {
 	} else {
 
 		rows = getConfig('public/data/example_response.json');
-
-	// 	var query = "SELECT rds.stop_id, route_id, direction_id, " + 
-	// 							"fulfilled, early_5, early_2, early, " + 
-	// 							"on_time, late, late_10, late_15, late_20, late_30 " + 
-	// 							"FROM stops " + 
-	// 							"INNER JOIN rds ON stops.stop_id = rds.stop_id " + 
-	// 							"INNER JOIN adherence ON adherence.rds = rds.rds " + 
-	// 							"WHERE feed_index >= 26 " + 
-	// 							"AND date = '" + date + "'" + 
-	// 							"AND hour = '" + hour + "' LIMIT 200;"
-
-	// 	console.log(query);
-	// 	connection.query(query, function (err, rows, fields) {
-	// 		if (err) {
-	// 			res.status(500).send("MySQL error during query run. " + err);
-	// 		} else {
-
-				var clean = {};
-
-				rows.forEach(function (stop) {
-					var k = stop.stop_id;
-					if (clean[k] == undefined) {
-						clean[k] = {0: null, 1: null};
-					}
-					var d = stop.direction_id;
-					if (d == 0 || d == 1) {
-						clean[k][d] = stop;
-						delete clean[k][d].stop_id;
-						delete clean[k][d].direction_id;
-					}
-				});
-
-				res.status(200).send(clean);
-	// 		}
-	// 	});
+		var clean = {};
+		rows.forEach(function (stop) {
+			var k = stop.stop_id;
+			if (clean[k] == undefined) { clean[k] = {0: null, 1: null}; }
+			var d = stop.direction_id;
+			if (d == 0 || d == 1) { clean[k][d] = stop; delete clean[k][d].stop_id; delete clean[k][d].direction_id; }
+		});
+		res.status(200).send(clean);
+
+		// var query = "SELECT rds.stop_id, route_id, direction_id, " + 
+		// 						"fulfilled, early_5, early_2, early, " + 
+		// 						"on_time, late, late_10, late_15, late_20, late_30 " + 
+		// 						"FROM stops " + 
+		// 						"INNER JOIN rds ON stops.stop_id = rds.stop_id " + 
+		// 						"INNER JOIN adherence ON adherence.rds = rds.rds " + 
+		// 						"WHERE feed_index >= 26 " + 
+		// 						"AND date = '" + date + "'" + 
+		// 						"AND hour = '" + hour + "';"
+
+		// connection.query(query, function (err, rows, fields) {
+		// 	if (err) {
+		// 		res.status(500).send("MySQL error during query run. " + err);
+		// 	} else {
+
+		// 		var clean = {};
+
+		// 		rows.forEach(function (stop) {
+		// 			var k = stop.stop_id;
+		// 			if (clean[k] == undefined) {
+		// 				clean[k] = {0: null, 1: null};
+		// 			}
+		// 			var d = stop.direction_id;
+		// 			if (d == 0 || d == 1) {
+		// 				clean[k][d] = stop;
+		// 				delete clean[k][d].stop_id;
+		// 				delete clean[k][d].direction_id;
+		// 			}
+		// 		});
+
+		// 		res.status(200).send(clean);
+		// 	}
+		// });
 	}
 });
 

views/stops.html

@@ -127,11 +127,11 @@ <h5>
 
       <div class="row">
         <div class="one-half column">
-          Minimum percentage ontime (<span id="changeable_early_threshold">0</span> percent)
+          Minimum percentage early (<span id="changeable_early_threshold">0</span> percent)
         </div>
         <div class="one-half column">
           <input class="u-full-width" type="range" id="param_early_threshold" 
-              min="0" max="100" value="0" onclick="updateScale()">
+              min="0" max="100" value="0" onclick="updateScale_tresh()">
         </div>
       </div>
 
@@ -141,17 +141,17 @@ <h5>
         </div>
         <div class="one-half column">
           <input class="u-full-width" type="range" id="param_ontime_threshold" 
-              min="0" max="100" value="0" onclick="updateScale()">
+              min="0" max="100" value="0" onclick="updateScale_tresh()">
         </div>
       </div>
 
       <div class="row">
         <div class="one-half column">
-          Minimum percentage ontime (<span id="changeable_late_threshold">0</span> percent)
+          Minimum percentage late (<span id="changeable_late_threshold">0</span> percent)
         </div>
         <div class="one-half column">
           <input class="u-full-width" type="range" id="param_late_threshold" 
-              min="0" max="100" value="0" onclick="updateScale()">
+              min="0" max="100" value="0" onclick="updateScale_tresh()">
         </div>
       </div>
 
@@ -261,15 +261,19 @@ <h5>
 
     function updateScale () {
       if (!$(".ajax").is(":visible")) {
-        if ($("#changeable_scale")[0].innerHTML !== $("#param_scale")[0].value) {
-          $("#changeable_scale")[0].innerHTML !== $("#param_scale")[0].value;
-          resizeCircles();
-        } else {
-          $("#changeable_early_threshold")[0].innerHTML = $("#param_early_threshold").val();
-          $("#changeable_ontime_threshold")[0].innerHTML = $("#param_ontime_threshold").val();
-          $("#changeable_late_threshold")[0].innerHTML = $("#param_late_threshold").val();
-          toggleStopTypes();
-        }     
+        console.log("Update scale.");
+        $("#changeable_scale")[0].innerHTML !== $("#param_scale")[0].value;
+        resizeCircles();   
+      } 
+    }
+
+    function updateScale_tresh () {
+      if (!$(".ajax").is(":visible")) {
+        console.log("Update scale thresh.");
+        $("#changeable_early_threshold")[0].innerHTML = $("#param_early_threshold").val();
+        $("#changeable_ontime_threshold")[0].innerHTML = $("#param_ontime_threshold").val();
+        $("#changeable_late_threshold")[0].innerHTML = $("#param_late_threshold").val();
+        toggleStopTypes();  
       } 
     }