Merge pull request gravitystorm#976 from math1985/water-order

Restore rendering order water areas
matthijsmelissen · Sep 25, 2014 · 0f14d40 · 0f14d40
2 parents deb48b4 + b5d6605
commit 0f14d40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/project.mml b/project.mml
@@ -177,7 +177,7 @@
       "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": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    way, \"natural\", waterway, landuse, name, way_area/(!pixel_width!*!pixel_height!) AS way_pixels\n  FROM planet_osm_polygon\n  WHERE\n    (waterway IN ('dock', 'riverbank', 'canal')\n      OR landuse IN ('reservoir', 'basin')\n      OR \"natural\" IN ('lake', 'water', 'land', 'glacier', 'mud'))\n    AND building IS NULL\n    AND way_area/(!pixel_width!*!pixel_height!) > 0.01\n  ORDER BY z_order, way_area\n) AS water_areas", 
+        "table": "(SELECT \n    way, \"natural\", waterway, landuse, name, way_area/(!pixel_width!*!pixel_height!) AS way_pixels\n  FROM planet_osm_polygon\n  WHERE\n    (waterway IN ('dock', 'riverbank', 'canal')\n      OR landuse IN ('reservoir', 'basin')\n      OR \"natural\" IN ('lake', 'water', 'land', 'glacier', 'mud'))\n    AND building IS NULL\n    AND way_area/(!pixel_width!*!pixel_height!) > 0.01\n  ORDER BY z_order, way_area DESC\n) AS water_areas", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 

diff --git a/project.yaml b/project.yaml
@@ -188,7 +188,7 @@ Layer:
               OR "natural" IN ('lake', 'water', 'land', 'glacier', 'mud'))
             AND building IS NULL
             AND way_area/(!pixel_width!*!pixel_height!) > 0.01
-          ORDER BY z_order, way_area
+          ORDER BY z_order, way_area DESC
         ) AS water_areas
     advanced: {}
   - id: "water-areas-overlay"