more debug

Author: robotastic

object-ledger/object_ledger_pub_sub.py

@@ -209,7 +209,7 @@ def _get_max_entry_age(self, object_type: str) -> float:
         """
         return self.max_entry_age[object_type]
 
-    def _update_state(self, state: Dict[Any, Any]) -> None:
+    def _update_ledger(self, state: Dict[Any, Any]) -> None:
         """Update the ledger with a state message.
 
         Parameters
@@ -241,11 +241,12 @@ def _update_state(self, state: Dict[Any, Any]) -> None:
                         )
 
                     else:
+                        # Check if the update (entry) is newer than the ledger
                         if (entry['timestamp'] - self.ledger.loc[entry.index, 'timestamp']).iloc[0] > 0:
                             self.ledger.update(entry)
                             logging.debug(f"Updating entry for {entry.index[0]} is {(entry['timestamp'] - self.ledger.loc[entry.index, 'timestamp']).iloc[0]} newer than ledger!")
                         elif (entry['timestamp'] - self.ledger.loc[entry.index, 'timestamp']).iloc[0] < 0:
-                            logging.info(f"Skipping entry for {entry.index[0]} is {(entry['timestamp'] - self.ledger.loc[entry.index, 'timestamp']).iloc[0]} older than ledger!")
+                            logging.info(f"Skipping entry for {entry.index[0]} is {(entry['timestamp'] - self.ledger.loc[entry.index, 'timestamp']).iloc[0]} older than ledger! Update: {entry['timestamp'].iloc[0]} | Ledger: {self.ledger.loc[entry.index, 'timestamp'].iloc[0]}")
                         #logging.info(
                         #    f"Index: {entry.index[0]} | Time Delta (seconds): {(entry['timestamp'] - self.ledger.loc[entry.index, 'timestamp']).iloc[0]} | "
                         #    f"New Time: {entry['timestamp'].iloc[0]} | Ledger Time: {self.ledger.loc[entry.index, 'timestamp'].iloc[0]}"
@@ -294,29 +295,29 @@ def _state_callback(
                 for state in aircrafts:
                     state["object_id"] = state["icao_hex"]
                     state["object_type"] = "aircraft"
-                    self._update_state(state)
+                    self._update_ledger(state)
 
             if "ADS-B" in data:
                 logging.debug(f"Processing ADS-B state message data: {data}")
                 state = json.loads(data["ADS-B"])
                 state["object_id"] = state["icao_hex"]
                 state["object_type"] = "aircraft"
-                self._update_state(state)
+                self._update_ledger(state)
 
             elif "Decoded AIS" in data:
                 logging.debug(f"Processing AIS state message data: {data}")
                 state = json.loads(data["Decoded AIS"])
                 state["object_id"] = state["mmsi"]
                 state["object_type"] = "ship"
                 state["track"] = state["course"]
-                self._update_state(state)
+                self._update_ledger(state)
 
             elif "Radiosonde" in data:
                 logging.debug(f"Processing Radiosonde state message data: {data}")
                 state = json.loads(data["Radiosonde"])
                 state["object_id"] = state["sonde_serial"]
                 state["object_type"] = "balloon"
-                self._update_state(state)
+                self._update_ledger(state)
 
             else:
                 logging.debug(f"Skipping state message data: {data}")