Wykres commitów

428 Commity (0ddfa9ae9297317d060b5aee7d3601090f00c7da)

Autor SHA1 Wiadomość Data
David MENTRE 0ddfa9ae92 Import of original mapnik-osm style sheet 2012-03-30 10:12:20 +02:00
Sylvain Collilieux 4a5ccc7aa4 Update INSTALL file regarding a debian bug on ttf fonts 2012-03-30 10:08:55 +02:00
Thomas Petazzoni 1f115962da ocitysmap2: show OSM data last update timestamp on rendered maps
We use the maposmatic_admin table that is now part of the GIS database
and updated by the planet-update.sh script to show the timestamp of
the OSM data on rendered maps. If this table does not exist, we
gracefully fallback to an "unknown" timestamp, so that the rendering
doesn't fail.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-25 21:11:16 +02:00
Thomas Petazzoni 1cff9bae39 ocitysmap/support: add support for storing the age of the OSM data
This commit creates a new maposmatic_admin table, which contains a
single column and a single entry, used to store the age of the OSM
data that is currently inside the GIS database. This table is located
on the GIS database side (and *NOT* on the Django database side).

This table must be created once on the GIS database by running the
setup-maposmatic-admin.sql.

This table is then updated by the planet-update.sh script every time
it completes an update of the OSM data. System administrators of the
production and development servers are therefore now requested to use
the planet-update.sh script for the OcitySMap repository on the
servers, and to replicate on the Git repository any change done on
those scripts.

The contents of this table will be used by later commits to show the
replication lag on the MapOSMatic.org website and the date of the OSM
data on the generated maps.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-25 18:19:16 +02:00
Thomas Petazzoni 6a6a3f57b5 Add new planet-update.sh script
This script is, unmodified, the script currently used on
gis.maposmatic.org to update our planet regularly with the official
OSM database.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-25 18:02:54 +02:00
Thomas Petazzoni 815452bf12 Remove unused planet-update-daily.sh script
We now use 15-minutes diff to update our database, thanks to another
script. Remove this old, unused script.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-25 17:58:38 +02:00
Étienne Loks 01b7253e07 Index improvment: group locations whith the same name and the same position 2012-03-25 17:55:42 +02:00
Thomas Petazzoni c5a0813d6b Merge remote-tracking branch 'dmentre/villages' 2012-03-25 13:40:52 +02:00
Thomas Petazzoni d27a323fda config: make it possible to configure the port to connect to the GIS database
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-03-25 11:28:28 +02:00
Thomas Petazzoni ab4cc9c4f1 doc: add instructions to install the MapQuest stylesheet
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@enix.org>
2012-02-19 13:11:14 -08:00
Maxime Petazzoni eaff9ebfa4 Misc code style fixes
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2012-02-18 17:21:52 -08:00
Maxime Petazzoni 45cfbfbf33 Configurable paper orientation in ocitysmap2-render (task #10749)
Add a --orientation={portrait,landscape} command-line flag to control
the paper orientation of the rendering with ocitysmap2-render.

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2012-02-18 17:21:52 -08:00
Maxime Petazzoni 43529678ea Refactor INSTALL instruction files
Instructions for Ubuntu Lucid are now valid for Debian unstable too, so
move the INSTALL.lucid file as main INSTALL file and removed the other
two.

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2012-02-18 17:21:52 -08:00
David Decotigny c0a1a3889d support for next mapnik releases
with mapnik 2.0.0, import mapnik2 is required. But future versions
will only require "import mapnik". This patch anticipates this.
2012-02-18 11:56:29 -08:00
Maxime Petazzoni d295f956ef Update installation instructions for Debian unstable
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2012-02-18 11:31:12 -08:00
David Decotigny d2869b76f7 no intarray dep 2012-02-18 11:14:30 -08:00
David Decotigny 3b9ed4f47b minor typos 2012-02-18 11:12:27 -08:00
David Decotigny f45660fa31 really update insructions for mapnik2 on lucid
Chinese fonts are now rendered correctly.

Signed-off-by: David Decotigny <d2@maposmatic.org>
2012-02-18 10:48:43 -08:00
David Decotigny 4a066cae2f Updated installation instructions
This documents following final setup:
   - postgis 1.5.3 from ubuntugis-unstable PPA
   - mapnik 2.0.0 with libboost 1.46 from thomasjj PPA

Tested:
   - CLI frontend
   - maposmatic web frontend

Signed-off-by: David Decotigny <d2@maposmatic.org>
2012-02-18 10:21:06 -08:00
David MENTRE 79f9b5dd04 Add support for Mapnik2
Note:
  On my setup, Chinese characters are not rendered correctly (boxes).

Tested:
  - CLI frontend
  - maposmatic Web

Revised-by: David Decotigny <d2@maposmatic.org>
Reviewed-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
Signed-off-by: David Decotigny <d2@maposmatic.org>
2012-02-18 10:20:37 -08:00
David MENTRE 6d25c4913d Add 'place=isolated_dwelling' into index of villages 2012-01-08 08:27:28 +01:00
David MENTRE 98680e9106 Update ocitysmap POT and fr PO file for new 'Villages' string 2011-12-31 19:22:51 +01:00
David MENTRE 0339b2f13b Add an index of villages 2011-12-31 18:57:06 +01:00
Maxime Petazzoni 7cfe8086cb Ignore local files
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2011-12-23 22:16:21 -08:00
Maxime Petazzoni 7bd69722ff Refresh i18n files and add Indonesian translation
Indonesian translation contributed by Jeff Haack <jeff.haack@gmail.com>.

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2011-12-23 22:14:13 -08:00
malenki e9fe72af51 Update german translation 2010-12-28 10:41:11 -08:00
Maxime Petazzoni dc0a4223bd Have map generation date follow requested locale. Fixes #31498.
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-11-01 12:47:44 -07:00
Yauhen Kharuzhy c3553b687c Belarusian (be) translation
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-10-29 14:40:27 -07:00
Joan Montané cea2e23359 Updated Catalan translation
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-10-22 09:29:01 -07:00
Rodrigo de Avila e691bff538 Portuguese (pt_BR) translation update
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-10-19 10:05:43 -07:00
Maxime Petazzoni c122be94c0 Merge commit 'remotes/public/d2-ocitysmap2' 2010-10-11 15:34:12 -07:00
David Decotigny c026a81ba6 Renamed --polygon-osmid cmdline option as --osmid 2010-10-11 10:13:14 +02:00
David Decotigny aafa11268b Fixed references to Poygon ctor in shapely 2010-10-11 10:11:16 +02:00
David Decotigny 6ecb283a8e Fix trivial error due to previous patch-cleanup 2010-10-10 16:30:00 +02:00
David Decotigny 5d121d4587 Accept empty indexes
This patch allows ocitysmap to support empty indexes (empty areas).
2010-10-10 16:01:37 +02:00
David Decotigny 093b95bcf6 Support for complex city envelopes
Some OSM Ids such as 365634 have several entries in the polygon/line
tables. The original maposmatic code crashed because it assumed only
one entry was in the DB, and the ocitysmap code only considered the
1st entry returned by postgis.

This patch allows to work on the union of all the areas returned by
the polygon and line tables.

It adds another dependency: shapely. This allows to call libgeos
functions from within python. This also calls for some code
refactoring (=> TODO): the coords et al. API should be replaced by the
plain shapelib API
(http://gispython.org/shapely/docs/1.2/manual.html).
2010-10-10 15:54:55 +02:00
David Decotigny f595f4520d Updated for compat with maposmatic 2010-09-19 17:18:48 +02:00
David Decotigny d931e3571a Fixed install inst for karmic + deprecating main INSTALL 2010-09-11 17:04:52 +02:00
David Decotigny f7deea3dca Updated setup.py
Also make sure ocitysmap2 is still working even if the logo cannot be found
2010-09-11 16:59:42 +02:00
David Decotigny f95dd525f6 fixed typo 2010-09-11 16:39:27 +02:00
David Decotigny d270ac53f7 Reorganized global layout managers
Split the renderers.py file info:
 - renderers.py: the layour registry
 - abstract_renderer: the ABC for a renderer
 - singe_page_renderer: 3 classes to render into a single page
2010-09-11 16:38:16 +02:00
David Decotigny 8ad862d265 Updated i18n 2010-09-11 15:44:22 +02:00
David Decotigny ee9a2b19bd Updated doc 2010-09-11 15:38:25 +02:00
David Decotigny b46e66b7cc Make sure PostGIS is >= 1.5
Raise an AssertionError when postgis is not >= 1.5.
2010-09-11 15:27:38 +02:00
David Decotigny a3286243a2 Command-line frontend.
Implemented ocitysmap2-render command-line frontend. Tested it on
Chevreuse (OSM ID -943886) with many possible cmdline option
combinations. Default layout is now map with index at bottom.
2010-09-11 15:14:03 +02:00
David Decotigny 04377283a9 Major reorganization, new maplib/indexlib/layoutlib hierarchy
New maplib (map creation routines), indexlib (index creation routines)
and layoutlib (page layout & rendering) structure. Besides moving
files around, a new layoutlib.commons module has been create to host
the mm to/from pt conversion routines.
2010-09-11 12:31:08 +02:00
Maxime Petazzoni d262015ea3 Ajout de 'Lotissement' dans les préfixes français
Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
2010-09-07 16:39:10 +02:00
David Decotigny 0d165fb78a Support ps.gz output 2010-09-05 20:30:28 +02:00
David Decotigny 1c26a805ba more verbose 2010-09-05 20:28:28 +02:00
David Decotigny abb04dd4bf pure cosmetics 2010-09-05 20:27:47 +02:00