Wykres commitów

620 Commity (9cdd71e30ab0433d23594e72a39dba1d7afc2ec5)

Autor SHA1 Wiadomość Data
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
Thomas Petazzoni a99fa35b03 multi-page: finalize and refactor code for front page generation
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-30 23:41:20 +02:00
David MENTRE ebada2a8a5 b&w stylesheet: Allow smaller fonts for street names
* Use advanced features of Mapnik2's TextSymbolizer to reduce size of
  street names if possible. This allows to display more street names,
  even if all of them are not displayed.

Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-30 18:22:18 +02:00
David MENTRE f658c5ba10 b&w stylesheet: put parking and residential area casing in black
* Use a thicker border for residential area.

Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-30 18:22:16 +02:00
David MENTRE fb87f377a9 b&w stylesheet: increase casing of motorway, trunk, primary and secondary roads at zoom levels 15 to 18
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-30 18:22:15 +02:00
David MENTRE f3dfe4d2f7 b&w stylesheet: put public buildings in black with light grey background
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-30 18:22:13 +02:00
David MENTRE 528a1334cd b&w stylesheet: remove landuse=residential coloring
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-30 18:22:11 +02:00
David MENTRE 5e055c2b2a b&w stylesheet: put all roads in black and white
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-30 18:22:10 +02:00
David MENTRE ef0f217b85 b&w stylesheet: display townhall, public_building, etc. amenities
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-30 18:22:08 +02:00
David MENTRE 53644e3c78 b&w stylesheet: remove building and power layers
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-30 18:22:06 +02:00
David MENTRE 8dfc85a86c B&W stylesheet: restore original mapnik-osm stylesheet
Signed-off-by: David MENTRE <dmentre@linux-france.org>
2012-03-30 18:22:04 +02:00
Gael UTARD 99a6e16095 Move the background setting to the renderer
And fix it by the way when png_dpi != 72.

Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
2012-03-30 18:20:48 +02:00
Thomas Petazzoni 0d5768547c Merge branch 'cover-page' 2012-03-30 18:19:38 +02:00
Thomas Petazzoni fe3d542fa7 multi-page: fix index rendering when no streets are present
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-30 18:19:24 +02:00
Thomas Petazzoni d4cf607c91 multi-page: implement a basic cover page
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-30 18:19:07 +02:00
Gael UTARD 282b14be02 Fix single page renderer
Previous commit changed the prototype of the constructor of the
parent class.

Signed-off-by: Gael UTARD <gael.utard@kisis.fr>
2012-03-30 16:26:18 +02:00
Thomas Petazzoni eae2588b14 multi-page: minor fixups for compatibility with Gaël's work to remove the scaling
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-30 13:04:22 +02:00
Thomas Petazzoni ccda3983d2 MultiPageStreetIndexRenderer: automatically compute the number of columns
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-30 13:04:22 +02:00