Merge remote-tracking branch 'origin/devel' into devel

src/main/java/ch/hepia/api/transport/Stop.java

@@ -106,7 +106,7 @@ public class Stop implements Serializable {
             String[] keys = new String[10];
             datas.keySet().toArray(keys);
             String type = keys[4];
-            JSONObject locationJSON = datas.isNull("type") ? new JSONObject() : datas.getJSONObject(type);
+            JSONObject locationJSON = datas.isNull("location") ? new JSONObject() : datas.getJSONObject("location");
             Location.LocationBuilder location = new Location.LocationBuilder(locationJSON, type);
 
             DateFormat formatter = new SimpleDateFormat("kk:mm:ss");

src/main/java/ch/hepia/ui/MainWindowController.java

@@ -107,16 +107,18 @@ public class MainWindowController implements Initializable {
      */
     private void drawConnection(Connection connection, int x, int y){
         List<Section> sections = connection.getSections();
-		for (int i = 0; i < sections.size(); i++){
         connectionCanvas.getGraphicsContext2D().setFill(Color.RED);
         
+        System.out.println(sections.size());
+		for (int i = 0; i < sections.size(); i++){
 			connectionCanvas.getGraphicsContext2D().strokeLine(
-					x + (622 / sections.size()) * i, y, 622 / sections.size(), y);
-			connectionCanvas.getGraphicsContext2D().fillOval(x + (622 / sections.size()) * i - 5, y - 5,
+					x + (622 / sections.size()) * (i), y, 622 / sections.size(), y);
+			connectionCanvas.getGraphicsContext2D().fillOval(x + (622 / sections.size()) * (i) - 5, y - 5,
 					10, 10);
-
-			connectionCanvas.getGraphicsContext2D().fillText(sections.get(i).getDeparture().getLocation().getName(),
-                    x + (622 / sections.size()) * i, y - 20);
+			connectionCanvas.getGraphicsContext2D().fillText(sections.get(i).getArrival().getLocation().getName(),
+                    x + (622 / sections.size()) * (i), y - 20);
+			connectionCanvas.getGraphicsContext2D().fillText(sections.get(i).getArrival().getArrivalTime().toString(),
+                    x + (622 / sections.size()) * (i), y - 40);
 		}
     }