Merge upstream master branch and fix conflict

jeisenbe · May 5, 2019 · 6b6d6fe · 6b6d6fe
2 parents a4ed841 + b664c8f
commit 6b6d6fe
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,43 @@
-## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.20.0...master)
+## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.21.0...master)
+
+## [v4.21.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.20.0...v4.21.0) - 2019-05-01
+## Major changes
+- Removed unused `world_boundaries-spherical.tgz` file from scripts
+
+  This file can be safely removed and has not been used for some time.
+
+- Switch to osmdata.openstreetmap.de for water & icesheet shapefiles
+
+  The script will handle the change automatically, but if manually downloading
+  or using a different method, you will need to adjust paths.
+
+- Started using ST_PointOnSurface for some label placements
+
+  These changes are part of an effort to make it easier for forks using a
+  vector tile architecture as well as reducing the duplication among POI
+  layers. Some load has been shifted from Mapnik to the database.
+
+- Adjusted index for military areas
+
+  The query was adjusted last version but the index was missed. The old
+  `planet_osm_polygon_military` can be removed, and for servers in use, the new
+  one can be taken from the `scripts/indexes.py --concurrent` output.
+
+## Changes
+- Adjusted starting zooms for labeling of administrative areas.
+
+  The new zooms are based on `admin_level` and size.
+
+- Revert rendering of healthcare key
+
+  The original PR which implemented this had technical issues that prevented it
+  from working properly.
+
+- Stop place some place labels when the objects become too big or at high
+  zooms.
+- Only render capes as points and render them like other points.
+- Only render ferry lines from ways, not relations
+- Improved developer internal documentation
 
 ## [v4.20.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.19.0...v4.20.0) - 2019-02-15
 ## Changes

diff --git a/INSTALL.md b/INSTALL.md
@@ -48,7 +48,6 @@ 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_water_polygons.shp`](https://osmdata.openstreetmap.de/download/simplified-water-polygons-split-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)
 * [`water_polygons.shp`](https://osmdata.openstreetmap.de/download/water-polygons-split-3857.zip) (updated daily)

diff --git a/amenity-points.mss b/amenity-points.mss
@@ -1744,10 +1744,10 @@
 /* Note that these layers are also used in water.mss */
 .text-low-zoom[zoom < 10],
 #text-point[zoom >= 10] {
-  [feature = 'place_island'][zoom >= 4][way_pixels > 3000][way_pixels < 800000],
-  [feature = 'place_island'][zoom >= 16][way_pixels < 800000],
-  [feature = 'place_islet'][zoom >= 11][way_pixels > 3000][way_pixels < 800000],
-  [feature = 'place_islet'][zoom >= 17][way_pixels < 800000] {
+  [feature = 'place_island'][zoom >= 4][way_pixels > 3000][way_pixels <= 768000],
+  [feature = 'place_island'][zoom >= 16][way_pixels <= 768000],
+  [feature = 'place_islet'][zoom >= 11][way_pixels > 3000][way_pixels <= 768000],
+  [feature = 'place_islet'][zoom >= 17][way_pixels <= 768000] {
     text-name: "[name]";
     text-fill: #000;
     text-size: @landcover-font-size;
@@ -2184,8 +2184,8 @@
   }
 
   [feature = 'leisure_swimming_pool'][is_building = 'no'] {
-    [zoom >= 14][way_pixels > 3000],
-    [zoom >= 17] {
+    [zoom >= 14][way_pixels > 3000][way_pixels <= 768000],
+    [zoom >= 17][way_pixels <= 768000] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -2239,8 +2239,8 @@
   [feature = 'leisure_nature_reserve'],
   [feature = 'boundary_aboriginal_lands'],
   [feature = 'boundary_protected_area'] {
-    [zoom >= 8][way_pixels > 3000][is_building = 'no'],
-    [zoom >= 17] {
+    [zoom >= 8][way_pixels > 3000][way_pixels <= 768000][is_building = 'no'],
+    [zoom >= 17][way_pixels <= 768000] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -2278,8 +2278,8 @@
   }
 
   [feature = 'military_danger_area'][is_building = 'no'] {
-    [zoom >= 9][way_pixels > 3000],
-    [zoom >= 17] {
+    [zoom >= 9][way_pixels > 3000][way_pixels <= 768000],
+    [zoom >= 17][way_pixels <= 768000] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -2303,8 +2303,8 @@
   }
 
   [feature = 'landuse_garages'][is_building = 'no'] {
-    [zoom >= 13][way_pixels > 3000],
-    [zoom >= 17] {
+    [zoom >= 13][way_pixels > 3000][way_pixels <= 768000],
+    [zoom >= 17][way_pixels <= 768000] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -2380,10 +2380,10 @@
   [feature = 'leisure_dog_park'],
   [feature = 'leisure_ice_rink'],
   [feature = 'leisure_pitch'] {
-    [zoom >= 10][way_pixels > 3000][is_building = 'no'],
-    [zoom >= 17][is_building = 'no'],
-    [zoom >= 10][way_pixels > 3000][feature = 'shop_mall'],
-    [zoom >= 17][feature = 'shop_mall'] {
+    [zoom >= 10][way_pixels > 3000][way_pixels <= 768000][is_building = 'no'],
+    [zoom >= 17][way_pixels <= 768000][is_building = 'no'],
+    [zoom >= 10][way_pixels > 3000][way_pixels <= 768000][feature = 'shop_mall'],
+    [zoom >= 17][way_pixels <= 768000][feature = 'shop_mall'] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -2645,8 +2645,8 @@
   }
 
   [feature = 'leisure_marina'][zoom >= 15] {
-    [zoom >= 10][way_pixels > 3000],
-    [zoom >= 17] {
+    [zoom >= 10][way_pixels > 3000][way_pixels <= 768000],
+    [zoom >= 17][way_pixels <= 768000] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -3021,8 +3021,8 @@
   [feature = 'power_generator'][is_building = 'no']["generator:source" != 'wind'][zoom >= 10],
   [feature = 'power_sub_station'][is_building = 'no'][zoom >= 13],
   [feature = 'power_substation'][is_building = 'no'][zoom >= 13]{
-    [way_pixels > 3000],
-    [zoom >= 17] {
+    [way_pixels > 3000][way_pixels <= 768000],
+    [zoom >= 17][way_pixels <= 768000] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -3049,8 +3049,8 @@
   [feature = 'natural_shingle'][zoom >= 9],
   [feature = 'natural_bare_rock'],
   [feature = 'natural_sand'] {
-    [zoom >= 8][way_pixels > 3000][is_building = 'no'],
-    [zoom >= 17][is_building = 'no'] {
+    [zoom >= 8][way_pixels > 3000][way_pixels <= 768000][is_building = 'no'],
+    [zoom >= 17][way_pixels <= 768000][is_building = 'no'] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -3081,8 +3081,8 @@
   }
 
   [feature = 'aeroway_apron'][is_building = 'no'] {
-    [zoom >= 10][way_pixels > 3000],
-    [zoom >= 17] {
+    [zoom >= 10][way_pixels > 3000][way_pixels <= 768000],
+    [zoom >= 17][way_pixels <= 768000] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -3107,8 +3107,8 @@
 
   [feature = 'highway_services'][is_building = 'no'],
   [feature = 'highway_rest_area'][is_building = 'no'] {
-    [zoom >= 10][way_pixels > 3000],
-    [zoom >= 17] {
+    [zoom >= 10][way_pixels > 3000][way_pixels <= 768000],
+    [zoom >= 17][way_pixels <= 768000] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
@@ -3132,9 +3132,9 @@
   }
 
   [feature = 'natural_glacier'][is_building = 'no'] {
-    [zoom >= 8][way_pixels > 10000],
-    [zoom >= 10][way_pixels > 750],
-    [zoom >= 17] {
+    [zoom >= 8][way_pixels > 10000][way_pixels <= 768000],
+    [zoom >= 10][way_pixels > 750][way_pixels <= 768000],
+    [zoom >= 17][way_pixels <= 768000] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;

diff --git a/roads.mss b/roads.mss
@@ -2672,7 +2672,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
 
 #bridge-text  {
   [man_made = 'bridge'] {
-    [zoom >= 12][way_pixels > 62.5] {
+    [zoom >= 12][way_pixels > 62.5][way_pixels <= 64000] {
       text-name: "[name]";
       text-size: 10;
       text-wrap-width: 30; // 3 em

diff --git a/scripts/get-shapefiles.py b/scripts/get-shapefiles.py
@@ -36,49 +36,38 @@
     # Keys 1, 2, 3, ... set the arg short-options and the related process
     # ordering. Use > 0 to allow processing.
     1: {
-        'directory': 'world_boundaries',
-        'url': 'https://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz',  # noqa
-        'type': 'tgz',
-        'shp_basename': [
-            'world_bnd_m',
-            'places',
-            'world_boundaries_m'],
-        'long_opt': '--world-boundaries'
-    },
-
-    2: {
         'directory': 'simplified-water-polygons-split-3857',
         'url': 'https://osmdata.openstreetmap.de/download/simplified-water-polygons-split-3857.zip',  # noqa
         'type': 'zip',
         'shp_basename': ['simplified_water_polygons'],
         'long_opt': '--simplified-water'
     },
 
-    3: {
+    2: {
         'directory': 'ne_110m_admin_0_boundary_lines_land',
         'url': 'http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip',  # noqa
         'type': 'zip_dir',
         'shp_basename': ['ne_110m_admin_0_boundary_lines_land'],
         'long_opt': '--ne-admin'
     },
 
-    4: {
+    3: {
         'directory': 'water-polygons-split-3857',
         'url': 'https://osmdata.openstreetmap.de/download/water-polygons-split-3857.zip',  # noqa
         'type': 'zip',
         'shp_basename': ['water_polygons'],
         'long_opt': '--water-polygons'
     },
 
-    5: {
+    4: {
         'directory': 'antarctica-icesheet-polygons-3857',
         'url': 'https://osmdata.openstreetmap.de/download/antarctica-icesheet-polygons-3857.zip',  # noqa
         'type': 'zip',
         'shp_basename': ['icesheet_polygons'],
         'long_opt': '--icesheet-polygons'
     },
 
-    6: {
+    5: {
         'directory': 'antarctica-icesheet-outlines-3857',
         'url': 'https://osmdata.openstreetmap.de/download/antarctica-icesheet-outlines-3857.zip',  # noqa
         'type': 'zip',

diff --git a/water.mss b/water.mss
@@ -337,7 +337,7 @@
   [feature = 'landuse_reservoir'],
   [feature = 'landuse_basin'],
   [feature = 'waterway_dock'] {
-    [zoom >= 5][way_pixels > 3000],
+    [zoom >= 5][way_pixels > 3000][way_pixels <= 768000],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: 10;