Merge pull request #1736 from matkoniecz/gsoc

New road style - rework road colours, road widths and display of railway=rail

INSTALL.md

@@ -80,4 +80,8 @@ If you aren't using TileMill, you can compile the CartoCSS stylesheets into Mapn
 * curl, unzip for downloading and decompressing files
 * shapeindex (a companion utility to Mapnik found in the mapnik-utils package) for indexing downloaded shapefiles
 
+### Development dependencies
+
+* Python and Ruby to run helper scripts
 * [PyYAML](http://pyyaml.org/wiki/PyYAML) if editing the MML (layer definition) file (packaged as `python-yaml` on Ubuntu, or installed with `pip install pyyaml`)
+* [Color Math](https://github.com/gtaylor/python-colormath) and [numpy](http://www.numpy.org/) if running generate_road_colors.py helper script (may be obtained with `pip install colormath numpy`)

project.mml

@@ -601,7 +601,7 @@
       ],
       "properties": {
         "group-by": "layernotnull",
-        "minzoom": 10
+        "minzoom": 9
       },
       "advanced": {}
     },
@@ -835,7 +835,7 @@
       ],
       "id": "roads-casing",
       "properties": {
-        "minzoom": 10
+        "minzoom": 9
       },
       "advanced": {}
     },
@@ -1018,7 +1018,7 @@
       ],
       "properties": {
         "group-by": "layernotnull",
-        "minzoom": 10
+        "minzoom": 9
       },
       "advanced": {}
     },

project.yaml

@@ -607,7 +607,7 @@ Layer:
         ) AS tunnels
     properties:
       group-by: "layernotnull"
-      minzoom: 10
+      minzoom: 9
     advanced: {}
   - id: "citywalls"
     name: "citywalls"
@@ -890,7 +890,7 @@ Layer:
             CASE WHEN int_surface IN ('unpaved') THEN 0 ELSE 2 END
         ) AS roads_casing
     properties:
-      minzoom: 10
+      minzoom: 9
     advanced: {}
   - id: "highway-area-fill"
     name: "highway-area-fill"
@@ -1275,7 +1275,7 @@ Layer:
         ) AS bridges
     properties:
       group-by: "layernotnull"
-      minzoom: 10
+      minzoom: 9
     advanced: {}
   - id: "guideways"
     name: "guideways"