Consistently calling stream IDs 'streamId'.

htm-community · Sep 17, 2015 · cd86d5e · cd86d5e
1 parent 11bdf3a
commit cd86d5e
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 61 deletions.
diff --git a/rivers/airnow/parser.js b/rivers/airnow/parser.js
@@ -73,7 +73,7 @@ function initialize(config, callback) {
 
 function parse(body, options, temporalDataCallback, metaDataCallback) {
     xml2js.parseString(body, function(err, result) {
-        var data, html, $, $dataEl, location, airQualityString, airQualityParts,
+        var data, html, $, $dataEl, streamId, airQualityString, airQualityParts,
             agency, updatedAtString, updatedAt, airQualityReports = [],
             fieldValues = [];
         if (err) {
@@ -95,8 +95,8 @@ function parse(body, options, temporalDataCallback, metaDataCallback) {
         $ = cheerio.load(html);
         $dataEl = $('[valign="top"]');
 
-        location = $dataEl.find('div:first-child').text().split(':').pop().trim();
-        //console.log(location);
+        // The streamId is actually the 'location'.
+        streamId = $dataEl.find('div:first-child').text().split(':').pop().trim();
 
         airQualityString = $dataEl.find('div:nth-child(4)').text().trim();
         //console.log(airQualityString);
@@ -133,11 +133,11 @@ function parse(body, options, temporalDataCallback, metaDataCallback) {
 
         //console.log(fieldValues);
 
-        temporalDataCallback(location, updatedAt, fieldValues);
+        temporalDataCallback(streamId, updatedAt, fieldValues);
 
-        metaDataCallback(location, {
+        metaDataCallback(streamId, {
             agency: agency,
-            location: location
+            location: streamId
         });
 
     });

diff --git a/rivers/chicago-beach-water-quality/parser.js b/rivers/chicago-beach-water-quality/parser.js
@@ -46,7 +46,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
     _.each(dataArray, function(dataPoint) {
         var fieldValues = [],
             metadata = {},
-            sensorId = dataPoint.beach_name,
+            streamId = dataPoint.beach_name,
             dateString = dataPoint.last_updated_label,
             timestamp = dateStringToTimestampWithZone(dateString, config.timezone);
 
@@ -55,14 +55,14 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             fieldValues.push(parseFloat(dataPoint[fieldName]));
         });
 
-        temporalDataCallback(sensorId, timestamp, fieldValues);
+        temporalDataCallback(streamId, timestamp, fieldValues);
 
         // Metadata
         _.each(metadataNames, function(metadataName) {
             metadata[metadataName] = dataPoint[metadataName];
         });
 
-        metaDataCallback(sensorId, metadata);
+        metaDataCallback(streamId, metadata);
 
 
     });

diff --git a/rivers/chicago-beach-weather/parser.js b/rivers/chicago-beach-weather/parser.js
@@ -40,7 +40,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
     _.each(dataArray, function(dataPoint) {
         var fieldValues = [],
             metadata = {},
-            sensorId = dataPoint.station_name,
+            streamId = dataPoint.station_name,
             dateString = dataPoint.measurement_timestamp_label,
             timestamp = dateStringToTimestampWithZone(dateString, config.timezone);
 
@@ -49,14 +49,14 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             fieldValues.push(parseFloat(dataPoint[fieldName]));
         });
 
-        temporalDataCallback(sensorId, timestamp, fieldValues);
+        temporalDataCallback(streamId, timestamp, fieldValues);
 
         // Metadata
         _.each(metadataNames, function(metadataName) {
             metadata[metadataName] = dataPoint[metadataName];
         });
 
-        metaDataCallback(sensorId, metadata);
+        metaDataCallback(streamId, metadata);
 
 
     });

diff --git a/rivers/ercot-demand/parser.js b/rivers/ercot-demand/parser.js
@@ -31,7 +31,7 @@ function systemWideDemand(body, options, temporalDataCallback, metaDataCallback)
     var config = options.config,
         url = options.url,
         $ = cheerio.load(body),
-        id = 'system_wide_demand',
+        streamId = 'system_wide_demand',
         parsedUrl = nodeUrl.parse(url),
         sourceDomain = parsedUrl.protocol + '//' + parsedUrl.hostname,
         downloaders = [];
@@ -63,7 +63,7 @@ function systemWideDemand(body, options, temporalDataCallback, metaDataCallback)
                                 timeString = row[1],
                                 timestamp = dateStringToTimestampWithZone(dateString, timeString, config.timezone),
                                 demand = parseFloat(row[2]);
-                            temporalDataCallback(id, timestamp, [demand]);
+                            temporalDataCallback(streamId, timestamp, [demand]);
                         });
 
                     });

diff --git a/rivers/ercot-loads/parser.js b/rivers/ercot-loads/parser.js
@@ -21,10 +21,9 @@ function dateStringToTimestampWithZone(dateString, timeString, zone) {
 
 module.exports = function(body, options, temporalDataCallback, metaDataCallback) {
     var config = options.config,
-        url = options.url,
         $ = cheerio.load(body),
         columnNames = [],
-        id = 'actual_loads_of_weather_zones';
+        streamId = 'actual_loads_of_weather_zones';
 
     // This is important.
     moment.tz.setDefault(config.timezone);
@@ -55,7 +54,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             // Shift off the first two values, which are date and time strings.
             row.shift();
             row.shift();
-            temporalDataCallback(id, timestamp, row);
+            temporalDataCallback(streamId, timestamp, row);
         }
     });
 };
diff --git a/rivers/houston-freeway-traffic/parser.js b/rivers/houston-freeway-traffic/parser.js
@@ -20,17 +20,17 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
         freeways = result.rss.channel[0].item;
 
         _.each(freeways, function(freeway) {
-            var title = freeway.title[0];
+            var streamId = freeway.title[0];
             var fields;
             var travelTimeString;
             var travelTimeStringParts;
             var travelDuration;
             var metadata = {
-                title: title
+                title: streamId
             };
             var timestamp = gmtDateStringToTimestamp(freeway.pubDate[0]);
 
-            metaDataCallback(title, metadata);
+            metaDataCallback(streamId, metadata);
 
             travelTimeString = freeway.description[0].split(':').pop().trim();
             travelTimeStringParts = travelTimeString.split(/\s+/);
@@ -41,7 +41,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
 
             fields = [travelDuration.asMinutes()];
 
-            temporalDataCallback(title, timestamp, fields);
+            temporalDataCallback(streamId, timestamp, fields);
 
         });
 

diff --git a/rivers/md-traffic/parser.js b/rivers/md-traffic/parser.js
@@ -63,12 +63,13 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             return console.error(err);
         }
         _.each(result.speedSensors.sensor, function(sensor) {
-            var minMax, metadata, fieldValues;
+            var streamId, minMax, metadata, fieldValues;
 
+            streamId = sensor.deviceID[0];
             minMax = calculateMinAndMaxSpeed(sensor.speed[0]);
 
             metadata = {
-                id: sensor.deviceID[0],
+                id: streamId,
                 location: sensor.location[0],
                 latitude: parseFloat(sensor.latitude[0]),
                 longitude: parseFloat(sensor.longitude[0]),
@@ -80,7 +81,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             fieldValues = [minMax.min, minMax.max];
 
             temporalDataCallback(
-                sensor.deviceID[0], dateStringToTimestampWithZone(sensor.timeReported[0], config.timezone), fieldValues
+                streamId, dateStringToTimestampWithZone(sensor.timeReported[0], config.timezone), fieldValues
             );
 
         });

diff --git a/rivers/mn-traffic-sensors/parser.js b/rivers/mn-traffic-sensors/parser.js
@@ -56,7 +56,7 @@ function parse(body, options, temporalDataCallback, metaDataCallback) {
 
         _.each(result.traffic_sample.sample, function(detector) {
             var data = detector['$'],
-                sensorId = data.sensor,
+                streamId = data.sensor,
                 station = stationMap[detectorToStation[data.sensor]],
                 stashedDetector = detectorMap[data.sensor];
 
@@ -65,23 +65,23 @@ function parse(body, options, temporalDataCallback, metaDataCallback) {
                 metadata = {
                     latitude: parseFloat(station.lat),
                     longitude: parseFloat(station.lon),
-                    sensorId: sensorId,
+                    sensorId: streamId,
                     stationId: station.station_id,
                     stationLabel: station.label,
                     sensorLabel: stashedDetector.label,
                     lane: stashedDetector.lane,
                     category: stashedDetector.category
                 };
 
-                metaDataCallback(sensorId, metadata);
+                metaDataCallback(streamId, metadata);
 
                 fields = [
                     parseInt(data.flow),
                     parseInt(data.speed),
                     parseFloat(data.occ)
                 ];
 
-                temporalDataCallback(sensorId, timestamp, fields);
+                temporalDataCallback(streamId, timestamp, fields);
 
             }
 

diff --git a/rivers/mo-water-levels/parser.js b/rivers/mo-water-levels/parser.js
@@ -19,7 +19,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
         }
 
         var props = result.site['$'],
-            id = props.id,
+            streamId = props.id,
             metaData = {},
             data = result.site.observed[0].datum.reverse();
 
@@ -34,13 +34,13 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
                 flow = parseFloat(point.secondary[0]._)
             }
 
-            temporalDataCallback(id, timestamp, [stage, flow]);
+            temporalDataCallback(streamId, timestamp, [stage, flow]);
         });
 
         _.each(metaDataNames, function(propName) {
             metaData[propName] = props[propName];
         });
-        metaDataCallback(id, metaData);
+        metaDataCallback(streamId, metaData);
 
     });
 };
diff --git a/rivers/nyc-traffic/parser.js b/rivers/nyc-traffic/parser.js
@@ -47,7 +47,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
         _.each(data, function(path) {
             var metaData = {},
                 fieldValues = [],
-                pathId = path[headers.indexOf('Id')],
+                streamId = path[headers.indexOf('Id')],
                 timeString = path[headers.indexOf('DataAsOf')],
                 timestamp = dateStringToTimestampWithZone(
                     timeString, config.timezone
@@ -56,12 +56,12 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             _.each(metadataNames, function(propName) {
                 metaData[propName] = path[headers.indexOf(propName)];
             });
-            metaDataCallback(pathId, metaData);
+            metaDataCallback(streamId, metaData);
 
             _.each(fieldNames, function(fieldName) {
                 fieldValues.push(path[headers.indexOf(fieldName)]);
             });
-            temporalDataCallback(pathId, timestamp, fieldValues);
+            temporalDataCallback(streamId, timestamp, fieldValues);
         });
 
     });

diff --git a/rivers/nypd-motor-vehicle-collisions/parser.js b/rivers/nypd-motor-vehicle-collisions/parser.js
@@ -5,7 +5,7 @@ var _ = require('lodash'),
 module.exports = function(body, options, temporalDataCallback, metaDataCallback) {
     var config = options.config,
         data = JSON.parse(body),
-        id = 'nypd-motor-vehicle-collisions';
+        streamId = 'nypd-motor-vehicle-collisions';
 
     // This is important.
     moment.tz.setDefault(config.timezone);
@@ -34,6 +34,6 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             event.vehicle_type_code2, event.zip_code
         ];
 
-        temporalDataCallback(id, timestamp, fieldValues);
+        temporalDataCallback(streamId, timestamp, fieldValues);
     });
 };
diff --git a/rivers/portland-911/parser.js b/rivers/portland-911/parser.js
@@ -28,7 +28,7 @@ function dateStringToTimestampWithZone(timeIn, zone) {
 
 module.exports = function(body, options, temporalDataCallback, metaDataCallback) {
     var config = options.config,
-        id = 'portland-911';
+        streamId = 'portland-911';
 
     // This is important.
     moment.tz.setDefault(config.timezone);
@@ -45,8 +45,8 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             email = meta.author.email,
             fieldValues = [];
 
-        metaDataCallback(id, {
-            id: id,
+        metaDataCallback(streamId, {
+            id: streamId,
             title: title,
             subtitle: subtitle,
             author: author,
@@ -69,7 +69,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
                 lat, lng, dispatchId, summary, category, updated, published
             ];
 
-            temporalDataCallback(id, timestamp, fieldValues);
+            temporalDataCallback(streamId, timestamp, fieldValues);
         });
 
     });

diff --git a/rivers/portland-restaurant-inspections/parser.js b/rivers/portland-restaurant-inspections/parser.js
@@ -20,7 +20,7 @@ function dateStringToTimestampWithZone(dateString, zone) {
 module.exports = function(body, options, temporalDataCallback, metaDataCallback) {
     var config = options.config,
         data = JSON.parse(body).results,
-        id = 'portland-restaurant-inspections';
+        streamId = 'portland-restaurant-inspections';
 
     _.each(data, function(point) {
         var dateString = point.date,
@@ -31,7 +31,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             point.location.Latitude, point.location.Longitude, point.restaurant_id, point.name, parseInt(point.score), point.inspection_number, point.type, point.address.street, point.address.city, point.address.zip
         ];
 
-        temporalDataCallback(id, timestamp, fieldValues);
+        temporalDataCallback(streamId, timestamp, fieldValues);
 
     });
 };
diff --git a/rivers/sfpd-incidents/parser.js b/rivers/sfpd-incidents/parser.js
@@ -4,7 +4,7 @@ var _ = require('lodash'),
 module.exports = function(body, options, temporalDataCallback, metaDataCallback) {
     var config = options.config,
         data = JSON.parse(body),
-        id = 'sfpd-incidents';
+        streamId = 'sfpd-incidents';
 
     // This is important.
     moment.tz.setDefault(config.timezone);
@@ -19,14 +19,14 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             fieldValues;
 
         if (isNaN(latitude) || isNaN(longitude)) {
-            latitude = null
-            longitude = null
+            latitude = null;
+            longitude = null;
         }
 
         fieldValues = [
             latitude, longitude, parseInt(event.incidntnum), event.category, event.pddistrict, event.pdid, event.address, event.descript, event.resolution
         ];
 
-        temporalDataCallback(id, timestamp, fieldValues);
+        temporalDataCallback(streamId, timestamp, fieldValues);
     });
 };
diff --git a/rivers/usgs-earthquakes/parser.js b/rivers/usgs-earthquakes/parser.js
@@ -5,13 +5,13 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
     var config = options.config,
         payload = JSON.parse(body),
         metadata = payload.metadata,
-        id = 'usgs-earthquakes';
+        streamId = 'usgs-earthquakes';
 
     moment.tz.setDefault(config.timezone);
 
     metadata.bbox = payload.bbox;
 
-    metaDataCallback(id, payload.metadata);
+    metaDataCallback(streamId, payload.metadata);
 
     _.each(payload.features, function(quake) {
         var props = quake.properties,
@@ -51,6 +51,6 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
             props.title
         ];
 
-        temporalDataCallback(id, timestamp, values);
+        temporalDataCallback(streamId, timestamp, values);
     });
 };
diff --git a/rivers/yahoo-finance-prices/parser.js b/rivers/yahoo-finance-prices/parser.js
@@ -10,7 +10,7 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
         date = undefined,
         timestamp = undefined,
         res = data.query.results.quote,
-        symbol = res.symbol,
+        streamId = res.symbol,
         fieldValues = undefined;
 
     moment.tz.setDefault(config.timezone);
@@ -22,5 +22,5 @@ module.exports = function(body, options, temporalDataCallback, metaDataCallback)
         parseFloat(res.Ask), parseFloat(res.Bid), parseFloat(res.Change), parseFloat(res.LastTradePriceOnly), parseFloat(res.LastTradePriceOnly)
     ];
 
-    temporalDataCallback(symbol, timestamp, fieldValues);
+    temporalDataCallback(streamId, timestamp, fieldValues);
 };