Fixed #18

Zverik · May 16, 2015 · b6e11d7 · b6e11d7
1 parent d557d4b
commit b6e11d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * `--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)
 
 ## 1.5, 7.12.2014
 

diff --git a/nik4.py b/nik4.py
@@ -14,7 +14,7 @@
 except ImportError:
 	HAS_CAIRO = False
 
-VERSION = '1.5.1'
+VERSION = '1.5.2'
 TILE_BUFFER = 128
 IM_MONTAGE = 'montage'
 
@@ -286,7 +286,7 @@ def add_fonts(path):
 		scale = options.scale * 0.00028 / scale_factor
 		# Now we have to divide by cos(lat), but we might not know latitude at this point
 		if options.center:
-			scale = scale / math.cos(math.radians(center.y))
+			scale = scale / math.cos(math.radians(options.center[1]))
 		elif options.bbox:
 			scale = scale / math.cos(math.radians((options.bbox[3] + options.bbox[1]) / 2))
 		else:

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
 		name='Nik4',
-		version='1.5.1',
+		version='1.5.2',
 		license='WTFPL',
 		description='Command-line interface to a Mapnik rendering toolkit',
 		long_description="""