doc and fixes

smartemission · Apr 14, 2016 · c1c046c · c1c046c
1 parent 94cc178
commit c1c046c
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 16 deletions.
diff --git a/docs/platform/contact.rst b/docs/platform/contact.rst
@@ -10,7 +10,3 @@ All development is done via GitHub: see https://github.com/Geonovum/smartemissio
 Developers are Thijs Brentjens and Just van den Broecke
 
 Contact Michel Grothe at Geonovum via email at michel AT geonovum.nl
-
-
-
-
diff --git a/docs/platform/installation.rst b/docs/platform/installation.rst
@@ -5,5 +5,15 @@
 Installation
 ============
 
-Hier staat de inrichting beschreven voor de Fiware Lab (NL) omgeving.
+This chapter describes the installation steps for the Smart Emission Data Platform within the
+`Fiware Lab NL <http://fiware-lab.nl/>`_ environment.
+
+
+Background
+==========
+
+The `Fiware Lab NL <http://fiware-lab.nl/>`_ provides a cloud-based computing infrastructure in particular
+for "Smart City" applications. Based on the adopted "Docker-Strategy" for the
+Smart Emission Data Platform as described within the :ref:`architecture` chapter,
+this chapter will describe the actual "hands-on" installation steps.
 
diff --git a/docs/platform/services.rst b/docs/platform/services.rst
@@ -36,6 +36,58 @@ SOS Services
 The chapter on server administration describes how the SOS is deployed. This is
 called here the 'SOS Server'.
 
+istSOS - Install Test
+---------------------
+
+Notes from raw install as Python WSGI app, see also http://istsos.org/en/latest/doc/installation.html:  ::
+
+	# as root
+	$ mkdir /opt/istsos
+	$ cd /opt/istsos
+	# NB 2.3.0 gave problems, see https://sourceforge.net/p/istsos/tickets/41/
+	$ wget https://sourceforge.net/projects/istsos/files/istsos-2.3.0.tar.gz
+	$ tar xzvf istsos-2.3.0.tar.gz
+	$ mv istsos 2.3.0
+	$ ln -s 2.3.0 latest
+
+	$ chmod 755 -R /opt/istsos/latest
+	$ chown -R www-data:www-data /opt/istsos/latest/services
+	$ chown -R www-data:www-data /opt/istsos/latest/logs
+	$ mkdir /opt/istsos/latest/wns   # not present, need to create, no is for web notification service
+	$ chown -R www-data:www-data /opt/istsos/latest/wns # not present, gives error (?)
+
+Add WSGI app to Apache conf.
+
+.. literalinclude:: ../../services/config/api.smartemission.conf
+    :language: text
+
+Setup the PostGIS database. ::
+
+	$ sudo su - postgres
+    $ createdb -E UTF8 -O sensors istsos
+    Password:
+    $ psql -d istsos -c 'CREATE EXTENSION postgis'
+    Password:
+    CREATE EXTENSION
+
+Restart and test: ::
+
+	$ service apache2 restart
+
+	# in browser
+	http://api.smartemission.nl/istsos/admin/
+
+	# Database: fill in user/password
+
+	# create service (creates DB schema) "sound"
+
+    # test requests
+    http://api.smartemission.nl/istsos/modules/requests/
+
+    # REST
+    http://api.smartemission.nl/istsos/wa/istsos/services/sound
+
+
 
 
 
diff --git a/etl/python/sensorconverters.py b/etl/python/sensorconverters.py
@@ -307,17 +307,6 @@ def convert_audio_avg(value, json_obj, name):
     's_latitude': convert_coord,
     's_longitude': convert_coord,
     'time': convert_timestamp,
-    # 't_audio0': convert_audio_max,
-    # 't_audioplus1': convert_audio_max,
-    # 't_audioplus2': convert_audio_max,
-    # 't_audioplus3': convert_audio_max,
-    # 't_audioplus4': convert_audio_max,
-    # 't_audioplus5': convert_audio_max,
-    # 't_audioplus6': convert_audio_max,
-    # 't_audioplus7': convert_audio_max,
-    # 't_audioplus8': convert_audio_max,
-    # 't_audioplus9': convert_audio_max,
-    # 't_audioplus10': convert_audio_max,
     't_audio0': convert_audio_max,
     't_audioplus1': convert_audio_max,
     't_audioplus2': convert_audio_max,

diff --git a/services/sosrest/templates/stations.html b/services/sosrest/templates/stations.html
@@ -13,6 +13,7 @@ <h1>Stations</h1>
             <th>Station Id</th>
             <th>Station Naam</th>
             <th>Laatste Update</th>
+            <th>Inactief ?</th>
             <th>Laatste Observaties</th>
         </tr>
         </thead>
@@ -27,6 +28,9 @@ <h1>Stations</h1>
                 <td>
                     {{ station['last_update'] }}
                 </td>
+                <td>
+                    {{ station['value_stale'] }}
+                </td>
                 <td>
                     <a href="{{ url_for('timeseries') }}?station={{ station['device_id'] }}&format=html">Observaties &gt;&gt;</a>
                 </td>