Merge pull request #3577 from Vizzuality/fix/analysis-layers-service

Fix/analysis layers service
wri · Aug 31, 2018 · db937cc · db937cc
2 parents 2791776 + 485cd3f
commit db937cc
Show file tree

Hide file tree

Showing 9 changed files with 561 additions and 581 deletions.
diff --git a/app/assets/javascripts/connect/views/SubscriptionNewView.js b/app/assets/javascripts/connect/views/SubscriptionNewView.js
@@ -178,14 +178,7 @@ define([
           var defaults = this.subscription.get('defaults').params;
 
           if (!!data.use && this.usenames.indexOf(data.use) === -1) {
-            var provider = {
-              table: data.use,
-              filter: 'cartodb_id = ' + data.useid,
-              user: 'wri-01',
-              type: 'carto'
-            };
-
-            GeostoreService.use(provider).then(function(useGeostoreId) {
+             GeostoreService.use({ use: use, useid: useid }).then(function(useGeostoreId) {
               this.subscription.set({
                 metadata: JSON.stringify(data)
               }, { silent: true });

diff --git a/app/assets/javascripts/map/presenters/analysis/AnalysisResultsNewPresenter.js b/app/assets/javascripts/map/presenters/analysis/AnalysisResultsNewPresenter.js
@@ -133,8 +133,7 @@ define(
         /**
          * Define variable that we are going to use later
          */
-        var type = this.status.get('type'),
-          results = this.status.get('results'),
+        var results = this.status.get('results'),
           dateRange = [
             moment(this.status.get('begin')),
             moment(this.status.get('end'))
@@ -145,10 +144,28 @@ define(
 
         // Area
         p.areaHa = this.roundNumber(results.areaHa || 0);
+        p.treeExtent = this.roundNumber(
+          results.extent2000 || results.treeExtent || 0
+        );
+        p.treeExtent2010 = this.roundNumber(
+          results.extent2010 || results.treeExtent2010 || 0
+        );
+
+        // Change
+        p.loss = this.roundNumber(results.loss || 0);
+        p.gain = this.roundNumber(results.gain || 0);
 
         // Alerts
-        p.alerts = {};
-        p.alerts.totalAlerts = this.roundNumber(results.loss || 0);
+        if (p.slug === 'imazon-alerts') {
+          p.degrad = results.alerts.degrad
+            ? Math.round(results.alerts.degrad).toLocaleString()
+            : 0;
+          p.defor = results.alerts.defor
+            ? Math.round(results.alerts.defor).toLocaleString()
+            : 0;
+        } else {
+          p.alerts = this.roundNumber(results.alerts || 0);
+        }
 
         // Options
         p.options = {};
@@ -170,52 +187,19 @@ define(
         /**
          * Exceptions
          */
-        // If glads enpoint; api response schema is different!
-        p.alerts.totalAlerts =
-          p.baselayers && typeof p.baselayers.umd_as_it_happens !== 'undefined'
-            ? this.roundNumber(results.alerts || 0)
-            : this.roundNumber(results.loss || 0);
-
-        p.areaHa = this.roundNumber(results.areaHa || 0);
-        p.alerts.gainAlerts = this.roundNumber(results.gain || 0);
-        p.alerts.treeExtent = this.roundNumber(
-          results.extent2000 || results.treeExtent || 0
-        );
-        p.alerts.treeExtent2010 = this.roundNumber(
-          results.extent2010 || results.treeExtent2010 || 0
-        );
-
         // Dates
         p.dates.lossDateRange = '{0}-{1}'.format(
           dateRange[0].year(),
           dateRange[1].year() - 1
         );
 
-        if (p.slug === 'viirs-active-fires') {
-          p.alerts.totalAlerts = this.roundNumber(results.alerts || 0);
-        }
-
-        if (p.slug === 'imazon-alerts') {
-          p.alerts.degradAlerts =
-            !!results.value.length && results.value[0]
-              ? Math.round(results.value[0].value).toLocaleString()
-              : 0;
-          p.alerts.deforAlerts =
-            !!results.value.length && results.value[1]
-              ? Math.round(results.value[1].value).toLocaleString()
-              : 0;
-        }
-
         if (p.slug === 'prodes-loss') {
           p.dates.dateRange = '{0}-{1}'.format(
             dateRange[0].year(),
             dateRange[1].year() - 1
           );
         }
 
-        if (p.slug === 'forma250GFW') {
-          p.alerts.totalAlerts = this.roundNumber(results.loss || 0);
-        }
         return p;
       },