Merge pull request #2031 from Vizzuality/disposable/urthecast

Disposable/urthecast

Author: apercas

app/assets/images/backgrounds/urthecastDisclaimer.png

@@ -83,33 +83,31 @@ define([
     },
 
     _drawCanvasImage: function(canvasData) {
-      var canvas = canvasData.canvas;
-      var image = canvasData.image;
-      var x = canvasData.x;
-      var y = canvasData.y;
-      var z = canvasData.z;
+      "use asm";
+      var canvas = canvasData.canvas,
+          ctx    = canvas.getContext('2d'),
+          image  = canvasData.image,
+          zsteps = this._getZoomSteps(canvasData.z) |0; // force 32bit int type
 
-      var ctx = canvas.getContext('2d');
-      var zsteps = this._getZoomSteps(z);
+      ctx.clearRect(0, 0, 256, 256);                    // this will allow us to sum up the dots when the timeline is running
 
       if (zsteps < 0) {
         ctx.drawImage(image, 0, 0);
-      } else {
-        ctx.imageSmoothingEnabled = false;
+      } else {                                          // over the maxzoom, we'll need to scale up each tile
+
+        ctx.imageSmoothingEnabled = false;              // disable pic enhancement
         ctx.mozImageSmoothingEnabled = false;
-        ctx.webkitImageSmoothingEnabled = false;
 
-        var srcX = 256 / Math.pow(2, zsteps) * (x % Math.pow(2, zsteps));
-        var srcY = 256 / Math.pow(2, zsteps) * (y % Math.pow(2, zsteps));
-        var srcW = 256 / Math.pow(2, zsteps);
-        var srcH = 256 / Math.pow(2, zsteps);
+        // tile scaling
+        var srcX = (256 / Math.pow(2, zsteps) * (canvasData.x % Math.pow(2, zsteps))) |0,
+            srcY = (256 / Math.pow(2, zsteps) * (canvasData.y % Math.pow(2, zsteps))) |0,
+            srcW = (256 / Math.pow(2, zsteps)) |0,
+            srcH = (256 / Math.pow(2, zsteps)) |0;
 
-        ctx.clearRect(0, 0, 256, 256);
         ctx.drawImage(image, srcX, srcY, srcW, srcH, 0, 0, 256, 256);
       }
-
       var I = ctx.getImageData(0, 0, canvas.width, canvas.height);
-      this.filterCanvasImgdata(I.data, canvas.width, canvas.height, z);
+      this.filterCanvasImgdata(I.data, canvas.width, canvas.height, canvasData.z);
       ctx.putImageData(I, 0, 0);
     },
 

app/assets/images/backgrounds/view_existing_global_data.gif

@@ -1,10 +1,10 @@
 define([
-  'moment',
+  'moment', 'handlebars',
   'abstract/layer/CanvasLayerClass', 'helpers/canvasCartoCSSHelper',
   'map/services/CartoDbLayerService',
   'text!map/queries/default_cartodb_canvas.sql.hbs'
 ], function(
-  moment,
+  moment, Handlebars,
   CanvasLayerClass, canvasCartoCSSHelper,
   CartoDbLayerService,
   SQL
@@ -47,7 +47,7 @@ define([
     _getSQL: function() {
       var template = Handlebars.compile(SQL),
           sql = template({
-            table: 'umd_alerts_agg'
+            table: 'umd_alerts_agg_rast'
           });
 
       return sql;

app/assets/javascripts/abstract/layer/CanvasLayerClass.js

@@ -6,7 +6,7 @@
 define([
   'underscore',
   'uri',
-  'abstract/layer/OverlayLayerClass'
+  'abstract/layer/OverlayLayerClass',
 ], function(_, UriTemplate, OverlayLayerClass) {
 
   'use strict';
@@ -19,6 +19,7 @@ define([
 
     init: function(layer, options, map) {
       this.tiles = {};
+      this.layer_slug = layer.slug;
       this._super(layer, options, map);
     },
 
@@ -30,7 +31,7 @@ define([
 
     _getParams: function() {
       var params = {};
-      if (window.location.search.contains('&hresolution=') && window.location.search.indexOf('=', window.location.search.indexOf('&hresolution=') + 13) !== -1) {
+      if (window.location.search.contains('hresolution=') && window.location.search.indexOf('=', window.location.search.indexOf('hresolution=') + 11) !== -1) {
         var params_new_url = {};
         var parts = location.search.substring(1).split('&');
         for (var i = 0; i < parts.length; i++) {
@@ -62,6 +63,10 @@ define([
      * @return {div}     div           Tile div
      */
     getTile: function(coord, zoom, ownerDocument) {
+      var zoomLT7 = (zoom < 7);
+      if(zoomLT7) {
+        if (this.layer_slug == 'urthe') {return;}
+      }
       var zsteps = this._getZoomSteps(zoom);
 
       var url = this._getUrl.apply(this,
@@ -104,7 +109,6 @@ define([
     },
 
     _getUrl: function(x, y, z, params) {
-
       return new UriTemplate(this.options.urlTemplate).fillFromObject({
         x: x,
         y: y,

app/assets/javascripts/abstract/layer/CartoDbCanvasLayerClass.js

@@ -6,8 +6,9 @@
 define([
   'Class',
   'underscore',
+  'mps',
   'map/views/layers/CustomInfowindow'
-], function(Class, _, CustomInfowindow) {
+], function(Class, _, mps, CustomInfowindow) {
 
   'use strict';
 
@@ -26,6 +27,13 @@ define([
       this.name = layer.slug;
       this.tileSize = new google.maps.Size(256, 256);
       this.options = _.extend({}, this.defaults, this.options || {});
+      this.setListeners();
+    },
+
+    setListeners: function() {
+      mps.subscribe('Infowindow/close', _.bind(function(){
+        this.removeMultipolygon();
+      }, this ))
     },
 
     addLayer: function(position, success) {
@@ -34,6 +42,10 @@ define([
         if (this.options.infowindow && this.options.interactivity) {
           this.setInfowindow(layer);
         }
+        if (!!this.options.infowindowImagelayer) {
+          this.addClick();
+        }
+
         success();
       }, this));
 
@@ -42,6 +54,7 @@ define([
     removeLayer: function() {
       var overlayIndex = this._getOverlayIndex();
       this.removeInfowindow();
+      this.removeMultipolygon();
       if (overlayIndex > -1) {
         google.maps.event.clearListeners(this.map, 'click');
         this.map.overlayMapTypes.setAt(overlayIndex, null);
@@ -86,6 +99,12 @@ define([
       }
     },
 
+    removeMultipolygon: function() {
+      if (!!this.multipolygon) {
+        this.map.data.remove(this.multipolygon);
+      }
+    },
+
     _getOverlayIndex: function() {
       var index = -1;
 

app/assets/javascripts/abstract/layer/ImageLayerClass.js

@@ -147,13 +147,16 @@ define([
           var infoWindowOptions = {
             offset: [0, 100],
             infowindowData: {
-              name: data.features[0].attributes['tis.nombre'],
-              country: data.features[0].attributes['tis.pais'],
-              status: data.features[0].attributes['tis.leyenda'],
+              name: data.features[0].attributes['tis.nombre']|| data.features[0].attributes['nombre'],
+              country: data.features[0].attributes['tis.pais']|| data.features[0].attributes['pais'],
+              status: data.features[0].attributes['tis.leyenda']|| data.features[0].attributes['situacion'],
               date_create: data.features[0].attributes['tis.fecha_norma'],
-              area_ha: data.features[0].attributes['tis.area_oficial_ha'].toLocaleString(),
+              area_ha: data.features[0].attributes['tis.area_oficial_ha']|| data.features[0].attributes['area_oficial_ha'],
               category:data.features[0].attributes['tis.categoria'],
               source: data.features[0].attributes['tis.fuente'],
+              company: data.features[0].attributes['cia'],
+              substance: data.features[0].attributes['tipo_minerio'],
+
             }
           }
           this.infowindow = new CustomInfowindow(this.location.latlng, this.map, infoWindowOptions);

app/assets/javascripts/abstract/layer/OverlayLayerClass.js

@@ -249,8 +249,8 @@ define([
           .tickSize(0)
           .tickPadding(0)
           .tickFormat(_.bind(function(d) {
-            return (d == 2000 && this.name == 'prodes') ? String('1997-2000') : String(d);
-            // return String(d);
+            // return (d == 2000 && this.name == 'prodes') ? String('1997-2000') : String(d);
+            return String(d);
           }, this ))
 
       this.svg.append('g')

app/assets/javascripts/abstract/layer/WMSLayerClass.js

@@ -1,45 +1,21 @@
-/**
- * Application entry point.
- */
 require([
-  'jquery',
-  'underscore',
-  'Class',
-  'backbone',
-  'handlebars',
-  'mps',
-  'views/HeaderView',
-  'views/FooterView',
-  'views/SourceMobileFriendlyView',
-  'views/SourceWindowView',
-  'views/FeedbackModalView',
-  'connect/views/UserFormView'
-], function($, _, Class, Backbone, Handlebars, mps, HeaderView, FooterView, SourceMobileFriendlyView,SourceWindowView, FeedbackModalView, UserFormView) {
-  'use strict';
-
-  var ConnectPage = Class.extend({
+  'backbone', 'underscore',
+  'connect/routers/UserRouter'
+], function(Backbone, _, UserRouter) {
 
-    $el: $('body'),
+  'use strict';
 
-    init: function() {
-      this._initViews();
-    },
+  var router = new UserRouter();
+  Backbone.history.start({pushState: true});
 
-    /**
-     * Initialize Landing Views.
-     */
-    _initViews: function() {
-      //shared
-      new HeaderView();
-      new FooterView();
-      new SourceMobileFriendlyView();
-      new SourceWindowView();
-      new FeedbackModalView();
+  // Force nav links to navigate, rather than doing a browser page
+  // reload
+  $('#user-profile-nav').on('click', 'a', function(event) {
+    event.preventDefault();
+    var root = location.protocol + '//' + location.host + '/',
+        href = _.last($(this).prop('href').split(root));
 
-      new UserFormView();
-    }
+    router.navigate(href, {trigger: true});
   });
 
-  new ConnectPage();
-
 });

app/assets/javascripts/abstract/timeline/TimelineYearClass.js

@@ -0,0 +1,30 @@
+define([
+  'backbone',
+  'connect/models/Subscription'
+], function(Backbone, Subscription) {
+
+  'use strict';
+
+  var Subscriptions = Backbone.Collection.extend({
+    model: Subscription,
+
+    url: window.gfw.config.GFW_API_HOST + '/v2/subscriptions',
+
+    sync: function(method, model, options) {
+      options || (options = {});
+
+      if (!options.crossDomain) {
+        options.crossDomain = true;
+      }
+
+      if (!options.xhrFields) {
+        options.xhrFields = {withCredentials:true};
+      }
+
+      return Backbone.sync.call(this, method, model, options);
+    }
+  });
+
+  return Subscriptions;
+
+});

app/assets/javascripts/connect.js

@@ -0,0 +1,27 @@
+define([
+ 'backbone'
+], function(Backbone) {
+
+  'use strict';
+
+  var Subscription = Backbone.Model.extend({
+    idAttribute: 'key',
+
+    sync: function(method, model, options) {
+      options || (options = {});
+
+      if (!options.crossDomain) {
+        options.crossDomain = true;
+      }
+
+      if (!options.xhrFields) {
+        options.xhrFields = {withCredentials:true};
+      }
+
+      return Backbone.sync.call(this, method, model, options);
+    }
+  });
+
+  return Subscription;
+
+});

app/assets/javascripts/connect/collections/Subscriptions.js

@@ -0,0 +1,68 @@
+define([
+  'jquery', 'backbone', 'underscore',
+  'map/models/UserModel',
+  'connect/views/UserFormView',
+  'connect/views/SubscriptionListView'
+], function($, Backbone, _, User, UserFormView, SubscriptionListView) {
+
+  'use strict';
+
+  var UserRouter = Backbone.Router.extend({
+
+    el: $('#profile'),
+
+    routes: {
+      '*path': 'showView'
+    },
+
+    initialize: function() {
+      this.checkLoggedIn();
+      this.setupNavbar();
+    },
+
+    checkLoggedIn: function() {
+      this.user = new User();
+      this.user.fetch().fail(function() {
+        location.href = '/';
+      });
+    },
+
+    setupNavbar: function() {
+      // Force nav links to navigate, rather than doing a browser page
+      // reload
+      var context = this;
+      $('#user-profile-nav').on('click', 'a', function(event) {
+        event.preventDefault();
+        var root = location.protocol + '//' + location.host + '/',
+            href = _.last($(this).prop('href').split(root));
+
+        context.navigate(href, {trigger: true});
+      });
+    },
+
+    availableViews: {
+      'my_gfw': UserFormView,
+      'subscriptions': SubscriptionListView
+    },
+
+    showView: function(routeName) {
+      var viewName = _.last(_.compact(routeName.split('/')));
+
+      this.subViews = this.subViews || {};
+      if (this.subViews[viewName] === undefined) {
+        var View = this.availableViews[viewName];
+        if (View === undefined) { return; }
+
+        this.subViews[viewName] = new View();
+        this.subViews[viewName].render();
+      }
+
+      this.el.html(this.subViews[viewName].el);
+      this.subViews[viewName].delegateEvents();
+    }
+
+  });
+
+  return UserRouter;
+
+});