Merge pull request #908 from Vizzuality/staging

Staging

Author: apercas

app/assets/javascripts/countries/views/overview.js

@@ -288,7 +288,7 @@ gfw.ui.view.CountriesOverview = cdb.core.View.extend({
                             <div class="countries_list__num">'+ord+'</div>\
                             <div class="countries_list__title">'+enabled+'</div>\
                             <div class="countries_list__data">\
-                              <div id="perc_'+val.iso+'" class="perct"><span class="line percent loss" data-orig="' + val.ratio_loss + '">'+ (val.ratio_loss).toFixed(3) +'%</span></div>\
+                              <div id="perc_'+val.iso+'" class="perct"><span class="line percent loss" data-orig="' + val.ratio_loss + '">'+ (val.ratio_loss*100).toFixed(2) +'%</span></div>\
                             </div>\
                           </li>';
           if (key == max_trigger){

app/assets/javascripts/map/presenters/AnalysisToolPresenter.js

@@ -28,6 +28,13 @@ define([
     }
   });
 
+  var concessionsSql = {
+    'logging': 'http://wri-01.cartodb.com/api/v2/sql/?q=SELECT ST_AsGeoJSON(the_geom) from logging_all_merged where cartodb_id ={0}',
+    'mining':'http://wri-01.cartodb.com/api/v2/sql/?q=SELECT ST_AsGeoJSON(the_geom) from mining_permits_merge where cartodb_id ={0}',
+    'oilpalm': 'http://wri-01.cartodb.com/api/v2/sql/?q=SELECT ST_AsGeoJSON(the_geom) from oil_palm_permits_merge where cartodb_id ={0}',
+    'fiber': 'http://wri-01.cartodb.com/api/v2/sql/?q=SELECT ST_AsGeoJSON(the_geom) from fiber_all_merged where cartodb_id ={0}'
+  };
+
   var AnalysisToolPresenter = PresenterClass.extend({
 
     datasets: {
@@ -72,6 +79,10 @@ define([
       'AnalysisTool/analyze-wdpaid': function(wdpaid) {
         this._analyzeWdpai(wdpaid.wdpaid);
       }
+    }, {
+      'AnalysisTool/analyze-concession': function(useid, layerSlug) {
+        this._analyzeConcession(useid, layerSlug);
+      }
     }, {
       'Timeline/date-change': function(layerSlug, date) {
         this.status.set('date', date);
@@ -188,6 +199,32 @@ define([
       }, this));
     },
 
+    /**
+     * Analyze a concession.
+     *
+     * @param  {integer} useid Carto db id
+     */
+    _analyzeConcession: function(useid, layerSlug) {
+      var resource = this._buildResource({
+        useid: useid,
+        use: layerSlug
+      });
+
+      var url = concessionsSql[layerSlug].format(useid);
+
+      $.getJSON(url, _.bind(function(data) {
+        var geojson = {
+          geometry: JSON.parse(data.rows[0].st_asgeojson),
+          properties: {},
+          type: 'Feature'
+        };
+
+        this._geojsonFitBounds(geojson);
+        this.view.drawMultipolygon(geojson);
+        this._publishAnalysis(resource);
+      }, this));
+    },
+
     /**
      * Get the geojson from the current and analyze
      * that geojson without drawing again the geom.

app/assets/javascripts/map/router.js

@@ -18,7 +18,7 @@ define([
   var Router = Backbone.Router.extend({
 
     // temporary, we will do it with env variables
-    _cacheVersion: 0,
+    _cacheVersion: 1,
 
     routes: {
       'map(/:zoom)(/:lat)(/:lng)(/:iso)(/:maptype)(/:baselayers)(/:sublayers)(/)': 'map',

app/assets/javascripts/map/templates/analysisResultsFailure.handlebars

@@ -3,16 +3,16 @@
   <div class="widget-content">
 
     <div class="widget-closed">
-      <span class="analysis-title">Error</span>
+      <span class="analysis-title">Not available</span>
     </div>
 
     <div class="widget-opened">
       <div class="analysis-info">
-        <span class="analysis-title">Error</span>
+        <span class="analysis-title">Not available</span>
       </div>
 
       <div class="analysis-error">
-        Couldn't fetch analysis data.
+        This analysis is not available. Coming soon.
       </div>
 
       <div class="analysis-footer">

app/assets/javascripts/map/templates/infowindow.handlebars

@@ -10,7 +10,7 @@
           <div class="thumb-mask"><img src="{{content.data.image}}" onerror="this.style.display='none';"></div>
       {{/if}}
       {{#if content.data.analysis}}
-        <a href="#analysis" class="analyse" data-layer="{{content.data.id}}"></a>
+        <a id="analyzeBtn" class="analyse" data-useid="{{content.data.cartodb_id}}" data-layer="{{content.data.tablename}}"></a>
       {{/if}}
     </div>
     <div class="cartodb-popup-content">
@@ -114,3 +114,11 @@
   </div>
   <div class="cartodb-popup-tip-container"></div>
 </div>
+
+<script type="text/javascript">
+  $('#analyzeBtn').on('click', function(e) {
+    var useid = $(this).data('useid');
+    var layer = $(this).data('layer');
+    mps.publish('AnalysisTool/analyze-concession', [useid, layer]);
+  });
+</script>

app/assets/javascripts/map/views/layers/LoggingLayer.js

@@ -12,9 +12,9 @@ define([
   var LoggingLayer = CartoDBLayerClass.extend({
 
     options: {
-      sql: 'SELECT the_geom_webmercator, company, country, permit_num, nat_origin, area_ha, name, \'{tableName}\' AS layer, {analysis} AS analysis FROM {tableName}',
+      sql: 'SELECT \'logging\' as tablename, cartodb_id, the_geom_webmercator, company, country, permit_num, nat_origin, area_ha, name, \'{tableName}\' AS layer, {analysis} AS analysis FROM {tableName}',
       infowindow: true,
-      interactivity: 'name, company, country, permit_num, nat_origin, area_ha, analysis',
+      interactivity: 'cartodb_id, tablename, name, company, country, permit_num, nat_origin, area_ha, analysis',
       analysis: true
     }
 

app/assets/javascripts/map/views/layers/MiningLayer.js

@@ -12,9 +12,9 @@ define([
   var MiningLayer = CartoDBLayerClass.extend({
 
     options: {
-      sql: 'SELECT the_geom_webmercator, company, country, area_ha, name, \'{tableName}\' AS layer, {analysis} AS analysis FROM {tableName}',
+      sql: 'SELECT cartodb_id, \'mining\' as tablename, the_geom_webmercator, company, country, area_ha, name, \'{tableName}\' AS layer, {analysis} AS analysis FROM {tableName}',
       infowindow: true,
-      interactivity: 'name, company, country, area_ha, analysis',
+      interactivity: 'cartodb_id, tablename, name, company, country, area_ha, analysis',
       analysis: true
     }
 

app/assets/javascripts/map/views/layers/OilPalmLayer.js

@@ -12,9 +12,9 @@ define([
   var OilPalmLayer = CartoDBLayerClass.extend({
 
     options: {
-      sql: 'SELECT the_geom_webmercator, type, country, area_ha, \'{tableName}\' AS layer, {analysis} AS analysis FROM {tableName}',
+      sql: 'SELECT \'oilpalm\' as tablename, cartodb_id, the_geom_webmercator, type, country, area_ha, \'{tableName}\' AS layer, {analysis} AS analysis FROM {tableName}',
       infowindow: true,
-      interactivity: 'country, type, area_ha, analysis',
+      interactivity: 'cartodb_id, tablename, country, type, area_ha, analysis',
       analysis: true
     }
 

app/assets/javascripts/map/views/layers/WoodFiberPlantationsLayer.js

@@ -12,9 +12,9 @@ define([
   var WoodFiberPlantationsLayer = CartoDBLayerClass.extend({
 
     options: {
-      sql: 'SELECT the_geom_webmercator, type, area_ha, \'{tableName}\' AS layer, {analysis} AS analysis FROM {tableName}',
+      sql: 'SELECT \'fiber\' as tablename, cartodb_id, the_geom_webmercator, type, area_ha, \'{tableName}\' AS layer, {analysis} AS analysis FROM {tableName}',
       infowindow: true,
-      interactivity: 'type, area_ha, analysis',
+      interactivity: 'cartodb_id, tablename, type, area_ha, analysis',
       analysis: true
     }