Merge remote-tracking branch 'upstream/master' into low-zoom-landcover

.travis.yml

@@ -45,3 +45,5 @@ script:
   - psql -1Xq -v ON_ERROR_STOP=1 -d gis -f indexes.sql
   # Test for hstore operation not supported in PostgreSQL 9.3
   - '! grep "tags->''[^'']\+'' IS" project.mml > /dev/null'
+  # Test for classes in project.mml (not supported in vector tiles)
+  - '! grep "class:" project.mml > /dev/null'

CHANGELOG.md

@@ -1,4 +1,52 @@
-## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.23.0...master)
+## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.24.1...master)
+
+## [v4.24.1](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.24.0...v4.24.1) - 2019-10-28
+### Changes
+- Revert PR #3930 which added river-color (#3955)
+
+## [v4.24.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.23.0...v4.24.0) - 2019-10-25
+### Changes
+- Create darker river-color for river & canal areas and waterway lines (#3930)
+
+    The color of river, canal, ditch and drain waterway lines 
+    and river and canal areas is changed to `#8fcadd` (Lch78,21,227) 
+
+- Fix rendering of water body labels (#3919)
+
+    Restores rendering of water body labels on points (node features)
+    Fixes rendering of natural=bay to use italic font at all z levels
+    Cleans up duplicate natural=strait code in water.mss
+
+- Precedence of junctions over POIs (#3915)
+
+    Junction=yes, =motorway and man_made=bridge labels now render before amenity-points
+    This prevents icons from blocking the display of these text labels
+
+- Remove rendering of waterway=wadi (#3931)
+
+    The tag waterway=wadi is deprecated, suggested replacement: 
+    waterway=river/stream + intermittent=yes OR natural=valley
+
+- Move parking to amenity-points layers, change way_pixels limit and initial zoom level (#3923)
+
+    Moved parking features back to amenity-points layers
+    Changed parking text intial zoom to z14, as planned in PR #3612
+    Change way_pixels limit for parking icon (750) and text (3000)
+
+- Don't use classes anymore (#3912)
+- Convert state & country layers to ST_PointOnSurface (#3920)
+- Convert addresses to use ST_PointOnSurface (#3898)
+- Apply bbox to part of "addresses" query (#3942)
+
+    The 4 changes above are needed to allow use of vector tiles
+    ST_PointOnSurface is used to generate a point for labeling
+    Classes are removed, replaced with the layer id
+
+- Documentation updates (#3911) & (#3910) 
+- Code clean-up (#3899) & (#3922)
+
+    Document inner line rendering, update docker documentation
+    Clean-up text-placement / marker-placement, remove natural=marsh
 
 ## [v4.23.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.22.0...v4.23.0) - 2019-9-20
 ### Changes

DOCKER.md

@@ -20,6 +20,7 @@ Read on below to get the details.
 
 * `git clone https://github.com/gravitystorm/openstreetmap-carto.git` to clone openstreetmap-carto repository into a directory on your host system
 * download OpenStreetMap data in osm.pbf format to a file `data.osm.pbf` and place it within the openstreetmap-carto directory (for example some small area from [Geofabrik](https://download.geofabrik.de/))
+* If necessary, `sudo service postgresql stop` to make sure you don't have currently running a native PostgreSQL server which would conflict with Docker's PostgreSQL server.
 * `docker-compose up import` to import the data (only necessary the first time or when you change the data file)
 * `docker-compose up kosmtik` to run the style preview application
 * browse to [http://localhost:6789](http://localhost:6789) to view the output of Kosmtik

admin.mss

@@ -275,9 +275,16 @@ overlapping borders correctly.
       }
     }
     [zoom >= 10] {
+      // inner line
       ::wideline {
         opacity: 0.15;
         line-width: 3.6;
+        // Unlike planet_osm_line, planet_osm_polygon does not preserves the
+        // original direction of the OSM way: Following OGS at
+        // https://www.opengeospatial.org/standards/sfa always at the left
+        // is the interior and at the right the exterior of the polygon.(This
+        // also applies to inner rings of multipolygons.) So a negative
+        // line-offset is always an offset to the inner side of the polygon.
         line-offset: -0.9;
         line-color: green;
         [boundary='aboriginal_lands'],
@@ -295,6 +302,7 @@ overlapping borders correctly.
           line-offset: -2;
         }
       }
+      // outer line
       ::narrowline {
         opacity: 0.15;
         line-width: 1.8;

amenity-points.mss

@@ -1,5 +1,5 @@
 @marina-text: #576ddf; // also swimming_pool
-@wetland-text: darken(#4aa5fa, 25%); /* Also for marsh and mud */
+@wetland-text: darken(#4aa5fa, 25%); /* Also for mud */
 @shop-icon: #ac39ac;
 @shop-text: #939;
 @transportation-icon: #0092da;
@@ -1434,27 +1434,12 @@
       marker-fill: @man-made-icon;
     }
   }
-}
-
-#amenity-low-priority {
-  [feature = 'man_made_cross'][zoom >= 16],
-  [feature = 'historic_wayside_cross'][zoom >= 16] {
-    marker-file: url('symbols/man_made/cross.svg');
-    marker-fill: @religious-icon;
-    marker-clip: false;
-  }
-
-  [feature = 'historic_wayside_shrine'][zoom >= 17] {
-    marker-file: url('symbols/historic/shrine.svg');
-    marker-fill: @man-made-icon;
-    marker-clip: false;
-  }
 
   [feature = 'amenity_parking'],
   [feature = 'amenity_bicycle_parking'],
   [feature = 'amenity_motorcycle_parking'],
   [feature = 'amenity_parking_entrance'] {
-    [zoom >= 14][way_pixels > 900],
+    [zoom >= 14][way_pixels > 750],
     [zoom >= 17][feature = 'amenity_parking'],
     [zoom >= 18] {
       [feature = 'amenity_parking'] { marker-file: url('symbols/amenity/parking.svg'); }
@@ -1466,6 +1451,21 @@
       [access != ''][access != 'permissive'][access != 'yes'] { marker-opacity: 0.33; }
     }
   }
+}
+
+#amenity-low-priority {
+  [feature = 'man_made_cross'][zoom >= 16],
+  [feature = 'historic_wayside_cross'][zoom >= 16] {
+    marker-file: url('symbols/man_made/cross.svg');
+    marker-fill: @religious-icon;
+    marker-clip: false;
+  }
+
+  [feature = 'historic_wayside_shrine'][zoom >= 17] {
+    marker-file: url('symbols/historic/shrine.svg');
+    marker-fill: @man-made-icon;
+    marker-clip: false;
+  }
 
   [feature = 'railway_level_crossing'][zoom >= 14]::railway,
   [feature = 'railway_crossing'][zoom >= 15]::railway{
@@ -1573,7 +1573,7 @@
 }
 
 /* Note that these layers are also used in water.mss */
-.text-low-zoom[zoom < 10],
+#text-poly-low-zoom[zoom < 10],
 #text-point[zoom >= 10] {
   [feature = 'place_island'][zoom >= 4][way_pixels > 3000][way_pixels <= 768000],
   [feature = 'place_island'][zoom >= 16][way_pixels <= 768000],
@@ -2125,7 +2125,6 @@
   }
 
   [feature = 'natural_wetland'],
-  [feature = 'natural_marsh'],
   [feature = 'natural_mud'],
   [feature = 'leisure_park'],
   [feature = 'leisure_recreation_ground'],
@@ -2200,7 +2199,6 @@
       text-halo-fill: @standard-halo-fill;
       [feature = 'natural_reef'],
       [feature = 'natural_wetland'],
-      [feature = 'natural_marsh'],
       [feature = 'natural_mud'] {
         text-fill: @wetland-text;
       }
@@ -2317,7 +2315,6 @@
     }
   }
 
-  [feature = 'natural_bay'][zoom >= 14],
   [feature = 'natural_spring'][zoom >= 16] {
     text-name: "[name]";
     text-size: 10;
@@ -2327,9 +2324,7 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    [feature = 'natural_spring'] {
-      text-dy: 6;
-    }
+    text-dy: 6;
   }
 
   [feature = 'amenity_atm'][zoom >= 19],
@@ -2924,14 +2919,12 @@
     text-halo-fill: @standard-halo-fill;
     text-face-name: @standard-font;
   }
-}
 
-#text-low-priority {
   [feature = 'amenity_parking'],
   [feature = 'amenity_bicycle_parking'],
   [feature = 'amenity_motorcycle_parking'],
   [feature = 'amenity_parking_entrance'] {
-    [zoom >= 10][way_pixels > 900],
+    [zoom >= 14][way_pixels > 3000],
     [zoom >= 18] {
       text-name: "[name]";
       text-size: @standard-font-size;
@@ -2950,7 +2943,9 @@
       [feature = 'amenity_motorcycle_parking'] { text-dy: 12; }
     }
   }
+}
 
+#text-low-priority {
   [feature = 'man_made_cross'][zoom >= 17],
   [feature = 'historic_wayside_cross'][zoom >= 17],
   [feature = 'historic_wayside_shrine'][zoom >= 17] {

landcover.mss

@@ -946,7 +946,8 @@
   }
 }
 
-.barriers {
+#line-barriers,
+#area-barriers {
   [zoom >= 16] {
     line-width: 0.4;
     line-color: #444;

placenames.mss

@@ -3,7 +3,7 @@
 @country-labels: darken(@admin-boundaries, 15%);
 @state-labels: desaturate(darken(@admin-boundaries, 5%), 20%);
 
-.country {
+#country-names {
   [zoom >= 3][zoom < 5][way_pixels > 1000],
   [zoom >= 5][way_pixels < 360000] {
     text-name: "[name]";
@@ -38,12 +38,11 @@
     text-face-name: @book-fonts;
     text-halo-fill: @standard-halo-fill;
     text-halo-radius: @standard-halo-radius * 1.5;
-    text-placement: interior;
     text-character-spacing: 0.5;
   }
 }
 
-.state {
+#state-names {
   [zoom >= 5][zoom < 7][way_pixels > 3000],
   [zoom >= 7][way_pixels > 3000][way_pixels < 196000] {
     text-name: "[name]";
@@ -55,7 +54,6 @@
     text-face-name: @oblique-fonts;
     text-halo-fill: @standard-halo-fill;
     text-halo-radius: @standard-halo-radius * 1.5;
-    text-placement: interior;
     [zoom >= 7] {
       text-size: 11;
       text-wrap-width: 50; // 4.5 em