update

1 files changed, 25 insertions, 21 deletions

diff --git a/scripts/match-road.sh b/scripts/match-road.sh
index 7b6dad4..608fc56 100755
--- a/scripts/match-road.sh
+++ b/scripts/match-road.sh
@@ -20,9 +20,9 @@ set -e
 # put yout Mapbox token here
 ACCESS_TOKEN=$(cat ~/settings/tokens/mapbox)
 # number of coordinates for each Mapbox Map Matching API request, Maximum value is 100
-LIMIT=50
+LIMIT=10
 # define the lowest confidence of accepted matched points
-THRESHOLD=0.7
+THRESHOLD=0.3
 
 ORIGIN_DATA=/tmp/$(basename $1).origin
 MATCHED=/tmp/$(basename $1).matched
@@ -30,7 +30,7 @@ MATCHED=/tmp/$(basename $1).matched
 # extract data from the given gpx file, dump data with format [coordindate] [time_to_second], like:
 # [121.0179739,14.5515336] 1984-01-01T08:00:46
 function get_data() {
-    sed -nr '/<trkpt /, /<\/trkpt>/ {H; /<\/trkpt>/ {x; s/\n/ /g; p; s/.*//; x}}' $1 |\
+    sed -nr '/<trkpt /, /<\/trkpt>/ {H; /<\/trkpt>/ {x; s/\n/ /g; p; s/.*//; x}}' $1 |
     sed -nr 'h; s/.*lon="([^"]+).*/\1/; H; g
                 s/.*lat="([^"]+).*/\1/; H; g
                 # If trkpt has no time, leave it blank
@@ -38,8 +38,8 @@ function get_data() {
                     s/.*<time>([^.]+).*<\/time>.*/\1/
                     H; g
                 }
-                s/^[^\n]+\n//; s/\n/ /g; p' |\
-    sed -r 's/^([^ ]+) ([^ ]+)/[\1,\2]/' |\
+                s/^[^\n]+\n//; s/\n/ /g; p' |
+    sed -r 's/^([^ ]+) ([^ ]+)/[\1,\2]/' |
     awk '!_[$2]++'
 }
 
@@ -47,12 +47,12 @@ function get_data() {
 # [121.0179739,14.5515336] 1984-01-01T08:00:46
 function make_geojson() {
     # change input to format like: [[lon, lat], time]
-    awk '{printf("[%s,\"%s\"]\n", $1, $2)}' |\
+    awk '{printf("[%s,\"%s\"]\n", $1, $2)}' |
     jq '[inputs] | {type: "Feature", properties: {coordTimes: (map(.[1]))}, geometry: {type: "LineString", coordinates: map(.[0])}}'
 }
 
 # Read GeoJSON body from STDIN, and return result from Mapbox Map Matching API
-function query_matched_road() {
+function query_matched_points() {
     curl -X POST -s --data @- \
         --header "Content-Type:application/json" \
         https://api.mapbox.com/matching/v4/mapbox.driving.json?access_token=$ACCESS_TOKEN
@@ -63,15 +63,15 @@ function query_matched_road() {
 # [121.0179739,14.5515336] 35
 # If the point is newly added, the index would be -1, like
 # [121.0189339,14.5525931] -1
-function get_valid_data() {
+function validate_matched_points() {
     VALID_DATA=$(jq ".features[] | select(.properties.confidence >= $THRESHOLD)")
 
-    echo $VALID_DATA |\
+    echo $VALID_DATA |
     jq -cr '.properties | [.matchedPoints, (.indices | map(.+1))] | transpose[] | "\(.[0]) \(.[1])"' > $MATCHED
 
-    echo $VALID_DATA | jq -c '.geometry.coordinates[]' |\
+    echo $VALID_DATA | jq -c '.geometry.coordinates[]' |
     while read point; do
-        if head -1 $MATCHED| grep -F $point; then
+        if head -1 $MATCHED | grep -F $point; then
             sed -i 1d $MATCHED
         else
             echo $point -1
@@ -87,9 +87,9 @@ function complete_data() {
         else
             echo $coor $index
         fi
-    done|\
+    done|
     # interpolate timestamps to newly added points
-    awk '{COOR[NR][0]=$1; N++; COOR[NR][1]=$2} END{for (i=1; i<=N; i++) {printf COOR[i][0]; if (COOR[i][1] != -1) {print " "COOR[i][1]; LAST=i} else {while(COOR[i+n][1] == -1) n++; print " "COOR[LAST][1]+(COOR[i+n][1]-COOR[LAST][1])*(i-LAST)/(i+n-LAST)}}}' |\
+    awk '{COOR[NR][0]=$1; N++; COOR[NR][1]=$2} END{for (i=1; i<=N; i++) {printf COOR[i][0]; if (COOR[i][1] != -1) {print " "COOR[i][1]; LAST=i} else {while(COOR[i+n][1] == -1) n++; print " "COOR[LAST][1]+(COOR[i+n][1]-COOR[LAST][1])*(i-LAST)/(i+n-LAST)}}}' |
     while read coor unix_time; do
         # Transform unix timestamp into human readable time format, like following:
         # Transform [121.018088,14.5516] 18.50
@@ -101,7 +101,7 @@ function complete_data() {
 # Make GPX format for output
 # Take input with format: [lon,lat] [time]
 function make_gpx() {
-    sed -E 's/\[([^,]+),([^,]+)\] (.*)/      <trkpt lon="\1" lat="\2"><time>\3<\/time><\/trkpt>/' |\
+    sed -E 's/\[([^,]+),([^,]+)\] (.*)/      <trkpt lon="\1" lat="\2"><time>\3<\/time><\/trkpt>/' |
     sed "1i \
 <gpx version=\"1.1\" creator=\"Garmin Connect\"\n\
   xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd\"\n\
@@ -122,13 +122,17 @@ get_data $1 > $ORIGIN_DATA
 
 # Consume raw data with serveral request
 while [ -s $ORIGIN_DATA ]; do
-
-    head -$LIMIT $ORIGIN_DATA |\ # Take original data by limited points at a time: [121.0179739,14.5515336] 1984-01-01T08:00:46
-    make_geojson |\              # Make geojson body: {type: "Feature", properties: {coordTimes: [...]}, geometry: {type: "LineString", coordinates: [...]}}
-    query_matched_road |\        # Call Mapbox Map Matching API: {geometry: {coordinates: [...]}, properties: {confidence: 0.9, matching: [...], indices: [...]}}
-    get_valid_data |\            # Get valid point and index by confidence value: [121.0179739,14.5515336] 5
-    complete_data
+    # Take original data by limited points for each time: [121.0179739,14.5515336] 1984-01-01T08:00:46
+    # Make geojson body: {type: "Feature", properties: {coordTimes: [...]}, geometry: {type: "LineString", coordinates: [...]}}
+    # Call Mapbox Map Matching API: {geometry: {coordinates: [...]}, properties: {confidence: 0.9, matching: [...], indices: [...]}}
+    # Get valid point and index by confidence value: [121.0179739,14.5515336] 5
+    # complete_data
+    head -$LIMIT $ORIGIN_DATA |
+    make_geojson |
+    query_matched_points |
+    validate_matched_points
 
     # Remove processed raw data
     sed -i "1,$LIMIT d" $ORIGIN_DATA
-done
+done |
+make_geojson > test.geojson