Coryp/ch1815/update geodesic and geocode ip response (#3)

* update geodesic response

* update geocode/ip to return address

* bump version

* address name to addressLabel, placeLabel

Author: corypisano

examples/geocode_example.py

@@ -28,7 +28,7 @@
   },
   "latitude": 40.704262,
   "longitude": -73.986675,
-  "name": "20 Jay Street",
+  "addressLabel": "20 Jay Street",
   "neighborhood": "DUMBO",
   "number": "20",
   "postalCode": "11201",
@@ -62,7 +62,7 @@
   },
   "latitude": 40.704053,
   "longitude": -73.986802,
-  "name": "20 Jay St",
+  "addressLabel": "20 Jay St",
   "neighborhood": "DUMBO",
   "number": "20",
   "state": "New York",

radar/endpoints.py

@@ -453,20 +453,20 @@ def reverse(self, coordinates):
         return [Address(self._radar, data) for data in raw_addresses]
 
     def ip(self, ip):
-        """Geocodes an IP address, converting IP address to country.
+        """Geocodes an IP address, converting IP address to partial address.
         
         https://radar.io/documentation/api#geocode-ip
 
         Args:
             ip (str):  The IP address to geocode.
         
         Returns:
-            `list` of :class:`~radar.models.address.Address`
+            `:class:`~radar.models.address.Address`
         """
         path = API_PATH["geocode_ip"]
         params = {"ip": ip}
 
-        raw_address = self._get(path, params=params)
+        raw_address = self._get(path, params=params, json_key="address")
         return Address(self._radar, raw_address)
 
 

radar/models/address.py

@@ -14,7 +14,8 @@ class Address(Model):
         distance (float)
         formattedAddress (str)
         geometry (GeoJSON.Point)
-        name (str)
+        addressLabel (str)
+        placeLabel (str)
         number (str)
         latitude (float)
         longitude (float)
@@ -31,4 +32,5 @@ class Address(Model):
         "latitude",
         "longitude",
         "formattedAddress",
+        "placeLabel",
     )

radar/models/route.py

@@ -66,11 +66,12 @@ def __init__(self, distance=None, duration=None, mode=None):
             self.duration = None
 
     def __repr__(self):
-        display_str = f"<distance={self.distance.text}"
+        fields = []
+        if self.distance:
+            fields.append(f"distance={self.distance.text}")
         if self.duration:
-            display_str += f" duration={self.duration.text}>"
-        else:
-            display_str += ">"
+            fields.append(f"duration={self.duration.text}")
+        display_str = f"<{' '.join(fields)}>"
         return display_str
 
 
@@ -96,15 +97,12 @@ def __init__(self, radar, data={}):
         self._radar = radar
         self.raw_json = data
         for attribute, value in data.items():
-            if attribute in ["transit", "car", "bike", "foot"]:
+            if attribute in ["geodesic", "transit", "car", "bike", "foot"]:
                 route = Route(
                     distance=value.get("distance"),
                     duration=value.get("duration"),
                     mode=attribute,
                 )
                 setattr(self, attribute, route)
-            elif attribute in ["geodesic"]:
-                route = Route(distance=value, mode=attribute)
-                setattr(self, attribute, route)
             else:
                 setattr(self, attribute, value)

radar/version.py

@@ -1 +1 @@
-VERSION = "0.0.3"
+VERSION = "0.0.4"