From bff6ff4030521726da7cd3e753315ab68d0d4ea7 Mon Sep 17 00:00:00 2001
From: Rob Hawkes <rob@rawkes.com>
Date: Sun, 2 Feb 2014 11:17:05 +0000
Subject: [PATCH] Removed hard-coded city coordinates

---
 examples/index.html |  4 ++++
 src/client/City.js  | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/examples/index.html b/examples/index.html
index c650fee..0d9c959 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -26,6 +26,10 @@
 	<script>
 		var city = new VIZI.City();
 		city.init({
+			areaCoords: {
+				bottomLeft: [-0.090062,51.489438],
+				topRight: [0.012322,51.519747]
+			},
 			buildings: true, 
 			buildingsURL: "osm-buildings.json"
 		});
diff --git a/src/client/City.js b/src/client/City.js
index 91065fd..3959ea9 100644
--- a/src/client/City.js
+++ b/src/client/City.js
@@ -16,13 +16,8 @@
 		this.ui = {};
 		this.ui.loading = undefined;
 
-		// Set up geo methods
-		this.geo = VIZI.Geo.getInstance({
-			areaCoords: {
-				bottomLeft: [-0.090062,51.489438],
-				topRight: [0.012322,51.519747]
-			}
-		});
+		// Geo methods
+		this.geo = undefined;
 			
 		// Basic WebGL components (scene, camera, renderer, lights, etc)
 		this.webgl = undefined;
@@ -53,6 +48,10 @@
 		}
 
 		_.defaults(options, {
+			areaCoords: {
+				bottomLeft: [-0.090062,51.489438],
+				topRight: [0.012322,51.519747]
+			}, 
 			buildings: true,
 			buildingsURL: null
 		});
@@ -60,6 +59,11 @@
 		// Output city options
 		VIZI.Log(options);
 
+		// Set up geo methods
+		self.geo = VIZI.Geo.getInstance({
+			areaCoords: options.areaCoords
+		});
+
 		// Load city using promises
 
 		self.publish("loadingProgress", 0);