Added support for sensor status,versions and instances

fetcher/providers/generic.js

@@ -195,7 +195,10 @@ class Sensor {
         this.sensor_id = data.sensor_id;
         this.parameter = null;
         this.interval_seconds = null;
-        this.metadata = {};
+        this.version_date = null;
+        this.instance = null;
+        this.status = null;
+        this.metadata = null;
         classAssign(this, data, []);
     }
 
@@ -206,6 +209,9 @@ class Sensor {
     json() {
         return stripNulls({
             sensor_id: this.sensor_id,
+            version_date: this.version_date,
+            status: this.status,
+            instance: this.instance,
             parameter: this.parameter,
             interval_seconds: this.interval_seconds,
         });
@@ -274,7 +280,7 @@ class Client {
         const location_id = this.getLocationId(row);
         let key = null;
         if (manufacturer && model) {
-            key = `${manufacturer}::${model}`;
+            key = `${manufacturer}:${model}`;
         } else if (!manufacturer & !model) {
             key = 'default';
         } else {
@@ -292,10 +298,15 @@ class Client {
     getSensorId(row) {
         const measurand = this.measurands[row.metric];
         const location_id = this.getLocationId(row);
+        const version = cleanKey(row.version_date);
+        const instance = cleanKey(row.instance);
         if (!measurand) {
             throw new Error(`Could not find measurand for ${row.metric}`);
         }
-        return `${location_id}-${measurand.parameter}`;
+        let key = [measurand.parameter];
+        if (instance) key.push(instance);
+        if (version) key.push(version);
+        return `${location_id}-${key.join(':')}`;
     }
 
 
@@ -440,6 +451,7 @@ class Client {
                 const sensor_id = this.getSensorId({
                     location: d[this.location_key],
                     metric: d[this.parameter_key],
+                    ...d,
                 });
 
                 const system_id = this.getSystemId(d);

test/generic.test.js

@@ -151,7 +151,8 @@ tape('simple simple sensors work', async (t) => {
     t.equal(loc1.systems[0].sensors.length, 1, '1 sensor added to system');
     t.equal(loc2.systems.length, 1, 'One systems were added to #2');
     t.equal(loc2.systems[0].sensors.length, 2, '2 sensors added to system');
-    t.equal(loc2.systems[0].system_id, 'testing-test_site_2-metone::aio2', 'Has correct system name');
+    t.equal(loc2.systems[0].sensors[0].status, 'u', 'has correct status');
+    t.equal(loc2.systems[0].system_id, 'testing-test_site_2-metone:aio2', 'Has correct system name');
     t.end();
 });
 
@@ -181,7 +182,6 @@ tape('simple all files work', async (t) => {
     }));
 
     const data = client.data();
-    //console.dir(data, {depth:null})
     const loc1 = data.locations[0];
     const loc2 = data.locations[1];
 
@@ -193,6 +193,62 @@ tape('simple all files work', async (t) => {
     t.equal(loc1.systems[0].sensors.length, 1, '1 sensor added to system');
     t.equal(loc2.systems.length, 1, 'One systems were added to #2');
     t.equal(loc2.systems[0].sensors.length, 2, '2 sensors added to system');
-    t.equal(loc2.systems[0].system_id, 'testing-test_site_2-metone::aio2', 'Has correct system name');
+    t.equal(loc2.systems[0].system_id, 'testing-test_site_2-metone:aio2', 'Has correct system name');
+    t.end();
+});
+
+
+tape('versioned sensors work', async (t) => {
+
+    const client = new generic.Client(config);
+    await client.fetchMeasurands();
+
+    const files = [
+        {
+            "type": "sensors",
+            "path": `${__dirname}/test_sensors_versioned.csv`
+        }
+    ];
+
+    await Promise.all(files.map(async (file) => {
+        await client.processData(file);
+    }));
+
+    const data = client.data();
+    const loc1 = data.locations[0];
+
+    t.equal(data.locations.length, 1, 'locations were added');
+    t.equal(loc1.systems.length, 1, 'systems were added to #1');
+    t.equal(loc1.systems[0].sensors.length, 2, '2 sensor added to system');
+    t.end();
+});
+
+
+/**
+ * This would be the case when one node/location has more than one
+ * instance of a given parameter/measurand
+ */
+tape('sensors instances work', async (t) => {
+
+    const client = new generic.Client(config);
+    await client.fetchMeasurands();
+
+    const files = [
+        {
+            "type": "sensors",
+            "path": `${__dirname}/test_sensor_instances.csv`
+        }
+    ];
+
+    await Promise.all(files.map(async (file) => {
+        await client.processData(file);
+    }));
+
+    const data = client.data();
+    const loc1 = data.locations[0];
+
+    t.equal(data.locations.length, 1, 'locations were added');
+    t.equal(loc1.systems.length, 1, 'systems were added to #1');
+    t.equal(loc1.systems[0].sensors.length, 2, '2 sensor added to system');
     t.end();
 });

test/test_sensor_instances.csv

@@ -0,0 +1,3 @@
+location,parameter,units,manufacturer_name,model_name,interval_seconds,instance
+Test Site #1,ws,m/s,MetOne,AIO2,3600,a
+Test Site #1,ws,m/s,MetOne,AIO2,3600,b

test/test_sensors_simple.csv

@@ -1,5 +1,5 @@
-location,parameter,units,manufacturer_name,model_name,interval_seconds
-Test Site #1,ws,m/s,MetOne,AIO2,3600
-Test Site #1,co,ppb,Ecotech,Serinus 30,3600
-Test Site #2,ws,m/s,MetOne,AIO2,3600
-Test Site #2,wd,deg,MetOne,AIO2,3600
+location,parameter,units,manufacturer_name,model_name,interval_seconds,status
+Test Site #1,ws,m/s,MetOne,AIO2,3600,u
+Test Site #1,co,ppb,Ecotech,Serinus 30,3600,u
+Test Site #2,ws,m/s,MetOne,AIO2,3600,u
+Test Site #2,wd,deg,MetOne,AIO2,3600,u

test/test_sensors_versioned.csv

@@ -0,0 +1,3 @@
+location,parameter,units,manufacturer_name,model_name,interval_seconds,status,version_date
+Test Site #1,ws,m/s,MetOne,AIO2,3600,u,
+Test Site #1,ws,m/s,MetOne,AIO2,3600,r,20240101