Merge pull request #22 from shahariaazam/master

willdurand · willdurand · commit f7ebd114077b · 2014-01-23T15:30:51.000+01:00
diff --git a/composer.json b/composer.json
@@ -10,10 +10,10 @@
     ],
     "require": {
         "php": ">=5.2.4",
-        "propel/propel1": "~1.6,>=1.6.4"
+        "propel/propel1": "~1.6,>=1.6.4",
+        "willdurand/geocoder": "~2.3"
     },
     "require-dev": {
-        "willdurand/geocoder": "@stable"
     },
     "autoload": {
         "classmap": ["src/"]
diff --git a/src/GeocodableBehavior.php b/src/GeocodableBehavior.php
@@ -19,14 +19,18 @@ class GeocodableBehavior extends Behavior
         'auto_update'               => 'true',
         'latitude_column'           => 'latitude',
         'longitude_column'          => 'longitude',
+        'type'                      => 'DOUBLE',
+        'size'                      => 10,
+        'scale'                     => 8,
+
         // IP-based Geocoding
         'geocode_ip'                => 'false',
         'ip_column'                 => 'ip_address',
         // Address Geocoding
         'geocode_address'           => 'false',
         'address_columns'           => 'street,locality,region,postal_code,country',
         // Geocoder
-        'geocoder_provider'         => '\Geocoder\Provider\OpenStreetMapsProvider',
+        'geocoder_provider'         => '\Geocoder\Provider\OpenStreetMapProvider',
         'geocoder_adapter'          => '\Geocoder\HttpAdapter\CurlHttpAdapter',
         'geocoder_api_key'          => 'false',
         'geocoder_api_key_provider' => 'false',
@@ -45,13 +49,17 @@ public function modifyTable()
         if (!$this->getTable()->containsColumn($this->getParameter('latitude_column'))) {
             $this->getTable()->addColumn(array(
                 'name' => $this->getParameter('latitude_column'),
-                'type' => 'DOUBLE'
+                'type' => $this->getParameter('type'),
+                'size' => $this->getParameter('size'),
+                'scale'=> $this->getparameter('scale')
             ));
         }
         if (!$this->getTable()->containsColumn($this->getParameter('longitude_column'))) {
             $this->getTable()->addColumn(array(
                 'name' => $this->getParameter('longitude_column'),
-                'type' => 'DOUBLE'
+                'type' => $this->getParameter('type'),
+                'size' => $this->getParameter('size'),
+                'scale'=> $this->getparameter('scale')
             ));
         }
         if ('true' === $this->getParameter('geocode_ip') && !$this->getTable()->containsColumn($this->getParameter('ip_column'))) {
diff --git a/tests/GeocodableBehaviorTest.php b/tests/GeocodableBehaviorTest.php
@@ -403,7 +403,6 @@ public function testGeocode()
         $this->assertTrue($geo->isModified());
         $this->assertInstanceOf('Geocoder\Result\ResultInterface', $result);
         $this->assertEquals('Paris', $result->getCity());
-        $this->assertEquals('France Métropolitaine', $result->getCountry());
     }
 
     public function testGeocodeIsEffectLessIfGeocodingDisabled()
diff --git a/tests/GeocodableBehaviorWithNamespacesTest.php b/tests/GeocodableBehaviorWithNamespacesTest.php
@@ -412,7 +412,6 @@ public function testGeocode()
         $this->assertTrue($geo->isModified());
         $this->assertInstanceOf('Geocoder\Result\ResultInterface', $result);
         $this->assertEquals('Paris', $result->getCity());
-        $this->assertEquals('France Métropolitaine', $result->getCountry());
     }
 
     public function testGeocodeIsEffectLessIfGeocodingDisabled()

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,6 @@ public function testGeocode()`
`403`	`403`	`$this->assertTrue($geo->isModified());`
`404`	`404`	`$this->assertInstanceOf('Geocoder\Result\ResultInterface', $result);`
`405`	`405`	`$this->assertEquals('Paris', $result->getCity());`
`406`		`- $this->assertEquals('France Métropolitaine', $result->getCountry());`
`407`	`406`	`}`
`408`	`407`
`409`	`408`	`public function testGeocodeIsEffectLessIfGeocodingDisabled()`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,6 @@ public function testGeocode()`
`412`	`412`	`$this->assertTrue($geo->isModified());`
`413`	`413`	`$this->assertInstanceOf('Geocoder\Result\ResultInterface', $result);`
`414`	`414`	`$this->assertEquals('Paris', $result->getCity());`
`415`		`- $this->assertEquals('France Métropolitaine', $result->getCountry());`
`416`	`415`	`}`
`417`	`416`
`418`	`417`	`public function testGeocodeIsEffectLessIfGeocodingDisabled()`