Skip to content

Commit d96cd25

Browse files
author
Martin Brecht-Precht
committed
Updated the project after extracting the GeoLocation namespace into the Google Data Structures project.
1 parent 2488ad9 commit d96cd25

11 files changed

+18
-475
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
}
2323
},
2424
"require": {
25-
"php": ">=5.3"
25+
"php": ">=5.3",
26+
"markenwerk/google-datastructures": "*"
2627
},
2728
"require-dev":{
2829
"phpunit/phpunit": "~4.8",

src/Base/BaseLookup.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace GoogleGeocode\Base;
44

55
use GoogleGeocode;
6+
use GoogleDataStructure;
67

78
/**
89
* Class BaseLookup
@@ -139,8 +140,10 @@ protected function addResultsFromResponse($responseData)
139140
$address = $responseData['results'][$i]['address_components'];
140141
$geometry = $responseData['results'][$i]['geometry'];
141142
$placesId = $responseData['results'][$i]['place_id'];
142-
$locationAddress = new GoogleGeocode\GeoLocation\GeoLocationAddress($address);
143-
$locationGeometry = new GoogleGeocode\GeoLocation\GeoLocationGeometry($geometry);
143+
$locationAddress = new GoogleDataStructure\GeoLocation\GeoLocationAddress();
144+
$locationAddress->setFromServiceResult($address);
145+
$locationGeometry = new GoogleDataStructure\GeoLocation\GeoLocationGeometry();
146+
$locationGeometry->setFromServiceResult($geometry);
144147
$this->addResult(new GoogleGeocode\GeoLookupResult($locationAddress, $locationGeometry, $placesId));
145148
}
146149
return $this;

src/GeoLocation/GeoLocation.php

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/GeoLocation/GeoLocationAddress.php

Lines changed: 0 additions & 241 deletions
This file was deleted.

src/GeoLocation/GeoLocationAddressComponent.php

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)