fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/java/seng202/group9/GUI/FlightSummaryController.java
This commit is contained in:
Liam Beckett
2016-09-17 18:13:02 +12:00
parent cd8e2b0c7f 44ed68ee7a
commit 1664a49623
12 changed files with 255 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/airline_summary.fxml
+2 -2
View File
@@ -9,9 +9,9 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<?import javafx.scene.web.WebView?>
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirlineSummaryController">
<children>
@@ -83,7 +83,7 @@
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
</Pane>
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE" height="200.0" stroke="BLACK" strokeType="INSIDE" width="252.0" />
<WebView fx:id="mapView" prefHeight="200.0" prefWidth="252.0" />
</children>
</AnchorPane>
</children>
src/main/resources/airport_summary.fxml
+4 -2
View File
@@ -9,9 +9,9 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<?import javafx.scene.web.WebView?>
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.AirportSummaryController">
<children>
@@ -83,8 +83,10 @@
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
<children>
<WebView fx:id="mapView" prefHeight="200.0" prefWidth="254.0" />
</children>
</Pane>
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE" height="200.0" stroke="BLACK" strokeType="INSIDE" width="252.0" />
</children>
</AnchorPane>
</children>
src/main/resources/flight_data_summary.fxml
+1 -2
View File
@@ -73,8 +73,7 @@
</Pane>
<Pane prefHeight="934.0" prefWidth="474.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
<children>
<WebView prefHeight="431.0" prefWidth="310.0" />
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="#0d93e0" height="432.0" layoutX="5.0" layoutY="-1.0" smooth="false" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" width="305.0" />
<WebView fx:id="mapView" prefHeight="431.0" prefWidth="310.0" />
</children>
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
src/main/resources/map.html
+101
View File
@@ -0,0 +1,101 @@
<!DOCTYPE html>
<html>
<head>
<title>Google Map Demo</title>
<meta name="viewport" content="initial-scale=1.0">
<meta charset="utf-8">
<style>
html, body {
height: 100%;
margin: 0;
padding: 0;
}
#map {
height: 100%;
}
</style>
</head>
<body>
<div id="map"></div>
<script>
var map;
var marker1;
var marker2;
var path;
function initMap() {
map = new google.maps.Map(document.getElementById('map'), {
center: {lat: 39.144684, lng: -84.510079},
zoom: 15
});
new google.maps.Marker({
position: {lat: 39.144684, lng: -84.510079},
map: map,
title: '\u0048\u0061\u0072\u0061\u006d\u0062\u0065'
});
}
function displayAirport(position){
map = new google.maps.Map(document.getElementById('map'), {
center: position[0],
zoom: 15
});
new google.maps.Marker({
position: position[0],
map: map,
title: '\u0048\u0061\u0072\u0061\u006d\u0062\u0065'
});
}
function displayRoute(flightPath) {
// CLEAR EXISTING MARKERS
if (marker1 !== undefined && marker2 !== undefined && path !== undefined) {
marker1.setMap(null);
marker2.setMap(null);
path.setMap(null);
}
if (flightPath.length < 2) {
return;
}
// CREATE MARKERS AT START AND FINISH
marker1 = new google.maps.Marker({
position: flightPath[0],
map: map
});
marker2 = new google.maps.Marker({
position: flightPath[flightPath.length - 1],
map: map
});
// DRAW POLYLINE FOR ROUTE
path = new google.maps.Polyline({
path: flightPath,
geodesic: true,
strokeColor: '#FF0000',
strokeOpacity: 1.0,
strokeWeight: 2
});
path.setMap(map);
repositionMap(flightPath);
}
function repositionMap(flightPath) {
var bounds = new google.maps.LatLngBounds();
for (var i = 0; i < flightPath.length; i++) {
bounds.extend(flightPath[i]);
}
map.fitBounds(bounds);
}
</script>
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBnt2PJyKZsh-qrsTkbZwSGuUNWPromlLg&callback=initMap" defer></script>
</body>
</html>
src/main/resources/routes_summary.fxml
+4 -2
View File
@@ -9,9 +9,9 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<?import javafx.scene.web.WebView?>
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.RouteSummaryController">
<children>
@@ -83,8 +83,10 @@
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
<children>
<WebView fx:id="mapView" prefHeight="200.0" prefWidth="252.0" />
</children>
</Pane>
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE" height="200.0" stroke="BLACK" strokeType="INSIDE" width="252.0" />
</children>
</AnchorPane>
</children>