Merge pull request #465 from earboxer/openlocationcodes

Address Service: Convert Open Location Codes to lat/lon
nextcloud · Apr 14, 2022 · ae6d347 · ae6d347
2 parents 3f3d2a4 + 880d40e
commit ae6d347
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
     "require": {
-        "lsolesen/pel": "^0.9.11"
+        "lsolesen/pel": "^0.9.11",
+        "bogdaan/open-location-code": "dev-master"
     },
     "require-dev": {
         "christophwurst/nextcloud_testing": "^0.9.1"

diff --git a/lib/Service/AddressService.php b/lib/Service/AddressService.php
@@ -21,6 +21,7 @@
 use OCP\IMemcache;
 use \Sabre\VObject\Reader;
 use \OCP\Files\IAppData;
+use OpenLocationCode\OpenLocationCode;
 
 /**
  * Class AddressService
@@ -136,6 +137,15 @@ public function lookupAddress($adr, $uri) {
 
     private function lookupAddressInternal($adr) {
         $res = [null, null, False];
+
+        if (OpenLocationCode::isFull($adr)) {
+            $decoded = OpenLocationCode::decode($adr);
+            $res[0] = $decoded['latitudeCenter'];
+            $res[1] = $decoded['longitudeCenter'];
+            $res[2] = True;
+            return $res;
+        }
+
         $adr_norm = strtolower(preg_replace('/\s+/', '', $adr));
 
         $this->qb->select('lat', 'lng')