[openstreetmap-carto] 01/05: Imported Upstream version 2.44.1
Bas Couwenberg
sebastic at debian.org
Wed Oct 12 18:31:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit e8906ade5f0cc74f5a158901d9090131acb70a4f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Oct 12 20:18:00 2016 +0200
Imported Upstream version 2.44.1
---
CHANGELOG.md | 7 ++++++-
INSTALL.md | 14 +++++++++++---
project.mml | 4 ++--
project.yaml | 11 +++++++----
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee02b80..306c0e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
-## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.44.0...master)
+## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.44.1...master)
+
+## [v2.44.1](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.44.1...v2.44.0) - 2016-10-12
+### Changes
+- Bug fixes to low zoom place rendering changes
+- Documentation improvements for fonts and non-latin rendering
## [v2.44.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.44.0...v2.43.0) - 2016-09-26
### Major Changes
diff --git a/INSTALL.md b/INSTALL.md
index 79a70a9..9a953f7 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -48,16 +48,24 @@ DejaVu Sans is used as an optional fallback font for systems without Noto Sans.
Unifont is used as a last resort fallback, with it's excellent coverage, common presence on machines, and ugly look.
-Mapnik 3 is required for acceptable rendering of most non-Latin scripts, particularly those with complicated diacritics and tone marks.
-
On Ubuntu 16.04 or Debian Testing you can install all required fonts with
```
-sudo apt-get install fonts-noto ttf-unifont
+sudo apt-get install fonts-noto-cjk fonts-noto-hinted fonts-noto-unhinted ttf-unifont
```
DejaVu is packaged as `fonts-dejavu-core`.
+### Non-latin scripts
+
+For proper rendering of non-latin scripts, particularly those with complicated diacritics and tone marks the requirements are
+
+* Mapnik 3
+
+* FreeType 2.6.2 or later for CJK characters
+
+* A recent enough version of Noto with coverage for the scripts needed.
+
## Dependencies
For development, a style design studio is needed.
diff --git a/project.mml b/project.mml
index fffc907..64fcf42 100644
--- a/project.mml
+++ b/project.mml
@@ -1267,7 +1267,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n name,\n CASE\n WHEN (population ~ '^[0-9]{1,8}$') THEN population::INTEGER ELSE 0\n END as population,\n round(random()) AS dir\n FROM planet_osm_point\n WHERE capital = 'yes'\n AND admin_level = '2'\n ORDER BY population DESC\n) AS capital_names",
+ "table": "(SELECT\n way,\n name,\n CASE\n WHEN (population ~ '^[0-9]{1,8}$') THEN population::INTEGER ELSE 0\n END as population,\n round(ascii(md5(osm_id::text)) / 55) AS dir -- base direction factor on geometry to be consistent across metatiles\n FROM planet_osm_point\n WHERE place IN ('city', 'town')\n AND name IS NOT NULL\n AND capital = 'yes'\n AND admin_level = '2'\n ORDER BY population DESC\n) AS capital_names",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1320,7 +1320,7 @@
"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",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n name,\n score,\n CASE\n WHEN (place = 'city') THEN 1\n ELSE 2\n END as category,\n round(random()) AS dir\n FROM \n (SELECT\n way,\n place,\n name,\n (\n (CASE\n WHEN (population ~ '^[0-9]{1,8}$') THEN population::INTEGER\n WHEN (place = 'city') THEN 100000\n WHEN (place = 'town') THEN 1000\n ELSE 1\n END)\n *\n (CA [...]
+ "table": "(SELECT\n way,\n name,\n score,\n CASE\n WHEN (place = 'city') THEN 1\n ELSE 2\n END as category,\n round(ascii(md5(osm_id::text)) / 55) AS dir -- base direction factor on geometry to be consistent across metatiles\n FROM \n (SELECT\n osm_id,\n way,\n place,\n name,\n (\n (CASE\n WHEN (population ~ '^[0-9]{1,8}$') THEN population::INTEGER\n WHEN (place = 'city') THEN 100000 [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
diff --git a/project.yaml b/project.yaml
index 29aa170..c1ab649 100644
--- a/project.yaml
+++ b/project.yaml
@@ -1533,9 +1533,11 @@ Layer:
CASE
WHEN (population ~ '^[0-9]{1,8}$') THEN population::INTEGER ELSE 0
END as population,
- round(random()) AS dir
+ round(ascii(md5(osm_id::text)) / 55) AS dir -- base direction factor on geometry to be consistent across metatiles
FROM planet_osm_point
- WHERE capital = 'yes'
+ WHERE place IN ('city', 'town')
+ AND name IS NOT NULL
+ AND capital = 'yes'
AND admin_level = '2'
ORDER BY population DESC
) AS capital_names
@@ -1582,9 +1584,10 @@ Layer:
WHEN (place = 'city') THEN 1
ELSE 2
END as category,
- round(random()) AS dir
+ round(ascii(md5(osm_id::text)) / 55) AS dir -- base direction factor on geometry to be consistent across metatiles
FROM
(SELECT
+ osm_id,
way,
place,
name,
@@ -1604,7 +1607,7 @@ Layer:
FROM planet_osm_point
WHERE place IN ('city', 'town')
AND name IS NOT NULL
- AND capital IS NULL OR capital != 'yes' OR (capital = 'yes' AND admin_level != '2')
+ AND (capital IS NULL OR capital != 'yes' OR (capital = 'yes' AND (admin_level IS NULL OR admin_level != '2')))
) as p
ORDER BY score DESC, length(name) DESC, name
) AS placenames_medium
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git
More information about the Pkg-grass-devel
mailing list