diff --git a/get-shapefiles.sh b/get-shapefiles.sh index 65fc306450..c3e0bf5720 100755 --- a/get-shapefiles.sh +++ b/get-shapefiles.sh @@ -30,6 +30,10 @@ unzip $UNZIP_OPTS data/simplified-land-polygons-complete-3857.zip \ simplified-land-polygons-complete-3857/simplified_land_polygons.cpg \ -d data/ +ogr2ogr -spat -20037509 -8400000 20037509 20037509 data/simplified-land-polygons-complete-3857/simplified_land_north.shp data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp +ogr2ogr -spat -20037509 -20037509 20037509 -8400000 data/simplified-land-polygons-complete-3857/simplified_land_south.shp data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp + + # ne_110m_admin_0_boundary_lines_land echo "dowloading ne_110m_admin_0_boundary_lines_land..." curl -z data/ne_110m_admin_0_boundary_lines_land.zip -L -o data/ne_110m_admin_0_boundary_lines_land.zip http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip @@ -65,6 +69,8 @@ unzip $UNZIP_OPTS data/land-polygons-split-3857.zip \ land-polygons-split-3857/land_polygons.cpg \ -d data/ +ogr2ogr -spat -20037509 -8400000 20037509 20037509 data/land-polygons-split-3857/land_north.shp data/land-polygons-split-3857/land_polygons.shp +ogr2ogr -spat -20037509 -20037509 20037509 -8400000 data/land-polygons-split-3857/land_south.shp data/land-polygons-split-3857/land_polygons.shp #process populated places echo "processing ne_10m_populated_places..." @@ -78,8 +84,11 @@ shapeindex --shape_files \ data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp \ data/land-polygons-split-3857/land_polygons.shp \ data/ne_10m_populated_places/ne_10m_populated_places_fixed.shp \ -data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp - +data/ne_110m_admin_0_boundary_lines_land/ne_110m_admin_0_boundary_lines_land.shp \ +data/land-polygons-split-3857/land_south.shp \ +data/land-polygons-split-3857/land_north.shp \ +data/simplified-land-polygons-complete-3857/simplified_land_north.shp \ +data/simplified-land-polygons-complete-3857/simplified_land_south.shp #clean up echo "cleaning up..." diff --git a/project.mml b/project.mml index fd9b47963f..e51329220f 100755 --- a/project.mml +++ b/project.mml @@ -39,14 +39,14 @@ "geometry": "polygon", "extent": [ -179.99999692067183, - -85.05112877980659, + -60, 179.99999692067183, 85.05112877980659 ], "id": "world", "class": "", "Datasource": { - "file": "data/simplified-land-polygons-complete-3857/simplified_land_polygons.shp", + "file": "data/simplified-land-polygons-complete-3857/simplified_land_north.shp", "type": "shape" }, "srs-name": "900913", @@ -60,12 +60,31 @@ -179.99999692067183, -85.05112877980659, 179.99999692067183, + -60 + ], + "id": "world-south", + "class": "", + "Datasource": { + "file": "data/simplified-land-polygons-complete-3857/simplified_land_south.shp", + "type": "shape" + }, + "srs-name": "900913", + "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", + "advanced": {}, + "name": "world-south" + }, + { + "geometry": "polygon", + "extent": [ + -179.99999692067183, + -60, + 179.99999692067183, 85.05112877980659 ], "id": "coast-poly", "class": "", "Datasource": { - "file": "data/land-polygons-split-3857/land_polygons.shp", + "file": "data/land-polygons-split-3857/land_north.shp", "type": "shape" }, "srs-name": "900913", @@ -73,6 +92,25 @@ "advanced": {}, "name": "coast-poly" }, + { + "geometry": "polygon", + "extent": [ + -179.99999692067183, + -85.051, + 179.99999692067183, + -60 + ], + "id": "coast-poly-south", + "class": "", + "Datasource": { + "file": "data/land-polygons-split-3857/land_south.shp", + "type": "shape" + }, + "srs-name": "900913", + "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", + "advanced": {}, + "name": "coast-poly-south" + }, { "geometry": "polygon", "extent": [ @@ -213,7 +251,7 @@ ], "Datasource": { "type": "postgis", - "table": " (select way,\"natural\",waterway,landuse,name\n from planet_osm_polygon\n where (waterway in ('dock','mill_pond','riverbank','canal')\n or landuse in ('reservoir','water','basin')\n or \"natural\" in ('lake','water','land','glacier','mud'))\n and building is null\n order by z_order,way_area desc\n ) as water_areas", + "table": " (select way,way_area,\"natural\",waterway,landuse,name\n from planet_osm_polygon\n where (waterway in ('dock','mill_pond','riverbank','canal')\n or landuse in ('reservoir','water','basin')\n or \"natural\" in ('lake','water','land','glacier','mud'))\n and building is null\n order by z_order,way_area desc\n ) as water_areas", "extent": "-20037508,-20037508,20037508,20037508", "key_field": "", "geometry_field": "way", diff --git a/shapefiles.mss b/shapefiles.mss index 1e8bfa099c..ef71420696 100644 --- a/shapefiles.mss +++ b/shapefiles.mss @@ -24,12 +24,27 @@ } } +#world-south { + [zoom < 2] { + polygon-fill: @land-color; + } + [zoom >= 2][zoom < 10] { + polygon-pattern-file: url('symbols/glacier.png'); + } +} + #coast-poly { [zoom >= 10] { polygon-fill: @land-color; } } +#coast-poly-south { + [zoom >= 10] { + polygon-pattern-file: url('symbols/glacier2.png'); + } +} + #builtup { [zoom >= 8][zoom < 10] { polygon-fill: #ddd; diff --git a/water.mss b/water.mss index 2657a0eb46..5f8d90e6a5 100644 --- a/water.mss +++ b/water.mss @@ -1,7 +1,10 @@ @water-text: #6699cc; #water-areas { - [natural = 'glacier']::natural { + [natural = 'glacier'] { + [way_area >= 15000000000000][zoom >= 2][zoom < 6] { + polygon-pattern-file: url('symbols/glacier.png'); + } [zoom >= 6] { line-dasharray: 4,2; line-width: 1.5;