Wykres commitów

558 Commity (13615f7eaa0c7b830e4c82534ec472721ec49158)

Autor SHA1 Wiadomość Data
Gael UTARD 13615f7eaa Fix scale computations to ensure a minimum zoom level
Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
2012-04-10 20:52:06 +02:00
Gael UTARD a6906098a6 Take margins into account when computing sizes for single page
Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
2012-04-10 20:52:03 +02:00
Jeroen van Rijn c37e4522a8 Updated Norwegian translation
An updated translation for Bokmål (nb-NO) and a new Nynorsk (nn-NO) translation based on the nb-NO translation.
Fixes https://savannah.nongnu.org/bugs/?35372

All credit goes to Guttorm Flatabø <post@guttormflatabo.com>
Patch to MapOSMatic/www/settings.py to add Nynorsk and credit Guttorm to follow shortly.

Signed-off-by: Guttorm Flatabø <post@guttormflatabo.com>
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2012-04-10 20:33:47 +02:00
Jeroen van Rijn e030a50cc4 Updated Italian translation
Sent off as patch against current head on behalf of Simone Cortesi.

Signed-off-by: Simone Cortesi <simone@cortesi.com>
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2012-04-10 20:32:23 +02:00
Jeroen van Rijn 61dca51842 Mapnik 2.1: update INSTALL and get rid of DeprecationWarning
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>
2012-04-10 20:31:09 +02:00
Étienne Loks f196de198e Indexer: fix bad logic for condition on 0-9 index 2012-04-03 23:31:04 +02:00
Konstantin Mochalov cc5cd9b555 Use xgettext instead of deprecated pygettext.
pygettext  is deprecated. The current version of xgettext supports many
       languages, including Python.
2012-04-03 13:08:43 +02:00
Konstantin Mochalov b9d386c3eb Updated russian translation 2012-04-03 13:08:40 +02:00
Esben Damgaard 711c17514f Update danish translation 2012-04-03 00:00:20 +02:00
Rodrigo Avila f3e28574b4 Update Brasilian portuguese translation 2012-04-02 23:35:40 +02:00
Thomas Bellmann a821d0015d Update german translation 2012-04-02 23:33:06 +02:00
Étienne Loks 9508973464 upper_unaccent_string is missing from the base i18n class 2012-04-02 23:22:35 +02:00
Jeroen van Rijn d38ea65c5b forgot comma in previous patch to i18n.py, fix
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2012-04-02 22:57:53 +02:00
Thomas Petazzoni 77dace289c Add Étienne in the AUTHORS file
Étienne has done an enormous amount of development on the multi-page
renderer, and therefore should be mentionned in our AUTHORS file.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-04-01 15:59:21 +02:00
Jeroen van Rijn 1d29af9591 Updated Dutch translation
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2012-04-01 11:00:33 +02:00
Jeroen van Rijn c663d98b1e i18n.py: Added two more prefixes to Dutch i18n class
Signed-off-by: Jeroen van Rijn <jvrnix@gmail.com>
2012-04-01 11:00:04 +02:00
Étienne Loks f1a2e9f3d8 Indexer: regroup street beginning with a digit into a single category 2012-04-01 02:49:12 +02:00
Étienne Loks 2dda067173 multi-page: fix background color of the page number of the blank page 2012-04-01 02:24:46 +02:00
Thomas Petazzoni 752afb5dd0 MultiPageRenderer constructor fix
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-04-01 02:24:19 +02:00
Thomas Petazzoni f4adfa19bc Fix some remaining bugs on StreetIndex construction move to SinglePageRenderer
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-04-01 02:07:35 +02:00
Étienne Loks b20bfeb191 multi-page: adjust page number size of direction arrows 2012-04-01 01:47:13 +02:00
Gael UTARD e34791cd55 Remove dead code about zoom_level
Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
2012-04-01 01:46:31 +02:00
Étienne Loks 8a6b15f924 Draw utils refactoring 2012-04-01 01:46:01 +02:00
Gael UTARD 56a1a63872 Fix generation of csv file for "no index" layout
Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
2012-04-01 01:45:47 +02:00
Gael UTARD c4cf3307b8 Propose a default amongst compatible paper sizes
Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
2012-04-01 01:45:29 +02:00
Étienne Loks cc2cafc29c multi-page: don't rotate the label of the south arrow, minor fix 2012-04-01 01:09:46 +02:00
Thomas Petazzoni 2add1ee6cd Update French translation
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-31 23:30:12 +02:00
Thomas Petazzoni 5d841ecbd5 Update all PO files
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-31 23:25:41 +02:00
Thomas Petazzoni 6ef99e4059 Update POT file for translation
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-31 23:25:16 +02:00
Thomas Petazzoni 9b8f41a1a8 i18n: update source files requiring translation
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-31 23:24:45 +02:00
Thomas Petazzoni fd4ed60f54 multi-page: only support pdf as output format
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>
2012-03-31 23:13:55 +02:00
David MENTRE 2a4109f41a Move street index creation into single page renderer
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-31 22:59:10 +02:00
Étienne Loks ea17da8623 multi-page: drawing neighbour arrows 2012-03-31 20:21:02 +02:00
Frederic Daniel Luc Lehobey c684b20d3d Orange stylesheet of Pierre Mauduit adapted to Mapnik2.
Still needs to be fixed (colors are weird).

Signed-off-by: Frederic Daniel Luc Lehobey <Frederic@Lehobey.net>
2012-03-31 19:34:56 +02:00
Frederic Daniel Luc Lehobey 488e257662 Update the version of mapnik2-osm for which we have tested the installation
Signed-off-by: Frederic Daniel Luc Lehobey <Frederic@Lehobey.net>
2012-03-31 19:34:54 +02:00
Thomas Petazzoni ca7e375130 ocitysmap2-render: reject unsupported output formats
Use the new get_compatible_output_formats() method to reject the
unsupported output formats depending on the selected rendering layout.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-31 19:30:46 +02:00
Thomas Petazzoni 1869b9c5fd renderers: add a get_compatible_output_formats() method
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>
2012-03-31 19:22:30 +02:00
David MENTRE 58beafb881 In layoutlib/multi_page_renderer.py, use shared draw_utils.render_page_number()
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-31 18:46:12 +02:00
David MENTRE 8379cd7862 Print page number at bottom of multi-page map index
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-31 18:46:10 +02:00
Gael UTARD 808a6748e2 Fix .gitignore after stylesheet renaming
Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
2012-03-31 18:45:54 +02:00
Gael UTARD f5f6cd58ce Set grid size to 40 mm +/- 33%
Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
2012-03-31 18:45:52 +02:00
Étienne Loks c68369dbe8 multi-page refactoring: remove overview page from map pages list 2012-03-31 17:05:19 +02:00
Étienne Loks fa81ce86a8 multi-page: add a more suitable style for shade of outside town 2012-03-31 16:39:41 +02:00
David MENTRE 6ae7855a6c printable stylesheet: remove house numbers
* House number are removed because we don't show buildings.

Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-31 16:39:32 +02:00
Étienne Loks 06ea895391 multi-page: fix and improve page number
* position fixed
 * add a rectangle to draw inside
 * left and right alternance for page position
2012-03-31 16:03:50 +02:00
David MENTRE 6f680386b5 Rename "black-and-white" stylesheet into "maposmatic-printable"
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-31 15:51:57 +02:00
David MENTRE 4babca77fb b&w stylesheet: put bridges in white and increase their border
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-31 15:51:55 +02:00
Frederic Daniel Luc Lehobey 57c6ec5d34 Use -s option in ocitysmap2-render
Signed-off-by: Frederic Daniel Luc Lehobey <Frederic@Lehobey.net>
2012-03-31 15:47:44 +02:00
Frederic Daniel Luc Lehobey 2f59e783b5 Unifont is enabled in mapnik2-osm since r28035 (2012-03-10)
Signed-off-by: Frederic Daniel Luc Lehobey <Frederic@Lehobey.net>
2012-03-31 15:47:42 +02:00
Étienne Loks b4a619df3c fix comments, add copyright notice, multipage: fix page numbers 2012-03-31 15:47:05 +02:00