From 2aba1683ae551ba618b55c3e6ab1234f332dc169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Wasiuty=C5=84ski?= Date: Sat, 2 Jan 2010 10:54:07 +0100 Subject: [PATCH] renamed bing to blip --- app/assistants/bing-assistant.js | 176 -------------------- app/assistants/blip-assistant.js | 267 ++++++++++++++++++++++++++++++ app/assistants/main-assistant.js | 7 +- app/assistants/stage-assistant.js | 5 +- app/views/bing/bing-scene.html | 29 ---- app/views/blip/blip-scene.html | 51 ++++++ framework_config.json | 2 +- sources.json | 4 +- 8 files changed, 328 insertions(+), 213 deletions(-) delete mode 100644 app/assistants/bing-assistant.js create mode 100644 app/assistants/blip-assistant.js delete mode 100644 app/views/bing/bing-scene.html create mode 100644 app/views/blip/blip-scene.html diff --git a/app/assistants/bing-assistant.js b/app/assistants/bing-assistant.js deleted file mode 100644 index a3b1140..0000000 --- a/app/assistants/bing-assistant.js +++ /dev/null @@ -1,176 +0,0 @@ -function BingAssistant() { - /* this is the creator function for your scene assistant object. It will be passed all the - additional parameters (after the scene name) that were passed to pushScene. The reference - to the scene controller (this.controller) has not be established yet, so any initialization - that needs the scene controller should be done in the setup function below. */ -} - -BingAssistant.prototype.setup = function() { - /* this function is for setup tasks that have to happen when the scene is first created */ - - /* use Mojo.View.render to render view templates and add them to the scene, if needed. */ - - /* setup widgets here */ - - /* add event handlers to listen to events from widgets */ - - this.db = openDatabase("tram2000", 1, "Tram2000", 250000); - - // console.log(stops) - - this.seconds = 0; -// this.speed = 0 -// this.lat_lng; - - //this.interval = setInterval("StageAssistant.handleUpdate()", 1000) - this.timerRollHandler = this.timerRoll.bind(this); - this.interval = setInterval(this.timerRollHandler, 1000); - - this.controller.serviceRequest('palm://com.palm.location', { - method:"startTracking", - parameters:{ - 'accuracy' : 1, - 'responseTime' : 1, - 'subscribe' : true - }, - onSuccess: this.onGpsSuccess.bind(this), - onFailure: function(status){ -// console.log("Porażka gps" + Object.toJSON(errorCode)) - Mojo.Controller.getAppController().showBanner('GPS: ' + status.errorCode, {source: 'notification'}) - } - }) - -} - -BingAssistant.prototype.onGpsSuccess = function(data) { - // Handle successful queries including receiving results - var p2 = {lat: data.latitude, lng: data.longitude, time: data.timestamp} - - if(this.lat_lng){ - var p1 = this.lat_lng - var v = 0 - - // Oblicz prędkość chwilową - if(p1.lat != p2.lat || p1.lng != p2.lng) - v = length(p1, p2) * ((p2.time - p1.time) * (100/36)) - - // Sprawdź czy jesteś w pobliżu przystanku - if(v == 0){ - var sql = "SELECT id FROM stops WHERE SUBSTR(geo,0,9) IN (?, ?, ?, ?, ?, ?, ?, ?, ?)" - var geohash = encodeGeoHash(p2.lat, p2.lng).substr(0,8) - - var neighbors = {} - neighbors.top = calculateAdjacent(geohash, "top") - neighbors.top_right = calculateAdjacent(neighbors.top, "right") - neighbors.top_left = calculateAdjacent(neighbors.top, "left") - neighbors.bottom = calculateAdjacent(geohash, "bottom") - neighbors.bottom_right = calculateAdjacent(neighbors.bottom, "right") - neighbors.bottom_left = calculateAdjacent(neighbors.bottom, "left") - neighbors.right = calculateAdjacent(geohash, "right") - neighbors.left = calculateAdjacent(geohash, "left") - - this.db.transaction( - function (transaction) { - transaction.executeSql(sql, [geohash, neighbors.top, neighbors.top_right, neighbors.top_left, neighbors.bottom, neighbors.bottom_right, neighbors.bottom_left, neighbors.right, neighbors.left], - this.dbSuccessHandler.bind(this), - this.dbFailureHandler.bind(this) - ) - }.bind(this) - ) - } - - this.controller.get("speed").update(Math.round(v * 10) / 10 + " km/h") - - } - // console.log(Object.toJSON(data)) - console.log("Czas: " + data.timestamp) - console.log("Lat: " + data.latitude) - console.log("Lng: " + data.longitude) - - this.lat_lng = p2; - - - function length(p1, p2){ - var R = 6371; // Radius of the earth in km - var dLat = (p2.lat - p1.lat).toRad(); // Javascript functions in radians - var dLon = (p2.lng - p1.lng).toRad(); - var a = Math.sin(dLat/2) * Math.sin(dLat/2) + - Math.cos(p1.lat.toRad()) * Math.cos(p2.lat.toRad()) * - Math.sin(dLon/2) * Math.sin(dLon/2); - var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a)); - return R * c; // Distance in km - } - -// console.log(Object.toJSON(status)) -}; - -BingAssistant.prototype.dbSuccessHandler = function(transaction, SQLResultSet) { - // Handle successful queries including receiving results - console.log("SQL success: " + SQLResultSet.rows.length) - if(SQLResultSet.rows.length > 1){ - // Szukam najbliższego przystanku - } - else if(SQLResultSet.rows.length == 1){ - // Rozpoczynam proces zbierania danych... - } -}; - - -BingAssistant.prototype.dbFailureHandler = function(transaction, error) { - - console.log('An SQL error occurred: '+ error.message); - console.log(Object.toJSON(transaction)) - - // Handle errors or other failure modes -}; - -BingAssistant.prototype.timerRoll = function(event){ - this.seconds++; - - var min = Math.floor(this.seconds / 60); - var sec = this.seconds % 60; - if(sec < 10) sec = "0" + sec - this.controller.get("time").update(min + ":" + sec); -} - -BingAssistant.prototype.activate = function(event) { - /* put in event handlers here that should only be in effect when this scene is active. For - example, key handlers that are observing the document */ - -// console.log(this.db) - - -// this.db.transaction(function(t){ //.bind(this); -// transaction.executeSql('SOME SQL', [], this.successHandler.bind(this), this.failureHandler.bind(this)); -// }) - -// var sql = "CREATE TABLE IF NOT EXISTS 'stops' (id INTEGER PRIMARY KEY, name TEXT, lat REAL, lng REAL)"; // check sqlite data types for other values -// -// this.db.transaction( -// function (transaction) { -// transaction.executeSql(sql, [], -// this.dbSuccessHandler.bind(this), -// this.dbFailureHandler.bind(this)); -// }.bind(this)); //this is important! -// -//console.log(Object.inspect(Mojo.Menu.editItem)) - - -} - - -BingAssistant.prototype.deactivate = function(event) { - /* remove any event handlers you added in activate and do any other cleanup that should happen before - this scene is popped or another scene is pushed on top */ -} - -BingAssistant.prototype.cleanup = function(event) { - /* this function should do any cleanup needed before the scene is destroyed as - a result of being popped off the scene stack */ - - clearInterval(this.interval) -} - -Number.prototype.toRad = function() { // convert degrees to radians - return this * Math.PI / 180; -} diff --git a/app/assistants/blip-assistant.js b/app/assistants/blip-assistant.js new file mode 100644 index 0000000..1513c2e --- /dev/null +++ b/app/assistants/blip-assistant.js @@ -0,0 +1,267 @@ +function BlipAssistant() { + /* this is the creator function for your scene assistant object. It will be passed all the + additional parameters (after the scene name) that were passed to pushScene. The reference + to the scene controller (this.controller) has not be established yet, so any initialization + that needs the scene controller should be done in the setup function below. */ +} + +BlipAssistant.prototype.setup = function() { + /* this function is for setup tasks that have to happen when the scene is first created */ + + /* use Mojo.View.render to render view templates and add them to the scene, if needed. */ + + /* setup widgets here */ + + /* add event handlers to listen to events from widgets */ + + this.db = openDatabase("tram2000", 1, "Tram2000", 250000) + + // console.log(stops) + + this.seconds = 0 + this.blip = false +// this.speed = 0 +// this.lat_lng; + + //this.interval = setInterval("StageAssistant.handleUpdate()", 1000) + this.timerRollHandler = this.timerRoll.bind(this) + this.interval = window.setInterval(this.timerRollHandler, 1000) + + this.controller.serviceRequest('palm://com.palm.location', { + method : "startTracking", + parameters: { + accuracy : 1, + responseTime: 1, + subscribe : true + }, + onSuccess : this.onGpsSuccess.bind(this), + onFailure : function(status){ +// console.log("Porażka gps" + Object.toJSON(errorCode)) + window.clearInterval(this.interval) + this.controller.showAlertDialog({ + onChoose: function() { }, + title: 'Błąd GPS ('+ status.errorCode +')', + message: 'Nie mogłem ustalić bieżącego położenia.', + choices: [ + {label: 'Spróbuj ponownie'}, + {label: 'Anuluj'} + ] + }); + +// Mojo.Controller.getAppController().showBanner('Błąd GPS: ' + status.errorCode, {source: 'notification'}) + }.bind(this) + }) + + this.commandMenuModel = {items: [{label: 'Pokaż szczegóły', command: 'show-details'}, {label: 'Reset', icon:'refresh', command:'reset'}]} + this.controller.setupWidget(Mojo.Menu.commandMenu, {}, this.commandMenuModel) + + this.controller.listen(document, 'orientationchange', this.handleOrientation.bindAsEventListener(this)) + +} + +BlipAssistant.prototype.onGpsSuccess = function(data){ + var v = 0 + var p2 = {lat: data.latitude, lng: data.longitude, time: data.timestamp} + + // Jeżeli nie jest to pierwsze zapytanie + if(this.lat_lng){ + var p1 = this.lat_lng + + // Oblicz prędkość chwilową + if(p1.lat != p2.lat || p1.lng != p2.lng) + v = length(p1, p2) * ((p2.time - p1.time) * (100/36)) + + // Jeżeli prędkość jest równa zero, + // sprawdź czy jesteś w pobliżu przystanku + if(v == 0){ + var sql = "SELECT id FROM stops WHERE SUBSTR(geo,0,9) IN (?, ?, ?, ?, ?, ?, ?, ?, ?)" + var geohash = encodeGeoHash(p2.lat, p2.lng).substr(0,8) + + var neighbors = {} + neighbors.top = calculateAdjacent(geohash, "top") + neighbors.top_right = calculateAdjacent(neighbors.top, "right") + neighbors.top_left = calculateAdjacent(neighbors.top, "left") + neighbors.bottom = calculateAdjacent(geohash, "bottom") + neighbors.bottom_right = calculateAdjacent(neighbors.bottom, "right") + neighbors.bottom_left = calculateAdjacent(neighbors.bottom, "left") + neighbors.right = calculateAdjacent(geohash, "right") + neighbors.left = calculateAdjacent(geohash, "left") + + this.db.transaction( + function (transaction) { + transaction.executeSql(sql, [geohash, neighbors.top, neighbors.top_right, neighbors.top_left, neighbors.bottom, neighbors.bottom_right, neighbors.bottom_left, neighbors.right, neighbors.left], + this.dbSuccessHandler.bind(this), + this.dbFailureHandler.bind(this) + ) + }.bind(this) + ) + } + } + + this.controller.get("speed").update(Math.round(v * 10) / 10 + " km/h") + + + console.log(Object.toJSON(data)) +// console.log("Czas: " + data.timestamp) +// console.log("Lat: " + data.latitude) +// console.log("Lng: " + data.longitude) + + this.lat_lng = p2; + + // Returns length between two points + function length(p1, p2){ + var R = 6371; // Radius of the earth in km + var dLat = (p2.lat - p1.lat).toRad(); // Javascript functions in radians + var dLon = (p2.lng - p1.lng).toRad(); + var a = Math.sin(dLat/2) * Math.sin(dLat/2) + + Math.cos(p1.lat.toRad()) * Math.cos(p2.lat.toRad()) * + Math.sin(dLon/2) * Math.sin(dLon/2); + var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a)); + return R * c; // Distance in km + } + +// console.log(Object.toJSON(status)) +}; + +BlipAssistant.prototype.dbSuccessHandler = function(transaction, SQLResultSet) { + // Handle successful queries including receiving results + console.log("SQL success: " + SQLResultSet.rows.length) + var the_nearest_stop + + if(SQLResultSet.rows.length > 1){ + // Szukam najbliższego przystanku + the_nearest_stop = "??" + } + else if(SQLResultSet.rows.length == 1){ + the_nearest_stop = SQLResultSet.rows.item(0) + } + + console.log("W pobliżu jest przystanków:" + SQLResultSet.rows.length) + + if(this.blip){ + // Kończę proces zbierania danych + } else { + // Rozpoczynam proces zbierania danych. + // this.blip.add_dist("a") + } +} + +BlipAssistant.prototype.startFollowing = function(){ + +} + +BlipAssistant.prototype.stopFollowing = function(){ + +} + +BlipAssistant.prototype.dbFailureHandler = function(transaction, error) { + + console.log('An SQL error occurred: '+ error.message); + console.log(Object.toJSON(transaction)) + + // Handle errors or other failure modes +}; + +BlipAssistant.prototype.timerRoll = function(event){ + this.seconds++; + + var min = Math.floor(this.seconds / 60); + var sec = this.seconds % 60; + if(sec < 10) sec = "0" + sec + this.controller.get("time").update(min + ":" + sec); +} + +BlipAssistant.prototype.activate = function(event) { + /* put in event handlers here that should only be in effect when this scene is active. For + example, key handlers that are observing the document */ + +// console.log(this.db) + + +// this.db.transaction(function(t){ //.bind(this); +// transaction.executeSql('SOME SQL', [], this.successHandler.bind(this), this.failureHandler.bind(this)); +// }) + +// var sql = "CREATE TABLE IF NOT EXISTS 'stops' (id INTEGER PRIMARY KEY, name TEXT, lat REAL, lng REAL)"; // check sqlite data types for other values +// +// this.db.transaction( +// function (transaction) { +// transaction.executeSql(sql, [], +// this.dbSuccessHandler.bind(this), +// this.dbFailureHandler.bind(this)); +// }.bind(this)); //this is important! +// +//console.log(Object.inspect(Mojo.Menu.editItem)) + + +} + + +BlipAssistant.prototype.deactivate = function(event) { + /* remove any event handlers you added in activate and do any other cleanup that should happen before + this scene is popped or another scene is pushed on top */ +} + +BlipAssistant.prototype.cleanup = function(event) { + /* this function should do any cleanup needed before the scene is destroyed as + a result of being popped off the scene stack */ + + clearInterval(this.interval) +} + +BlipAssistant.prototype.toggleDetails = function(){ + console.log("showing details") + $("#details").toggleClass("hidden") + + // Nie mogłem połączyć się z siecią internet. +} + +BlipAssistant.prototype.handleOrientation = function(event){ +// if(event.position > 3) +// $("#info, #details").css("display", "table-cell") +// else +// $("#info, #details").css("display", "table-row") + + +// Mojo.Log.info("Orientation change position: ", event.position, " pitch: ", event.pitch, " roll: ", event.roll) +} + +BlipAssistant.prototype.handleCommand = function(event) { + + if(event.type == Mojo.Event.command) { + switch(event.command) { + case 'show-details': + this.commandMenuModel.temp = this.commandMenuModel.items + this.commandMenuModel.items = [{label: 'Ukryj szczegóły', command: 'hide-details'}, {label: 'Reset', icon:'refresh', command:'reset'}] + this.controller.modelChanged(this.commandMenuModel) + this.toggleDetails() + break + + case 'hide-details': + this.commandMenuModel.items = this.commandMenuModel.temp + this.controller.modelChanged(this.commandMenuModel) + this.toggleDetails() + break + + case 'reset': + Mojo.Controller.stageController.activeScene().showAlertDialog({ + onChoose: function(value) { + if(value){ + + } + }, + title: "Restart", + message: "Czy na pewno chcesz na nowo rozpocząć proces monitorowania podróży?", + choices:[ + {label: 'Tak', value: true}, + {label: 'Nie', value: false} + ] + }) + break + } + } +} + +Number.prototype.toRad = function() { // convert degrees to radians + return this * Math.PI / 180; +} diff --git a/app/assistants/main-assistant.js b/app/assistants/main-assistant.js index dec44a5..27148d0 100644 --- a/app/assistants/main-assistant.js +++ b/app/assistants/main-assistant.js @@ -2,7 +2,10 @@ function MainAssistant() { } MainAssistant.prototype.setup = function() { - + + if(this.controller.stageController.setWindowOrientation) + this.controller.stageController.setWindowOrientation("free") + this.controller.setupWidget(Mojo.Menu.appMenu, appMenuAttr, appMenuModel); this.controller.setupWidget('luncher', {}, {buttonLabel: 'Monitoruj', buttonClass: 'affirmative'}); this.controller.setupWidget('stats', {}, {buttonLabel: 'Moje statystyki'}); @@ -12,7 +15,7 @@ MainAssistant.prototype.setup = function() { } MainAssistant.prototype.handleRenderBlip = function(){ - this.controller.stageController.pushScene("bing") + this.controller.stageController.pushScene("blip") } MainAssistant.prototype.handleRenderStats = function(event){ diff --git a/app/assistants/stage-assistant.js b/app/assistants/stage-assistant.js index 9dd0de7..674ca55 100644 --- a/app/assistants/stage-assistant.js +++ b/app/assistants/stage-assistant.js @@ -19,9 +19,8 @@ StageAssistant.prototype.setup = function() { ] }; - this.db = openDatabase("tram2000", 1, "Tram2000", 250000); - this.controller.pushScene("main"); - + this.db = openDatabase("tram2000", 1, "Tram2000", 250000) + this.controller.pushScene("main") } StageAssistant.prototype.handleCommand = function(event) { diff --git a/app/views/bing/bing-scene.html b/app/views/bing/bing-scene.html deleted file mode 100644 index ebe0ef7..0000000 --- a/app/views/bing/bing-scene.html +++ /dev/null @@ -1,29 +0,0 @@ -

- Proces gromadzenia danych został rozpoczęty. Nie wyłączaj tej aplikacji do czasu dotarcia do celu. Miłej podróży. -

- -

- Prędkość chwilowa - - - - -

- -

- Przejechano przystanków - - - - -

- - -

- Czas podróży - - 0:00 - -

- -
-
Szczegóły
-
diff --git a/app/views/blip/blip-scene.html b/app/views/blip/blip-scene.html new file mode 100644 index 0000000..60f4493 --- /dev/null +++ b/app/views/blip/blip-scene.html @@ -0,0 +1,51 @@ +

+ Proces gromadzenia danych został rozpoczęty. Nie wyłączaj tej aplikacji do czasu dotarcia do celu. Miłej podróży. +

+ + \ No newline at end of file diff --git a/framework_config.json b/framework_config.json index 04c48bf..be37b6a 100644 --- a/framework_config.json +++ b/framework_config.json @@ -1,3 +1,3 @@ { - "logLevel": 20, + "logLevel": 99 } diff --git a/sources.json b/sources.json index bb42dd7..8d71692 100644 --- a/sources.json +++ b/sources.json @@ -7,8 +7,8 @@ "source": "app/assistants/index-assistant.js" }, { - "scenes": "bing", - "source": "app/assistants/bing-assistant.js" + "scenes": "blip", + "source": "app/assistants/blip-assistant.js" }, { "scenes": "home",