Don't use classes anymore

.travis.yml

@@ -45,3 +45,5 @@ script:
   - psql -1Xq -v ON_ERROR_STOP=1 -d gis -f indexes.sql
   # Test for hstore operation not supported in PostgreSQL 9.3
   - '! grep "tags->''[^'']\+'' IS" project.mml > /dev/null'
+  # Test for classes in project.mml (not supported in vector tiles)
+  - '! grep "class:" project.mml > /dev/null'

amenity-points.mss

@@ -1573,7 +1573,7 @@
 }
 
 /* Note that these layers are also used in water.mss */
-.text-low-zoom[zoom < 10],
+#text-poly-low-zoom[zoom < 10],
 #text-point[zoom >= 10] {
   [feature = 'place_island'][zoom >= 4][way_pixels > 3000][way_pixels <= 768000],
   [feature = 'place_island'][zoom >= 16][way_pixels <= 768000],

landcover.mss

@@ -855,7 +855,8 @@
   }
 }
 
-.barriers {
+#line-barriers,
+#area-barriers {
   [zoom >= 16] {
     line-width: 0.4;
     line-color: #444;

placenames.mss

@@ -3,7 +3,7 @@
 @country-labels: darken(@admin-boundaries, 15%);
 @state-labels: desaturate(darken(@admin-boundaries, 5%), 20%);
 
-.country {
+#country-names {
   [zoom >= 3][zoom < 5][way_pixels > 1000],
   [zoom >= 5][way_pixels < 360000] {
     text-name: "[name]";
@@ -43,7 +43,7 @@
   }
 }
 
-.state {
+#state-names {
   [zoom >= 5][zoom < 7][way_pixels > 3000],
   [zoom >= 7][way_pixels > 3000][way_pixels < 196000] {
     text-name: "[name]";

project.mml

@@ -198,7 +198,6 @@ Layer:
       minzoom: 8
       maxzoom: 11
   - id: water-lines
-    class: water-lines
     geometry: linestring
     <<: *extents
     Datasource:
@@ -251,7 +250,6 @@ Layer:
       minzoom: 0
   - id: ocean-lz
     geometry: polygon
-    class: ocean
     <<: *extents
     Datasource:
       file: data/simplified-water-polygons-split-3857/simplified_water_polygons.shp
@@ -260,7 +258,6 @@ Layer:
       maxzoom: 9
   - id: ocean
     geometry: polygon
-    class: ocean
     <<: *extents
     Datasource:
       file: data/water-polygons-split-3857/water_polygons.shp
@@ -451,7 +448,6 @@ Layer:
     properties:
       minzoom: 14
   - id: tunnels
-    class: access
     geometry: linestring
     <<: *extents
     Datasource:
@@ -578,7 +574,6 @@ Layer:
     properties:
       minzoom: 10
   - id: line-barriers
-    class: barriers
     geometry: linestring
     <<: *extents
     Datasource:
@@ -614,7 +609,6 @@ Layer:
       cache-features: true
       minzoom: 13
   - id: area-barriers
-    class: barriers
     geometry: polygon
     <<: *extents
     Datasource:
@@ -834,7 +828,6 @@ Layer:
     properties:
       minzoom: 14
   - id: roads-fill
-    class: access
     geometry: linestring
     <<: *extents
     Datasource:
@@ -900,7 +893,6 @@ Layer:
       minzoom: 6
       maxzoom: 9
   - id: waterway-bridges
-    class: water-lines
     geometry: linestring
     <<: *extents
     Datasource:
@@ -923,7 +915,6 @@ Layer:
     properties:
       minzoom: 12
   - id: bridges
-    class: access
     geometry: linestring
     <<: *extents
     Datasource:
@@ -1191,7 +1182,6 @@ Layer:
       cache-features: true
       minzoom: 16
   - id: country-names
-    class: country
     geometry: point
     <<: *extents
     Datasource:
@@ -1234,7 +1224,6 @@ Layer:
       minzoom: 3
       maxzoom: 15
   - id: state-names
-    class: state
     geometry: point
     <<: *extents
     Datasource:
@@ -1384,7 +1373,6 @@ Layer:
       cache-features: true
       minzoom: 12
   - id: amenity-points
-    class: points
     geometry: point
     <<: *extents
     Datasource:
@@ -1808,7 +1796,6 @@ Layer:
     properties:
       minzoom: 15
   - id: roads-text-name
-    class: directions
     geometry: linestring
     <<: *extents
     Datasource:
@@ -1864,7 +1851,6 @@ Layer:
       cache-features: true
       minzoom: 13
   - id: paths-text-name
-    class: directions
     geometry: linestring
     <<: *extents
     Datasource:
@@ -1968,7 +1954,6 @@ Layer:
     properties:
       minzoom: 15
   - id: text-poly-low-zoom
-    class: text-low-zoom
     geometry: polygon
     <<: *extents
     Datasource:

roads.mss

@@ -2753,7 +2753,9 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
   }
 }
 
-.access::fill {
+#tunnels::fill,
+#roads-fill::fill,
+#bridges::fill {
   [access = 'destination'] {
     [feature = 'highway_secondary'],
     [feature = 'highway_tertiary'],
@@ -3374,7 +3376,8 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
   }
 }
 
-.directions::directions {
+#roads-text-name::directions,
+#paths-text-name::directions {
   [zoom >= 16] {
     // intentionally omitting highway_platform, highway_construction
     [highway = 'motorway'],

shapefiles.mss

@@ -11,7 +11,8 @@
   }
 }
 
-.ocean {
+#ocean-lz,
+#ocean {
   polygon-fill: @water-color;
 }
 

water.mss

@@ -120,7 +120,8 @@
   }
 }
 
-.water-lines {
+#water-lines,
+#waterway-bridges {
   [waterway = 'canal'][zoom >= 12],
   [waterway = 'river'][zoom >= 12],
   [waterway = 'wadi'][zoom >= 13] {
@@ -332,7 +333,7 @@
 }
 
 
-.text-low-zoom[zoom < 10],
+#text-poly-low-zoom[zoom < 10],
 #text-point[zoom >= 10] {
   [feature = 'natural_water'],
   [feature = 'natural_bay'],