Merge tag 'v3.2.0' into lua/master

Tag v3.2.0

CARTOGRAPHY.md

@@ -18,7 +18,7 @@ This style has multiple purposes:
 * It's an important feedback mechanism for mappers to validate their edits and helps to prevent unfavorable fragmentation of tag use.
 * It's a major part of the public face of OpenStreetMap, for many people the map on osm.org rendered with this style _is_ OpenStreetMap.
 * It's used in many map applications as a general purpose map.
-* It's an examplar stylesheet for rendering OSM data.
+* It's an exemplar stylesheet for rendering OSM data.
 
 There is no ranking of these purposes.  To allow serving all of them and to 
 avoid satisfying only some at the cost of the others the following main goals 

CHANGELOG.md

@@ -1,4 +1,14 @@
-## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.1.0...master)
+## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.2.0...master)
+
+## [v3.2.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.1.0...v3.2.0) - 2017-04-17
+### Changes
+- Render aeroway terminal buildings like other buildings
+- Removed rendering of `landuse=farm`
+- Added rendering for arts centre, fitness centre, plant nursery, mixed lift aerialways
+- Rendering for fens changed
+- Typography for point road-related features, addresses, and water features changed
+- Removed rendering of `waterway=canal` as an area
+- Take text properties of roads under construction from the type of road they will be
 
 ## [v3.1.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.0.1...v3.1.0) - 2017-01-28
 ### Changes

INSTALL.md

@@ -43,13 +43,15 @@ The repeated www.naturalearthdata.com in the Natural Earth shapefiles is correct
 Put these shapefiles at `path/to/openstreetmap-carto/data`.
 
 ## Fonts
-The stylesheet uses Noto Sans, an openly licensed font from Google with support for multiple scripts. The "UI" version is used where available, with its vertical metrics which fit better with Latin text. Other fonts from the Noto family are used for some other languages.
+The stylesheet uses Noto, an openly licensed font family from Google with support for multiple scripts. The stylesheet uses Noto's "Sans" style where available. If not available, this stylesheet uses another appropriate style of the Noto family. The "UI" version is used where available, with its vertical metrics which fit better with Latin text.
 
 DejaVu Sans is used as an optional fallback font for systems without Noto Sans. If all the Noto fonts are installed, it should never be used.
 
 Unifont is used as a last resort fallback, with it's excellent coverage, common presence on machines, and ugly look.
 
-On Ubuntu 16.04 or Debian Testing you can install the required fonts except Noto Emoji Regular with
+### Installation on Ubuntu/Debian
+
+On Ubuntu 16.04 or Debian Testing you can download and install the required fonts except Noto Emoji Regular with
 
 ```
 sudo apt-get install fonts-noto-cjk fonts-noto-hinted fonts-noto-unhinted ttf-unifont
@@ -61,6 +63,16 @@ It might be useful to have a more recent version of the fonts for [rare non-lati
 
 DejaVu is packaged as `fonts-dejavu-core`.
 
+### Installation on other operation systems
+
+The fonts can be downloaded here:
+
+* [Noto homepage](http://www.google.com/get/noto/) and [Noto github repositories](http://github.com/googlei18n?utf8=%E2%9C%93&q=noto)
+* [DejaVu homepage](http://dejavu-fonts.org/)
+* [Unifont homepage](http://unifoundry.com/)
+
+After the download, you have to install the font files in the usual way of your operation system.
+
 ### Non-latin scripts
 
 For proper rendering of non-latin scripts, particularly those with complicated diacritics and tone marks the requirements are

README.md

@@ -88,7 +88,7 @@ maps using Mapnik, many based on this project. Some alternatives are:
 * [OSM-Bright](https://github.com/mapbox/osm-bright)
 * [XML-based stylesheets](https://trac.openstreetmap.org/browser/subversion/applications/rendering/mapnik)
 * [osmfr-cartocss](https://github.com/cquest/osmfr-cartocss)
-* [openstreetmap-carto-german](https://github.com/woodpeck/openstreetmap-carto-german)
+* [openstreetmap-carto-german](https://github.com/giggls/openstreetmap-carto-de)
 
 # Maintainers
 

RELEASES.md

@@ -7,6 +7,7 @@ Throughout this document, replace $OLD_VERSION with the previous release and $NE
 1. Update your local master branch
 2. Review the changes in git since the last release with a command like `git log --graph $OLD_VERSION...master` or online at https://github.com/gravitystorm/openstreetmap-carto/compare/$OLD_VERSION...master
 3. Review [pull requests](https://github.com/gravitystorm/openstreetmap-carto/pulls) for anything that should be merged before release
+4. Check [`preview.png`](preview.png) and update it if needed. Preferred way is to import current Chicago data, export new image (for example from Kosmtik via [this link](http://127.0.0.1:6789/openstreetmap-carto/export/?showExtent=true&format=png&width=849&height=310&scale=1&zoom=15&bounds=-87.65145778656006%2C41.86914537674214%2C-87.61502265930177%2C41.8790515319021)) and upload as new version of this file
 
 Decide among the maintainers if a new release is due.
 
@@ -54,4 +55,4 @@ https://github.com/gravitystorm/openstreetmap-carto/issues.
 
 3. Post an [openstreetmap.org diary entry](http://www.openstreetmap.org/diary/new) with the text from the email. Add links and other markdown if needed.
 
-4. *Optional: Post on twitter with a link to the diary entry.*
+4. *Optional: Post on twitter with a link to the diary entry.*

addressing.mss

@@ -21,14 +21,17 @@
     }
     text-placement: interior;
     text-min-distance: 1;
-    text-wrap-width: 20;
     text-face-name: @book-fonts;
     text-fill: @address-color;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
     text-size: 10;
+    text-wrap-width: 20; // 2.0 em
+    text-line-spacing: -1.5; // -0.15 em
     [zoom >= 20] {
         text-size: 11;
+        text-wrap-width: 22; // 2.0 em
+        text-line-spacing: -1.65; // -0.15 em
     }
   }
 }
@@ -41,11 +44,12 @@ no official postal addresses) */
   [zoom >= 17] {
     text-name: "[name]";
     text-placement: interior;
-    text-wrap-width: 20;
     text-face-name: @book-fonts;
     text-fill: #444;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
     text-size: 11;
+    text-wrap-width: 22; // 2.0 em
+    text-line-spacing: -1.65; // -0.15 em
   }
 }

aerialways.mss

@@ -1,6 +1,7 @@
 #aerialways {
   [aerialway = 'cable_car'],
-  [aerialway = 'gondola'] {
+  [aerialway = 'gondola'],
+  [aerialway = 'mixed_lift'] {
     [zoom >= 12] {
       line/line-width: 1;
       line/line-join: round;

amenity-points.mss

@@ -501,6 +501,13 @@
     marker-clip: false;
   }
 
+  [feature = 'amenity_arts_centre'][zoom >= 17] {
+    marker-file: url('symbols/shop/art.svg');
+    marker-fill: @amenity-brown;
+    marker-placement: interior;
+    marker-clip: false;
+  }
+
   [feature = 'amenity_toilets'][zoom >= 17] {
     marker-file: url('symbols/toilets.svg');
     marker-fill: @amenity-brown;
@@ -1233,7 +1240,8 @@
   [feature = 'amenity_theatre'],
   [feature = 'amenity_courthouse'],
   [feature = 'amenity_townhall'],
-  [feature = 'amenity_cinema'] {
+  [feature = 'amenity_cinema'],
+  [feature = 'amenity_arts_centre'] {
     [zoom >= 17] {
       text-name: "[name]";
       text-size: @standard-text-size;
@@ -1248,7 +1256,8 @@
       [feature = 'amenity_library'],
       [feature = 'tourism_museum'],
       [feature = 'amenity_theatre'],
-      [feature = 'amenity_cinema'] {
+      [feature = 'amenity_cinema'],
+      [feature = 'amenity_arts_centre'] {
         text-dy: 11;
       }
     }
@@ -1549,6 +1558,7 @@
   [feature = 'landuse_quarry'],
   [feature = 'landuse_vineyard'],
   [feature = 'landuse_orchard'],
+  [feature = 'landuse_plant_nursery'],
   [feature = 'landuse_cemetery'],
   [feature = 'amenity_grave_yard'],
   [feature = 'landuse_residential'],
@@ -1581,6 +1591,7 @@
   [feature = 'natural_beach'],
   [feature = 'natural_shoal'],
   [feature = 'natural_reef'],
+  [feature = 'leisure_fitness_centre'],
   [feature = 'leisure_sports_centre'],
   [feature = 'leisure_stadium'],
   [feature = 'leisure_track'],
@@ -1623,7 +1634,8 @@
         text-fill: darken(@quarry, 60%);
       }
       [feature = 'landuse_vineyard'],
-      [feature = 'landuse_orchard'] {
+      [feature = 'landuse_orchard'],
+      [feature = 'landuse_plant_nursery'] {
         text-fill: darken(@orchard, 50%);
       }
       [feature = 'landuse_cemetery'],
@@ -1695,6 +1707,7 @@
       [feature = 'natural_shoal'] {
         text-fill: darken(@beach, 60%);
       }
+      [feature = 'leisure_fitness_centre'],
       [feature = 'leisure_sports_centre'],
       [feature = 'leisure_stadium'] {
         text-fill: darken(@stadium, 70%);

buildings.mss

@@ -5,9 +5,6 @@
 @building-major-fill: darken(@building-fill, 20%);
 @building-major-line: darken(@building-major-fill, 25%);
 
-@building-aeroway-fill: #cc99ff;
-@building-aeroway-line: darken(@building-aeroway-fill,15%);
-
 
 #buildings {
   [zoom >= 13] {
@@ -24,15 +21,7 @@
 
 #buildings-major {
   [zoom >= 13] {
-    [aeroway = 'terminal'] {
-      polygon-fill: @building-aeroway-fill;
-      polygon-clip: false;
-      [zoom >= 15] {
-        line-width: .75;
-        line-clip: false;
-        line-color: @building-aeroway-line;
-      }
-    }
+    [aeroway = 'terminal'],
     [amenity = 'place_of_worship'],
     [building = 'train_station'] {
       polygon-fill: @building-major-fill;

landcover.mss

@@ -5,7 +5,7 @@
 @forest: #add19e;       // Lch(80,30,135)
 @forest-text: #46673b;  // Lch(40,30,135)
 @park: #c8facc;         // Lch(94,30,145) also recreation_ground
-@orchard: #aedfa3;
+@orchard: #aedfa3; // also vineyard, plant_nursery
 
 // --- "Base" landuses ---
 
@@ -17,7 +17,7 @@
 @commercial-line: #d1b2b0;  // Lch(75,12,25)
 @industrial: #ebdbe8;       // Lch(89,9,330) (Also used for railway)
 @industrial-line: #c6b3c3;  // Lch(75,11,330) (Also used for railway-line)
-@farmland: #fbecd7;         // Lch(94,12,80) (Also used for farm)
+@farmland: #fbecd7;         // Lch(94,12,80)
 @farmland-line: #d6c4ab;    // Lch(80,15,80)
 @farmyard: #f5dcba;         // Lch(89,20,80)
 @farmyard-line: #d1b48c;    // Lch(75,25,80)
@@ -59,7 +59,7 @@
 
 @pitch: #aae0cb; // also track
 @track: @pitch;
-@stadium: @societal_amenities; // also sports_centre
+@stadium: @societal_amenities; // also fitness_centre and sports_centre
 @golf_course: #b5e3b5;
 
 #landcover-low-zoom[zoom < 10],
@@ -145,6 +145,20 @@
     }
   }
 
+  [feature = 'landuse_plant_nursery'] {
+    [zoom >= 10] {
+      polygon-fill: @orchard;
+      [way_pixels >= 4]  { polygon-gamma: 0.75; }
+      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    }
+    [zoom >= 14] {
+      polygon-pattern-file: url('symbols/plant_nursery.png');
+      polygon-pattern-alignment: global;
+      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
+      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+    }
+  }
+
   [feature = 'landuse_cemetery'],
   [feature = 'amenity_grave_yard'] {
     [zoom >= 10] {
@@ -282,7 +296,6 @@
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
-  [feature = 'landuse_farm'],
   [feature = 'landuse_farmland'],
   [feature = 'landuse_greenhouse_horticulture'] {
     [zoom >= 10] {
@@ -454,6 +467,7 @@
   }
 
   [feature = 'wetland_wet_meadow'],
+  [feature = 'wetland_fen'],
   [feature = 'wetland_marsh'] {
     [zoom >= 10] {
       polygon-fill: @grass;
@@ -474,7 +488,7 @@
         polygon-fill: @societal_amenities;
         [zoom >= 13] {
           line-width: 0.3;
-          line-color: brown;
+          line-color: darken(@societal_amenities, 35%);
         }
       }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
@@ -528,12 +542,17 @@
     polygon-fill: @station;
   }
 
+  [feature = 'leisure_fitness_centre'],
   [feature = 'leisure_sports_centre'],
   [feature = 'leisure_stadium'] {
     [zoom >= 10] {
       polygon-fill: @stadium;
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [zoom >= 13] {
+        line-width: 0.3;
+        line-color: darken(@stadium, 35%);
+      }
     }
   }
 
@@ -586,8 +605,7 @@
   [zoom >= 14] {
     [int_wetland = 'marsh'],
     [int_wetland = 'saltmarsh'],
-    [int_wetland = 'wet_meadow'],
-    [int_wetland = 'fen'] {
+    [int_wetland = 'wet_meadow'] {
       polygon-pattern-file: url('symbols/wetland_marsh.png');
       polygon-pattern-alignment: global;
     }
@@ -604,6 +622,7 @@
       polygon-pattern-alignment: global;
     }
     [int_wetland = 'bog'],
+    [int_wetland = 'fen'],
     [int_wetland = 'string_bog'] {
       polygon-pattern-file: url('symbols/wetland_bog.png');
       polygon-pattern-alignment: global;