Fix the automatic font size calculation for the title and the copyright
notice.
Fix the placement, size and display of the copyright notice.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Basic changes:
- new as_wkt() method that returns a WKT for the current bounding box
- renamed self.ptstr -> _ptstr
- renamed parse -> parse_latlon_strtuple
Signed-off-by: David Decotigny <d2@maposmatic.org>
Start working on re-integrating the SQL queries to feed the index (not
functional right now).
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Instead of having to pass a list, we can now also pass just a single
string or None, in which case a default set of config file paths will
be tried.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Implement all functionality for rendering the index in a specified
graphical area. The index automatically shrinks to the minimum space it
needs by adjusting one of the dimension (passed as a parameter).
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
The compatible paper sizes no return 5-uples that specify if the
provided bounding box fits in portrait and/or in landscape mode.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
The layout renderers now work in a unitless fashion where dimensions are
expressed in "dots". A RenderingSession object defines and stores how
dots are obtained from typographic/printing points depending on the
provided DPI.
The DPI for vector-based surfaces is set to 72, because a typographic
point is 1/72th of an inch. For PNG surfaces, its value is configurable
in the OCitySMap configuration as 'png_dpi' in the 'rendering' section.
It defaults to 300dpi.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Only connect to the PostGIS datasource when needed so OCitySMap objects
can be instancied and used without connecting to the database if it is
not required.
Remove some debugging messages, and tweaks to the layout renderers
registry.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
When returning the list of compatible paper sizes for the provided
bounding box, add a custom format that is exactly fitted to the bounding
box if the user doesn't want one of the preset paper sizes.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Parse the stylesheet definitions (we'll support several Mapnik
stylesheets, eventually from contributors) from the OCitySMap
configuration file. Provide a registry to list and access them.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
OCitySMap now provides a quick public API to get the list of all
implemented layout renderers, or to get one directly by name. Renderer
classes are returned, not instances.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Grid labels (letters horizontally, numbers vertically) are now drawn
directly in Cairo. The plain renderer draws them outside of the map area
in a small margin. Other renderers may choose to do otherwise (directly
on the map area, not displaying them at all, etc.).
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
When rendering an administrative boundary, we overlay a transparent grey
shade around the city.
A WKT MULTIPOLYGON is created from the corrected bounding box and the
administrative boundary (as an inner hole). A shape file is then created
from this polygon and added to the rendering.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Integrate the main OCitySMap object to the layout renderers so it can
render maps. Renderers now work in typographic points.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
After a compatible paper has been chosen, the geographic bounding box
requested for rendering (or the bounding box of the administrative
boundary requested) doesn't fill the paper entirely. The bounding box is
thus extented by Mapnik into a corrected bounding box, corresponding
exactly to what is rendered on the paper.
The bounding box used by the Grid object is also slightly expanded to
accomodate for the small imprecisions of the various projections, which
made the grid lines not fill the bounding box entirely.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Re-implement configuration file parsing to get access to the database.
The request timeout is now configurable in the 'datasource'
configuration section as 'request_timeout'. It defaults to 15 minutes.
Re-integrate the i18n and languages support.
Re-implement the map grid support. From the corrected geographical
bounding box, the Grid object can generate an ESRI Shapefile with the
grid lines. The grid size automatically adjusts to lower sizes if the
bounding box is smaller.
Stub implementation of the StreetIndex object that will handle data
gathering, outputting as CSV and rendering into a given surface.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
This new OCitySMap version aims at providing a more print-oriented
map rendering engine.
Its main features include being aware of paper sizes and constraints,
but also providing different "renderers" implementing rendering layouts
for the maps. For now, only the PlainRenderer which renderers a
full-page map is implemented, but renderers that also generate an index
will be available.
The main idea is that we no longer generate a separate index. The
generated map includes (or not) an index depending on the rendering
layout used to render it.
Finally, each renderer is able to tell which paper sizes are compatible
with the bounding box from a "geographic" resolution.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
David Decotigny