Merge pull request #310 from girder/mapnik-only-one-path-call

Only call getLargeImagePath once in the mapnik tilesource.
girder · Oct 5, 2018 · 4f3ae29 · 4f3ae29
2 parents aeb98cd + ed8e2f9
commit 4f3ae29
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/server/tilesource/mapniksource.py b/server/tilesource/mapniksource.py
@@ -54,7 +54,8 @@ class MapnikTileSource(FileTileSource):
     def __init__(self, path, projection=None, style=None, unitsPerPixel=None, **kwargs):
         super(MapnikTileSource, self).__init__(path, **kwargs)
         self._bounds = {}
-        self.dataset = gdal.Open(self._getLargeImagePath())
+        self._path = self._getLargeImagePath()
+        self.dataset = gdal.Open(self._path)
         self.tileSize = 256
         self.tileWidth = self.tileSize
         self.tileHeight = self.tileSize
@@ -415,13 +416,9 @@ def addStyle(self, m, layerSrs, extent):
         lyr = mapnik.Layer('layer')
         lyr.srs = layerSrs
         if extent:
-            lyr.datasource = mapnik.Gdal(
-                base='', file=self._getLargeImagePath(),
-                band=band, extent=extent)
+            lyr.datasource = mapnik.Gdal(base=None, file=self._path, band=band, extent=extent)
         else:
-            lyr.datasource = mapnik.Gdal(
-                base='', file=self._getLargeImagePath(),
-                band=band)
+            lyr.datasource = mapnik.Gdal(base=None, file=self._path, band=band)
         lyr.styles.append('Raster Style')
         m.layers.append(lyr)