Skip to content

Commit 61c1fe3

Browse files
committed
Fix frontend and db
1 parent d5e10cb commit 61c1fe3

File tree

3 files changed

+13
-57
lines changed

3 files changed

+13
-57
lines changed

database/exercises/db.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,10 @@ COPY public.exercises_universes (id, exercise_id, universe_id, is_default) FROM
196196
46 27 44 True
197197
47 1 41 False
198198
48 1 42 False
199+
49 1 50 False
200+
50 1 51 False
201+
51 1 52 False
202+
52 1 53 False
199203
\.
200204
-- 30 16 3
201205

exercises/static/exercises/follow_line/react-components/WebGUI.js

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -35,47 +35,25 @@ const WebGUI = () => {
3535
}, []);
3636

3737
const updateCircuit = (universe) => {
38-
switch (universe) {
39-
case "Simple Circuit":
38+
if (universe === undefined) {
39+
return
40+
}
41+
42+
if (universe.includes("Simple")) {
4043
circuitName = "default";
4144
setCircuitImg(defaultCircuit);
42-
break;
43-
case "Montmelo Circuit":
45+
} else if (universe.includes("Montmelo")) {
4446
circuitName = "montmelo";
4547
setCircuitImg(montmeloCircuit);
46-
break;
47-
case "Montreal Circuit":
48+
} else if (universe.includes("Montreal")) {
4849
circuitName = "montreal";
4950
setCircuitImg(montrealCircuit);
50-
break;
51-
case "Nurburgring Circuit":
51+
} else if (universe.includes("Nurburgring")) {
5252
circuitName = "ngb";
5353
setCircuitImg(ngbCircuit);
54-
break;
55-
case "Monaco Circuit":
54+
} else if (universe.includes("Monaco")) {
5655
circuitName = "monaco";
5756
setCircuitImg(monacoCircuit);
58-
break;
59-
case "Simple Ackermann Circuit":
60-
circuitName = "default ack";
61-
setCircuitImg(defaultCircuit);
62-
break;
63-
case "Montmelo Ackermann Circuit":
64-
circuitName = "montmelo ack";
65-
setCircuitImg(montmeloCircuit);
66-
break;
67-
case "Montreal Ackermann Circuit":
68-
circuitName = "montreal ack";
69-
setCircuitImg(montrealCircuit);
70-
break;
71-
case "Nurburgring Ackermann Circuit":
72-
circuitName = "ngb ack";
73-
setCircuitImg(ngbCircuit);
74-
break;
75-
case "Monaco Ackermann Circuit":
76-
circuitName = "monaco ack";
77-
setCircuitImg(monacoCircuit);
78-
break;
7957
}
8058
};
8159

exercises/static/exercises/follow_line/react-components/helpers/showCarPositionFollowLine.js

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,32 @@
11
export const getCarPose = (circuit, position) => {
22
var scaleX, scaleY, offsetX, offsetY;
3-
let ackUniverse = circuit.includes("ack")
43
let ackMultiplier = 1;
54
let pose = position.substring( 1, position.length - 1);
65
let pos = pose.split(",").map(function (item) {
76
return parseFloat(item);
87
});
9-
10-
if (ackUniverse) {
11-
circuit = circuit.replace(" ack","")
12-
ackMultiplier = 1
13-
}
148

159
switch (circuit) {
1610
case "default":
1711
scaleY = 1.25; offsetY = 77
1812
scaleX = -2.6; offsetX = 151
1913
break;
20-
case "default ack":
21-
scaleY = 1.25; offsetY = 77
22-
scaleX = -2.6; offsetX = 151
23-
break;
2414
case "montmelo":
2515
scaleY = 2.1; offsetY = 77
2616
scaleX = -1.3; offsetX = 151
2717
break;
28-
case "montmelo ack":
29-
scaleY = 2.1; offsetY = 77
30-
scaleX = -1.3; offsetX = 151
31-
break;
3218
case "montreal":
3319
scaleY = 0.685; offsetY = 77
3420
scaleX = -0.48; offsetX = 151
3521
break;
36-
case "montreal ack":
37-
scaleY = 0.685; offsetY = 77
38-
scaleX = -0.48; offsetX = 151
39-
break;
4022
case "ngb":
4123
scaleY = 1.5; offsetY = 77
4224
scaleX = -1.495; offsetX = 151
4325
break;
44-
case "ngb ack":
45-
scaleY = 1.5; offsetY = 77
46-
scaleX = -1.495; offsetX = 151
47-
break;
4826
case "monaco":
4927
scaleY = 1.25; offsetY = 77
5028
scaleX = -2.6; offsetX = 151
5129
break;
52-
case "monaco ack":
53-
scaleY = 1.25; offsetY = 77
54-
scaleX = -2.6; offsetX = 151
55-
break;
5630
default:
5731
scaleY = 1.25; offsetY = 77
5832
scaleX = -2.6; offsetX = 151

0 commit comments

Comments
 (0)