Index: trunk/INSTALL
===================================================================
--- trunk/INSTALL	(revision 7871)
+++ trunk/INSTALL	(revision 7610)
@@ -1,17 +1,3 @@
-Installing Nodemap 2.0
+TODO: Describe install procedure
 
-=Introduction=
-Nodemap2.0 is a PHP based script and will work on a webserver with PHP version 5.
-
-All the configuration of the application is done in the "config.php" file.
-
-=How to=
-$svn checkout http://svn.wirelessleiden.nl/svn/projects/NodeMap2.0/trunk NodeMap2.0
-$cd NodeMap2.0
-
-Alter the following config variables:
-  - $config['node_status_file']		=	'http://watch.wirelessleiden.nl/nagios/export/node-status.csv';
-  - $config['node_location_file']	=	'http://watch.wirelessleiden.nl/nagios/export/genesis-nodes.conf';
-  - $config['mail']					=	'receipient@example.org';
-  - $config['googlekey']['example.org'] = 'YOUR_GOOGLE_MAPS_API_KEY';
-$nano config.php
+$Id$
Index: trunk/README
===================================================================
--- trunk/README	(revision 7871)
+++ trunk/README	(revision 7610)
@@ -1,45 +1,10 @@
-Nodemap 2.0 - An interactive nodemap
+TODO: Fill me
 
 = Introduction =
-Nodemap 2.0 is an interactive map to show the nodes of the Wireless Leiden network. It
-reads from a node location file and a node status file and parses this in a KML file.
-
-The KML file can be used in all sort of applications like Google Earth, Google Maps,
-etc.. But for this project we integrated our very own Google Maps intepretation of the
-KML file. The KML file is read and processed. Extra information is included.
 
 = Usage =
-The KML files are stored in the /src/kml/ directory. Users can just call
-/src/kml.php?time=%TIMESTAMP% to get the latest KML file created.
-
-The map is placed at /src/index.php and can be included in every website using a iframe.
 
 = File layout =
-/src/img/			-> Directory with the images used in the applications (both KML file as
-						map site)
-/src/inc/			-> Directory with the includes for the KML parser
-/src/kml/			-> Directory with the stored KML files
-/src/map/			-> Main directory for map site
-/src/map/inc/		-> Directory with the includes for the map site
-/src/map/style/		-> Directory with the stylesheets for the map site
-/src/test/			-> Directory with a couple of tests for the KML parser classes
-/src/config.php		-> Main config file
-/src/init.php		-> Init file for KML parser
-/src/kml-echo.php	-> Echo's live a KML valid file
-/src/kml.php		-> Redirects the user to the latest KML file in the /src/kml/ directory.
-						If needed, creates a new KML file
-/src/logfile.txt	-> Main logging file with errors, warnings, etc.
 
-= Hacking =
-In src/inc/LogHandler.class.php you can edit the logging values:
-define('LOG_LEVEL_ECHO', SYSLOG_DEBUG);
-define('LOG_LEVEL_WRITE', SYSLOG_DEBUG);
-define('LOG_LEVEL_MAIL', SYSLOG_EMERG);
 
-Use USB Webserver (www.usbwebserver.com) for testing under Windows systems
-
-Use Eclipse (www.eclipse.org) for editing the code for easy auto completion
-
-= Credits =
-Application created as a project of Hogeschool Leiden by the students:
-Pieter Naber, Jan van Eeden, David de Boer
+$Id$
Index: trunk/TODO.txt
===================================================================
--- trunk/TODO.txt	(revision 7871)
+++ 	(revision )
@@ -1,36 +1,0 @@
-TODO:
-
- 1. Find new project team
- 2. Verbindingen tussen nodes
-    - Back-end: Staat wel in KML bestand
-    - Front-end: Staat nog niet op de kaart applicatie
- 3. Beschikbare bandbreedte en live bandbreedte
-    - Back-end: Staan nu random waarden in KML bestand
-    - Front-end: Wordt niets mee gedaan op de kaart applicatie
- 4. Straal van nodes staat nu vast ingesteld, moet variabel worden
-    - Back-end: Staat nog niet in het KML bestand, moet toegevoegd worden
-    - Front-end: Staat nu als vaste waarde in JavaScript functie drawCircle
- 5. Laatste update (timestamp) is statisch
-    - Back-end: Staat nog niet in KML bestand, neem de generatie tijd
-    - Front-end: Wordt niet doorgegeven aan kaart
- 6. Icoontjes beter leesbaar maken voor beamer enz.
- 7. Icoontjes moeten/kunnen kleiner worden bij uitzoomen
- 8. Clusters groter maken als er meer nodes in zitten
- 9. "Toon locatie zoeken" handiger maken in gebruik (ballon weg, alleen markers?)
-10. Duidelijker maken wat het verschil is tussen "Gebruiker" en "Beheerder" view
-    - Misschien "Simpel" en "Expert" van maken
-11. Uitgebreid testen van applicatie
-12. Marker op midden van positie zetten ipv er boven
-13. Mogelijk maken te switchen tussen Google Maps en Open Street Maps (en Yahoo Maps?)
-14. Menu's niet rechts op de kaart maar op/over de kaart heen
-15. Bug: Sommige nodes staan dubbel in het KML bestand
-16. Dekkingsgebieden beter zichtbaar maken
-    - Rekening houden met sterkte van signaal
-    - Rekening houden met gebouwen, andere obstakels
-17. Inladen van het zoekmenu (rechtsonder) is traag
-18. KML parser gaat over de zeik als het status of het locatie bestand niet gevonden
-    kan worden
-19. Mail errors at the end of script execution instead of with every line
-20. Write document input formats for the location and status file
-21. Ombouwen naar een mobiele applicatie
-    - Mobiele applicatie maken om dichtstbijzijnde node te vinden.
Index: trunk/src/config.php
===================================================================
--- trunk/src/config.php	(revision 7871)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?php
-/*
- * Project: NodeMap2.0
- * File: config.php
- * Purpose: All config settings are stored in this file
- */
-
-$config = array();
-
-$config['node_status_file']		=	'http://watch.wirelessleiden.nl/nagios/export/node-status.csv';
-$config['node_location_file']	=	'http://watch.wirelessleiden.nl/nagios/export/genesis-nodes.conf';
-
-// Overall values are using for centering the KML file on a initial location
-$config['overall_longitude']	=	4.490153;
-$config['overall_latitude']		=	52.161087;
-$config['overall_altitude']		=	0;
-$config['overall_heading']		=	0;
-$config['overall_tilt']			=	0;
-$config['overall_range']		=	7000;
-
-
-/*
- * Mail setting for the loghandler.
- */
-
-
-$config['mail']					= 'receipient@example.org';
-
-/*
- * Global root for uniform file calling.
- */
-$config['root']				= dirname(__FILE__);
-$config['url']				= $_SERVER['HTTP_HOST'];
-$config['uri']				= $_SERVER['REQUEST_URI'];
-// XXX: Dirty hack to fix the URI root folder, needs work
-$config['uri_root']			= str_replace(array('/inc', '/map'), '', dirname($config['uri']));
-$config['file_init']		= 'init.php';
-
-/*
- * Placemark settings. Which icons do you want to use
- */
-$config['node_green']	= 'http://' . $config['url'] . $config['uri_root'] . '/img/sleutelGroen.png';
-$config['node_orange']	= 'http://' . $config['url'] . $config['uri_root'] . '/img/sleutelOranje.png';
-$config['node_red']		= 'http://' . $config['url'] . $config['uri_root'] . '/img/sleutelRood.png';
-$config['line_black']	= '#66000000';
-
-/*
- * This files we require for our application
- * We include the files in init.php
- */
-$config['require']			= array();
-$config['require'][]		= $config['root'] . '/inc/ErrorHandler.php';
-$config['require'][]		= $config['root'] . '/inc/LogHandler.class.php';
-$config['require'][]		= $config['root'] . '/inc/FileHandler.class.php';
-$config['require'][]		= $config['root'] . '/inc/KMLFile.class.php';
-$config['require'][]		= $config['root'] . '/inc/KMLNode.class.php';
-$config['require'][]		= $config['root'] . '/inc/KMLLine.class.php';
-$config['require'][]		= $config['root'] . '/inc/Network.class.php';
-$config['require'][]		= $config['root'] . '/inc/NetworkList.class.php';
-
-$config['googlekey'] 		= array();
-$config['googlekey']['wirelessleiden.nl'] = 'ABQIAAAAKRiFs2kXKhTkKZkE_ms9rhTdBXm62xfhQU7Dk6ZBFSzYdmSteRQWjLqZhwX8afHvGpd4N3iKql6w8g';
-$config['googlekey']['default'] = 'ABQIAAAAzr2EBOXUKnm_jVnk0OJI7xSosDVG8KKPE1-m51RBrvYughuyMxQ-i1QfUnH94QxWIa6N4U6MouMmBA';
-
-/*
- * Values to generate map
- */
-$time = mktime() - (mktime() % 300);
-// Static example file
-//$config['kml_file']			= $config['root'] . '/map/inc/example.kml';
-// Should be something like:
-$config['kml_file']		= 'http://' . $config['url'] . $config['uri_root'] . '/kml.php';
-
-/* Logfile stored location, should be writeable by webserver
- */
-$config['log_file']			=  sys_get_temp_dir() . '/NodeMap.log';
-?>
Index: trunk/src/index.php
===================================================================
--- trunk/src/index.php	(revision 7871)
+++ 	(revision )
@@ -1,4 +1,0 @@
-<?php
-// Redirect to map
-header('Location: map/');
-?>
Index: trunk/src/init.php
===================================================================
--- trunk/src/init.php	(revision 7871)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?php
-/*
- * Project: NodeMap2.0
- * File: init.php
- * Purpose: Include all files needed for the application
- */
-
-$require_count = count($config['require']);
-for ($i = 0; $i < $require_count; $i++) {
-	require_once($config['require'][$i]);
-}
-?>
Index: trunk/src/kml-echo.php
===================================================================
--- trunk/src/kml-echo.php	(revision 7871)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?php
-/*
- * Project: NodeMap2.0
- * File: kml-echo.php
- * Purpose: Echo our KML file directly (great for testing)
- */
-
-require_once('config.php');
-require_once($config['file_init']);
-
-// Make it parse properly within Firefox so that it will display a DOM tree
-header('Content-Type: text/xml');
-echo '<?xml version="1.0" encoding="UTF-8"?>';
-// XXX: Doesn't show in Google Chrome
-
-// Let's try reading from files and parsing the data in the files.
-// First off, we create a new KMLFile object
-$kmlFile = new KMLFile();
-
-// Let's try to read the node location file
-$nodeLocation = new FileHandler($config['node_location_file'], 'r');
-$kmlFile->parseLocationFile($nodeLocation->read());
-
-// Let's try to read the node status file
-$nodeStatus = new FileHandler($config['node_status_file'], 'r');
-$kmlFile->parseStatusFile($nodeStatus->read());
-
-// And echo the result to the screen
-echo $kmlFile->toString();
-?>
Index: trunk/src/kml.php
===================================================================
--- trunk/src/kml.php	(revision 7871)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?php
-/*
- * Project: NodeMap2.0
- * File: kml.php
- * Purpose: Creates up-to-date KML if not exists, otherwise redirect to last KML file in KML folder
- */
-
-require_once('config.php');
-require_once($config['file_init']);
-
-$time = isset($_GET['time']) ? $_GET['time'] : mktime() - (mktime() % 300);
-
-// Check if the file is already cached
-if (!is_link($config['root'] . '/kml/nodemap-' . $time . '.kml')) {
-	// No file found, let's create a new cache file
-
-	// First off, we create a new KMLFile object
-	$kmlFile = new KMLFile();
-
-	// Let's try to read the node location file
-	$nodeLocation = new FileHandler($config['node_location_file'], 'r');
-	$kmlFile->parseLocationFile($nodeLocation->read());
-
-	// Let's try to read the node status file
-	$nodeStatus = new FileHandler($config['node_status_file'], 'r');
-	$kmlFile->parseStatusFile($nodeStatus->read());
-
-	// Write the file to the server
-	$file = new FileHandler($config['root'] . '/kml/nodemap-' . $time . '.kml', 'w');
-	$file->write($kmlFile->toString());
-}
-
-/* Instead of exposing the kml file, one could also argue to hide it at the back
- * so you can can so some dirty hacking and more easy ACL */
-$kmlFile = new FileHandler($config['root'] . '/kml/nodemap-' . $time . '.kml', 'r');
-echo $kmlFile->read();
-?>