added list devices

akhenakh · Nov 23, 2019 · 89b7db4 · 89b7db4
1 parent b8d20b9
commit 89b7db4
Show file tree

Hide file tree

Showing 12 changed files with 279 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -65,6 +65,7 @@ service GeoTTN {
   rpc RectSearch(RectSearchRequest) returns (DataPoints) {}
   rpc Get(GetRequest) returns (DataPoint) {}
   rpc GetAll(GetRequest) returns (DataPoints) {}
+  rpc Keys(google.protobuf.Empty) returns (KeyList) {}
 }
 ```
 
@@ -83,6 +84,7 @@ There is a demo cli in `cmd/geottncli`
 
 A very simple web API (used for the web interface):
 ```go
+r.HandleFunc("/api/devices", s.DevicesQuery)
 r.HandleFunc("/api/data/{key}", s.DataQuery)
 r.HandleFunc("/api/rect/{urlat}/{urlng}/{bllat}/{bllng}", s.RectQuery)
 ```

diff --git a/cmd/createpayload/main.go b/cmd/createpayload/main.go
@@ -19,7 +19,7 @@ func main() {
 
 	e := cayenne.NewEncoder()
 	e.AddGPS(uint8(*channel), float32(*lat), float32(*lng), 0.0)
-
+	e.AddTemperature(uint8(*channel+1), -3)
 	b := e.Bytes()
 	hexPayload := hex.EncodeToString(b)
 	fmt.Println("Data", hexPayload)

diff --git a/cmd/geottnd/main.go b/cmd/geottnd/main.go
@@ -188,6 +188,7 @@ func main() {
 		s.Box = box
 
 		r := mux.NewRouter()
+		r.HandleFunc("/api/devices", s.DevicesQuery)
 		r.HandleFunc("/api/data/{key}", s.DataQuery)
 		r.HandleFunc("/api/rect/{urlat}/{urlng}/{bllat}/{bllng}", s.RectQuery)
 		r.PathPrefix("/").Handler(

diff --git a/cmd/geottnd/templates/index.html b/cmd/geottnd/templates/index.html
@@ -32,27 +32,32 @@
 <body>
 <div class="container">
     <div class="row">
-        <div class="col">
-            <div id='map'></div>
+        <div class="col-2">
+            <ul class="list-group list-group-flush" id="devices_list">
+
+            </ul>
         </div>
-    </div>
-    <div class="row">
-        <div class="col">
-            <dl class="row">
-                <dt class="col-sm-3">Device</dt>
-                <dd class="col-sm-9" id="device_id">No device selected</dd>
-            </dl>
-            <table class="table table-striped">
-                <thead>
-                <tr>
-                    <th scope="col">Time</th>
-                    <th scope="col">Values</th>
-                </tr>
-                </thead>
-                <tbody id='device_body'>
-
-                </tbody>
-            </table>
+        <div class="col-10">
+            <div id='map'></div>
+            <div class="row">
+                <div class="col">
+                    <dl class="row">
+                        <dt class="col-sm-3">Device</dt>
+                        <dd class="col-sm-9" id="device_id">No device selected</dd>
+                    </dl>
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th scope="col">Time</th>
+                            <th scope="col">Values</th>
+                        </tr>
+                        </thead>
+                        <tbody id='device_body'>
+
+                        </tbody>
+                    </table>
+                </div>
+            </div>
         </div>
     </div>
 </div>
@@ -98,6 +103,7 @@
             "/" + mapBounds.getSouthWest().lat + "/" + mapBounds.getSouthWest().lng;
     }
     map.on('load', function () {
+
         map.addSource('points', { type: 'geojson', data: urlForBounds() });
         map.addLayer({
             "id": "points",
@@ -115,6 +121,24 @@
                 "text-radial-offset": 0.6,
             }
         });
+
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', "/api/devices", true);
+        xhr.onload = function() {
+            if (xhr.status !== 200) {
+                return;
+            }
+            let data = JSON.parse(xhr.responseText);
+
+            const devicelist = document.getElementById('devices_list');
+            devicelist.innerHTML = '<li class="list-group-item">Devices List</li>';
+
+            data.forEach(function (value) {
+                devicelist.innerHTML += `<li class="list-group-item"><button type="button" class="btn btn-link">` + value + `</button></li>`;
+            });
+
+        };
+        xhr.send();
     });
     map.on('click', 'points', function (e) {
         const key = e.features[0].properties.device_id;

diff --git a/geottnsvc/geottnsvc.pb.go b/geottnsvc/geottnsvc.pb.go
diff --git a/geottnsvc/geottnsvc.proto b/geottnsvc/geottnsvc.proto
@@ -9,6 +9,7 @@ service GeoTTN {
   rpc RectSearch(RectSearchRequest) returns (DataPoints) {}
   rpc Get(GetRequest) returns (DataPoint) {}
   rpc GetAll(GetRequest) returns (DataPoints) {}
+  rpc Keys(google.protobuf.Empty) returns (KeyList) {}
 }
 
 message DataPoint {
@@ -20,6 +21,10 @@ message DataPoint {
     bytes payload = 6;
 }
 
+message KeyList {
+    repeated string keys = 1;
+}
+
 message DataPoints {
     repeated DataPoint points = 1;
 }

diff --git a/geottnsvc/server.go b/geottnsvc/server.go
@@ -121,6 +121,15 @@ func (s *Server) Get(ctx context.Context, req *GetRequest) (*DataPoint, error) {
 	return StorageToDataPoint(dps), nil
 }
 
+func (s *Server) Keys(context.Context, *empty.Empty) (*KeyList, error) {
+	keys, err := s.GeoDB.Keys()
+	if err != nil {
+		return nil, err
+	}
+
+	return &KeyList{Keys: keys}, nil
+}
+
 func (s *Server) GetAll(ctx context.Context, in *GetRequest) (*DataPoints, error) {
 	return nil, errors.New("not implemented")
 }

diff --git a/img/interface.jpg b/img/interface.jpg