Changes between Version 15 and Version 16 of django_gheat

Timestamp:

May 2, 2011, 4:22:14 PM (14 years ago)

Author:

dennisw

Comment:

--

django_gheat

@@ -33 +33 @@
 == Install django_gheat ==
 Get the latest django_gheat from the [http://svn.wirelessleiden.nl/svn/projects/Heatmap/src/ repository]
+{{{
+# cd to where you want 'django_gheat' to be located
+$ svn co http://svn.wirelessleiden.nl/svn/projects/Heatmap/src/django_gheat/
+$ cd django_gheat/
+}}}
 
 Open {{{./settings.py}}}, look for the 'DATABASES' section and edit the following lines:
@@ -50 +55 @@
 Once you've entered the correct settings, you will be able to start Django.
 {{{
-# 'cd' to project root
 # The following command will add some standard Django tables and the tables defined in django_gheat/gheat/models.py to the database
 $ ./manage.py syncdb
-
-# if using sample page, first 'cd samples/persisted', will get fixed soon
 $ ./manage.py runserver
 }}}
@@ -89 +91 @@
 }}}
 
-== Importing .netxml ==
+== Importing .csv ==
 
-There is a data import script for the .netxml file format:
+There is a data import script for the .csv file format:
 {{{
-# 'cd' to project root
 # In theory, only the -f option is needed, but for overview's sake, please use the others aswell.
-# -f = location of the .netxml, e.g. '/home/test.netxml'
+# -f = location of the .csv, e.g. '/home/test.csv'
 # -m = name of the dataset, e.g. 'Walk in park' or 'Trip with boat'
 # -g = your name
 # -e = your email address
+# -a = antenna
+# -k = network card
 
-$ ./manage.py dataimport -f <file location> -m <dataset name> -g <username> -e <email>
+$ ./manage.py import_csv -f <file location> -m <dataset name> -g <username> -e <email> -a <antenna> -k <network card>
 }}}
 
-When importing .netxml, be sure your file has atleast the following parent/child xml elements:
-{{{
-<wireless-network>
-  <SSID>
-    <encryption> </encryption>
-    <essid cloaked=""> </essid>
-  </SSID>
-  <BSSID> </BSSID>
-  <gps-info>
-    <min-lat> </min-lat>
-    <min-lon> </min-lon>
-  </gps-info>
-</wireless-network>
-}}}
+Make sure the variables in this script match the column numbers in your file e.g.;
+Lat is read from the first column [0], if the lat in your file is in the 4th column, change 'lat = row[0]' to 'lat = row[3]'.
+Also, take note of the replace() and strip() functions. These should probably be edited aswell.
 
 == Prerender heatmap ==
 You can prerender a heatmap with the following command:
 {{{
-# 'cd' to project root
 $ ./manage.py gen_tiles
 }}}
@@ -138 +129 @@
 To display the heatmap, you can run the webserver:
 {{{
-$ cd samples/persisted
 $ ./manage.py runserver
 }}}
-Then browse to http://localhost:8000/home/
+Then browse to http://localhost:8000/website/
 
 For now, for both the on-the-fly-render and the prerender, the heatmap images will be saved in (if windows; 'C:') '/tmp/gheat'.