#3 Finished implementing dataLayer switch

src/main/scala/braingames/binary/DataCache.scala

@@ -14,6 +14,7 @@ case class CachedBlock(
   dataSetName: String,
   dataLayerId: String,
   dataLayerTyp: String,
+  dataLayerBaseDir: String,
   resolution: Int,
   x: Int,
   y: Int,
@@ -25,6 +26,7 @@ object CachedBlock {
       b.dataSet.name,
       b.dataLayerSection.sectionId,
       b.dataLayer.typ,
+      b.dataLayer.baseDir,
       b.resolution,
       b.block.x,
       b.block.y,

src/main/scala/braingames/binary/DataRequestActor.scala

@@ -105,7 +105,6 @@ class DataRequestActor(
 
   def loadFromLayer(loadBlock: LoadBlock): Future[Box[Array[Byte]]] = {
     if (loadBlock.dataLayerSection.doesContainBlock(loadBlock.block, loadBlock.dataSet.blockLength)) {
-
       def loadFromStore(dataStores: List[ActorRef]): Future[Box[Array[Byte]]] = dataStores match {
         case a :: tail =>
           (a ? loadBlock)
@@ -137,7 +136,7 @@ class DataRequestActor(
 
   def loadFromSomewhere(dataSet: DataSet, layer: DataLayer, requestedSection: Option[String], resolution: Int, block: Point3D): Future[Array[Byte]] = {
 
-    def loadFromSections(sections: Stream[DataLayerSection]): Future[Array[Byte]] = sections match {
+    def loadFromSections(sections: Stream[(DataLayerSection, DataLayer)]): Future[Array[Byte]] = sections match {
       case (section, layer) #:: tail =>
         val loadBlock = LoadBlock(dataSet, layer, section, resolution, block)
         loadFromLayer(loadBlock).flatMap {
@@ -170,6 +169,7 @@ class DataRequestActor(
           }
       }.getOrElse(Nil)), 5 seconds)
     }
+
     loadFromSections(sections)
   }
 

src/main/scala/braingames/binary/LoadBlock.scala

@@ -7,6 +7,7 @@ import braingames.binary.models.DataLayerSection
 
 case class LoadBlock(
   dataSet: DataSet,
+  dataLayer: DataLayer,
   dataLayerSection: DataLayerSection,
   resolution: Int,
   block: Point3D) 

src/main/scala/braingames/binary/api/DataSetService.scala

@@ -30,14 +30,16 @@ trait DataSetService {
 
   def createUserDataLayer(baseDataSet: DataSet): UserDataLayer = {
     val name = userDataSetName()
+    val baseFolder = new File(userDataSetFolder(name))
+    val sections = baseDataSet.dataLayer(DataLayer.SEGMENTATION.name).map(_.sections).getOrElse(Nil)
     val dataLayer = DataLayer(
       DataLayer.SEGMENTATION.name,
-      userDataSetFolder(name),
+      baseFolder.getAbsolutePath(),
       None,
       DataLayer.SEGMENTATION.defaultElementClass,
-      fallback = Some(baseDataSet.name))
+      Some(baseDataSet.name),
+      sections)
 
-    val baseFolder = new File(dataLayer.baseDir)
     baseFolder.mkdirs()
     UserDataLayer(name, baseDataSet.name, dataLayer)
   }

src/main/scala/braingames/binary/models/DataLayerSettings.scala

@@ -11,12 +11,11 @@ import java.io.File
  */
 case class DataLayerSettings(
   typ: String,
-  baseDir: String,
   `class`: String,
   flags: Option[List[String]],
   fallback: Option[String])
 
-object DataLayerSettings extends SettingsFile with Function5[String, String, String, Option[List[String]], Option[String], DataLayerSettings]{
+object DataLayerSettings extends SettingsFile with Function4[String, String, Option[List[String]], Option[String], DataLayerSettings]{
   val dataLayerSettingsReads = Json.reads[DataLayerSettings]
 
   def fromFile(f: File): Option[DataLayerSettings] = {

src/main/scala/braingames/binary/models/DataLayers.scala

@@ -32,11 +32,14 @@ trait DataLayerLike {
 
 case class DataLayer(
   typ: String,
+  baseDir: String,
   flags: Option[List[String]],
   elementClass: String = "uint8",
   fallback: Option[String] = None,
   sections: List[DataLayerSection] = Nil) extends DataLayerLike {
 
+  def relativeBaseDir(binaryBase: String) = baseDir.replace(binaryBase, "")
+
   val interpolator = DataLayer.interpolationFromString(typ)
 
   val resolutions = sections.flatMap(_.resolutions).distinct
@@ -46,7 +49,7 @@ case class DataLayer(
 
 case class DataLayerType(name: String, interpolation: Interpolation, defaultElementClass: String = "uint8")
 
-object DataLayer extends Function5[String, Option[List[String]], String, Option[String], List[DataLayerSection], DataLayer]{
+object DataLayer extends Function6[String, String, Option[List[String]], String, Option[String], List[DataLayerSection], DataLayer]{
   val COLOR =
     DataLayerType("color", TrilerpInterpolation)
   val SEGMENTATION =

src/main/scala/braingames/binary/models/DataSet.scala

@@ -16,6 +16,7 @@ case class DataSetSettings(
 
 case class DataSet(
   name: String,
+  baseDir: String,
   priority: Int = 0,
   scale: Scale,
   dataLayers: List[DataLayer] = Nil,
@@ -26,6 +27,8 @@ case class DataSet(
   def dataLayer(typ: String) =
     dataLayers.find(_.typ == typ)
 
+  def relativeBaseDir(binaryBase: String) = baseDir.replace(binaryBase, "")
+
   val blockLength = 128
 
   val blockSize = blockLength * blockLength * blockLength

src/main/scala/braingames/binary/store/DataStore.scala

@@ -35,7 +35,8 @@ abstract class DataStore extends Actor {
 object DataStore {
 
   def createFilename(dataInfo: LoadBlock) =
-    "%s/%d/x%04d/y%04d/z%04d/%s_mag%d_x%04d_y%04d_z%04d.raw".format(
+    "%s/%s/%d/x%04d/y%04d/z%04d/%s_mag%d_x%04d_y%04d_z%04d.raw".format(
+      dataInfo.dataLayer.baseDir,
       dataInfo.dataLayerSection.baseDir,
       dataInfo.resolution,
       dataInfo.block.x, dataInfo.block.y, dataInfo.block.z,

src/main/scala/braingames/io/DataSetChangeHandler.scala

@@ -84,12 +84,12 @@ class DataSetChangeHandler(dataSetRepository: DataSetRepository)
     }
   }
 
-  def extractSections(base: File): Iterable[DataLayerSection] = {
+  def extractSections(base: File, basePath: String): Iterable[DataLayerSection] = {
     val sectionSettingsMap = extractSectionSettings(base)
     sectionSettingsMap.map {
       case (path, settings) =>
         DataLayerSection(
-          path.getAbsolutePath(),
+          path.getAbsolutePath().replace(basePath, ""),
           settings.sectionId getOrElse path.getName,
           settings.resolutions,
           BoundingBox.createFrom(settings.bboxSmall),
@@ -119,8 +119,8 @@ class DataSetChangeHandler(dataSetRepository: DataSetRepository)
     } yield {
       println("Found Layer: " + settings)
       val dataLayerPath = layer.getAbsolutePath()
-      val sections = extractSections(layer).toList
-      DataLayer(settings.typ, settings.flags, settings.`class`, settings.fallback, sections)
+      val sections = extractSections(layer, dataLayerPath).toList
+      DataLayer(settings.typ, dataLayerPath, settings.flags, settings.`class`, settings.fallback, sections)
     }
   }
 
@@ -130,6 +130,7 @@ class DataSetChangeHandler(dataSetRepository: DataSetRepository)
         case Some(settings) =>
           DataSet(
             settings.name,
+            folder.getAbsolutePath,
             settings.priority getOrElse 0,
             settings.scale,
             Nil,
@@ -138,6 +139,7 @@ class DataSetChangeHandler(dataSetRepository: DataSetRepository)
         case _ =>
           DataSet(
             folder.getName,
+            folder.getAbsolutePath,
             0,
             Scale.default,
             Nil,