From 35a8ab057997fe2295436d639537feecc4d8bfce Mon Sep 17 00:00:00 2001
From: Stanislav Rassokhin <sr.rassokhin@gmail.com>
Date: Sat, 13 Feb 2021 00:40:57 +0300
Subject: [PATCH] CS-494 Request spectrogram tiles from Media API for audios
 from RFCx streams

---
 CHANGELOG.md                                      |  5 +++++
 DEPLOYMENT_NOTES.md                               |  4 ++++
 app/model/recordings.js                           |  1 +
 assets/app/app/visualizer/visobjects/recording.js | 13 ++++++++++---
 config/rfcx.json                                  |  2 +-
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e00a0b19..7b0f403cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Arbimon Release Notes
 
+## v3.0.10
+
+New features:
+- ([CS-494](https://jira.rfcx.org/browse/CS-494)) Request spectrogram tiles from Media API for audios from RFCx streams
+
 ## v3.0.9 - Feb 12, 2021
 
 New features:
diff --git a/DEPLOYMENT_NOTES.md b/DEPLOYMENT_NOTES.md
index 5a328489d..02befdbf0 100644
--- a/DEPLOYMENT_NOTES.md
+++ b/DEPLOYMENT_NOTES.md
@@ -1,5 +1,9 @@
 # Arbimon Deployment Notes
 
+## v3.0.10
+
+_None_
+
 ## v3.0.9
 
 - Run migration 006-project-table-add-aed-clustering-enabled-colums.sql
diff --git a/app/model/recordings.js b/app/model/recordings.js
index b53c29054..c033052e7 100644
--- a/app/model/recordings.js
+++ b/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"+
diff --git a/assets/app/app/visualizer/visobjects/recording.js b/assets/app/app/visualizer/visobjects/recording.js
index 40bc39cf5..b6ced7aa1 100644
--- a/assets/app/app/visualizer/visobjects/recording.js
+++ b/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;
@@ -37,12 +37,19 @@ angular.module('a2.visobjects.recording', [
             }
         };
         // set it to the scope
+        var streamId = data.uri.split('/')[3]
         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 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();
diff --git a/config/rfcx.json b/config/rfcx.json
index 7c30e74a6..983e2e2c5 100644
--- a/config/rfcx.json
+++ b/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"
 }