nacis shared server edits to tilemill-examples

nacis-edits.diff

diff --git a/compositing-circles/.thumb.png b/compositing-circles/.thumb.png
index fb6d816..567e586 100644
Binary files a/compositing-circles/.thumb.png and b/compositing-circles/.thumb.png differ
diff --git a/compositing-circles/style.mss b/compositing-circles/style.mss
index 4833f53..81d2292 100644
--- a/compositing-circles/style.mss
+++ b/compositing-circles/style.mss
@@ -12,11 +12,11 @@ Map {
 }
 
 #pdx {
-  marker-fill:red;
-  marker-width:200;
+  marker-fill:maroon;
+  marker-width:250;
   marker-line-width:20;
-  marker-line-color:steelblue;
-  marker-line-opacity:.5;
+  marker-line-color:yellow;
+  marker-line-opacity:.60;
   marker-allow-overlap:true;
   marker-fill-opacity:.5;
   [name="one"] {
@@ -25,7 +25,7 @@ Map {
   }
   [name="two"] {
     //marker-comp-op:src-over;
-    //marker-comp-op:hard-light;
-    marker-comp-op:difference;
+    marker-comp-op:soft-light;
+    //marker-comp-op:difference;
   }
 }
diff --git a/custom-map-projection/.thumb.png b/custom-map-projection/.thumb.png
index edbef35..5bb7823 100644
Binary files a/custom-map-projection/.thumb.png and b/custom-map-projection/.thumb.png differ
diff --git a/custom-map-projection/project.mml b/custom-map-projection/project.mml
index 66e88bf..8576e92 100644
--- a/custom-map-projection/project.mml
+++ b/custom-map-projection/project.mml
@@ -14,7 +14,7 @@
   "interactivity": false,
   "minzoom": 0,
   "maxzoom": 22,
-  "srs": "+proj=robin +lon_0=0 +x_0=0 +y_0=0 +a=6371000 +b=6371000 +units=m +no_defs",
+  "srs": "+proj=vandg +lon_0=0 +x_0=0 +y_0=0 +R_A +a=6371000 +b=6371000 +units=m +no_defs",
   "Stylesheet": [
     "style.mss"
   ],
diff --git a/custom-map-projection/style.mss b/custom-map-projection/style.mss
index 4731321..e79ccc2 100644
--- a/custom-map-projection/style.mss
+++ b/custom-map-projection/style.mss
@@ -1,5 +1,5 @@
 Map {
-  background-color: #b8dee6;
+  background-color: #140f0f;
 }
 
 /*
@@ -15,7 +15,7 @@ Map {
 
 #countries {
   ::outline {
-    line-color: #85c5d3;
+    line-color: #855050;
     line-width: 2;
     line-join: round;
   }
diff --git a/dynamic-http/.thumb.png b/dynamic-http/.thumb.png
index 39588b6..242150f 100644
Binary files a/dynamic-http/.thumb.png and b/dynamic-http/.thumb.png differ
diff --git a/dynamic-http/project.mml b/dynamic-http/project.mml
index 4bd3c35..7bd3923 100644
--- a/dynamic-http/project.mml
+++ b/dynamic-http/project.mml
@@ -43,7 +43,7 @@
       "extent": [
         -130,
         40,
-        -117,
+        -116.00000000000001,
         45
       ],
       "id": "dynamic",
diff --git a/dynamic-http/style.mss b/dynamic-http/style.mss
index d20823d..92f9f16 100644
--- a/dynamic-http/style.mss
+++ b/dynamic-http/style.mss
@@ -5,14 +5,14 @@ Map {
 #countries {
   ::outline {
     line-color: #85c5d3;
-    line-width: 2;
+    line-width: 4;
     line-join: round;
   }
   polygon-fill: #fff;
 }
 
 #dynamic {
-  marker-fill:teal;
+  marker-fill:cyan;
   marker-line-color:darken(teal,10%);
   marker-width:[size];
   marker-line-width:2;
diff --git a/enhance-low-res-raster/.thumb.png b/enhance-low-res-raster/.thumb.png
index 3449d9e..125c7e4 100644
Binary files a/enhance-low-res-raster/.thumb.png and b/enhance-low-res-raster/.thumb.png differ
diff --git a/enhance-low-res-raster/project.mml b/enhance-low-res-raster/project.mml
index d172a69..f9f1229 100644
--- a/enhance-low-res-raster/project.mml
+++ b/enhance-low-res-raster/project.mml
@@ -45,7 +45,8 @@
       "Datasource": {
         "file": "http://mapbox-geodata.s3.amazonaws.com/natural-earth-1.4.0/cultural/10m-admin-0-countries.zip",
         "type": "shape"
-      }
+      },
+      "status": "off"
     }
   ],
   "scale": 1,
diff --git a/enhance-low-res-raster/style.mss b/enhance-low-res-raster/style.mss
index 8fad78d..a2fbe47 100644
--- a/enhance-low-res-raster/style.mss
+++ b/enhance-low-res-raster/style.mss
@@ -1,15 +1,15 @@
 Map {
-  background-color: #b8dee6;
-  buffer-size:0;
+  background-color: #a15505;
+  buffer-size:10;
 }
 
 #countries {
-  polygon-fill: #fff;
-  polygon-gamma:.3;
+  polygon-fill: #52b237;
+  polygon-gamma:.5;
   comp-op:dst-atop;
 }
 
 #truemarble {
   raster-opacity:1;
   raster-scaling:bilinear;
-}
\ No newline at end of file
+}
diff --git a/fancy-formatted-label/.thumb.png b/fancy-formatted-label/.thumb.png
index 1c72847..6213541 100644
Binary files a/fancy-formatted-label/.thumb.png and b/fancy-formatted-label/.thumb.png differ
diff --git a/fancy-formatted-label/style.mss b/fancy-formatted-label/style.mss
index 2dab878..c22ecd6 100644
--- a/fancy-formatted-label/style.mss
+++ b/fancy-formatted-label/style.mss
@@ -10,10 +10,11 @@
   marker-line-width:0;
   [zoom >= 10] {
     text-face-name:'DejaVu Sans Book';
-    text-size:15;
+    text-size:30;
     text-name:@label;
     text-fill:darken(grey,10%);
     text-dx:15;
+    text-dy:-1;
   }
 }
 
diff --git a/octocat-mask/project.mml b/octocat-mask/project.mml
index 5f87be4..24c6e9e 100644
--- a/octocat-mask/project.mml
+++ b/octocat-mask/project.mml
@@ -13,7 +13,7 @@
   "format": "png",
   "interactivity": false,
   "minzoom": 0,
-  "maxzoom": 22,
+  "maxzoom": 5,
   "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"
@@ -50,7 +50,7 @@
   ],
   "scale": 1.8,
   "metatile": 4,
-  "name": "",
+  "name": "cat",
   "description": "",
   "attribution": ""
 }
\ No newline at end of file
diff --git a/osm-data-browser/.thumb.png b/osm-data-browser/.thumb.png
index dfd5033..3e43a43 100644
Binary files a/osm-data-browser/.thumb.png and b/osm-data-browser/.thumb.png differ
diff --git a/osm-data-browser/style.mss b/osm-data-browser/style.mss
index 9726602..3109aea 100644
--- a/osm-data-browser/style.mss
+++ b/osm-data-browser/style.mss
@@ -14,7 +14,7 @@ Map {
   ::line {
     ['mapnik::geometry_type'=linestring] {
      two/line-color:green;
-     two/line-opacity:.5;
+     two/line-opacity:6;
      two/line-cap:round;
      two/line-join:round;
      two/line-opacity:.7;
diff --git a/single-tint-band/.thumb.png b/single-tint-band/.thumb.png
index f80d783..ec9adb5 100644
Binary files a/single-tint-band/.thumb.png and b/single-tint-band/.thumb.png differ
diff --git a/single-tint-band/style.mss b/single-tint-band/style.mss
index 0e1a421..2bddd7b 100644
--- a/single-tint-band/style.mss
+++ b/single-tint-band/style.mss
@@ -24,4 +24,27 @@ Map {
       polygon-fill: #EBEAE8;
     }
   }
-}
\ No newline at end of file
+}
+#countries {
+  [NAME='India'] {
+    line-color:#F8C3BF;
+    line-offset:-3;
+    line-width:15;
+    polygon-fill:black;
+    polygon-comp-op:dst-in;
+    ::mask {
+      polygon-fill:#EBEAE8;
+      comp-op:dst-in;
+    }
+  }
+  [NAME!='India'] {
+    ::outline {
+      line-color: #85c5d3;
+      line-width: 2;
+      line-join: round;
+    }
+    ::fill {
+      polygon-fill: #EBEAE8;
+    }
+  }
+}
diff --git a/smart-halos/.thumb.png b/smart-halos/.thumb.png
index 1a5681a..8355005 100644
Binary files a/smart-halos/.thumb.png and b/smart-halos/.thumb.png differ
diff --git a/smart-halos/style.mss b/smart-halos/style.mss
index e24db5c..b97b937 100644
--- a/smart-halos/style.mss
+++ b/smart-halos/style.mss
@@ -7,7 +7,7 @@ Map {
 #countries {
   ::outline {
     line-color: #85c5d3;
-    line-width: 2;
+    line-width: 1;
     line-join: round;
   }
   polygon-fill: #fff;
@@ -18,12 +18,13 @@ Map {
 #arc {
   opacity:.9999;
   line-color:@line_color;
-  line-width:4;
+  line-width:8;
+  
   line-cap:round;
   line-join:round;
   one/text-face-name:"DejaVu Sans Bold";
   one/text-name:[name];
-  one/text-size:15;
+  one/text-size:25;
   one/text-placement:line;
   one/text-halo-radius:6;
   one/text-clip:false;
@@ -31,7 +32,7 @@ Map {
 
   two/text-fill:darken(@line_color,20%);
   two/text-face-name:"DejaVu Sans Book";
-  two/text-size:17;
+  two/text-size:25;
   two/text-halo-radius:1.5;
   two/text-halo-fill:rgba(255,255,255,.5);
   two/text-clip:false;
diff --git a/sql-on-the-fly/.thumb.png b/sql-on-the-fly/.thumb.png
index d84cd65..f682adf 100644
Binary files a/sql-on-the-fly/.thumb.png and b/sql-on-the-fly/.thumb.png differ
diff --git a/sql-on-the-fly/project.mml b/sql-on-the-fly/project.mml
index 0dfde9a..89abe57 100644
--- a/sql-on-the-fly/project.mml
+++ b/sql-on-the-fly/project.mml
@@ -67,7 +67,7 @@
       ],
       "Datasource": {
         "type": "postgis",
-        "table": "states",
+        "table": "(select * from states where\n  ST_Intersects(geom,ST_SetSRID('Point(-122 45)'::geometry,4326))\n) as tmp",
         "key_field": "",
         "geometry_field": "",
         "extent_cache": "dynamic",
diff --git a/sql-on-the-fly/style.mss b/sql-on-the-fly/style.mss
index dc6336b..92c03a4 100644
--- a/sql-on-the-fly/style.mss
+++ b/sql-on-the-fly/style.mss
@@ -1,14 +1,14 @@
 Map {
-  background-color: #b8dee6;
+  background-color: #126a7c;
 }
 
 #countries {
   ::outline {
-    line-color: #85c5d3;
-    line-width: 2;
+    line-color: #944848;
+    line-width: 7;
     line-join: round;
   }
-  polygon-fill: #fff;
+  polygon-fill: #b91414;
 }
 
 /*
@@ -18,6 +18,7 @@ createdb -T template_postgis states
 shp2pgsql -s 4326 -g geom ./data/us_states_wgs84.shp states | psql states
 
 - only render multigeometries
+
 (select * from states
 where ST_NumGeometries(geom) > 1
 ) as tmp
@@ -39,6 +40,7 @@ where ST_NumGeometries(geom) > 1
 (select
   ST_Intersection(geom,
     ST_Buffer(
+
       ST_SetSRID('Point(-122 45)'::geometry,4326)
    ,10)
 )
@@ -50,7 +52,7 @@ as geom from states
 #sql {
   ::poly {
     ['mapnik::geometry_type'=polygon] {
-      polygon-fill:steelblue;
+      polygon-fill:darkblue;
       line-color:darkblue;     
     }
   }
diff --git a/tint-bands/.thumb.png b/tint-bands/.thumb.png
index ce58ddc..07eb038 100644
Binary files a/tint-bands/.thumb.png and b/tint-bands/.thumb.png differ
diff --git a/tint-bands/project.mml b/tint-bands/project.mml
index 776bc22..f948184 100644
--- a/tint-bands/project.mml
+++ b/tint-bands/project.mml
@@ -13,7 +13,7 @@
   "format": "png",
   "interactivity": false,
   "minzoom": 0,
-  "maxzoom": 22,
+  "maxzoom": 4,
   "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",
diff --git a/tint-bands/style.mss b/tint-bands/style.mss
index a1989df..cc553ee 100644
--- a/tint-bands/style.mss
+++ b/tint-bands/style.mss
@@ -3,7 +3,7 @@
 Map { background-color: @water; }
 
 #countries::tint-bands {
-  image-filters: agg-stack-blur(3,3);
+  image-filters: agg-stack-blur(1,1);
   opacity: 0.3;
   line-join: round;
   [zoom=2] { line-width: 3; }