fix cache for different zoomlevels

epiviz · May 13, 2020 · 1872395 · 1872395
1 parent 3dfcc96
commit 1872395
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/epivizfileserver/parser/BigWig.py b/src/epivizfileserver/parser/BigWig.py
@@ -409,14 +409,16 @@ def traverseRtreeNodes(self, node, zoomlvl, chrmId, start, end, result = []):
         """
         offset = node.get("rOffset")
 
-        if self.cacheData.get(str(offset)):
-            tree = self.cacheData.get(str(offset))
+        if self.cacheData.get(str(zoomlvl) + "-" + str(offset)):
+            tree = self.cacheData.get(str(zoomlvl) + "-" + str(offset))
         else:
             if node.get("rIsLeaf"):
+                # print("leaf")
                 tree = self.getTreeBytes(zoomlvl, offset, node.get("rCount") * 32)
             else:
+                # print("not leaf")
                 tree = self.getTreeBytes(zoomlvl, offset, node.get("rCount") * 24)
-            self.cacheData[str(offset)] = tree
+            self.cacheData[str(zoomlvl) + "-" + str(offset)] = tree
 
         if node.get("rIsLeaf"):
             for i in range(0, node.get("rCount")):
@@ -649,4 +651,4 @@ def parseLeafDataNode(self, chrmId, start, end, zoomlvl, rStartChromIx, rStartBa
             if endv >= start and startv <= end and chromId == chrmId:
                 result.append((chromId, startv, endv, valuev))
 
-        return result
+        return result