diff --git a/execution.js b/execution.js index c4d8217..c9fc825 100644 --- a/execution.js +++ b/execution.js @@ -1,11 +1,4 @@ (async () =>{ - console.log( getAllCoordinates('route2')) - - - - -//var polyline = L.polyline(newArray, {color: 'red'}).addTo(map); -//map.fitBounds(polyline.getBounds()); -//connectDB('route2') - -})(); \ No newline at end of file +//displayRoute(); +//showBike() +})(); diff --git a/functions.js b/functions.js index 947ff22..25e7517 100644 --- a/functions.js +++ b/functions.js @@ -12,11 +12,11 @@ initIPFS() - async function createDb(db_name){ +async function createDb(db_name){ // Create database instance - - const ipfsOptions = { repo: '/orbitdb/examples/browser/new/ipfs/0.33.1', } - const ipfs = await Ipfs.create(ipfsOptions) + //const ipfsOptions = { repo: '/orbitdb/createdb1', } + + const ipfs = await Ipfs.create() const orbitdb = await OrbitDB.createInstance(ipfs) // Create IPFS instance const db = await orbitdb.keyvalue(db_name) @@ -24,7 +24,10 @@ initIPFS() console.log(address) console.log(db.address.toString()) await db.put('2022-07-01T10:49:07', '49.41185089/8.67646861') - await db.put('2022-07-01T10:49:12', '49.41166303/8.67652893') + await db.put('2022-07-01T10:49:12', '49.41166303/8.67652893') + await db.put('2022-07-01T10:49:20','49.41123636/8.67652849') + await db.put(' 2022-07-01T10:49:25','49.41084041/8.67651128') + await db.put('2022-07-01T10:49:31','49.41049801/8.67656948') let csv = "./new.csv" const value = db.all //console.log(value) @@ -35,8 +38,7 @@ initIPFS() } async function loadRoute(db_name){ - const ipfsOptions = { repo: '/orbitdb/los', } - const ipfs = await Ipfs.create(ipfsOptions) + const ipfs = await Ipfs.create() const orbitdb = await OrbitDB.createInstance(ipfs) const db = await orbitdb.keyvalue(db_name) @@ -54,13 +56,20 @@ async function connectDB(dbname){ const route2 = db_route2.all console.log(route2); } -async function getActualCoordinates(){ - +async function getCurrentCoordinate(){ + var db_conn = await createDb('coordinates') + const currentCoordinate = db_conn.all + console.log(currentCoordinate) + var latest_coord_string = (currentCoordinate[Object.keys(currentCoordinate)[Object.keys(currentCoordinate).length - 1]]) + var latest_coordinate_str = latest_coord_string.split("/") + latest_coordinate_str[0] = parseFloat(latest_coordinate_str[0]) + latest_coordinate_str[1] = parseFloat(latest_coordinate_str[1]) + console.log(latest_coordinate_str) + return latest_coordinate_str; } -async function getAllCoordinates(dbname){ - // creater db with name db2 +async function getAllCoordinates(dbname){ var db2 = await createDb(dbname) const all_coordinates = db2.all // coordinates in this schema 49.123/8.2311 @@ -80,9 +89,18 @@ for (var i = 0; i < comma_string.length; i++) { newArray.push([comma_string[i], comma_string[increment]]) increment = increment+1 i = i+1 - } -console.log(newArray); +(function(elem) { + var callee = arguments.callee; + return elem instanceof Array ? elem.map(function(elem2) { return callee(elem2); }) + : parseFloat(elem); +}) +newArray = newArray.map(function(elem) { + return elem.map(function(elem2) { + return parseFloat(elem2); + }); +}); +//console.log(newArray) return newArray; } diff --git a/index.html b/index.html index baf1e5b..91713dd 100644 --- a/index.html +++ b/index.html @@ -8,11 +8,13 @@ integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ==" crossorigin=""> - + + Track your bike +