Merge branch 'VoronoiMap'

Conflicts: voronoimap.php
FreifunkFranken · Nov 11, 2014 · 9a12c89 · 9a12c89
2 parents def61aa + 28326c0
commit 9a12c89
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/config.inc.php
+/.project
diff --git a/config.inc.php.example b/config.inc.php.example
@@ -0,0 +1,8 @@
+<?php
+
+$mysql_server = "localhost";
+$mysql_db = "fff_xchange";
+$mysql_user = "fff_xchange";
+$mysql_pass = "xxxxxxxxxxxxx";
+
+?>
diff --git a/voronoimap.php b/voronoimap.php
@@ -1,3 +1,28 @@
+<?php
+try {
+	require ("config.inc.php");
+	$db = new PDO("mysql:host=$mysql_server;dbname=$mysql_db;charset=utf8mb4", $mysql_user, $mysql_pass);
+	$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+	$rs = $db->prepare ( "SELECT * FROM `hoods`" );
+	$rs->execute ();
+} catch ( PDOException $e ) {
+	exit($e);
+}
+
+$hoods = array();
+while ( $result = $rs->fetch ( PDO::FETCH_ASSOC ) ) {
+	if ($result ['lat'] > 0 && $result ['lon'] > 0) {
+		array_push($hoods, array(
+			'name' => $result ['name'],
+			'type' => $result ['name'],
+			'lat' => $result ['lat'],
+			'lon' => $result ['lon'],
+			'color' => "#F00" 
+		));
+	}
+}
+?>
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -174,28 +199,28 @@
 
 
 <body>
-	<div id='map'>
-	</div>
+	<div id='map'></div>
 	<div id='selections' class="selections">
-	<a href='#' class="show"></a>
-	<div class='content'>
-		<a href='#' class="hide">Hide</a>
-		<div id="toggles">
+		<a href='#' class="show"></a>
+		<div class='content'>
+			<a href='#' class="hide">Hide</a>
+			<div id="toggles"></div>
 		</div>
 	</div>
-	</div>
-	<div id='loading'>
-	</div>
+	<div id='loading'></div>
 	<div id='selected'>
-	<h1>Explore supermarkets in the UK</h1>
+		<h1>The Freifunk-Franken "hoods" visualized as voronoi charts</h1>
 	</div>
 	<div id='about'>
-	<a href='#' class="show">About</a>
-	<p class='content'>
-		Explore Freifunk Franken Hoods. Created by <a href="http://wunschik.it">Alexander Wunschik</a> havely based on a example by <a href="http://chriszetter.com">Chris Zetter</a>, maps copyright <a href='https://www.mapbox.com/about/maps/' target='_blank'>Mapbox and OpenStreetMap</a>.
-		<a href='#' class="hide">Hide</a>
-	</div>
+		<a href='#' class="show">About</a>
+		<p class='content'>
+			Explore Freifunk Franken Hoods. Created by <a href="http://wunschik.it">Alexander Wunschik</a> 
+			havely based on a example by <a href="http://chriszetter.com">Chris Zetter</a>, 
+			maps copyright <a href='https://www.mapbox.com/about/maps/' target='_blank'>Mapbox and OpenStreetMap</a>.
+			<a href='#' class="hide">Hide</a>
+		</p>
 	</div>
+
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.4.8/d3.min.js"></script>
 	<script src="https://api.tiles.mapbox.com/mapbox.js/v1.6.3/mapbox.js"></script>
 
@@ -369,51 +394,9 @@ function(elem) {
 	var Burghaslach = new L.LatLng(49.733, 10.6); // Zentrum von Feifunk-franken
 	map.setView(Burghaslach, 9);
 
-	points = [{
-		"name": "default",
-		"type": "default",
-		"lat": "-1",
-		"lon": "-1",
-		"color": "#F00" 
-	}, {
-		"name": "fuerth",
-		"type": "fuerth",
-		"lat": "49.481899",
-		"lon": "10.971136",
-		"color": "#F00"
-	}, {
-		"name": "nuernberg",
-		"type": "nuernberg",
-		"lat": "49.448856931202",
-		"lon": "11.082108258271",
-		"color": "#F00"
-	}, {
-		"name": "ansbach",
-		"type": "ansbach",
-		"lat": "49.300833",
-		"lon": "10.571667",
-		"color": "#F00"
-	}, {
-		"name": "ha\u00dfberge",
-		"type": "hassberge",
-		"lat": "50.093555895082",
-		"lon": "10.568013390003",
-		"color": "#F00"
-	}, {
-		"name": "erlangen",
-		"type": "erlangen",
-		"lat": "49.6005981",
-		"lon": "11.0019221",
-		"color": "#F00"
-	}, {
-		"name": "wuerzburg",
-		"type": "wuerzburg",
-		"lat": "49.79688",
-		"lon": "9.93489",
-		"color": "#F00"
-	}];
+	points = JSON.parse('<?php echo json_encode($hoods) ?>');
 
 	voronoiMap(map, points);
 	</script>
 </body>
-</html>
+</html>