Correction of Zero!

ph-il · Oct 6, 2014 · 189d91e · 189d91e
1 parent 80c6c41
commit 189d91e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/EventListener/UserGeolocationListener.php b/EventListener/UserGeolocationListener.php
@@ -99,13 +99,14 @@ private function getLatitudeLongitude(Request $request, $cookie)
         try {
             $coords = $this->geocoder->geocode($request->getClientIp());
         } catch (\Exception $e) {
+            $coords = $this->getDefaultCoords();
+        }
 
-            $coords = array(
-                'latitude'  =>  "43.650297000",
-                'longitude' => "-79.385298000"
-            );
+        if ($coords['latitude'] == 0 || $coords['longitude']) {
+            $coords = $this->getDefaultCoords();
         }
 
+
         $cookie['latitude']  = $coords['latitude'];
         $cookie['longitude'] = $coords['longitude'];
         $cookie['geotype'] = 'ip';
@@ -132,4 +133,17 @@ private function getCookie($request)
             return $cookie;
         }
     }
+
+    /**
+     * @return array
+     */
+    private function getDefaultCoords()
+    {
+        $coords = array(
+            'latitude'  => "43.650297000",
+            'longitude' => "-79.385298000"
+        );
+
+        return $coords;
+    }
 } 
diff --git a/Twig/Extension/DistanceExtension.php b/Twig/Extension/DistanceExtension.php
@@ -31,7 +31,7 @@ public function getFilters()
         );
     }
 
-    public function address(Point $from, Point $to, $flags = AbstractGeotools::KILOMETER_UNIT)
+    public function distance(Point $from, Point $to, $flags = AbstractGeotools::KILOMETER_UNIT)
     {
         return $this->distance->setFrom($from)->setTo($to)->in($flags)->vincenty();
     }