X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/83fe6080939bf6d13a1ee9dfdfac2b71c97804b5..8c38ecd35e8f74afa00177e5ef4b16cdb622629c:/cookbooks/planet/files/default/cgi/HEADER.cgi diff --git a/cookbooks/planet/files/default/cgi/HEADER.cgi b/cookbooks/planet/files/default/cgi/HEADER.cgi index 19dda9732..35f4c7680 100644 --- a/cookbooks/planet/files/default/cgi/HEADER.cgi +++ b/cookbooks/planet/files/default/cgi/HEADER.cgi @@ -10,7 +10,7 @@ def nice_size(file): MB = 1024. * KB GB = 1024. * MB TB = 1024. * GB - + if size < KB: size, suffix = size, '' elif size < MB: @@ -21,7 +21,7 @@ def nice_size(file): size, suffix = size/GB, 'GB' else: size, suffix = size/TB, 'TB' - + if size < 10: return '%.1f %s' % (round(size,1), suffix) else: @@ -50,25 +50,26 @@ def file_info(file, name): return '%(name)s
%(size)s, created %(date)s ago.
md5: %(hash)s.' % locals() -planet_link = file_info('planet/planet-latest.osm.bz2', 'Latest Weekly Planet File') +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') print """ Index of / - + -

Planet OSM

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. +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 400 KB/s due to limited available capacity on our Internet connection. Please use a mirror if possible.

@@ -129,6 +131,6 @@ database, and those published before the 12 September 2012 are distributed under

@@ -85,6 +86,7 @@ database, and those published before the 12 September 2012 are distributed under	%(planet_link)s %(changesets_link)s + %(planet_pbf_link)s Each week, a new and complete copy of all data in OpenStreetMap is made available as both a compressed XML file and a custom PBF format file. @@ -99,19 +101,19 @@ database, and those published before the 12 September 2012 are distributed under	- You are granted permission to use OpenStreetMap data by - the OpenStreetMap License, which also describes + You are granted permission to use OpenStreetMap data by + the OpenStreetMap License, which also describes your obligations. - You can process the file - or extracts with a variety of tools. Osmosis + You can process the file + or extracts with a variety of tools. Osmosis is a general-purpose command-line tool for converting the data among different formats - and databases, and Osm2pgsql + and databases, and Osm2pgsql is a tool for importing the data into a Postgis database for rendering maps. - Processed coastline data + Processed coastline data derived from OSM data is also needed for rendering usable maps, and can be found in a single shapefile (360MB). @@ -119,9 +121,9 @@ database, and those published before the 12 September 2012 are distributed under	The complete planet is very large, so you may prefer to use one of - several periodic extracts - (individual countries or states) from third parties. GeoFabrik.de - and BBBike.org are two providers + several periodic extracts + (individual countries or states) from third parties. GeoFabrik.de + and BBBike.org are two providers of extracts with up-to-date worldwide coverage.

@@ -85,6 +86,7 @@ database, and those published before the 12 September 2012 are distributed under

%(planet_link)s

%(changesets_link)s

%(planet_pbf_link)s

Each week, a new and complete copy of all data in OpenStreetMap is made available as both a compressed XML file and a custom PBF format file. @@ -99,19 +101,19 @@ database, and those published before the 12 September 2012 are distributed under

- You are granted permission to use OpenStreetMap data by - the OpenStreetMap License, which also describes + You are granted permission to use OpenStreetMap data by + the OpenStreetMap License, which also describes your obligations.

- You can process the file - or extracts with a variety of tools. Osmosis + You can process the file + or extracts with a variety of tools. Osmosis is a general-purpose command-line tool for converting the data among different formats - and databases, and Osm2pgsql + and databases, and Osm2pgsql is a tool for importing the data into a Postgis database for rendering maps.

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

@@ -119,9 +121,9 @@ database, and those published before the 12 September 2012 are distributed under

The complete planet is very large, so you may prefer to use one of - several periodic extracts - (individual countries or states) from third parties. GeoFabrik.de - and BBBike.org are two providers + several periodic extracts + (individual countries or states) from third parties. GeoFabrik.de + and BBBike.org are two providers of extracts with up-to-date worldwide coverage.

-If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the OpenStreetMap Data Working Group. +If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the OpenStreetMap Data Working Group.

""" % locals()