Update geocoder_api.py

herepy/geocoder_api.py

@@ -106,11 +106,11 @@ def address_with_boundingbox(
 
  def address_with_details(
  self,
- house_number: int,
- street: str,
  city: str,
  country: str,
  lang: str = "en-US",
+ house_number: Optional[int] = None,
+ street: Optional[str] = None,
  ) -> Optional[GeocoderResponse]:
  """Geocodes with given address details
  Args:
@@ -129,11 +129,16 @@ def address_with_details(
  Raises:
  HEREError"""
 
+ qq_query = ""
+ if house_number is not None:
+ qq_query += f"houseNumber={house_number};"
+ if street is not None:
+ qq_query += f"street={street};"
+ qq_query += f"city={city};"
+ qq_query += f"country={country}"
+
  data = {
- "qq": str.format("houseNumber={0};", house_number)
- + str.format("street={0};", street)
- + str.format("city={0};", city)
- + str.format("country={0}", country),
+ "qq": qq_query,
  "apiKey": self._api_key,
  "lang": lang,
  }

tests/test_geocoder_api.py

@@ -90,10 +90,53 @@ def test_addresswithdetails_whensucceed(self):
  expectedResponse,
  status=200,
  )
- response = self._api.address_with_details(34, "Barbaros", "Istanbul", "Turkey")
+ response = self._api.address_with_details(
+ street="Barbaros",
+ city="Istanbul",
+ country="Turkey",
+ house_number=34
+ )
+ self.assertTrue(response)
+ self.assertIsInstance(response, herepy.GeocoderResponse)
+
+ @responses.activate
+ def test_address_with_detail_without_street(self):
+ with open("testdata/models/geocoder.json", "r") as f:
+ expected_response = f.read()
+ responses.add(
+ responses.GET,
+ "https://geocode.search.hereapi.com/v1/geocode",
+ expected_response,
+ status=200,
+ )
+ response = self._api.address_with_details(
+ city="Istanbul",
+ country="Turkey",
+ house_number=34,
+ street= None
+ )
  self.assertTrue(response)
  self.assertIsInstance(response, herepy.GeocoderResponse)
 
+ @responses.activate
+ def test_address_with_detail_without_house_number(self):
+ with open("testdata/models/geocoder.json", "r") as f:
+ expected_response = f.read()
+ responses.add(
+ responses.GET,
+ "https://geocode.search.hereapi.com/v1/geocode",
+ expected_response,
+ status=200,
+ )
+ response = self._api.address_with_details(
+ street="Barbaros",
+ city="Istanbul",
+ country="Turkey",
+ house_number= None
+ )
+ self.assertTrue(response)
+ self.assertIsInstance(response, herepy.GeocoderResponse)
+
  @responses.activate
  def test_addresswithdetails_whenerroroccurred(self):
  with open("testdata/models/geocoder_error.json", "r") as f: