From 4581bc1ff3788ee78f21f2736fd362f8f72e42fb Mon Sep 17 00:00:00 2001
From: harjaus <harjaus@coventry.ac.uk>
Date: Tue, 18 Feb 2020 14:59:46 -0800
Subject: [PATCH] Added orange cone support. Latest map

---
 FreeTime/Canvassing/createMap.py |  15 +-
 FreeTime/Canvassing/mapInput.txt | 237 ++++++++++++++++---------------
 2 files changed, 131 insertions(+), 121 deletions(-)

diff --git a/FreeTime/Canvassing/createMap.py b/FreeTime/Canvassing/createMap.py
index 9839616..876d73e 100644
--- a/FreeTime/Canvassing/createMap.py
+++ b/FreeTime/Canvassing/createMap.py
@@ -1,3 +1,4 @@
+import os
 
 def getInput():
     x = []
@@ -5,8 +6,8 @@ def getInput():
     label = []
     for line in open("mapInput.txt").readlines():
         values = line[:-1].split(",")
-        y.append(values[0]) #webots is reversed
-        x.append(values[1])
+        y.append(str(float(values[0]))) #webots is reversed
+        x.append(str(float(values[1])-50))
         label.append(values[2])
 
     return x, y, label
@@ -21,8 +22,11 @@ if __name__ == "__main__":
     for x, y, label in zip(xList, yList, labelList):
         if label == " 3": 
             colour = "blue"
-        else:
+        elif label == " 8":
             colour = "yellow"
+        elif label == " 5":
+        	colour = "orange"
+           
         translation = str(round(float(x),2)) + " -0.3 " + str(round(float(y),2))
         name = "cone" + colour + str(i)
         content = f'\n\ttranslation {translation}\n\tname "{name}"\n\tcolor "{colour}"\n'
@@ -30,4 +34,7 @@ if __name__ == "__main__":
         i+=1
         result += fullString 
 
-    open("result.txt", "w").write(result)
\ No newline at end of file
+
+    open("new.wbt", "w").write(open("template.wbt", "r").read() + result)
+    os.system("cp new.wbt ~/Downloads/rc_webots/worlds/.")
+    os.system("echo Done!")
diff --git a/FreeTime/Canvassing/mapInput.txt b/FreeTime/Canvassing/mapInput.txt
index 6e6681f..1085087 100644
--- a/FreeTime/Canvassing/mapInput.txt
+++ b/FreeTime/Canvassing/mapInput.txt
@@ -1,117 +1,120 @@
-8.444444274902343, 8.95, 8
-8.394444274902344, 11.05, 8
-8.394444274902344, 14.25, 8
-8.344444274902344, 12.8, 8
-8.294444274902343, 15.8, 8
-8.444444274902343, 7.75, 8
-9.144444274902344, 15.95, 8
-10.144444274902344, 15.95, 8
-11.194444274902343, 16.05, 8
-7.144444274902344, 7.85, 3
-7.244444274902344, 9.05, 3
-7.144444274902344, 11.05, 3
-7.044444274902344, 12.95, 3
-6.844444274902344, 14.3, 3
-6.894444274902344, 15.95, 3
-6.994444274902344, 17.15, 3
-8.044444274902343, 17.25, 3
-9.044444274902343, 17.25, 3
-9.744444274902344, 17.1, 3
-10.744444274902344, 17.2, 3
-11.894444274902344, 15.7, 8
-12.494444274902344, 15.35, 8
-12.844444274902344, 15.2, 8
-13.594444274902344, 15.2, 8
-14.144444274902344, 15.6, 8
-14.444444274902343, 16.15, 8
-11.494444274902344, 17.5, 3
-12.144444274902344, 17, 3
-12.594444274902344, 16.35, 3
-13.194444274902343, 16.4, 3
-13.644444274902344, 16.9, 3
-14.194444274902343, 17.45, 3
-15.644444274902344, 16.25, 8
-15.094444274902344, 16.3, 8
-16.594444274902344, 16.25, 8
-16.844444274902344, 15.75, 8
-16.694444274902345, 15.1, 8
-16.194444274902345, 14.25, 8
-14.844444274902344, 17.85, 3
-15.794444274902343, 18.2, 3
-16.744444274902342, 18.05, 3
-17.394444274902344, 17.8, 3
-18.194444274902345, 17.25, 3
-18.594444274902344, 16.7, 3
-18.894444274902344, 15.65, 3
-18.644444274902344, 15.05, 3
-18.294444274902343, 14.3, 3
-17.794444274902343, 13.9, 3
-15.394444274902344, 13.5, 8
-14.944444274902343, 12.6, 8
-14.044444274902343, 12.1, 8
-13.144444274902344, 11.55, 8
-12.644444274902344, 10.85, 8
-11.944444274902343, 10.15, 8
-17.394444274902344, 13.4, 3
-16.844444274902344, 12.65, 3
-16.594444274902344, 12.3, 3
-16.244444274902342, 12, 3
-15.394444274902344, 11.45, 3
-14.944444274902343, 10.9, 3
-14.544444274902343, 10.4, 3
-13.944444274902343, 9.8, 3
-13.244444274902344, 9.3, 3
-12.394444274902344, 8.9, 3
-10.744444274902344, 9.55, 8
-10.444444274902343, 8.6, 8
-10.294444274902343, 7.75, 8
-10.244444274902344, 6.7, 8
-12.094444274902344, 8.4, 3
-11.694444274902343, 7.55, 3
-11.594444274902344, 6.95, 3
-11.394444274902344, 6.45, 3
-9.944444274902343, 5.8, 8
-9.944444274902343, 5.8, 8
-9.944444274902343, 5.1, 8
-10.494444274902344, 4.65, 8
-11.144444274902344, 4.55, 8
-11.694444274902343, 4.5, 8
-12.244444274902344, 4.5, 8
-13.094444274902344, 4.45, 8
-13.644444274902344, 4.25, 8
-13.794444274902343, 3.65, 8
-13.894444274902344, 2.9, 8
-13.444444274902343, 2.1, 8
-12.944444274902343, 1.7, 8
-11.794444274902343, 1.3, 8
-11.094444274902344, 1.15, 8
-9.994444274902344, 1.5, 8
-9.144444274902344, 2.25, 8
-8.494444274902344, 3, 8
-8.244444274902344, 4.65, 8
-8.344444274902344, 5.6, 8
-8.344444274902344, 6.45, 8
-8.344444274902344, 6.9, 8
-12.394444274902344, 6.25, 3
-13.344444274902344, 6.05, 3
-13.794444274902343, 5.85, 3
-14.244444274902344, 5.45, 3
-14.744444274902344, 4.95, 3
-15.094444274902344, 4.4, 3
-15.394444274902344, 3.7, 3
-15.394444274902344, 3.3, 3
-15.444444274902343, 2.2, 3
-15.094444274902344, 1.45, 3
-14.644444274902344, 0.85, 3
-14.094444274902344, 0.6, 3
-12.994444274902344, 0.4, 3
-11.944444274902343, 0.35, 3
-10.394444274902344, 0.3, 3
-9.694444274902343, 0.65, 3
-9.094444274902344, 0.95, 3
-8.594444274902344, 1.75, 3
-7.794444274902344, 2.8, 3
-7.194444274902343, 4, 3
-7.144444274902344, 4.8, 3
-6.894444274902344, 6, 3
-7.044444274902344, 7.05, 3
+4.94375, 19.9619140625, 3
+4.977272796630859, 24.981671142578126, 3
+4.977272796630859, 29.981671142578126, 3
+4.977272796630859, 34.98167114257812, 3
+5.027272796630859, 40.018035888671875, 3
+4.927272796630859, 44.96803588867188, 3
+4.977272796630859, 50.06803588867187, 3
+5.027272796630859, 54.90894317626953, 3
+4.977272796630859, 60.00894317626953, 3
+4.975, 65.05, 3
+5.025, 69.95, 3
+8.975, 19.95, 8
+9.025, 25.05, 8
+9.075, 30, 8
+9.025, 34.95, 8
+9.025, 40.05, 8
+8.975, 44.95, 8
+8.975, 50, 8
+9.075, 54.95, 8
+9.025, 60, 8
+9.025, 65.05, 8
+9.075, 69.95, 8
+4.975, 75, 3
+9.025, 74.95, 3
+4.975, 72.4, 3
+7.075, 74.95, 3
+13.975, 74.95, 3
+19.025, 74.95, 3
+14.025, 70, 8
+19.025, 70.05, 8
+28.925, 75, 3
+21.975, 74, 3
+23.925, 72, 3
+25.875, 70, 3
+27.925, 72, 3
+20.925, 68.95, 8
+22.975, 67, 8
+25.975, 65.9, 8
+29.075, 66.9, 8
+30.975, 70, 8
+31.025, 74.95, 3
+34.975, 74.95, 3
+34.975, 70, 8
+38.925, 73.9, 3
+42.025, 71, 3
+40.925, 68, 3
+37.975, 65, 3
+36.925, 70, 8
+36.025, 67.95, 8
+32.975, 65, 8
+34.925, 62, 3
+31.942857360839845, 59.02857666015625, 3
+28.992857360839842, 56.02857666015625, 3
+25.992857360839842, 53.02857666015625, 3
+29.942857360839845, 62.02857666015625, 8
+27.042857360839843, 59.02857666015625, 8
+23.942857360839845, 56.07857666015625, 8
+20.94375, 53.0494140625, 8
+23.09375, 49.9994140625, 3
+18.975, 50.05, 8
+22.075, 48, 3
+17.975, 47.05, 8
+20.975, 45.95, 3
+16.925, 44.05, 8
+15.975, 41.05, 8
+14.975, 38, 8
+13.975, 35.05, 8
+12.975, 32.05, 8
+19.925, 43.05, 3
+19.025, 40.05, 3
+18.025, 37.05, 3
+16.975, 34, 3
+15.975, 31.1, 3
+12.964286041259765, 27.000006103515624, 8
+12.964286041259765, 29.400006103515626, 8
+15.964286041259765, 26.950006103515626, 8
+17.014286041259766, 30.04285888671875, 3
+18.014286041259766, 27.007147216796874, 8
+20.964286041259765, 27.007147216796874, 8
+19.014286041259766, 30.09285888671875, 3
+20.914286041259764, 29.94285888671875, 3
+24.875, 26.95, 8
+24.925, 29.95, 3
+29.025, 26.95, 8
+29.025, 30, 3
+32.975, 29, 3
+35.925, 26, 3
+37.86818237304688, 23.040765380859376, 3
+30.968182373046876, 25.990765380859376, 8
+32.86818237304688, 23.990765380859376, 8
+33.96818237304687, 21.990765380859376, 8
+37.95909118652344, 19.96348876953125, 3
+36.96428604125977, 17.04285888671875, 3
+34.96428604125977, 14.04285888671875, 3
+32.94000015258789, 11.039996337890624, 3
+29.940000152587892, 10.089996337890625, 3
+25.99000015258789, 9.089996337890625, 3
+21.940000152587892, 9.089996337890625, 3
+17.940000152587892, 8.939996337890625, 3
+13.990000152587891, 9.989996337890625, 3
+10.94000015258789, 11.989996337890625, 3
+5.990000152587891, 18.039996337890624, 3
+7.840000152587891, 16.039996337890624, 3
+9.740000152587891, 14.039996337890624, 3
+10.84000015258789, 17.95999755859375, 8
+12.04000015258789, 15.95999755859375, 8
+13.740000152587891, 14.05999755859375, 8
+16.89000015258789, 13.05999755859375, 8
+21.940000152587892, 13.00999755859375, 8
+25.99000015258789, 12.95999755859375, 8
+28.940000152587892, 14.05999755859375, 8
+31.09000015258789, 16.00999755859375, 8
+32.94000015258789, 17.95999755859375, 8
+33.94000015258789, 19.95999755859375, 8
+4.966665649414063, 22, 3
+9.016665649414062, 22, 8
+4.937890625, 45.974609375, 5
+8.987890625, 46.074609375, 5
+4.837890625, 43.974609375, 5
+9.037890625, 43.974609375, 5