[Git][debian-gis-team/nik4][upstream] New upstream version 1.8

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / nik4


Commits:
5c155188 by Bas Couwenberg at 2024-12-03T06:30:51+01:00
New upstream version 1.8
- - - - -


5 changed files:

- .gitignore
- CHANGELOG.md
- nik4.py
- + pyproject.toml
- setup.py


Changes:

=====================================
.gitignore
=====================================
@@ -1,3 +1,5 @@
+.venv/
+Nik4.egg-info/
 dist/
 build/
 README.txt


=====================================
CHANGELOG.md
=====================================
@@ -1,5 +1,9 @@
 # Nik4 Change History
 
+## 1.8, 1.12.2024
+
+* Fixed font loading. [#46](https://github.com/Zverik/Nik4/pull/46) — thanks @Luflosi.
+
 ## 1.7, 27.03.2021
 
 * Choose any projection with `--projection`. [#29](https://github.com/Zverik/Nik4/pull/29) - thanks @Nakaner.


=====================================
nik4.py
=====================================
@@ -21,7 +21,7 @@ try:
 except ImportError:
     HAS_CAIRO = False
 
-VERSION = '1.7'
+VERSION = '1.8'
 TILE_BUFFER = 128
 IM_MONTAGE = 'montage'
 EPSG_4326 = '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
@@ -286,6 +286,11 @@ def run(options):
     bbox = None
     rotate = not options.norotate
 
+    # register non-standard fonts
+    if options.fonts:
+        for f in options.fonts:
+            add_fonts(f)
+
     if (options.ozi and options.projection.lower() != 'epsg:3857'
             and options.projection != EPSG_3857):
         raise Exception('Ozi map file output is only supported for Web Mercator (EPSG:3857). ' +
@@ -421,11 +426,6 @@ def run(options):
     mapnik.load_map_from_string(m, style_xml.encode("utf-8"), False, style_path)
     m.srs = proj_target.params()
 
-    # register non-standard fonts
-    if options.fonts:
-        for f in options.fonts:
-            add_fonts(f)
-
     # get bbox from layer extents
     if options.fit:
         bbox = layer_bbox(m, options.fit.split(','), proj_target, bbox)


=====================================
pyproject.toml
=====================================
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"


=====================================
setup.py
=====================================
@@ -1,8 +1,8 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(
         name='Nik4',
-        version='1.7.0',
+        version='1.8.0',
         license='WTFPL',
         description='Command-line interface to a Mapnik rendering toolkit',
         long_description="""
@@ -22,6 +22,7 @@ to see available options and their descriptions.
         requires=['Mapnik'],
         keywords='Mapnik,GIS,OpenStreetMap,mapping,export',
         scripts=['nik4.py'],
+        packages=[],
         classifiers=[
             'Development Status :: 5 - Production/Stable',
             'Environment :: Console',



View it on GitLab: https://salsa.debian.org/debian-gis-team/nik4/-/commit/5c15518818f17da8bbc34281ec0224c09d42afde

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/nik4/-/commit/5c15518818f17da8bbc34281ec0224c09d42afde
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20241203/8593336f/attachment-0001.htm>