X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.maps.elevation.server%2Fsrc%2Forg%2Fsimantics%2Fmaps%2Felevation%2Fserver%2FTiffTileInterface.java;h=8f7ecc010d285e5ba41d55728fc2fc0e904668ed;hb=47748e479895b9e74d805411f26c1d02601bf360;hp=6f24ad5b65073eec799ac66247c90180d14b9f4e;hpb=76d4bb1c494a0d9059062baf2f3ba4b3559c3e19;p=simantics%2Fdistrict.git

diff --git a/org.simantics.maps.elevation.server/src/org/simantics/maps/elevation/server/TiffTileInterface.java b/org.simantics.maps.elevation.server/src/org/simantics/maps/elevation/server/TiffTileInterface.java
index 6f24ad5b..8f7ecc01 100644
--- a/org.simantics.maps.elevation.server/src/org/simantics/maps/elevation/server/TiffTileInterface.java
+++ b/org.simantics.maps.elevation.server/src/org/simantics/maps/elevation/server/TiffTileInterface.java
@@ -1,6 +1,7 @@
 package org.simantics.maps.elevation.server;
 
 import java.awt.geom.Rectangle2D;
+import java.io.Closeable;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -27,11 +28,12 @@ import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.index.strtree.STRtree;
 
-public class TiffTileInterface {
+public class TiffTileInterface implements Closeable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TiffTileInterface.class);
 
     private Path tilesFolder;
+    private Map<Path, Envelope> envelopes = new ConcurrentHashMap<>();
     private LoadingCache<Path, TiffInterface> interfaceCache;
     private int openInterfacesSize;
     private STRtree index;
@@ -94,8 +96,6 @@ public class TiffTileInterface {
         });
     }
 
-    private Map<Path, Envelope> envelopes = new ConcurrentHashMap<>();
-
     public Collection<Rectangle2D> getBoundingBoxes() {
         Collection<Rectangle2D> rects = envelopes.values().stream().map(env -> {
             double x = env.getMinX();
@@ -133,4 +133,15 @@ public class TiffTileInterface {
         }
         return new Double(0); // use 0 by default for now
     }
+
+    @Override
+    public void close() throws IOException {
+        interfaceCache.invalidateAll();
+        interfaceCache.cleanUp();
+        
+        envelopes.clear();
+        envelopes = null;
+        index = null;
+        interfaceCache = null;
+    }
 }
\ No newline at end of file