Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / location.php

diff --git a/lib/location.php b/lib/location.php
index 191550d6d6ca53e213f4a13f3b6b8bd2fc763a65..54e0d07acf61575fff990cf2d9f56c8123fabcc6 100644 (file)
--- a/lib/location.php
+++ b/lib/location.php
@@ -56,6 +56,23 @@ class Location
 
     var $names = array();
 
+    /**
+     * Constructor that makes a Location from Notice::locationOptions(...)
+     *
+     * @param array $options    an array for example provided by Notice::locationOptions(...)
+     *
+     * @return Location Location with the given options (lat, lon, id, name)
+     */
+    static function fromOptions(array $options) {
+        $location = new Location();
+        foreach (['lat', 'lon', 'location_id', 'location_ns'] as $opt) {
+            if (isset($options[$opt])) {
+                $location->$opt = $options[$opt];
+            }
+        }
+        return $location;
+    }
+
     /**
      * Constructor that makes a Location from a string name
      *