Merge pull request #8 from hotosm/hotfix/bug-orthogonalize

HOTFIX : Bug on API endpoint for orthogonalize

API/main.py

@@ -67,11 +67,6 @@ class PredictionRequest(BaseModel):
         description="Indicates whether to use JOSM query. Defaults to False.",
     )
 
-    merge_adjacent_polygons: Optional[bool] = Field(
-        True,
-        description="Merges adjacent self-intersecting or containing each other polygons. Defaults to True.",
-    )
-
     confidence: Optional[int] = Field(
         50,
         description="Threshold probability for filtering out low-confidence predictions. Defaults to 50.",
@@ -196,6 +191,7 @@ async def predict_api(request: PredictionRequest):
             skew_tolerance=request.skew_tolerance,
             tolerance=request.tolerance,
             area_threshold=request.area_threshold,
+            orthogonalize=request.use_josm_q,
         )
         return predictions
     except Exception as e:

API/requirements.txt

@@ -1,4 +1,5 @@
 fastapi==0.103.2
 uvicorn==0.22.0
 fairpredictor==0.0.32
-tflite-runtime==2.14.0
+tflite-runtime==2.14.0
+tensorflow==2.9.2

predictor/app.py

@@ -26,7 +26,7 @@ def predict(
     tile_overlap_distance=0.15,
     use_raster2polygon=False,
     remove_metadata=True,
-    use_josm_q=False,
+    orthogonalize=False,
     max_angle_change=15,
     skew_tolerance=15,
 ):
@@ -100,7 +100,7 @@ def predict(
     for feature in prediction_geojson_data["features"]:
         feature["properties"]["building"] = "yes"
         feature["properties"]["source"] = "fAIr"
-        if use_josm_q is True:
+        if orthogonalize is True:
             feature["geometry"] = othogonalize_poly(
                 feature["geometry"],
                 maxAngleChange=max_angle_change,