Fix/skillcorner timestamp

kloppy/infra/serializers/tracking/skillcorner.py

@@ -209,18 +209,24 @@ def _get_skillcorner_attacking_directions(cls, frames, periods):
 
  return attacking_directions
 
- def __load_json(self, file):
+ @staticmethod
+ def __replace_timestamp(obj):
+ if "timestamp" in obj:
+ obj["time"] = obj.pop("timestamp")
+ return obj
+
+ def __load_json_raw(self, file):
  if Path(file.name).suffix == ".jsonl":
  data = []
  for line in file:
  obj = json.loads(line)
- # for each line rename timestamp to time to make it compatible with existing loader
- if "timestamp" in obj:
- obj["time"] = obj.pop("timestamp")
- data.append(obj)
+ data.append(self.__replace_timestamp(obj))
  return data
  else:
- return json.load(file)
+ data = json.load(file)
+ for line in data:
+ line = self.__replace_timestamp(line)
+ return data
 
  @classmethod
  def __get_periods(cls, tracking):
@@ -288,8 +294,8 @@ def __create_anon_player(cls, teams, frame_record):
  )
 
  def deserialize(self, inputs: SkillCornerInputs) -> TrackingDataset:
- metadata = self.__load_json(inputs.meta_data)
- raw_data = self.__load_json(inputs.raw_data)
+ metadata = json.load(inputs.meta_data)
+ raw_data = self.__load_json_raw(inputs.raw_data)
 
  with performance_logging("Loading metadata", logger=logger):
  periods = self.__get_periods(raw_data)

kloppy/tests/test_skillcorner.py

@@ -25,6 +25,20 @@ def meta_data(self, base_dir) -> str:
  def raw_data(self, base_dir) -> str:
  return base_dir / "files/skillcorner_structured_data.json"
 
+ @pytest.fixture
+ def raw_data_timestamp(self, base_dir) -> str:
+ return base_dir / "files/skillcorner_structured_data_timestamp.json"
+
+ def test_correct_deserialization_timestamp(
+ self, raw_data_timestamp: Path, meta_data: Path
+ ):
+ skillcorner.load(
+ meta_data=meta_data,
+ raw_data=raw_data_timestamp,
+ coordinates="skillcorner",
+ include_empty_frames=True,
+ )
+
  def test_correct_deserialization(self, raw_data: Path, meta_data: Path):
  dataset = skillcorner.load(
  meta_data=meta_data,