Merge pull request #6 from remap/missing-journal-bug

Resolves Rendering Issue with Rides
remap · May 5, 2023 · 144fa56 · 144fa56
2 parents d87499f + c896767
commit 144fa56
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/project/_startDev.cmd b/project/_startDev.cmd
@@ -26,9 +26,6 @@ for /f "tokens=2*" %%a in ('reg query "hkcr\TouchDesigner."%TOUCHVERSION%"\shell
 rem if we are in this part of the script, the TD version has not been found in the registry
 goto TDVERSIONNOTFOUND
 
-
-
-
 :STARTPROJECT
 
 rem construct our run command - removes cmd arg param, concats toefile

diff --git a/project/td-python/CibicObjects/data_controller.py b/project/td-python/CibicObjects/data_controller.py
@@ -263,6 +263,7 @@ def ProcessData(self, ride_data:list, journal_data:list) -> None:
 	def Run(self, start=datetime(2022, 6, 1), end=datetime(2022, 8, 24), to_bin=False):
 
 		self._Fetch(start, end)
+		self.raw_journals = filter(lambda x: x['journal'] is not None, self.raw_journals)
 		self.ProcessData(self.raw_rides, self.raw_journals)
 		for k, v in self._User_Map.items():
 			v.Match()
@@ -297,6 +298,7 @@ def Load_from_cache(self, directory):
 
 		self.raw_rides = combined['raw_rides']
 		self.raw_journals = combined['raw_journals']
+		self.raw_journals = filter(lambda x: x['journal'] is not None, self.raw_journals)
 		self.ProcessData(self.raw_rides, self.raw_journals)
 		for k, v in self._User_Map.items():
 			v.Match()

diff --git a/project/td-python/Process/processEXT.py b/project/td-python/Process/processEXT.py
@@ -165,7 +165,7 @@ def Video_render_timer_cycle(self, timerOp:OP) -> None:
 
     # NOTE Mapbox and Ride Info
     def _get_mapbox_loaded(self:callable):
-            return Lookup.PROCESS.op("base_mapbox/MapboxTD").par.Loaded
+        return Lookup.PROCESS.op("base_mapbox/MapboxTD").par.Loaded
 
     def _rides_by_region(self:callable, region:str) -> list:
         '''Rides filtered by currently selected region
@@ -180,7 +180,7 @@ def _rides_by_region(self:callable, region:str) -> list:
         region_rides = [ride for ride in all_rides if ride.region == region_str]        
         rides_with_flows = [ride for ride in region_rides if ride.Flow.name != None]
         rides_with_journals = [ride for ride in rides_with_flows if ride.Reflection_data != None]
-        
+
         # which list of rides do we output
         output_rides = rides_with_flows