Wykres commitów

601 Commity (e62162fb38e261c2255220fd9d880e78875ada60)

Autor SHA1 Wiadomość Data
Maxime Petazzoni 78d231129d Spanish translation
Integrate OCitySMap Spanish translation, contributed by:

  * Jean-Guilhem Cailton <jgc@arkemie.com>
  * Sebastian Borgwardt <sebastian.borgwardt@aonikenk.com>
  * Julio Costa Zambelli <julio.costa@openstreetmap.cl>

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-03-13 16:54:35 +01:00
Maxime Petazzoni 6f6d2de4b7 Improve information messages during rendering
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-03-10 18:07:56 +01:00
Maxime Petazzoni ea546db8ef Set logger to 'maposmatic' to correctly collect OCitySMap logging messages
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-02-24 12:36:45 +01:00
Thomas Petazzoni 78a33dc6fa Add python-gtk2 and python-cairo as dependencies
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-02-24 09:34:50 +01:00
Thomas Petazzoni 2658b0aa72 street_index: reorganize imports
One per-line, sorted alphabetically. We keep imports of standard
Python modules separated from imports of OCitySMap specific modules.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-02-24 09:34:47 +01:00
Thomas Petazzoni dd54123ea1 Use pango to render copyright notice and al. on maps
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-02-24 09:34:44 +01:00
Thomas Petazzoni 32e134f0e1 Use Pango to draw the index and map titles
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-02-24 09:34:40 +01:00
Thomas Petazzoni be4a2f34f6 Implement support for RTL languages in street index
We introduce a isrtl() method in the i18n classes. By default, this
method returns False (for non-RTL languages), but RTL languages can
return True to enable the RTL rendering mode for the map and the
index.

For now, the RTL mode :

 * Changes the rendering of the index columns: the first column is on
   the right.

 * Changes on index entries are rendered: the street name is on the
   right while the location on the map squares is on the left.

We must ask Arabic person to know whether the square on the map should
also be rendered from right to left (i.e column A on the right).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-02-24 09:34:37 +01:00
Thomas Petazzoni 2e3cb99a9a Use Pango to render the text for the index
This allows Arabic or Korean characters to be rendered properly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-02-24 09:34:35 +01:00
Maxime Petazzoni 6179e7aca4 Improve the map_areas table name parametrization
Previously, the map_areas table name was taken from the ocitysmap.conf
configuration file (from the wrong section when compared to the provided
configuration file example...), falling back to a sensible default. This
didn't really help make things easier to run several ocitysmap rendering
processes in parallel, as they would need separate, pre-existing
configuration files.

A table name prefix can now be provided to the OCitySMap initalization
function instead of through the configuration file. The map_areas table
name is then constructed from this prefix with '<prefix>map_areas'.
Example prefixes are: 'RENDERERNAME_PID_', 'myjob_', 'another_'.

The temporary table is also now automatically cleaned up after
processing (failing or not).

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-02-10 21:13:10 +01:00
Łukasz Jernaś 4d3a32533f Initial Polish language support.
This patch adds support for some of the caveats in maps of Poland
generated from ocitysmap. Probably more will be needed.

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-02-10 15:32:09 +01:00
David MENTRE 554503d8ca Add French prefix "Parc" to ocitysmap/i18n.py 2010-01-28 12:04:45 +01:00
David MENTRE 2973856c9b First support for Croatian. Handling of Croatian accents 2010-01-22 12:38:26 +01:00
David MENTRE aed528b7d6 New i18n.py script to handle I18N tasks
The set of languages is deduced from locale/ directory content.

Usage: i18n.py [options]
 WARNING: This program should be called from ocitysmap/ directory!

Options:
  -h, --help            show this help message and exit
  -P, --make-pot        make locale/ocitysmap.pot
  -p, --make-po         merge locale/ocitysmap.pot with
                        locale/*/LC_MESSAGES/ocitysmap.po
  -m, --compile-mo      compile locale/*/LC_MESSAGES/ocitysmap.mo files
  -n LANGUAGE_CODE, --new-language=LANGUAGE_CODE
                        create .pot file for a new language. LANGUAGE_CODE is
                        like "fr_FR".
2010-01-20 20:34:46 +01:00
David MENTRE 39e93aff75 Update I18N documentation file for new i18n.py script 2010-01-20 20:29:11 +01:00
malenki 2fe1066167 Updated german translation ocitysmap 2010-01-17 10:33:02 +01:00
Maxime Petazzoni e3452f7b8a Fixed some French translations 2010-01-17 10:32:45 +01:00
Thomas Petazzoni fe2d9578da Catalan i18n update, by Joan Montané
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-12 21:53:24 +01:00
Jeroen van Rijn 7f5ddf3cca Quick fix for the Matches == None exception
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2010-01-12 21:45:30 +01:00
Thomas Petazzoni 0dc6286458 Update catalan translation, by Joan Montané
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-12 18:43:29 +01:00
Thomas Petazzoni 88de22f994 Update arabic translation, by Bassem JARKAS
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-12 18:15:13 +01:00
Thomas Petazzoni 44deac3ff3 Remove debugging message left in previous commit
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-12 18:08:43 +01:00
David Decotigny 0280212f34 Use psycopg2 instead of pygresql (aka. pgdb)
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.
2010-01-12 18:07:40 +01:00
Jeroen van Rijn 760507a5eb v2: Fix plural/singular issue with Public building(s)
Thanks to David Mentre for the head's up.

Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2010-01-12 17:52:51 +01:00
Thomas Petazzoni 039979cf64 Update pt_BR translation, by Rodrigo de Avila
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-12 17:52:26 +01:00
Maxime Petazzoni 4e89d4be04 Add 'Passerelle' and 'Passerelles' to the list of French appelations 2010-01-12 17:51:06 +01:00
Jeroen van Rijn be1ad4f23b Updated ocitysmap Dutch translation
Adds newly added strings from draw_utils.py

Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2010-01-11 23:05:15 +01:00
Thomas Petazzoni 87f0abd26f Translate the strings at the bottom left of the map
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-11 22:33:18 +01:00
David MENTRE 26a3f5f099 Add "Cale" and "Cales" into French street prefixes (task 10061) 2010-01-11 22:16:06 +01:00
Thomas Petazzoni 1b1dbf9a51 pt_BR determinants fixes by Rodrigo de Avila
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-11 21:33:51 +01:00
Jeroen van Rijn 02c34096f0 INSTALL: Add instructions to install Git and SVN if needed
Also changed one instance of "svn checkout" to "svn co" to match the other instance.

Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2010-01-11 21:32:22 +01:00
Jeroen van Rijn 51521b2f1f Updated ocitysmap/i18n.py.i18n_nl_generic
Added comments as to what the Dutch class is actually doing.
Added more titles to capture as prefixes.
Added handling of counting words, e.g. "1e Walstraat" => "Walstraat (1e)"

Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2010-01-11 08:29:25 +01:00
Thomas Petazzoni a88d28ddb8 Incorrect indentation
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-10 22:54:49 +01:00
Jeroen van Rijn d65f75c7d6 i18n.py processor for Dutch street
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2010-01-10 20:32:42 +01:00
Konstantin Mochalov f82cdd7962 Added russian name processor. 2010-01-10 16:26:04 +01:00
David MENTRE bfd5e08830 First generic code for Arabic index generation (from Bassem JARKAS)
This is a first attempt at building an index for Arabic language.
Prefixes have been provided by Bassem JARKAS. The regexp might need some
tweaking.

Do not forget to do "sudo locale-gen --lang ar" on Ubuntu machines.
2010-01-10 16:09:04 +01:00
David MENTRE edea2c358c Udpate Arabic ocitysmap.po (from Bassem JARKAS) 2010-01-10 16:09:00 +01:00
David MENTRE 4a88b23bfe Update French ocitysmap.po translation 2010-01-10 16:08:08 +01:00
David MENTRE 2f8985393d Update generic ocitysmap.pot file with respect to code 2010-01-10 16:07:07 +01:00
David MENTRE 5b70e5cca8 Add "public_building" into street index amenities (task 10049) 2010-01-10 16:06:55 +01:00
Jeroen van Rijn d57c4fe363 nl_NL locale for ocitysmap
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2010-01-10 16:04:24 +01:00
Maxime Petazzoni 53c1b8e10b Display database connection information in the daemon log
This makes things easier when debugging the setting up of the rendering
pipeline with the MapOSMatic daemon and PostgreSQL.
2010-01-08 00:07:30 +01:00
Thomas Petazzoni 69699b4789 Add Danish translation, by Esben Damgaard
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-07 20:46:29 +01:00
Thomas Petazzoni 1d5a58ab6d Make the pt_BR translation valid
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-07 10:36:05 +01:00
Thomas Petazzoni fce32e1238 Add pt_BR translation by Rodrigo de Avila and Arlindo Pereira
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-07 10:27:47 +01:00
Thomas Petazzoni b61c118279 Add Catalan adaptation, by Joan Montané
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-07 09:52:10 +01:00
Thomas Petazzoni d3f7b3b49a Rename ru translation to the correct filename
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-07 09:31:11 +01:00
David MENTRE acec12bae6 Add "Sentiers", "Allées" & "Petite Rue" as French street prefix (task 10048) 2010-01-07 09:06:17 +01:00
Thomas Petazzoni 696e32f398 Set statement_timeout for DB connections
The patch sets the statement_timeout parameter for the ocitysmap
sessions to 18mn. This should be enough. I checked that an exception
is raised when the timeout appears (=> ocitysmap crashes
immediatly). The other sessions (eg. osm2pgsql) should not be
affected. Issue "show statement_timeout" on a new DB connection to
make sure (should reply '0').

This is a "quick and dirty fix": the timeout should be configurable
from a config file or from the cmdline. For now it's hard-coded in
street_index.py.

Patch by David Decotigny <d2@maposmatic.org>
2010-01-07 09:05:11 +01:00
Thomas Petazzoni 02a09c76de Add Arabic translation by Bassem Jarkas
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-01-06 13:22:44 +01:00