Merge branch 'simplify-capital'

Ircama · Dec 4, 2016 · c077472 · c077472
2 parents ba2ddd6 + da19452
commit c077472
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/project.mml b/project.mml
@@ -1538,7 +1538,6 @@ Layer:
           WHERE place IN ('city', 'town')
             AND name IS NOT NULL
             AND capital = 'yes'
-            AND admin_level = '2'
           ORDER BY population DESC
         ) AS capital_names
     properties:
@@ -1600,14 +1599,14 @@ Layer:
                   END)
                   *
                   (CASE
-                    WHEN (capital = '4' OR (capital = 'yes' AND admin_level = '4')) THEN 2
+                    WHEN (capital = '4') THEN 2
                     ELSE 1
                   END)
                 ) AS score
               FROM planet_osm_point
               WHERE place IN ('city', 'town')
                 AND name IS NOT NULL
-                AND (capital IS NULL OR capital != 'yes' OR (capital = 'yes' AND (admin_level IS NULL OR admin_level != '2')))
+                AND (capital IS NULL OR capital != 'yes')
             ) as p
           ORDER BY score DESC, length(name) DESC, name
         ) AS placenames_medium