Merge pull request #38 from docentYT/development

v3.1.1

Author: docentYT

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.1] - 2025-10-24
+
+### Changed
+- Better url parameters join in `changeset.get_query()`
+- Better url parameters join in `elements.get_query()`
+- Better url parameters join in `user.get_query()`
+
+### Fixed
+- `time_one` and `time_two` params for `changeset.get_query()` should not be joined with `&` [#37](https://github.com/docentYT/osm_easy_api/issues/37)
+
 ## [3.1.0] - 2025-10-08
 
 ### Added

src/osm_easy_api/__init__.py

@@ -1,5 +1,5 @@
 """Python package for parsing osm diffs and communicating with the OpenStreetMap api."""
-VERSION = "3.1.0"
+VERSION = "3.1.1"
 
 from . import data_classes
 from . import diff

src/osm_easy_api/api/endpoints/changeset.py

@@ -132,28 +132,29 @@ def get_query(self, left: float | None = None, bottom: float | None = None, righ
         Returns:
             list[Changeset]: List of Changeset objects.
         """
-        param = "?"
-        if left or bottom or right or top: param += f"bbox={left},{bottom},{right},{top}&"
-        if user_id:         param += f"user={user_id}&"
-        if display_name:    param += f"display_name={display_name}&"
-        if time_one:        param += f"time={time_one}&"
-        if time_two:        param += f",{time_two}&"
-        if open:            param += f"open={open}&"
-        if closed:          param += f"closed={closed}&"
+        params = []
+        if left or bottom or right or top: params.append(f"bbox={left},{bottom},{right},{top}")
+        if user_id:         params.append(f"user={user_id}")
+        if display_name:    params.append(f"display_name={display_name}")
+        if time_one:
+            time_param = f"time={time_one}"
+            if time_two:
+                time_param += f",{time_two}"
+            params.append(time_param)
+            
+        if open:            params.append(f"open={open}")
+        if closed:          params.append(f"closed={closed}")
         if changesets_id:
-            param += f"changesets={changesets_id[0]}"
-            changesets_id.pop(0)
-            for id in changesets_id:
-                param += f",{id}"
-            param += "&"
-        param+=f"order={order}"
-        param+=f"&limit={limit}"
+            changesets = ",".join(map(str, changesets_id))
+            params.append(f"changesets={changesets}")
+
+        params.append(f"order={order}")
+        params.append(f"limit={limit}")
 
         generator = self.outer._request_generator(
             method=self.outer._RequestMethods.GET,
-            url=join_url(self.outer._url.changeset["get_query"], param),
+            url=join_url(self.outer._url.changeset["get_query"], "?" + "&".join(params)),
             custom_status_code_exceptions={400: ValueError("Invalid arguments: {TEXT}")})
-
         return self._xml_to_changesets_list(generator)
 
     def update(self, id: int, comment: str | None = None, tags: Tags | None = None) -> Changeset:

src/osm_easy_api/api/endpoints/elements.py

@@ -173,9 +173,7 @@ def get_query(self, element_type: Type[Node_Way_Relation], ids: list[int]) -> li
             list[Node_Way_Relation]: List of elements you are looking for.
         """
         element_name = element_type.__name__.lower() + 's'
-        param = f"?{element_name}="
-        for id in ids: param += f"{id},"
-        param = param[:-1]
+        param = f"?{element_name}=" + ",".join(map(str, ids))
         url = self.outer._url.elements["multi_fetch"].format(element_type=element_name) + param
         generator = self.outer._request_generator(
             method=self.outer._RequestMethods.GET,

src/osm_easy_api/api/endpoints/user.py

@@ -78,10 +78,7 @@ def get_query(self, ids: list[int]) -> list[User]:
         Returns:
             list[User]: List of User objects.
         """
-        param = ""
-        for id in ids:
-            param += f"{id},"
-        param = param[:-1]
+        param = ",".join(map(str, ids))
         generator = self.outer._request_generator(
             method=self.outer._RequestMethods.GET,
             url=self.outer._url.user["get_query"] + param)

tests/api/test_api_changeset.py

@@ -95,6 +95,14 @@ def test_get_query(self):
         changeset_list = self.API.changeset.get_query(user_id=18179, limit=1)
         self.assertEqual(changeset_list.__len__(), 1)
 
+        responses.add(**{
+            "method": responses.GET,
+            "url": "https://test.pl/api/0.6/changesets/?display_name=Map_Rivers&time=1970-11-29%2016:30:00,2025-10-16%2014:24:23&order=newest&limit=100",
+            "body": body,
+            "status": 200
+        })
+        changeset_list = self.API.changeset.get_query(display_name="Map_Rivers", order="newest", time_one="1970-11-29 16:30:00", time_two="2025-10-16 14:24:23")
+
     @responses.activate
     def test_update(self):
         responses.add(**{