From 8e24c204fd06cf70ff38401bad540c8e2bad1fc1 Mon Sep 17 00:00:00 2001 From: William Muir Date: Thu, 3 Aug 2017 11:26:44 +1200 Subject: [PATCH] Fixed build. Google map does not work tags: #issue[34] --- src/main/java/seng302/utilities/GeoUtility.java | 2 +- src/main/java/seng302/visualiser/GameView.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/seng302/utilities/GeoUtility.java b/src/main/java/seng302/utilities/GeoUtility.java index 751d2c6c..54b0484a 100644 --- a/src/main/java/seng302/utilities/GeoUtility.java +++ b/src/main/java/seng302/utilities/GeoUtility.java @@ -44,7 +44,7 @@ public class GeoUtility { * and end up on a heading of 120° */ public static Double getBearing(GeoPoint p1, GeoPoint p2) { - return (getBearingRad(p1, p2) + 360.0) % 360.0; + return (Math.toDegrees(getBearingRad(p1, p2)) + 360.0) % 360.0; } /** diff --git a/src/main/java/seng302/visualiser/GameView.java b/src/main/java/seng302/visualiser/GameView.java index e5c7b6ed..093f98c4 100644 --- a/src/main/java/seng302/visualiser/GameView.java +++ b/src/main/java/seng302/visualiser/GameView.java @@ -13,6 +13,7 @@ import javafx.geometry.Point2D; import javafx.scene.Group; import javafx.scene.Node; import javafx.scene.image.ImageView; +import javafx.scene.layout.AnchorPane; import javafx.scene.layout.Pane; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; @@ -88,8 +89,6 @@ public class GameView extends Pane { public GameView () { gameObjects = this.getChildren(); // create image view for map, bind panel size to image -// mapImage.fitWidthProperty().bind(this.widthProperty()); -// mapImage.fitHeightProperty().bind(this.heightProperty()); gameObjects.add(mapImage); fpsDisplay.setLayoutX(5); fpsDisplay.setLayoutY(20); @@ -175,6 +174,8 @@ public class GameView extends Pane { bottomRightPos.getLat(), originPos.getLng()); CanvasMap canvasMap = new CanvasMap(boundary); mapImage.setImage(canvasMap.getMapImage()); + mapImage.fitWidthProperty().bind(((AnchorPane) this.getParent()).heightProperty()); + mapImage.fitHeightProperty().bind(((AnchorPane) this.getParent()).heightProperty()); } /**