Skip to content
...@@ -554,7 +554,7 @@ class GenerateRobotData: ...@@ -554,7 +554,7 @@ class GenerateRobotData:
# pics = f'PICS_{tags[0]}' # pics = f'PICS_{tags[0]}'
# #
# return reference, pics # return reference, pics
aux = [x for x in tags if match(pattern='^(\d+_\d+_\d+)', string=x)] aux = [x for x in tags if match(pattern='^(\d+_\d+_\d+)|^(\d+_\d+)', string=x)]
if len(aux) == 0: if len(aux) == 0:
raise Exception( raise Exception(
......
from re import compile from re import compile
from dataclasses import dataclass from dataclasses import dataclass
from dateTimeUtils import parse_ngsild_date import dateTimeUtils
from deepdiff import DeepDiff from deepdiff import DeepDiff
from deepdiff.helper import CannotCompare from deepdiff.helper import CannotCompare
from prettydiff import get_annotated_lines_from_diff, diff_json, Flag from prettydiff import get_annotated_lines_from_diff, diff_json, Flag
...@@ -53,8 +53,8 @@ class TemporalPropertyOperator: ...@@ -53,8 +53,8 @@ class TemporalPropertyOperator:
or level.path().endswith("['deletedAt']")) or level.path().endswith("['deletedAt']"))
def give_up_diffing(self, level, diff_instance) -> bool: def give_up_diffing(self, level, diff_instance) -> bool:
expected_datetime = parse_ngsild_date(level.t1) expected_datetime = dateTimeUtils.parse_ngsild_date(level.t1)
actual_datetime = parse_ngsild_date(level.t2) actual_datetime = dateTimeUtils.parse_ngsild_date(level.t2)
return actual_datetime is not None and expected_datetime == actual_datetime return actual_datetime is not None and expected_datetime == actual_datetime
......