feat(response): assert all timestamps are without time zone

because they are always in UTC anyway
closes #103

Author: rp280

CHANGELOG.md

@@ -7,6 +7,7 @@
  - start and end timestamp meta information of the client are now datetime objects
  - accept shapely Polygon and MultiPolygon for `bpolys` input parameter
  - if a request fails a bash script containing the respective `curl` command is logged (if possible). This allows for easier debugging and sharing of failed requests.
+ - timestamps are converted without timezone information. Deviates from Ohsome API [(Issue #318)](https://github.com/GIScience/ohsome-api/issues/318)
 
 ### Changed
 

ohsome/response.py

@@ -112,30 +112,30 @@ def _as_geodataframe(
 
         if "@validFrom" in features.columns:
             features["@validFrom"] = pd.to_datetime(
-                features["@validFrom"], format="%Y-%m-%dT%H:%M:%SZ"
+                features["@validFrom"].str.replace("Z", ""), format="ISO8601"
             )
             features["@validTo"] = pd.to_datetime(
-                features["@validTo"], format="%Y-%m-%dT%H:%M:%SZ"
+                features["@validTo"].str.replace("Z", ""), format="ISO8601"
             )
             if multi_index:
                 features = features.set_index(["@osmId", "@validFrom", "@validTo"])
         elif "@snapshotTimestamp" in features.columns:
             features["@snapshotTimestamp"] = pd.to_datetime(
-                features["@snapshotTimestamp"], format="%Y-%m-%dT%H:%M:%SZ"
+                features["@snapshotTimestamp"].str.replace("Z", ""), format="ISO8601"
             )
             if multi_index:
                 features = features.set_index(["@osmId", "@snapshotTimestamp"])
         elif (
             "timestamp" in features.columns and "groupByBoundaryId" in features.columns
         ):
             features["timestamp"] = pd.to_datetime(
-                features["timestamp"], format="%Y-%m-%dT%H:%M:%SZ"
+                features["timestamp"].str.replace("Z", ""), format="ISO8601"
             )
             if multi_index:
                 features = features.set_index(["groupByBoundaryId", "timestamp"])
         elif "@timestamp" in features.columns:
             features["@timestamp"] = pd.to_datetime(
-                features["@timestamp"], format="%Y-%m-%dT%H:%M:%SZ"
+                features["@timestamp"].str.replace("Z", ""), format="ISO8601"
             )
             if multi_index:
                 features = features.set_index(["@timestamp"])
@@ -200,12 +200,12 @@ def _format_timestamp(self, result_df: DataFrame) -> None:
         """
         if "timestamp" in result_df.columns:
             result_df["timestamp"] = pd.to_datetime(
-                result_df["timestamp"], format="ISO8601"
+                result_df["timestamp"].str.replace("Z", ""), format="ISO8601"
             )
         else:
             result_df["fromTimestamp"] = pd.to_datetime(
-                result_df["fromTimestamp"], format="ISO8601"
+                result_df["fromTimestamp"].str.replace("Z", ""), format="ISO8601"
             )
             result_df["toTimestamp"] = pd.to_datetime(
-                result_df["toTimestamp"], format="ISO8601"
+                result_df["toTimestamp"].str.replace("Z", ""), format="ISO8601"
             )

ohsome/test/cassettes/test_client/test_check_time_parameter_datetime.yaml

@@ -43,7 +43,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:04 GMT
+      - Wed, 29 Nov 2023 13:54:48 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:

ohsome/test/cassettes/test_client/test_check_time_parameter_list.yaml

@@ -44,7 +44,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:04 GMT
+      - Wed, 29 Nov 2023 13:54:48 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:

ohsome/test/cassettes/test_client/test_end_timestamp_as_time_input.yaml

@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: bcircles=0%3A8.678770065307615%2C49.414435400453954%2C100%7C1%3A8.697137832641602%2C49.41007968889129%2C150&time=2023-11-11T22%3A00%3A00&filter=amenity%3Drestaurant+and+type%3Away
+    body: bcircles=0%3A8.678770065307615%2C49.414435400453954%2C100%7C1%3A8.697137832641602%2C49.41007968889129%2C150&time=2023-11-25T13%3A00%3A00&filter=amenity%3Drestaurant+and+type%3Away
     headers:
       Accept:
       - '*/*'
@@ -20,7 +20,7 @@ interactions:
     body:
       string: "{\n  \"attribution\" : {\n    \"url\" : \"https://ohsome.org/copyrights\",\n
         \   \"text\" : \"\xA9 OpenStreetMap contributors\"\n  },\n  \"apiVersion\"
-        : \"1.10.1\",\n  \"result\" : [ {\n    \"timestamp\" : \"2023-11-11T22:00:00Z\",\n
+        : \"1.10.1\",\n  \"result\" : [ {\n    \"timestamp\" : \"2023-11-25T13:00:00Z\",\n
         \   \"value\" : 0.0\n  } ]\n}"
     headers:
       Access-Control-Allow-Credentials:
@@ -42,7 +42,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:06 GMT
+      - Wed, 29 Nov 2023 13:54:48 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:

ohsome/test/cassettes/test_client/test_format_bboxes_dataframe.yaml

@@ -42,7 +42,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:13 GMT
+      - Wed, 29 Nov 2023 13:54:53 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:

ohsome/test/cassettes/test_client/test_format_bboxes_list.yaml

@@ -42,7 +42,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:13 GMT
+      - Wed, 29 Nov 2023 13:54:53 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:
@@ -99,7 +99,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:14 GMT
+      - Wed, 29 Nov 2023 13:54:53 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:
@@ -156,7 +156,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:14 GMT
+      - Wed, 29 Nov 2023 13:54:55 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:
@@ -213,7 +213,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:16 GMT
+      - Wed, 29 Nov 2023 13:54:55 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:
@@ -270,7 +270,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:16 GMT
+      - Wed, 29 Nov 2023 13:54:55 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:

ohsome/test/cassettes/test_client/test_format_bcircles_dataframe.yaml

@@ -45,7 +45,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:06 GMT
+      - Wed, 29 Nov 2023 13:54:49 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:

ohsome/test/cassettes/test_client/test_format_bcircles_list.yaml

@@ -42,7 +42,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:08 GMT
+      - Wed, 29 Nov 2023 13:54:51 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:
@@ -102,7 +102,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:08 GMT
+      - Wed, 29 Nov 2023 13:54:51 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:
@@ -159,7 +159,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:09 GMT
+      - Wed, 29 Nov 2023 13:54:51 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:
@@ -216,7 +216,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:09 GMT
+      - Wed, 29 Nov 2023 13:54:52 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server:

ohsome/test/cassettes/test_client/test_format_bcircles_pandas.yaml

@@ -51,7 +51,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 17 Nov 2023 15:37:11 GMT
+      - Wed, 29 Nov 2023 13:54:52 GMT
       Keep-Alive:
       - timeout=5, max=100
       Server: