large-image-source-mapnik 1.29.1.dev6__tar.gz → 1.29.1.dev16__tar.gz

{large-image-source-mapnik-1.29.1.dev6 → large-image-source-mapnik-1.29.1.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-mapnik
-Version: 1.29.1.dev6
+Version: 1.29.1.dev16
 Summary: A Mapnik tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,11 +17,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 License-File: LICENSE
-Requires-Dist: large-image>=1.29.1.dev6
-Requires-Dist: large-image-source-gdal>=1.29.1.dev6
+Requires-Dist: large-image>=1.29.1.dev16
+Requires-Dist: large-image-source-gdal>=1.29.1.dev16
 Requires-Dist: mapnik
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.29.1.dev6; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.1.dev16; extra == "girder"
 
 A Mapnik tilesource for large_image.
 

{large-image-source-mapnik-1.29.1.dev6 → large-image-source-mapnik-1.29.1.dev16}/large_image_source_mapnik/__init__.py

@@ -273,7 +273,7 @@ class MapnikFileTileSource(GDALFileTileSource, metaclass=LruCacheMetaclass):
         sym = mapnik.RasterSymbolizer()
         if colorizer is not None:
             sym.colorizer = colorizer
-        rule.symbols.append(sym)
+        getattr(rule, 'symbols', getattr(rule, 'symbolizers', None)).append(sym)
         style = mapnik.Style()
         style.rules.append(rule)
         if composite is not None:
@@ -286,8 +286,9 @@ class MapnikFileTileSource(GDALFileTileSource, metaclass=LruCacheMetaclass):
         if hasattr(self, '_netcdf') and isinstance(band, tuple):
             gdalband = band[1]
             gdalpath = self._netcdf['datasets'][band[0]]['name']
-        lyr.datasource = mapnik.Gdal(
-            base=None, file=gdalpath, band=gdalband, extent=extent, nodata=nodata)
+        params = dict(base=None, file=gdalpath, band=gdalband, extent=extent, nodata=nodata)
+        params = {k: v for k, v in params.items() if v is not None}
+        lyr.datasource = mapnik.Gdal(**params)
         lyr.styles.append(styleName)
         m.layers.append(lyr)
 
@@ -387,7 +388,9 @@ class MapnikFileTileSource(GDALFileTileSource, metaclass=LruCacheMetaclass):
             m.zoom_to_box(mapnik.Box2d(xmin, ymin, xmax, ymax))
             img = mapnik.Image(self.tileWidth + overscan * 2, self.tileHeight + overscan * 2)
             mapnik.render(m, img)
-            pilimg = PIL.Image.frombytes('RGBA', (img.width(), img.height()), img.tostring())
+            pilimg = PIL.Image.frombytes(
+                'RGBA', (img.width(), img.height()),
+                getattr(img, 'tostring', getattr(img, 'to_string', None))())
         if overscan:
             pilimg = pilimg.crop((1, 1, pilimg.width - overscan, pilimg.height - overscan))
         return self._outputTile(pilimg, TILE_FORMAT_PIL, x, y, z, applyStyle=False, **kwargs)

{large-image-source-mapnik-1.29.1.dev6 → large-image-source-mapnik-1.29.1.dev16}/large_image_source_mapnik.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: large-image-source-mapnik
-Version: 1.29.1.dev6
+Version: 1.29.1.dev16
 Summary: A Mapnik tilesource for large_image.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -17,11 +17,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 License-File: LICENSE
-Requires-Dist: large-image>=1.29.1.dev6
-Requires-Dist: large-image-source-gdal>=1.29.1.dev6
+Requires-Dist: large-image>=1.29.1.dev16
+Requires-Dist: large-image-source-gdal>=1.29.1.dev16
 Requires-Dist: mapnik
 Provides-Extra: girder
-Requires-Dist: girder-large-image>=1.29.1.dev6; extra == "girder"
+Requires-Dist: girder-large-image>=1.29.1.dev16; extra == "girder"
 
 A Mapnik tilesource for large_image.
 

large-image-source-mapnik-1.29.1.dev16/large_image_source_mapnik.egg-info/requires.txt

@@ -0,0 +1,6 @@
+large-image>=1.29.1.dev16
+large-image-source-gdal>=1.29.1.dev16
+mapnik
+
+[girder]
+girder-large-image>=1.29.1.dev16

large-image-source-mapnik-1.29.1.dev6/large_image_source_mapnik.egg-info/requires.txt

@@ -1,6 +0,0 @@
-large-image>=1.29.1.dev6
-large-image-source-gdal>=1.29.1.dev6
-mapnik
-
-[girder]
-girder-large-image>=1.29.1.dev6