diff --git a/index.html b/index.html
index 421477a..d7d992a 100644
--- a/index.html
+++ b/index.html
@@ -29,8 +29,55 @@
mapTypeControl: false
});
+ var forestHeight = new google.maps.ImageMapType({
+ getTileUrl: function(ll, z) {
+ var X = ll.x % (1 << z); // wrap
+ return "http://api.tiles.mapbox.com/v3/cartodb.Forest-Height-Test/" + z + "/" + X + "/" + ll.y + ".png";
+ },
+ tileSize: new google.maps.Size(256, 256),
+ isPng: true,
+ maxZoom: 7,
+ name: "Forest Height",
+ alt: "Global forest height"
+ });
+
+ map.mapTypes.set('forests', forestHeight);
+ var Road = function(){
+ this.Road = function(){
+ map.setMapTypeId(google.maps.MapTypeId.ROADMAP);
+ map.setOptions({styles: null});
+ }
+ }
+ var Satellite = function(){
+ this.Satellite = function(){
+ map.setMapTypeId(google.maps.MapTypeId.SATELLITE);
+ map.setOptions({styles: null});
+ }
+ }
+ var Forest = function(){
+ this.Forest = function(){
+ map.setMapTypeId('forests');
+ map.setOptions({styles: null});
+ }
+ }
+
+ var map_style = {};
+ map_style.google_maps_customization_style = [ { stylers: [ { saturation: -65 }, { gamma: 1.52 } ] }, { featureType: "administrative", stylers: [ { saturation: -95 },{ gamma: 2.26 } ] }, { featureType: "water", elementType: "labels", stylers: [ { visibility: "off" } ] }, { featureType: "administrative.locality", stylers: [ { visibility: 'off' } ] }, { featureType: "road", stylers: [ { visibility: "simplified" }, { saturation: -99 }, { gamma: 2.22 } ] }, { featureType: "poi", elementType: "labels", stylers: [ { visibility: "off" } ] }, { featureType: "road.arterial", stylers: [ { visibility: 'off' } ] }, { featureType: "road.local", elementType: "labels", stylers: [ { visibility: 'off' } ] }, { featureType: "transit", stylers: [ { visibility: 'off' } ] }, { featureType: "road", elementType: "labels", stylers: [ { visibility: 'off' } ] },{ featureType: "poi", stylers: [ { saturation: -55 } ] } ];
+
+ var Soft = function(){
+ this.Soft = function(){
+ map.setMapTypeId(google.maps.MapTypeId.ROADMAP);
+ map.setOptions({styles: map_style.google_maps_customization_style});
+ }
+ }
+
dat.GUI.DEFAULT_WIDTH = 300;
gui = new dat.GUI();
+ var bl = gui.addFolder("Basemap Style");
+ bl.add(new Road(), 'Road');
+ bl.add(new Satellite(), 'Satellite');
+ bl.add(new Soft(), 'Soft').name('Soft toned');
+ bl.add(new Forest(), 'Forest').name('Global forest height');
GFW(function(env) {
GFW.app = new env.app.Instance(map, {
diff --git a/sql/pixels_to_polys.sql b/sql/pixels_to_polys.sql
index 326b859..5a8ae02 100644
--- a/sql/pixels_to_polys.sql
+++ b/sql/pixels_to_polys.sql
@@ -22,6 +22,9 @@ SET statement_timeout TO 0; UPDATE forma_data SET the_geom = ST_Transform(ST_Set
--create polygons
SET statement_timeout TO 0; DELETE FROM forma_zoom_polys; INSERT INTO forma_zoom_polys (the_geom,z,alerts) (SELECT st_multi(st_transform(ST_Envelope(ST_SetSRId(ST_Collect( ST_Point( ((x*256.0) * (156543.03392804062 / (2^z)) - 20037508.342789244), -(((y)*256.0) * (156543.03392804062 / (2^z)) - 20037508.342789244)), ST_Point( (((x+1.0)*256.0) * (156543.03392804062 / (2^z)) - 20037508.342789244), -(((y-1.0)*256.0) * (156543.03392804062 / (2^z)) - 20037508.342789244)) ), 3857)),4326)) as the_geom,z,array_length(date_array,1) FROM forma_data);
+
+
+
--create arrays of distinct dates
INSERT INTO forma_data (x,y,date_array,z) (
SELECT x, y, array_agg(undate) as date_array, 15 as z FROM (
diff --git a/src/gfw.js b/src/gfw.js
index ffc7fd9..dff70c6 100644
--- a/src/gfw.js
+++ b/src/gfw.js
@@ -219,7 +219,7 @@ GFW.modules.maplayer = function(gfw) {
var that = this;
this._opacity = {alpha: 100};
- this.toggle = gui.addFolder(this.layer.get('title'));;
+ this.toggle = gui.addFolder(this.layer.get('title'));
this.toggle
.add(this.layer.attributes, 'visible')
.onChange(function(value) {