This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository nik4.
commit bb3b900c6006eff02a44cc808b68cbe0991c959e
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Jun 1 10:32:30 2016 +0200
Imported Upstream version 1.6
---
CHANGELOG.md | 3 ++-
nik4.py | 22 +++++++++++-----------
setup.py | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebbadbb..8f627ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
# Nik4 Change History
-## *master*
+## 1.6, 1.06.2016
* `--version` option.
* Added `--fonts` option for registering additional fonts.
[#16](https://github.com/Zverik/Nik4/issues/16)
* Fixed `--center` with `--scale` error.
[#18](https://github.com/Zverik/Nik4/issues/18)
* Swapped sizes 4A0 and 2A0. [#17](https://github.com/Zverik/Nik4/issues/17)
+* Support Python 3. [#23](https://github.com/Zverik/Nik4/issues/23)
## 1.5, 7.12.2014
diff --git a/nik4.py b/nik4.py
index 4b8326b..79295c5 100755
--- a/nik4.py
+++ b/nik4.py
@@ -14,7 +14,7 @@ try:
except ImportError:
HAS_CAIRO = False
-VERSION = '1.5.2'
+VERSION = '1.6'
TILE_BUFFER = 128
IM_MONTAGE = 'montage'
@@ -376,12 +376,12 @@ if __name__ == "__main__":
select_layers(m, options.add_layers.split(',') if
options.add_layers else [], options.hide_layers.split(',') if
options.hide_layers else [])
if options.debug:
- print 'scale={}'.format(scale)
- print 'scale_factor={}'.format(scale_factor)
- print 'size={},{}'.format(size[0], size[1])
- print 'bbox={}'.format(bbox)
- print 'bbox_wgs84={}'.format(transform.backward(bbox) if bbox
else None)
- print 'layers=' + ','.join([l.name for l in m.layers if
l.active])
+ print('scale={}'.format(scale))
+ print('scale_factor={}'.format(scale_factor))
+ print('size={},{}'.format(size[0], size[1]))
+ print('bbox={}'.format(bbox))
+ print('bbox_wgs84={}'.format(transform.backward(bbox) if bbox
else None))
+ print('layers=' + ','.join([l.name for l in m.layers if
l.active]))
# generate metadata
if options.ozi:
@@ -424,14 +424,14 @@ if __name__ == "__main__":
m.buffer_size = TILE_BUFFER
tile_cnt = [int(math.ceil(1.0 * size[0] / width)),
int(math.ceil(1.0 * size[1] / height))]
if options.debug:
- print 'tile_count={},{}'.format(tile_cnt[0],
tile_cnt[1])
- print 'tile_size={},{}'.format(width, height)
+ print('tile_count={},{}'.format(tile_cnt[0],
tile_cnt[1]))
+ print('tile_size={},{}'.format(width, height))
tmp_tile = '{:02d}_{:02d}_{}'
tile_files = []
for row in range(0, tile_cnt[1]):
for column in range(0, tile_cnt[0]):
if options.debug:
- print 'tile={},{}'.format(row,
column)
+ print('tile={},{}'.format(row,
column))
tile_bbox = mapnik.Box2d(bbox.minx +
1.0 * width * scale * column, bbox.maxy - 1.0 * height * scale * row, bbox.minx
+ 1.0 * width * scale * (column + 1), bbox.maxy - 1.0 * height * scale * (row +
1))
tile_size = [width if column <
tile_cnt[0] - 1 else size[0] - width * (tile_cnt[0] - 1), height if row <
tile_cnt[1] - 1 else size[1] - height * (tile_cnt[1] - 1)]
m.zoom_to_box(tile_bbox)
@@ -465,5 +465,5 @@ if __name__ == "__main__":
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
outfile.seek(0)
- print outfile.read()
+ print(outfile.read())
outfile.close()
diff --git a/setup.py b/setup.py
index 55359cf..9e92e6c 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
setup(
name='Nik4',
- version='1.5.2',
+ version='1.6.0',
license='WTFPL',
description='Command-line interface to a Mapnik rendering
toolkit',
long_description="""
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/nik4.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
