This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository openstreetmap-carto.
commit f5988e5461e615ec5927c22113a17284cef430ad Author: Bas Couwenberg <[email protected]> Date: Fri Dec 23 09:31:16 2016 +0100 Imported Upstream version 3.0.1 --- CHANGELOG.md | 4 ++++ project.mml | 27 ++------------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 561d29e..b368a1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.0.0...master) +## [v3.0.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.0.0...v3.0.1) - 2016-12-22 +### Changes +- Revert of junction area changes which were preventing index usage + ## [v3.0.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.45.1...v3.0.0) - 2016-12-21 ### Major Changes - Mapnik 3 is now required diff --git a/project.mml b/project.mml index 77c3179..e45372e 100644 --- a/project.mml +++ b/project.mml @@ -1924,33 +1924,10 @@ Layer: highway, junction, ref, - name, - NULL AS way_pixels + name FROM planet_osm_point WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes' - UNION( - SELECT - ST_BuildArea(way), - highway, - junction, - ref, - name, - NULL AS way_pixels - FROM planet_osm_line - WHERE junction = 'yes' - UNION - SELECT - way, - highway, - junction, - ref, - name, - way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels - FROM planet_osm_polygon - WHERE junction = 'yes' - ORDER BY way_pixels DESC NULLS LAST - ) - ) AS junctions + ) AS junctions properties: minzoom: 11 advanced: {} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
