From aa5ee865e367f0af8d5443b6899236946062346a Mon Sep 17 00:00:00 2001
From: math1985 <github@matthijsmelissen.nl>
Date: Sun, 1 Nov 2015 10:52:25 +0100
Subject: [PATCH 1/2] Drop incorrect text class from text-line

This saves 4 out 20 seconds on ever Carto-run on my system, and was a bug
anyway.
---
 project.mml  | 2 +-
 project.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project.mml b/project.mml
index 730c3023a9..54fed2e8ba 100644
--- a/project.mml
+++ b/project.mml
@@ -1732,7 +1732,7 @@
       "name": "text-line",
       "srs-name": "900913",
       "geometry": "linestring",
-      "class": "text",
+      "class": "",
       "id": "text-line",
       "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",
       "Datasource": {
diff --git a/project.yaml b/project.yaml
index cf78cec322..acdde92751 100644
--- a/project.yaml
+++ b/project.yaml
@@ -2096,7 +2096,7 @@ Layer:
     advanced: {}
   - id: "text-line"
     name: "text-line"
-    class: "text"
+    class: ""
     geometry: "linestring"
     <<: *extents
     Datasource:

From eff987c7f03266f3750aa60b4b38d46f8e092f45 Mon Sep 17 00:00:00 2001
From: math1985 <github@matthijsmelissen.nl>
Date: Sun, 1 Nov 2015 21:36:30 +0100
Subject: [PATCH 2/2] Restore rendering of water-feature labels

---
 water-features.mss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/water-features.mss b/water-features.mss
index 2230fa7d49..7c8f305aea 100644
--- a/water-features.mss
+++ b/water-features.mss
@@ -114,7 +114,8 @@
   }
 }
 
-.text {
+.text,
+#text-line {
   [feature = 'waterway_dam'],
   [feature = 'waterway_weir'] {
     #text-poly[zoom >= 15],