Due to the order of spanish determinants, a street such as "Calle de
los Huertos" was indexed under "los Huertos (Calle de)" instead of
"Huertos (Calle de los)". Same problem for "de la" or "de las". By
reordering the determinants so that the most specific ones are
considered first, we can achieve the desired behaviour.
See
http://www.maposmatic.org/rendered//046017_2012-04-27_11-51_MirafloresdelaSierraSpain.png
for an example of many current problems.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
In concerned SQL queries this patch apply a 0-buffer to malformed ways.
As malformed ways seem pretty uncommon and as this operation is heavy
for performance issue the query is first run without the 0-buffer and
is re-run with it if the query fails.
With PostGIS 1.5 the failure message is not explicit so we can only
catch the generic psycopg2.InternalError.
This is committed only for debugging purposes, to help us investigate
the file descriptors leak problem.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
This is committed only for debugging purposes, to help us investigate
the file descriptors leak problem.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
* The CSV file should be generated after calling apply_grid() method
which updates the grid location of each label.
Signed-off-by: David MENTRE <dmentre@linux-france.org>
In case of multi-page renderer, we are using Mapnik projection functions
to convert from (lat,lon) to meters and vice-versa. Therefore, contrary
to single page renderer, we don't need to take into account current
latitude, as Mapnik is doing this for us.
Signed-off-by: David MENTRE <dmentre@linux-france.org>
While I'd forgotten to add the norwegian languages to i18n, Thomas's patch to do so contained a typo. This fixes that typo.
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
CC: Thomas Petazzoni <thomas.petazzoni@enix.org>
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>
For the moment, the CSV generated by the multi-page renderer is
completely incorrect. It would require more work, and is not essential
to put this multi-page renderer in production, so let's disable it for
now. We can make it work later on, and enable it again if we want.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
The single page renderers can output PNG, SVGZ, PDF and CSV, but by
design, the multi page renderer can only output PDF and CSV. So we
introduce a get_compatible_output_formats() in the renderer class so
that users of OcitySMap2 can find out which formats are possible
depending on the choosen layout.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
Thomas Petazzoni
