update

1 files changed, 20 insertions, 14 deletions

diff --git a/scripts/match-road.sh b/scripts/match-road.sh
index 0486dbe..01fa888 100755
--- a/scripts/match-road.sh
+++ b/scripts/match-road.sh
@@ -26,15 +26,14 @@ RESPONSE=/tmp/response
 # store data of time and location into tmp file with 2 columns, format is like:
 # 1970-01-01T08:00:46 [121.0179739,14.5515336]
 paste -d' ' \
-    <(sed -nr '/<trk>/,/<\/trk>/ { s/.*<time>(.*)<\/time>/\1/p }' $1 | cut -d'.' -f1) \
-    <(sed -nr 's/.*lon=\"([^\"]+)\".*/\1/p' $1) \
-    <(sed -nr 's/.*lat=\"([^\"]+)\".*/\1/p' $1) |\
-sed -r 's/ ([^ ]+) ([^ ]+)/ [\1,\2]/' |\
+    <(sed -nE '/<trk>/,/<\/trk>/ { s/.*<time>(.*)<\/time>/\1/p }' $1 | cut -d'.' -f1) \
+    <(sed -nE 's/.*lon=\"([^\"]+)\".*/\1/p' $1) \
+    <(sed -nE 's/.*lat=\"([^\"]+)\".*/\1/p' $1) |\
+sed -E 's/ ([^ ]+) ([^ ]+)/ [\1,\2]/' |\
 awk '!_[$1]++' > $ORIGIN_DATA
 
 # Consume raw data with serveral request
-while [ -s $ORIGIN_DATA ]
-do
+while [ -s $ORIGIN_DATA ]; do
     # Make GeoJSON object for request
     jq --slurp '{type: "Feature", properties: {coordTimes: .[1]}, geometry: {type: "LineString", coordinates: .[0]}}' \
         <(head -$LIMIT $ORIGIN_DATA | cut -d' ' -f2 | jq -n '[inputs]') \
@@ -42,14 +41,21 @@ do
     # Mapbox Map Matching API, store response into tmp file
     curl -X POST -s  --data @- --header "Content-Type:application/json" https://api.mapbox.com/matching/v4/mapbox.driving.json?access_token=$ACCESS_TOKEN > $RESPONSE
 
-    # Put existing timestamp to matched points, and interpolate new timestamp into new points
+    # Put existing timestamps to matched points, and interpolate new timestamps into new points
     join -a1 \
         <(jq -c  '.features[0].geometry.coordinates[]' $RESPONSE) \
-        <(jq -cr '.features[0].properties | [.matchedPoints, .indices] | transpose[] | "\(.[0]) \(.[1])"' $RESPONSE) |\
-    awk '{COOR[NR][0]=$1; N++; if(NF>1) COOR[NR][1]=$2; else COOR[NR][1]=-1} 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
-        # Trasform unix timestamp into human readable time format, like following:
+        <(jq -cr '.features[0].properties | [.matchedPoints, (.indices | map(.+1))] | transpose[] | "\(.[0]) \(.[1])"' $RESPONSE) |\
+    sed '/ / !s/$/ -1/' |\
+    while read coor index; do
+        if [ $index -gt -1 ]; then
+            echo $coor $(sed -n "$index p" $ORIGIN_DATA | cut -d' ' -f1 | date -f - +%s)
+        else
+            echo $coor $index
+        fi
+    done |\
+    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
         # Into      [121.018088,14.5516] 1970-01-01T08:00:18.50Z
         echo $coor $(date -d @$unix_time +'%Y-%m-%dT%H:%M:%S.%2NZ')
@@ -59,7 +65,7 @@ do
     sed -i "1,$LIMIT d" $ORIGIN_DATA
 done |\
 # Make GPX format for output
-sed -r '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\
@@ -67,7 +73,7 @@ sed "1i \
   xmlns:gpxtpx=\"http://www.garmin.com/xmlschemas/TrackPointExtension/v1\"\n\
   xmlns:gpxx=\"http://www.garmin.com/xmlschemas/GpxExtensions/v3\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n\
   <trk>\n\
-    <name>$(sed -nr 's/.*<name>(.*)<\/name>.*/\1/p; /<name>/q' $1)<\/name>\n\
+    <name>$(sed -nE 's/.*<name>(.*)<\/name>.*/\1/p; /<name>/q' $1)<\/name>\n\
     <trkseg>
 \$a \
 \ \ \ \ <\/trkseg>\n\