Merge branch 'master' of https://github.com/oeco/infoamazonia-maps

Conflicts:
	tilemill/deforestation-sad/project.mml

Author: hvalois

.gitignore

@@ -6,4 +6,5 @@
 .Spotlight-V100
 .Trashes
 ehthumbs.db
-Thumbs.db
+Thumbs.db
+tilemill/biodiversity/data/*

README.md

@@ -72,71 +72,15 @@ Once the import is complete you will need to update and optimize the tables in y
 
 ## Deforestation data from Imazon SAD
 
-Imazon publishes monthly deforestation alerts at this page:
+This project has moved to:
 
-http://www.imazongeo.org.br/doc/downloads.php
-
-In the `tile/deforestation-sad/data` folder you'll find a file named `alerts.shp`, which has all Imazon SAD information to date.
-
-If you need to update this file, follow the instructions:
-
-1) Download the latest file and unzip it to `data` folder. You should have only two shapefiles at you data folder, `alerts.shp` and the new one from Imazon SAD;<br>
-2) Open QGIS and select menu 'Vector' / 'Data Management Tools' / 'Merge Shapefile to One';<br>
-3) Select the `data` folder as the input directory;<br>
-4) Save the output shapefile as `alerts-new.shp` at `data` folder;<br>
-5) Open this file in QGIS, and use the code bellow in the the field calculator to update `area_ha` field: <br>
-
-```
-	CASE 
-		WHEN AREA > 0 THEN toReal(toInt(AREA * 10000)) /100
-		WHEN area_km2 > 0 THEN toReal(toInt(area_km2 * 10000)) /100
-		WHEN area_km2_ > 0 THEN toReal(toInt(area_km2_ * 10000)) /100    
-		WHEN F_AREA > 0 THEN toReal(toInt(F_AREA * 10000)) /100
-		WHEN Shape_Area > 0 THEN toReal(toInt(Shape_Area * 10000)) /100
-	END
-```
-6) Finally, in QGIS, save `alerts-new.shp` as `alerts.shp`, overwriting the old file;<br>
-7) Regenerate the map at TileMill;<br>
-8) Upload it to Mapbox;<br>
-9) Delete old files and commit changes to this repository.<br>
-
-If you need to download all source files again, run these commands inside `tilemill\deforestion-sad\data` folder:
-
-	wget -r -nd -A "imazon_sad_desmatamento*.zip" -P sources http://www.imazongeo.org.br/doc/downloads.php
-	unzip -j sources/\*.zip -d sources-expanded -j
-
-You'll find the shapefiles uncompressed in `tilemill\deforestion-sad\data\sources-expanded`.
+https://github.com/oeco/tm-deforestation-sad
 
 ## Fires
 
-These projects are also is being powered by the postgres database. They are broken out into separate projects so preserve interactivity for both the high-intensity (yellow) layer, and the recent fires layer (red). Data for both these layer has been included in the desmata.sql dump. 
-
-### Source
-
-Monthly data should be requested at:
-
-http://firms.modaps.eosdis.nasa.gov/download/
-
-### Updating Fires
-
-You can now import it with shp2pgsql. Again, note the `-a` flag that appends this data to the fires table rather than overwriting the existing table. Read more about shp2pgsql [here](http://www.bostongis.com/pgsql2shp_shp2pgsql_quickguide_20.bqg).
-
-	shp2pgsql -D -a july-merc.shp fires | psql -d amazonia
-	
-Before your changes will take a effect you will need to the `update-fires.sql` script:
-
-	psql -d amazonia -f update-fires.sql
-
-After importing the FIRMS data, and running the update-fires.sql script, tilemill project for both high-intensity fires and recent fires should work. 
-
-__OPTIONAL:__ To load historical data yourself [re-projecting](http://mapbox.com/tilemill/docs/guides/optimizing-shapefiles/) your NASA shapefile to Google Mercator you will need to upload it with shp2pgsql. Be sure to call the table 'fires' as in the import command below:
-
-	shp2pgsql -D -a firms1961337193914.shp fires| psql -d amazonia
-
-again, run the optimization script in `/maps-src`. 
-
-	psql -d amazonia -f update-fires.sql
+This project has moved to:
 
+https://github.com/oeco/tm-fires-nasa
 
 ## Mining (and protected areas)
 

tilemill/biodiversity/.thumb.png

@@ -0,0 +1,8 @@
+
+
+# Source data
+
+Providers:
+
+- Global Biodiversity Information Facility (www.gbif.org);
+- IUCN Red List International Union for Conservation of Nature: has terrestrial mammals 

tilemill/biodiversity/README.md

@@ -0,0 +1 @@
+/Users/vitor/Documents/MapBox/cache/82945364-10m-admin-0-countries/82945364-10m-admin-0-countries.dbf

tilemill/biodiversity/layers/countries/82945364-10m-admin-0-countries.dbf

@@ -0,0 +1 @@
+/Users/vitor/Documents/MapBox/cache/82945364-10m-admin-0-countries/82945364-10m-admin-0-countries.index

tilemill/biodiversity/layers/countries/82945364-10m-admin-0-countries.index

@@ -0,0 +1 @@
+/Users/vitor/Documents/MapBox/cache/82945364-10m-admin-0-countries/82945364-10m-admin-0-countries.prj

tilemill/biodiversity/layers/countries/82945364-10m-admin-0-countries.prj

@@ -0,0 +1 @@
+/Users/vitor/Documents/MapBox/cache/82945364-10m-admin-0-countries/82945364-10m-admin-0-countries.shp

tilemill/biodiversity/layers/countries/82945364-10m-admin-0-countries.shp

@@ -0,0 +1 @@
+/Users/vitor/Documents/MapBox/cache/82945364-10m-admin-0-countries/82945364-10m-admin-0-countries.shx

tilemill/biodiversity/layers/countries/82945364-10m-admin-0-countries.shx

@@ -0,0 +1 @@
+/Users/vitor/Documents/MapBox/cache/82945364-10m-admin-0-countries/82945364-10m-admin-0-countries.zip

tilemill/biodiversity/layers/countries/82945364-10m-admin-0-countries.zip

@@ -0,0 +1,37 @@
+{
+  "bounds": [
+    -180,
+    -85.05112877980659,
+    180,
+    85.05112877980659
+  ],
+  "center": [
+    0,
+    0,
+    2
+  ],
+  "format": "png",
+  "interactivity": false,
+  "minzoom": 0,
+  "maxzoom": 22,
+  "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+  "Stylesheet": [
+    "style.mss"
+  ],
+  "Layer": [
+    {
+      "id": "countries",
+      "name": "countries",
+      "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+      "geometry": "polygon",
+      "Datasource": {
+        "file": "http://mapbox-geodata.s3.amazonaws.com/natural-earth-1.4.0/cultural/10m-admin-0-countries.zip",
+        "type": "shape"
+      }
+    }
+  ],
+  "scale": 1,
+  "metatile": 2,
+  "name": "Amazon Biodiversity",
+  "description": ""
+}

tilemill/biodiversity/project.mml

@@ -0,0 +1,12 @@
+Map {
+  background-color: #b8dee6;
+}
+
+#countries {
+  ::outline {
+    line-color: #85c5d3;
+    line-width: 2;
+    line-join: round;
+  }
+  polygon-fill: #fff;
+}