remove extra comments and console.log statements.

Author: mroberge

index.html

@@ -156,23 +156,17 @@
         font: 10px sans-serif;
       }
 
-      /*TODO: .axisTitle was there a typo? how are the axes titled?*/
       .axisTitle {
         font: 14px serif;
       }
-      /*TODO: .Title was there a typo? how are the axes titled?*/
       .Title {
         font: 20px serif;
       }
-      /*TODO: .subTitle was there a typo? how are the axes titled?*/
       .subTitle {
         font: 12px serif;
       }
 
       path {
-        /*  I need a way to set a default that can be overridden by D3 .attr("stroke", color)
-        stroke: black;
-        */
         fill: none;
         stroke-width: 2;
       }

src/graph-flowduration.js

@@ -2,7 +2,7 @@
  * Created by Marty on 3/12/2017.
  */
 function flowduration(id) {
-    console.log("flowduration");
+    //console.log("flowduration");
     var data = chooseData(id);
     //If there is no data for a site, keep the previous graph alive & do nothing.
     if(!data) return;
@@ -17,7 +17,6 @@ function flowduration(id) {
     data.sort(function(a, b) {
         return a[1] < b[1] ? 1 : a[1] > b[1] ? -1 : 0;
     });
-    //console.log(data);
 
     var margin = {
         top : 10,
@@ -37,8 +36,6 @@ function flowduration(id) {
     var yAxis = d3.svg.axis().scale(yScale).orient("left");
 
     var rank = 0;
-    //console.log(sorted.length)
-    //var testarray = [];
 
     var area = d3.svg.line().interpolate("step-before").x(function(d) {
         rank = rank + 1;
@@ -56,11 +53,10 @@ function flowduration(id) {
     yScale.domain([1, d3.max(data.map(function(d) {
         return d[1];
     }))]);
-    //If y.domain has a min value of 0, then you can't plot in a log scale.'
+    //If y.domain has a min value of 0, then you can't plot in a log scale.
 
     focus.append("path").datum(data).attr("clip-path", "url(#clip)").attr("d", area).attr("stroke", "blue");
     //append the path to the graph, but clip it with the rectangle we defined above.
-    //focus.append("path").datum(data).attr("d", area);//This still seems to get clipped even though it doesn't have the clipping path. ???
     focus.append("g").attr("class", "x axis").attr("transform", "translate(0," + height + ")").call(xAxis);
     focus.append("g").attr("class", "y axis").call(yAxis);
 

src/graph-scatterChart.js

@@ -93,7 +93,7 @@ function scatterChart() {
       var lineGroup = gEnter.append("g").attr("class", "lineGroup");
       var lineEnter = lineGroup.selectAll("path").data(dataArray).enter().append("path").attr("class", "line");
 
-      gEnter.append("g").attr("class", "x axis");//is this name okay? It has a space!
+      gEnter.append("g").attr("class", "x axis");//g given two classes: x and axis.
       gEnter.append("g").attr("class", "y axis");
 
       var titleGroup = gEnter.append("g").attr("class", "titleGroup");
@@ -111,10 +111,10 @@ function scatterChart() {
       g.selectAll(".line").attr("d", line).attr("stroke", function(d, i) {return color(i);});
 
       // Update the x-axis.
-      g.select(".x.axis").attr("transform", "translate(0," + yScale.range()[0] + ")").call(xAxis).on("click", myClickFunction);
+      g.select(".x.axis").attr("transform", "translate(0," + yScale.range()[0] + ")").call(xAxis);
 
       // Update the y-axis.
-      g.select(".y.axis").attr("transform", "translate(0," + xScale.range()[0] + ")").call(yAxis).on("click", myRClickFunction);
+      g.select(".y.axis").attr("transform", "translate(0," + xScale.range()[0] + ")").call(yAxis);
 
       // Update the title.
       g.select(".titleGroup").attr("transform", "translate(10,0)");

src/index-drawMap.js

@@ -3,14 +3,12 @@ var fusionLayerInfoWindow;
 var center = new google.maps.LatLng(39.395, -76.609);
 
 function drawMap() {
-  //document.getElementById('map_div').style.display = "none";
   var mapOptions = {
     zoom : 8,
     center : new google.maps.LatLng(39.395, -76.609),
     mapTypeId : google.maps.MapTypeId.TERRAIN
   };
 
-  //console.log(document.getElementById('map_div'));
   map = new google.maps.Map(document.getElementById('map_div'), mapOptions);
 
   fusionLayerInfoWindow = new google.maps.InfoWindow();
@@ -20,21 +18,25 @@ function drawMap() {
   var fusionLayer = new google.maps.FusionTablesLayer({
     query : {
       select : 'location',
-      //real.kmz, has more sites than Gages II, but less info.
+      //real.kmz, has more sites than Gages II, but less info for each.
       //from : '1Rt_U4LqeNPi6Tk1-kq8ta-6OP748nJJJTqdwlC0Q'
 
       //from Gages II merge, too large, takes too long to load
       //from : '1wtRBQVozXdLsn5t0PL8egL5wL7tUzFQvw6NYQizn'
 
       //from Gages II merge- small
       from : '103gQIyU069THrk7KGZYtbC8_My1rW4JwaHhX1ehe'
+      //Add queries like this:
       //where : 'DRAIN_SQKM < 20'
     },
     suppressInfoWindows: true
   });
   fusionLayer.setMap(map);
 
   google.maps.event.addListener(fusionLayer, 'click', function(event) {
+    //TODO: Google sometimes returns an error; I can't replicate this anymore. ???
+    //console.dir(event);
+
     //Parse real.kmz
     //var re = /[0-9]+/;
     //var sId = "dv" + re.exec(event.row.site_no.value)[0];
@@ -54,7 +56,6 @@ function drawMap() {
     //Update our viewModel with the current site information.
     viewModel.siteId(sId);
     viewModel.siteName(siteName);
-    //viewModel.siteDict.push(siteDict);
 
     //update our InfoWindow, then open it.
     fusionLayerInfoWindow.setOptions(
@@ -82,24 +83,6 @@ function drawMap() {
     map : map
   });
 
-  google.maps.event.addListener(fusionLayer, 'click', function(event) {
-    console.log(event);
-    var re = /^[0-9]+/;
-    var sId = re.exec(event.featureData.name)[0];
-    viewModel.siteId(sId);
-    viewModel.siteName(event.featureData.name);
-    //This siteIdArray.push won't capture the first data requested.
-    viewModel.siteIdArray.push(+sId);
-    console.log(viewModel.siteId());
-    console.log(viewModel.siteIdArray());
-    //viewModel.siteName.push(kmlEvent.featureData.name);
-
-    //console.log(sId);
-    //console.log(viewModel.siteId());
-    //console.log(viewModel.siteName());
-
-    getUSGS(sId);
-  });
 */
 
   var tileNEX = new google.maps.ImageMapType({
@@ -122,12 +105,10 @@ function drawMap() {
     isPng : true
   });
 
-  map.overlayMapTypes.push(null);
   //create empty overlay entry
-  //map.overlayMapTypes.setAt("0",goes);
+  map.overlayMapTypes.push(null);
+  //Add the GOES cloud imagery layer
+  //map.overlayMapTypes.setAt("0", goes);
   map.overlayMapTypes.setAt("1", tileNEX);
-  google.maps.event.addListener(map, 'bounds_changed', function() {
-    //console.log(map.getBounds());
-  });
 }
 

src/initialize.js

@@ -1,33 +1,22 @@
-/**
- * Created by Marty on 3/12/2017.
- */
-
 function initialize() {
 
     ko.applyBindings(viewModel);
 
     var data = [];
 
-    
-    
-
     viewModel.time.start(new Date(2014,1,1));
     viewModel.time.end(new Date(2015,1,1));
     viewModel.time.recent("90");
 
     viewModel.dataArray.subscribe(function(newValue) {
-        //alert("dataArray was just updated. " + newValue[0]);
-        console.log("plotGraph() called from index.html");
+        //console.log("plotGraph() called with new value added to dataArray.");
         viewModel.plotGraph();
     });
 
-//getUSGS(viewModel.siteDict()[0].id);
-    console.log("Initial value of requestData parameters: ");
-    console.log(viewModel.siteId());
-    console.log(viewModel.siteName());
-    console.log(viewModel.siteDict().toString());
-
-    console.log("setting viewModel values.");
+    //console.log("Initial value of requestData parameters: ");
+    //console.log(viewModel.siteId());
+    //console.log(viewModel.siteName());
+    //console.log("setting viewModel values.");
     viewModel.siteId("dv01580000");
     viewModel.siteName("Deer Creek at Rocks, MD");
     var initialSiteDict = {
@@ -36,16 +25,13 @@ function initialize() {
         area : 94.4,
         impervious : 1.26
     };
-//viewModel.siteDict().push(initialSiteDict); //This doesn't get done in drawMap, don't do it here.
 
-    console.log("Initial call of requestData with: ");
-    console.log(viewModel.siteId());
-    console.log(viewModel.siteName());
-    console.log(viewModel.siteDict().toString());
+    //console.log("Initial call of requestData with: ");
+    //console.log(viewModel.siteId());
+    //console.log(viewModel.siteName());
+    //console.log(viewModel.siteDict().toString());
     requestData(viewModel.siteId(), viewModel.siteName(), initialSiteDict);
 
-//getTuNexrad(viewModel.siteDict()[0].id);
-//$(window).resize();
     google.maps.event.addDomListener(window, 'load', drawMap);
     google.maps.event.addDomListener(window, 'load', redraw);
     $(window).resize(redraw);

src/local-storage.js

@@ -17,7 +17,6 @@ function storageAvailable(storageType) {
 function checkStorage(site){
     if (storageAvailable('localStorage')) {
         // localStorage is available
-        console.log("localStorage is available. site: " + site);
         try {
             var storage = window['localStorage'];
             var data = JSON.parse(storage.getItem(site));
@@ -26,14 +25,12 @@ function checkStorage(site){
             //In this case, I may want to have a refresh button near the graph to ask for more data.
             //
             if (Array.isArray(data)) {
-                console.log("Retrieved data from site " + site + ". Length is:" + data.length);
+                //console.log("Retrieved data from site " + site + ". Length is:" + data.length);
                 //convert string to Date
                 data.forEach(function(d, index, array){
                     d[0] = new Date(d[0]);
                 });
                 return data;
-                //console.log(data);
-                //return false;
             } else {
                 console.log("Problem with retrieved data for site " + site);
                 console.log(data);
@@ -56,7 +53,7 @@ function checkStorage(site){
 function saveData(key, data) {
     if (storageAvailable('localStorage')) {
         // localStorage is available
-        console.log("attempting to save");
+        //console.log("attempting to save");
         try {
             var storage = window['localStorage'];
             storage.setItem(key, JSON.stringify(data));