From 14eedbbe8b0ce34a7bbea8f34beb2da667ef19d2 Mon Sep 17 00:00:00 2001
From: Paul Norman <penorman@mac.com>
Date: Thu, 22 Dec 2016 16:22:11 -0800
Subject: [PATCH] Revert "Merge pull request #2510 from
 sommerluk/junctionareas02"

This reverts commit 755b15d1ead4ffe2f6dc162339f4894a1fab2ca7, reversing
changes made to 4ce7c874aab67cb6bf1dc316c1c2ba871aa22da8.

The query changes were causing sequential scans on all rendering tables
---
 project.mml | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/project.mml b/project.mml
index 77c317973a..e45372e2a3 100644
--- a/project.mml
+++ b/project.mml
@@ -1924,33 +1924,10 @@ Layer:
             highway,
             junction,
             ref,
-            name,
-            NULL AS way_pixels
+            name
           FROM planet_osm_point
           WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes'
-          UNION(
-            SELECT
-              ST_BuildArea(way),
-              highway,
-              junction,
-              ref,
-              name,
-              NULL AS way_pixels
-            FROM planet_osm_line
-            WHERE junction = 'yes'
-            UNION
-            SELECT
-              way,
-              highway,
-              junction,
-              ref,
-              name,
-              way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
-            FROM planet_osm_polygon
-            WHERE junction = 'yes'
-            ORDER BY way_pixels DESC NULLS LAST
-          )
-         ) AS junctions
+        ) AS junctions
     properties:
       minzoom: 11
     advanced: {}