mirror
/
ocitysmap
kopia lustrzana https://github.com/hholzgra/ocitysmap
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
537 Commity
27 Gałęzie
14 Tagi
3 MiB
Wykres commitów

537 Commity (e34791cd5591ddefb1e73926d61d6b45109ecc89)

Autor SHA1 Wiadomość Data
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
Étienne Loks 4b706221d1 multi-page: add an intentionally blank page 2012-03-31 12:38:05 +02:00
David MENTRE a4ac0f1805 multi-page index: wrap long labels over several lines 
Signed-off-by: David MENTRE <dmentre@linux-france.org>
 2012-03-31 10:54:57 +02:00
David MENTRE cf6ce9585b multi-page index: en entry repeated several times in a row is only printed once 
Signed-off-by: David MENTRE <dmentre@linux-france.org>
 2012-03-31 10:54:54 +02:00
Thomas Petazzoni d3fdeffb21 multi-page: update copyright header 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
 2012-03-31 09:46:16 +02:00
Étienne Loks 3a94a3e6a1 multi-page overview: adjust automatically the size of page number on the map 2012-03-31 08:57:52 +02:00
Thomas Petazzoni 73e9945039 Add a short test-suite for OcitySMap 
This test suite renders different locations, with different renderers,
on different paper formats and orientations. It assumes that a
database containing the France OSM data is available.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
 2012-03-31 08:56:26 +02:00
Gael UTARD ad1eb8789f Reduce multipage grid line width 
Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
 2012-03-31 02:02:22 +02:00
Étienne Loks 8f2b75d4ab Fix name grouping in the index 2012-03-31 02:02:21 +02:00
Étienne Loks 4159a1d59d multi-page index: filter items outside the town 2012-03-31 00:47:04 +02:00
Thomas Petazzoni 9cf7e4f841 support: add bounding-box-debug.html 
This short HTML page is helpful to debug bounding box related
problems, by visualizing a set of bounding boxes on a slippy map. Many
bounding boxes can be added using the BoundingBox() function.

Note that the OcitySMap BoundingBox object has a .as_javascript()
method that directly generates a string that is suitable for
copy/paste into this file.

This file has been _very_ helpful to debug some initial problems of
the multi-page renderer.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
 2012-03-31 00:44:02 +02:00
Thomas Petazzoni df888d8499 ocitysmap: get rid of ocitysmap v1 
OcitySMap2 has been in development for a while now, and has a much,
much larger feature set than the original ocitysmap. Let's keep only
ocitysmap2 in the Git repository. Those nostalgics of the old version
can always dig into the Git history.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
 2012-03-31 00:21:21 +02:00
Étienne Loks a59fe847bd multi-page: use shapely instead of ogr for disjoint test 2012-03-31 00:06:07 +02:00
David MENTRE af416405e2 Update INSTALL to put b&w stylesheet installation in appendix 
Signed-off-by: David MENTRE <dmentre@linux-france.org>
 2012-03-30 23:56:18 +02:00
Étienne Loks 60f5171400 multi-page: generate the town's contour shade on every pages 2012-03-30 23:56:04 +02:00
Étienne Loks 5862ba30f3 multi-page: do not render pages outside the selected town 2012-03-30 23:56:02 +02:00
Étienne Loks 7da6b70ab2 multi-page overview: correct page number position 2012-03-30 23:56:00 +02:00
Étienne Loks 757ee41530 multi-page: add page number on overview page 2012-03-30 23:55:37 +02:00
Étienne Loks 181dc48d38 multi-page: some clean-up 2012-03-30 23:53:39 +02:00
Étienne Loks f2c1ed9bdc multi-page: fix pages box in the overview page 2012-03-30 23:53:38 +02:00
Étienne Loks 2607568000 multi-page: fix grey shape around the overview map 2012-03-30 23:53:37 +02:00
Étienne Loks 17298cd3fe Add an overview page in the multi-page renderer. 
* get the right bounding box
 * create the overview canvas
 * draw the map and the appropriate shade
 * draw boxes for each pages (OverwiewGrid)
 * add the overview to the list of pages to be rendered

Signed-off-by: Étienne Loks <etienne.loks@peacefrogs.net>
 2012-03-30 23:53:36 +02:00