Integration 1

.gitignore

@@ -12,3 +12,4 @@ TileStache-*.*.tar.gz
 *.shx
 .coverage
 .idea/
+.DS_Store

.travis.yml

@@ -9,21 +9,26 @@ python:
 virtualenv:
   system_site_packages: true
 
+services:
+  - memcached
+
 before_install:
-  - sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+#  - sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
   - sudo apt-get update -qq
-  - sudo apt-get install -qq postgis gdal-bin libgdal-dev libgdal1 libgdal1-dev libpq-dev memcached python-pip
+  - sudo apt-get install -qq gdal-bin memcached python-pip
   - sudo apt-get install -qq python-nose python-imaging python-memcache python-gdal
   - sudo apt-get install -qq python-coverage python-werkzeug python-psycopg2
   - ogrinfo --version
   - ogrinfo --formats
+
+before_script:
   - sudo -u postgres psql -c "drop database if exists test_tilestache"
   - sudo -u postgres psql -c "create database test_tilestache"
   - sudo -u postgres psql -c "create extension postgis" -d test_tilestache
   - sudo -u postgres ogr2ogr -nlt MULTIPOLYGON -f "PostgreSQL" PG:"user=postgres dbname=test_tilestache" ./examples/sample_data/world_merc.shp
 
 install:
-  - sudo pip install -r requirements.txt --use-mirrors
+  - sudo pip install -r requirements.txt --use-mirrors --allow-external ModestMaps --allow-unverified ModestMaps
 
 script:
   - nosetests -v --with-coverage --cover-package TileStache

API.html

@@ -1082,6 +1082,10 @@ <h4><a id="proxy-provider" name="proxy-provider">Proxy</a> <a href="#proxy-provi
     <code>ModestMaps.builtinProviders.keys()</code> for a list. Example:
     <samp>"OPENSTREETMAP"</samp>.
     </dd>
+    <dt>timeout</dt>
+    Defines a timeout in seconds for the request.
+    If not defined, the global default timeout setting will be used.
+    </dd>
 </dl>
 
 <p>
@@ -1312,6 +1316,14 @@ <h4><a id="url-template-provider" name="url-template-provider">URL Template</a>
     Some WMS servers use the Referer request header to authenticate requests;
     this parameter provides one.
     </dd>
+    <dt>source projection</dt>
+    Names a geographic projection, explained in <a href="#projections">Projections</a>, that
+    coordinates should be transformed to for requests.
+    </dd>
+    <dt>timeout</dt>
+    Defines a timeout in seconds for the request.
+    If not defined, the global default timeout setting will be used.
+    </dd>
 </dl>
 
 <p>

CHANGELOG → CHANGELOG.md

@@ -1,3 +1,130 @@
+v0.10.1
+-------
+* Update building transforms to work with `_` separated properties. The queries upstream changed to return `_` as the separator instead of `:`. See [#806](https://github.com/mapzen/vector-datasource/issues/806).
+
+v0.10.0
+-------
+* Add `is_bicycle_related` transform. See [#152](https://github.com/mapzen/TileStache/pull/152).
+* Normalize cycling related properties so shared properties for `cycleway:left` and `cycleway:right` are deleted and projected into `cycleway` directly, and if `cycleway:both` is included but `cycleway` is not, project that onto `cycleway`. [#150](https://github.com/mapzen/TileStache/pull/150).
+* Don't label generate label placements for unnamed stone and rock features. See [#151](https://github.com/mapzen/TileStache/pull/151).
+* Don't generate label placements for point or line features (for islands), make it configurable. See [#153](https://github.com/mapzen/TileStache/pull/153) and [#154](https://github.com/mapzen/TileStache/pull/154).
+* Update road kind for `whitewater=portage_way`. See [#140](https://github.com/mapzen/TileStache/pull/140).
+* Remove junk `highway=minor` and `highway=footpath` from logic. See [#137](https://github.com/mapzen/TileStache/pull/137).
+* Remove outdated building kind calculation. See [#139](https://github.com/mapzen/TileStache/pull/139).
+* Remove outdated `road_sort_key` transform. See [#142](https://github.com/mapzen/TileStache/pull/142).
+* Remove outdated roads functions (logic is now carried in YAML queries), and fix duplicate points bug. See [#143](https://github.com/mapzen/TileStache/pull/143).
+* Remove outdated boundary transforms (logic is now carried in YAML queries). See [#138](https://github.com/mapzen/TileStache/pull/138).
+* Add transform to convert `admin_level` to an int. See [#136](https://github.com/mapzen/TileStache/pull/136).
+* Add transform for convert `capacity` in pois layer to int. See [#146](https://github.com/mapzen/TileStache/pull/146).
+* Add function to convert `height` values to meters. See [#145](https://github.com/mapzen/TileStache/pull/145).
+* Add function to convert `elevation` values meters. See [#147](https://github.com/mapzen/TileStache/pull/147).
+* Add sort order for `peak` and `volcano` features. See [#148](https://github.com/mapzen/TileStache/pull/148).
+* Add end zoom for remove duplicates function. See [#149](https://github.com/mapzen/TileStache/pull/149).
+* Add `is_empty` property for geometry proxy for Shapely's STRtree. See [#135](https://github.com/mapzen/TileStache/pull/135).
+* Delegate quantization to mapbox-vector-tile. See [#141](https://github.com/mapzen/TileStache/pull/141).
+
+v0.9.0
+------
+* After merging, simplify with a very small tolerance to remove duplicate and almost-colinear points
+* Add transform to update parenthetical properties
+* Add ability to drop parenthetical features below some given zoom level
+* Add function to add construction state to stations
+* Adjust tile rank score for stations to take into account the different types of routes
+* Remove temporary properties which shouldn't be public
+* Add 'root_relation_id' for linking related features together in a site or public transport 'stop area' or 'stop area group'
+* Remove now unused landuse kind mapping transform
+* Add uic_ref transform
+
+v0.8.0
+------
+* Allow code in `drop_features_where` function.
+* Add bounding box clipping to exterior boundaries transform to improve water boundary performance.
+* Add kind normalisation functions for social facilities and medical features.
+* Update road sort key value function.
+* Add CSV spreadsheet property matching functions to provide sort_key value lookups for landuse, roads, and most other layers.
+* Use more precision for json formatter on z16 and higher.
+
+v0.7.0
+------
+
+* Add function to normalise tourism kind and related properties.
+* Add function to drop properties from features under some configurable set of conditions.
+* Implement merging for linear features.
+* Add code to normalise leisure kinds for fitness-related POIs.
+* Add transform to include aeroway tag for `kind=gate`.
+
+v0.6.0
+------
+* Ensure that the `population` property, if present, is an integer.
+* Add IATA short (3-character) codes to airports.
+* Interpret road kinds for pistes, motorway junctions, racetracks and piers.
+* Normalise `is_link`, `is_tunnel` and `is_bridge` so that it is not present in the negative; it should only be present when its value is positive.
+* Re-order aerialways to be above all road types, including bridges, unless overriden by a `layer` property.
+* Added sort order properties for beaches and winter sports areas.
+* Added a function to remove abandoned pistes from the output.
+
+v0.5.1
+------
+* Protect against empty snapped geometries - resolves segfault
+
+v0.5.0
+------
+* Update sorts for `pois` and `places`
+* Update `kind` calculation for roads to include `aerialway`s
+* Add volume calculation transform
+* Update road sort key calculation
+* Remove `scalerank` for neighbourhoods
+* Allow exterior boundaries to be snapped to a grid
+* Improve exterior boundaries processing
+* Add post processing functions:
+  - generate address points from buildings
+  - drop certain features
+  - drop certain feature properties
+  - remove features with zero area
+  - remove duplicate features
+  - normalize duplicate stations
+  - only keep the first N features matching a criteria
+  - rank features based on a key
+  - normalize `aerialway`s
+  - numeric min filter
+  - copy features across `layers`
+  - replace geometry with a representative point
+
+v0.4.1
+------
+* Make admin boundaries post-processing filter work with boundary linestring fragments rather than needing an oriented polygon.
+
+v0.4.0
+------
+* Add transform to dynamically create polygon `label_placement` features using representative point for existing layers (or exporte in new layer) as long as the input feature has a `name` or `sport` tag.
+* Ported PostGIS SQL logic from Vector Datasource to Python, with spatial intersection logic for `maritime` boundaries.
+* Use the input data's `kind` property when provided when determining building feature's kind.
+* Add `ferry` lines to high roads logic.
+
+v0.3.0
+------
+* Add intracut (intersection) algorithm for cutting within layers.
+* Add smarts for dealing with maritime boundary attributes
+* Add tranform for water `tunnel`s
+
+v0.2.0
+-----
+* Stable
+
+--------------------------------------------------------------------------------
+
+Pre-fork changelog
+------------------
+
+2014-05-10: 1.49.10
+- Fixed Travis build.
+- Fixed import errors for case-insensitive filesystems.
+- Added TileStache Vagrant machine configuration.
+- Fixed some memcache testing problems.
+
+2014-05-10: 1.49.9
+- Moved everything to PyPI and fixed VERSION kerfuffle.
+
 2013-07-02: 1.49.8
 - Dropped Proxy provider srs=900913 check.
 - Updated most JSON mime-types from text/json to application/json.

Makefile

@@ -1,111 +1,59 @@
-VERSION:=$(shell cat VERSION)
-PACKAGE=TileStache-$(VERSION)
-TARBALL=$(PACKAGE).tar.gz
+VERSION:=$(shell cat TileStache/VERSION)
 DOCROOT=tilestache.org:public_html/tilestache/www
 
-all: $(TARBALL)
-	#
-
-live: $(TARBALL) doc
-	scp $(TARBALL) $(DOCROOT)/download/
+live: doc
 	rsync -Cr doc/ $(DOCROOT)/doc/
-	python setup.py register
-
-$(TARBALL): doc
-	mkdir $(PACKAGE)
-	ln setup.py $(PACKAGE)/
-	ln README.md $(PACKAGE)/
-	ln VERSION $(PACKAGE)/
-	ln tilestache.cfg $(PACKAGE)/
-	ln tilestache.cgi $(PACKAGE)/
-
-	mkdir $(PACKAGE)/TileStache
-	ln TileStache/*.py $(PACKAGE)/TileStache/
-
-	rm $(PACKAGE)/TileStache/__init__.py
-	cp TileStache/__init__.py $(PACKAGE)/TileStache/__init__.py
-	perl -pi -e 's#\bN\.N\.N\b#$(VERSION)#' $(PACKAGE)/TileStache/__init__.py
-
-	mkdir $(PACKAGE)/TileStache/Vector
-	ln TileStache/Vector/*.py $(PACKAGE)/TileStache/Vector/
-
-	mkdir $(PACKAGE)/TileStache/Goodies
-	ln TileStache/Goodies/*.py $(PACKAGE)/TileStache/Goodies/
-
-	mkdir $(PACKAGE)/TileStache/Goodies/Caches
-	ln TileStache/Goodies/Caches/*.py $(PACKAGE)/TileStache/Goodies/Caches/
-
-	mkdir $(PACKAGE)/TileStache/Goodies/Providers
-	ln TileStache/Goodies/Providers/*.py $(PACKAGE)/TileStache/Goodies/Providers/
-	ln TileStache/Goodies/Providers/*.ttf $(PACKAGE)/TileStache/Goodies/Providers/
-
-	mkdir $(PACKAGE)/TileStache/Goodies/VecTiles
-	ln TileStache/Goodies/VecTiles/*.py $(PACKAGE)/TileStache/Goodies/VecTiles/
-
-	mkdir $(PACKAGE)/scripts
-	ln scripts/*.py $(PACKAGE)/scripts/
-
-	mkdir $(PACKAGE)/examples
-	#ln examples/*.py $(PACKAGE)/examples/
-
-	mkdir $(PACKAGE)/doc
-	ln doc/*.html $(PACKAGE)/doc/
-
-	mkdir $(PACKAGE)/man
-	ln man/*.1 $(PACKAGE)/man/
-
-	tar -czf $(TARBALL) $(PACKAGE)
-	rm -rf $(PACKAGE)
+	python setup.py sdist upload
 
 doc:
 	mkdir doc
 
-	pydoc -w TileStache
-	pydoc -w TileStache.Core
-	pydoc -w TileStache.Caches
-	pydoc -w TileStache.Memcache
-	pydoc -w TileStache.Redis
-	pydoc -w TileStache.S3
-	pydoc -w TileStache.Config
-	pydoc -w TileStache.Vector
-	pydoc -w TileStache.Vector.Arc
-	pydoc -w TileStache.Geography
-	pydoc -w TileStache.Providers
-	pydoc -w TileStache.Mapnik
-	pydoc -w TileStache.MBTiles
-	pydoc -w TileStache.Sandwich
-	pydoc -w TileStache.Pixels
-	pydoc -w TileStache.Goodies
-	pydoc -w TileStache.Goodies.Caches
-	pydoc -w TileStache.Goodies.Caches.LimitedDisk
-	pydoc -w TileStache.Goodies.Caches.GoogleCloud
-	pydoc -w TileStache.Goodies.Providers
-	pydoc -w TileStache.Goodies.Providers.Composite
-	pydoc -w TileStache.Goodies.Providers.Cascadenik
-	pydoc -w TileStache.Goodies.Providers.PostGeoJSON
-	pydoc -w TileStache.Goodies.Providers.SolrGeoJSON
-	pydoc -w TileStache.Goodies.Providers.MapnikGrid
-	pydoc -w TileStache.Goodies.Providers.MirrorOSM
-	pydoc -w TileStache.Goodies.Providers.Monkeycache
-	pydoc -w TileStache.Goodies.Providers.UtfGridComposite
-	pydoc -w TileStache.Goodies.Providers.UtfGridCompositeOverlap
-	pydoc -w TileStache.Goodies.Providers.TileDataOSM
-	pydoc -w TileStache.Goodies.Providers.Grid
-	pydoc -w TileStache.Goodies.Providers.GDAL
-	pydoc -w TileStache.Goodies.AreaServer
-	pydoc -w TileStache.Goodies.StatusServer
-	pydoc -w TileStache.Goodies.Proj4Projection
-	pydoc -w TileStache.Goodies.ExternalConfigServer
-	pydoc -w TileStache.Goodies.VecTiles
-	pydoc -w TileStache.Goodies.VecTiles.server
-	pydoc -w TileStache.Goodies.VecTiles.client
-	pydoc -w TileStache.Goodies.VecTiles.geojson
-	pydoc -w TileStache.Goodies.VecTiles.topojson
-	pydoc -w TileStache.Goodies.VecTiles.mvt
-	pydoc -w TileStache.Goodies.VecTiles.wkb
-	pydoc -w TileStache.Goodies.VecTiles.ops
-
-	pydoc -w scripts/tilestache-*.py
+	python -m pydoc -w TileStache
+	python -m pydoc -w TileStache.Core
+	python -m pydoc -w TileStache.Caches
+	python -m pydoc -w TileStache.Memcache
+	python -m pydoc -w TileStache.Redis
+	python -m pydoc -w TileStache.S3
+	python -m pydoc -w TileStache.Config
+	python -m pydoc -w TileStache.Vector
+	python -m pydoc -w TileStache.Vector.Arc
+	python -m pydoc -w TileStache.Geography
+	python -m pydoc -w TileStache.Providers
+	python -m pydoc -w TileStache.Mapnik
+	python -m pydoc -w TileStache.MBTiles
+	python -m pydoc -w TileStache.Sandwich
+	python -m pydoc -w TileStache.Pixels
+	python -m pydoc -w TileStache.Goodies
+	python -m pydoc -w TileStache.Goodies.Caches
+	python -m pydoc -w TileStache.Goodies.Caches.LimitedDisk
+	python -m pydoc -w TileStache.Goodies.Caches.GoogleCloud
+	python -m pydoc -w TileStache.Goodies.Providers
+	python -m pydoc -w TileStache.Goodies.Providers.Composite
+	python -m pydoc -w TileStache.Goodies.Providers.Cascadenik
+	python -m pydoc -w TileStache.Goodies.Providers.PostGeoJSON
+	python -m pydoc -w TileStache.Goodies.Providers.SolrGeoJSON
+	python -m pydoc -w TileStache.Goodies.Providers.MapnikGrid
+	python -m pydoc -w TileStache.Goodies.Providers.MirrorOSM
+	python -m pydoc -w TileStache.Goodies.Providers.Monkeycache
+	python -m pydoc -w TileStache.Goodies.Providers.UtfGridComposite
+	python -m pydoc -w TileStache.Goodies.Providers.UtfGridCompositeOverlap
+	python -m pydoc -w TileStache.Goodies.Providers.TileDataOSM
+	python -m pydoc -w TileStache.Goodies.Providers.Grid
+	python -m pydoc -w TileStache.Goodies.Providers.GDAL
+	python -m pydoc -w TileStache.Goodies.AreaServer
+	python -m pydoc -w TileStache.Goodies.StatusServer
+	python -m pydoc -w TileStache.Goodies.Proj4Projection
+	python -m pydoc -w TileStache.Goodies.ExternalConfigServer
+	python -m pydoc -w TileStache.Goodies.VecTiles
+	python -m pydoc -w TileStache.Goodies.VecTiles.server
+	python -m pydoc -w TileStache.Goodies.VecTiles.client
+	python -m pydoc -w TileStache.Goodies.VecTiles.geojson
+	python -m pydoc -w TileStache.Goodies.VecTiles.topojson
+	python -m pydoc -w TileStache.Goodies.VecTiles.mvt
+	python -m pydoc -w TileStache.Goodies.VecTiles.wkb
+	python -m pydoc -w TileStache.Goodies.VecTiles.ops
+
+	python -m pydoc -w scripts/tilestache-*.py
 
 	mv TileStache.html doc/
 	mv TileStache.*.html doc/
@@ -119,4 +67,4 @@ doc:
 
 clean:
 	find TileStache -name '*.pyc' -delete
-	rm -rf $(TARBALL) doc
+	rm -rf doc

README.md

@@ -1,8 +1,12 @@
-#TileStache
+# Note: This repository is deprecated, and no longer supported.
+
+To serve tiles, please have a look at our [documentation for getting started](https://github.com/tilezen/vector-datasource/wiki/Mapzen-Vector-Tile-Service).
+
+##TileStache
 
 _a stylish alternative for caching your map tiles_
 
-[![Build Status](https://travis-ci.org/migurski/TileStache.png)](https://travis-ci.org/migurski/TileStache)
+[![Build Status](https://travis-ci.org/TileStache/TileStache.png)](https://travis-ci.org/TileStache/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), 
@@ -52,7 +56,7 @@ Install the pure python modules with pip:
 
 Install pip (http://www.pip-installer.org/) like:
 
-    curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
+    curl -O -L https://raw.github.com/pypa/pip/master/contrib/get-pip.py
     sudo python get-pip.py
 
 Install Mapnik via instructions at: