Return more information with API

Author: daniel-stoneuk

api.py

@@ -14,14 +14,14 @@ def toBase64(image):
     png_as_text = base64.b64encode(buffer).decode('utf-8')
     return png_as_text
 
-def process(image,max_size=200,taps=5):
+def process(image,max_size=200,taps=3):
     resized_image = resize.resize(image,max_size)
     height, width, _ = resized_image.shape
     recoloured_image = recolour.find_silver(resized_image)
-    houses = contours.get_contour_nodes(recoloured_image)
+    houses, percentage = contours.get_contour_nodes(recoloured_image)
     tap_locations = TapWork.greedy_brute(houses,taps,(height,width))
     image = TapWork.draw_network(houses,tap_locations,resized_image,display=False) 
-    return toBase64(image)
+    return dict(image=toBase64(image), houses=len(houses), taps=taps, percentage=percentage)
 
 @app.route('/giveLocation', methods=['GET'])
 def giveLocation():
@@ -38,15 +38,15 @@ def giveLocation():
     image_array = numpy.asarray(bytearray(response.content), dtype=numpy.uint8)
     map_image = cv2.imdecode(image_array, -1)
     if max_size is not None and taps is not None:
-        base64_payload = process(map_image,max_size=max_size,taps=taps)
+        result = process(map_image,max_size=max_size,taps=taps)
     elif max_size is not None: 
-        base64_payload = process(map_image,max_size=max_size)
+        result = process(map_image,max_size=max_size)
     elif taps is not None:
-        base64_payload = process(map_image,taps=taps)
+        result = process(map_image,taps=taps)
     else:
-        base64_payload = process(map_image)
+        result = process(map_image)
 
-    return jsonify(image=base64_payload)
+    return jsonify(result)
 
 if __name__ == '__main__':
     app.run(port=25565,host='0.0.0.0')

contours.py

@@ -5,6 +5,9 @@
 # construct the argument parse and parse the arguments
 def get_contour_nodes(image):
     height, width = image.shape
+    totalpixels = height * width;
+    pixels = cv2.sumElems(image)[0] / 255;
+    percentage = round((pixels / totalpixels) * 100)
     # gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
     # blurred = cv2.GaussianBlur(gray, (5, 5), 0)
     # thresh = cv2.threshold(blurred, 60, 255, cv2.THRESH_BINARY)[1]
@@ -27,4 +30,4 @@ def get_contour_nodes(image):
                 nodes.append([cv2.contourArea(c), [cX, cY]])
         except:
             pass
-    return nodes
+    return nodes, percentage

main.py

@@ -24,7 +24,7 @@
 # cv2.imshow("Window", recoloured_image)
 # cv2.waitKey(0)
 
-houses = contours.get_contour_nodes(recoloured_image)
+houses, percentage = contours.get_contour_nodes(recoloured_image)
 print(houses)
 tap_locations = TapWork.greedy_brute(houses, 3, (height, width))
 print(tap_locations)