From f6a165f65233e534f0e591a230310573c8556e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Efe=20Ayd=C4=B1n?= <3feaydin@gmail.com>
Date: Wed, 10 Jul 2019 13:35:04 +0300
Subject: [PATCH] Auto stash before merge of "efe" and "origin/yigit"
---
.../compile/default-compile/inputFiles.lst | 6 ++---
robot/robot.py | 14 ++++++++++++
.../.idea/codeStyles/codeStyleConfig.xml | 5 +++++
server_side/.idea/encodings.xml | 4 ++++
server_side/.idea/misc.xml | 6 +++++
server_side/.idea/modules.xml | 9 ++++++++
server_side/.idea/vcs.xml | 6 +++++
server_side/api/app.py | 2 +-
server_side/api/modules/SpotSelector.py | 6 ++---
server_side/api/modules/c.jpeg | Bin 42857 -> 121011 bytes
.../api/modules/databases/locations.json | 21 ++++++++++++++++++
server_side/api/modules/smart_park.py | 9 +++-----
.../data/mscoco_label_map.pbtxt | 2 +-
13 files changed, 76 insertions(+), 14 deletions(-)
create mode 100644 robot/robot.py
create mode 100644 server_side/.idea/codeStyles/codeStyleConfig.xml
create mode 100644 server_side/.idea/encodings.xml
create mode 100644 server_side/.idea/misc.xml
create mode 100644 server_side/.idea/modules.xml
create mode 100644 server_side/.idea/vcs.xml
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 @@
+
iVdzWEO?Gyul`(0cm*A7cLxUZhXF&@nMFFme9F3k}`pX~Q7J#A4*delDwxW9j~a
zi7yP7OfKnLZ5JLhzs@namB%FhOBR7YuTTC%?Z3?a-w_M{|HbV85c|Kp76I}Atp5TJ
z3k#1B4-b!!l<*0p JB60Aq$9jb=TzPv2~MS60fB4r)Il
z-#mb7)P&3{EjlgYMHwTxuBsSzEixd0VL%^Bwzwk#hQSr2UMnu*GQi@t ieITvnLoBJ?kQkwnah+=}`sCRwR1lwsHAa
z5qZcs2e_zid`}X_MWhFRZ0Cy5k^UpQTU$RM5xzr=cf~hHQnqWK*15ET?^C<`Md2VG
zK>n54z@Zah;0jWDSZIo2&0MkqOMR+x$-y3#PGECc&otK3iLKbHkI2%9+0p#C#YXIr
zp?Nq_$u)%DBAgH2zzOvo>k9VwQPlqccaJVVO3;!^Y1>fMUS<2EkHWgS22_E?WN9`@
zYM(D8@=a{HsFNBqnY@QrZ0%Ar^sTb0$|Q`2Q_zaWxdf>mwUD=$mSl(<<@7Y-Hg#;7
z=DF>D{VlDG5wPC;V0u*v^{rAtwE~ZES+>@1J;$GP+mBpR5xt_s>1qRa=CmA~;-7CB
zNbyMEWagp0M`8%Hs5j7?1m737k-)6c;`9iZ5~3e57@;SYaCeV`*%V6u=KL`-X(0jwPJO$QUC(^D
zZ`V$^+
`Dk*)JzlThp?Ax08L
zg^zZbwVx^J9jSd6=Olk@*Y)fXQ2Ao$;k^05sM`3H`FxZ;iosV~v3ona@3`mBIjvLL
zBVffxdbW|_*frew5ikvDybGyqyWVP}EfdE#B~jt&-r^FojdOh{=x2EZc)zAcHRv5s
z#B&!OliNYThUfrW>292Lb?-E?HgYX&P=&y(R%ZoaL>C#FF=0K^Fj;5?VK@#ZRY)4g
z-u5v(NuP`fKt>12AWJ
z@1w83U
z!^0Vzt!q*&GX}l|K{pO1NO$$Q8^k|4)qTC0GZ+M|zECp+tUWmZT31{d00jmT{9!FS
zB6g~FU+bq*VC{1a$G5waZ8q#UbL2lZzlxBpe~{v*Ao?pdQN;#VS{YQ5mAElT7g?+5
zy*qF~Dug{FKhQ4
s!50|CyIr?jnK&MVrA|
z>I#V?*zTJ1!!@3aC{Uk4Q;y=#s0%ntQ%*C!<8#%3ovNO4I`&JxzchnKYN>vq=atPY
znTdW8*p)Z}*;GqDJck2
nZ+)2#epkX*2*8M3#mD!BLmTfv)S3b8)kaxBJ4YndiJNM5qRACUp4^_^)FcFHWp^$M
zZBO^9$4|M8Zyz`vNULO)B$HZNT(G43C;lPw;CHLAj0H6EYE4xV*8GV6>y6m-%|q6q
zp^-|;i<+$zGF=kc+P<`t{LPBHz)>3g&?%$>t(}M%V#NB
57I8DkpGVi~CmE5MJ=ryX4%z@pP`T;X_j_U`V3I
zG3isxzMbniJF=0Ow_jwFE%zI*wQ42Rl!I`c0Qan$nDP#5nYpq}#IPgiYNF7ZHuZlH
zTR{s!X4~BGPhnU(6|Ai<+N1}bnf`Q;>F_fG6tVZNw$j|jfSxJ0VOX^%3zJzB$nd|K
zhml&+XKiOs8F8FeHz<}Jb4_p-
=IOw!jnnNYimL%70V{VW}
z5e5`=sNh(^