Change from land polygons to ocean polygons (#3694)

* Change from land polygons to ocean polygons Remove outline from low-zoom coastlines * Remove zoom level filter from ocean in shapefiles.mss
gravitystorm · Mar 25, 2019 · b5938d6 · b5938d6 · dktue · May 19, 2019
1 parent cfe7cf4
commit b5938d6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,8 +18,8 @@ env:
   - CARTO=0.18.0 MAPNIK='3.0.0 3.0.12'
 install:
   - npm install carto@$CARTO
-  - mkdir -p data/world_boundaries data/simplified-land-polygons-complete-3857 data/ne_110m_admin_0_boundary_lines_land data/land-polygons-split-3857
-  - touch data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp data/land-polygons-split-3857/land_polygons.shp
+  - mkdir -p data/world_boundaries data/simplified-water-polygons-complete-3857 data/ne_110m_admin_0_boundary_lines_land data/water-polygons-split-3857
+  - touch data/simplified-water-polygons-complete-3857/simplified_water_polygons.shp data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp data/water-polygons-split-3857/water_polygons.shp
   - createdb -w -E utf8 -U postgres gis && psql -Xq -d gis -U postgres -w -c "CREATE EXTENSION postgis; CREATE EXTENSION hstore;"
 script:
   # We're using pipes in the checks, so fail if any part fails

diff --git a/INSTALL.md b/INSTALL.md
@@ -49,9 +49,9 @@ This script downloads necessary files, generates and populates the *data* direct
 You can also download them manually at the following paths:
 
 * [`world_bnd_m.shp`, `places.shp`, `world_boundaries_m.shp`](https://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz)
-* [`simplified_land_polygons.shp`](http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip) (updated daily)
+* [`simplified_water_polygons.shp`](http://data.openstreetmapdata.com/simplified-water-polygons-complete-3857.zip) (updated daily)
 * [`ne_110m_admin_0_boundary_lines_land.shp`](http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip)
-* [`land_polygons.shp`](http://data.openstreetmapdata.com/land-polygons-split-3857.zip) (updated daily)
+* [`water_polygons.shp`](http://data.openstreetmapdata.com/water-polygons-split-3857.zip) (updated daily)
 * [`icesheet_polygons.shp`](http://data.openstreetmapdata.com/antarctica-icesheet-polygons-3857.zip)
 * [`icesheet_outlines.shp`](http://data.openstreetmapdata.com/antarctica-icesheet-outlines-3857.zip)
 

diff --git a/project.mml b/project.mml
@@ -54,19 +54,21 @@ Stylesheet:
   - admin.mss
   - addressing.mss
 Layer:
-  - id: world
+  - id: ocean-lz
     geometry: polygon
+    class: ocean
     <<: *extents
     Datasource:
-      file: data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp
+      file: data/simplified-water-polygons-complete-3857/simplified_water_polygons.shp
       type: shape
     properties:
       maxzoom: 9
-  - id: coast-poly
+  - id: ocean
     geometry: polygon
+    class: ocean
     <<: *extents
     Datasource:
-      file: data/land-polygons-split-3857/land_polygons.shp
+      file: data/water-polygons-split-3857/water_polygons.shp
       type: shape
     properties:
       minzoom: 10

diff --git a/scripts/get-shapefiles.py b/scripts/get-shapefiles.py
@@ -47,11 +47,11 @@
     },
 
     2: {
-        'directory': 'simplified-land-polygons-complete-3857',
-        'url': 'http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip',  # noqa
+        'directory': 'simplified-water-polygons-complete-3857',
+        'url': 'http://data.openstreetmapdata.com/simplified-water-polygons-complete-3857.zip',  # noqa
         'type': 'zip',
-        'shp_basename': ['simplified_land_polygons'],
-        'long_opt': '--simplified-land'
+        'shp_basename': ['simplified_water_polygons'],
+        'long_opt': '--simplified-water'
     },
 
     3: {
@@ -63,11 +63,11 @@
     },
 
     4: {
-        'directory': 'land-polygons-split-3857',
-        'url': 'http://data.openstreetmapdata.com/land-polygons-split-3857.zip',  # noqa
+        'directory': 'water-polygons-split-3857',
+        'url': 'http://data.openstreetmapdata.com/water-polygons-split-3857.zip',  # noqa
         'type': 'zip',
-        'shp_basename': ['land_polygons'],
-        'long_opt': '--land-polygons'
+        'shp_basename': ['water_polygons'],
+        'long_opt': '--water-polygons'
     },
 
     5: {

diff --git a/shapefiles.mss b/shapefiles.mss
@@ -11,23 +11,8 @@
   }
 }
 
-#world {
-  [zoom >= 0][zoom < 10] {
-    polygon-fill: @land-color;
-    polygon-simplify: 0.4;
-    [zoom < 8] {
-      line-color: darken(@water-color,20%);
-      line-simplify: 0.4;
-      line-width: 0.5;
-      line-offset: 0.5;
-    }
-  }
-}
-
-#coast-poly {
-  [zoom >= 10] {
-    polygon-fill: @land-color;
-  }
+.ocean {
+  polygon-fill: @water-color;
 }
 
 #icesheet-poly {

diff --git a/style.mss b/style.mss
@@ -1,5 +1,5 @@
 Map {
-  background-color: @water-color;
+  background-color: @land-color;
 }
 
 @water-color: #aad3df;