Renamed ocitysmap2-render as render.py since we don't need/want
"ocitysmap2" in the name anymore. Rename conf template as
ocitysmap.conf.dist for the same reason. Updated INSTALL instructions
accordingly.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
As the changes in the base stylesheet begins to be heavy, specific
stylesheets files have been created. Reference files (labels.mms for
labels-ocitysmap.mss and style-toner-standard.mml for
style-toner-ocitysmap.mml) have been added to ocitysmap repository to
track changes on the toner main repository.
style-toner-ocitysmap.mml and labels-ocitysmap.mss have been updated
to display names of localities, hamlets and villages.
INSTALL instructions have been updated.
[Thomas: add similar fix for UK stylesheet]
Signed-off-by: David MENTRE <dmentre@linux-france.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
As of mapnik commit 14700dba16146902ca98fdcacb72b2fba4fa596a,
using 'import mapnik2' raises a DeprecationWarning.
See https://github.com/mapnik/mapnik/issues/941 for details.
Update imports of the mapnik module to use 'import mapnik' and assert
that the installed version is new enough.
We need mapnik 2.1.0 (or at least a version newer than 2.0.0
that supports placement-type="simple") for the Printable Stylesheet,
as per David's suggestion. Thomas pointed out that having the note
in all files was overkill, this patch takes that into account.
Also update INSTALL with instructions on how to build Mapnik from Git
and which specifically tested commit to use if the latest version
doesn't work.
CC: thomas.petazzoni@enix.org
CC: dmentre@linux-france.org
CC: maxime.petazzoni@bulix.org
Tested-by: Jeroen van Rijn <jvrnix@gmail.com>
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
Instructions for Ubuntu Lucid are now valid for Debian unstable too, so
move the INSTALL.lucid file as main INSTALL file and removed the other
two.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
In order to get proper rendering of Korean, Chinese, Japanese and
probably other "special" characters, the unifont font must be
enabled. This patch updates the INSTALL procedure to :
* Install the ttf-unifont package
* Patch Mapnik so that it recursively searches for fonts
* Compile Mapnik with SYSTEM_FONTS=/usr/share/fonts
* Modify the mapnik-osm configuration file to enable the usage of
unifont
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Django relies on psycopg2 for its postgres backend, whereas ocitysmap
was using another (pgdb). This patch addresses task #9666: it removes
the pygresql dependency and changes it for psycopg2.
The major part of the patch deals with unicode issues, because
psycopg2 can handle unicode strings directly. Actual;ly, that's what
it does when it is being used along django. So we force this same
behavior as well when we run ocitysmap in plain "command line" mode.
Manuel Fuhr