diff --git a/master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 5252ff8..5ef5a6e 100644
--- a/master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,3 +1,3 @@
-/home/yigit/projects/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/Main.java
-/home/yigit/projects/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/managementForm.java
-/home/yigit/projects/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/cameraForm.java
+/home/efeaydin/Masaüstü/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/managementForm.java
+/home/efeaydin/Masaüstü/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/cameraForm.java
+/home/efeaydin/Masaüstü/MyCity/master_app/src/main/java/me/yigitcolakoglu/master_app/Main.java
diff --git a/robot/robot.py b/robot/robot.py
new file mode 100644
index 0000000..1f1a13c
--- /dev/null
+++ b/robot/robot.py
@@ -0,0 +1,14 @@
+import os
+
+path = '/home/robot/image/'
+
+prev_files = []
+files = []
+# r=root, d=directories, f = files
+for r, d, f in os.walk(path):
+ for file in f:
+ if '.jpg' in file:
+ files.append(os.path.join(r, file))
+
+for f in files:
+ print(f)
diff --git a/server_side/.idea/codeStyles/codeStyleConfig.xml b/server_side/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/server_side/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/server_side/.idea/encodings.xml b/server_side/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/server_side/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/server_side/.idea/misc.xml b/server_side/.idea/misc.xml
new file mode 100644
index 0000000..fd2f27a
--- /dev/null
+++ b/server_side/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server_side/.idea/modules.xml b/server_side/.idea/modules.xml
new file mode 100644
index 0000000..b8f31b4
--- /dev/null
+++ b/server_side/.idea/modules.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server_side/.idea/vcs.xml b/server_side/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/server_side/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/server_side/api/app.py b/server_side/api/app.py
index e13659e..c727f77 100644
--- a/server_side/api/app.py
+++ b/server_side/api/app.py
@@ -2,7 +2,7 @@ from flask import Flask, send_from_directory
from flask_restful import Api
from flask_cors import CORS, cross_origin
-from modules import user_info, voting_system, rating_system, denunciation, navigation, bus_stops, announcements, complaint, car_crash,smart_park
+from modules import user_info, voting_system, rating_system, denunciation, navigation, bus_stops, announcements, complaint, car_crash, smart_park
from modules import utility
from modules import user_set
diff --git a/server_side/api/modules/SpotSelector.py b/server_side/api/modules/SpotSelector.py
index 2a96d08..04efefd 100644
--- a/server_side/api/modules/SpotSelector.py
+++ b/server_side/api/modules/SpotSelector.py
@@ -4,9 +4,9 @@ import json
rects = []
-cam = cv2.VideoCapture(2)
-ret,im = cam.read()
-cam.release()
+#cam = cv2.VideoCapture("http://192.168.43.246:4747/mjpegfeed")
+#ret,im = cam.read()
+im = cv2.imread("lot.jpg")
if __name__ == '__main__' :
while(True):
diff --git a/server_side/api/modules/c.jpeg b/server_side/api/modules/c.jpeg
index 8a02ec8..efa8b10 100644
Binary files a/server_side/api/modules/c.jpeg and b/server_side/api/modules/c.jpeg differ
diff --git a/server_side/api/modules/databases/locations.json b/server_side/api/modules/databases/locations.json
index 70d3f9f..f74980f 100644
--- a/server_side/api/modules/databases/locations.json
+++ b/server_side/api/modules/databases/locations.json
@@ -1,5 +1,6 @@
{
"0": {
+<<<<<<< Updated upstream
"x1": 2,
"y1": 94,
"x2": 198,
@@ -18,6 +19,26 @@
"y1": 66,
"x2": 640,
"y2": 200,
+=======
+ "x1": 208,
+ "y1": 356,
+ "x2": 374,
+ "y2": 460,
+ "priority": 0
+ },
+ "1": {
+ "x1": 114,
+ "y1": 358,
+ "x2": 230,
+ "y2": 450,
+ "priority": 1
+ },
+ "2": {
+ "x1": 0,
+ "y1": 346,
+ "x2": 106,
+ "y2": 478,
+>>>>>>> Stashed changes
"priority": 2
}
}
\ No newline at end of file
diff --git a/server_side/api/modules/smart_park.py b/server_side/api/modules/smart_park.py
index c33181b..6f25c62 100644
--- a/server_side/api/modules/smart_park.py
+++ b/server_side/api/modules/smart_park.py
@@ -93,7 +93,7 @@ def generateData(locs, img, avgs,show):
if spot in show:
plt.imshow(vals[spot], interpolation='nearest')
- plt.show()
+ #plt.show()
return distances
@@ -102,8 +102,6 @@ def im2str(im):
imdata = pickle.dumps(im)
return base64.b64encode(imdata).decode('ascii')
-cam = cv2.VideoCapture(2)
-
plt.axis("off")
with open("modules/databases/locations.json","r") as f:
locs = json.loads(f.read())
@@ -120,9 +118,7 @@ if 0:
class Empty(Resource):
def get(self):
-
- ret,image = cam.read()
- #image = cv2.imread("module s/lot.jpg")
+ image = cv2.imread("modules/lot.jpg")
backup = image.copy()
spot_data = generateData(locs,image,data,["0","1","2"])
print(spot_data)
@@ -140,6 +136,7 @@ class Empty(Resource):
print(spot_data)
if best_spot == -1:
print("Sorry, no spot found :(")
+ return
else:
print("Empty spot found at {}".format(int(best_spot) + 1))
foo = locs[best_spot]
diff --git a/traffic_analyzer/object_detection/data/mscoco_label_map.pbtxt b/traffic_analyzer/object_detection/data/mscoco_label_map.pbtxt
index 81aeb2e..a1bccf3 100644
--- a/traffic_analyzer/object_detection/data/mscoco_label_map.pbtxt
+++ b/traffic_analyzer/object_detection/data/mscoco_label_map.pbtxt
@@ -36,7 +36,7 @@ item {
item {
name: "/m/07r04"
id: 8
- display_name: "ambulance"
+ display_name: "truck"
}
item {
name: "/m/019jd"