From 23027705da8723a0b11364d67a902fa47986d4b3 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Tue, 29 Aug 2017 15:37:01 +1200
Subject: [PATCH] Sample Tokens are now sent out in RaceXML correctly

Token and TokenType class created

#story[1250]
---
 src/main/java/seng302/gameServer/GameState.java  | 16 ++++++++++++++++
 .../server_config/xml_templates/race.ftlh        |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index e6379369..fcd3fa7e 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -30,6 +30,7 @@ import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Mark;
 import seng302.model.mark.MarkOrder;
 import seng302.model.token.Token;
+import seng302.model.token.TokenType;
 import seng302.utilities.GeoUtility;
 import seng302.utilities.XMLParser;
 
@@ -94,6 +95,17 @@ public class GameState implements Runnable {
         this.hostIpAddress = hostIpAddress;
         yachts = new HashMap<>();
         tokens = new ArrayList<>();
+
+        //TEMP TEST STUFF
+        // TODO: 29/08/17 wmu16 - Take this out!
+        tokens.add(new Token(TokenType.BOOST, 1233d, 11.83154));
+        tokens.add(new Token(TokenType.BOOST, 57.66877, 11.83382));
+        tokens.add(new Token(TokenType.BOOST, 57.66914, 11.83965));
+        tokens.add(new Token(TokenType.BOOST, 57.66684, 11.83214));
+        ;
+
+        //TEMP TEST STUFF
+
         players = new ArrayList<>();
         GameState.hostIpAddress = hostIpAddress;
         customizationFlag = false;
@@ -140,6 +152,10 @@ public class GameState implements Runnable {
         return players;
     }
 
+    public static void addToken(Token token) {
+        tokens.add(token);
+    }
+
     public static List<Token> getTokens() {
         return tokens;
     }
diff --git a/src/main/resources/server_config/xml_templates/race.ftlh b/src/main/resources/server_config/xml_templates/race.ftlh
index 0dfb65e4..081fc085 100644
--- a/src/main/resources/server_config/xml_templates/race.ftlh
+++ b/src/main/resources/server_config/xml_templates/race.ftlh
@@ -13,7 +13,7 @@
 
     <Tokens>
         <#list tokens as token>
-            <Token TokenType="${token.type}" TargetLat="${token.targetLat}" TargetLng="${token.targetLng}"/>
+            <Token TokenType="${token.tokenType}" TargetLat="${token.lat?c}" TargetLng="${token.lng?c}"/>
         </#list>
     </Tokens>