The following commit has been merged in the master branch: commit 5e7a21412bb210b0b616d2855f08419378985248 Author: Andrew Harvey <andrew.harv...@gmail.com> Date: Sat Oct 13 11:54:35 2012 +1100
Imported Upstream version 1.42.1 diff --git a/._VERSION b/._VERSION index 56185a5..bfbc466 100644 Binary files a/._VERSION and b/._VERSION differ diff --git a/._tilestache.cfg b/._tilestache.cfg index 7338e96..7da2bda 100644 Binary files a/._tilestache.cfg and b/._tilestache.cfg differ diff --git a/TileStache/Goodies/Providers/GDAL.py b/TileStache/Goodies/Providers/GDAL.py index 446ad41..b09afcd 100644 --- a/TileStache/Goodies/Providers/GDAL.py +++ b/TileStache/Goodies/Providers/GDAL.py @@ -104,9 +104,30 @@ class Provider: if mask_ds is not None: mask_ds.SetGeoTransform(gtx) + # Adjust resampling method ----------------------------------------- + + resample = self.resample + + if resample == gdal.GRA_CubicSpline: + # + # I've found through testing that when ReprojectImage is used + # on two same-scaled datasources, GDAL will visibly darken the + # output and the results look terrible. Switching resampling + # from cubic spline to bicubic in these cases fixes the output. + # + xscale = area_ds.GetGeoTransform()[1] / src_ds.GetGeoTransform()[1] + yscale = area_ds.GetGeoTransform()[5] / src_ds.GetGeoTransform()[5] + diff = max(abs(xscale - 1), abs(yscale - 1)) + + if diff < .001: + resample = gdal.GRA_Cubic + # Create rendered area --------------------------------------------- - gdal.ReprojectImage(src_ds, area_ds, src_ds.GetProjection(), area_ds.GetProjection(), self.resample) + src_sref = osr.SpatialReference() + src_sref.ImportFromWkt(src_ds.GetProjection()) + + gdal.ReprojectImage(src_ds, area_ds, src_ds.GetProjection(), area_ds.GetProjection(), resample) if mask_ds is not None: # Interpolating validity makes no sense and so we can use nearest neighbour resampling here no matter # what is requested. diff --git a/TileStache/__init__.py b/TileStache/__init__.py index d666c47..4c8812c 100644 --- a/TileStache/__init__.py +++ b/TileStache/__init__.py @@ -8,7 +8,7 @@ designers and cartographers. Documentation available at http://tilestache.org/doc/ """ -__version__ = '1.42.0' +__version__ = '1.42.1' import re diff --git a/VERSION b/VERSION index a50908c..e640847 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.42.0 +1.42.1 diff --git a/doc/TileStache.Goodies.Proj4Projection.html b/doc/TileStache.Goodies.Proj4Projection.html index eba460e..93e889e 100644 --- a/doc/TileStache.Goodies.Proj4Projection.html +++ b/doc/TileStache.Goodies.Proj4Projection.html @@ -101,7 +101,7 @@ Optional attributes:<br> </dl> <hr> Methods defined here:<br> -<dl><dt><a name="Proj4Projection-__init__"><strong>__init__</strong></a>(self, srs, resolutions, tile_size<font color="#909090">=256</font>, transformation<font color="#909090">=<ModestMaps.Geo.Transformation instance at 0x1010b3ea8></font>)</dt><dd><tt>Creates a new instance with the projection specified in srs, which is in Proj4<br> +<dl><dt><a name="Proj4Projection-__init__"><strong>__init__</strong></a>(self, srs, resolutions, tile_size<font color="#909090">=256</font>, transformation<font color="#909090">=<ModestMaps.Geo.Transformation instance at 0x1010b4e60></font>)</dt><dd><tt>Creates a new instance with the projection specified in srs, which is in Proj4<br> format.</tt></dd></dl> <dl><dt><a name="Proj4Projection-coordinateProj"><strong>coordinateProj</strong></a>(self, coord)</dt><dd><tt>Convert from Coordinate object to a Point object in the defined projection</tt></dd></dl> diff --git a/doc/TileStache.Sandwich.html b/doc/TileStache.Sandwich.html index ce276f1..ca63a1b 100644 --- a/doc/TileStache.Sandwich.html +++ b/doc/TileStache.Sandwich.html @@ -205,6 +205,6 @@ Examples:<br> <font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr> <tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td> -<td width="100%"><strong>adjustment_names</strong> = {'curves': <function curves at 0x10b2a7f50>, 'curves2': <function curves2 at 0x10b2ab050>, 'threshold': <function threshold at 0x109e895f0>}<br> -<strong>blend_modes</strong> = {'add': <function add at 0x109e85b90>, 'hard light': <function hard_light at 0x109e85d70>, 'linear light': <function linear_light at 0x109e85cf8>, 'multiply': <function multiply at 0x109e85c08>, 'screen': <function screen at 0x109e85b18>, 'subtract': <function subtract at 0x109e85c80>}</td></tr></table> +<td width="100%"><strong>adjustment_names</strong> = {'curves': <function curves at 0x1093a7f50>, 'curves2': <function curves2 at 0x1093ab050>, 'threshold': <function threshold at 0x1077935f0>}<br> +<strong>blend_modes</strong> = {'add': <function add at 0x10778fb90>, 'hard light': <function hard_light at 0x10778fd70>, 'linear light': <function linear_light at 0x10778fcf8>, 'multiply': <function multiply at 0x10778fc08>, 'screen': <function screen at 0x10778fb18>, 'subtract': <function subtract at 0x10778fc80>}</td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/index.html b/doc/index.html index acc6806..5d0ce3f 100644 --- a/doc/index.html +++ b/doc/index.html @@ -76,7 +76,7 @@ </p> <p> - <strong>This document covers TileStache version 1.42.0</strong>. + <strong>This document covers TileStache version 1.42.1</strong>. </p> <p> diff --git a/doc/tilestache-clean.html b/doc/tilestache-clean.html index 077627a..7935fb8 100644 --- a/doc/tilestache-clean.html +++ b/doc/tilestache-clean.html @@ -38,7 +38,7 @@ Read coordinates from a file with one Z/X/Y&n <tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td> <td width="100%"><strong>defaults</strong> = {'bbox': (37.777000000000001, -122.352, 37.838999999999999, -122.226), 'extension': 'png', 'padding': 0, 'verbose': True}<br> -<strong>parser</strong> = <optparse.OptionParser instance at 0x1005436c8><br> +<strong>parser</strong> = <optparse.OptionParser instance at 0x101021fc8><br> <strong>path</strong> = ['.', '/System/Library/Frameworks/Python.framework/Versions/2.6/bin', '/Library/Frameworks/SQLite3.framework/Versions/3/Python/2.6', '/Library/Frameworks/GDAL.framework/Versions/1.8/Python/2.6/site-packages', '/Library/Python/2.6/site-packages/ModestMaps', '/Library/Python/2.6/site-packages/numpy-1.5.1-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/BlobDetector-1.0.0-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/bson-0.3.2-py2.6.egg', '/Library/Python/2.6/site-packages/pytz-2011d-py2.6.egg', '/Library/Python/2.6/site-packages/boto-1.9b-py2.6.egg', '/Library/Python/2.6/site-packages/PyAMF-0.6.1-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/pystache-0.3.1-py2.6.egg', '/Library/Python/2.6/site-packages/chardet-1.0.1-py2.6.egg', '/Library/Python/2.6/site-packages/pyproj-1.8.9-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/OAM-0.1-py2.6.egg', '/Library/Python/2.6/site-packages/encutils-0.9-py2.6.egg', '/Library/Python/2.6/site-packages/cssutils-0.9.8a1-py2.6.egg', '/Library/Python/2.6/site-packages/Werkzeug-0.6.2-py2.6.egg', '/Library/Python/2.6/site-packages/Shapely-1.2.10-py2.6.egg', '/Library/Python/2.6/site-packages/python_twitter-0.8.2-py2.6.egg', ...]<br> <strong>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/tilestache-compose.html b/doc/tilestache-compose.html index 1e31302..9aa6f37 100644 --- a/doc/tilestache-compose.html +++ b/doc/tilestache-compose.html @@ -157,7 +157,7 @@ Write a string to a file descriptor.</tt></dd></dl <tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td> <td width="100%"><strong>defaults</strong> = {'center': (37.804400000000001, -122.27119999999999), 'dimensions': (900, 600), 'verbose': True, 'zoom': 14}<br> <strong>mmaps_version</strong> = (1, 4, 0)<br> -<strong>parser</strong> = <optparse.OptionParser instance at 0x100654128><br> +<strong>parser</strong> = <optparse.OptionParser instance at 0x1006540e0><br> <strong>path</strong> = ['.', '/System/Library/Frameworks/Python.framework/Versions/2.6/bin', '/Library/Frameworks/SQLite3.framework/Versions/3/Python/2.6', '/Library/Frameworks/GDAL.framework/Versions/1.8/Python/2.6/site-packages', '/Library/Python/2.6/site-packages/ModestMaps', '/Library/Python/2.6/site-packages/numpy-1.5.1-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/BlobDetector-1.0.0-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/bson-0.3.2-py2.6.egg', '/Library/Python/2.6/site-packages/pytz-2011d-py2.6.egg', '/Library/Python/2.6/site-packages/boto-1.9b-py2.6.egg', '/Library/Python/2.6/site-packages/PyAMF-0.6.1-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/pystache-0.3.1-py2.6.egg', '/Library/Python/2.6/site-packages/chardet-1.0.1-py2.6.egg', '/Library/Python/2.6/site-packages/pyproj-1.8.9-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/OAM-0.1-py2.6.egg', '/Library/Python/2.6/site-packages/encutils-0.9-py2.6.egg', '/Library/Python/2.6/site-packages/cssutils-0.9.8a1-py2.6.egg', '/Library/Python/2.6/site-packages/Werkzeug-0.6.2-py2.6.egg', '/Library/Python/2.6/site-packages/Shapely-1.2.10-py2.6.egg', '/Library/Python/2.6/site-packages/python_twitter-0.8.2-py2.6.egg', ...]<br> <strong>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/tilestache-render.html b/doc/tilestache-render.html index 5e853bb..450912a 100644 --- a/doc/tilestache-render.html +++ b/doc/tilestache-render.html @@ -43,6 +43,6 @@ See `tilestache-render.py --help` for more information. <font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr> <tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td> -<td width="100%"><strong>parser</strong> = <optparse.OptionParser instance at 0x1010efea8><br> +<td width="100%"><strong>parser</strong> = <optparse.OptionParser instance at 0x1010efe60><br> <strong>pathinfo_pat</strong> = <_sre.SRE_Pattern object at 0x100733858></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/tilestache-seed.html b/doc/tilestache-seed.html index 365492b..914ba77 100644 --- a/doc/tilestache-seed.html +++ b/doc/tilestache-seed.html @@ -44,7 +44,7 @@ Read coordinates from an MBTiles tileset filename. <tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td> <td width="100%"><strong>defaults</strong> = {'bbox': (37.777000000000001, -122.352, 37.838999999999999, -122.226), 'enable_retries': False, 'padding': 0, 'verbose': True}<br> -<strong>parser</strong> = <optparse.OptionParser instance at 0x1010f2320><br> +<strong>parser</strong> = <optparse.OptionParser instance at 0x1010f22d8><br> <strong>path</strong> = ['.', '/System/Library/Frameworks/Python.framework/Versions/2.6/bin', '/Library/Frameworks/SQLite3.framework/Versions/3/Python/2.6', '/Library/Frameworks/GDAL.framework/Versions/1.8/Python/2.6/site-packages', '/Library/Python/2.6/site-packages/ModestMaps', '/Library/Python/2.6/site-packages/numpy-1.5.1-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/BlobDetector-1.0.0-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/bson-0.3.2-py2.6.egg', '/Library/Python/2.6/site-packages/pytz-2011d-py2.6.egg', '/Library/Python/2.6/site-packages/boto-1.9b-py2.6.egg', '/Library/Python/2.6/site-packages/PyAMF-0.6.1-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/pystache-0.3.1-py2.6.egg', '/Library/Python/2.6/site-packages/chardet-1.0.1-py2.6.egg', '/Library/Python/2.6/site-packages/pyproj-1.8.9-py2.6-macosx-10.6-universal.egg', '/Library/Python/2.6/site-packages/OAM-0.1-py2.6.egg', '/Library/Python/2.6/site-packages/encutils-0.9-py2.6.egg', '/Library/Python/2.6/site-packages/cssutils-0.9.8a1-py2.6.egg', '/Library/Python/2.6/site-packages/Werkzeug-0.6.2-py2.6.egg', '/Library/Python/2.6/site-packages/Shapely-1.2.10-py2.6.egg', '/Library/Python/2.6/site-packages/python_twitter-0.8.2-py2.6.egg', ...]<br> <strong>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> </body></html> \ No newline at end of file diff --git a/tilestache.cfg b/tilestache.cfg index 22af5e3..d904304 100644 --- a/tilestache.cfg +++ b/tilestache.cfg @@ -60,7 +60,7 @@ "name": "sandwich", "stack": [ - {"src": "http://localhost/~migurski/TileStache/ocean-texture.png"} + {"src": "magical_forest-whole.jpg"} ] } } -- map tiles caching system _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel