furkot-copilot - npm Package Compare versions

Comparing version 0.1.1 to 0.3.0

History.md

@@ -0,1 +1,18 @@
+0.3.0 / 2015-02-25
+==================
+
+ * handle multiple day routes
+ * extract street address
+
+0.2.1 / 2015-02-25
+==================
+
+ * change input data format (add points field to route)
+
+0.2.0 / 2015-02-25
+==================
+
+ * CoPilot files don't support tracks just detailed routes
+ * change input from Furkot trip to abstract data
+
 0.1.1 / 2015-02-20
@@ -2,0 +19,0 @@ ==================

lib/trp.js

 var buffer = require('./buffer');
-var poly = require('polyline-encoded');
 
-
 function writeEntry(out, type, name, data) {
@@ -21,6 +19,6 @@ out.writeln('Start ', type, '=', name);
 
-function writeTrip(out, trip, opts) {
-  writeEntry(out, 'Trip', trip.destination || opts.destination, {
-    'Creator': opts.creator,
-    'Memo': trip.notes
+function writeTrip(out, metadata) {
+  writeEntry(out, 'Trip', metadata.name, {
+    'Creator': metadata.author && [ metadata.author.name, metadata.author.link ].join(' '),
+    'Memo': metadata.desc
   });
@@ -42,29 +40,40 @@ }
 
-function writeStep(out, seq, step) {
-  if (!isValid(step)) {
-    return;
+function streetAddress(step) {
+  var address;
+  if (step.streetAddress !== undefined) {
+    return step.streetAddress;
   }
-  var data = {
-    'Name': step.name,
-    'Address': step.address,
-    'City': step.locality && step.locality.town,
-    'State': step.locality && step.locality.province,
-    'Country': step.locality && step.locality.country_long,
-    'Longitude': formatCoord(step.coordinates.lon),
-    'Latitude': formatCoord(step.coordinates.lat),
-    'Show': 1,
-    'Sequence': seq.index
-  };
-  if (seq.opts.tracks && seq.index > 0) {
-    writeRoute(out, seq, step.directions.route.polyline);
+  if (step.address) {
+    address = step.address.split(',')[0];
+    if (!step.locality || address !== step.locality.town
+        && address !== step.locality.province && address !== step.locality.province_long
+        && address !== step.locality.country && address !== step.locality.country_long) {
+      step.streetAddress = address;
+      return address;
+    }
+    step.streetAddress = '';
+    return '';
   }
-  writeStop(out, seq.index, data);
-  seq.index += 1;
 }
 
-function writeRoute(out, seq, polyline) {
-  if (!polyline) {
+function writeStep(out, seq, step) {
+  if (!isValid(step)) {
     return;
   }
-  poly.decode(polyline).forEach(writeWaypoint.bind(null, out, seq));
+  if (step.name || step.address || step.locality) {
+    writeStop(out, seq.index, {
+      'Name': step.name,
+      'Address': streetAddress(step),
+      'City': step.locality && step.locality.town,
+      'State': step.locality && step.locality.province,
+      'Country': step.locality && step.locality.country_long,
+      'Longitude': formatCoord(step.coordinates.lon),
+      'Latitude': formatCoord(step.coordinates.lat),
+      'Show': 1,
+      'Sequence': seq.index
+    });
+    seq.index += 1;
+    return;
+  }
+  writeWaypoint(out, seq, step);
 }
@@ -74,4 +83,4 @@
   var data = {
-    'Longitude': formatCoord(wpt[1]),
-    'Latitude': formatCoord(wpt[0]),
+    'Longitude': formatCoord(wpt.coordinates.lon),
+    'Latitude': formatCoord(wpt.coordinates.lat),
     'Show': 0,
@@ -84,3 +93,3 @@ 'Sequence': seq.index
 
-function writeTrp(out, trip, opts) {
+function writeTrp(out, opts) {
   var seq = {
@@ -91,4 +100,4 @@ index: 0,
   out.writeln('Data Version:2.14.6.1');
-  writeTrip(out, trip, opts);
-  trip.steps.forEach(writeStep.bind(null, out, seq));
+  writeTrip(out, opts.metadata);
+  opts.routes[0].points.forEach(writeStep.bind(null, out, seq));
 }
@@ -107,8 +116,23 @@
 
-function toTrp(trip, opts) {
-  var buf = buffer();
-  writeTrp(buf, trip, opts);
-  return toBuffer(buf.toString());
+function toTrp(opts) {
+  var buf;
+  if (opts.routes && opts.routes.length > 1) {
+    return opts.routes.map(function (route) {
+      return toTrp({
+        metadata: {
+          name: [ opts.metadata.name, route.name ].join(' - '),
+          author: opts.metadata.author,
+          desc: opts.metadata.desc
+        },
+        routes: [ route ]
+      });
+    });
+  }
+  else {
+    buf = buffer();
+    writeTrp(buf, opts);
+    return toBuffer(buf.toString());
+  }
 }
 
 module.exports = toTrp;

package.json

 {
   "name": "furkot-copilot",
-  "version": "0.1.1",
-  "description": "Generate copilot .TRP files from Furkot trip data.",
+  "version": "0.3.0",
+  "description": "Generate CoPilot .TRP files from Furkot trip data.",
   "main": "index.js",
@@ -26,4 +26,3 @@ "scripts": {
   "dependencies": {
-    "polyline-encoded": "~0"
   }
-}
+}

test/fixtures/multi-trip.json

 {
-  "destination" : "Ski trip",
-  "begin_date" : "2013-04-23",
-  "end_date" : "2013-04-28",
-  "start_time" : 32400000,
-  "stop_time" : 79200000,
-  "units" : {
-    "distance" : "km"
+  "metadata" : {
+    "name" : "Ski trip",
+    "desc" : "Winter trip to Killington",
+    "units" : "km",
+    "author" : {
+      "name": "Furkot - road trip planner",
+      "short_name": "Furkot",
+      "email": {
+        "id": "trips",
+        "domain": "furkot.com"
+      },
+      "link": "https://trips.furkot.com"
+    }
   },
-  "coordinates" : {
-    "lat" : 43.01504974245872,
-    "lon" : -71.92655324999998
-  },
-  "scale" : 8,
-  "id" : "5144eae2d6e4d26079000001",
-  "steps" : [
+  "routes" : [ {
+	"points" : [
       {
-        "auto" : false,
-        "id" : "5144eae2d6e4d26079000002",
-        "lastDay" : true,
         "day" : 0,
-        "pos" : 0.5,
         "name" : "Boston, MA",
@@ -36,15 +33,4 @@ "coordinates" : {
         "notes" : "",
-        "images" : [],
-        "skip" : false,
-        "lodging" : {},
-        "trip" : {
-          "id" : "5144eae2d6e4d26079000001"
-        },
-        "position" : [ 0.5 ],
         "address" : "Boston, MA",
         "visit_duration" : 0,
-        "expander" : [ {
-          "route" : [ false ]
-        } ],
-        "ack_warnings" : true,
         "nights" : 0,
@@ -55,7 +41,3 @@ "arrival_time" : 1366722000000,
       {
-        "auto" : false,
-        "id" : "5144eaefd6e4d26079000004",
-        "lastDay" : false,
         "day" : 0,
-        "pos" : 0.625,
         "name" : "Courtyard by Marriott",
@@ -68,11 +50,2 @@ "coordinates" : {
         "notes" : "",
-        "images" : [],
-        "skip" : false,
-        "lodging" : {
-          "active" : true
-        },
-        "trip" : {
-          "id" : "5144eae2d6e4d26079000001"
-        },
-        "position" : [ 0.625, 0.6875 ],
         "locality" : {
@@ -85,54 +58,4 @@ "town" : "Manchester",
         },
-        "ack_warnings" : false,
         "visit_duration" : 0,
-        "expander" : [
-            {
-              "route" : [ {
-                "duration" : 3319,
-                "distance" : 80888,
-                "coordinates" : {
-                  "lat" : 42.3584308,
-                  "lon" : -71.0597732
-                },
-                "address" : "64 Tremont Street, Boston, MA 02108, USA",
-                "polyline" : "qcpaGr|upL^P~@t@H]t@{Dv@wEq@g@aBq@gCCiAbHOXk@r@wCrAw@x@gAzBSn@q@}@Ym@o@eByByFgA{D_AcDg@i@OLUj@}CzCyO`OgQhSwCjDqHnLeGpM_DfIyA~DoBvDcChD_DhDwFdEyDjCwCnAkCf@sCNkBGmJy@iF`@cDt@eBt@yClB{AtAwCfDmElGyFjIoElFcCtBeDpCgDrDyDxFmUt\\}FvHiFvFkKfJi_@x[mCbCkH`GcD`BmDfAiGl@_FNsMTqNPcRmA_RgAwEUiKA{L[yGcAc@YsBQwE[gJb@oOlDwZ~GcLjA}JK{G}@wSaEkUqEsGqAiH_AwIMwDP_Gv@oEfAmKtEm`@xVko@~`@yU~NeK`EaJzBmEh@qF\\aNRkFHom@z@yIj@kDf@}ItAsAVkFlBaFlC_EdCiGhFgI`H_XnUyUzRyHnHcHdFgH~DwJtD}JnBsHjA_H\\cG?aDKa]oBkUkAcNOgCPiHf@gKlA{[hFmL~BqRlGuSnJiAr@i|@da@yIlE}YzP}J~GoDfBwVlPwJdIgZjXwUjTcRdPkLvHkFnCaJtDmGnBcYfGseBl]ch@`K_TfEmH|AyRjFej@nR}SfHubAf^om@bTe_Al\\knAlc@ce@hPcOjFqHfB_KlAoOhAkVlBaMt@eQb@cP]aOyA}MaCiToGsf@eToIsD_H{AkHk@uE?aGh@cHzAwEjBmDpBoKpJkl@zl@aTvTeF|GuEjIeQ`b@_DhH{E`J_KnN{KxKuQnLkq@p`@qSrL_DvBwE|D_EjEgEnGqCtFqDnJkBdHaFl[kDrV}AjIgB~FgC~FmE|GmFlFeFdD_FnBaF~@}FVoFQaOcCcc@qHkJyAkGWwFt@}CrAgAv@}C|CuC`FsBdGgMrh@eDdLcBfEoCrFyCzEcGbHsExDyXjPiVdNuZdQwHvEiJbIkGtHiGvIsFvHaJ|KcKhJcPbNgSxPed@l`@yHnJ{FrJyExKyB~GqBrIkKli@aElMqCxFyBvD{BxC{DbEeDpCwFjDsEhBwGlBc[`JkV~Ga^jKmCpAyCtBqKrLyj@zq@oJzJwIfG}FtCyg@zSea@pPsMlFeI`EiUlNcZtQs[lQ{JbFyKtEgVbI}L|Eea@vUiFxEiOhTk_@bj@mWj_@gDfEwArAoA|A}MjLgEvD_CjDuAjDm@~B}Fz[q@pGDbFnGni@hGle@x@pHbEhWfAtE~Ba@dGSfDf@pAb@|BZtDe@bGcDjImEFcD[aD[uA"
-              } ]
-            },
-            {
-              "route" : [ {
-                "duration" : 1414,
-                "distance" : 35992,
-                "coordinates" : {
-                  "lat" : 43.20517581723733,
-                  "lon" : -71.531982421875
-                },
-                "address" : "Frederick E. Everett Turnpike, Concord, NH 03301, USA",
-                "polyline" : "moufGnarsLbBg@rEeBfQiH|JyDbR_I|LqF~EqBnCkA`@SDElNiHhAk@jAe@|Aa@~BWhCApB\\hA`@v@\\b@XbAz@l@j@rB|Bn@fArDtHhEvIf@z@`DvFvB`EjAlBn@~@bAdAnBtAjBt@zBd@lCVbAIzAWxBm@rIaChCi@zGiBlBk@|@Yp@a@TMRMVObCmB|B{BnA}AdAeBbBcD~@gB|@{BrDuIjEmJdH_P`EoJlCyFpE}K~CgHzBmErCiEzCiDjAeAtGeF`LsIh@a@nFeEvOiL~WmSbAq@pN{KlGuErEiDlDmCfEmDdHiFbRyNjLsIvGeF~GyFzCaC~B_BfHuDhQgHxf@_SdAg@rSoIt[oMbFkBdCu@vBa@zASnBOfBG~B?rCLvL`AjZ`C~CFbD?tCOzFm@x]eFzLkArFm@zIsArIuA|Fw@dGm@fCQba@eA|o@cBnTYfa@b@bb@b@nEPzAA|BB|AJv@FdAPxCv@lCdA|BrAtCzBnAtAhApAhCvDbJrMlDvEfEjGjEjGlEfGPXtAtBhB~BpBrB~ApA`BfAfB|@fBr@fCp@rc@vIlFdAlCXjCFpBEfD[lB_@jBi@~Ao@|@c@zBsA|AoApBqB|UsZfB_CfIiK`CcC|BgBf@_@bB}@zCoA~CeAvJeDhCu@nB]hDW~CMzNc@vH]dEMv@Gt@Mt@Ur@[p@e@l@i@j@q@`AaBhC{GfAoBn@q@`@]h@]h@YRKb@KbAQ|@EhE@bA@tA?jBFhG^zBThBTzB`@vCf@jGx@dANj@@dA?dAMlAW|EiBt@YfBm@hDkAzA]nBS`DEzCNZB`@NlBX`@DrEnA`DfAbDtA`Bv@bDnBtDzBjFpD|CjBzAz@xFfD|CtAdCv@rCn@bBVnBRnAFtBBtACtCMpAOhFy@xU}D`BU|RcD~HuAd@Gx@DxBMpCD|Bb@pAn@vCzAnA`@dAJtA@d@Gx@O`A]|@c@bAc@Zc@l@mAj@oA\\s@t@qBtAoFh@cC\\_C|AaOf@{ERsDK}HcBsOoAqK[cDk@{Es@yD_@}Ai@gBmAcD{AeDeAgBuB_DcEeGgAkB_@{@y@sB{@wBw@}BsAeFgEoQc@gBMk@@_@wAiGcBeIaAkFyAaJSqBk@iD?c@DORYpB?hAJ|AZpAb@~AX\\@n@Aj@Eh@Kn@Q|@a@dEaCx@a@|A_AfCqAj@YFcDIkAQuAIg@Qm@"
-              } ]
-            } ],
         "url" : "http://www.easytobook.com/en/united-states-of-america/new-hampshire/manchester/courtyard-by-marriott-manchester/?affid=280826683",
-        "directions" : {
-          "points" : {
-            "from" : {
-              "lat" : 42.3584308,
-              "lon" : -71.0597732
-            },
-            "to" : {
-              "lat" : 42.94989,
-              "lon" : -71.43241
-            }
-          },
-          "route" : {
-            "duration" : 3319,
-            "distance" : 80888,
-            "coordinates" : {
-              "lat" : 42.3584308,
-              "lon" : -71.0597732
-            },
-            "address" : "64 Tremont Street, Boston, MA 02108, USA",
-            "polyline" : "qcpaGr|upL^P~@t@H]t@{Dv@wEq@g@aBq@gCCiAbHOXk@r@wCrAw@x@gAzBSn@q@}@Ym@o@eByByFgA{D_AcDg@i@OLUj@}CzCyO`OgQhSwCjDqHnLeGpM_DfIyA~DoBvDcChD_DhDwFdEyDjCwCnAkCf@sCNkBGmJy@iF`@cDt@eBt@yClB{AtAwCfDmElGyFjIoElFcCtBeDpCgDrDyDxFmUt\\}FvHiFvFkKfJi_@x[mCbCkH`GcD`BmDfAiGl@_FNsMTqNPcRmA_RgAwEUiKA{L[yGcAc@YsBQwE[gJb@oOlDwZ~GcLjA}JK{G}@wSaEkUqEsGqAiH_AwIMwDP_Gv@oEfAmKtEm`@xVko@~`@yU~NeK`EaJzBmEh@qF\\aNRkFHom@z@yIj@kDf@}ItAsAVkFlBaFlC_EdCiGhFgI`H_XnUyUzRyHnHcHdFgH~DwJtD}JnBsHjA_H\\cG?aDKa]oBkUkAcNOgCPiHf@gKlA{[hFmL~BqRlGuSnJiAr@i|@da@yIlE}YzP}J~GoDfBwVlPwJdIgZjXwUjTcRdPkLvHkFnCaJtDmGnBcYfGseBl]ch@`K_TfEmH|AyRjFej@nR}SfHubAf^om@bTe_Al\\knAlc@ce@hPcOjFqHfB_KlAoOhAkVlBaMt@eQb@cP]aOyA}MaCiToGsf@eToIsD_H{AkHk@uE?aGh@cHzAwEjBmDpBoKpJkl@zl@aTvTeF|GuEjIeQ`b@_DhH{E`J_KnN{KxKuQnLkq@p`@qSrL_DvBwE|D_EjEgEnGqCtFqDnJkBdHaFl[kDrV}AjIgB~FgC~FmE|GmFlFeFdD_FnBaF~@}FVoFQaOcCcc@qHkJyAkGWwFt@}CrAgAv@}C|CuC`FsBdGgMrh@eDdLcBfEoCrFyCzEcGbHsExDyXjPiVdNuZdQwHvEiJbIkGtHiGvIsFvHaJ|KcKhJcPbNgSxPed@l`@yHnJ{FrJyExKyB~GqBrIkKli@aElMqCxFyBvD{BxC{DbEeDpCwFjDsEhBwGlBc[`JkV~Ga^jKmCpAyCtBqKrLyj@zq@oJzJwIfG}FtCyg@zSea@pPsMlFeI`EiUlNcZtQs[lQ{JbFyKtEgVbI}L|Eea@vUiFxEiOhTk_@bj@mWj_@gDfEwArAoA|A}MjLgEvD_CjDuAjDm@~B}Fz[q@pGDbFnGni@hGle@x@pHbEhWfAtE~Ba@dGSfDf@pAb@|BZtDe@bGcDjImEFcD[aD[uA"
-          }
-        },
-        "distance" : 80888,
-        "driving" : 3319,
         "nights" : 1,
@@ -143,7 +66,3 @@ "arrival_time" : 1366725319000,
       {
-        "auto" : false,
-        "id" : "5144eb49d6e4d26079000005",
-        "lastDay" : true,
         "day" : 0,
-        "pos" : 0.65625,
         "name" : "Concord, NH, USA",
@@ -156,9 +75,2 @@ "coordinates" : {
         "notes" : "",
-        "images" : [],
-        "skip" : false,
-        "lodging" : {},
-        "trip" : {
-          "id" : "5144eae2d6e4d26079000001"
-        },
-        "position" : [ 0.65625 ],
         "locality" : {
@@ -171,40 +83,3 @@ "town" : "Concord",
         },
-        "ack_warnings" : false,
         "visit_duration" : 7200000,
-        "expander" : [ {
-          "route" : [ {
-            "duration" : 1473,
-            "distance" : 37154,
-            "coordinates" : {
-              "lat" : 42.94989,
-              "lon" : -71.43241
-            },
-            "address" : "723-761 Huse Road, Manchester, NH 03103, USA",
-            "polyline" : "atceGvs~rLGSMR^fBNz@Bb@Bp@@j@C|A_@JaB~@y@`@wAv@eBdAgCtAk@Ti@Ng@Jk@DgA@qBUSGUQg@OiA[e@Cw@G[E]?_B@cAJgAsEm@_BoAeCu@sCOq@sAeEuAoH}@sFu@oF}@wHi@mFeAiMkB{Tg@oFYgCMy@WoA[iA[y@Sa@Sa@m@_Ay@cA_Au@k@_@u@]eD_AwGeBqIyBuAWuAO_AEcA@eADgAHWASKqC`@mJbAoJv@eE`@aCTcGv@kDd@eFr@_Df@mBTkG`AmCXoG`@kADwG\\{ELeFHiB@{HCkNOe@Fq@?y@@w@FmB\\WFsAf@aAf@iAx@eAfA[^o@`Au@vAy@jB]fAc@bBeFfV_GbZs@vDy@|CSj@_@~@}@hBaBbCmAnAgA|@kAr@kAj@}Af@wCj@}El@sAToKjBgHbAkJzAeDx@eCz@wB~@eDnB}C~BeOrLqG~EyDtC}CjCmCfCuLhJyC~B_@VwBzAmGxFiCpBcFzCm@N{FzC}K|FkDdB_E~BaDrBwAnA}C`D}D`FiA`BoDlFmBpCYh@qCbEyFbI}B`DcHfKc@n@qAxAmE~GoB`CuAtBYb@eElGuJxMeBtBs@z@aBlAuAdA}CxAwDv@iCPaABaVMsIJkLOyDAoXh@yXh@{DLwMZuNXwFPkQb@iCFaCTsL|A_IfAgBTwEb@gFp@i@Hi@HcOtCiJdAqP`CmCZaEZcCBgCCwGe@gZaCeDYyCQ{DB{DNmDb@kEjAwFvB}BbA}\\dNuDvAs^rOwL`FaO~FwIpDsDjBkQ`NiK~HcI|FaFzDeLzI_G~Ds@j@qIpG}KrIuRbOeW|RmOdLqH|Fa@X_SlO}CxCkAtAkA`BcC`EgArBeDlHsA`DgCrFiUfh@eBvDqF`M}AhDqAfCu@hAwAhBeC|BoCrBq@^sAp@{OvEmBd@cHzBcDt@}BDmBScB[mAg@kAu@eA}@kA}AkAeBsHuNuAcC}IiQq@gA_AeAi@k@sB{Am@[k@WsAa@uASuAIwA@uANsAXw@XwI`EkJjEiHzCuEtBmEjB{XxLyEtB{D`BqJ|D{Bz@oDjAqA`@kGnBsD~@wDt@}HfA{Ej@eCVgBHyBFwD?eIKgIMs@W_@G[MYQS[O_@Ia@Ce@@c@Fa@N_@LOLMNKXIT?J@XLNJd@j@Vf@`@v@t@vDh@vCItBY|@_@b@g@R[@]Cc@WUWQ]Ic@Ee@@e@Ji@L[TYLKZI^Gj@ATEJKbRRrBCvCM`Hy@lIeAvB]hDo@~Bm@pEqA`DaA"
-          } ]
-        } ],
-        "directions" : {
-          "points" : {
-            "from" : {
-              "lat" : 42.94989,
-              "lon" : -71.43241
-            },
-            "to" : {
-              "lat" : 43.20517581723733,
-              "lon" : -71.531982421875
-            }
-          },
-          "route" : {
-            "duration" : 1473,
-            "distance" : 37154,
-            "coordinates" : {
-              "lat" : 42.94989,
-              "lon" : -71.43241
-            },
-            "address" : "723-761 Huse Road, Manchester, NH 03103, USA",
-            "polyline" : "atceGvs~rLGSMR^fBNz@Bb@Bp@@j@C|A_@JaB~@y@`@wAv@eBdAgCtAk@Ti@Ng@Jk@DgA@qBUSGUQg@OiA[e@Cw@G[E]?_B@cAJgAsEm@_BoAeCu@sCOq@sAeEuAoH}@sFu@oF}@wHi@mFeAiMkB{Tg@oFYgCMy@WoA[iA[y@Sa@Sa@m@_Ay@cA_Au@k@_@u@]eD_AwGeBqIyBuAWuAO_AEcA@eADgAHWASKqC`@mJbAoJv@eE`@aCTcGv@kDd@eFr@_Df@mBTkG`AmCXoG`@kADwG\\{ELeFHiB@{HCkNOe@Fq@?y@@w@FmB\\WFsAf@aAf@iAx@eAfA[^o@`Au@vAy@jB]fAc@bBeFfV_GbZs@vDy@|CSj@_@~@}@hBaBbCmAnAgA|@kAr@kAj@}Af@wCj@}El@sAToKjBgHbAkJzAeDx@eCz@wB~@eDnB}C~BeOrLqG~EyDtC}CjCmCfCuLhJyC~B_@VwBzAmGxFiCpBcFzCm@N{FzC}K|FkDdB_E~BaDrBwAnA}C`D}D`FiA`BoDlFmBpCYh@qCbEyFbI}B`DcHfKc@n@qAxAmE~GoB`CuAtBYb@eElGuJxMeBtBs@z@aBlAuAdA}CxAwDv@iCPaABaVMsIJkLOyDAoXh@yXh@{DLwMZuNXwFPkQb@iCFaCTsL|A_IfAgBTwEb@gFp@i@Hi@HcOtCiJdAqP`CmCZaEZcCBgCCwGe@gZaCeDYyCQ{DB{DNmDb@kEjAwFvB}BbA}\\dNuDvAs^rOwL`FaO~FwIpDsDjBkQ`NiK~HcI|FaFzDeLzI_G~Ds@j@qIpG}KrIuRbOeW|RmOdLqH|Fa@X_SlO}CxCkAtAkA`BcC`EgArBeDlHsA`DgCrFiUfh@eBvDqF`M}AhDqAfCu@hAwAhBeC|BoCrBq@^sAp@{OvEmBd@cHzBcDt@}BDmBScB[mAg@kAu@eA}@kA}AkAeBsHuNuAcC}IiQq@gA_AeAi@k@sB{Am@[k@WsAa@uASuAIwA@uANsAXw@XwI`EkJjEiHzCuEtBmEjB{XxLyEtB{D`BqJ|D{Bz@oDjAqA`@kGnBsD~@wDt@}HfA{Ej@eCVgBHyBFwD?eIKgIMs@W_@G[MYQS[O_@Ia@Ce@@c@Fa@N_@LOLMNKXIT?J@XLNJd@j@Vf@`@v@t@vDh@vCItBY|@_@b@g@R[@]Cc@WUWQ]Ic@Ee@@e@Ji@L[TYLKZI^Gj@ATEJKbRRrBCvCM`Hy@lIeAvB]hDo@~Bm@pEqA`DaA"
-          }
-        },
-        "distance" : 37154,
-        "driving" : 1473,
         "nights" : 0,
@@ -215,7 +90,3 @@ "arrival_time" : 1366809873000,
       {
-        "auto" : false,
-        "id" : "5144eaefd6e4d26079000004:1",
-        "lastDay" : true,
         "day" : 1,
-        "pos" : 0.6875,
         "name" : "Courtyard by Marriott",
@@ -228,11 +99,2 @@ "coordinates" : {
         "notes" : "",
-        "images" : [],
-        "skip" : false,
-        "lodging" : {
-          "active" : true
-        },
-        "trip" : {
-          "id" : "5144eae2d6e4d26079000001"
-        },
-        "position" : [ 0.625, 0.6875 ],
         "locality" : {
@@ -245,54 +107,4 @@ "town" : "Manchester",
         },
-        "ack_warnings" : false,
         "visit_duration" : 7200000,
-        "expander" : [
-            {
-              "route" : [ {
-                "duration" : 3319,
-                "distance" : 80888,
-                "coordinates" : {
-                  "lat" : 42.3584308,
-                  "lon" : -71.0597732
-                },
-                "address" : "64 Tremont Street, Boston, MA 02108, USA",
-                "polyline" : "qcpaGr|upL^P~@t@H]t@{Dv@wEq@g@aBq@gCCiAbHOXk@r@wCrAw@x@gAzBSn@q@}@Ym@o@eByByFgA{D_AcDg@i@OLUj@}CzCyO`OgQhSwCjDqHnLeGpM_DfIyA~DoBvDcChD_DhDwFdEyDjCwCnAkCf@sCNkBGmJy@iF`@cDt@eBt@yClB{AtAwCfDmElGyFjIoElFcCtBeDpCgDrDyDxFmUt\\}FvHiFvFkKfJi_@x[mCbCkH`GcD`BmDfAiGl@_FNsMTqNPcRmA_RgAwEUiKA{L[yGcAc@YsBQwE[gJb@oOlDwZ~GcLjA}JK{G}@wSaEkUqEsGqAiH_AwIMwDP_Gv@oEfAmKtEm`@xVko@~`@yU~NeK`EaJzBmEh@qF\\aNRkFHom@z@yIj@kDf@}ItAsAVkFlBaFlC_EdCiGhFgI`H_XnUyUzRyHnHcHdFgH~DwJtD}JnBsHjA_H\\cG?aDKa]oBkUkAcNOgCPiHf@gKlA{[hFmL~BqRlGuSnJiAr@i|@da@yIlE}YzP}J~GoDfBwVlPwJdIgZjXwUjTcRdPkLvHkFnCaJtDmGnBcYfGseBl]ch@`K_TfEmH|AyRjFej@nR}SfHubAf^om@bTe_Al\\knAlc@ce@hPcOjFqHfB_KlAoOhAkVlBaMt@eQb@cP]aOyA}MaCiToGsf@eToIsD_H{AkHk@uE?aGh@cHzAwEjBmDpBoKpJkl@zl@aTvTeF|GuEjIeQ`b@_DhH{E`J_KnN{KxKuQnLkq@p`@qSrL_DvBwE|D_EjEgEnGqCtFqDnJkBdHaFl[kDrV}AjIgB~FgC~FmE|GmFlFeFdD_FnBaF~@}FVoFQaOcCcc@qHkJyAkGWwFt@}CrAgAv@}C|CuC`FsBdGgMrh@eDdLcBfEoCrFyCzEcGbHsExDyXjPiVdNuZdQwHvEiJbIkGtHiGvIsFvHaJ|KcKhJcPbNgSxPed@l`@yHnJ{FrJyExKyB~GqBrIkKli@aElMqCxFyBvD{BxC{DbEeDpCwFjDsEhBwGlBc[`JkV~Ga^jKmCpAyCtBqKrLyj@zq@oJzJwIfG}FtCyg@zSea@pPsMlFeI`EiUlNcZtQs[lQ{JbFyKtEgVbI}L|Eea@vUiFxEiOhTk_@bj@mWj_@gDfEwArAoA|A}MjLgEvD_CjDuAjDm@~B}Fz[q@pGDbFnGni@hGle@x@pHbEhWfAtE~Ba@dGSfDf@pAb@|BZtDe@bGcDjImEFcD[aD[uA"
-              } ]
-            },
-            {
-              "route" : [ {
-                "duration" : 1414,
-                "distance" : 35992,
-                "coordinates" : {
-                  "lat" : 43.20517581723733,
-                  "lon" : -71.531982421875
-                },
-                "address" : "Frederick E. Everett Turnpike, Concord, NH 03301, USA",
-                "polyline" : "moufGnarsLbBg@rEeBfQiH|JyDbR_I|LqF~EqBnCkA`@SDElNiHhAk@jAe@|Aa@~BWhCApB\\hA`@v@\\b@XbAz@l@j@rB|Bn@fArDtHhEvIf@z@`DvFvB`EjAlBn@~@bAdAnBtAjBt@zBd@lCVbAIzAWxBm@rIaChCi@zGiBlBk@|@Yp@a@TMRMVObCmB|B{BnA}AdAeBbBcD~@gB|@{BrDuIjEmJdH_P`EoJlCyFpE}K~CgHzBmErCiEzCiDjAeAtGeF`LsIh@a@nFeEvOiL~WmSbAq@pN{KlGuErEiDlDmCfEmDdHiFbRyNjLsIvGeF~GyFzCaC~B_BfHuDhQgHxf@_SdAg@rSoIt[oMbFkBdCu@vBa@zASnBOfBG~B?rCLvL`AjZ`C~CFbD?tCOzFm@x]eFzLkArFm@zIsArIuA|Fw@dGm@fCQba@eA|o@cBnTYfa@b@bb@b@nEPzAA|BB|AJv@FdAPxCv@lCdA|BrAtCzBnAtAhApAhCvDbJrMlDvEfEjGjEjGlEfGPXtAtBhB~BpBrB~ApA`BfAfB|@fBr@fCp@rc@vIlFdAlCXjCFpBEfD[lB_@jBi@~Ao@|@c@zBsA|AoApBqB|UsZfB_CfIiK`CcC|BgBf@_@bB}@zCoA~CeAvJeDhCu@nB]hDW~CMzNc@vH]dEMv@Gt@Mt@Ur@[p@e@l@i@j@q@`AaBhC{GfAoBn@q@`@]h@]h@YRKb@KbAQ|@EhE@bA@tA?jBFhG^zBThBTzB`@vCf@jGx@dANj@@dA?dAMlAW|EiBt@YfBm@hDkAzA]nBS`DEzCNZB`@NlBX`@DrEnA`DfAbDtA`Bv@bDnBtDzBjFpD|CjBzAz@xFfD|CtAdCv@rCn@bBVnBRnAFtBBtACtCMpAOhFy@xU}D`BU|RcD~HuAd@Gx@DxBMpCD|Bb@pAn@vCzAnA`@dAJtA@d@Gx@O`A]|@c@bAc@Zc@l@mAj@oA\\s@t@qBtAoFh@cC\\_C|AaOf@{ERsDK}HcBsOoAqK[cDk@{Es@yD_@}Ai@gBmAcD{AeDeAgBuB_DcEeGgAkB_@{@y@sB{@wBw@}BsAeFgEoQc@gBMk@@_@wAiGcBeIaAkFyAaJSqBk@iD?c@DORYpB?hAJ|AZpAb@~AX\\@n@Aj@Eh@Kn@Q|@a@dEaCx@a@|A_AfCqAj@YFcDIkAQuAIg@Qm@"
-              } ]
-            } ],
         "url" : "http://www.easytobook.com/en/united-states-of-america/new-hampshire/manchester/courtyard-by-marriott-manchester/?affid=280826683",
-        "directions" : {
-          "points" : {
-            "from" : {
-              "lat" : 43.20517581723733,
-              "lon" : -71.531982421875
-            },
-            "to" : {
-              "lat" : 42.94989,
-              "lon" : -71.43241
-            }
-          },
-          "route" : {
-            "duration" : 1414,
-            "distance" : 35992,
-            "coordinates" : {
-              "lat" : 43.20517581723733,
-              "lon" : -71.531982421875
-            },
-            "address" : "Frederick E. Everett Turnpike, Concord, NH 03301, USA",
-            "polyline" : "moufGnarsLbBg@rEeBfQiH|JyDbR_I|LqF~EqBnCkA`@SDElNiHhAk@jAe@|Aa@~BWhCApB\\hA`@v@\\b@XbAz@l@j@rB|Bn@fArDtHhEvIf@z@`DvFvB`EjAlBn@~@bAdAnBtAjBt@zBd@lCVbAIzAWxBm@rIaChCi@zGiBlBk@|@Yp@a@TMRMVObCmB|B{BnA}AdAeBbBcD~@gB|@{BrDuIjEmJdH_P`EoJlCyFpE}K~CgHzBmErCiEzCiDjAeAtGeF`LsIh@a@nFeEvOiL~WmSbAq@pN{KlGuErEiDlDmCfEmDdHiFbRyNjLsIvGeF~GyFzCaC~B_BfHuDhQgHxf@_SdAg@rSoIt[oMbFkBdCu@vBa@zASnBOfBG~B?rCLvL`AjZ`C~CFbD?tCOzFm@x]eFzLkArFm@zIsArIuA|Fw@dGm@fCQba@eA|o@cBnTYfa@b@bb@b@nEPzAA|BB|AJv@FdAPxCv@lCdA|BrAtCzBnAtAhApAhCvDbJrMlDvEfEjGjEjGlEfGPXtAtBhB~BpBrB~ApA`BfAfB|@fBr@fCp@rc@vIlFdAlCXjCFpBEfD[lB_@jBi@~Ao@|@c@zBsA|AoApBqB|UsZfB_CfIiK`CcC|BgBf@_@bB}@zCoA~CeAvJeDhCu@nB]hDW~CMzNc@vH]dEMv@Gt@Mt@Ur@[p@e@l@i@j@q@`AaBhC{GfAoBn@q@`@]h@]h@YRKb@KbAQ|@EhE@bA@tA?jBFhG^zBThBTzB`@vCf@jGx@dANj@@dA?dAMlAW|EiBt@YfBm@hDkAzA]nBS`DEzCNZB`@NlBX`@DrEnA`DfAbDtA`Bv@bDnBtDzBjFpD|CjBzAz@xFfD|CtAdCv@rCn@bBVnBRnAFtBBtACtCMpAOhFy@xU}D`BU|RcD~HuAd@Gx@DxBMpCD|Bb@pAn@vCzAnA`@dAJtA@d@Gx@O`A]|@c@bAc@Zc@l@mAj@oA\\s@t@qBtAoFh@cC\\_C|AaOf@{ERsDK}HcBsOoAqK[cDk@{Es@yD_@}Ai@gBmAcD{AeDeAgBuB_DcEeGgAkB_@{@y@sB{@wBw@}BsAeFgEoQc@gBMk@@_@wAiGcBeIaAkFyAaJSqBk@iD?c@DORYpB?hAJ|AZpAb@~AX\\@n@Aj@Eh@Kn@Q|@a@dEaCx@a@|A_AfCqAj@YFcDIkAQuAIg@Qm@"
-          }
-        },
-        "distance" : 35992,
-        "driving" : 1414,
         "nights" : 1,
@@ -303,7 +115,3 @@ "arrival_time" : 1366818487000,
       {
-        "auto" : false,
-        "id" : "5144eae2d6e4d26079000003",
-        "lastDay" : true,
         "day" : 0,
-        "pos" : 0.75,
         "name" : "Killington, VT",
@@ -323,48 +131,4 @@ "coordinates" : {
         "notes" : "",
-        "images" : [],
-        "skip" : false,
-        "lodging" : {},
-        "trip" : {
-          "id" : "5144eae2d6e4d26079000001"
-        },
-        "position" : [ 0.75 ],
         "address" : "Killington, VT",
         "visit_duration" : 0,
-        "expander" : [ {
-          "route" : [ {
-            "duration" : 7309,
-            "distance" : 181741,
-            "coordinates" : {
-              "lat" : 42.94989,
-              "lon" : -71.43241
-            },
-            "address" : "723-761 Huse Road, Manchester, NH 03103, USA",
-            "polyline" : "atceGvs~rL`@xF}DvFoNjG{J}AuG?eEyLqOocAoFgg@mIuJ_a@kIk_BjPcu@j@}O`Ge`@luAuYdKie@dIaQjJsfAt{@yx@bg@iuAlmBkLvEm\\FcpAlAmgBvJid@`He_@|Dgg@kDwTWqRfF_dBvr@g_Axn@im@ld@scB~sA{|@thBqKtIoEXAgGpE|BnErKfJja@oOlu@kkAtpDkIzbAb@tXld@xgBxLjj@_@x\\um@nxEpD|lCxEhcBeJx^kGhFkg@bKgPzDyXdTcp@|g@eg@`_@}hAt{A{hAjwAudAbUg^pJiZnRe[xXqk@dbB_Hjw@kVdu@fDhqAyB`ZqO~XqIfZgJ||@qQv`@o\\xR}{@xXk`AzYyRzKgL|RsF~ZgE`~@}Thx@uEjuAsDzUoNlX_\\p~@qLdNgR`EsgA|FmZxHsNbOyLpc@ePb^c_@x[ov@t_@wNfOcg@zyBmOfb@qm@dgAu[vuAyGrz@kK|qAa_@ho@sj@rq@clAvcAynAhe@eNzR{P|m@cPtaBwQhs@il@tkAcq@p]ke@jm@sLhBuJ}BeRyFiKdA}hA~[qI|HmHx[~BhoA{L|[es@|V{y@jDmN|Ces@rc@_Q~Asp@gKgx@eGq|Bf[eTbTaRbZoc@zr@{Q|Jm\\dFix@f_@ui@uG{KxCiL|QuDrcAeLnTkb@v[u\\v^up@hc@iLdRkPbb@aTnMab@rMsIbF}IfRgKrfAu]ry@{QjbB_Cj_@~Kf_@xz@v}A|GlNfOzj@pWt}C{Cbu@{Tjq@s\\~p@k`@xm@sZV_MhB}b@hXyJz[gQ`qBwNdp@sHvNK`OjNlJva@iDtWrBfI~EtMxQn_@pJtIO~PkKdHgApGdDxFpYw@lfAeDbM_PjGwIxP_Dn`@_G`c@nBjVeDbc@~Jl\\`[tQjLpZ~I~d@hDdIvG~BhQqD~GlBdErUaOlq@yYjUiTnJwEtMg@xUO~h@x@j]fLr^b@b[xJfR`ZxQxJpBdDnAlBhDg@pLOfSbDvRjE|N}@hY~HjM|DpGrDzC~ClHbFlYxEjJjNbv@rR~Wb[dU|Rrl@nRn_@vHt\\m@bZiAt]|M|XgDzx@bBd\\bVjf@vJh_@fUhKpW|a@mA~WsDd_@qAjv@}Ctm@fChe@dEbc@{Fh^sKfa@wj@|e@wDdWbD~L{@v[s@|WzF~KjAz`@xJbVpF|VtEtRuAlI}It]wS~IyMf[`Gx]wA|JwKxMwN`i@Udd@dWb{@wBrUoSvDgl@fEuO`Tue@jYcc@rNeqC`r@wu@lQcUtVsTnq@zEfRQ|HmHvN"
-          } ]
-        } ],
-        "ack_warnings" : false,
-        "directions" : {
-          "points" : {
-            "from" : {
-              "lat" : 42.94989,
-              "lon" : -71.43241
-            },
-            "to" : {
-              "lat" : 43.6647222,
-              "lon" : -72.79333329999997
-            }
-          },
-          "route" : {
-            "duration" : 7309,
-            "distance" : 181741,
-            "coordinates" : {
-              "lat" : 42.94989,
-              "lon" : -71.43241
-            },
-            "address" : "723-761 Huse Road, Manchester, NH 03103, USA",
-            "polyline" : "atceGvs~rL`@xF}DvFoNjG{J}AuG?eEyLqOocAoFgg@mIuJ_a@kIk_BjPcu@j@}O`Ge`@luAuYdKie@dIaQjJsfAt{@yx@bg@iuAlmBkLvEm\\FcpAlAmgBvJid@`He_@|Dgg@kDwTWqRfF_dBvr@g_Axn@im@ld@scB~sA{|@thBqKtIoEXAgGpE|BnErKfJja@oOlu@kkAtpDkIzbAb@tXld@xgBxLjj@_@x\\um@nxEpD|lCxEhcBeJx^kGhFkg@bKgPzDyXdTcp@|g@eg@`_@}hAt{A{hAjwAudAbUg^pJiZnRe[xXqk@dbB_Hjw@kVdu@fDhqAyB`ZqO~XqIfZgJ||@qQv`@o\\xR}{@xXk`AzYyRzKgL|RsF~ZgE`~@}Thx@uEjuAsDzUoNlX_\\p~@qLdNgR`EsgA|FmZxHsNbOyLpc@ePb^c_@x[ov@t_@wNfOcg@zyBmOfb@qm@dgAu[vuAyGrz@kK|qAa_@ho@sj@rq@clAvcAynAhe@eNzR{P|m@cPtaBwQhs@il@tkAcq@p]ke@jm@sLhBuJ}BeRyFiKdA}hA~[qI|HmHx[~BhoA{L|[es@|V{y@jDmN|Ces@rc@_Q~Asp@gKgx@eGq|Bf[eTbTaRbZoc@zr@{Q|Jm\\dFix@f_@ui@uG{KxCiL|QuDrcAeLnTkb@v[u\\v^up@hc@iLdRkPbb@aTnMab@rMsIbF}IfRgKrfAu]ry@{QjbB_Cj_@~Kf_@xz@v}A|GlNfOzj@pWt}C{Cbu@{Tjq@s\\~p@k`@xm@sZV_MhB}b@hXyJz[gQ`qBwNdp@sHvNK`OjNlJva@iDtWrBfI~EtMxQn_@pJtIO~PkKdHgApGdDxFpYw@lfAeDbM_PjGwIxP_Dn`@_G`c@nBjVeDbc@~Jl\\`[tQjLpZ~I~d@hDdIvG~BhQqD~GlBdErUaOlq@yYjUiTnJwEtMg@xUO~h@x@j]fLr^b@b[xJfR`ZxQxJpBdDnAlBhDg@pLOfSbDvRjE|N}@hY~HjM|DpGrDzC~ClHbFlYxEjJjNbv@rR~Wb[dU|Rrl@nRn_@vHt\\m@bZiAt]|M|XgDzx@bBd\\bVjf@vJh_@fUhKpW|a@mA~WsDd_@qAjv@}Ctm@fChe@dEbc@{Fh^sKfa@wj@|e@wDdWbD~L{@v[s@|WzF~KjAz`@xJbVpF|VtEtRuAlI}It]wS~IyMf[`Gx]wA|JwKxMwN`i@Udd@dWb{@wBrUoSvDgl@fEuO`Tue@jYcc@rNeqC`r@wu@lQcUtVsTnq@zEfRQ|HmHvN"
-          }
-        },
-        "distance" : 181741,
-        "driving" : 7309,
         "nights" : 0,
@@ -374,2 +138,3 @@ "arrival_time" : 1366909309000,
       } ]
+  } ]
 }

test/fixtures/simple-trip.json

 {
-  "destination" : "",
-  "begin_date" : "2013-07-08",
-  "end_date" : "2013-07-13",
-  "start_time" : 32400000,
-  "stop_time" : 79200000,
-  "coordinates" : {
-    "lat" : 41.87360463980304,
-    "lon" : -122.54781130000003
+  "metadata" : {
+    "name" : "Furkot trip",
+    "desc" : "",
+    "link" : "http://google.com",
+    "author" : {
+      "name": "Furkot - road trip planner",
+      "short_name": "Furkot",
+      "email": {
+        "id": "trips",
+        "domain": "furkot.com"
+      },
+      "link": "https://trips.furkot.com"
+    }
   },
-  "scale" : 6,
-  "id" : "5144f7bed6e4d26079000006",
-  "steps" : [
+  "routes" : [ {
+    "points" : [
       {
-        "auto" : false,
-        "id" : "5144f7bed6e4d26079000007",
-        "lastDay" : true,
-        "day" : 0,
-        "pos" : 0.5,
+    	"day" : 0,
         "name" : "San Francisco",
@@ -33,15 +33,4 @@ "coordinates" : {
         "notes" : "",
-        "images" : [],
-        "skip" : false,
-        "lodging" : {},
-        "trip" : {
-          "id" : "5144f7bed6e4d26079000006"
-        },
-        "position" : [ 0.5 ],
         "address" : "San Francisco, CA",
         "visit_duration" : 0,
-        "expander" : [ {
-          "route" : [ false ]
-        } ],
-        "ack_warnings" : false,
         "nights" : 0,
@@ -52,8 +41,4 @@ "arrival_time" : 1373288400000,
       {
-        "auto" : false,
-        "id" : "5144f7cbd6e4d26079000009",
-        "lastDay" : true,
         "day" : 0,
-        "pos" : 0.625,
-        "name" : "Redding",
+    	"name" : "Redding",
         "coordinates" : {
@@ -65,9 +50,2 @@ "lat" : 40.54720023441049,
         "notes" : "",
-        "images" : [],
-        "skip" : false,
-        "lodging" : {},
-        "trip" : {
-          "id" : "5144f7bed6e4d26079000006"
-        },
-        "position" : [ 0.625 ],
         "locality" : {
@@ -80,40 +58,3 @@ "town" : "Redding",
         },
-        "ack_warnings" : false,
         "visit_duration" : 900000,
-        "expander" : [ {
-          "route" : [ {
-            "duration" : 11580,
-            "distance" : 342748,
-            "coordinates" : {
-              "lat" : 37.7749295,
-              "lon" : -122.41941550000001
-            },
-            "address" : "1601-1645 Market Street, San Francisco, CA 94103, USA",
-            "polyline" : "k|peFl`ejV``@_IbBbF}AiG~@mj@Hc^eObCgHh@}NeIeYaf@kb@wm@uk@io@o~ByiCqNoj@s[mpBsEyl@kJygAeK{mAoMcz@yKqHePQaOjG}TnI}vElw@muAlTwW{FoZ~@q^tL_r@ta@eUvHgv@bAkf@jXwe@h[oPhA{g@kQe|@fXwb@zPyO}AyV}]}IqPiTqJkk@wMaLkCup@_S_UcUkNoc@{OedBuIqPei@mf@or@mo@uhC{~Bo^q^mnAsoBkO}R_oAxCuq@ba@iNrF{ZfCwq@}N}YqDygAg@a`BhB_|BojAu^cHsb@aCc|@ii@}p@kdAiVg^ie@cj@_`@qm@qMqi@al@ul@q|AqmBq_Ac|A_c@_y@c\\m~@meAiaDab@exA_K}Pqs@kk@qjBczAodBcsAe~@oBeu@wBo\\uFar@aj@ox@}c@ic@oWmPoVaVyaAmg@ufBoR{c@cVqWeb@uv@kj@c`AcLwHgM|@moAuOskEeo@iiAoEy~AI_q@eAo~@tCuvAdSe{Bv[kl@vIusAdB_q@LieFb@ipE`@yqMuGq|ArFcoCzZmm@lFc\\uBohDke@c~Cqe@ml@sHig@}AekCk[smAgAwgCfEwW|EeKpOqJ`S_`ArbAm}An~AiSnIumAxe@gdEj_Cmk@~Iif@jWaw@di@ec@n`@{t@lb@_o@xSikAtl@kcA|k@miB~fAqQbU{w@x]ej@dVgVhNg~@lh@oh@b_@m^r`@miAzc@gaA`e@_gAxn@}O|I{a@td@i[nP{c@hKauApw@qh@xg@sSlJcXvBqWY_ZrFi}@hd@mbAng@st@jc@ul@lq@c^hVonAfo@{|@x^mbAjFkrDrBsaEzEczC`Xky@le@qWjGsZT{fCf@eb@Ao]iGsc@sCme@HsdDj@yhA`OcfAiJ}~ByAsbC~AuXjH}yAvAgdBjB}\\|L_jAtv@mb@v\\}a@zMcv@PinAN}gBgDowBaR}lByJk{DmY{s@wBwpGtAaqDhGsoGaB_iDoDyu@gBmoAsVkcDgA{yFXc_J`@kjEB_mAbA_rD`\\}_Hnn@crClRkbB|C}_D`GarBpDioA|Ka~AdPucA{Fkw@kEu[fLebB~rAez@xl@yw@zXih@xTqYdK_b@pCun@|KeaAlT_eDb_Aw}@|`@m]zPs`EpKi_D~FueC~KacAzC{wAV}sAuXevAvF{_AbNyq@rPqz@pLyd@hZejDjfDc`@n^{t@xb@sr@b_@_Hk@o@cOoo@Aqw@NoeA^gEhIuHvF{Jl@ih@sBcGfIeBvNwClD"
-          } ]
-        } ],
-        "directions" : {
-          "points" : {
-            "from" : {
-              "lat" : 37.7749295,
-              "lon" : -122.41941550000001
-            },
-            "to" : {
-              "lat" : 40.54720023441049,
-              "lon" : -122.34375
-            }
-          },
-          "route" : {
-            "duration" : 11580,
-            "distance" : 342748,
-            "coordinates" : {
-              "lat" : 37.7749295,
-              "lon" : -122.41941550000001
-            },
-            "address" : "1601-1645 Market Street, San Francisco, CA 94103, USA",
-            "polyline" : "k|peFl`ejV``@_IbBbF}AiG~@mj@Hc^eObCgHh@}NeIeYaf@kb@wm@uk@io@o~ByiCqNoj@s[mpBsEyl@kJygAeK{mAoMcz@yKqHePQaOjG}TnI}vElw@muAlTwW{FoZ~@q^tL_r@ta@eUvHgv@bAkf@jXwe@h[oPhA{g@kQe|@fXwb@zPyO}AyV}]}IqPiTqJkk@wMaLkCup@_S_UcUkNoc@{OedBuIqPei@mf@or@mo@uhC{~Bo^q^mnAsoBkO}R_oAxCuq@ba@iNrF{ZfCwq@}N}YqDygAg@a`BhB_|BojAu^cHsb@aCc|@ii@}p@kdAiVg^ie@cj@_`@qm@qMqi@al@ul@q|AqmBq_Ac|A_c@_y@c\\m~@meAiaDab@exA_K}Pqs@kk@qjBczAodBcsAe~@oBeu@wBo\\uFar@aj@ox@}c@ic@oWmPoVaVyaAmg@ufBoR{c@cVqWeb@uv@kj@c`AcLwHgM|@moAuOskEeo@iiAoEy~AI_q@eAo~@tCuvAdSe{Bv[kl@vIusAdB_q@LieFb@ipE`@yqMuGq|ArFcoCzZmm@lFc\\uBohDke@c~Cqe@ml@sHig@}AekCk[smAgAwgCfEwW|EeKpOqJ`S_`ArbAm}An~AiSnIumAxe@gdEj_Cmk@~Iif@jWaw@di@ec@n`@{t@lb@_o@xSikAtl@kcA|k@miB~fAqQbU{w@x]ej@dVgVhNg~@lh@oh@b_@m^r`@miAzc@gaA`e@_gAxn@}O|I{a@td@i[nP{c@hKauApw@qh@xg@sSlJcXvBqWY_ZrFi}@hd@mbAng@st@jc@ul@lq@c^hVonAfo@{|@x^mbAjFkrDrBsaEzEczC`Xky@le@qWjGsZT{fCf@eb@Ao]iGsc@sCme@HsdDj@yhA`OcfAiJ}~ByAsbC~AuXjH}yAvAgdBjB}\\|L_jAtv@mb@v\\}a@zMcv@PinAN}gBgDowBaR}lByJk{DmY{s@wBwpGtAaqDhGsoGaB_iDoDyu@gBmoAsVkcDgA{yFXc_J`@kjEB_mAbA_rD`\\}_Hnn@crClRkbB|C}_D`GarBpDioA|Ka~AdPucA{Fkw@kEu[fLebB~rAez@xl@yw@zXih@xTqYdK_b@pCun@|KeaAlT_eDb_Aw}@|`@m]zPs`EpKi_D~FueC~KacAzC{wAV}sAuXevAvF{_AbNyq@rPqz@pLyd@hZejDjfDc`@n^{t@xb@sr@b_@_Hk@o@cOoo@Aqw@NoeA^gEhIuHvF{Jl@ih@sBcGfIeBvNwClD"
-          }
-        },
-        "distance" : 342748,
-        "driving" : 11580,
         "nights" : 0,
@@ -124,7 +65,3 @@ "arrival_time" : 1373299980000,
       {
-        "auto" : false,
-        "id" : "5144f7dfd6e4d2607900000a",
-        "lastDay" : true,
         "day" : 0,
-        "pos" : 0.6875,
         "name" : "Lane",
@@ -137,10 +74,3 @@ "coordinates" : {
         "notes" : "",
-        "images" : [],
-        "skip" : false,
-        "lodging" : {},
-        "trip" : {
-          "id" : "5144f7bed6e4d26079000006"
-        },
         "pin" : 25,
-        "position" : [ 0.6875 ],
         "locality" : {
@@ -153,38 +83,3 @@ "town" : "Springfield",
         },
-        "ack_warnings" : false,
         "visit_duration" : 900000,
-        "expander" : [ {
-          "route" : [ {
-            "duration" : 18180,
-            "distance" : 515914,
-            "coordinates" : {
-              "lat" : 40.54720023441049,
-              "lon" : -122.34375
-            },
-            "address" : "4000 Victor Avenue, Redding, CA 96002, USA",
-            "polyline" : "}knvFzxuiV`HkWjy@gChHtf@igA~~@g`Ilj@__Fnl@{|JstCgrD_vBylCe~@{v@zi@kiAgS}LwVyv@n@gv@m`@u_AblAweD~PicBtSio@tbAei@bXgiAlhCesAzeBm_ErZukBjaD}s@zh@kYz`AeX|s@clA{Ks`@`c@kh@{h@wiBab@uwBgxBibBc`AeiAaIufA_^uz@_uAykCmlCmbBiu@glAmhAc_@gt@wf@dE}pAga@u{Au\\oaAmqCgz@~SqkBgk@soCcsAevC{IauBelBu}BjzBixC`nEipGhcDo{D`gE{x@ve@wpB`Lkn@`a@uz@_Qgs@v^i[zpAud@`}@|I`zAyvBj_B__GlrC_aBtx@wgB`Te`ElcA}`I|oCi{EtfC}cBvfDic@vpEwpAf|D{pAnaBuvBve@_~EoqBmzCyoFodBwIiy@r[{vAurAao@eHuwAre@eaBip@c~AaPyrCgsAqkNpyFwdGdnBaj@~Fgt@y_@{dC_gAu_BrgA{oAkm@mh@rJaj@e_@ssA~n@iuApz@aqFrtCc}GdfEm{DtoJotBpuFaiDfnEuzFjtGaxBrfCyoEzaBqcDppEw{BxoE_Np{EyuAfvIgf@hgGjd@|qCrgBb|CaUpyBatBleBgBp`B`{@bmBeHbdD_XdyB{t@viBqNv_Ec`CziB}jB~gFopAndAizIdq@ooDbMul@dm@cq@ny@ue@eSm`@aRulA{Qyz@rVkj@yQgkA|h@upAagAyt@b@im@rZ}}BdnAobBwcDsk@~Dux@hXsv@mG{k@jDuwAi|AemAezEcuA{nH_jBulB_jAH{`Bl^owByq@c^zPs`@_i@g`B}PmwCmk@{k@zmA}zCbzDauA`i@ki@dr@mAhrCqWncAo{@{[sf@~aAsnBod@}eDwzDiv@M_]wCkUpnA}b@zoByhAhE{aAlc@y|@pxA_oCtcB}pAuJiKaq@ij@wJeoA~o@qaG`LqhBzo@a_BwxA}oAi\\gxAbe@_yIm^ejHobBqzByeAyuBbMuiApm@ghA}F{lC_cAkaBqr@ec@qYg{@xs@ciAhIwz@qk@gvBxaA}m@hGa|AwiAuhBei@cdAsmBo|CueAknBewBaeE_pGsn@yTc`Az^yeCc|@isAsk@ixBmRw`Cll@mPzy@qd@z@cyC}xDqqAslCe@c{BvIouDi~AggGkiAyzAadC{lAu`HmhCyhCk`AkvFrBkyBwOq`GzCotD}c@e]~z@sdEp}A}_@`jBstBpK}`@yT`BsdBf]wb@a@ha@nHliAtf@|["
-          } ]
-        } ],
-        "directions" : {
-          "points" : {
-            "from" : {
-              "lat" : 40.54720023441049,
-              "lon" : -122.34375
-            },
-            "to" : {
-              "lat" : 44.04811573082351,
-              "lon" : -123.046875
-            }
-          },
-          "route" : {
-            "duration" : 18180,
-            "distance" : 515914,
-            "coordinates" : {
-              "lat" : 40.54720023441049,
-              "lon" : -122.34375
-            },
-            "address" : "4000 Victor Avenue, Redding, CA 96002, USA",
-            "polyline" : "}knvFzxuiV`HkWjy@gChHtf@igA~~@g`Ilj@__Fnl@{|JstCgrD_vBylCe~@{v@zi@kiAgS}LwVyv@n@gv@m`@u_AblAweD~PicBtSio@tbAei@bXgiAlhCesAzeBm_ErZukBjaD}s@zh@kYz`AeX|s@clA{Ks`@`c@kh@{h@wiBab@uwBgxBibBc`AeiAaIufA_^uz@_uAykCmlCmbBiu@glAmhAc_@gt@wf@dE}pAga@u{Au\\oaAmqCgz@~SqkBgk@soCcsAevC{IauBelBu}BjzBixC`nEipGhcDo{D`gE{x@ve@wpB`Lkn@`a@uz@_Qgs@v^i[zpAud@`}@|I`zAyvBj_B__GlrC_aBtx@wgB`Te`ElcA}`I|oCi{EtfC}cBvfDic@vpEwpAf|D{pAnaBuvBve@_~EoqBmzCyoFodBwIiy@r[{vAurAao@eHuwAre@eaBip@c~AaPyrCgsAqkNpyFwdGdnBaj@~Fgt@y_@{dC_gAu_BrgA{oAkm@mh@rJaj@e_@ssA~n@iuApz@aqFrtCc}GdfEm{DtoJotBpuFaiDfnEuzFjtGaxBrfCyoEzaBqcDppEw{BxoE_Np{EyuAfvIgf@hgGjd@|qCrgBb|CaUpyBatBleBgBp`B`{@bmBeHbdD_XdyB{t@viBqNv_Ec`CziB}jB~gFopAndAizIdq@ooDbMul@dm@cq@ny@ue@eSm`@aRulA{Qyz@rVkj@yQgkA|h@upAagAyt@b@im@rZ}}BdnAobBwcDsk@~Dux@hXsv@mG{k@jDuwAi|AemAezEcuA{nH_jBulB_jAH{`Bl^owByq@c^zPs`@_i@g`B}PmwCmk@{k@zmA}zCbzDauA`i@ki@dr@mAhrCqWncAo{@{[sf@~aAsnBod@}eDwzDiv@M_]wCkUpnA}b@zoByhAhE{aAlc@y|@pxA_oCtcB}pAuJiKaq@ij@wJeoA~o@qaG`LqhBzo@a_BwxA}oAi\\gxAbe@_yIm^ejHobBqzByeAyuBbMuiApm@ghA}F{lC_cAkaBqr@ec@qYg{@xs@ciAhIwz@qk@gvBxaA}m@hGa|AwiAuhBei@cdAsmBo|CueAknBewBaeE_pGsn@yTc`Az^yeCc|@isAsk@ixBmRw`Cll@mPzy@qd@z@cyC}xDqqAslCe@c{BvIouDi~AggGkiAyzAadC{lAu`HmhCyhCk`AkvFrBkyBwOq`GzCotD}c@e]~z@sdEp}A}_@`jBstBpK}`@yT`BsdBf]wb@a@ha@nHliAtf@|["
-          }
-        },
         "distance" : 515914,
@@ -197,7 +92,3 @@ "driving" : 18180,
       {
-        "auto" : false,
-        "id" : "5144f7bed6e4d26079000008",
-        "lastDay" : true,
         "day" : 0,
-        "pos" : 0.75,
         "name" : "Portland",
@@ -216,52 +107,9 @@ "coordinates" : {
         "notes" : "Trip notes for first stop",
-        "images" : [],
-        "skip" : false,
-        "lodging" : {},
-        "trip" : {
-          "id" : "5144f7bed6e4d26079000006"
-        },
-        "position" : [ 0.75 ],
         "address" : "Portland, OR",
         "visit_duration" : 0,
-        "expander" : [ {
-          "route" : [ {
-            "duration" : 6595,
-            "distance" : 178156,
-            "coordinates" : {
-              "lat" : 44.04811573082351,
-              "lon" : -123.046875
-            },
-            "address" : "500-554 Walnut Place, Springfield, OR 97477, USA",
-            "polyline" : "kkzkGvn_nV?wGD_N{@IiCNoEAgE?qCBeDUiJZDgFQiLyD}QwAwIKuG?}[DcNbAiHZ_CF]}V|FeBh@]LyDx@@rAUzSq@nGoBnOk@rKFn[KxMs@rIm@|CiCdI{ElFmCpAkCb@oCJ}HIac@oC_RmAmf@qCo_@gCi|AaJgJI}EZuOvBeTtD{vCve@u}ApWg{ApVaKdBgQx@qf@B_vBPyD@{iDRyhA?qpAHmmEVguFRu_BZ}gCFu}DPuuLj@mdLj@e{DH{tHh@aeCNgv@bA_[ZmG?uEMca@wDixAkOi`@qEqd@oKuf@_M{RqCiS_A_x@mBiPJuCDkQ`Ba]xGyWbC_WSeT_AkP}@mxAiGcz@qEgWkAqScCmQkEyf@sOkqAua@_gDeeAa{@qXoRmI{PmLoLyKaEqEuMoQ_MgOmLcK{GaEgKoEuHsByJ}AiQ_@qp@lDoFr@oEjAoSvHcLxBmGLaCGuKmBmImD{IwGqJ{IqYyWcNwJgMaFeEaAoJkAc[mCq^aEiI_CgH_EqDiDyBkCuFsJmOo\\yEsG{EgEqJwEkK}AwHJiPrCkcAtS}XrF{KhA{JXqUDif@AqOAil@?cl@Msg@IuiBF{CTmHzAwQdGk`@nMaP`HqPbOsHfF_IpCaCh@wGZaGUuD[cFuA{QiI{UoKuh@kUw_DyuAshAkf@{PkIcMwEq_Bss@gSsKu|A_~AkeDohDsiFumFgMgNiV}Uqq@kr@gpBurBq`@sa@iUwSsMgKq\\cTsZiR{BoAwjA_t@e^_UwPyLke@e_@eNyJgQyNc{DkzCul@qd@qYsTsCqA}D}@_OSsl@@gQ?kQa@mWEi_AAopCNaTQgMc@mHcAwBWc[{HkaAqYwhAs\\kh@yOkTgGam@yPun@_QuPcFmYwIgMiCeOeBcNg@yh@F_^Hgf@Jy}@NoFEkC_@iGuBwBgAqJmHcJyHyAgB_CgFwB{Mm@uF}AsHcDaHoCiDgGgEoNuHaC{B}DiHeB_I_@gFAmGTcNI{Hs@oFoCcI_Oa\\{Uwg@{Pc^uI_TaKwRqIiJ}BoCuAiDu@uGO{Ix@kNpAsNMcHu@{CgA}BaC{BkCu@iCFgIxBsJdCaNjAoO?uEUyFF_Nt@kEk@{DiCcEcGoH}IiDgCwHyCoG}@_[k@aBBeKJ_En@}Ap@oOpEcHrBqIhCsEDsDgAaHyCgA@e@XORU^eCgAaCiA[QgBy@qGmCgLeFgOwGeGkCy@lGKb@]nBeAi@YCYLaBRU?BlEBhEDfKaAR"
-          } ]
-        } ],
-        "ack_warnings" : false,
-        "directions" : {
-          "points" : {
-            "from" : {
-              "lat" : 44.04811573082351,
-              "lon" : -123.046875
-            },
-            "to" : {
-              "lat" : 45.5234515,
-              "lon" : -122.6762071
-            }
-          },
-          "route" : {
-            "duration" : 6595,
-            "distance" : 178156,
-            "coordinates" : {
-              "lat" : 44.04811573082351,
-              "lon" : -123.046875
-            },
-            "address" : "500-554 Walnut Place, Springfield, OR 97477, USA",
-            "polyline" : "kkzkGvn_nV?wGD_N{@IiCNoEAgE?qCBeDUiJZDgFQiLyD}QwAwIKuG?}[DcNbAiHZ_CF]}V|FeBh@]LyDx@@rAUzSq@nGoBnOk@rKFn[KxMs@rIm@|CiCdI{ElFmCpAkCb@oCJ}HIac@oC_RmAmf@qCo_@gCi|AaJgJI}EZuOvBeTtD{vCve@u}ApWg{ApVaKdBgQx@qf@B_vBPyD@{iDRyhA?qpAHmmEVguFRu_BZ}gCFu}DPuuLj@mdLj@e{DH{tHh@aeCNgv@bA_[ZmG?uEMca@wDixAkOi`@qEqd@oKuf@_M{RqCiS_A_x@mBiPJuCDkQ`Ba]xGyWbC_WSeT_AkP}@mxAiGcz@qEgWkAqScCmQkEyf@sOkqAua@_gDeeAa{@qXoRmI{PmLoLyKaEqEuMoQ_MgOmLcK{GaEgKoEuHsByJ}AiQ_@qp@lDoFr@oEjAoSvHcLxBmGLaCGuKmBmImD{IwGqJ{IqYyWcNwJgMaFeEaAoJkAc[mCq^aEiI_CgH_EqDiDyBkCuFsJmOo\\yEsG{EgEqJwEkK}AwHJiPrCkcAtS}XrF{KhA{JXqUDif@AqOAil@?cl@Msg@IuiBF{CTmHzAwQdGk`@nMaP`HqPbOsHfF_IpCaCh@wGZaGUuD[cFuA{QiI{UoKuh@kUw_DyuAshAkf@{PkIcMwEq_Bss@gSsKu|A_~AkeDohDsiFumFgMgNiV}Uqq@kr@gpBurBq`@sa@iUwSsMgKq\\cTsZiR{BoAwjA_t@e^_UwPyLke@e_@eNyJgQyNc{DkzCul@qd@qYsTsCqA}D}@_OSsl@@gQ?kQa@mWEi_AAopCNaTQgMc@mHcAwBWc[{HkaAqYwhAs\\kh@yOkTgGam@yPun@_QuPcFmYwIgMiCeOeBcNg@yh@F_^Hgf@Jy}@NoFEkC_@iGuBwBgAqJmHcJyHyAgB_CgFwB{Mm@uF}AsHcDaHoCiDgGgEoNuHaC{B}DiHeB_I_@gFAmGTcNI{Hs@oFoCcI_Oa\\{Uwg@{Pc^uI_TaKwRqIiJ}BoCuAiDu@uGO{Ix@kNpAsNMcHu@{CgA}BaC{BkCu@iCFgIxBsJdCaNjAoO?uEUyFF_Nt@kEk@{DiCcEcGoH}IiDgCwHyCoG}@_[k@aBBeKJ_En@}Ap@oOpEcHrBqIhCsEDsDgAaHyCgA@e@XORU^eCgAaCiA[QgBy@qGmCgLeFgOwGeGkCy@lGKb@]nBeAi@YCYLaBRU?BlEBhEDfKaAR"
-          }
-        },
-        "distance" : 178156,
-        "driving" : 6595,
         "nights" : 0,
         "arrival_time" : 1373326555000,
         "departure_time" : 1373326555000
-      } ]
+      } ] 
+  } ]
 }

test/trp.test.js

@@ -1,2 +0,1 @@
-var assert = require('assert');
 var trp = require('../lib/trp');
@@ -6,2 +5,4 @@ var fs = require('fs');
 
+/*global describe, it*/
+
 function loadFile(dirname, file) {
@@ -19,7 +20,3 @@ var filename = path.resolve(dirname, file);
     var t = loadJson(__dirname, './fixtures/simple-trip.json'),
-      generated = trp(t, {
-        tracks: true,
-        creator: 'Furkot - road trip planner. See: https://trips.furkot.com',
-        destination: 'Furkot trip'
-      }),
+      generated = trp(t),
       expected = loadFile(__dirname, './fixtures/simple.trp');
@@ -35,7 +32,3 @@
     var t = loadJson(__dirname, './fixtures/multi-trip.json'),
-      generated = trp(t, {
-        tracks: true,
-        creator: 'Furkot - road trip planner. See: https://trips.furkot.com',
-        destination: 'Furkot trip'
-      }),
+      generated = trp(t),
       expected = loadFile(__dirname, './fixtures/multi.trp');
@@ -48,2 +41,17 @@
   });
+
+  it('day routes', function (done) {
+    var t = loadJson(__dirname, './fixtures/day-routes.json'),
+      generated = trp(t);
+
+    generated.forEach(function (generated, i) {
+      var expected = loadFile(__dirname, './fixtures/day-routes/day-' + (i + 1) + '.trp');
+      
+      // require('fs').writeFileSync('day-' + (i + 1) + '.trp', generated);
+
+      generated.should.eql(expected);
+    });
+
+    done();
+  });
 });

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Dependency count

0

decreased by-100%

Number of package files

26

increased by30%

Worsened metrics

Total package byte prevSize

67434

decreased by-89.21%

Lines of code

823

decreased by-2.14%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• - Removedpolyline-encoded@~0

• - Removedpolyline-encoded@0.0.9(transitive)