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

1571 Commity (5f302d71e46314db0ca3f50c85a2caaac1befd37)

Autor SHA1 Wiadomość Data
Thomas Petazzoni eb8abff072 Update about page with new developments 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-23 09:18:42 +01:00
Thomas Petazzoni 15f3d5607b Credit Pierre Mauduit 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-23 09:18:30 +01:00
Pierre Mauduit e4dbc5ec14 Updating translation de ; to be reviewed by a native speaker (reguarding the previously non-translated fields) 2009-12-23 01:39:02 +01:00
Thomas Petazzoni 633a2bcc9e Merge commit 'fdl/installation' 2009-12-23 01:17:25 +01:00
Thomas Petazzoni 8aa7521552 Update German translation 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-23 00:21:15 +01:00
Thomas Petazzoni c6da5dab37 Only show the language selector when needed 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-22 23:02:28 +01:00
David Decotigny 61ce0e6f0b FIXED bug with IE: force javastcript to encode the nominatim query arguments 
When the city query contains special features (accents, etc.), IE was
getting the nominatim query URL without escaping them. This patch adds
the ability for the nominatim pages to be queried through GET. We then
ask jQuery to pass the query arguments through GET, which has the nice
consequence that everything is escaped correctly.
 2009-12-22 20:11:07 +01:00
David Decotigny 0bf5c56afd FIXED bug with IE: incorrect selection event 2009-12-22 20:11:03 +01:00
David Decotigny 8f23bc6e00 format the results along a table instead of ul/li (broken on webkit) 2009-12-22 19:36:45 +01:00
Pierre Mauduit 2f0a6dd372 Maxime's remarks 
- If city's text input is modified after having selected a
  location, we have to de-activate the green arrow et empty
  the results list.
 2009-12-22 17:02:18 +01:00
David Decotigny e4284a7305 try to have a nice wrapping strategy for multi-line query items 2009-12-22 16:25:54 +01:00
David Decotigny a0005173d3 Don't interfere with the GO button 
With webkit and IE, the GO button is not available when the query
results are long strings (marseille, brussels, etc.) because they
overwrite its sensitivity area. This patch leaves the GO button alone
in its column.
 2009-12-22 16:25:50 +01:00
Pierre Mauduit 88af77d069 JS Bugfixing 
There was a regression when I switched keypress to keyup event.
The keypress event was responsible of unexpected form submission.
To avoid this, we have to catch the keypress event as well.
 2009-12-22 12:59:18 +01:00
Pierre Mauduit c3f7035ec8 Bugfixing osmid (older versions of iceweasel) 2009-12-22 12:20:52 +01:00
Pierre Mauduit ef06f72ce2 Modifying CSS to comply with D2's remarks 2009-12-22 12:11:35 +01:00
David Decotigny 7c2cdbd16f replaced overkill jscript href with a normal html tag 2009-12-22 12:11:31 +01:00
Pierre Mauduit 5018dc3585 Fixing JS bug selection of a previously typed town 
- keypress replaced by keyup event
 2009-12-22 12:11:25 +01:00
David Decotigny 1807e6634d more explicit formulation for locale C collation 2009-12-22 12:11:19 +01:00
Frederic Daniel Luc Lehobey 30bfb2218c Access right to log files. 2009-12-22 11:45:54 +01:00
Frederic Daniel Luc Lehobey 580ccab401 Being more explicit about rendering paths in template configurations. 2009-12-22 11:32:13 +01:00
Pierre Mauduit 00bb0afb12 Fix a bug : using JQuery to set the value attribute 2009-12-22 11:15:59 +01:00
Pierre Mauduit 072720d7ae JS Rewrite of onChange event on the radio box (html form) 2009-12-22 10:53:51 +01:00
David Decotigny 0512ccd985 cosmetics 2009-12-22 10:53:49 +01:00
David Decotigny 0aabbb6656 for similar admin_level, sort according to the city area 2009-12-22 10:53:47 +01:00
Thomas Petazzoni 00583545f8 Add favicon 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-22 10:33:23 +01:00
David MENTRE 8092b0bcc4 Add support for all English-speaking countries 2009-12-22 00:37:29 +01:00
Thomas Petazzoni 32c6cb74e8 Revert to proper Javascript function call 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-22 00:26:53 +01:00
Pierre Mauduit fea686c776 Restoring new translation from index.html form 2009-12-22 00:05:18 +01:00
Pierre Mauduit 4f03148bd6 Rsolving conflits (don't forget to work in new branch ...) 2009-12-21 23:53:48 +01:00
David Decotigny 8574e0ff59 order according to the admin levels as well 2009-12-21 23:14:42 +01:00
Thomas Petazzoni 0628cccaa3 Don't forget to display all languages in bbox mode 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-21 23:09:31 +01:00
Thomas Petazzoni 3e1a05924d Merge branch 'bottom' 2009-12-21 23:07:40 +01:00
Thomas Petazzoni 60b67119fd New fr translation 2009-12-21 23:05:46 +01:00
Thomas Petazzoni 74e1a07a26 Put the validation button to the bottom 2009-12-21 22:58:36 +01:00
Thomas Petazzoni 7080052550 Match language 'C' in all cases 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-21 22:54:25 +01:00
Thomas Petazzoni 9edfbb9b65 Move language 'C' at the end of the list 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-21 22:54:03 +01:00
David MENTRE 1922546293 Add "Unsupported" map index language 2009-12-21 22:45:38 +01:00
Pierre Mauduit fc96bf605e Yet another User-XP improvement 
The form is now correctly reset while switching from a mode to
an other (search -> select a place -> switch to bounding box
-> switch back to nominatim mode)
 2009-12-21 20:46:34 +01:00
Pierre Mauduit 49373036fe Improving the "user XP" with the HTML form. 
- Re-enable it when using "bounding box" mode
 2009-12-21 20:46:32 +01:00
Thomas Petazzoni 7be6cfd20d Show all languages after search 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-21 20:45:30 +01:00
David MENTRE 0ad217b6f8 Anoter explanation fix on main page. Update FR translation 2009-12-21 20:32:47 +01:00
David MENTRE dfa4d699d5 Update needed translations. Update FR translations 2009-12-21 20:32:44 +01:00
Pierre Mauduit a43aed4fa1 Taking into accout sam`'s remarks : 
- give a title param to little yellow panes to mention
  why the place is not available

- toggle disable / enable "generate" button : remove the
  "link" mouse pointer when unavailable and give an
  explanation on why the form could not be submitted
  at the moment.
 2009-12-21 20:32:41 +01:00
David MENTRE fb8e76d758 Fix description of the 2 modes on main page 2009-12-21 20:32:37 +01:00
David Decotigny e3c129790b cosmetics: variable names 2009-12-21 20:32:22 +01:00
Thomas Petazzoni a7a85f3130 Fix a minimal width for the language selector 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-21 20:32:11 +01:00
Thomas Petazzoni 4d6d014bca Filter the list of languages depending on the country 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-21 20:31:49 +01:00
Pierre Mauduit 7f29422a55 Debugging JS code using intensively jquery / debugging submit of main form, and some cosmetic modifications. 2009-12-21 16:28:26 +01:00
Thomas Petazzoni 52abd0eb02 Make cell width more flexible to give width for search button 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-21 16:05:37 +01:00
Maxime Petazzoni 44fdc2b9d9 By boundingbox selection is hidden by default. 2009-12-21 15:36:27 +01:00
Maxime Petazzoni 73f491fc5b HTML markup fixes. 2009-12-21 15:36:26 +01:00
Maxime Petazzoni c57ed3ab77 Use late slippy map initialization 2009-12-21 15:36:24 +01:00
Maxime Petazzoni e8153e1f0f Fix comments in the map management JS file. 2009-12-21 15:36:22 +01:00
David Decotigny 6ad5b9c953 commit test for git 2009-12-21 15:12:18 +01:00
David Decotigny 08543a6c23 FIXED incorrect non-ascii nominatim queries 2009-12-21 15:02:33 +01:00
Pierre Mauduit dc4483f618 Modifying index.html HTML form / nominatim integration 
- Adding new "disabled" icon form (gray arrow). Not yet
functionning

- Adding some JS code related to form validation, ...
 2009-12-21 14:44:24 +01:00
David MENTRE 23069f074a maposmatic: Use a list for MAP_LANGUAGES instead of a tuple 2009-12-21 14:44:21 +01:00
David MENTRE 9a79be598b maposmatic: add support for all French-speaking countries 2009-12-21 14:41:37 +01:00
David Decotigny 6f86d30cf2 Query nominatim for more details + canonicalize the results 
With the "addressdetail" querty param, Nominatim allows to retrieve
the coutry, world region, etc. as well as the language code. The
latter is needed for localization. This patch uses it and correctly
pareses the new format. The patch also transforms the results so that
dict, list, etc. do not only deal with strings: we try to cast the
strings to integers, float, etc. as far as possible.
 2009-12-21 12:08:41 +01:00
David Decotigny 0a1ff08ff7 cosmetics and main() to test from the cmdline 2009-12-21 12:08:39 +01:00
David Decotigny fd2ff96fc4 only try to lookup the negative osm_id, and only when nominatim determined it through a relation 2009-12-21 12:08:36 +01:00
Thomas Petazzoni f29a97388a Administrative OSM id field is not required 2009-12-21 11:30:32 +01:00
David Decotigny 72db2f045f don't ever try to lookup non-admin boundaries in the DB 2009-12-21 01:06:59 +01:00
David Decotigny 974a4b99ef filter out nominatim non-admin-boundary entries having same name as admin boundaries 2009-12-21 00:58:29 +01:00
David Decotigny 2fc56332d2 ignore all the nominatim entries except boundaries and places 2009-12-21 00:32:37 +01:00
Thomas Petazzoni 90eed6ef28 Merge commit 'fdl/installation' 2009-12-21 00:26:46 +01:00
Pierre Mauduit ef199fb2c0 Resetting the osmid field while trying an other place lookup / nominatim lookup 2009-12-21 00:24:32 +01:00
David Decotigny 8550318c46 Sort the nominatim results so that admin boundaries appear first 2009-12-21 00:24:29 +01:00
Frederic Daniel Luc Lehobey 39060357e4 Sensible default values in settings_local.py-template. 2009-12-20 23:36:20 +01:00
Pierre Mauduit 27f61e51fb Js / Nominatim administrative boundaries. 2009-12-20 23:07:32 +01:00
Pierre Mauduit fe5a429cc2 Modifying some fields into the main page's HTML form. 
(Removing field administrative_table, adding administrative_osmid)
 2009-12-20 23:07:30 +01:00
David Decotigny aca1ba126a comments, docstrings and cosmetics 2009-12-20 22:59:19 +01:00
Frederic Daniel Luc Lehobey ce8b490d9f Renamed www/settings_local.py.template to -template. 2009-12-20 22:34:10 +01:00
David Decotigny 12c7408e58 Cosmetics and better exception-safety for pgsql connection object in nomismatim api. 2009-12-20 22:28:14 +01:00
David MENTRE bae1265335 First support to select map index language into maposmatic 
* You need to drop maposmatic_maprenderingjob table and run a manage
  syncdb.

* The selection of Belgian languages will crash current ocitysmap.
 2009-12-20 22:28:11 +01:00
Gaël UTARD b25eac0fab Remove debug code. 2009-12-20 22:08:28 +01:00
David Decotigny 02f859f876 send nominatim entries, even when they are not lookup-able in the OSM DB 2009-12-20 21:59:45 +01:00
David Decotigny 7793228d47 New separate api to query nominatim 
Nominatim queries now performed in their own module, together with the
relevant OSM queries to retrieve the osm_id from the DB.
 2009-12-20 19:53:44 +01:00
Gaël UTARD c139ed883d Don't try to give the reason when the rendering fails. Just tell to ask contact@maposmatic.org. This fixes bug #27413. 2009-12-20 19:53:37 +01:00
Thomas Petazzoni 8a8b87e3ed Fix models 
Fix typo on Integer. Remove useless field administrative_table.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-20 16:20:11 +01:00
Pierre Mauduit dd2761ceb2 Add JQuery Library (1.3.2) 2009-12-20 15:36:11 +01:00
Pierre Mauduit 00c568aa80 Removing limitation to France 2009-12-20 15:35:45 +01:00
Pierre Mauduit 16bf79ae76 First implementation of Nominatim lookup 2009-12-20 15:19:14 +01:00
Pierre Mauduit 4cc011c706 Modifications around JSON handling 
Should work on python JSON modules, fixed generation of JSON output
(without templates)
 2009-12-20 15:18:27 +01:00
Thomas Petazzoni 34708eaa8a Add new fields for administrative rendering 
The selection of administrative boundaries using Nominatim will
require additional information to be stored for the job, since the
name of the city is no longer an unique identifier.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-20 15:10:32 +01:00
Gaël UTARD 57ba00581f Fix job position in queue. 2009-12-20 14:49:04 +01:00
David Decotigny b1789868a5 New /nominatim space reserved for the local gateway to nominatim 
We query nominatim and present the results in json format for use by a
local javascript routine.
 2009-12-20 01:24:10 +01:00
David Decotigny 201c498ab8 Slightly more robust city name query 
This will make sure the connection object is closed when done with the
query
 2009-12-20 01:16:21 +01:00
Thomas Petazzoni 0b4558846f Update translations 2009-12-19 17:10:00 +01:00
Thomas Petazzoni ebe8cea3ee Add contributors 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-19 17:09:56 +01:00
Thomas Petazzoni 5d26b3bad9 update german translation 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-19 16:56:49 +01:00
Thomas Petazzoni f2d356559d Add german translation of the MapOSMatic website 
Contributed by malenki <osm@malenki.ch>.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-12-19 16:52:03 +01:00
Thomas Petazzoni 04abc42d36 Update translation 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-11-06 08:50:30 +01:00
Thomas Petazzoni 98ce7e8e35 Only redirect to maps rendered less than 24 hours ago 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-11-05 23:13:07 +01:00
Thomas Petazzoni 653c57ad03 Remove debugging in feedparser template filter 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-10-07 09:22:06 +02:00
Thomas Petazzoni ece978f547 Add a new right box with the latest blog entries 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-10-07 09:16:03 +02:00
Thomas Petazzoni d90adbedb9 Fix blog URL + add link to RSS 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-09-28 20:24:56 +02:00
Thomas Petazzoni 3268e55621 Add blog to the menu + fix translations 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-09-28 20:22:10 +02:00
David Decotigny 2802f85813 Added http 404 error page 
Added 404 error page in order to avoid wsgi spam mail messages to
root.
 2009-09-28 20:19:30 +02:00
David Decotigny 0990dc7cc2 Allows to specify non-default ocitysmap config file 
By default, the maposmaticd daemon was reading the default ocitysmap
configuration (~/.ocitysmap.conf or /etc/...). This patch allows to
specify a path to another ocitysmap config file from within
settings_local.py.
 2009-09-28 20:19:26 +02:00
David Decotigny bb5a32496f Updated URL to stats. 
The stats are now maintained by the stats vhost.
 2009-09-16 07:12:55 +02:00
David Decotigny 36ea803276 Tell that ocitysmap should be in the python path for maposmatic 
Maposmatic now depends on ocitysmap. This dependency can be expressed in
the wsgi script.
 2009-09-11 23:51:48 +02:00
David Decotigny 263315bc39 Do not duplicate code from ocitysmap 
This patch imports one module from ocitysmap to compute the extension
of a bbox, instead of duplicating the code of the routine. This patch
relates to patch ocitysmap's 78c067e3ece79d62e87893c6747b6c609571c6bb.
 2009-09-11 23:51:31 +02:00
Thomas Petazzoni 90b63d4bea Fix previous commit, administrative_city cannot be None 2009-09-11 23:27:25 +02:00
Thomas Petazzoni 9354efb92b Make sure than admin mode and bbox mode are really exclusive 
When we had a submission in admin mode, we were correctly setting the
bbox coordinates to None. However, when we had a submission in bbox
mode, we didn't reset the administrative_city field to None. Which
means that we could have the following (common!) scenario:

 1. The user chooses the default mode, admin mode, and enters the name
    of a city

 2. MapOSMatic says "sorry, I don't know this city"

 3. The user switches to bbox mode, *without* blanking the
    administrative city field

 4. The user selects a bounding box and submits

In this case, we would save in the database both the administrative
city and the bounding box. Then, the maposmaticd daemon would choose
the administrative city... and fail because the administrative city
doesn't exist.

This commit probably fixes the problem that caused most of the
rendering failures in bounding box mode.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-09-11 23:17:12 +02:00
Thomas Petazzoni 9edf41c0d8 Don't redirect to failed renderings 2009-09-11 12:28:10 +02:00
David Decotigny 11d5894790 Pure cosmetics 
Cosmetics
 2009-09-11 12:22:47 +02:00
Thomas Petazzoni e275afec4c Do not redirect to a failed map 2009-09-11 11:50:01 +02:00
Thomas Petazzoni 128b45b4a8 Make sure the bounding box is more or less in France 2009-09-10 16:25:57 +02:00
Thomas Petazzoni 16abf8f130 Redirect to an existing rendering if possible 2009-09-10 16:15:47 +02:00
MapOSMatic developers 04e33fb598 Added piwik stats 
This patch adds piwik tracking.
 2009-09-10 10:42:59 +02:00
Thomas Petazzoni 50ad1039ab Further style refinements 2009-09-10 09:44:01 +02:00
Thomas Petazzoni 0849d7aaef Further style refinements 2009-09-10 09:41:10 +02:00
Thomas Petazzoni e6a5dd827f Revert to a simpler design 2009-09-10 09:34:43 +02:00
Thomas Petazzoni aa5a79c0b7 Another index layout proposal 2009-09-10 09:25:17 +02:00
Thomas Petazzoni c5f0f90a32 Modify the page layout to move the submit form higher 2009-09-10 09:16:45 +02:00
Thomas Petazzoni bb55c85eca Don't save bounding box coordinates in admin mode 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-09-09 16:15:02 +02:00
Thomas Petazzoni df37b95558 Copy/paste spheric_sizes() to remove dependency on OCitySMap 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-09-09 16:01:39 +02:00
Thomas Petazzoni c0d53d5d26 Implement bbox limitation 
To implement the bbox limitation, we use the
ocitysmap.coords.BoundingBox class. As this is the first usage of
ocitysmap from the Web front-end, this patch might require some
installation changes.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-09-09 15:16:01 +02:00
Thomas Petazzoni 38d03b0db4 Fix typo in fr translation 2009-09-09 14:47:22 +02:00
Maxime Petazzoni 352cec54ec Use irc.freenode.net instead of just 'Freenode' in the contact box 2009-09-09 14:37:04 +02:00
Maxime Petazzoni 3e1c6ee475 Limit coordinates display to 4 decimals 2009-09-09 14:36:55 +02:00
Maxime Petazzoni 4bedef55e6 Place the attribution string correctly 
This puts the attribution notice in a more convenient position on the
slippy map.
 2009-09-09 14:36:39 +02:00
Maxime Petazzoni 412581d7e4 Bypass the city_exists check when no GIS database is set 
This allows for MapOSMatic to be used without a GIS-capable database to
test the web interface without doing any rendering or calls to the GIS
database.
 2009-09-09 14:31:44 +02:00
Thomas Petazzoni 39d28b46e3 Disable AreaField clean logic 
As no clean() method was defined in AreaField, we were inherinting the
clean() logic of the parent class. However, this clean logic doesn't
work with our field, so let's disable it.

The validation of the Bounding Box data is done in the clean() method
of the form.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 2009-09-09 14:21:08 +02:00
Maxime Petazzoni 87e66f3511 Show bounding box errors 2009-09-09 14:02:02 +02:00
Maxime Petazzoni 5ec9958ccf Fix the slippy map display bug. 2009-09-09 14:01:56 +02:00
Maxime Petazzoni e4d15f0ff5 Improve slippy map integration. 
* Fix HTML and style issues with the slippy map code
  * Make the JS code a bit more readable
  * Use a default bounding box at init (patch from Etienne Loks)

Note: a bug is still present when loading the page. The slippy map
remains gray (no tile loaded) until an event happens on the map (drap,
zoom).
 2009-09-09 14:01:39 +02:00
Maxime Petazzoni 51dab09be5 Style improvements 
* Make the map generation form a bit nicer.
  * Fix a bug in the selection mode toggles when refreshing
    the page
  * Fix the form anchor so that the rest of the page is not considered
    part of the link
  * Update the contact us message
  * Don't center the "No random map found" message, only the random map
    when it is displayed
  * Reduce the font-size: more readable, and fixes a table overflow
    problem on the jobs page.
  * Add a link to OpenStreetMap on the front page
 2009-09-09 14:01:34 +02:00
Étienne Loks 37287bbf43 Remove dependance with GIS extension on website database 2009-09-09 13:54:55 +02:00
Thomas Petazzoni 3bedc19f8b Remove debugging messages 2009-09-08 23:49:41 +02:00
Thomas Petazzoni 1ef11b85b5 Add slippy map to select the area to render 
Code provided by Etienne Loks.
 2009-09-08 23:48:46 +02:00
Thomas Petazzoni 89418ac2dc Re-update translations 2009-09-08 22:12:55 +02:00
Thomas Petazzoni 66730d019c Fix french typo on main title 2009-09-08 22:09:06 +02:00
Thomas Petazzoni 53b41dd177 Add link on hacker + fix french typo 2009-09-08 22:08:08 +02:00
Thomas Petazzoni 60aab80b67 Better highlighting of form submission errors 2009-09-08 22:05:08 +02:00
Thomas Petazzoni 4949eefd6d Center the random map 2009-09-08 21:54:11 +02:00
Thomas Petazzoni 7c65c066c2 Translation for the contact box 2009-09-08 21:52:55 +02:00
Thomas Petazzoni 15e0df1d86 Add contact box 2009-09-08 21:52:18 +02:00
Thomas Petazzoni 8ec81957d3 Add a refresh status link and tune the rendering finish time value 2009-09-08 21:50:43 +02:00
Thomas Petazzoni 95b8daa251 Fix minor typo issues reported by Valérie-Emma 2009-09-08 21:39:36 +02:00
Maxime Petazzoni 3bae3ccca3 Use pagination in jobs and maps list pages 2009-09-08 21:27:19 +02:00
Thomas Petazzoni 083da2ffe9 Update translations after the last modifications 2009-09-08 09:19:05 +02:00
Thomas Petazzoni 3c9b1c3f80 Fix commit 7ab0869b55 2009-09-08 08:55:55 +02:00
David Decotigny 477b5fc0d6 Don't show the submit button for on-the-fly language selection when javascript being used. 
As told...
 2009-09-08 08:54:11 +02:00
Thomas Petazzoni 7ab0869b55 Slightly improve the language selection rendering 2009-09-07 21:16:07 +02:00
Thomas Petazzoni b338d03f01 Merge branch 'integration' 
Conflicts:
	www/templates/maposmatic/index.html
 2009-09-07 21:01:03 +02:00
David Decotigny f302408d28 Support on-the-fly change of the locale settings. 
Add a new Language menu on the left to allow the selection of any of
the supported languages. The list of supported languages is in the
settings.py file and is related to the .po files available in locales/.
 2009-09-07 21:00:20 +02:00
Thomas Petazzoni 9237be41d3 Apply the <td> style to <th> to get centered column titles 2009-09-07 20:06:36 +02:00
David Decotigny 5ce0a61bda Added translations for 500.html 2009-09-07 20:02:53 +02:00
David Decotigny 90c939ca3b Adding Error 500 handler template. 
New template for Internal Server Error page (500).
 2009-09-07 20:02:48 +02:00
David Decotigny 4c4ce90264 Allows to have separate DBs for GIS OSM info and rendering DB. 
The assumption that the OSM postGIS DB was the same as the DB used for
the rendering (shared with maposmaticd) doesn't allow to run 2
instances of the maposmatic/maposmaticd engine (eg. a prod and a dev
instance). This patch allows this by differentiating both DB. This
makes it possible to share the same OSM db by both instances, but to
have separate rendering info.
 2009-09-07 20:02:45 +02:00
Maxime Petazzoni 05d83c0c9c Remove the statically defined language from the base template. 
Now that MapOSMatic has i18n features, the content language is detected
from the Accept-Language header sent by the client. Therefore, the
statically defined 'fr-fr' language in the Content-Language META tag is
no longer required (not mentioning wrong if we're not sending French).
 2009-09-07 20:02:41 +02:00
Maxime Petazzoni 0ad0a6bcac Only use a map title for bounding box defined maps. 
This changes removes the need for a map title when requesting for a map
by city name. When the request is made by administrative boundary, the
map title is directly infered from the city name. Otherwise, a map title
is of course still required.
 2009-09-07 20:02:34 +02:00
Maxime Petazzoni ac01ba1442 Re-add the session application to the INSTALLED_APPS list. 
The session app is required for Django's good operation. Putting back
django.contrib.session into the INSTALLED_APPS list in the settings
ensures that the django_session table will be created by syncdb and that
the web application runs fine afterwards.
 2009-09-07 20:02:29 +02:00
David MENTRE 129b4989e3 Update fr translations 2009-09-05 13:16:18 +02:00
David MENTRE 46aaff4d2e Add OSM license ref on index page 2009-09-05 12:40:23 +02:00
David MENTRE 4833dd4921 Fix typo 2009-09-05 11:57:58 +02:00
David MENTRE 71ce604db8 Put licence as Django comments in templates 2009-09-05 11:54:21 +02:00
David MENTRE fd2bc3ef40 Add translation mark for "Your free city maps!" 2009-09-05 11:46:48 +02:00
David MENTRE 34ac4c4886 English typo fix, add links and other minor changes 
* style.css: Update it so that images within links have no border.

* about.html: Fix English typo (no space before double punctuation). Fix
  some text. Add links to AGPLv3, PostgreSQL, etc. Fix git clone text
  for ocitysmap. Add ";" to bullets.

* base.html: Remove &nbsp; before "!".

* index.html: Add links for Chavagne thumbnail images (to PNG
  versions). Upper case first sentence of each bullet point. Add a text
  blob that says that maps can be freely reused. Change <i> in to <em>.
 2009-09-05 11:24:09 +02:00
Thomas Petazzoni 1312534adb Fix context processor module location 2009-09-04 09:27:17 +02:00
Thomas Petazzoni cd043ef466 Add missing context_processors 2009-09-04 08:55:32 +02:00
Thomas Petazzoni e33179a11b Remove debug messages 2009-09-04 00:02:45 +02:00
Thomas Petazzoni a48b18fcce Add thumbnail to the job status page 2009-09-04 00:00:46 +02:00
Thomas Petazzoni 328e84029c Add a random map block to the right 2009-09-03 23:57:45 +02:00
Thomas Petazzoni 9d7c4f0206 Test whether generated files still exist 2009-09-03 23:10:23 +02:00
Thomas Petazzoni 4f1f13d27a Mention IRC channel and authors 2009-09-03 22:43:10 +02:00
Thomas Petazzoni 83de239b9f Translate two missing titles 2009-09-03 22:28:25 +02:00
Thomas Petazzoni 7dddb9bc0a Fix typo 2009-09-03 22:26:34 +02:00
Thomas Petazzoni 2ffe6cc7fa Finalize French translation 2009-09-03 22:25:45 +02:00
Thomas Petazzoni c243c069b5 Better message when the job page is empty 2009-09-03 22:11:03 +02:00
Thomas Petazzoni c759dfe510 Fix missing links in the about page 2009-09-03 22:10:49 +02:00
Thomas Petazzoni 293ba3a5a2 More details in the about page 2009-09-03 22:08:36 +02:00
Thomas Petazzoni e1b2261111 Ignore .mo files 2009-09-03 21:22:19 +02:00
Thomas Petazzoni b0188ca7c8 Merge branch 'maps-page' 2009-09-03 21:21:51 +02:00
Thomas Petazzoni 3ad15aa199 Fix missing </td> 2009-09-03 21:21:46 +02:00
Thomas Petazzoni e54a17d352 Improve maps page + translate 2009-09-03 21:21:16 +02:00
Thomas Petazzoni 3b92f8bf59 Translate the index page 2009-09-03 21:11:31 +02:00
Thomas Petazzoni d6cf1b7386 Improve layout of the job status page 2009-09-03 20:26:43 +02:00
Thomas Petazzoni e82e8a0a48 Merge branch 'thumbnails' 2009-09-03 11:06:27 +02:00
Thomas Petazzoni 9c94202d63 About page 2009-09-03 08:55:46 +02:00
Thomas Petazzoni 7e1865dd91 Implement thumbnail generation and beginning of maps page 2009-09-03 08:55:23 +02:00
David Decotigny 4a40d212d2 Fixed minor cosmetic typo. 2009-09-01 15:03:45 +02:00
David Decotigny 68cef75ac0 i18n with french available. Run python /usr/share/python-support/python-django/django/bin/django-admin.py compilemessages to generate the po files. 2009-09-01 15:03:38 +02:00
Thomas Petazzoni b67dacafb5 UI improvements 2009-08-31 23:49:39 +02:00
Thomas Petazzoni 67f2decc39 Minor improvements 2009-08-31 23:29:45 +02:00
Thomas Petazzoni 6d2ca9dd33 Improve homepage 2009-08-31 23:12:15 +02:00
Thomas Petazzoni 07a9124d48 Merge branch 'master' of git://bentobako.org/git/maposmatic 2009-08-31 21:53:15 +02:00
David MENTRE 5b195c6178 Put maposmatic under AGPLv3 license 2009-08-31 19:36:21 +02:00
Thomas Petazzoni af5e77c416 Add a subtitle on the website 2009-08-31 19:23:46 +02:00
Thomas Petazzoni 9150cf23d1 Improve error message 2009-08-30 00:58:15 +02:00
Thomas Petazzoni 1bc8ab5703 Improve error message 2009-08-30 00:57:53 +02:00
Thomas Petazzoni 8a60f68cc7 Remove debugging cruft 2009-08-30 00:56:00 +02:00
Thomas Petazzoni 3e36d229ad Validate that the city entered exists 2009-08-30 00:44:20 +02:00
Thomas Petazzoni 0cbe52838b Display CSV Index in generated files 2009-08-30 00:24:16 +02:00
Thomas Petazzoni 506ea5625d Additionnal checks on submitted values 2009-08-30 00:05:35 +02:00
Thomas Petazzoni e356483c7c Fix generation using bounding box coordinates 2009-08-29 22:56:37 +02:00
Thomas Petazzoni 1794bdd19d Merge branch 'master' of git://pollindd.local/maposmatic/ 2009-08-29 19:16:32 +02:00
David Decotigny 37ccc94c60 changed log infrastructure : single LOG object confiugrable through settings 2009-08-29 19:13:17 +02:00
Thomas Petazzoni 5ca1ed0958 Slightly increase the space between the bounding box inputs 2009-08-29 19:02:38 +02:00
Thomas Petazzoni f3ebea30f3 Translate index to english 2009-08-29 19:01:44 +02:00
Thomas Petazzoni 075676c16f Implement the file cleaning procedure 2009-08-29 18:30:35 +02:00
David Decotigny 280dfa573b doc for the wsgi template 2009-08-29 17:45:45 +02:00
David Decotigny 15d5cd7f0d wsgi template 2009-08-29 17:43:28 +02:00
Thomas Petazzoni 4df2d3e9c0 Add missing import logging in configuration template 2009-08-29 17:39:17 +02:00
Thomas Petazzoni f6303aec2e Remove forbidden prints 2009-08-29 17:38:53 +02:00
Thomas Petazzoni 2b13d8bc3f Support multiple rendering formats and display links to generated files 2009-08-29 17:23:11 +02:00
Thomas Petazzoni 331d738c89 Switch to a better logging facility 
We now have separate logging for the web service (logwww) and the
daemon (logdaemon). They can be configured separately in the
settings_local.py file.
 2009-08-29 16:40:31 +02:00
Thomas Petazzoni eb64e1e1b5 Improve the generation of the files prefix 2009-08-29 16:39:07 +02:00
Thomas Petazzoni 3a4da0d28a Only show entries over last 24h in /jobs page and improve formatting 2009-08-29 15:08:07 +02:00
Thomas Petazzoni 3e8997fead Add more details in the job status pages 2009-08-29 12:51:53 +02:00
Thomas Petazzoni 8a5dcb3cf0 Add methods to give queue status informations 
Method queue_size() in the MapRenderingJob manager

Methods current_position_in_queue() and
rendering_estimated_start_time() in MapRenderingJob

In the view:

 * use the queue_size() method to initialize the
   index_queue_at_submission when a job is submitted.

 * on the job status page, sort jobs by descending order of submission
   time
 2009-08-29 12:49:41 +02:00
Thomas Petazzoni 616b3b39d0 Many improvements 2009-08-29 11:06:30 +02:00
Thomas Petazzoni 8a70335efe Improve menu + add about and maps pages 2009-08-29 09:20:13 +02:00
Thomas Petazzoni 880d6795fa Move menu to the left, center the title 2009-08-29 08:53:17 +02:00
Thomas Petazzoni da10c910e5 Re-indent CSS 2009-08-29 08:37:50 +02:00
Thomas Petazzoni cb79143669 Various fixes 2009-08-29 01:15:50 +02:00
Thomas Petazzoni 3b58bd825a Split settings into settings_local 2009-08-28 15:42:41 +02:00
Thomas Petazzoni dc341b22d9 Ignore .pyc files 2009-08-28 15:36:51 +02:00
Thomas Petazzoni 7c28357369 First import of maposmatic web service 2009-08-28 15:36:10 +02:00