Bugfix: override of flights in case of same flight_id

core/dataset.py

@@ -23,10 +23,13 @@ class Dataset:
 
         self.metadata = gt["metadata"]
         for flight_id in gt["samples"].keys():
+            flight_id_with_prefix = flight_id
+            if self.prefix:
+                flight_id_with_prefix = self.prefix + flight_id
             if self.partial and flight_id not in self.valid_encounter:
                 logger.info("Skipping flight, not present in valid encounters: %s" % flight_id)
                 continue
-            self.flights[flight_id] = Flight(flight_id, gt["samples"][flight_id], self.file_handler, self.valid_encounter.get(flight_id), prefix=self.prefix)
+            self.flights[flight_id_with_prefix] = Flight(flight_id_with_prefix, gt["samples"][flight_id], self.file_handler, self.valid_encounter.get(flight_id), prefix=self.prefix)
 
     def load_ve(self):
         if self.partial:

core/frame.py

@@ -51,12 +51,16 @@ class Frame:
         return len(self.detected_objects)
 
     def image_path(self):
+        flight_id = self.flight.id
         if self.flight.prefix:
-            return os.path.join('Images', self.flight.prefix + self.flight.id, (str(self.timestamp) + str(self.flight.id) + '.png'))
-        return os.path.join('Images', self.flight.id, (str(self.timestamp) + str(self.flight.id) + '.png'))
+            flight_id = self.flight.id.split(self.flight.prefix)[1]
+        return os.path.join('Images', self.flight.id, (str(self.timestamp) + flight_id + '.png'))
 
     def image_s3_path(self):
-        return os.path.join('Images', self.flight.id, (str(self.timestamp) + str(self.flight.id) + '.png'))
+        flight_id = self.flight.id
+        if self.flight.prefix:
+            flight_id = self.flight.id.split(self.flight.prefix)[1]
+        return os.path.join('Images', flight_id, (str(self.timestamp) + flight_id + '.png'))
 
     def image(self, type='pil'):
         """