1 files changed, 15 insertions, 13 deletions

diff --git a/scripts/match.sh b/scripts/match.sh
index e76ddec..a1c7e62 100755
--- a/scripts/match.sh
+++ b/scripts/match.sh
@@ -4,31 +4,33 @@
 set -e
 
 ACCESS_TOKEN=$(cat ~/settings/tokens/mapbox)
-#export MAPBOX_ACCESS_TOKEN=$ACCESS_TOKEN
 LIMIT=10
-TRK_NAME=$(sed -nr 's/.*<name>(.*)<\/name>.*/\1/p; /<name>/q' $1)
+ORIGIN_DATA=/tmp/origin
+RESPONSE=/tmp/response
 
-# Need to add pre-process for duplicated gpx trkpts
+# 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]/' |\
-awk '!_[$1]++' > origin
+awk '!_[$1]++' > $ORIGIN_DATA
+exit 0
 
-while [ -s origin ]
+while [ -s $ORIGIN_DATA ]
 do
     jq --slurp '{type: "Feature", properties: {coordTimes: .[1]}, geometry: {type: "LineString", coordinates: .[0]}}' \
-        <(head -$LIMIT origin | cut -d' ' -f2 | jq -n '[inputs]') \
-        <(head -$LIMIT origin | cut -d' ' -f1 | jq -nR '[inputs]') |\
-    curl -X POST -s --header "Content-Type:application/json" --data @- https://api.mapbox.com/matching/v4/mapbox.driving.json?access_token=$ACCESS_TOKEN > response
+        <(head -$LIMIT $ORIGIN_DATA | cut -d' ' -f2 | jq -n '[inputs]') \
+        <(head -$LIMIT $ORIGIN_DATA | cut -d' ' -f1 | jq -nR '[inputs]') |\
+    curl -X POST -s --header "Content-Type:application/json" --data @- https://api.mapbox.com/matching/v4/mapbox.driving.json?access_token=$ACCESS_TOKEN > $RESPONSE
 
     TIMESTAMP=0
     paste -d' ' \
-        <(jq -c '.features[0].properties.matchedPoints[]' response) \
-        <(jq -c '.features[0].properties.indices[]' response | xargs -I{} echo {}+1 | bc | xargs -I{} sed -n {}p origin | cut -d' ' -f1 | date -f - +%s) \
+        <(jq -c '.features[0].properties.matchedPoints[]' $RESPONSE) \
+        <(jq -c '.features[0].properties.indices[]' $RESPONSE | xargs -I{} echo {}+1 | bc | xargs -I{} sed -n {}p $ORIGIN_DATA | cut -d' ' -f1 | date -f - +%s) \
     > matched
-    jq -c '.features[0].geometry.coordinates[]' response |\
+    jq -c '.features[0].geometry.coordinates[]' $RESPONSE |\
     while read line
     do
         TIMESTAMP=$(head -1 matched | cut -d' ' -f2)
@@ -36,7 +38,7 @@ do
     done |\
     tee /dev/tty && rm matched
 
-    sed -i "1,$LIMIT d" origin
+    sed -i "1,$LIMIT d" $ORIGIN_DATA
 done |\
 sed -r 's/\[([^,]+),([^,]+)\] ?(.*)/      <trkpt lon="\1" lat="\2"><time>\3<\/time><\/trkpt>/' |\
 sed "1i \
@@ -46,7 +48,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>$TRK_NAME<\/name>\n\
+    <name>$(sed -nr 's/.*<name>(.*)<\/name>.*/\1/p; /<name>/q' $1)<\/name>\n\
     <trkseg>
 \$a \
 \ \ \ \ <\/trkseg>\n\