X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/85b17e5bb5c6e47ed9bfbf57b9c3e6d68d3437ea..dd7f629ab3f1404a2a3ea5a9c4e28c416ecb6e3b:/cookbooks/planet/files/default/cgi/HEADER.cgi?ds=sidebyside diff --git a/cookbooks/planet/files/default/cgi/HEADER.cgi b/cookbooks/planet/files/default/cgi/HEADER.cgi index 0ce17f64a..7955d4718 100644 --- a/cookbooks/planet/files/default/cgi/HEADER.cgi +++ b/cookbooks/planet/files/default/cgi/HEADER.cgi @@ -43,16 +43,17 @@ def nice_time(time): return '%d months' % (time / 2592000.) -def file_info(file, name): +def file_info(file, rss_file, name): + torrent_file = file + '.torrent' size = nice_size(file) hash = search(r'\w{32}', open(file+'.md5', 'r').read()).group(0) date = nice_time(time() - stat(file).st_mtime) - return '%(name)s
%(size)s, created %(date)s ago.
md5: %(hash)s.' % locals() + return '%(name)s (torrent) (RSS)
%(size)s, created %(date)s ago.
md5: %(hash)s.' % locals() -planet_link = file_info('planet/planet-latest.osm.bz2', 'Latest Weekly Planet XML File') -changesets_link = file_info('planet/changesets-latest.osm.bz2', 'Latest Weekly Changesets') -planet_pbf_link = file_info('pbf/planet-latest.osm.pbf', 'Latest Weekly Planet PBF File') +planet_link = file_info('planet/planet-latest.osm.bz2', 'planet/planet-bz2-rss.xml', 'Latest Weekly Planet XML File') +changesets_link = file_info('planet/changesets-latest.osm.bz2', 'planet/changesets-bz2-rss.xml', 'Latest Weekly Changesets') +planet_pbf_link = file_info('pbf/planet-latest.osm.pbf', 'pbf/planet-pbf-rss.xml', 'Latest Weekly Planet PBF File') print """ @@ -69,7 +70,7 @@ print """ The files found here are regularly-updated, complete copies of the OpenStreetMap.org database, and those published before the 12 September 2012 are distributed under a Creative Commons Attribution-ShareAlike 2.0 license, those published after are Open Data Commons Open Database License 1.0 licensed. For more information, see the project wiki.

-

WARNING Download speeds are currently restricted to 2048 KB/s due to limited available capacity on our Internet connection. Please use a mirror if possible.

+

WARNING Download speeds are currently restricted to 4096 KB/s due to limited available capacity on our Internet connection. Please use torrents or a mirror if possible.

@@ -113,9 +114,8 @@ database, and those published before the 12 September 2012 are distributed under is a tool for importing the data into a Postgis database for rendering maps.

- Processed coastline data - derived from OSM data is also needed for rendering usable maps, and can be found in a - single shapefile (360MB). + Processed coastline data + derived from OSM data is also needed for rendering usable maps.