This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository tilestache.
commit c51f4e8b5329a9a09a9744c1c48702d4e3a3330e Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Oct 17 08:27:35 2016 +0200 Imported Upstream version 1.49.9 --- PKG-INFO | 10 ++ README.md | 152 --------------------- TileStache/._Geography.py | Bin 82 -> 0 bytes TileStache/._Pixels.py | Bin 82 -> 0 bytes TileStache/Core.py | 19 ++- TileStache/Goodies/.___init__.py | Bin 171 -> 0 bytes TileStache/Goodies/Providers/._MirrorOSM.py | Bin 171 -> 0 bytes TileStache/Pixels.py | 5 + TileStache/Sandwich.py | 44 +++--- TileStache/VERSION | 1 + TileStache/__init__.py | 4 +- VERSION | 1 - doc/TileStache.Caches.html | 2 +- doc/TileStache.Config.html | 6 +- doc/TileStache.Core.html | 22 +-- doc/TileStache.Geography.html | 2 +- doc/TileStache.Goodies.AreaServer.html | 2 +- doc/TileStache.Goodies.Caches.GoogleCloud.html | 10 +- doc/TileStache.Goodies.Caches.LimitedDisk.html | 2 +- doc/TileStache.Goodies.Caches.html | 2 +- doc/TileStache.Goodies.ExternalConfigServer.html | 2 +- doc/TileStache.Goodies.Proj4Projection.html | 4 +- doc/TileStache.Goodies.Providers.Cascadenik.html | 10 +- doc/TileStache.Goodies.Providers.Composite.html | 5 +- doc/TileStache.Goodies.Providers.GDAL.html | 2 +- doc/TileStache.Goodies.Providers.Grid.html | 2 +- doc/TileStache.Goodies.Providers.MapnikGrid.html | 5 +- doc/TileStache.Goodies.Providers.MirrorOSM.html | 4 +- doc/TileStache.Goodies.Providers.Monkeycache.html | 2 +- doc/TileStache.Goodies.Providers.PostGeoJSON.html | 2 +- doc/TileStache.Goodies.Providers.SolrGeoJSON.html | 12 +- doc/TileStache.Goodies.Providers.TileDataOSM.html | 4 +- ...eStache.Goodies.Providers.UtfGridComposite.html | 2 +- ....Goodies.Providers.UtfGridCompositeOverlap.html | 2 +- doc/TileStache.Goodies.Providers.html | 2 +- doc/TileStache.Goodies.StatusServer.html | 2 +- doc/TileStache.Goodies.VecTiles.client.html | 64 ++------- doc/TileStache.Goodies.VecTiles.geojson.html | 12 +- doc/TileStache.Goodies.VecTiles.html | 2 +- doc/TileStache.Goodies.VecTiles.mvt.html | 2 +- doc/TileStache.Goodies.VecTiles.ops.html | 2 +- doc/TileStache.Goodies.VecTiles.server.html | 6 +- doc/TileStache.Goodies.VecTiles.topojson.html | 2 +- doc/TileStache.Goodies.VecTiles.wkb.html | 2 +- doc/TileStache.Goodies.html | 2 +- doc/TileStache.MBTiles.html | 2 +- doc/TileStache.Mapnik.html | 11 +- doc/TileStache.Memcache.html | 2 +- doc/TileStache.Pixels.html | 7 +- doc/TileStache.Providers.html | 2 +- doc/TileStache.Redis.html | 2 +- doc/TileStache.S3.html | 2 +- doc/TileStache.Sandwich.html | 19 +-- doc/TileStache.Vector.Arc.html | 2 +- doc/TileStache.Vector.html | 2 +- doc/TileStache.html | 8 +- doc/index.html | 14 +- doc/tilestache-clean.html | 10 +- doc/tilestache-compose.html | 18 +-- doc/tilestache-list.html | 10 +- doc/tilestache-render.html | 6 +- doc/tilestache-seed.html | 10 +- doc/tilestache-server.html | 2 +- man/tilestache-clean.1 | 65 --------- man/tilestache-render.1 | 32 ----- man/tilestache-seed.1 | 82 ----------- man/tilestache-server.1 | 35 ----- setup.py | 4 +- tilestache.cfg | 21 --- tilestache.cgi | 7 - 70 files changed, 195 insertions(+), 620 deletions(-) diff --git a/PKG-INFO b/PKG-INFO new file mode 100644 index 0000000..3e2f0a1 --- /dev/null +++ b/PKG-INFO @@ -0,0 +1,10 @@ +Metadata-Version: 1.0 +Name: TileStache +Version: 1.49.9 +Summary: A stylish alternative for caching your map tiles. +Home-page: http://tilestache.org +Author: Michal Migurski +Author-email: m...@stamen.com +License: BSD +Description: UNKNOWN +Platform: UNKNOWN diff --git a/README.md b/README.md deleted file mode 100644 index 38e07a8..0000000 --- a/README.md +++ /dev/null @@ -1,152 +0,0 @@ -#TileStache - -_a stylish alternative for caching your map tiles_ - -[![Build Status](https://travis-ci.org/migurski/TileStache.png)](https://travis-ci.org/migurski/TileStache) - -**TileStache** is a Python-based server application that can serve up map tiles -based on rendered geographic data. You might be familiar with [TileCache](http://tilecache.org), -the venerable open source WMS server from MetaCarta. TileStache is similar, but we hope -simpler and better-suited to the needs of designers and cartographers. - -##Synopsis - - import TileStache - import ModestMaps - - config = { - "cache": {"name": "Test"}, - "layers": { - "example": { - "provider": {"name": "mapnik", "mapfile": "examples/style.xml"}, - "projection": "spherical mercator" - } - } - } - - # like http://tile.openstreetmap.org/1/0/0.png - coord = ModestMaps.Core.Coordinate(0, 0, 1) - config = TileStache.Config.buildConfiguration(config) - type, bytes = TileStache.getTile(config.layers['example'], coord, 'png') - - open('tile.png', 'w').write(bytes) - - - -##Dependencies - -###Required: - -- ModestMaps: http://modestmaps.com, http://github.com/migurski/modestmaps-py -- Python Imaging Library (PIL): http://www.pythonware.com/products/pil - -###Optional: - -- Simplejson: https://github.com/simplejson/simplejson (optional if using >= python 2.6) -- mapnik: http://mapnik.org (optional) -- werkzeug: http://werkzeug.pocoo.org/ (optional) - -Install the pure python modules with pip: - - sudo pip install -U PIL modestmaps simplejson werkzeug - -Install pip (http://www.pip-installer.org/) like: - - curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py - sudo python get-pip.py - -Install Mapnik via instructions at: - - http://mapnik.org/download - - -##Installation - -TileStache can be run from the download directory as is. For example the scripts: - - tilestache-render.py tilestache-seed.py tilestache-server.py - -Can all be run locally like: - - ./scripts/tilestache-server.py - -To install globally do: - - python setup.py install - - * Note: you may need to prefix that command with 'sudo' to have permissions -to fully install TileStache. - - -##Quickstart - -To make sure TileStache is working start the development server: - - ./scripts/tilestache-server.py - -Then open a modern web browser and you should be able to preview tiles at: - - http://localhost:8080/osm/preview.html - -This is a previewer that uses ModestMaps and OpenStreetMap tiles from -http://tile.osm.org as defined in the default config file 'tilestache.cfg' - - -##Documentation - -The next step is to learn how build custom layers and serve them. - -See the [docs](http://tilestache.org/doc/) for details. - - -##Features - -Rendering providers: -* Mapnik -* Proxy -* Vector -* Templated URLs - -Caching backends: -* Local disk -* Test -* Memcache -* S3 - - -##Design Goals - -The design of TileStache focuses on approachability at the expense of -cleverness or completeness. Our hope is to make it easy for anyone to design -a new map of their city, publish a fresh view of their world, or even build -the next 8-Bit NYC (http://8bitnyc.com). - -* Small - -The core of TileStache is intended to have a small code footprint. -It should be quick and easy to to understand what the library is doing and -why, based on common entry points like included CGI scripts. Where possible, -dynamic programming "magic" is to be avoided, in favor of basic, procedural -and copiously-documented Python. - -* Pluggable - -We want to accept plug-ins and extensions from outside TileStache, and offer -TileStache itself as an extension for other systems. It must be possible to -write and use additional caches or renderers without having to modify the -core package itself, extend classes from inside the package, or navigate -chains of class dependencies. Duck typing and stable interfaces win. - -* Sensible Defaults - -The default action of a configured TileStache instance should permit the most -common form of interaction: a worldwide, spherical-mercator upper-left oriented -tile layout compatible with those used by OpenStreetMap, Google, Bing Maps, -Yahoo! and others. It should be possible to make TileStache do whatever is -necessary to support any external system, but we eschew complex, impenetrable -standards in favor of pragmatic, fast utility with basic web clients. - - -##License - -BSD, see LICENSE file. diff --git a/TileStache/._Geography.py b/TileStache/._Geography.py deleted file mode 100644 index 79a7755..0000000 Binary files a/TileStache/._Geography.py and /dev/null differ diff --git a/TileStache/._Pixels.py b/TileStache/._Pixels.py deleted file mode 100644 index 79a7755..0000000 Binary files a/TileStache/._Pixels.py and /dev/null differ diff --git a/TileStache/Core.py b/TileStache/Core.py index ab491af..f9be3cc 100644 --- a/TileStache/Core.py +++ b/TileStache/Core.py @@ -70,9 +70,9 @@ configuration file as a dictionary: want to leave this at the default value of 256, but you can use a value of 512 to create double-size, double-resolution tiles for high-density phone screens. - "jpeg options" is an optional dictionary of JPEG creation options, passed - through to PIL: http://www.pythonware.com/library/pil/handbook/format-jpeg.htm. + through to PIL: http://effbot.org/imagingbook/format-jpeg.htm. - "png options" is an optional dictionary of PNG creation options, passed - through to PIL: http://www.pythonware.com/library/pil/handbook/format-png.htm. + through to PIL: http://effbot.org/imagingbook/format-png.htm. The public-facing URL of a single tile for this layer might look like this: @@ -139,7 +139,7 @@ from StringIO import StringIO from urlparse import urljoin from time import time -from Pixels import load_palette, apply_palette +from Pixels import load_palette, apply_palette, apply_palette256 try: from PIL import Image @@ -526,6 +526,10 @@ class Layer: buff = StringIO() bbox = (x, y, x + self.dim, y + self.dim) subtile = surtile.crop(bbox) + if self.palette256: + # this is where we have PIL optimally palette our image + subtile = apply_palette256(subtile) + subtile.save(buff, format) body = buff.getvalue() @@ -617,7 +621,7 @@ class Layer: """ Optional arguments are added to self.jpeg_options for pickup when saving. More information about options: - http://www.pythonware.com/library/pil/handbook/format-jpeg.htm + http://effbot.org/imagingbook/format-jpeg.htm """ if quality is not None: self.jpeg_options['quality'] = int(quality) @@ -628,14 +632,14 @@ class Layer: if progressive is not None: self.jpeg_options['progressive'] = bool(progressive) - def setSaveOptionsPNG(self, optimize=None, palette=None): + def setSaveOptionsPNG(self, optimize=None, palette=None, palette256=None): """ Optional arguments are added to self.png_options for pickup when saving. Palette argument is a URL relative to the configuration file, and it implies bits and optional transparency options. More information about options: - http://www.pythonware.com/library/pil/handbook/format-png.htm + http://effbot.org/imagingbook/format-png.htm """ if optimize is not None: self.png_options['optimize'] = bool(optimize) @@ -649,6 +653,9 @@ class Layer: if t_index is not None: self.png_options['transparency'] = t_index + if palette256 is not None: + self.palette256 = bool(palette256) + class KnownUnknown(Exception): """ There are known unknowns. That is to say, there are things that we now know we don't know. diff --git a/TileStache/Goodies/.___init__.py b/TileStache/Goodies/.___init__.py deleted file mode 100644 index 83e2f11..0000000 Binary files a/TileStache/Goodies/.___init__.py and /dev/null differ diff --git a/TileStache/Goodies/Providers/._MirrorOSM.py b/TileStache/Goodies/Providers/._MirrorOSM.py deleted file mode 100644 index 38798bf..0000000 Binary files a/TileStache/Goodies/Providers/._MirrorOSM.py and /dev/null differ diff --git a/TileStache/Pixels.py b/TileStache/Pixels.py index d17faa0..de7f208 100644 --- a/TileStache/Pixels.py +++ b/TileStache/Pixels.py @@ -108,3 +108,8 @@ def apply_palette(image, palette, t_index): output.putpalette(palette) return output + +def apply_palette256(image): + """ Get PIL to generate and apply an optimum 256 color palette to the given image and return it + """ + return image.convert('RGB').convert('P', palette=Image.ADAPTIVE, colors=256, dither=Image.NONE) diff --git a/TileStache/Sandwich.py b/TileStache/Sandwich.py index c0ac720..ee77f4d 100644 --- a/TileStache/Sandwich.py +++ b/TileStache/Sandwich.py @@ -125,23 +125,35 @@ from urllib import urlopen from . import Core -import Image -import Blit - -blend_modes = { - 'screen': Blit.blends.screen, - 'add': Blit.blends.add, - 'multiply': Blit.blends.multiply, - 'subtract': Blit.blends.subtract, - 'linear light': Blit.blends.linear_light, - 'hard light': Blit.blends.hard_light - } +try: + import Image +except ImportError: + try: + from Pillow import Image + except ImportError: + from PIL import Image + +try: + import Blit + + blend_modes = { + 'screen': Blit.blends.screen, + 'add': Blit.blends.add, + 'multiply': Blit.blends.multiply, + 'subtract': Blit.blends.subtract, + 'linear light': Blit.blends.linear_light, + 'hard light': Blit.blends.hard_light + } -adjustment_names = { - 'threshold': Blit.adjustments.threshold, - 'curves': Blit.adjustments.curves, - 'curves2': Blit.adjustments.curves2 - } + adjustment_names = { + 'threshold': Blit.adjustments.threshold, + 'curves': Blit.adjustments.curves, + 'curves2': Blit.adjustments.curves2 + } + +except ImportError: + # Well, this will not work. + pass class Provider: """ Sandwich Provider. diff --git a/TileStache/VERSION b/TileStache/VERSION new file mode 100644 index 0000000..077f4d0 --- /dev/null +++ b/TileStache/VERSION @@ -0,0 +1 @@ +1.49.9 diff --git a/TileStache/__init__.py b/TileStache/__init__.py index 8191f3a..b1a519b 100644 --- a/TileStache/__init__.py +++ b/TileStache/__init__.py @@ -8,7 +8,9 @@ designers and cartographers. Documentation available at http://tilestache.org/doc/ """ -__version__ = '1.49.8' +import os.path + +__version__ = open(os.path.join(os.path.dirname(__file__), 'VERSION')).read().strip() import re diff --git a/VERSION b/VERSION deleted file mode 100644 index 7e564d1..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.49.8 diff --git a/doc/TileStache.Caches.html b/doc/TileStache.Caches.html index 64a9f3a..693b4e8 100644 --- a/doc/TileStache.Caches.html +++ b/doc/TileStache.Caches.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Caches</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Config.html b/doc/TileStache.Config.html index aeb14c1..aebd19a 100644 --- a/doc/TileStache.Config.html +++ b/doc/TileStache.Config.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Config</title> </head><body bgcolor="#f0f0f8"> @@ -210,6 +210,6 @@ Equivalent soon-to-be-deprecated classpath: "Module.Submodule.Cla <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>modules</strong> = {'ConfigParser': <module 'ConfigParser' from '/System/Library/Fra...ork/Versions/2.6/lib/python2.6/ConfigParser.pyc'>, 'FixTk': <module 'FixTk' from '/System/Library/Frameworks...ork/Versions/2.6/lib/python2.6/lib-tk/FixTk.pyc'>, 'Image': <module 'Image' from '/usr/local/lib/python2.6/site-packages/PIL/Image.pyc'>, 'ImageColor': <module 'ImageColor' from '/usr/local/lib/python2.6/site-packages/PIL/ImageColor.pyc'>, 'Imag [...] -<strong>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> +<td width="100%"><strong>modules</strong> = {'FixTk': <module 'FixTk' from '/System/Library/Frameworks...ork/Versions/2.7/lib/python2.7/lib-tk/FixTk.pyc'>, 'ModestMaps': <module 'ModestMaps' from '/Users/migurski/Sites...python2.7/site-packages/ModestMaps/__init__.pyc'>, 'ModestMaps.BlueMarble': <module 'ModestMaps.BlueMarble' from '/Users/mig...thon2.7/site-packages/ModestMaps/BlueMarble.pyc'>, 'ModestMaps.CloudMade': <module 'ModestMaps.CloudMade' from '/Users/migu [...] +<strong>stderr</strong> = <open file '<stderr>', mode 'w'></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/TileStache.Core.html b/doc/TileStache.Core.html index 4d0f7a9..717d982 100644 --- a/doc/TileStache.Core.html +++ b/doc/TileStache.Core.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Core</title> </head><body bgcolor="#f0f0f8"> @@ -81,9 +81,9 @@ configuration file as a dictionary:<br> want to leave this at the default value of 256, but you can use a value of 512<br> to create double-size, double-resolution tiles for high-density phone screens.<br> - "jpeg options" is an optional dictionary of JPEG creation options, passed<br> - through to PIL: <a href="http://www.pythonware.com/library/pil/handbook/format-jpeg.htm">http://www.pythonware.com/library/pil/handbook/format-jpeg.htm</a>.<br> + through to PIL: <a href="http://effbot.org/imagingbook/format-jpeg.htm">http://effbot.org/imagingbook/format-jpeg.htm</a>.<br> - "png options" is an optional dictionary of PNG creation options, passed<br> - through to PIL: <a href="http://www.pythonware.com/library/pil/handbook/format-png.htm">http://www.pythonware.com/library/pil/handbook/format-png.htm</a>.<br> + through to PIL: <a href="http://effbot.org/imagingbook/format-png.htm">http://effbot.org/imagingbook/format-png.htm</a>.<br> <br> The public-facing URL of a single tile for this layer might look like this:<br> <br> @@ -194,11 +194,11 @@ Data descriptors defined here:<br> </dl> <hr> Methods inherited from <a href="exceptions.html#Exception">exceptions.Exception</a>:<br> -<dl><dt><a name="KnownUnknown-__init__"><strong>__init__</strong></a>(...)</dt><dd><tt>x.<a href="#KnownUnknown-__init__">__init__</a>(...) initializes x; see x.__class__.__doc__ for signature</tt></dd></dl> +<dl><dt><a name="KnownUnknown-__init__"><strong>__init__</strong></a>(...)</dt><dd><tt>x.<a href="#KnownUnknown-__init__">__init__</a>(...) initializes x; see help(type(x)) for signature</tt></dd></dl> <hr> Data and other attributes inherited from <a href="exceptions.html#Exception">exceptions.Exception</a>:<br> -<dl><dt><strong>__new__</strong> = <built-in method __new__ of type object at 0x100119f80><dd><tt>T.<a href="#KnownUnknown-__new__">__new__</a>(S, ...) -> a new object with type S, a subtype of T</tt></dl> +<dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#KnownUnknown-__new__">__new__</a>(S, ...) -> a new object with type S, a subtype of T</tt></dl> <hr> Methods inherited from <a href="exceptions.html#BaseException">exceptions.BaseException</a>:<br> @@ -296,7 +296,7 @@ Optional attributes:<br> if the rendered image is not this height.<br> </tt></td></tr> <tr><td> </td> <td width="100%">Methods defined here:<br> -<dl><dt><a name="Layer-__init__"><strong>__init__</strong></a>(self, config, projection, metatile, stale_lock_timeout<font color="#909090">=15</font>, cache_lifespan<font color="#909090">=None</font>, write_cache<font color="#909090">=True</font>, allowed_origin<font color="#909090">=None</font>, max_cache_age<font color="#909090">=None</font>, redirects<font color="#909090">=None</font>, preview_lat<font color="#909090">=37.799999999999997</font>, preview_lon<font color="#909090">=-122. [...] +<dl><dt><a name="Layer-__init__"><strong>__init__</strong></a>(self, config, projection, metatile, stale_lock_timeout<font color="#909090">=15</font>, cache_lifespan<font color="#909090">=None</font>, write_cache<font color="#909090">=True</font>, allowed_origin<font color="#909090">=None</font>, max_cache_age<font color="#909090">=None</font>, redirects<font color="#909090">=None</font>, preview_lat<font color="#909090">=37.8</font>, preview_lon<font color="#909090">=-122.26</font>, pre [...] <dl><dt><a name="Layer-doMetatile"><strong>doMetatile</strong></a>(self)</dt><dd><tt>Return True if we have a real metatile and the provider is OK with it.</tt></dd></dl> @@ -336,15 +336,15 @@ are mutually exclusive options</tt></dd></dl> <dl><dt><a name="Layer-setSaveOptionsJPEG"><strong>setSaveOptionsJPEG</strong></a>(self, quality<font color="#909090">=None</font>, optimize<font color="#909090">=None</font>, progressive<font color="#909090">=None</font>)</dt><dd><tt>Optional arguments are added to self.<strong>jpeg_options</strong> for pickup when saving.<br> <br> More information about options:<br> - <a href="http://www.pythonware.com/library/pil/handbook/format-jpeg.htm">http://www.pythonware.com/library/pil/handbook/format-jpeg.htm</a></tt></dd></dl> + <a href="http://effbot.org/imagingbook/format-jpeg.htm">http://effbot.org/imagingbook/format-jpeg.htm</a></tt></dd></dl> -<dl><dt><a name="Layer-setSaveOptionsPNG"><strong>setSaveOptionsPNG</strong></a>(self, optimize<font color="#909090">=None</font>, palette<font color="#909090">=None</font>)</dt><dd><tt>Optional arguments are added to self.<strong>png_options</strong> for pickup when saving.<br> +<dl><dt><a name="Layer-setSaveOptionsPNG"><strong>setSaveOptionsPNG</strong></a>(self, optimize<font color="#909090">=None</font>, palette<font color="#909090">=None</font>, palette256<font color="#909090">=None</font>)</dt><dd><tt>Optional arguments are added to self.<strong>png_options</strong> for pickup when saving.<br> <br> Palette argument is a URL relative to the configuration file,<br> and it implies bits and optional transparency options.<br> <br> More information about options:<br> - <a href="http://www.pythonware.com/library/pil/handbook/format-png.htm">http://www.pythonware.com/library/pil/handbook/format-png.htm</a></tt></dd></dl> + <a href="http://effbot.org/imagingbook/format-png.htm">http://effbot.org/imagingbook/format-png.htm</a></tt></dd></dl> </td></tr></table> <p> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> @@ -412,7 +412,7 @@ Data descriptors defined here:<br> </dl> <hr> Data and other attributes inherited from <a href="exceptions.html#Exception">exceptions.Exception</a>:<br> -<dl><dt><strong>__new__</strong> = <built-in method __new__ of type object at 0x100119f80><dd><tt>T.<a href="#NoTileLeftBehind-__new__">__new__</a>(S, ...) -> a new object with type S, a subtype of T</tt></dl> +<dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#NoTileLeftBehind-__new__">__new__</a>(S, ...) -> a new object with type S, a subtype of T</tt></dl> <hr> Methods inherited from <a href="exceptions.html#BaseException">exceptions.BaseException</a>:<br> @@ -477,7 +477,7 @@ Data descriptors defined here:<br> </dl> <hr> Data and other attributes inherited from <a href="exceptions.html#Exception">exceptions.Exception</a>:<br> -<dl><dt><strong>__new__</strong> = <built-in method __new__ of type object at 0x100119f80><dd><tt>T.<a href="#TheTileLeftANote-__new__">__new__</a>(S, ...) -> a new object with type S, a subtype of T</tt></dl> +<dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#TheTileLeftANote-__new__">__new__</a>(S, ...) -> a new object with type S, a subtype of T</tt></dl> <hr> Methods inherited from <a href="exceptions.html#BaseException">exceptions.BaseException</a>:<br> diff --git a/doc/TileStache.Geography.html b/doc/TileStache.Geography.html index 3a83b47..36872b1 100644 --- a/doc/TileStache.Geography.html +++ b/doc/TileStache.Geography.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Geography</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.AreaServer.html b/doc/TileStache.Goodies.AreaServer.html index 00a421f..9ed744b 100644 --- a/doc/TileStache.Goodies.AreaServer.html +++ b/doc/TileStache.Goodies.AreaServer.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.AreaServer</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.Caches.GoogleCloud.html b/doc/TileStache.Goodies.Caches.GoogleCloud.html index 7ff7e2a..e33a8b9 100644 --- a/doc/TileStache.Goodies.Caches.GoogleCloud.html +++ b/doc/TileStache.Goodies.Caches.GoogleCloud.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Caches.GoogleCloud</title> </head><body bgcolor="#f0f0f8"> @@ -37,14 +37,6 @@ cache parameters:<br> Required secret access key for your GS account.</tt></p> <p> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> -<tr bgcolor="#aa55cc"> -<td colspan=3 valign=bottom> <br> -<font color="#ffffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr> - -<tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td> -<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="boto.html">boto</a><br> -</td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p> -<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ee77aa"> <td colspan=3 valign=bottom> <br> <font color="#ffffff" face="helvetica, arial"><big><strong>Classes</strong></big></font></td></tr> diff --git a/doc/TileStache.Goodies.Caches.LimitedDisk.html b/doc/TileStache.Goodies.Caches.LimitedDisk.html index 05d4e06..17c9de9 100644 --- a/doc/TileStache.Goodies.Caches.LimitedDisk.html +++ b/doc/TileStache.Goodies.Caches.LimitedDisk.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Caches.LimitedDisk</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.Caches.html b/doc/TileStache.Goodies.Caches.html index 618dd77..b6f7d74 100644 --- a/doc/TileStache.Goodies.Caches.html +++ b/doc/TileStache.Goodies.Caches.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: package TileStache.Goodies.Caches</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.ExternalConfigServer.html b/doc/TileStache.Goodies.ExternalConfigServer.html index 2e71b00..218e347 100644 --- a/doc/TileStache.Goodies.ExternalConfigServer.html +++ b/doc/TileStache.Goodies.ExternalConfigServer.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.ExternalConfigServer</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.Proj4Projection.html b/doc/TileStache.Goodies.Proj4Projection.html index bbf45b3..11fd8ca 100644 --- a/doc/TileStache.Goodies.Proj4Projection.html +++ b/doc/TileStache.Goodies.Proj4Projection.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Proj4Projection</title> </head><body bgcolor="#f0f0f8"> @@ -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 0x106434368></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></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-coordinateLocation"><strong>coordinateLocation</strong></a>(self, coord)</dt><dd><tt>TODO: write me.</tt></dd></dl> diff --git a/doc/TileStache.Goodies.Providers.Cascadenik.html b/doc/TileStache.Goodies.Providers.Cascadenik.html index 22b2489..426df6d 100644 --- a/doc/TileStache.Goodies.Providers.Cascadenik.html +++ b/doc/TileStache.Goodies.Providers.Cascadenik.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.Cascadenik</title> </head><body bgcolor="#f0f0f8"> @@ -20,14 +20,6 @@ More information on Cascadenik:<br> Requires Cascadenik 2.x+.</tt></p> <p> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> -<tr bgcolor="#aa55cc"> -<td colspan=3 valign=bottom> <br> -<font color="#ffffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr> - -<tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td> -<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="mapnik.html">mapnik</a><br> -</td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p> -<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ee77aa"> <td colspan=3 valign=bottom> <br> <font color="#ffffff" face="helvetica, arial"><big><strong>Classes</strong></big></font></td></tr> diff --git a/doc/TileStache.Goodies.Providers.Composite.html b/doc/TileStache.Goodies.Providers.Composite.html index c6b0587..e46e51d 100644 --- a/doc/TileStache.Goodies.Providers.Composite.html +++ b/doc/TileStache.Goodies.Providers.Composite.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.Composite</title> </head><body bgcolor="#f0f0f8"> @@ -167,8 +167,7 @@ This complete example can be found in the&nbs <a href="TileStache.html">TileStache</a><br> </td><td width="25%" valign=top><a href="numpy.html">numpy</a><br> <a href="re.html">re</a><br> -</td><td width="25%" valign=top><a href="sympy.html">sympy</a><br> -<a href="sys.html">sys</a><br> +</td><td width="25%" valign=top><a href="sys.html">sys</a><br> </td><td width="25%" valign=top></td></tr></table></td></tr></table><p> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ee77aa"> diff --git a/doc/TileStache.Goodies.Providers.GDAL.html b/doc/TileStache.Goodies.Providers.GDAL.html index c49ffe2..d599974 100644 --- a/doc/TileStache.Goodies.Providers.GDAL.html +++ b/doc/TileStache.Goodies.Providers.GDAL.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.GDAL</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.Providers.Grid.html b/doc/TileStache.Goodies.Providers.Grid.html index c75b299..1ac4a7b 100644 --- a/doc/TileStache.Goodies.Providers.Grid.html +++ b/doc/TileStache.Goodies.Providers.Grid.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.Grid</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.Providers.MapnikGrid.html b/doc/TileStache.Goodies.Providers.MapnikGrid.html index 0592994..ff762ad 100644 --- a/doc/TileStache.Goodies.Providers.MapnikGrid.html +++ b/doc/TileStache.Goodies.Providers.MapnikGrid.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.MapnikGrid</title> </head><body bgcolor="#f0f0f8"> @@ -48,8 +48,7 @@ buffer: buffer around the queried features, in&nbs <tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td> <td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="json.html">json</a><br> -</td><td width="25%" valign=top><a href="mapnik.html">mapnik</a><br> -</td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p> +</td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ee77aa"> <td colspan=3 valign=bottom> <br> diff --git a/doc/TileStache.Goodies.Providers.MirrorOSM.html b/doc/TileStache.Goodies.Providers.MirrorOSM.html index 9faff38..f0b4c84 100644 --- a/doc/TileStache.Goodies.Providers.MirrorOSM.html +++ b/doc/TileStache.Goodies.Providers.MirrorOSM.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.MirrorOSM</title> </head><body bgcolor="#f0f0f8"> @@ -161,5 +161,5 @@ Write a string to a file descriptor.</tt></dd></dl <tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td> <td width="100%"><strong>PIPE</strong> = -1<br> -<strong>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> +<strong>stderr</strong> = <open file '<stderr>', mode 'w'></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/TileStache.Goodies.Providers.Monkeycache.html b/doc/TileStache.Goodies.Providers.Monkeycache.html index fbad260..80d0969 100644 --- a/doc/TileStache.Goodies.Providers.Monkeycache.html +++ b/doc/TileStache.Goodies.Providers.Monkeycache.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.Monkeycache</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.Providers.PostGeoJSON.html b/doc/TileStache.Goodies.Providers.PostGeoJSON.html index c938895..d9b9ad9 100644 --- a/doc/TileStache.Goodies.Providers.PostGeoJSON.html +++ b/doc/TileStache.Goodies.Providers.PostGeoJSON.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.PostGeoJSON</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.Providers.SolrGeoJSON.html b/doc/TileStache.Goodies.Providers.SolrGeoJSON.html index 268e62a..7e62893 100644 --- a/doc/TileStache.Goodies.Providers.SolrGeoJSON.html +++ b/doc/TileStache.Goodies.Providers.SolrGeoJSON.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.SolrGeoJSON</title> </head><body bgcolor="#f0f0f8"> @@ -118,9 +118,11 @@ TileStache.getTile() expects to be able to save&nb <td width="100%"><dl><dt><a name="-atan"><strong>atan</strong></a>(...)</dt><dd><tt><a href="#-atan">atan</a>(x)<br> <br> Return the arc tangent (measured in radians) of x.</tt></dd></dl> - <dl><dt><a name="-log"><strong>log</strong></a>(...)</dt><dd><tt><a href="#-log">log</a>(x[, base]) -> the logarithm of x to the given base.<br> + <dl><dt><a name="-log"><strong>log</strong></a>(...)</dt><dd><tt><a href="#-log">log</a>(x[, base])<br> + <br> +Return the logarithm of x to the given base.<br> If the base not specified, returns the natural logarithm (base e) of x.</tt></dd></dl> - <dl><dt><a name="-pow"><strong>pow</strong></a>(...)</dt><dd><tt><a href="#-pow">pow</a>(x,y)<br> + <dl><dt><a name="-pow"><strong>pow</strong></a>(...)</dt><dd><tt><a href="#-pow">pow</a>(x, y)<br> <br> Return x**y (x to the power of y).</tt></dd></dl> <dl><dt><a name="-tan"><strong>tan</strong></a>(...)</dt><dd><tt><a href="#-tan">tan</a>(x)<br> @@ -133,6 +135,6 @@ Return the tangent of x (measured in radians) <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>e</strong> = 2.7182818284590451<br> -<strong>pi</strong> = 3.1415926535897931</td></tr></table> +<td width="100%"><strong>e</strong> = 2.718281828459045<br> +<strong>pi</strong> = 3.141592653589793</td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/TileStache.Goodies.Providers.TileDataOSM.html b/doc/TileStache.Goodies.Providers.TileDataOSM.html index c57774c..466df0f 100644 --- a/doc/TileStache.Goodies.Providers.TileDataOSM.html +++ b/doc/TileStache.Goodies.Providers.TileDataOSM.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.TileDataOSM</title> </head><body bgcolor="#f0f0f8"> @@ -113,5 +113,5 @@ is not present, current time as returned by&n <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>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> +<td width="100%"><strong>stderr</strong> = <open file '<stderr>', mode 'w'></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/TileStache.Goodies.Providers.UtfGridComposite.html b/doc/TileStache.Goodies.Providers.UtfGridComposite.html index 3b86e4a..e8cd6b9 100644 --- a/doc/TileStache.Goodies.Providers.UtfGridComposite.html +++ b/doc/TileStache.Goodies.Providers.UtfGridComposite.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.UtfGridComposite</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.Providers.UtfGridCompositeOverlap.html b/doc/TileStache.Goodies.Providers.UtfGridCompositeOverlap.html index 0bba674..43df38b 100644 --- a/doc/TileStache.Goodies.Providers.UtfGridCompositeOverlap.html +++ b/doc/TileStache.Goodies.Providers.UtfGridCompositeOverlap.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.Providers.UtfGridCompositeOverlap</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.Providers.html b/doc/TileStache.Goodies.Providers.html index 77cf39e..6dc54cd 100644 --- a/doc/TileStache.Goodies.Providers.html +++ b/doc/TileStache.Goodies.Providers.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: package TileStache.Goodies.Providers</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.StatusServer.html b/doc/TileStache.Goodies.StatusServer.html index eb08fa6..259d785 100644 --- a/doc/TileStache.Goodies.StatusServer.html +++ b/doc/TileStache.Goodies.StatusServer.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.StatusServer</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.VecTiles.client.html b/doc/TileStache.Goodies.VecTiles.client.html index 1e70a81..e76b644 100644 --- a/doc/TileStache.Goodies.VecTiles.client.html +++ b/doc/TileStache.Goodies.VecTiles.client.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.VecTiles.client</title> </head><body bgcolor="#f0f0f8"> @@ -58,7 +58,7 @@ See also:<br> <tr><td bgcolor="#ee77aa"><tt> </tt></td><td> </td> <td width="100%"><dl> -<dt><font face="helvetica, arial"><a href="mapnik.html#PythonDatasource">mapnik.PythonDatasource</a>(<a href="__builtin__.html#object">__builtin__.object</a>) +<dt><font face="helvetica, arial"><a href="__builtin__.html#object">__builtin__.object</a> </font></dt><dd> <dl> <dt><font face="helvetica, arial"><a href="TileStache.Goodies.VecTiles.client.html#Datasource">Datasource</a> @@ -69,7 +69,7 @@ See also:<br> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ffc8d8"> <td colspan=3 valign=bottom> <br> -<font color="#000000" face="helvetica, arial"><a name="Datasource">class <strong>Datasource</strong></a>(<a href="mapnik.html#PythonDatasource">mapnik.PythonDatasource</a>)</font></td></tr> +<font color="#000000" face="helvetica, arial"><a name="Datasource">class <strong>Datasource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr> <tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td> <td colspan=2><tt>Mapnik datasource to read tiled vector data in GeoJSON or MVT formats.<br> @@ -86,13 +86,7 @@ Sample usage in Mapnik configuration XML:<br> </<a href="#Datasource">Datasource</a>><br> </Layer><br> </tt></td></tr> <tr><td> </td> -<td width="100%"><dl><dt>Method resolution order:</dt> -<dd><a href="TileStache.Goodies.VecTiles.client.html#Datasource">Datasource</a></dd> -<dd><a href="mapnik.html#PythonDatasource">mapnik.PythonDatasource</a></dd> -<dd><a href="__builtin__.html#object">__builtin__.object</a></dd> -</dl> -<hr> -Methods defined here:<br> +<td width="100%">Methods defined here:<br> <dl><dt><a name="Datasource-__init__"><strong>__init__</strong></a>(self, template, sort_key<font color="#909090">=None</font>, clipped<font color="#909090">='true'</font>, zoom_data<font color="#909090">='single'</font>)</dt><dd><tt>Make a new <a href="#Datasource">Datasource</a>.<br> <br> Parameters:<br> @@ -130,47 +124,7 @@ Parameters:<br> <dl><dt><a name="Datasource-features"><strong>features</strong></a>(self, query)</dt></dl> <hr> -Methods inherited from <a href="mapnik.html#PythonDatasource">mapnik.PythonDatasource</a>:<br> -<dl><dt><a name="Datasource-features_at_point"><strong>features_at_point</strong></a>(self, point)</dt><dd><tt>Rarely uses. Return an iterable which yields instances of Feature for the specified point.</tt></dd></dl> - -<hr> -Class methods inherited from <a href="mapnik.html#PythonDatasource">mapnik.PythonDatasource</a>:<br> -<dl><dt><a name="Datasource-wkb_features"><strong>wkb_features</strong></a>(cls, keys, features)<font color="#909090"><font face="helvetica, arial"> from <a href="__builtin__.html#type">__builtin__.type</a></font></font></dt><dd><tt>A convenience function to wrap an iterator yielding pairs of WKB format geometry and dictionaries of<br> -key-value pairs into mapnik features. Return this from <a href="mapnik.html#PythonDatasource">PythonDatasource</a>.<a href="#Datasource-features">features</a>() passing it a sequence of keys<br> -to appear in the output and an iterator yielding features.<br> - <br> -For example. One might have a <a href="#Datasource-features">features</a>() method in a derived class like the following:<br> - <br> -def <a href="#Datasource-features">features</a>(self, query):<br> - # ... create WKB features feat1 and feat2<br> - <br> - return mapnik.<a href="mapnik.html#PythonDatasource">PythonDatasource</a>.<a href="#Datasource-wkb_features">wkb_features</a>(<br> - keys = ( 'name', 'author' ),<br> - features = [<br> - (feat1, { 'name': 'feat1', 'author': 'alice' }),<br> - (feat2, { 'name': 'feat2', 'author': 'bob' }),<br> - ]<br> - )</tt></dd></dl> - -<dl><dt><a name="Datasource-wkt_features"><strong>wkt_features</strong></a>(cls, keys, features)<font color="#909090"><font face="helvetica, arial"> from <a href="__builtin__.html#type">__builtin__.type</a></font></font></dt><dd><tt>A convenience function to wrap an iterator yielding pairs of WKT format geometry and dictionaries of<br> -key-value pairs into mapnik features. Return this from <a href="mapnik.html#PythonDatasource">PythonDatasource</a>.<a href="#Datasource-features">features</a>() passing it a sequence of keys<br> -to appear in the output and an iterator yielding features.<br> - <br> -For example. One might have a <a href="#Datasource-features">features</a>() method in a derived class like the following:<br> - <br> -def <a href="#Datasource-features">features</a>(self, query):<br> - # ... create WKT features feat1 and feat2<br> - <br> - return mapnik.<a href="mapnik.html#PythonDatasource">PythonDatasource</a>.<a href="#Datasource-wkt_features">wkt_features</a>(<br> - keys = ( 'name', 'author' ),<br> - features = [<br> - (feat1, { 'name': 'feat1', 'author': 'alice' }),<br> - (feat2, { 'name': 'feat2', 'author': 'bob' }),<br> - ]<br> - )</tt></dd></dl> - -<hr> -Data descriptors inherited from <a href="mapnik.html#PythonDatasource">mapnik.PythonDatasource</a>:<br> +Data descriptors defined here:<br> <dl><dt><strong>__dict__</strong></dt> <dd><tt>dictionary for instance variables (if defined)</tt></dd> </dl> @@ -184,7 +138,7 @@ Data descriptors inherited from <a href="mapnik.html#PythonDatasource">mapnik.Py <font color="#ffffff" face="helvetica, arial"><big><strong>Functions</strong></big></font></td></tr> <tr><td bgcolor="#eeaa77"><tt> </tt></td><td> </td> -<td width="100%"><dl><dt><a name="-list_tiles"><strong>list_tiles</strong></a>(query, zoom_adjust)</dt><dd><tt>Return a list of tiles (z, x, y) dicts for a mapnik Query object.<br> +<td width="100%"><dl><dt><a name="-list_tiles"><strong>list_tiles</strong></a>(query, zoom_adjust)</dt><dd><tt>Return a list of tiles (z, x, y) dicts for a mapnik Query <a href="__builtin__.html#object">object</a>.<br> <br> Query is assumed to be in spherical mercator projection.<br> Zoom_adjust is an integer delta to subtract from the calculated zoom.</tt></dd></dl> @@ -207,7 +161,7 @@ but Mapnik is ultra-whiny about these and rej <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>diameter</strong> = 40075016.685578488<br> -<strong>meter_zoom</strong> = 17.256199785269999<br> -<strong>pi</strong> = 3.1415926535897931</td></tr></table> +<td width="100%"><strong>diameter</strong> = 40075016.68557849<br> +<strong>meter_zoom</strong> = 17.25619978527<br> +<strong>pi</strong> = 3.141592653589793</td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/TileStache.Goodies.VecTiles.geojson.html b/doc/TileStache.Goodies.VecTiles.geojson.html index ca80fda..48fda0d 100644 --- a/doc/TileStache.Goodies.VecTiles.geojson.html +++ b/doc/TileStache.Goodies.VecTiles.geojson.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.VecTiles.geojson</title> </head><body bgcolor="#f0f0f8"> @@ -42,7 +42,9 @@ Floating point precision in the output is tru <br> Check integrity and compatibility of each, looking at known layers,<br> correct JSON mime-types and "FeatureCollection" in the type attributes.</tt></dd></dl> - <dl><dt><a name="-log"><strong>log</strong></a>(...)</dt><dd><tt><a href="#-log">log</a>(x[, base]) -> the logarithm of x to the given base.<br> + <dl><dt><a name="-log"><strong>log</strong></a>(...)</dt><dd><tt><a href="#-log">log</a>(x[, base])<br> + <br> +Return the logarithm of x to the given base.<br> If the base not specified, returns the natural logarithm (base e) of x.</tt></dd></dl> <dl><dt><a name="-mercator"><strong>mercator</strong></a>((x, y))</dt><dd><tt>Project an (x, y) tuple to spherical mercator.</tt></dd></dl> <dl><dt><a name="-merge"><strong>merge</strong></a>(file, names, config, coord)</dt><dd><tt>Retrieve a list of GeoJSON tile responses and merge them into one.<br> @@ -58,9 +60,9 @@ Return the tangent of x (measured in radians) <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>charfloat_pat</strong> = <_sre.SRE_Pattern object at 0x10732e3f0><br> -<strong>float_pat</strong> = <_sre.SRE_Pattern object at 0x1064142d0><br> -<strong>pi</strong> = 3.1415926535897931<br> +<td width="100%"><strong>charfloat_pat</strong> = <_sre.SRE_Pattern object><br> +<strong>float_pat</strong> = <_sre.SRE_Pattern object><br> +<strong>pi</strong> = 3.141592653589793<br> <strong>precisions</strong> = [2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 7, 7, 7, ...]<br> <strong>zoom</strong> = 22</td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/TileStache.Goodies.VecTiles.html b/doc/TileStache.Goodies.VecTiles.html index f931213..c476c78 100644 --- a/doc/TileStache.Goodies.VecTiles.html +++ b/doc/TileStache.Goodies.VecTiles.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: package TileStache.Goodies.VecTiles</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.VecTiles.mvt.html b/doc/TileStache.Goodies.VecTiles.mvt.html index 9131ec3..3a82f3c 100644 --- a/doc/TileStache.Goodies.VecTiles.mvt.html +++ b/doc/TileStache.Goodies.VecTiles.mvt.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.VecTiles.mvt</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.VecTiles.ops.html b/doc/TileStache.Goodies.VecTiles.ops.html index b912220..a9636d8 100644 --- a/doc/TileStache.Goodies.VecTiles.ops.html +++ b/doc/TileStache.Goodies.VecTiles.ops.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.VecTiles.ops</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.VecTiles.server.html b/doc/TileStache.Goodies.VecTiles.server.html index 7e276fe..9f1199f 100644 --- a/doc/TileStache.Goodies.VecTiles.server.html +++ b/doc/TileStache.Goodies.VecTiles.server.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.VecTiles.server</title> </head><body bgcolor="#f0f0f8"> @@ -237,7 +237,7 @@ bounds argument is a 4-tuple with (xmin, ymin <tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td> <td width="100%"><strong>err</strong> = ImportError('No module named psycopg2.extras',)<br> -<strong>pi</strong> = 3.1415926535897931<br> -<strong>tolerances</strong> = [156543.03392804097, 78271.516964020484, 39135.758482010242, 19567.879241005121, 9783.9396205025605, 4891.9698102512803, 2445.9849051256401, 1222.9924525628201, 611.49622628141003, 305.74811314070502, 152.87405657035251, 76.437028285176254, 38.218514142588127, 19.109257071294063, 9.5546285356470317, 4.7773142678235159, 2.3886571339117579, 1.194328566955879, 0.59716428347793948, 0.29858214173896974]<br> +<strong>pi</strong> = 3.141592653589793<br> +<strong>tolerances</strong> = [156543.03392804097, 78271.51696402048, 39135.75848201024, 19567.87924100512, 9783.93962050256, 4891.96981025128, 2445.98490512564, 1222.99245256282, 611.49622628141, 305.748113140705, 152.8740565703525, 76.43702828517625, 38.21851414258813, 19.109257071294063, 9.554628535647032, 4.777314267823516, 2.388657133911758, 1.194328566955879, 0.5971642834779395, 0.29858214173896974]<br> <strong>zoom</strong> = 19</td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/TileStache.Goodies.VecTiles.topojson.html b/doc/TileStache.Goodies.VecTiles.topojson.html index 7bafba1..192b475 100644 --- a/doc/TileStache.Goodies.VecTiles.topojson.html +++ b/doc/TileStache.Goodies.VecTiles.topojson.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.VecTiles.topojson</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.VecTiles.wkb.html b/doc/TileStache.Goodies.VecTiles.wkb.html index 04f1d24..7fe761d 100644 --- a/doc/TileStache.Goodies.VecTiles.wkb.html +++ b/doc/TileStache.Goodies.VecTiles.wkb.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Goodies.VecTiles.wkb</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Goodies.html b/doc/TileStache.Goodies.html index c5e8dde..57cdd10 100644 --- a/doc/TileStache.Goodies.html +++ b/doc/TileStache.Goodies.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: package TileStache.Goodies</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.MBTiles.html b/doc/TileStache.MBTiles.html index ca563d0..a789fb2 100644 --- a/doc/TileStache.MBTiles.html +++ b/doc/TileStache.MBTiles.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.MBTiles</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Mapnik.html b/doc/TileStache.Mapnik.html index d4c3cf2..7449a41 100644 --- a/doc/TileStache.Mapnik.html +++ b/doc/TileStache.Mapnik.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Mapnik</title> </head><body bgcolor="#f0f0f8"> @@ -22,11 +22,10 @@ Mapnik 2.0.0 and above.</tt></p> <tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td> <td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="PIL.Image.html">PIL.Image</a><br> -<a href="json.html">json</a><br> +</td><td width="25%" valign=top><a href="json.html">json</a><br> </td><td width="25%" valign=top><a href="logging.html">logging</a><br> -<a href="mapnik.html">mapnik</a><br> </td><td width="25%" valign=top><a href="os.html">os</a><br> -</td><td width="25%" valign=top></td></tr></table></td></tr></table><p> +</td></tr></table></td></tr></table><p> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ee77aa"> <td colspan=3 valign=bottom> <br> @@ -186,7 +185,7 @@ TileStache.getTile() expects to be able to save&nb <td width="100%"><dl><dt><a name="-allocate_lock"><strong>allocate_lock</strong></a>(...)</dt><dd><tt><a href="#-allocate_lock">allocate_lock</a>() -> lock object<br> (allocate() is an obsolete synonym)<br> <br> -Create a new lock object. See LockType.__doc__ for information about locks.</tt></dd></dl> +Create a new lock object. See help(LockType) for information about locks.</tt></dd></dl> <dl><dt><a name="-decode_char"><strong>decode_char</strong></a>(char)</dt></dl> <dl><dt><a name="-encode_id"><strong>encode_id</strong></a>(id)</dt></dl> <dl><dt><a name="-get_mapnikMap"><strong>get_mapnikMap</strong></a>(mapfile)</dt><dd><tt>Get a new mapnik.Map instance for a mapfile</tt></dd></dl> @@ -202,5 +201,5 @@ Fractions of a second may be present if <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>global_mapnik_lock</strong> = <thread.lock object at 0x1004b3228></td></tr></table> +<td width="100%"><strong>global_mapnik_lock</strong> = <thread.lock object></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/TileStache.Memcache.html b/doc/TileStache.Memcache.html index c22727f..568fb8b 100644 --- a/doc/TileStache.Memcache.html +++ b/doc/TileStache.Memcache.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Memcache</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Pixels.html b/doc/TileStache.Pixels.html index f11c0d6..9c56dba 100644 --- a/doc/TileStache.Pixels.html +++ b/doc/TileStache.Pixels.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Pixels</title> </head><body bgcolor="#f0f0f8"> @@ -48,6 +48,7 @@ in the lookup table. If the final byte i <tr><td bgcolor="#eeaa77"><tt> </tt></td><td> </td> <td width="100%"><dl><dt><a name="-add"><strong>add</strong></a>(...)</dt><dd><tt><a href="#-add">add</a>(a, b) -- Same as a + b.</tt></dd></dl> <dl><dt><a name="-apply_palette"><strong>apply_palette</strong></a>(image, palette, t_index)</dt><dd><tt>Apply a palette array to an image, return a new image.</tt></dd></dl> + <dl><dt><a name="-apply_palette256"><strong>apply_palette256</strong></a>(image)</dt><dd><tt>Get PIL to generate and apply an optimum 256 color palette to the given image and return it</tt></dd></dl> <dl><dt><a name="-ceil"><strong>ceil</strong></a>(...)</dt><dd><tt><a href="#-ceil">ceil</a>(x)<br> <br> Return the ceiling of x as a float.<br> @@ -57,7 +58,9 @@ This is the smallest integral value >= x.< Return tuple is an array of [ (r, g, b), (r, g, b), ... ],<br> bit depth of the palette, and a numeric transparency index<br> or None if not defined.</tt></dd></dl> - <dl><dt><a name="-log"><strong>log</strong></a>(...)</dt><dd><tt><a href="#-log">log</a>(x[, base]) -> the logarithm of x to the given base.<br> + <dl><dt><a name="-log"><strong>log</strong></a>(...)</dt><dd><tt><a href="#-log">log</a>(x[, base])<br> + <br> +Return the logarithm of x to the given base.<br> If the base not specified, returns the natural logarithm (base e) of x.</tt></dd></dl> <dl><dt><a name="-pack"><strong>pack</strong></a>(...)</dt><dd><tt>Return string containing values v1, v2, ... packed according to fmt.</tt></dd></dl> <dl><dt><a name="-palette_color"><strong>palette_color</strong></a>(r, g, b, palette, t_index)</dt><dd><tt>Return best palette match index.<br> diff --git a/doc/TileStache.Providers.html b/doc/TileStache.Providers.html index 7e81fd8..168a443 100644 --- a/doc/TileStache.Providers.html +++ b/doc/TileStache.Providers.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Providers</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Redis.html b/doc/TileStache.Redis.html index f01155d..969b0f1 100644 --- a/doc/TileStache.Redis.html +++ b/doc/TileStache.Redis.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Redis</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.S3.html b/doc/TileStache.S3.html index 5a952ff..c016ce2 100644 --- a/doc/TileStache.S3.html +++ b/doc/TileStache.S3.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.S3</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Sandwich.html b/doc/TileStache.Sandwich.html index 06e25d7..64150fd 100644 --- a/doc/TileStache.Sandwich.html +++ b/doc/TileStache.Sandwich.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Sandwich</title> </head><body bgcolor="#f0f0f8"> @@ -134,10 +134,9 @@ A complete example configuration might look like&n <font color="#ffffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr> <tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td> -<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="Blit.html">Blit</a><br> -</td><td width="25%" valign=top><a href="TileStache.Core.html">TileStache.Core</a><br> -</td><td width="25%" valign=top><a href="Image.html">Image</a><br> -</td><td width="25%" valign=top></td></tr></table></td></tr></table><p> +<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="TileStache.Core.html">TileStache.Core</a><br> +</td><td width="25%" valign=top><a href="PIL.Image.html">PIL.Image</a><br> +</td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#ee77aa"> <td colspan=3 valign=bottom> <br> @@ -198,13 +197,5 @@ Examples:<br> null: "#0000", "#00000000"<br> orange: "#f90", "#ff9900", "#ff9900ff"<br> transparent orange: "#f908", "#ff990088"</tt></dd></dl> -</td></tr></table><p> -<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> -<tr bgcolor="#55aa55"> -<td colspan=3 valign=bottom> <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 0x108343cf8>, 'curves2': <function curves2 at 0x108343d70>, 'threshold': <function threshold at 0x1074a48c0>}<br> -<strong>blend_modes</strong> = {'add': <function add at 0x1074a0e60>, 'hard light': <function hard_light at 0x1074a40c8>, 'linear light': <function linear_light at 0x1074a4050>, 'multiply': <function multiply at 0x1074a0ed8>, 'screen': <function screen at 0x1074a0de8>, 'subtract': <function subtract at 0x1074a0f50>}</td></tr></table> +</td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/TileStache.Vector.Arc.html b/doc/TileStache.Vector.Arc.html index 4e080a0..7627ec6 100644 --- a/doc/TileStache.Vector.Arc.html +++ b/doc/TileStache.Vector.Arc.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module TileStache.Vector.Arc</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.Vector.html b/doc/TileStache.Vector.html index 2d47f94..0b9929d 100644 --- a/doc/TileStache.Vector.html +++ b/doc/TileStache.Vector.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: package TileStache.Vector</title> </head><body bgcolor="#f0f0f8"> diff --git a/doc/TileStache.html b/doc/TileStache.html index 8daeaaa..49a689a 100644 --- a/doc/TileStache.html +++ b/doc/TileStache.html @@ -1,12 +1,12 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: package TileStache</title> </head><body bgcolor="#f0f0f8"> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading"> <tr bgcolor="#7799ee"> <td valign=bottom> <br> -<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong>TileStache</strong></big></big> (version N.N.N)</font></td +<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong>TileStache</strong></big></big> (version 1.49.9)</font></td ><td align=right valign=bottom ><font color="#ffffff" face="helvetica, arial"><a >href=".">index</a></font></td></tr></table> <p><tt>A stylish alternative for caching your map tiles.<br> @@ -190,6 +190,6 @@ Fractions of a second may be present if <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>__version__</strong> = 'N.N.N'<br> -<strong>stdout</strong> = <open file '<stdout>', mode 'w' at 0x1004160b8></td></tr></table> +<td width="100%"><strong>__version__</strong> = '1.49.9'<br> +<strong>stdout</strong> = <open file '<stdout>', mode 'w'></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/index.html b/doc/index.html index 356851f..512c76b 100644 --- a/doc/index.html +++ b/doc/index.html @@ -76,7 +76,7 @@ </p> <p> - <strong>This document covers TileStache version 1.49.8</strong>. + <strong>This document covers TileStache version </strong>. </p> <p> @@ -961,7 +961,7 @@ Shared layer parameters: <dt>jpeg options</dt> <dd> An optional dictionary of JPEG creation options, passed through - <a href="http://www.pythonware.com/library/pil/handbook/format-jpeg.htm">to PIL</a>. + <a href="http://effbot.org/imagingbook/format-jpeg.htm">to PIL</a>. Valid options include <var>quality</var> (integer), <var>progressive</var> (boolean), and <var>optimize</var> (boolean). </dd> @@ -969,9 +969,9 @@ Shared layer parameters: <dt>png options</dt> <dd> An optional dictionary of PNG creation options, passed through - <a href="http://www.pythonware.com/library/pil/handbook/format-png.htm">to PIL</a>. - Valid options include <var>palette</var> (URL or filename) and - <var>optimize</var> (boolean). + <a href="http://effbot.org/imagingbook/format-png.htm">to PIL</a>. + Valid options include <var>palette</var> (URL or filename), <var>palette256</var> + (boolean) and <var>optimize</var> (boolean). </dd> </dl> @@ -1958,7 +1958,7 @@ Arguments to <code>renderTile</code>: <p> Return value of <code>renderTile</code> is a -<a href="http://www.pythonware.com/library/pil/handbook/image.htm#Image.save"><code>PIL.Image</code></a> +<a href="http://effbot.org/imagingbook/image.htm#Image.save"><code>PIL.Image</code></a> or other saveable object, used like this: </p> @@ -2030,7 +2030,7 @@ Arguments to <code>renderArea</code>: <p> Return value of <code>renderArea</code> is a -<a href="http://www.pythonware.com/library/pil/handbook/image.htm#Image.save"><code>PIL.Image</code></a> +<a href="http://effbot.org/imagingbook/image.htm#Image.save"><code>PIL.Image</code></a> or other saveable object, used like this: </p> diff --git a/doc/tilestache-clean.html b/doc/tilestache-clean.html index 87f6858..a81c525 100644 --- a/doc/tilestache-clean.html +++ b/doc/tilestache-clean.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module tilestache-clean</title> </head><body bgcolor="#f0f0f8"> @@ -37,8 +37,8 @@ Read coordinates from a file with one Z/X/Y&n <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>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 0x100585a28><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.9/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. [...] -<strong>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> +<td width="100%"><strong>defaults</strong> = {'bbox': (37.777, -122.352, 37.839, -122.226), 'extension': 'png', 'padding': 0, 'verbose': True}<br> +<strong>parser</strong> = <optparse.OptionParser instance><br> +<strong>path</strong> = ['', '/Library/Frameworks/SQLite3.framework/Versions/B/Python/2.7', '/Library/Frameworks/GEOS.framework/Versions/3/Python/2.7', '/Library/Python/2.7/site-packages/numpy-override', '/Library/Frameworks/GDAL.framework/Versions/1.10/Python/2.7/site-packages', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python27.zip', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python2.7', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python2.7/plat-darwin' [...] +<strong>stderr</strong> = <open file '<stderr>', mode 'w'></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/tilestache-compose.html b/doc/tilestache-compose.html index 24b2be9..99de22a 100644 --- a/doc/tilestache-compose.html +++ b/doc/tilestache-compose.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module tilestache-compose</title> </head><body bgcolor="#f0f0f8"> @@ -59,11 +59,11 @@ Data descriptors defined here:<br> </dl> <hr> Methods inherited from <a href="exceptions.html#Exception">exceptions.Exception</a>:<br> -<dl><dt><a name="BadComposure-__init__"><strong>__init__</strong></a>(...)</dt><dd><tt>x.<a href="#BadComposure-__init__">__init__</a>(...) initializes x; see x.__class__.__doc__ for signature</tt></dd></dl> +<dl><dt><a name="BadComposure-__init__"><strong>__init__</strong></a>(...)</dt><dd><tt>x.<a href="#BadComposure-__init__">__init__</a>(...) initializes x; see help(type(x)) for signature</tt></dd></dl> <hr> Data and other attributes inherited from <a href="exceptions.html#Exception">exceptions.Exception</a>:<br> -<dl><dt><strong>__new__</strong> = <built-in method __new__ of type object at 0x100119f80><dd><tt>T.<a href="#BadComposure-__new__">__new__</a>(S, ...) -> a new object with type S, a subtype of T</tt></dl> +<dl><dt><strong>__new__</strong> = <built-in method __new__ of type object><dd><tt>T.<a href="#BadComposure-__new__">__new__</a>(S, ...) -> a new object with type S, a subtype of T</tt></dl> <hr> Methods inherited from <a href="exceptions.html#BaseException">exceptions.BaseException</a>:<br> @@ -137,7 +137,7 @@ Methods inherited from <a href="ModestMaps.Providers.html#IMapProvider">ModestMa <td width="100%"><dl><dt><a name="-allocate_lock"><strong>allocate_lock</strong></a>(...)</dt><dd><tt><a href="#-allocate_lock">allocate_lock</a>() -> lock object<br> (allocate() is an obsolete synonym)<br> <br> -Create a new lock object. See LockType.__doc__ for information about locks.</tt></dd></dl> +Create a new lock object. See help(LockType) for information about locks.</tt></dd></dl> <dl><dt><a name="-close"><strong>close</strong></a>(...)</dt><dd><tt><a href="#-close">close</a>(fd)<br> <br> Close a file descriptor (for low level IO).</tt></dd></dl> @@ -155,9 +155,9 @@ Write a string to a file descriptor.</tt></dd></dl <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>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 0x100656170><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.9/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. [...] -<strong>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> +<td width="100%"><strong>defaults</strong> = {'center': (37.8044, -122.2712), 'dimensions': (900, 600), 'verbose': True, 'zoom': 14}<br> +<strong>mmaps_version</strong> = (1, 4, 6)<br> +<strong>parser</strong> = <optparse.OptionParser instance><br> +<strong>path</strong> = ['', '/Library/Frameworks/SQLite3.framework/Versions/B/Python/2.7', '/Library/Frameworks/GEOS.framework/Versions/3/Python/2.7', '/Library/Python/2.7/site-packages/numpy-override', '/Library/Frameworks/GDAL.framework/Versions/1.10/Python/2.7/site-packages', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python27.zip', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python2.7', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python2.7/plat-darwin' [...] +<strong>stderr</strong> = <open file '<stderr>', mode 'w'></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/tilestache-list.html b/doc/tilestache-list.html index ad2f801..af5f611 100644 --- a/doc/tilestache-list.html +++ b/doc/tilestache-list.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module tilestache-list</title> </head><body bgcolor="#f0f0f8"> @@ -45,8 +45,8 @@ Read coordinates from an MBTiles tileset filename. <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>defaults</strong> = {'bbox': (37.777000000000001, -122.352, 37.838999999999999, -122.226), 'padding': 0}<br> -<strong>parser</strong> = <optparse.OptionParser instance at 0x1010c39e0><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.9/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. [...] -<strong>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> +<td width="100%"><strong>defaults</strong> = {'bbox': (37.777, -122.352, 37.839, -122.226), 'padding': 0}<br> +<strong>parser</strong> = <optparse.OptionParser instance><br> +<strong>path</strong> = ['', '/Library/Frameworks/SQLite3.framework/Versions/B/Python/2.7', '/Library/Frameworks/GEOS.framework/Versions/3/Python/2.7', '/Library/Python/2.7/site-packages/numpy-override', '/Library/Frameworks/GDAL.framework/Versions/1.10/Python/2.7/site-packages', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python27.zip', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python2.7', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python2.7/plat-darwin' [...] +<strong>stderr</strong> = <open file '<stderr>', mode 'w'></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/tilestache-render.html b/doc/tilestache-render.html index 54a1a0b..cf134ab 100644 --- a/doc/tilestache-render.html +++ b/doc/tilestache-render.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module tilestache-render</title> </head><body bgcolor="#f0f0f8"> @@ -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 0x1064894d0><br> -<strong>pathinfo_pat</strong> = <_sre.SRE_Pattern object at 0x1034fe2e8></td></tr></table> +<td width="100%"><strong>parser</strong> = <optparse.OptionParser instance><br> +<strong>pathinfo_pat</strong> = <_sre.SRE_Pattern object></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/tilestache-seed.html b/doc/tilestache-seed.html index a79381a..6cd0aee 100644 --- a/doc/tilestache-seed.html +++ b/doc/tilestache-seed.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module tilestache-seed</title> </head><body bgcolor="#f0f0f8"> @@ -43,8 +43,8 @@ Read coordinates from an MBTiles tileset filename. <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>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 0x106489998><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.9/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. [...] -<strong>stderr</strong> = <open file '<stderr>', mode 'w' at 0x100416140></td></tr></table> +<td width="100%"><strong>defaults</strong> = {'bbox': (37.777, -122.352, 37.839, -122.226), 'enable_retries': False, 'padding': 0, 'verbose': True}<br> +<strong>parser</strong> = <optparse.OptionParser instance><br> +<strong>path</strong> = ['', '/Library/Frameworks/SQLite3.framework/Versions/B/Python/2.7', '/Library/Frameworks/GEOS.framework/Versions/3/Python/2.7', '/Library/Python/2.7/site-packages/numpy-override', '/Library/Frameworks/GDAL.framework/Versions/1.10/Python/2.7/site-packages', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python27.zip', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python2.7', '/Users/migurski/Sites/TileStache/venv-tilestache/lib/python2.7/plat-darwin' [...] +<strong>stderr</strong> = <open file '<stderr>', mode 'w'></td></tr></table> </body></html> \ No newline at end of file diff --git a/doc/tilestache-server.html b/doc/tilestache-server.html index 2d71745..1e8bf42 100644 --- a/doc/tilestache-server.html +++ b/doc/tilestache-server.html @@ -1,5 +1,5 @@ -<!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: module tilestache-server</title> </head><body bgcolor="#f0f0f8"> diff --git a/man/tilestache-clean.1 b/man/tilestache-clean.1 deleted file mode 100644 index bc03131..0000000 --- a/man/tilestache-clean.1 +++ /dev/null @@ -1,65 +0,0 @@ -.TH TILESTACHE-CLEAN 1 "Sep 23, 2012" -.SH NAME -tilestache\-clean \- clean tiles from a TileStache cache -.SH SYNOPSIS -.B tilestache\-clean -.RI [ options ] " zoom" ... -.SH DESCRIPTION -This manual page documents briefly the \fBtilestache\-clean\fR command. -.PP -\fBtilestache\-clean\fP is used to clean tiles from a TileStache cache. -.PP -Cleans a single layer in your TileStache configuration - no images are returned, -and TileStache ends up with an empty in selected areas cache. Bounding box is -given as a pair of lat/lon coordinates, e.g. "37.788 \-122.349 37.833 \-122.246". -Output is a list of tile paths as they are created. -.PP -The \fIzoom\fR option is a space separated list of zoom levels which will be -cleaned. e.g. 12 13 14 15 will clean zooms 12 through 15. Many shells allow you -to use {a..b} which will expand to a list of numbers a though to b. -\fBRequired.\fR -.SH REQUIRED OPTIONS -.TP -\fB-c\fR, \fB\-\-config\fR \fIfile\fR -Path to configuration file. \fBRequired.\fR -.TP -\fB-l\fR, \fB\-\-layer\fR \fIlayer\fR -Layer name from configuration. "ALL" is a special value that will clean all -layers in turn. If you have an actual layer named "ALL", use "ALL LAYERS" -instead. \fBRequired.\fR -.TP -\fB-b\fR, \fB\-\-bbox\fR \fIsouth west north east\fR -Bounding box in floating point geographic coordinates. \fBRequired.\fR -.SH OPTIONS -.B \-h, \-\-help -Show summary of options. -.TP -\fB-p\fR, \fB\-\-padding\fR \fIpadding\fR -Extra margin of tiles to add around bounded area. -Default value is 0 (no extra tiles). -.TP -\fB-e\fR, \fB\-\-extension\fR \fIextension\fR -Optional file type for rendered tiles. Default value is 'png'. -.TP -\fB-f\fR, \fB\-\-progress\-file\fR \fIfile\fR -Optional JSON progress file that gets written on each iteration, so you don't -have to pay close attention. -.TP -\fB-q\fR -Suppress chatty output, \-\-progress\-file works well with this. -.TP -\fB-i\fR, \fB\-\-include\-path\fR \fIpath\fR -Add the following colon-separated list of paths to Python's include path (aka -sys.path) -.TP -\fB\-\-tile\-list\fR \fIfile\fR -Optional file of tile coordinates, a simple text list of Z/X/Y coordinates. -Overrides \-\-bbox and \-\-padding. -.SH SEE ALSO -.BR tilestache-seed (1) -.SH AUTHOR -\fBTileStache\fR was written by Michal Migurski <m...@stamen.com>. -.PP -This manual page was written by Andrew Harvey <andrew.harv...@gmail.com>, -for the Debian project (and may be used by others). - diff --git a/man/tilestache-render.1 b/man/tilestache-render.1 deleted file mode 100644 index 9c385a9..0000000 --- a/man/tilestache-render.1 +++ /dev/null @@ -1,32 +0,0 @@ -.TH TILESTACHE-RENDER 1 "Nov 10, 2010" -.SH NAME -tilestache-render \- render tiles from tilestache -.SH SYNOPSIS -.B tilestache-render -.RI [ options ] " coordinates" ... -.SH DESCRIPTION -This manual page documents briefly the \fBtilestache-render\fR command. -.PP -\fBtilestache-render\fP is used to render tiles from \fBTileStache\fR. -.br -Each coordinate in the argument list should look like "12/656/1582.png", -similar to URL paths in web server usage. Coordinates are processed in -order, each one rendered to an image file in a temporary location and -output to stdout. -.SH REQUIRED OPTIONS -.TP -\fB-c\fR, \fB\-\-config\fR \fIfile\fR -Path to configuration file. -.TP -\fB-l\fR, \fB\-\-layer\fR \fIlayer\fR -Layer name from configuration. -.SH OPTIONS -.B \-h, \-\-help -Show summary of options. -.SH SEE ALSO -.BR tilestache-seed (1) -.SH AUTHOR -\fBTileStache\fR was written by Michal Migurski <m...@stamen.com>. -.PP -This manual page was written by David Paleino <da...@debian.org>, -for the Debian project (and may be used by others). diff --git a/man/tilestache-seed.1 b/man/tilestache-seed.1 deleted file mode 100644 index 97d1691..0000000 --- a/man/tilestache-seed.1 +++ /dev/null @@ -1,82 +0,0 @@ -.TH TILESTACHE-SEED 1 "Nov 10, 2010" -.SH NAME -tilestache-seed \- seed a single layer in your TileStache configuration -.SH SYNOPSIS -.B tilestache-seed -.RI [ options ] " zoom" ... -.SH DESCRIPTION -This manual page documents briefly the \fBtilestache-seed\fR command. -.PP -\fBtilestache-seed\fR seeds a single layer in your TileStache configuration. -No images are returned, but TileStache ends up with a pre-filled cache. -Bounding box is given as a pair of lat/lon coordinates, e.g. "37.788 -\-122.349 37.833 \-122.246". Output is a list of tile paths as they are -created. -.br -Configuration, BBox, and Layer options are required. -.SH REQUIRED OPTIONS -.TP -\fB\-c\fR, \fB\-\-config\fR \fIfile\fR -Path to configuration file. \fBRequired\fR. -.TP -\fB-l\fR, \fB\-\-layer\fR \fIlayer\fR -Layer name from configuration. \fBRequired\fR. -.TP -\fB-b\fR, \fB\-\-bbox\fR \fIsouth\fR \fIwest\fR \fInorth\fR \fIeast\fR -Bounding box in floating point geographic coordinates. \fBRequired\fR. -.SH OPTIONS -.TP -.B \-h, \-\-help -Show summary of options. -.TP -\fB-p\fR, \fB\-\-padding\fR \fIpadding\fR -Extra margin of tiles to add around bounded area. Default value is 0 (no extra tiles). -.TP -\fB-e\fR, \fB\-\-extension\fR \fIextension\fR -Optional file type for rendered tiles. Default value is "png" for most image layers and some variety of JSON for Vector or Mapnik Grid providers. -.TP -\fB-f\fR, \fB\-\-progress-file\fR \fIfile\fR -Optional JSON progress file that gets written on each iteration, so you don't have to pay close attention. -.TP -.B \-q -Suppress chatty output, \-\-progress-file works well with this. -.TP -.B \-i, \-\-include-path -Add the following colon-separated list of paths to Python's include path (aka sys.path). -.TP -.B \-d, \-\-output-directory -Optional output directory for tiles, to override configured cache with the equivalent of: - {"name": "Disk", "path": <output directory>, "dirs": "portable", "gzip": []}. - -More information in http://tilestache.org/doc/#caches. -.TP -.B \-\-to\-mbtiles -Optional output file for tiles, will be created as an MBTiles 1.1 tileset. See http://mbtiles.org for more information. -.TP -.B \-\-from\-mbtiles -Optional input file for tiles, will be read as an MBTiles 1.1 tileset. See http://mbtiles.org for more information. Overrides --extension, --bbox and --padding (this may change). -.TP -.B \-\-to-s3 -Optional output bucket for tiles, will be populated with tiles in a standard Z/X/Y layout. Three required arguments: AWS access-key, secret, and bucket name. -.TP -.B \-\-tile\-list -Optional file of tile coordinates, a simple text list of Z/X/Y coordinates. Overrides --bbox and --padding. -.TP -.B \-\-error\-list -Optional file of failed tile coordinates, a simple text list of Z/X/Y coordinates. If provided, failed tiles will be logged to this file instead of stopping tilestache-seed. -.TP -.B \-\-enable\-retries -If true this will cause tilestache-seed to retry failed tile renderings up to (3) times. Default value is False. -.TP -.B \-x, \-\-ignore-cached -Re-render every tile, whether it is in the cache already or not. -.TP -.B \-\-jsonp-callback -Add a JSONP callback for tiles with a json mime-type, causing "*.js" tiles to be written to the cache wrapped in the callback function. Ignored for non-JSON tiles. -.SH SEE ALSO -.BR tilestache-render (1) -.SH AUTHOR -\fBTileStache\fR was written by Michal Migurski <m...@stamen.com>. -.PP -This manual page was written by David Paleino <da...@debian.org>, -for the Debian project (and may be used by others). diff --git a/man/tilestache-server.1 b/man/tilestache-server.1 deleted file mode 100644 index d763c45..0000000 --- a/man/tilestache-server.1 +++ /dev/null @@ -1,35 +0,0 @@ -.TH TILESTACHE-SERVER 1 "Jan 24, 2011" -.SH NAME -tilestache-server \- seed a single layer in your TileStache configuration -.SH SYNOPSIS -.B tilestache-server -.RI [ options ] -.SH DESCRIPTION -This manual page documents briefly the \fBtilestache-server\fR command. -.PP -\fBtilestache-server\fR serves tiles through Werkzeug, using a -tilestache configuration file. -.SH OPTIONS -.TP -\fB\-c\fR, \fB\-\-config\fR \fIfile\fR -Path to configuration file. Defaults to \fItilestache.cfg\fR. -.TP -\fB-i\fR, \fB\-\-ip\fR \fIaddress\fR -IP address to listen to. Defaults to \fI127.0.0.1\fR. -.TP -\fB-p\fR, \fB\-\-port\fR \fIport\fR -Port number to listen to. Defaults to \fI8080\fR. -.TP -\fB\-\-include\-path\fR \fIpaths\fR -Add the following colon-separated list of paths to Python's include path (aka sys.path). -.TP -.B \-h, \-\-help -Show summary of options. -.SH SEE ALSO -.BR tilestache-render (1) -.BR tilestache-seed (1) -.SH AUTHOR -\fBTileStache\fR was written by Michal Migurski <m...@stamen.com>. -.PP -This manual page was written by David Paleino <da...@debian.org>, -for the Debian project (and may be used by others). diff --git a/setup.py b/setup.py index 8004e5d..963c7da 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ import pkg_resources import sys -version = open('VERSION', 'r').read().strip() +version = open('TileStache/VERSION', 'r').read().strip() def is_installed(name): @@ -40,5 +40,5 @@ setup(name='TileStache', 'TileStache.Goodies.VecTiles'], scripts=['scripts/tilestache-compose.py', 'scripts/tilestache-seed.py', 'scripts/tilestache-clean.py', 'scripts/tilestache-server.py', 'scripts/tilestache-render.py', 'scripts/tilestache-list.py'], data_files=[('share/tilestache', ['TileStache/Goodies/Providers/DejaVuSansMono-alphanumeric.ttf'])], - download_url='http://tilestache.org/download/TileStache-%(version)s.tar.gz' % locals(), + package_data={'TileStache': ['VERSION', '../doc/*.html']}, license='BSD') diff --git a/tilestache.cfg b/tilestache.cfg deleted file mode 100644 index 2beb2bb..0000000 --- a/tilestache.cfg +++ /dev/null @@ -1,21 +0,0 @@ -{ - "cache": - { - "name": "Test", - "path": "/tmp/stache", - "umask": "0000" - }, - "layers": - { - "osm": - { - "provider": {"name": "proxy", "provider": "OPENSTREETMAP"}, - "png options": {"palette": "http://tilestache.org/example-palette-openstreetmap-mapnik.act"} - }, - "example": - { - "provider": {"name": "mapnik", "mapfile": "examples/style.xml"}, - "projection": "spherical mercator" - } - } -} diff --git a/tilestache.cgi b/tilestache.cgi deleted file mode 100755 index e476b35..0000000 --- a/tilestache.cgi +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python - -import os -import TileStache - -if __name__ == '__main__': - TileStache.cgiHandler(os.environ, 'tilestache.cfg', debug=True) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/tilestache.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel