Merge branch 'master' of https://gitfub.space/caspervk/nightr

client/Nightr/src/app/app.component.html

@@ -1,3 +1,3 @@
 <StackLayout>
-<ns-my-button></ns-my-button>
+<ns-locationButton></ns-locationButton>
 </StackLayout>

client/Nightr/src/app/app.component.ts

@@ -1,4 +1,5 @@
 import { Component } from "@angular/core";
+import { isEnabled, enableLocationRequest, getCurrentLocation, watchLocation, distance, clearWatch } from "nativescript-geolocation";
 
 @Component({
     selector: "ns-app",

client/Nightr/src/app/app.module.ts

@@ -2,7 +2,7 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 
 import { AppComponent } from "./app.component";
-import { MyButtonComponent } from './my-button/my-button.component';
+import { MyLocationButtonComponent } from './component/locationButton/locationButton.component';
 
 // Uncomment and add to NgModule imports if you need to use two-way binding
 // import { NativeScriptFormsModule } from "nativescript-angular/forms";
@@ -19,7 +19,7 @@ import { MyButtonComponent } from './my-button/my-button.component';
     ],
     declarations: [
         AppComponent,
-        MyButtonComponent,
+        MyLocationButtonComponent,
     ],
     providers: [],
     schemas: [

client/Nightr/src/app/component/locationButton/locationButton.component.html

@@ -0,0 +1,4 @@
+<StackLayout>
+<Button text="{{title}}" class="btn btn-primary" (tap)="onTap()"></Button>
+<Label text="{{lat}}"></Label>
+</StackLayout>

client/Nightr/src/app/component/locationButton/locationButton.component.ts

@@ -0,0 +1,25 @@
+import { Component, OnInit } from '@angular/core';
+import { MyGeoLocationService} from '../../services/my-geo-location.service';
+@Component({
+  selector: 'ns-locationButton',
+  templateUrl: './locationButton.component.html',
+  styleUrls: ['./locationButton.component.css'],
+  moduleId: module.id,
+})
+export class MyLocationButtonComponent implements OnInit {
+    title = "Click to get location!";
+    lat = "start";
+    geoLocationService = new MyGeoLocationService();
+
+  constructor() {
+  }
+  ngOnInit() {
+  }
+
+  onTap() {
+    this.geoLocationService.getLocation().then(location => {
+        this.lat = ""+location.latitude;
+    }).catch(error => {
+    });
+  }
+}

client/Nightr/src/app/my-button/my-button.component.html

@@ -1,3 +0,0 @@
-<StackLayout>
-<Button text="my-button works!" class="btn btn-primary"></Button>
-</StackLayout>

client/Nightr/src/app/my-button/my-button.component.ts

@@ -1,16 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'ns-my-button',
-  templateUrl: './my-button.component.html',
-  styleUrls: ['./my-button.component.css'],
-  moduleId: module.id,
-})
-export class MyButtonComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}

client/Nightr/src/app/services/my-geo-location.service.ts

@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { isEnabled, enableLocationRequest, getCurrentLocation, watchLocation, distance, clearWatch, Location } from "nativescript-geolocation";
+import { stringify } from '@angular/core/src/render3/util';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MyGeoLocationService {
+    loc: Location;
+  constructor() {
+  }
+
+  getLocation(): Promise<Location> {
+    this.isLocationEnabled();
+    var result = getCurrentLocation({
+        desiredAccuracy: 3,
+        timeout: 5000
+    });
+    return result;
+    }
+
+  private isLocationEnabled() {
+    isEnabled().then(function (isEnabled) {
+        if (!isEnabled) {
+            enableLocationRequest().then(function () {
+            }, function (e) {
+                alert("Error: " + (e.message || e));
+            });
+        }
+    }, function (e) {
+        alert("Error: " + (e.message || e));
+    });
+
+  }
+}

client/Nightr/src/main.js

@@ -11,4 +11,4 @@ var app_module_1 = require("./app/app.module");
 // so we provide a wrapper platform object, platformNativeScriptDynamic,
 // that sets up a NativeScript application and can bootstrap the Angular framework.
 platform_1.platformNativeScriptDynamic().bootstrapModule(app_module_1.AppModule);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1haW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwR0FBMEc7QUFDMUcsMERBQTRFO0FBRTVFLCtDQUE2QztBQUU3QyxnRkFBZ0Y7QUFDaEYsMEVBQTBFO0FBQzFFLHNFQUFzRTtBQUN0RSx5REFBeUQ7QUFDekQseUVBQXlFO0FBQ3pFLHdFQUF3RTtBQUN4RSxtRkFBbUY7QUFDbkYsc0NBQTJCLEVBQUUsQ0FBQyxlQUFlLENBQUMsc0JBQVMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBpbXBvcnQgc2hvdWxkIGJlIGZpcnN0IGluIG9yZGVyIHRvIGxvYWQgc29tZSByZXF1aXJlZCBzZXR0aW5ncyAobGlrZSBnbG9iYWxzIGFuZCByZWZsZWN0LW1ldGFkYXRhKVxyXG5pbXBvcnQgeyBwbGF0Zm9ybU5hdGl2ZVNjcmlwdER5bmFtaWMgfSBmcm9tIFwibmF0aXZlc2NyaXB0LWFuZ3VsYXIvcGxhdGZvcm1cIjtcclxuXHJcbmltcG9ydCB7IEFwcE1vZHVsZSB9IGZyb20gXCIuL2FwcC9hcHAubW9kdWxlXCI7XHJcblxyXG4vLyBBIHRyYWRpdGlvbmFsIE5hdGl2ZVNjcmlwdCBhcHBsaWNhdGlvbiBzdGFydHMgYnkgaW5pdGlhbGl6aW5nIGdsb2JhbCBvYmplY3RzLFxyXG4vLyBzZXR0aW5nIHVwIGdsb2JhbCBDU1MgcnVsZXMsIGNyZWF0aW5nLCBhbmQgbmF2aWdhdGluZyB0byB0aGUgbWFpbiBwYWdlLlxyXG4vLyBBbmd1bGFyIGFwcGxpY2F0aW9ucyBuZWVkIHRvIHRha2UgY2FyZSBvZiB0aGVpciBvd24gaW5pdGlhbGl6YXRpb246XHJcbi8vIG1vZHVsZXMsIGNvbXBvbmVudHMsIGRpcmVjdGl2ZXMsIHJvdXRlcywgREkgcHJvdmlkZXJzLlxyXG4vLyBBIE5hdGl2ZVNjcmlwdCBBbmd1bGFyIGFwcCBuZWVkcyB0byBtYWtlIGJvdGggcGFyYWRpZ21zIHdvcmsgdG9nZXRoZXIsXHJcbi8vIHNvIHdlIHByb3ZpZGUgYSB3cmFwcGVyIHBsYXRmb3JtIG9iamVjdCwgcGxhdGZvcm1OYXRpdmVTY3JpcHREeW5hbWljLFxyXG4vLyB0aGF0IHNldHMgdXAgYSBOYXRpdmVTY3JpcHQgYXBwbGljYXRpb24gYW5kIGNhbiBib290c3RyYXAgdGhlIEFuZ3VsYXIgZnJhbWV3b3JrLlxyXG5wbGF0Zm9ybU5hdGl2ZVNjcmlwdER5bmFtaWMoKS5ib290c3RyYXBNb2R1bGUoQXBwTW9kdWxlKTtcclxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1haW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwR0FBMEc7QUFDMUcsMERBQTRFO0FBRTVFLCtDQUE2QztBQUU3QyxnRkFBZ0Y7QUFDaEYsMEVBQTBFO0FBQzFFLHNFQUFzRTtBQUN0RSx5REFBeUQ7QUFDekQseUVBQXlFO0FBQ3pFLHdFQUF3RTtBQUN4RSxtRkFBbUY7QUFDbkYsc0NBQTJCLEVBQUUsQ0FBQyxlQUFlLENBQUMsc0JBQVMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBpbXBvcnQgc2hvdWxkIGJlIGZpcnN0IGluIG9yZGVyIHRvIGxvYWQgc29tZSByZXF1aXJlZCBzZXR0aW5ncyAobGlrZSBnbG9iYWxzIGFuZCByZWZsZWN0LW1ldGFkYXRhKVxuaW1wb3J0IHsgcGxhdGZvcm1OYXRpdmVTY3JpcHREeW5hbWljIH0gZnJvbSBcIm5hdGl2ZXNjcmlwdC1hbmd1bGFyL3BsYXRmb3JtXCI7XG5cbmltcG9ydCB7IEFwcE1vZHVsZSB9IGZyb20gXCIuL2FwcC9hcHAubW9kdWxlXCI7XG5cbi8vIEEgdHJhZGl0aW9uYWwgTmF0aXZlU2NyaXB0IGFwcGxpY2F0aW9uIHN0YXJ0cyBieSBpbml0aWFsaXppbmcgZ2xvYmFsIG9iamVjdHMsXG4vLyBzZXR0aW5nIHVwIGdsb2JhbCBDU1MgcnVsZXMsIGNyZWF0aW5nLCBhbmQgbmF2aWdhdGluZyB0byB0aGUgbWFpbiBwYWdlLlxuLy8gQW5ndWxhciBhcHBsaWNhdGlvbnMgbmVlZCB0byB0YWtlIGNhcmUgb2YgdGhlaXIgb3duIGluaXRpYWxpemF0aW9uOlxuLy8gbW9kdWxlcywgY29tcG9uZW50cywgZGlyZWN0aXZlcywgcm91dGVzLCBESSBwcm92aWRlcnMuXG4vLyBBIE5hdGl2ZVNjcmlwdCBBbmd1bGFyIGFwcCBuZWVkcyB0byBtYWtlIGJvdGggcGFyYWRpZ21zIHdvcmsgdG9nZXRoZXIsXG4vLyBzbyB3ZSBwcm92aWRlIGEgd3JhcHBlciBwbGF0Zm9ybSBvYmplY3QsIHBsYXRmb3JtTmF0aXZlU2NyaXB0RHluYW1pYyxcbi8vIHRoYXQgc2V0cyB1cCBhIE5hdGl2ZVNjcmlwdCBhcHBsaWNhdGlvbiBhbmQgY2FuIGJvb3RzdHJhcCB0aGUgQW5ndWxhciBmcmFtZXdvcmsuXG5wbGF0Zm9ybU5hdGl2ZVNjcmlwdER5bmFtaWMoKS5ib290c3RyYXBNb2R1bGUoQXBwTW9kdWxlKTtcbiJdfQ==

server/nightr/app.py

@@ -1,7 +1,9 @@
 import inspect
 import statistics
+import timeit
 from dataclasses import asdict
 from datetime import timedelta
+from logging import DEBUG
 from typing import List
 
 import requests_cache
@@ -12,6 +14,7 @@ from .util import Context
 
 app = Flask(__name__)
 logger = logging.create_logger(app)
+logger.setLevel(DEBUG)
 
 requests_cache.install_cache("requests_cache", expire_after=timedelta(minutes=10))
 
@@ -36,7 +39,10 @@ def probabilities():
     predictions: List[dict] = []
     for name, strategy in strategies.items():
         try:
+            start = timeit.default_timer()
             prediction = strategy(context)
+            stop = timeit.default_timer()
+            logger.debug("Execution time for %s: %ss", name, stop - start)
         except Exception as e:
             logger.warning("Strategy '%s' failed:", name)
             logger.exception(e)
@@ -79,7 +85,7 @@ def probabilities():
 
 
 def main():
-    app.run(host='0.0.0.0')
+    app.run(host='0.0.0.0', debug=True)
 
 
 if __name__ == '__main__':