server-side-google-maps 0.0.1 → 0.0.2

data/lib/server-side-google-maps/directions.rb

@@ -131,6 +131,9 @@ module ServerSideGoogleMaps
 
     def calculate_distance
       return GeoMath.latlng_distance(*points) if @direct
+      if !leg['distance']
+        return leg['steps'].collect{|s| s['distance']}.collect{|d| d ? d['value'].to_i : 0}.inject(0){|s,v| s += v}
+      end
       leg['distance']['value']
     end
   end

data/lib/server-side-google-maps/version.rb

@@ -1,3 +1,3 @@
 module ServerSideGoogleMaps
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/directions_spec.rb

@@ -54,8 +54,6 @@ module ServerSideGoogleMaps
           parser = Parser.new(data, :json)
           parser.parse
         end
-
-        directions = Directions.new('Montreal,QC', 'Ottawa,ON')
       end
 
       it('should have origin_input and destination_input') do
@@ -118,5 +116,26 @@ module ServerSideGoogleMaps
         lambda { Directions.new('Montreal,QC', 'Ottawa,ON', :find_shortcuts => { :factor => 0.5, :mode => :direct }) }.should(raise_error(ArgumentError))
       end
     end
+
+    context('when Google forgets the total distance') do
+      class Parser < HTTParty::Parser
+        public_class_method(:new)
+      end
+
+      before(:each) do
+        Directions.stub(:get) do
+          data = File.read(File.dirname(__FILE__) + '/files/directions-Montreal,QC-to-Ottawa,ON-without-distance.txt')
+          parser = Parser.new(data, :json)
+          parser.parse
+        end
+
+        directions = Directions.new('Montreal,QC', 'Ottawa,ON')
+      end
+
+      it('should calculate the distance by summing the parts') do
+        directions = Directions.new('Montreal,QC', 'Ottawa,ON')
+        directions.distance.should == 199901
+      end
+    end
   end
 end

data/spec/files/directions-Montreal,QC-to-Ottawa,ON-without-distance.txt

@@ -0,0 +1,340 @@
+{
+  "status": "OK",
+  "routes": [ {
+    "summary": "Autoroute 40 W and ON-417 W",
+    "legs": [ {
+      "steps": [ {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.5086700,
+          "lng": -73.5536800
+        },
+        "end_location": {
+          "lat": 45.5062300,
+          "lng": -73.5556900
+        },
+        "polyline": {
+          "points": "elwtGn}|_MfNpK",
+          "levels": "BB"
+        },
+        "duration": {
+          "value": 20,
+          "text": "1 min"
+        },
+        "html_instructions": "Head \u003cb\u003esouthwest\u003c/b\u003e on \u003cb\u003eRue Notre-Dame E\u003c/b\u003e toward \u003cb\u003ePlace Jacques Cartier\u003c/b\u003e",
+        "distance": {
+          "value": 313,
+          "text": "0.3 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.5062300,
+          "lng": -73.5556900
+        },
+        "end_location": {
+          "lat": 45.5068900,
+          "lng": -73.5572800
+        },
+        "polyline": {
+          "points": "}|vtG`j}_McC|H",
+          "levels": "BB"
+        },
+        "duration": {
+          "value": 25,
+          "text": "1 min"
+        },
+        "html_instructions": "Take the 1st \u003cb\u003eright\u003c/b\u003e onto \u003cb\u003eBoulevard Saint-Laurent\u003c/b\u003e",
+        "distance": {
+          "value": 144,
+          "text": "0.1 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.5068900,
+          "lng": -73.5572800
+        },
+        "end_location": {
+          "lat": 45.5082100,
+          "lng": -73.5563400
+        },
+        "polyline": {
+          "points": "aawtG~s}_MgG{D",
+          "levels": "BB"
+        },
+        "duration": {
+          "value": 40,
+          "text": "1 min"
+        },
+        "html_instructions": "Take the 1st \u003cb\u003eright\u003c/b\u003e onto \u003cb\u003eRue Saint Antoine E\u003c/b\u003e",
+        "distance": {
+          "value": 164,
+          "text": "0.2 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.5082100,
+          "lng": -73.5563400
+        },
+        "end_location": {
+          "lat": 45.5071400,
+          "lng": -73.5585500
+        },
+        "polyline": {
+          "points": "iiwtGbn}_MuA]g@P}@xBAn@^d@fHnEjAd@",
+          "levels": "B???@??B"
+        },
+        "duration": {
+          "value": 61,
+          "text": "1 min"
+        },
+        "html_instructions": "Take the \u003cb\u003eAutoroute 720 O\u003c/b\u003e ramp on the \u003cb\u003eleft\u003c/b\u003e",
+        "distance": {
+          "value": 404,
+          "text": "0.4 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.5071400,
+          "lng": -73.5585500
+        },
+        "end_location": {
+          "lat": 45.4728800,
+          "lng": -73.5967400
+        },
+        "polyline": {
+          "points": "sbwtG|{}_M`TtPjMlIpCnAz@TvJ`@dBXjC`AfBjAfA`AzAtB~@fBr@lBtHhYvClH|DbG~StYrHhLvSj`@|_@~r@lEjErF|BdU`H",
+          "levels": "B?@??????@????@??@?@??B"
+        },
+        "duration": {
+          "value": 202,
+          "text": "3 mins"
+        },
+        "html_instructions": "Merge onto \u003cb\u003eAutoroute 720 W\u003c/b\u003e",
+        "distance": {
+          "value": 5006,
+          "text": "5.0 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.4728800,
+          "lng": -73.5967400
+        },
+        "end_location": {
+          "lat": 45.5019000,
+          "lng": -73.6638100
+        },
+        "polyline": {
+          "points": "olptGrje`MPPrD~A|A|AtAhBhAdC~@`Dv@nGFjEIzAg@nDiAnEeFnPsDpKeA~ByKx[uEjKoErIaCdDwGzFaClC{AbCyAjDmJ~WcJrXqItUiFrOOLwWrv@uGlSGp@eDtKqA|CeZbj@QHyG~LqApBuCnD{DjD",
+          "levels": "B???@??@????@???@?????@?????????@?????B"
+        },
+        "duration": {
+          "value": 378,
+          "text": "6 mins"
+        },
+        "html_instructions": "Take exit \u003cb\u003e1N\u003c/b\u003e to merge onto \u003cb\u003eAutoroute Décarie/Autoroute 15 N\u003c/b\u003e toward \u003cb\u003eSaint-Jérôme\u003c/b\u003e",
+        "distance": {
+          "value": 6611,
+          "text": "6.6 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.5019000,
+          "lng": -73.6638100
+        },
+        "end_location": {
+          "lat": 45.5026400,
+          "lng": -73.6676900
+        },
+        "polyline": {
+          "points": "{avtGxmr`McAz@uFdDsAlBa@~A@xBXlA\\n@VXl@XzCj@",
+          "levels": "B???@??@??B"
+        },
+        "duration": {
+          "value": 30,
+          "text": "1 min"
+        },
+        "html_instructions": "Take exit \u003cb\u003e70O\u003c/b\u003e on the \u003cb\u003eleft\u003c/b\u003e for \u003cb\u003eAutoroute 40 O\u003c/b\u003e toward \u003cb\u003eHull/Ottawa/Autoroute 520/Pierre Elliott Trudeau\u003c/b\u003e",
+        "distance": {
+          "value": 542,
+          "text": "0.5 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.5026400,
+          "lng": -73.6676900
+        },
+        "end_location": {
+          "lat": 45.5390400,
+          "lng": -74.3889100
+        },
+        "polyline": {
+          "points": "ofvtG`fs`MxAp@|AvAjXl^xEfHhAxBxA`Ep@hCl@dDn@bHNvF`@xl@ZvIt@xIfBdLlCfMdA~DtQnz@nAbIl@hG`@~JEpNsIrsDWfOAzN\\tVpB~t@b@pWfAla@d@tHrAfMhBfKlBbIlDzKni@bvAxl@|~A~gAlnCzR|f@pBvGn@lC~AbJjQduAnAdHfBbHrFhOx}@r~BvFlOvAnEfCxIhChKfEpT`J`l@nArGxChMxAlErBzFlG`Od[rs@xRdc@rOf^`C`FhBdFnBpIv@bHT|DPfHMzGeG`hBiCzp@a@xM@bHlQzyEvEpp@vArWnB|UjEpl@l@pGnBtMhD`OrBnGfNl_@vD`Jzh@btA|DzKlGnWjA`JN`GC`Dc@hGiBtI{AzDeC`EcBhBsCbCy@f@k^tYcSnQi{@r_AsChEg@fAgAlCeBhGs@bEc@rEaCzl@_@lTwAb{AWlGiAtKw@rDwChK_p@tvBiB|GwAvIw@xH[`JCvJ~DhhAT|PAhp@YpIuAnSmBxNyLht@iEhRaEbNuBrFgExJ{IpP}d@f~@m`@~p@qL~T}EpM}\\pmAcRnh@gQ`t@uBjLa\\`vCiAfFsAvD}D~GuR|VmR~U{CvF{CpI_Jfh@gL|s@q@xGUvFDbJpOxfDKhGc@`FqBpIwCfGkzA|kBgJvLeg@pr@wC|CkAbAuF~C_DfAgdBbe@mDd@yC?qHo@{C@cEz@wCpA}DdDaE|G{AtEsGj`@",
+          "levels": "B??@???@?????@?????A????@???@??A???@?@?????@???@??????@???????A???@???@@???A???@???@???A???@????@@???A??????@??@??@????@???A???@????@??@??@????@??A??@@??A????@???@???@?@?@?B"
+        },
+        "duration": {
+          "value": 2666,
+          "text": "44 mins"
+        },
+        "html_instructions": "Merge onto \u003cb\u003eAutoroute 40 W\u003c/b\u003e\u003cdiv style=\"font-size:0.9em\"\u003eEntering Ontario\u003c/div\u003e",
+        "distance": {
+          "value": 66555,
+          "text": "66.6 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.5390400,
+          "lng": -74.3889100
+        },
+        "end_location": {
+          "lat": 45.4124300,
+          "lng": -75.6833000
+        },
+        "polyline": {
+          "points": "_j}tGta`eMoRzmAab@vcCu\\|nCuF~]uThiAeE~VyR`wAcSfzA}AjLgA|J[|FK|FTpHp@nIfApGtBxHvBrFfGtIfj@`l@fHjJfGzJhKrVdSzs@pD|KdHxOfGdKvF`IxcAbmAtJ~IvJrH|GfEbb@nUpn@v\\tIpHnClDxCfF|ChHzBdHxD|TvMt`AbD`QbD`M`ElNxHzSnPl_@xGlRnCjJpBdIpJdd@pE`RfGfTjIpTnVzj@pFrObErNhFjU~E~[~D~_@nDbXlGdX|HbSbJjQnMdUlGlNhFnN~I`YzBhGzF|MxEpJlFnJ~JbOlOnPjOhNvLjLlFxHzEdJjFhN`D|LzDpUpAhVjAf]~@jNvB~PlC~NxDvN|DxKzFxMfG`Kt^bd@pF`IxEbIxIpQnSbk@hJzTpGbMpIdNfNzPdMfM`JrG|IhFzP|GfRbEj^zCnUtF~IhDvHjEjNjKjKxKvKnN|FtJ~FvLt^l}@bGnRtEpSjBfLdClUpAbSx@|b@n@`g@`AbTbDd^tDhUpDjQrFlSjSjk@bHhTvJh_@bGpXhH~]xGvWfOrg@vJfWpIjPvI`LvIpHbKrGxNrIdG~DfGpFvF|FlEtFvFhIfDfGlEhKxBfGhSlo@fe@`~A~H`[lEnXfCjXz@rV?fZc@dj@Zpc@fAt_@~B`c@nCj\\z]jtDv@zGnC~QzDrRrDrN~R|p@|Qxr@lQhy@rTbiAzEjYrEh^|A`ObD~`@vAvXf@bQxBpi@r@tM`@~LR~JBxJKtKg@dLk@rIy@rH}@bHeCnNaBzKcAdIy@bJmAvQk@lTCvTf@fT`ArPjCdYrBxQ~@lUMzToBhVqEfUwEhPcJtQkKlOmUp[cCvDuC~FqCnHaClJWxAyAlLk@xNRlLb@tJbDtg@nBte@`Cpz@fCzc@fJpfAp@~MXnPk@pZoAlQgDhY}@dJc@fNH~Kd@pK`F|y@d@`R?pIQvM{@tPuAjNsCbR_ElPcDjKeGhOuGlLio@x~@iDzFyDxI_CjHeAbE}BhNy@pI_@|HKdK?n_@K~I[dJkAvPeBxNuCvOwCrLeIlZ_DzOu@|EqAxKw@`Ke@lJS|ICdKlBxaC@vLMrQQ`JkArY_A|MeBfRiK`x@mDv\\kh@hzFaFxv@sIn}AcFp{@m@vGsAdJoAjGeBxGgCdIop@j_BmBnG}@zDu@vE]zC[~EmIxnBeF|gAiBb\\yBn\\aEne@}e@v_FwBlNiA|EoBvGsBlFyA|CmDfG}OdTgFhI}EnJwKpWkBtDwDnGoGhIeE`EoDvCiHjE{F`CiGhBkHpAyF^}Oj@qC`@kDz@yChAeFtCsNxK_C~AeCrAkE~AqMdDeBx@aBfA{BxBsAfBkCdFoArDcArFk@lGq@zKk@rE}@fEcAdDkBzDqCtD_CpBkBjAgBr@eCn@mM~AqAf@sBnAwBlB{B|C_B`EsA|FS~AYvFDrEZhE^fCrEdRfBdJvA~JjAhMt@vRnEr`Bb@lIXxCh@~CjE|Pd@vCZhDnB`k@ExE{@xLOxEF`GP|Cz@rGpAhFrQdg@rEnQ",
+          "levels": "B?@@??@?@???@??A??@??@??@??@?@???@??A?@???@???@????@???@????@???@????@?@??@??@?@???@???A???@??@??@??@?@?@??@??@?A???@???@?@???@????A??@????@???@????A??@??@?@?@??@??@?@????B??????@???????@??@?????A??@????@??@?A????????@????@???@???A???@??@???A??????@????@???@???@??@????@??@????@???@?????@??A???@???????@???@?????@????@???@???@??????@??@????@???A???@????@??@????@?????@???B"
+        },
+        "duration": {
+          "value": 4744,
+          "text": "1 hour 19 mins"
+        },
+        "html_instructions": "Continue onto \u003cb\u003eON-417 W\u003c/b\u003e",
+        "distance": {
+          "value": 118628,
+          "text": "119 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.4124300,
+          "lng": -75.6833000
+        },
+        "end_location": {
+          "lat": 45.4112800,
+          "lng": -75.6874000
+        },
+        "polyline": {
+          "points": "urdtGr{|lMNzAvAjGf@fFtAbF",
+          "levels": "B???B"
+        },
+        "duration": {
+          "value": 27,
+          "text": "1 min"
+        },
+        "html_instructions": "Take exit \u003cb\u003e119\u003c/b\u003e for \u003cb\u003eCatherine Street\u003c/b\u003e",
+        "distance": {
+          "value": 347,
+          "text": "0.3 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.4112800,
+          "lng": -75.6874000
+        },
+        "end_location": {
+          "lat": 45.4088400,
+          "lng": -75.6937300
+        },
+        "polyline": {
+          "points": "okdtGfu}lM|@jF`AjDfJxY",
+          "levels": "B??B"
+        },
+        "duration": {
+          "value": 108,
+          "text": "2 mins"
+        },
+        "html_instructions": "Slight \u003cb\u003eleft\u003c/b\u003e at \u003cb\u003eCatherine St/Regional Road 60\u003c/b\u003e",
+        "distance": {
+          "value": 565,
+          "text": "0.6 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.4088400,
+          "lng": -75.6937300
+        },
+        "end_location": {
+          "lat": 45.4125400,
+          "lng": -75.6968900
+        },
+        "polyline": {
+          "points": "g|ctGx|~lMU^}ElDoNhL",
+          "levels": "B??B"
+        },
+        "duration": {
+          "value": 56,
+          "text": "1 min"
+        },
+        "html_instructions": "Turn \u003cb\u003eright\u003c/b\u003e at \u003cb\u003eKent St/Hwy 17B/Regional Road 83\u003c/b\u003e",
+        "distance": {
+          "value": 480,
+          "text": "0.5 km"
+        }
+      }, {
+        "travel_mode": "DRIVING",
+        "start_location": {
+          "lat": 45.4125400,
+          "lng": -75.6968900
+        },
+        "end_location": {
+          "lat": 45.4119000,
+          "lng": -75.6984600
+        },
+        "polyline": {
+          "points": "ksdtGpp_mM~BxH",
+          "levels": "BB"
+        },
+        "duration": {
+          "value": 38,
+          "text": "1 min"
+        },
+        "html_instructions": "Turn \u003cb\u003eleft\u003c/b\u003e at \u003cb\u003eJames St\u003c/b\u003e\u003cdiv style=\"font-size:0.9em\"\u003eDestination will be on the left\u003c/div\u003e",
+        "distance": {
+          "value": 142,
+          "text": "0.1 km"
+        }
+      } ],
+      "duration": {
+        "value": 8395,
+        "text": "2 hours 20 mins"
+      },
+      "start_location": {
+        "lat": 45.5086700,
+        "lng": -73.5536800
+      },
+      "end_location": {
+        "lat": 45.4119000,
+        "lng": -75.6984600
+      },
+      "start_address": "Montreal, QC, Canada",
+      "end_address": "Ottawa, ON, Canada",
+      "via_waypoint": [ ]
+    } ],
+    "copyrights": "Map data ©2011 Google",
+    "overview_polyline": {
+      "points": "elwtGn}|_MfNpKcC|H}IyE}AlEvn@lc@f^pJ|Sbm@fyAndCli@|U~IbSo@dTg\\xaAqb@rp@soAhuDah@t_AeWdXrt@bdA`FlxAn_@jnBsIngFbHdyCxMnp@fuDzoJb^j}B|oAzeD~b@bvBpvAxgDpAd`@oLzqDlQzyEjRtmCzLxn@xcAnlCdJto@oJ|]a|@zt@i{@r_AiJhTsLh`Ei~@bfDrDjbDwSdcBiUzt@weBjfDibAblDab@tjDqs@ldAc\\vgBaAtZpOxfDaD|XuyCp|D}pBjl@y]r@wOtOibC|kO{i@t_EyAjd@fJnc@~cA~mA`e@lxAdX`f@noAbxAjfBbcA~RfUrf@fiCdi@dwAla@`bBpn@t`Bfa@teCzoAnwC~`AxhAtThc@|Inc@tI|uA`Wjz@hu@jdAri@psAja@dn@dc@d]~yArZbc@`W``@~f@tf@dkAjUvjA|FftBxInt@|_BvaG``@tu@bv@ji@dZda@xmAb_EpKniA~DvnDjb@vqErfBtbItMjpAbJb~BsT|{CdL`_C}Bdl@iLpf@iw@noA_K|p@n^n~GkJfsBvHpfBmA~i@sYroAi}@btA}Nrh@yEbhB_b@vdCS~~Ei_AhsJyWzqE_Mhn@qw@ntBqYf~Fmm@tlGqM`d@}aAhcBg`@bVsq@nIc|@bd@sKfR{Lzs@}JrJg\\zIuKjWfOrpAhHx~BpIxd@jA`wAnr@fgCcVvR~BxH",
+      "levels": "B@@@@@@@@@A@@@@@A@@A@A@@@@@A@@@A@@B@@@A@@@A@@@@@A@@AA@@A@@B@@@@@@A@@@@@@@@@@A@@@@@@@A@@@A@@@A@@@@@B@@A@@A@@@A@@A@@@@@@@@A@@@@@@@@@A@@@@@@B"
+    },
+    "warnings": [ ],
+    "waypoint_order": [ ],
+    "bounds": {
+      "southwest": {
+        "lat": 45.3026900,
+        "lng": -75.6984600
+      },
+      "northeast": {
+        "lat": 45.5655200,
+        "lng": -73.5536800
+      }
+    }
+  } ]
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: server-side-google-maps
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Adam Hooper
@@ -82,6 +82,7 @@ files:
 - server-side-google-maps.gemspec
 - spec/directions_spec.rb
 - spec/files/directions-45.5086700,-73.5536800-to-45.4119000,-75.6984600.txt
+- spec/files/directions-Montreal,QC-to-Ottawa,ON-without-distance.txt
 - spec/files/directions-Montreal,QC-to-Ottawa,ON.txt
 - spec/files/directions-Ottawa,ON-to-Toronto,ON.txt
 - spec/route_spec.rb