This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository tilestache.
commit 419040bcc14c2cf0820facc38feb55e97712204e Author: Bas Couwenberg <[email protected]> Date: Wed Dec 21 21:43:02 2016 +0100 Imported Upstream version 1.51.4 --- CHANGELOG | 3 +++ TileStache/Core.py | 3 ++- TileStache/VERSION | 2 +- TileStache/Vector/__init__.py | 10 ++++++++-- TileStache/__init__.py | 4 ++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index edcc9e6..360a1e7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2016-12-21: 1.51.4 +- Support for GDAL 2.x types OFTInteger64 and OFTInteger64 on Vector Tiles + 2016-10-30: 1.51.3 - Fixes for debian packaging diff --git a/TileStache/Core.py b/TileStache/Core.py index a404bbe..2b60e6c 100644 --- a/TileStache/Core.py +++ b/TileStache/Core.py @@ -733,7 +733,7 @@ def _preview(layer): <html> <head> <title>TileStache Preview: %(layername)s</title> - <script src="http://code.modestmaps.com/tilestache/modestmaps.min.js"; type="text/javascript"></script> + <script src="http://cdn.rawgit.com/stamen/modestmaps-js/v1.0.0-beta1/modestmaps.min.js"; type="text/javascript"></script> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> <style type="text/css"> html, body, #map { @@ -761,6 +761,7 @@ def _preview(layer): new MM.DoubleClickHandler() ]); map.setCenterZoom(new com.modestmaps.Location(%(lat).6f, %(lon).6f), %(zoom)d); + new MM.Hash(map); //--> </script> </body> diff --git a/TileStache/VERSION b/TileStache/VERSION index f8997b4..858461d 100644 --- a/TileStache/VERSION +++ b/TileStache/VERSION @@ -1 +1 @@ -1.51.3 +1.51.4 diff --git a/TileStache/Vector/__init__.py b/TileStache/Vector/__init__.py index 72bda34..d64681f 100644 --- a/TileStache/Vector/__init__.py +++ b/TileStache/Vector/__init__.py @@ -323,10 +323,16 @@ def _feature_properties(feature, layer_definition, whitelist=None, skip_empty_fi OFTInteger (0), OFTIntegerList (1), OFTReal (2), OFTRealList (3), OFTString (4), OFTStringList (5), OFTWideString (6), OFTWideStringList (7), OFTBinary (8), OFTDate (9), OFTTime (10), OFTDateTime (11). + + Extra OGR types for GDAL 2.x: + OFTInteger64 (12), OFTInteger64List (13) """ properties = {} - okay_types = ogr.OFTInteger, ogr.OFTReal, ogr.OFTString, ogr.OFTWideString, ogr.OFTDate, ogr.OFTTime, ogr.OFTDateTime - + okay_types = [ogr.OFTInteger, ogr.OFTReal, ogr.OFTString, + ogr.OFTWideString, ogr.OFTDate, ogr.OFTTime, ogr.OFTDateTime] + if hasattr(ogr, 'OFTInteger64'): + okay_types.extend([ogr.OFTInteger64, ogr.OFTInteger64List]) + for index in range(layer_definition.GetFieldCount()): field_definition = layer_definition.GetFieldDefn(index) field_type = field_definition.GetType() diff --git a/TileStache/__init__.py b/TileStache/__init__.py index 9d8d829..fb9374c 100644 --- a/TileStache/__init__.py +++ b/TileStache/__init__.py @@ -75,6 +75,7 @@ def getPreview(layer): """ return 200, Headers([('Content-Type', 'text/html')]), Core._preview(layer) + def parseConfig(configHandle): """ Parse a configuration file and return a Configuration object. @@ -112,6 +113,9 @@ def parseConfig(configHandle): return Config.buildConfiguration(config_dict, dirpath) +parseConfigfile = parseConfig # Deprecated function + + def splitPathInfo(pathinfo): """ Converts a PATH_INFO string to layer name, coordinate, and extension parts. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/tilestache.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
