Merge pull request #1880 from Vizzuality/release/oktoberfest

Release/oktoberfest

Author: apercas

app/assets/images/howto-screenshots-mobile/img10-1.png

@@ -51,10 +51,34 @@ define([
      * @return {string}  url  Tile url
      */
     _getUrl: function(tile, zoom) {
+      var params = {};
+      if (window.location.search.contains('&hresolution=') && window.location.search.indexOf('=', window.location.search.indexOf('&hresolution=') + 13) !== -1) {
+        var params_new_url = {};
+        var parts = location.search.substring(1).split('&');
+        for (var i = 0; i < parts.length; i++) {
+          var nv = parts[i].split('=');
+          if (!nv[0]) continue;
+            params_new_url[nv[0]] = nv[1] || true;
+        }
+        params = JSON.parse(atob(params_new_url.hresolution));
+      }
+      else if (!!sessionStorage.getItem('high-resolution')) {
+        params = JSON.parse(atob(sessionStorage.getItem('high-resolution')));
+      }
+      params = {
+         'color_filter': params.color_filter || 'rgb',
+         'cloud': params.cloud || '100',
+         'mindate': params.mindate || '2000-09-01',
+         'maxdate': params.maxdate || '2015-09-01'
+        }
       return new UriTemplate(this.options.urlTemplate).fillFromObject({
         x: tile.x,
         y: tile.y,
-        z: zoom
+        z: zoom,
+        sat: params.color_filter,
+        cloud: params.cloud,
+        mindate: params.mindate,
+        maxdate: params.maxdate
       });
     }
   });

app/assets/images/howto-screenshots-mobile/img10.png

@@ -54,7 +54,7 @@ define([
 
       this.markers = _.map(stories, function(story) {
 
-        story.title = _.str.truncate(story.title, 34);
+        story.title = _.str.truncate(story.title, 68);
 
         var markerOptions, infoWindowOptions;
 

app/assets/images/howto-screenshots-mobile/img11-1.png

@@ -248,7 +248,10 @@ define([
           .ticks(ticks)
           .tickSize(0)
           .tickPadding(0)
-          .tickFormat(function(d) {return String(d); })
+          .tickFormat(_.bind(function(d) {
+            return (d == 2000 && this.name == 'prodes') ? String('1997-2000') : String(d);
+            // return String(d);
+          }, this ))
 
       this.svg.append('g')
           .attr('class', 'xaxis-years')
@@ -317,6 +320,7 @@ define([
         .attr('x2', this.handlers.right.attr('x'));
 
       d3.select('.xaxis-years')
+          .attr('class', 'xaxis-years '+this.name)
           .selectAll('.tick')
           .on('click',_.bind(function(value){
             this.selectYear(value);

app/assets/images/howto-screenshots-mobile/img11-2.png

@@ -111,8 +111,8 @@ define([], function() {
 
   config.GRAPHS = {
     total_loss: {
-      title: "Countries with greatest tree cover loss (2001-2013)",
-      subtitle: "Global tree cover loss, 2001-2013<a href='#' class='info' data-source='total_loss'><i class='dark'></i></a>"
+      title: "Countries with greatest tree cover loss (2001-2014)",
+      subtitle: "Global tree cover loss, 2001-2014<a href='#' class='info' data-source='total_loss'><i class='dark'></i></a>"
     },
     percent_loss: {
       title: "Countries with greatest tree cover gain (2001-2012)",
@@ -127,8 +127,8 @@ define([], function() {
       subtitle: "Tree cover loss relative to tree cover gain by country (2001-2012)<a href='#' class='info' data-source='total_loss'><i class='dark'></i></a>"
     },
     domains: {
-      title: "Climate domains ranked in order of<br />greatest tree cover loss (2001-2013)",
-      subtitle: "Tree cover loss per year by climate domain, 2001-2013<a href='#' class='info' data-source='total_loss'><i class='dark'></i></a>"
+      title: "Climate domains ranked in order of<br />greatest tree cover loss (2001-2014)",
+      subtitle: "Tree cover loss per year by climate domain, 2001-2014<a href='#' class='info' data-source='total_loss'><i class='dark'></i></a>"
     }
   };
 

app/assets/images/howto-screenshots-mobile/img11-3.png

@@ -58,7 +58,7 @@ define([
 
       this.x_scale = d3.scale.linear()
         .range([m, w-m])
-        .domain([2001, 2013]);
+        .domain([2001, 2014]);
 
       this.grid_scale = d3.scale.linear()
         .range([vertical_m, h-vertical_m])
@@ -292,11 +292,11 @@ define([
 
             if (!!mode && mode.mode == 'percent') {
               $('.overview_graph__legend').find('.trigger-mode').html('<span>GROSS LOSS</span> <strong>PERCENT LOSS</strong>').show();
-              $('.overview_graph__title').html('Countries with greatest percent loss (2001-2013) relative to tree cover in 2000');
+              $('.overview_graph__title').html('Countries with greatest percent loss (2001-2014) relative to tree cover in 2000');
 
             } else {
               $('.overview_graph__legend').find('.trigger-mode').html('<strong>GROSS LOSS</strong> <span>PERCENT LOSS</span>').show();
-              $('.overview_graph__title').html('Countries with greatest tree cover loss (2001-2013)');
+              $('.overview_graph__title').html('Countries with greatest tree cover loss (2001-2014)');
             }
           }
 
@@ -519,7 +519,8 @@ define([
         }, this ));
       } else if (this.model.get('graph') === 'domains') {
         $('.countries_list__header__minioverview').show();
-        var sql = 'SELECT ecozone as name, sum(loss) as total_loss, sum(gain) as total_gain FROM umd_eco where thresh = ' + (this.helper.config.canopy_choice || 30) +' group by ecozone';
+        var sql = "SELECT ecozone as name, sum(loss) as total_loss, sum(gain) as total_gain FROM umd_eco_2014 where thresh = "+ (this.helper.config.canopy_choice || 30) +" and ecozone !='Water' and ecozone != 'Polar' group by ecozone";
+        // "SELECT ecozone as name, sum(loss) as total_loss, sum(gain) as total_gain FROM umd_eco where thresh = ' + (this.helper.config.canopy_choice || 30) +’ and ecozone !='Water' and ecozone != 'Polar' group by ecozone"
         d3.json('http://wri-01.cartodb.com/api/v2/sql/?q='+encodeURIComponent(sql), _.bind(function(json) {
           var self = that,
               markup_list = '';
@@ -626,7 +627,7 @@ define([
       } else if (this.model.get('graph') === ('percent_loss')) {
         var sql = 'SELECT year, \
                          loss_perc \
-                  FROM   umd_nat \
+                  FROM   umd_nat_final_1 \
                   WHERE  thresh = '+ (this.helper.config.canopy_choice || 30) +' \
                          AND iso = \''+ iso +'\'';
 
@@ -657,7 +658,7 @@ define([
         var sql = 'SELECT year, \
                    loss,  \
                    extent_offset extent  \
-                  FROM   umd_nat  \
+                  FROM   umd_nat_final_1  \
                   WHERE  thresh = '+ (this.helper.config.canopy_choice || 30) +'  \
                          AND iso = \''+ iso +'\' \
                          AND year > 2000 ';
@@ -733,10 +734,10 @@ define([
     _drawYears: function() {
       var markup_years = '';
 
-      for (var y = 2001; y<=2013; y += 1) {
+      for (var y = 2001; y<=2014; y += 1) {
         var y_ = this.x_scale(y);
 
-        if (y === 2001 || y === 2013) {
+        if (y === 2001 || y === 2014) {
           y_ -= 5;
         } else {
           y_ -= 0;
@@ -999,7 +1000,7 @@ define([
                   } else {
                     l_mha = 'Ha';
                   }
-                  $target.find('.figure').addClass('extent').html(extent.toLocaleString());
+                  $target.find('.figure').addClass('extent').html(Math.round(extent).toLocaleString());
                   $target.find('.unit').html(l_mha);
                 }
               }, this),
@@ -1241,29 +1242,26 @@ define([
         });
       } else if (this.model.get('graph') === 'domains') {
         this._showYears();
-
-
-        var sql = 'SELECT ecozone as name, loss, year FROM umd_eco where thresh = ' + (this.helper.config.canopy_choice || 30);
+        var sql = "SELECT ecozone as name, sum(loss), year FROM umd_eco_2014 where thresh = " + (this.helper.config.canopy_choice || 30) + " and ecozone !='Water' and ecozone != 'Polar' group by name, year";
         d3.json('http://wri-01.cartodb.com/api/v2/sql/?q='+encodeURIComponent(sql), _.bind(function(json) {
-
-          var data = _.groupBy(json.rows, function(row){
+          var data = _.groupBy(_.sortBy(json.rows, function(row){ return row.year}), function(row){
             return row.name;
           });
           var data_index = 0;
           var data_arr = [];
-          data = _.each(data, function(domain, i){
+          _.each(data, function(domain, i){
             var domain_obj = {};
 
             domain_obj['name'] = i;
-            domain_obj['max'] = _.max(domain, function(y){return y.loss}).loss;
+            domain_obj['max'] = _.max(domain, function(y){return y.sum}).sum;
 
             _.each(domain, function(y, j){
-              domain_obj['y'+y.year] = y.loss;
+              domain_obj['y'+y.year] = y.sum;
             });
 
             data_arr.push(domain_obj);
           });
-
+          data_arr = _.sortBy(data_arr, function(row){ return row.name });
           var r_scale = d3.scale.linear()
             .range([5, 30]) // max ball radius
             .domain([0, d3.max(data_arr, function(d) { return d.max; })])

app/assets/images/howto-screenshots-mobile/img11.png

@@ -20,7 +20,8 @@ define([
     events: {
       'click #get-started' : 'getStarted',
       'click #go-to-apps' : 'goToApps',
-      'click .gotomap' : 'gotoMap'
+      'click .gotomap' : 'gotoMap',
+      'click .ribbon' : 'startSurvey'
     },
 
     initialize: function() {
@@ -31,7 +32,7 @@ define([
       this.slickSlider();
     },
 
-    slickSlider: function(){
+    slickSlider: function() {
       //INIT
       $('.main-slider-viewport').slick({
         infinite: true,
@@ -64,6 +65,12 @@ define([
       $(e.currentTarget).toggleClass('active');
     },
 
+    startSurvey: function() {
+      ga('send', 'event', 'Home', 'Click', 'Survey link in slider');
+      var win = window.open('https://www.surveymonkey.com/s/GFWeval', '_blank');
+      win.focus();
+    },
+
     /**
      * Closes submenu tooltip
      * Check the click target is not the dialog itself.

app/assets/images/howto-screenshots-mobile/img12.png

@@ -0,0 +1,32 @@
+#gfw_landsat_alerts{
+  marker-file: url(http://com.cartodb.users-assets.production.s3.amazonaws.com/maki-icons/square-18.svg);
+  marker-fill-opacity: 1;
+  marker-line-width: 0;
+  marker-placement: point;
+  marker-type: ellipse;
+  marker-width: 0.12;
+  marker-height:0.12;
+  marker-fill: #F69;
+  marker-allow-overlap: true;
+
+  [zoom=10]{
+  marker-width: 0.3;
+  marker-height:0.3;
+  }
+  [zoom=11]{
+  marker-width: 0.75;
+  marker-height:0.75;
+  }
+  [zoom=12]{
+  marker-width: 1.5;
+  marker-height:1.5;
+  }
+  [zoom=13]{
+  marker-width: 3;
+  marker-height:3;
+  }
+  [zoom>13]{
+  marker-width: 1.5*('@zoom'-13);
+  marker-height:1.5*('@zoom'-13);
+  }
+}

app/assets/images/howto-screenshots-mobile/img13-1.png

@@ -0,0 +1,19 @@
+#khm_economic_land_concession_wgs {
+   polygon-opacity: 0.8;
+   line-color: #FFF;
+   line-width: 0;
+   line-opacity: 1;
+}
+
+#khm_economic_land_concession_wgs[adjustment_classification="Downsized"] {
+   polygon-fill: #FFCC00;
+}
+#khm_economic_land_concession_wgs[adjustment_classification="Downsized after revocation"] {
+   polygon-fill: #FF6600;
+}
+#khm_economic_land_concession_wgs[adjustment_classification="No evidence of adjustment"] {
+   polygon-fill: #055D00;
+}
+#khm_economic_land_concession_wgs[adjustment_classification="Revoked"] {
+   polygon-fill: #B40903;
+}

app/assets/images/howto-screenshots-mobile/img13.png

@@ -0,0 +1,48 @@
+#gfw_plantations {
+   polygon-opacity: 0.5;
+   line-color: #FFF;
+   line-width: 0.5;
+   line-opacity: 0;
+   polygon-fill: transparent;
+}
+#gfw_plantations[spec_simp="Fruit"] {
+  polygon-fill: #b2b300;
+}
+#gfw_plantations[spec_simp="Fruit mix"] {
+  polygon-fill: #FF0;
+}
+#gfw_plantations[spec_simp="Hevea (rubber)"] {
+  polygon-fill: #00bdbd;
+}
+#gfw_plantations[spec_simp="Oil palm"] {
+  polygon-fill: #f44c43;
+}
+#gfw_plantations[spec_simp="Oil palm mix"] {
+  polygon-fill: #f7837d;
+}
+#gfw_plantations[spec_simp="Other"] {
+  polygon-fill: #9ECC49;
+}
+#gfw_plantations[spec_simp="Other mix"] {
+  polygon-fill: #c1df8b;
+}
+#gfw_plantations[spec_simp="Recently cleared"] {
+  polygon-fill: #A53ED5;
+}
+#gfw_plantations[spec_simp="Rubber"] {
+  polygon-fill: #11002F;
+}
+#gfw_plantations[spec_simp="Rubber mix"] {
+  polygon-fill: #0FF;
+}
+#gfw_plantations[spec_simp="Unknown"] {
+  polygon-fill: #b5b0b0;
+}
+#gfw_plantations[spec_simp="Wood fiber / timber"] {
+  polygon-fill: #0F3B82;
+}
+#gfw_plantations[spec_simp="Wood fiber / timber mix"] {
+  polygon-fill: #246ee6;
+}
+
+

app/assets/images/howto-screenshots-mobile/img14-1.png

@@ -0,0 +1,20 @@
+#gfw_plantations {
+   polygon-opacity: 0.5;
+   line-color: #FFF;
+   line-width: 0.5;
+   line-opacity: 0;
+   polygon-fill: transparent;
+}
+
+#gfw_plantations[type_text="Large industrial plantation"] {
+   polygon-fill: #F84F40;
+}
+#gfw_plantations[type_text="Mosaic of medium-sized plantations"] {
+   polygon-fill: #A53ED5;
+}
+#gfw_plantations[type_text="Mosaic of small-sized plantations"] {
+   polygon-fill: #33A02C;
+}
+#gfw_plantations[type_text="Clearing/ very young plantation"] {
+   polygon-fill: #a7652a;
+}

app/assets/images/howto-screenshots-mobile/img14-2.png

@@ -13,12 +13,14 @@
       <sld:Title>polygonSymbolizer</sld:Title>
       <sld:FeatureTypeStyle>
         <sld:Rule>
+          <!--
           <ogc:Filter>
             <ogc:PropertyIsNotEqualTo>
               <ogc:PropertyName>pais</ogc:PropertyName>
               <ogc:Literal>Brasil</ogc:Literal>
             </ogc:PropertyIsNotEqualTo>
           </ogc:Filter>
+          -->
           <sld:PolygonSymbolizer>
             <sld:Fill>
               <!-- fill states polygons with RGB color "#FF0000" -->

app/assets/images/howto-screenshots-mobile/img14.png

@@ -567,4 +567,12 @@
   line-width: 0;
   line-opacity: 1;
   }
+  [layer='khm_protected_areas_wgs'] {
+  polygon-fill: #3182BD;
+  polygon-opacity: 0.6;
+  line-color: #FFF;
+  line-width: 0.25;
+  line-opacity: 1;
+  }
+
 }