Merge pull request #536 from rfcx/feature/CS-494-spectrogram-from-api

CS-494 Request non-legacy spectrogram tiles from Media API

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## v3.0.10 - Feb XX, 2021
 
+New features:
+- CS-494 Request spectrogram tiles from Media API for audios from RFCx streams
+
 Resolved issues:
 - PI-545 Improve the quality of the spectrogram image
 - PI-504 Can not filter more than one tag

app/model/recordings.js

@@ -247,6 +247,7 @@ var Recordings = {
             projection = "R.recording_id AS id, \n"+
                         "SUBSTRING_INDEX(R.uri,'/',-1) as file, \n"+
                         "S.name as site, \n"+
+                        "S.legacy as legacy, \n"+
                         "R.uri, \n"+
                         "R.datetime, \n"+
                         "R.mic, \n"+

assets/app/app/visualizer/visobjects/recording.js

@@ -12,7 +12,7 @@ angular.module('a2.visobjects.recording', [
 })
 .service('VisualizerObjectRecordingTypeLoader', function ($q, Project) {
     var khz_format = function(v){return (v/1000) | 0; };
-    
+
     var recording = function(data, extra){
         for(var i in data){ this[i] = data[i]; }
         this.sampling_rate = this.sample_rate;
@@ -38,11 +38,18 @@ angular.module('a2.visobjects.recording', [
         };
         // set it to the scope
         this.tiles.set.forEach((function(tile){
-            tile.src="/api/project/"+Project.getUrl()+"/recordings/tiles/"+this.id+"/"+tile.i+"/"+tile.j;
+            if (!!data.legacy) {
+                tile.src="/api/project/"+Project.getUrl()+"/recordings/tiles/"+this.id+"/"+tile.i+"/"+tile.j;
+            } else {
+                var streamId = data.uri.split('/')[3]
+                var start = new Date(new Date(data.datetime).valueOf() + Math.round(tile.s * 1000)).toISOString()
+                var end = new Date(new Date(data.datetime).valueOf() + Math.round((tile.s + tile.ds) * 1000)).toISOString()
+                tile.src = '/api/ingest/recordings/' + streamId + '_t' + start.replace(/-|:|\./g, '') + '.' + end.replace(/-|:|\./g, '') + '_z95_wdolph_g1_fspec_mtrue_d1023.255.png'
+            }
         }).bind(this));
     };
     recording.layers=[
-    
+
     ];
     recording.fetch = function(visobject){
         var d = $q.defer();

config/rfcx.json

@@ -1,5 +1,5 @@
 {
   "coreAPIEnabled": false,
   "apiBaseUrl": "https://api.rfcx.org",
-  "mediaBaseUrl": "https://media.rfcx.org"
+  "mediaBaseUrl": "https://media-api.rfcx.org"
 }