Merge pull request #133 from mapillary/Rubix982/132-Bug-Request-Detection-With-Image-Key-Fix

Rubix982/132 bug request detection with image key fix

Author: cbeddow

setup.py

@@ -23,7 +23,7 @@
 
 # Setup variables. Change as needed
 NAME = "mapillary"  
-VERSION = "0.0.32"
+VERSION = "1.0.0"
 AUTHOR = "Christopher Beddow"
 AUTHOR_EMAIL = "[email protected]"
 LICENSE = "MIT"

src/mapillary/controller/detection.py

@@ -30,7 +30,7 @@
 
 
 def get_image_detections_controller(
-    image_id: typing.Union[str, int], fields: list = None
+    image_id: typing.Union[str, int], fields: list = []
 ) -> GeoJSON:
     """
     Get image detections with given (image) key
@@ -60,7 +60,7 @@ def get_image_detections_controller(
 
 
 def get_map_feature_detections_controller(
-    map_feature_id: typing.Union[str, int], fields: list = None
+    map_feature_id: typing.Union[str, int], fields: list = []
 ) -> GeoJSON:
     """
     Get image detections with given (map feature) key

src/mapillary/interface.py

@@ -195,7 +195,7 @@ def get_image_looking_at(
 
 
 @auth()
-def get_detections_with_image_id(image_id: int, fields: list = None):
+def get_detections_with_image_id(image_id: int, fields: list = []):
     """
     Extracting all the detections within an image using an image key
 

src/mapillary/models/api/entities.py

@@ -144,9 +144,7 @@ def fetch_map_feature(
             ).content.decode("utf-8")
         )
 
-    def fetch_detections(
-        self, identity: int, id_type: bool = True, fields: list = None
-    ):
+    def fetch_detections(self, identity: int, id_type: bool = True, fields: list = []):
         """
         Fetches detections depending on the id, detections for either map_features or
         images and the fields provided

src/mapillary/utils/format.py

@@ -231,7 +231,7 @@ def detection_features_to_geojson(feature_list: list) -> dict:
                 if "image" in feature
                 else {},
                 # Property list
-                "properties": {
+                "possible_none_properties": {
                     # Only if "image" was specified in the `fields` of the endpoint, else None
                     "image_id": feature["image"]["id"]
                     if "image" in "feature"
@@ -249,6 +249,7 @@ def detection_features_to_geojson(feature_list: list) -> dict:
                     # "id" is always available in the response
                     "id": feature["id"],
                 },
+                "properties": {},
             }
             # Going through the given of features
             for feature in feature_list
@@ -261,13 +262,17 @@ def detection_features_to_geojson(feature_list: list) -> dict:
     for _feature in resulting_geojson["features"]:
 
         # Going through each property in the feature
-        for key, value in _feature["properties"].items():
+        for key, value in _feature["possible_none_properties"].items():
 
-            # If the _property has defaulted to None
-            if value is None:
+            # If the _property is not None
+            if value is not None:
 
-                # Delete the _property from the feature
-                del _feature["properties"][key]
+                # Add that property to the _feature
+                _feature["properties"][key] = value
+
+    for _feature in resulting_geojson["features"]:
+
+        del _feature["possible_none_properties"]
 
     # Finally return the output
     return resulting_geojson