Allow the passing-in of already decoded json objected

imclab · Apr 13, 2011 · 70f2593 · 70f2593
1 parent cb2c140
commit 70f2593
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/lib/adapters/GeoJSON.class.php b/lib/adapters/GeoJSON.class.php
@@ -23,17 +23,19 @@ class GeoJSON extends GeoAdapter
    * Deserializes a geojson string into an object
    *
    *
-   * @param string $string The GeoJSON string
+   * @param mixed $input The GeoJSON string or object
    *
    * @return object The PHP equivalent object
    */
-  public function read($string)
+  public function read($input)
   {
-    if (!($object = json_decode($string)))
-    {
+  	if (is_string($input)) {
+  		$input = json_decode($input);
+  	}
+    if (!is_object($input)) {
       throw new Exception('Invalid JSON');
     }
-    return self::toInstance($object);
+    return self::toInstance($input);
   }
 
   /**