Merge pull request #969 from GIScience/Fix_capacity_supercells

EnsureCapacity when storing supercell to cellIds data

CHANGELOG.md

@@ -47,6 +47,7 @@ RELEASING:
 - Clarified "Point not found"-Error message ([#922](https://github.com/GIScience/openrouteservice/issues/922))
 - Correct isochrones response documentation ([#670](https://github.com/GIScience/openrouteservice/issues/670))
 - Duplicate parameter in centrality docs due to spring reading getters for docs
+- Bug where supercell subcell ids were out of bounds in storage
 
 ## [6.5.0] - 2021-05-17
 ### Added

openrouteservice/src/main/java/org/heigit/ors/fastisochrones/partitioning/storage/CellStorage.java

@@ -266,7 +266,8 @@ public void storeContourPointerMap() {
     }
 
     /**
-     * Store super cells.
+     * Store super cells. It's a block at the end of all other data that stores [superCellId0, subcell0, subcell1, ..., -1, superCellId1, subcell0, subcell1, ..., -1, ..., -1]
+     * End denomination is by -1 for each supercell block and for the whole block we add another trailing -1.
      *
      * @param superCells the super cells
      */
@@ -276,6 +277,8 @@ public void storeSuperCells(IntObjectMap<IntHashSet> superCells) {
         cells.setHeader(8, (int) (cellContourPointer >> 32));
         cells.setHeader(12, (int) cellContourPointer);
         for (IntObjectCursor<IntHashSet> superCell : superCells) {
+            // + 1 for supercellId and + 1 for trailing -1
+            cells.ensureCapacity(cellContourPointer + (long) (superCell.value.size() + 2) * byteCount);
             cells.setInt(cellContourPointer, superCell.key);
             cellContourPointer = cellContourPointer + (long) byteCount;
             for (IntCursor cellId : superCell.value) {
@@ -288,6 +291,7 @@ public void storeSuperCells(IntObjectMap<IntHashSet> superCells) {
             cellContourPointer = cellContourPointer + (long) byteCount;
         }
         //Add second trailing -1 to mark end of superCell block
+        cells.ensureCapacity(cellContourPointer + (long) byteCount);
         cells.setInt(cellContourPointer, -1);
         cellContourPointer = cellContourPointer + (long) byteCount;
     }