diff --git a/.styleci.yml b/.styleci.yml
index 9a3353107..a5f5e9792 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -10,3 +10,4 @@ enabled:
disabled:
- phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198
+ - phpdoc_summary # Currenly some issues 2017-05-13
diff --git a/.travis.yml b/.travis.yml
index 1fe0b074e..d6d53e06e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,89 @@
+language: php
sudo: false
addons:
- apt:
- packages:
- - libgeoip-dev
-
-language: php
+ apt_packages:
+ - parallel
+ - libgeoip-dev
env:
global:
- - deps=""
-
-php:
- - 5.5
- - 5.6
- - 7.0
- - 7.1
- - hhvm
+ - MIN_PHP=5.5.9
matrix:
fast_finish: true
include:
- php: 5.5
env: deps="low"
+ - php: 5.5
+ - php: 5.6
+ - php: 7.0
+ - php: 7.1
+ - php: hhvm
-before_script:
+before_install:
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" && "$TRAVIS_PHP_VERSION" != "7.0" ]; then pecl install geoip; fi
- - composer self-update
- - if [ "$deps" = "low" ]; then composer update --prefer-dist --prefer-lowest; fi
- - if [ "$deps" = "" ]; then composer install --prefer-dist --no-interaction; fi
- if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then composer require "geoip/geoip"; fi
+ - |
+ # General configuration
+ stty cols 120
+ PHP=$TRAVIS_PHP_VERSION
+ [ -d ~/.composer ] || mkdir ~/.composer
+ export PHPUNIT=$(readlink -f ./phpunit)
+ export PHPUNIT_X="$PHPUNIT --exclude-group benchmark"
+ export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
+
+ # tfold is a helper to create folded reports
+ tfold () {
+ title=$1
+ fold=$(echo $title | sed -r 's/[^-_A-Za-z\d]+/./g')
+ shift
+ echo -e "travis_fold:start:$fold\\n\\e[1;34m$title\\e[0m"
+ bash -xc "$*" 2>&1 &&
+ echo -e "\\e[32mOK\\e[0m $title\\n\\ntravis_fold:end:$fold" ||
+ ( echo -e "\\e[41mKO\\e[0m $title\\n" && exit 1 )
+ }
+ export -f tfold
+
+ # Matrix lines for intermediate PHP versions are skipped for pull requests
+ if [[ ! $deps && ! $PHP = ${MIN_PHP%.*} && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
+ deps=skip
+ skip=1
+ else
+ COMPONENTS=$(find src -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n')
+ fi
+
+ # php.ini configuration
+ if [[ $PHP = hhvm* ]]; then
+ INI=/etc/hhvm/php.ini
+ else
+ INI=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+ phpenv config-rm xdebug.ini || echo "xdebug not available"
+ fi
+ echo memory_limit = -1 >> $INI
+
+install:
+ - if [[ ! $skip ]]; then $COMPOSER_UP; fi
+ - |
+ run_tests () {
+ set -e
+ if [[ $skip ]]; then
+ echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
+ elif [[ $deps = high ]]; then
+ echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
+ elif [[ $deps = low ]]; then
+ echo "$COMPONENTS" | parallel --gnu -j10% "tfold {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'" &&
+ # Test the PhpUnit bridge on PHP 5.5, using the original phpunit script
+ tfold src/Symfony/Bridge/PhpUnit \
+ "cd src/Symfony/Bridge/PhpUnit && wget https://phar.phpunit.de/phpunit-4.8.phar && phpenv global 5.3 && composer update --no-progress --ansi && php phpunit-4.8.phar"
+ elif [[ $PHP = hhvm* ]]; then
+ $PHPUNIT --exclude-group benchmark,intl-data
+ else
+ echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
+ tfold tty-group $PHPUNIT --group tty
+ fi
+ }
+
+script:
+ - (run_tests)
-script: ./vendor/bin/phpunit --coverage-text
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08fa7b01b..339b17c4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
* Introduced `GeocodeQuery` and `ReverseQuery`.
* `Provider` and `Geocoder` interfaces has been updated to use query objects
* All providers are stateless and immutable.
+* Moved **all** providers to new namespaces. Previous `Geocoder\Provider\BingMaps` is now located at `Geocoder\Provider\BingMaps\BingMaps`
* Added: Interface for `Geocoder\Model\AddressCollection` called `Geocoder\Collection`. Public APIs are updated to type hint for `Geocoder\GeocoderResult`.
* Added: Interface for `Geocoder\Model\Address` called `Geocoder\Location`. Public APIs are updated to type hint for `Geocoder\Location`.
* Added: GeoArray dumper
diff --git a/composer.json b/composer.json
index 60764944c..b230c1d37 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,14 @@
"php-http/discovery": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8",
+ "phpunit/phpunit": "^4.8 || ^5.4",
+ "symfony/phpunit-bridge": "^3.2",
"geoip2/geoip2": "~2.0",
"symfony/stopwatch": "~2.5",
"php-http/message": "^1.0",
- "php-http/guzzle6-adapter": "^1.0",
- "php-http/mock-client": "^0.3.0"
+ "php-http/curl-client": "^1.7",
+ "php-http/mock-client": "^0.3.0",
+ "guzzlehttp/psr7": "^1.4"
},
"suggest": {
"ext-geoip": "Enabling the geoip extension allows you to use the MaxMindProvider.",
@@ -35,7 +37,9 @@
"symfony/stopwatch": "If you want to use the TimedGeocoder"
},
"autoload": {
- "psr-4": { "Geocoder\\": "src/" }
+ "psr-4": {
+ "Geocoder\\": ["src/Common", "src/"]
+ }
},
"autoload-dev": {
"psr-4": { "Geocoder\\Tests\\": "tests/" }
diff --git a/phpunit b/phpunit
new file mode 100755
index 000000000..14194b1bc
--- /dev/null
+++ b/phpunit
@@ -0,0 +1,9 @@
+#!/usr/bin/env php
+ -->
+
./tests/
+ ./src/Common/Tests/
+ ./src/Provider/*/Tests/
+
./src/
+
+ ./src/Common/Tests
+ ./src/Provider/*/Tests
+ ./src/Common/vendor
+ ./src/Provider/*/vendor
+
+
+
+
+
diff --git a/src/Assert.php b/src/Common/Assert.php
similarity index 100%
rename from src/Assert.php
rename to src/Common/Assert.php
diff --git a/src/Collection.php b/src/Common/Collection.php
similarity index 100%
rename from src/Collection.php
rename to src/Common/Collection.php
diff --git a/src/Dumper/Dumper.php b/src/Common/Dumper/Dumper.php
similarity index 100%
rename from src/Dumper/Dumper.php
rename to src/Common/Dumper/Dumper.php
diff --git a/src/Dumper/GeoArray.php b/src/Common/Dumper/GeoArray.php
similarity index 100%
rename from src/Dumper/GeoArray.php
rename to src/Common/Dumper/GeoArray.php
diff --git a/src/Dumper/GeoJson.php b/src/Common/Dumper/GeoJson.php
similarity index 100%
rename from src/Dumper/GeoJson.php
rename to src/Common/Dumper/GeoJson.php
diff --git a/src/Dumper/Gpx.php b/src/Common/Dumper/Gpx.php
similarity index 100%
rename from src/Dumper/Gpx.php
rename to src/Common/Dumper/Gpx.php
diff --git a/src/Dumper/Kml.php b/src/Common/Dumper/Kml.php
similarity index 100%
rename from src/Dumper/Kml.php
rename to src/Common/Dumper/Kml.php
diff --git a/src/Dumper/Wkb.php b/src/Common/Dumper/Wkb.php
similarity index 100%
rename from src/Dumper/Wkb.php
rename to src/Common/Dumper/Wkb.php
diff --git a/src/Dumper/Wkt.php b/src/Common/Dumper/Wkt.php
similarity index 100%
rename from src/Dumper/Wkt.php
rename to src/Common/Dumper/Wkt.php
diff --git a/src/Exception/ChainZeroResults.php b/src/Common/Exception/ChainZeroResults.php
similarity index 100%
rename from src/Exception/ChainZeroResults.php
rename to src/Common/Exception/ChainZeroResults.php
diff --git a/src/Exception/CollectionIsEmpty.php b/src/Common/Exception/CollectionIsEmpty.php
similarity index 100%
rename from src/Exception/CollectionIsEmpty.php
rename to src/Common/Exception/CollectionIsEmpty.php
diff --git a/src/Exception/Exception.php b/src/Common/Exception/Exception.php
similarity index 100%
rename from src/Exception/Exception.php
rename to src/Common/Exception/Exception.php
diff --git a/src/Exception/ExtensionNotLoaded.php b/src/Common/Exception/ExtensionNotLoaded.php
similarity index 100%
rename from src/Exception/ExtensionNotLoaded.php
rename to src/Common/Exception/ExtensionNotLoaded.php
diff --git a/src/Exception/FunctionNotFound.php b/src/Common/Exception/FunctionNotFound.php
similarity index 100%
rename from src/Exception/FunctionNotFound.php
rename to src/Common/Exception/FunctionNotFound.php
diff --git a/src/Exception/HttpError.php b/src/Common/Exception/HttpError.php
similarity index 100%
rename from src/Exception/HttpError.php
rename to src/Common/Exception/HttpError.php
diff --git a/src/Exception/InvalidArgument.php b/src/Common/Exception/InvalidArgument.php
similarity index 100%
rename from src/Exception/InvalidArgument.php
rename to src/Common/Exception/InvalidArgument.php
diff --git a/src/Exception/InvalidCredentials.php b/src/Common/Exception/InvalidCredentials.php
similarity index 100%
rename from src/Exception/InvalidCredentials.php
rename to src/Common/Exception/InvalidCredentials.php
diff --git a/src/Exception/InvalidServerResponse.php b/src/Common/Exception/InvalidServerResponse.php
similarity index 100%
rename from src/Exception/InvalidServerResponse.php
rename to src/Common/Exception/InvalidServerResponse.php
diff --git a/src/Exception/ProviderNotRegistered.php b/src/Common/Exception/ProviderNotRegistered.php
similarity index 100%
rename from src/Exception/ProviderNotRegistered.php
rename to src/Common/Exception/ProviderNotRegistered.php
diff --git a/src/Exception/QuotaExceeded.php b/src/Common/Exception/QuotaExceeded.php
similarity index 100%
rename from src/Exception/QuotaExceeded.php
rename to src/Common/Exception/QuotaExceeded.php
diff --git a/src/Exception/UnexpectedValue.php b/src/Common/Exception/UnexpectedValue.php
similarity index 100%
rename from src/Exception/UnexpectedValue.php
rename to src/Common/Exception/UnexpectedValue.php
diff --git a/src/Exception/UnsupportedOperation.php b/src/Common/Exception/UnsupportedOperation.php
similarity index 100%
rename from src/Exception/UnsupportedOperation.php
rename to src/Common/Exception/UnsupportedOperation.php
diff --git a/src/Exception/ZeroResults.php b/src/Common/Exception/ZeroResults.php
similarity index 100%
rename from src/Exception/ZeroResults.php
rename to src/Common/Exception/ZeroResults.php
diff --git a/src/Formatter/StringFormatter.php b/src/Common/Formatter/StringFormatter.php
similarity index 100%
rename from src/Formatter/StringFormatter.php
rename to src/Common/Formatter/StringFormatter.php
diff --git a/src/Geocoder.php b/src/Common/Geocoder.php
similarity index 100%
rename from src/Geocoder.php
rename to src/Common/Geocoder.php
diff --git a/src/GeocoderTrait.php b/src/Common/GeocoderTrait.php
similarity index 100%
rename from src/GeocoderTrait.php
rename to src/Common/GeocoderTrait.php
diff --git a/src/Location.php b/src/Common/Location.php
similarity index 100%
rename from src/Location.php
rename to src/Common/Location.php
diff --git a/src/Model/Address.php b/src/Common/Model/Address.php
similarity index 100%
rename from src/Model/Address.php
rename to src/Common/Model/Address.php
diff --git a/src/Model/AddressCollection.php b/src/Common/Model/AddressCollection.php
similarity index 100%
rename from src/Model/AddressCollection.php
rename to src/Common/Model/AddressCollection.php
diff --git a/src/Model/AddressFactory.php b/src/Common/Model/AddressFactory.php
similarity index 100%
rename from src/Model/AddressFactory.php
rename to src/Common/Model/AddressFactory.php
diff --git a/src/Model/AdminLevel.php b/src/Common/Model/AdminLevel.php
similarity index 100%
rename from src/Model/AdminLevel.php
rename to src/Common/Model/AdminLevel.php
diff --git a/src/Model/AdminLevelCollection.php b/src/Common/Model/AdminLevelCollection.php
similarity index 100%
rename from src/Model/AdminLevelCollection.php
rename to src/Common/Model/AdminLevelCollection.php
diff --git a/src/Model/Bounds.php b/src/Common/Model/Bounds.php
similarity index 100%
rename from src/Model/Bounds.php
rename to src/Common/Model/Bounds.php
diff --git a/src/Model/Coordinates.php b/src/Common/Model/Coordinates.php
similarity index 100%
rename from src/Model/Coordinates.php
rename to src/Common/Model/Coordinates.php
diff --git a/src/Model/Country.php b/src/Common/Model/Country.php
similarity index 100%
rename from src/Model/Country.php
rename to src/Common/Model/Country.php
diff --git a/src/Model/Query/GeocodeQuery.php b/src/Common/Model/Query/GeocodeQuery.php
similarity index 100%
rename from src/Model/Query/GeocodeQuery.php
rename to src/Common/Model/Query/GeocodeQuery.php
diff --git a/src/Model/Query/ReverseQuery.php b/src/Common/Model/Query/ReverseQuery.php
similarity index 100%
rename from src/Model/Query/ReverseQuery.php
rename to src/Common/Model/Query/ReverseQuery.php
diff --git a/src/Provider/AbstractHttpProvider.php b/src/Common/Provider/AbstractHttpProvider.php
similarity index 100%
rename from src/Provider/AbstractHttpProvider.php
rename to src/Common/Provider/AbstractHttpProvider.php
diff --git a/src/Provider/AbstractProvider.php b/src/Common/Provider/AbstractProvider.php
similarity index 100%
rename from src/Provider/AbstractProvider.php
rename to src/Common/Provider/AbstractProvider.php
diff --git a/src/Provider/IpAddressGeocoder.php b/src/Common/Provider/IpAddressGeocoder.php
similarity index 100%
rename from src/Provider/IpAddressGeocoder.php
rename to src/Common/Provider/IpAddressGeocoder.php
diff --git a/src/Provider/LocaleAwareGeocoder.php b/src/Common/Provider/LocaleAwareGeocoder.php
similarity index 100%
rename from src/Provider/LocaleAwareGeocoder.php
rename to src/Common/Provider/LocaleAwareGeocoder.php
diff --git a/src/Provider/Provider.php b/src/Common/Provider/Provider.php
similarity index 100%
rename from src/Provider/Provider.php
rename to src/Common/Provider/Provider.php
diff --git a/src/ProviderAggregator.php b/src/Common/ProviderAggregator.php
similarity index 100%
rename from src/ProviderAggregator.php
rename to src/Common/ProviderAggregator.php
diff --git a/src/StatefulGeocoder.php b/src/Common/StatefulGeocoder.php
similarity index 100%
rename from src/StatefulGeocoder.php
rename to src/Common/StatefulGeocoder.php
diff --git a/tests/Dumper/GeoArrayTest.php b/src/Common/Tests/Dumper/GeoArrayTest.php
similarity index 100%
rename from tests/Dumper/GeoArrayTest.php
rename to src/Common/Tests/Dumper/GeoArrayTest.php
diff --git a/tests/Dumper/GeoJsonTest.php b/src/Common/Tests/Dumper/GeoJsonTest.php
similarity index 100%
rename from tests/Dumper/GeoJsonTest.php
rename to src/Common/Tests/Dumper/GeoJsonTest.php
diff --git a/tests/Dumper/GpxTest.php b/src/Common/Tests/Dumper/GpxTest.php
similarity index 100%
rename from tests/Dumper/GpxTest.php
rename to src/Common/Tests/Dumper/GpxTest.php
diff --git a/tests/Dumper/KmlTest.php b/src/Common/Tests/Dumper/KmlTest.php
similarity index 100%
rename from tests/Dumper/KmlTest.php
rename to src/Common/Tests/Dumper/KmlTest.php
diff --git a/tests/Dumper/WkbTest.php b/src/Common/Tests/Dumper/WkbTest.php
similarity index 100%
rename from tests/Dumper/WkbTest.php
rename to src/Common/Tests/Dumper/WkbTest.php
diff --git a/tests/Dumper/WktTest.php b/src/Common/Tests/Dumper/WktTest.php
similarity index 100%
rename from tests/Dumper/WktTest.php
rename to src/Common/Tests/Dumper/WktTest.php
diff --git a/tests/Formatter/StringFormatterTest.php b/src/Common/Tests/Formatter/StringFormatterTest.php
similarity index 100%
rename from tests/Formatter/StringFormatterTest.php
rename to src/Common/Tests/Formatter/StringFormatterTest.php
diff --git a/tests/Model/AddressFactoryTest.php b/src/Common/Tests/Model/AddressFactoryTest.php
similarity index 100%
rename from tests/Model/AddressFactoryTest.php
rename to src/Common/Tests/Model/AddressFactoryTest.php
diff --git a/tests/Model/AddressTest.php b/src/Common/Tests/Model/AddressTest.php
similarity index 100%
rename from tests/Model/AddressTest.php
rename to src/Common/Tests/Model/AddressTest.php
diff --git a/tests/Provider/AbstractProviderTest.php b/src/Common/Tests/Provider/AbstractProviderTest.php
similarity index 100%
rename from tests/Provider/AbstractProviderTest.php
rename to src/Common/Tests/Provider/AbstractProviderTest.php
diff --git a/tests/ProviderAggregatorTest.php b/src/Common/Tests/ProviderAggregatorTest.php
similarity index 100%
rename from tests/ProviderAggregatorTest.php
rename to src/Common/Tests/ProviderAggregatorTest.php
diff --git a/tests/TimedGeocoderTest.php b/src/Common/Tests/TimedGeocoderTest.php
similarity index 96%
rename from tests/TimedGeocoderTest.php
rename to src/Common/Tests/TimedGeocoderTest.php
index 0dc74e1d1..af2ffe372 100644
--- a/tests/TimedGeocoderTest.php
+++ b/src/Common/Tests/TimedGeocoderTest.php
@@ -34,7 +34,7 @@ class TimedGeocoderTest extends TestCase
protected function setUp()
{
$this->stopwatch = new Stopwatch();
- $this->delegate = $this->getMock(Provider::class);
+ $this->delegate = $this->getMockBuilder(Provider::class)->getMock();
$this->geocoder = new TimedGeocoder($this->delegate, $this->stopwatch);
}
diff --git a/src/TimedGeocoder.php b/src/Common/TimedGeocoder.php
similarity index 100%
rename from src/TimedGeocoder.php
rename to src/Common/TimedGeocoder.php
diff --git a/src/Common/composer.json b/src/Common/composer.json
new file mode 100644
index 000000000..64803ebf7
--- /dev/null
+++ b/src/Common/composer.json
@@ -0,0 +1,47 @@
+{
+ "name": "willdurand/geocoder",
+ "type": "library",
+ "description": "Common files for PHP Geocoder",
+ "keywords": ["geocoder", "geocoding", "abstraction", "geoip"],
+ "homepage": "http://geocoder-php.org",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "igorw/get-in": "^1.0",
+ "psr/http-message-implementation": "^1.0",
+ "php-http/client-implementation": "^1.0",
+ "php-http/message-factory": "^1.0.2",
+ "php-http/httplug": "^1.0",
+ "php-http/discovery": "^1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "symfony/stopwatch": "~2.5",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "php-http/mock-client": "^0.3.0",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "suggest": {
+ "symfony/stopwatch": "If you want to use the TimedGeocoder"
+ },
+ "autoload": {
+ "psr-4": {
+ "Geocoder\\": ""
+ }
+ },
+ "scripts": {
+ "test": "vendor/bin/phpunit"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Common/phpunit.xml.dist b/src/Common/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Common/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/ArcGISOnline/.gitignore b/src/Provider/ArcGISOnline/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/ArcGISOnline/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/ArcGISOnline.php b/src/Provider/ArcGISOnline/ArcGISOnline.php
similarity index 98%
rename from src/Provider/ArcGISOnline.php
rename to src/Provider/ArcGISOnline/ArcGISOnline.php
index e1a63ee9e..f4f305d8e 100644
--- a/src/Provider/ArcGISOnline.php
+++ b/src/Provider/ArcGISOnline/ArcGISOnline.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\ArcGISOnline;
use Geocoder\Exception\InvalidArgument;
use Geocoder\Exception\InvalidServerResponse;
@@ -16,6 +16,8 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/ArcGISOnlineTest.php b/src/Provider/ArcGISOnline/Tests/ArcGISOnlineTest.php
similarity index 99%
rename from tests/Provider/ArcGISOnlineTest.php
rename to src/Provider/ArcGISOnline/Tests/ArcGISOnlineTest.php
index 0f0bddc33..02a08a9a3 100644
--- a/tests/Provider/ArcGISOnlineTest.php
+++ b/src/Provider/ArcGISOnline/Tests/ArcGISOnlineTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\ArcGISOnlineTest\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\ArcGISOnline;
+use Geocoder\Provider\ArcGISOnline\ArcGISOnline;
class ArcGISOnlineTest extends TestCase
{
diff --git a/src/Provider/ArcGISOnline/composer.json b/src/Provider/ArcGISOnline/composer.json
new file mode 100644
index 000000000..3fdae3315
--- /dev/null
+++ b/src/Provider/ArcGISOnline/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/arcgis-online-provider",
+ "type": "library",
+ "description": "Geocoder ArcGIS Online adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\ArcGISOnine\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/ArcGISOnline/phpunit.xml.dist b/src/Provider/ArcGISOnline/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/ArcGISOnline/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/BingMaps/.gitignore b/src/Provider/BingMaps/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/BingMaps/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/BingMaps.php b/src/Provider/BingMaps/BingMaps.php
similarity index 97%
rename from src/Provider/BingMaps.php
rename to src/Provider/BingMaps/BingMaps.php
index aaa0799b7..5116cb1ac 100644
--- a/src/Provider/BingMaps.php
+++ b/src/Provider/BingMaps/BingMaps.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\BingMaps;
use Geocoder\Exception\InvalidCredentials;
use Geocoder\Exception\InvalidServerResponse;
@@ -16,6 +16,9 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\LocaleAwareGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/BingMapsTest.php b/src/Provider/BingMaps/Tests/BingMapsTest.php
similarity index 99%
rename from tests/Provider/BingMapsTest.php
rename to src/Provider/BingMaps/Tests/BingMapsTest.php
index 8d9a367ec..f6ee6feb2 100644
--- a/tests/Provider/BingMapsTest.php
+++ b/src/Provider/BingMaps/Tests/BingMapsTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\BingMaps\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\BingMaps;
+use Geocoder\Provider\BingMaps\BingMaps;
class BingMapsTest extends TestCase
{
diff --git a/src/Provider/BingMaps/composer.json b/src/Provider/BingMaps/composer.json
new file mode 100644
index 000000000..2815b1c99
--- /dev/null
+++ b/src/Provider/BingMaps/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/bing-maps-provider",
+ "type": "library",
+ "description": "Geocoder BigMaps adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\BingMaps\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/BingMaps/phpunit.xml.dist b/src/Provider/BingMaps/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/BingMaps/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/Chain/.gitignore b/src/Provider/Chain/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/Chain/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/Chain.php b/src/Provider/Chain/Chain.php
similarity index 96%
rename from src/Provider/Chain.php
rename to src/Provider/Chain/Chain.php
index 7141ca740..cf4778e0b 100644
--- a/src/Provider/Chain.php
+++ b/src/Provider/Chain/Chain.php
@@ -8,12 +8,14 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\Chain;
use Geocoder\Exception\ChainZeroResults;
use Geocoder\Exception\InvalidCredentials;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\LocaleAwareGeocoder;
+use Geocoder\Provider\Provider;
/**
* @author Markus Bachmann
diff --git a/tests/Provider/ChainTest.php b/src/Provider/Chain/Tests/ChainTest.php
similarity index 81%
rename from tests/Provider/ChainTest.php
rename to src/Provider/Chain/Tests/ChainTest.php
index 8cfa21f5e..a0aa0a854 100644
--- a/tests/Provider/ChainTest.php
+++ b/src/Provider/Chain/Tests/ChainTest.php
@@ -8,14 +8,14 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\Chain\Tests;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Provider\Provider;
use Geocoder\Tests\TestCase;
use Geocoder\Exception\ChainZeroResults;
-use Geocoder\Provider\Chain;
+use Geocoder\Provider\Chain\Chain;
/**
* @author Markus Bachmann
@@ -24,7 +24,7 @@ class ChainTest extends TestCase
{
public function testAdd()
{
- $mock = $this->getMock('Geocoder\Provider\Provider');
+ $mock = $this->getMockBuilder('Geocoder\Provider\Provider')->getMock();
$chain = new Chain();
$chain->add($mock);
@@ -38,14 +38,14 @@ public function testGetName()
public function testReverse()
{
- $mockOne = $this->getMock(Provider::class);
+ $mockOne = $this->getMockBuilder(Provider::class)->getMock();
$mockOne->expects($this->once())
->method('reverseQuery')
->will($this->returnCallback(function () {
throw new \Exception();
}));
- $mockTwo = $this->getMock('Geocoder\\Provider\\Provider');
+ $mockTwo = $this->getMockBuilder('Geocoder\\Provider\\Provider')->getMock();
$mockTwo->expects($this->once())
->method('reverseQuery')
->will($this->returnValue(['foo' => 'bar']));
@@ -57,7 +57,7 @@ public function testReverse()
public function testReverseThrowsChainZeroResults()
{
- $mockOne = $this->getMock('Geocoder\\Provider\\Provider');
+ $mockOne = $this->getMockBuilder('Geocoder\\Provider\\Provider')->getMock();
$mockOne->expects($this->exactly(2))
->method('reverseQuery')
->will($this->returnCallback(function () {
@@ -76,14 +76,14 @@ public function testReverseThrowsChainZeroResults()
public function testGeocode()
{
$query = GeocodeQuery::create('Paris');
- $mockOne = $this->getMock('Geocoder\\Provider\\Provider');
+ $mockOne = $this->getMockBuilder('Geocoder\\Provider\\Provider')->getMock();
$mockOne->expects($this->once())
->method('geocodeQuery')
->will($this->returnCallback(function () {
throw new \Exception();
}));
- $mockTwo = $this->getMock('Geocoder\\Provider\\Provider');
+ $mockTwo = $this->getMockBuilder('Geocoder\\Provider\\Provider')->getMock();
$mockTwo->expects($this->once())
->method('geocodeQuery')
->with($query)
@@ -96,7 +96,7 @@ public function testGeocode()
public function testGeocodeThrowsChainZeroResults()
{
- $mockOne = $this->getMock('Geocoder\\Provider\\Provider');
+ $mockOne = $this->getMockBuilder('Geocoder\\Provider\\Provider')->getMock();
$mockOne->expects($this->exactly(2))
->method('geocodeQuery')
->will($this->returnCallback(function () {
diff --git a/src/Provider/Chain/composer.json b/src/Provider/Chain/composer.json
new file mode 100644
index 000000000..1d68399da
--- /dev/null
+++ b/src/Provider/Chain/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/chain-provider",
+ "type": "library",
+ "description": "Geocoder chain adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\Chain\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/Chain/phpunit.xml.dist b/src/Provider/Chain/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/Chain/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/FreeGeoIp/.gitignore b/src/Provider/FreeGeoIp/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/FreeGeoIp/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/FreeGeoIp.php b/src/Provider/FreeGeoIp/FreeGeoIp.php
similarity index 95%
rename from src/Provider/FreeGeoIp.php
rename to src/Provider/FreeGeoIp/FreeGeoIp.php
index bff039463..076df0447 100644
--- a/src/Provider/FreeGeoIp.php
+++ b/src/Provider/FreeGeoIp/FreeGeoIp.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\FreeGeoIp;
use Geocoder\Exception\InvalidServerResponse;
use Geocoder\Exception\UnsupportedOperation;
@@ -16,6 +16,9 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\IpAddressGeocoder;
+use Geocoder\Provider\Provider;
/**
* @author William Durand
diff --git a/tests/Provider/FreeGeoIpTest.php b/src/Provider/FreeGeoIp/Tests/FreeGeoIpTest.php
similarity index 98%
rename from tests/Provider/FreeGeoIpTest.php
rename to src/Provider/FreeGeoIp/Tests/FreeGeoIpTest.php
index 8241ccb66..651b87911 100644
--- a/tests/Provider/FreeGeoIpTest.php
+++ b/src/Provider/FreeGeoIp/Tests/FreeGeoIpTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\FreeGeoIp\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\FreeGeoIp;
+use Geocoder\Provider\FreeGeoIp\FreeGeoIp;
class FreeGeoIpTest extends TestCase
{
diff --git a/src/Provider/FreeGeoIp/composer.json b/src/Provider/FreeGeoIp/composer.json
new file mode 100644
index 000000000..5269c978e
--- /dev/null
+++ b/src/Provider/FreeGeoIp/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/free-geoip-provider",
+ "type": "library",
+ "description": "Geocoder FreeGeoIp adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\FreeGeoIp\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/FreeGeoIp/phpunit.xml.dist b/src/Provider/FreeGeoIp/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/FreeGeoIp/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/GeoIP2/.gitignore b/src/Provider/GeoIP2/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/GeoIP2/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/GeoIP2.php b/src/Provider/GeoIP2/GeoIP2.php
similarity index 94%
rename from src/Provider/GeoIP2.php
rename to src/Provider/GeoIP2/GeoIP2.php
index 74d2cdc71..bbe0501a2 100644
--- a/src/Provider/GeoIP2.php
+++ b/src/Provider/GeoIP2/GeoIP2.php
@@ -8,13 +8,16 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\GeoIP2;
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractProvider;
+use Geocoder\Provider\IpAddressGeocoder;
+use Geocoder\Provider\LocaleAwareGeocoder;
+use Geocoder\Provider\Provider;
use GeoIp2\Exception\AddressNotFoundException;
-use Geocoder\Adapter\GeoIP2Adapter;
use Geocoder\Exception\UnsupportedOperation;
/**
diff --git a/src/Adapter/GeoIP2Adapter.php b/src/Provider/GeoIP2/GeoIP2Adapter.php
similarity index 98%
rename from src/Adapter/GeoIP2Adapter.php
rename to src/Provider/GeoIP2/GeoIP2Adapter.php
index ac4f623c4..96ff7fdd7 100644
--- a/src/Adapter/GeoIP2Adapter.php
+++ b/src/Provider/GeoIP2/GeoIP2Adapter.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Adapter;
+namespace Geocoder\Provider\GeoIP2;
use GeoIp2\ProviderInterface;
use Geocoder\Exception\InvalidArgument;
diff --git a/tests/Adapter/GeoIP2AdapterTest.php b/src/Provider/GeoIP2/Tests/GeoIP2AdapterTest.php
similarity index 97%
rename from tests/Adapter/GeoIP2AdapterTest.php
rename to src/Provider/GeoIP2/Tests/GeoIP2AdapterTest.php
index d825dfc1d..a149a3ac4 100644
--- a/tests/Adapter/GeoIP2AdapterTest.php
+++ b/src/Provider/GeoIP2/Tests/GeoIP2AdapterTest.php
@@ -8,11 +8,11 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Adapter;
+namespace Geocoder\Provider\GeoIP2\Tests;
-use Geocoder\Adapter\GeoIP2Adapter;
+use Geocoder\Provider\GeoIP2\GeoIP2Adapter;
use Geocoder\Tests\TestCase;
-use Geocoder\Exception\RuntimeException;
+use RuntimeException;
/**
* @author Jens Wiese
@@ -20,7 +20,7 @@
class GeoIP2AdapterTest extends TestCase
{
/**
- * @var GeoIP2DatabaseAdapter
+ * @var GeoIP2Adapter
*/
protected $adapter;
diff --git a/tests/Provider/GeoIP2Test.php b/src/Provider/GeoIP2/Tests/GeoIP2Test.php
similarity index 97%
rename from tests/Provider/GeoIP2Test.php
rename to src/Provider/GeoIP2/Tests/GeoIP2Test.php
index cc1f0af1f..ef7d7fe83 100644
--- a/tests/Provider/GeoIP2Test.php
+++ b/src/Provider/GeoIP2/Tests/GeoIP2Test.php
@@ -8,14 +8,14 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\GeoIP2\Tests;
-use Geocoder\Adapter\GeoIP2Adapter;
use Geocoder\Exception\ZeroResults;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
-use Geocoder\Provider\GeoIP2;
+use Geocoder\Provider\GeoIP2\GeoIP2;
+use Geocoder\Provider\GeoIP2\GeoIP2Adapter;
use Geocoder\Tests\TestCase;
use GeoIp2\Database\Reader;
@@ -223,11 +223,11 @@ public function testGeoIp2Encoding()
/**
* @param mixed $returnValue
*
- * @return \PHPUnit_Framework_MockObject_MockObject | GeoIP2DatabaseAdapter
+ * @return \PHPUnit_Framework_MockObject_MockObject|GeoIP2Adapter
*/
- public function getGeoIP2AdapterMock($returnValue = '')
+ private function getGeoIP2AdapterMock($returnValue = '')
{
- $mock = $this->getMockBuilder('Geocoder\Adapter\GeoIP2Adapter')
+ $mock = $this->getMockBuilder(GeoIP2Adapter::class)
->disableOriginalConstructor()
->setMethods(['getContent'])
->getMock();
diff --git a/tests/Provider/fixtures/GeoLite2-City.mmdb b/src/Provider/GeoIP2/Tests/fixtures/GeoLite2-City.mmdb
similarity index 100%
rename from tests/Provider/fixtures/GeoLite2-City.mmdb
rename to src/Provider/GeoIP2/Tests/fixtures/GeoLite2-City.mmdb
diff --git a/src/Provider/GeoIP2/composer.json b/src/Provider/GeoIP2/composer.json
new file mode 100644
index 000000000..a4d7e9ed5
--- /dev/null
+++ b/src/Provider/GeoIP2/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/geoip2-provider",
+ "type": "library",
+ "description": "Geocoder GeoIP2 adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\GeoIP2\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/GeoIP2/phpunit.xml.dist b/src/Provider/GeoIP2/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/GeoIP2/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/GeoIPs/.gitignore b/src/Provider/GeoIPs/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/GeoIPs/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/GeoIPs.php b/src/Provider/GeoIPs/GeoIPs.php
similarity index 97%
rename from src/Provider/GeoIPs.php
rename to src/Provider/GeoIPs/GeoIPs.php
index 8795767ab..5339a1ec1 100644
--- a/src/Provider/GeoIPs.php
+++ b/src/Provider/GeoIPs/GeoIPs.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\GeoIPs;
use Geocoder\Exception\InvalidArgument;
use Geocoder\Exception\InvalidCredentials;
@@ -18,6 +18,9 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\IpAddressGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/GeoIPsTest.php b/src/Provider/GeoIPs/Tests/GeoIPsTest.php
similarity index 99%
rename from tests/Provider/GeoIPsTest.php
rename to src/Provider/GeoIPs/Tests/GeoIPsTest.php
index bde3ff8f9..412b1abe6 100644
--- a/tests/Provider/GeoIPsTest.php
+++ b/src/Provider/GeoIPs/Tests/GeoIPsTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\GeoIPs\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\GeoIPs;
+use Geocoder\Provider\GeoIPs\GeoIPs;
class GeoIPsTest extends TestCase
{
diff --git a/src/Provider/GeoIPs/composer.json b/src/Provider/GeoIPs/composer.json
new file mode 100644
index 000000000..02c19e2ee
--- /dev/null
+++ b/src/Provider/GeoIPs/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/geoips-provider",
+ "type": "library",
+ "description": "Geocoder GeoIPs adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\GeoIPs\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/GeoIPs/phpunit.xml.dist b/src/Provider/GeoIPs/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/GeoIPs/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/GeoPlugin/.gitignore b/src/Provider/GeoPlugin/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/GeoPlugin/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/GeoPlugin.php b/src/Provider/GeoPlugin/GeoPlugin.php
similarity index 95%
rename from src/Provider/GeoPlugin.php
rename to src/Provider/GeoPlugin/GeoPlugin.php
index 7de93d05c..004e8a57c 100644
--- a/src/Provider/GeoPlugin.php
+++ b/src/Provider/GeoPlugin/GeoPlugin.php
@@ -8,13 +8,16 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\GeoPlugin;
use Geocoder\Exception\InvalidServerResponse;
use Geocoder\Exception\UnsupportedOperation;
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\IpAddressGeocoder;
+use Geocoder\Provider\Provider;
/**
* @author Andrea Cristaudo
diff --git a/tests/Provider/GeoPluginTest.php b/src/Provider/GeoPlugin/Tests/GeoPluginTest.php
similarity index 97%
rename from tests/Provider/GeoPluginTest.php
rename to src/Provider/GeoPlugin/Tests/GeoPluginTest.php
index 81818454a..b5593a22b 100644
--- a/tests/Provider/GeoPluginTest.php
+++ b/src/Provider/GeoPlugin/Tests/GeoPluginTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\GeoPlugin\Tests;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\GeoPlugin;
+use Geocoder\Provider\GeoPlugin\GeoPlugin;
class GeoPluginTest extends TestCase
{
diff --git a/src/Provider/GeoPlugin/composer.json b/src/Provider/GeoPlugin/composer.json
new file mode 100644
index 000000000..1f9241d46
--- /dev/null
+++ b/src/Provider/GeoPlugin/composer.json
@@ -0,0 +1,38 @@
+{
+ "name": "geocoder-php/geo-plugin-provider",
+ "type": "library",
+ "description": "Geocoder GeoPlugin adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0",
+ "igorw/get-in": "^1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\GeoPlugin\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/GeoPlugin/phpunit.xml.dist b/src/Provider/GeoPlugin/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/GeoPlugin/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/Geoip/.gitignore b/src/Provider/Geoip/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/Geoip/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/Geoip.php b/src/Provider/Geoip/Geoip.php
similarity index 95%
rename from src/Provider/Geoip.php
rename to src/Provider/Geoip/Geoip.php
index 96604d916..ced602cac 100644
--- a/src/Provider/Geoip.php
+++ b/src/Provider/Geoip/Geoip.php
@@ -8,13 +8,16 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\Geoip;
use Geocoder\Exception\ExtensionNotLoaded;
use Geocoder\Exception\UnsupportedOperation;
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractProvider;
+use Geocoder\Provider\IpAddressGeocoder;
+use Geocoder\Provider\Provider;
/**
* @author William Durand
diff --git a/tests/Provider/GeoipTest.php b/src/Provider/Geoip/Tests/GeoipTest.php
similarity index 97%
rename from tests/Provider/GeoipTest.php
rename to src/Provider/Geoip/Tests/GeoipTest.php
index 4ececc021..7eb6a86ae 100644
--- a/tests/Provider/GeoipTest.php
+++ b/src/Provider/Geoip/Tests/GeoipTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\Geoip\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\Geoip;
+use Geocoder\Provider\Geoip\Geoip;
class GeoipTest extends TestCase
{
diff --git a/src/Provider/Geoip/composer.json b/src/Provider/Geoip/composer.json
new file mode 100644
index 000000000..4adc60c55
--- /dev/null
+++ b/src/Provider/Geoip/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/geoip-provider",
+ "type": "library",
+ "description": "Geocoder Geoip adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\Geoip\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/Geoip/phpunit.xml.dist b/src/Provider/Geoip/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/Geoip/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/Geonames/.gitignore b/src/Provider/Geonames/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/Geonames/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/Geonames.php b/src/Provider/Geonames/Geonames.php
similarity index 97%
rename from src/Provider/Geonames.php
rename to src/Provider/Geonames/Geonames.php
index c154f68cb..ec4739f2b 100644
--- a/src/Provider/Geonames.php
+++ b/src/Provider/Geonames/Geonames.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\Geonames;
use Geocoder\Exception\InvalidCredentials;
use Geocoder\Exception\InvalidServerResponse;
@@ -17,6 +17,9 @@
use Geocoder\Model\AdminLevelCollection;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\LocaleAwareGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/GeonamesTest.php b/src/Provider/Geonames/Tests/GeonamesTest.php
similarity index 98%
rename from tests/Provider/GeonamesTest.php
rename to src/Provider/Geonames/Tests/GeonamesTest.php
index 497e5aea3..03ea5c332 100644
--- a/tests/Provider/GeonamesTest.php
+++ b/src/Provider/Geonames/Tests/GeonamesTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\Geonames\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\Geonames;
+use Geocoder\Provider\Geonames\Geonames;
class GeonamesTest extends TestCase
{
@@ -30,7 +30,7 @@ public function testGetName()
*/
public function testGeocodeWithNullUsername()
{
- $provider = new Geonames($this->getMock('Http\Client\HttpClient'), null);
+ $provider = new Geonames($this->getMockBuilder('Http\Client\HttpClient')->getMock(), null);
$provider->geocodeQuery(GeocodeQuery::create('foo'));
}
@@ -40,7 +40,7 @@ public function testGeocodeWithNullUsername()
*/
public function testReverseWithNullUsername()
{
- $provider = new Geonames($this->getMock('Http\Client\HttpClient'), null);
+ $provider = new Geonames($this->getMockBuilder('Http\Client\HttpClient')->getMock(), null);
$provider->reverseQuery(ReverseQuery::fromCoordinates(1, 2));
}
diff --git a/src/Provider/Geonames/composer.json b/src/Provider/Geonames/composer.json
new file mode 100644
index 000000000..fc376c8e0
--- /dev/null
+++ b/src/Provider/Geonames/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/geonames-provider",
+ "type": "library",
+ "description": "Geocoder Geonames adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\Geonames\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/Geonames/phpunit.xml.dist b/src/Provider/Geonames/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/Geonames/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/GoogleMaps/.gitignore b/src/Provider/GoogleMaps/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/GoogleMaps/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/GoogleMaps.php b/src/Provider/GoogleMaps/GoogleMaps.php
similarity index 98%
rename from src/Provider/GoogleMaps.php
rename to src/Provider/GoogleMaps/GoogleMaps.php
index 64a43ffb0..ca2d61341 100644
--- a/src/Provider/GoogleMaps.php
+++ b/src/Provider/GoogleMaps/GoogleMaps.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\GoogleMaps;
use Exception;
use Geocoder\Exception\InvalidCredentials;
@@ -19,6 +19,9 @@
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\Query;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\LocaleAwareGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/GoogleMapsTest.php b/src/Provider/GoogleMaps/Tests/GoogleMapsTest.php
similarity index 99%
rename from tests/Provider/GoogleMapsTest.php
rename to src/Provider/GoogleMaps/Tests/GoogleMapsTest.php
index 39b929812..6772f1a7b 100644
--- a/tests/Provider/GoogleMapsTest.php
+++ b/src/Provider/GoogleMaps/Tests/GoogleMapsTest.php
@@ -8,14 +8,14 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\GoogleMaps\Tests;
use Geocoder\Exception\ZeroResults;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\GoogleMaps;
+use Geocoder\Provider\GoogleMaps\GoogleMaps;
use Psr\Http\Message\RequestInterface;
class GoogleMapsTest extends TestCase
diff --git a/src/Provider/GoogleMaps/composer.json b/src/Provider/GoogleMaps/composer.json
new file mode 100644
index 000000000..266647909
--- /dev/null
+++ b/src/Provider/GoogleMaps/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/google-maps-provider",
+ "type": "library",
+ "description": "Geocoder GoogleMaps adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\GoogleMaps\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/GoogleMaps/phpunit.xml.dist b/src/Provider/GoogleMaps/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/GoogleMaps/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/HostIp/.gitignore b/src/Provider/HostIp/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/HostIp/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/HostIp.php b/src/Provider/HostIp/HostIp.php
similarity index 94%
rename from src/Provider/HostIp.php
rename to src/Provider/HostIp/HostIp.php
index 574f6b1f2..bfb8370f8 100644
--- a/src/Provider/HostIp.php
+++ b/src/Provider/HostIp/HostIp.php
@@ -8,13 +8,16 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\HostIp;
use Geocoder\Exception\UnsupportedOperation;
use Geocoder\Collection;
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\IpAddressGeocoder;
+use Geocoder\Provider\Provider;
/**
* @author William Durand
diff --git a/tests/Provider/HostIpTest.php b/src/Provider/HostIp/Tests/HostIpTest.php
similarity index 98%
rename from tests/Provider/HostIpTest.php
rename to src/Provider/HostIp/Tests/HostIpTest.php
index a3c2c5bdc..91af7be2d 100644
--- a/tests/Provider/HostIpTest.php
+++ b/src/Provider/HostIp/Tests/HostIpTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\HostIp\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\HostIp;
+use Geocoder\Provider\HostIp\HostIp;
class HostIpTest extends TestCase
{
diff --git a/src/Provider/HostIp/composer.json b/src/Provider/HostIp/composer.json
new file mode 100644
index 000000000..1eb15f9f2
--- /dev/null
+++ b/src/Provider/HostIp/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/host-ip-provider",
+ "type": "library",
+ "description": "Geocoder HostIp adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\HostIp\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/HostIp/phpunit.xml.dist b/src/Provider/HostIp/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/HostIp/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/IpInfoDb/.gitignore b/src/Provider/IpInfoDb/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/IpInfoDb/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/IpInfoDb.php b/src/Provider/IpInfoDb/IpInfoDb.php
similarity index 96%
rename from src/Provider/IpInfoDb.php
rename to src/Provider/IpInfoDb/IpInfoDb.php
index a34c53914..256fc4a92 100644
--- a/src/Provider/IpInfoDb.php
+++ b/src/Provider/IpInfoDb/IpInfoDb.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\IpInfoDb;
use Geocoder\Exception\InvalidArgument;
use Geocoder\Exception\InvalidCredentials;
@@ -18,6 +18,9 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\IpAddressGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/IpInfoDbTest.php b/src/Provider/IpInfoDb/Tests/IpInfoDbTest.php
similarity index 96%
rename from tests/Provider/IpInfoDbTest.php
rename to src/Provider/IpInfoDb/Tests/IpInfoDbTest.php
index 76e2d6bb1..a0394705b 100644
--- a/tests/Provider/IpInfoDbTest.php
+++ b/src/Provider/IpInfoDb/Tests/IpInfoDbTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\IpInfoDb\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\IpInfoDb;
+use Geocoder\Provider\IpInfoDb\IpInfoDb;
class IpInfoDbTest extends TestCase
{
@@ -38,7 +38,7 @@ public function testGetName()
*/
public function testGetDataWithNullApiKey()
{
- $provider = new IpInfoDb($this->getMock('Http\Client\HttpClient'), null);
+ $provider = new IpInfoDb($this->getMockBuilder('Http\Client\HttpClient')->getMock(), null);
$provider->geocodeQuery(GeocodeQuery::create('foo'));
}
@@ -185,7 +185,7 @@ public function testGetGeocodedDataWithCountryPrecision()
*/
public function testReverse()
{
- $provider = new IpInfoDb($this->getMock('Http\Client\HttpClient'), 'api_key');
+ $provider = new IpInfoDb($this->getMockBuilder('Http\Client\HttpClient')->getMock(), 'api_key');
$provider->reverseQuery(ReverseQuery::fromCoordinates(null, null));
}
}
diff --git a/src/Provider/IpInfoDb/composer.json b/src/Provider/IpInfoDb/composer.json
new file mode 100644
index 000000000..ba66adbda
--- /dev/null
+++ b/src/Provider/IpInfoDb/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/ip-info-db-provider",
+ "type": "library",
+ "description": "Geocoder IpInfoDb adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\IpInfoDb\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/IpInfoDb/phpunit.xml.dist b/src/Provider/IpInfoDb/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/IpInfoDb/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/MapQuest/.gitignore b/src/Provider/MapQuest/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/MapQuest/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/MapQuest.php b/src/Provider/MapQuest/MapQuest.php
similarity index 98%
rename from src/Provider/MapQuest.php
rename to src/Provider/MapQuest/MapQuest.php
index e3527bdaa..b3d9e3131 100644
--- a/src/Provider/MapQuest.php
+++ b/src/Provider/MapQuest/MapQuest.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\MapQuest;
use Geocoder\Exception\InvalidCredentials;
use Geocoder\Exception\InvalidServerResponse;
@@ -16,6 +16,8 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/MapQuestTest.php b/src/Provider/MapQuest/Tests/MapQuestTest.php
similarity index 99%
rename from tests/Provider/MapQuestTest.php
rename to src/Provider/MapQuest/Tests/MapQuestTest.php
index 56e9764d4..d6b238e04 100644
--- a/tests/Provider/MapQuestTest.php
+++ b/src/Provider/MapQuest/Tests/MapQuestTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\MapQuest\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\MapQuest;
+use Geocoder\Provider\MapQuest\MapQuest;
/**
* @author William Durand
diff --git a/src/Provider/MapQuest/composer.json b/src/Provider/MapQuest/composer.json
new file mode 100644
index 000000000..73cf7bac0
--- /dev/null
+++ b/src/Provider/MapQuest/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/mapquest-provider",
+ "type": "library",
+ "description": "Geocoder MapQuest adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\MapQuest\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/MapQuest/phpunit.xml.dist b/src/Provider/MapQuest/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/MapQuest/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/Mapzen/.gitignore b/src/Provider/Mapzen/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/Mapzen/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/Mapzen.php b/src/Provider/Mapzen/Mapzen.php
similarity index 98%
rename from src/Provider/Mapzen.php
rename to src/Provider/Mapzen/Mapzen.php
index 12941c2dc..e6bedfbc8 100644
--- a/src/Provider/Mapzen.php
+++ b/src/Provider/Mapzen/Mapzen.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\Mapzen;
use Geocoder\Collection;
use Geocoder\Exception\InvalidCredentials;
@@ -18,6 +18,8 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/MapzenTest.php b/src/Provider/Mapzen/Tests/MapzenTest.php
similarity index 99%
rename from tests/Provider/MapzenTest.php
rename to src/Provider/Mapzen/Tests/MapzenTest.php
index 8e72d748c..311a5d246 100644
--- a/tests/Provider/MapzenTest.php
+++ b/src/Provider/Mapzen/Tests/MapzenTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\Mapzen\Tests;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\Mapzen;
+use Geocoder\Provider\Mapzen\Mapzen;
/**
* @author Gary Gale
diff --git a/src/Provider/Mapzen/composer.json b/src/Provider/Mapzen/composer.json
new file mode 100644
index 000000000..a8e32b59f
--- /dev/null
+++ b/src/Provider/Mapzen/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/mapzen-provider",
+ "type": "library",
+ "description": "Geocoder Mapzen adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\Mapzen\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/Mapzen/phpunit.xml.dist b/src/Provider/Mapzen/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/Mapzen/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/MaxMind/.gitignore b/src/Provider/MaxMind/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/MaxMind/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/MaxMind.php b/src/Provider/MaxMind/MaxMind.php
similarity index 99%
rename from src/Provider/MaxMind.php
rename to src/Provider/MaxMind/MaxMind.php
index 06f0d16a0..999ebff79 100644
--- a/src/Provider/MaxMind.php
+++ b/src/Provider/MaxMind/MaxMind.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\MaxMind;
use Geocoder\Collection;
use Geocoder\Exception\InvalidCredentials;
@@ -17,6 +17,9 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\IpAddressGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/MaxMindTest.php b/src/Provider/MaxMind/Tests/MaxMindTest.php
similarity index 99%
rename from tests/Provider/MaxMindTest.php
rename to src/Provider/MaxMind/Tests/MaxMindTest.php
index c21e7bcec..8225803d0 100644
--- a/tests/Provider/MaxMindTest.php
+++ b/src/Provider/MaxMind/Tests/MaxMindTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\MaxMind\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\MaxMind;
+use Geocoder\Provider\MaxMind\MaxMind;
class MaxMindTest extends TestCase
{
diff --git a/src/Provider/MaxMind/composer.json b/src/Provider/MaxMind/composer.json
new file mode 100644
index 000000000..a500e4bcc
--- /dev/null
+++ b/src/Provider/MaxMind/composer.json
@@ -0,0 +1,38 @@
+{
+ "name": "geocoder-php/maxmind-provider",
+ "type": "library",
+ "description": "Geocoder MaxMind adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0",
+ "igorw/get-in": "^1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\MaxMind\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/MaxMind/phpunit.xml.dist b/src/Provider/MaxMind/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/MaxMind/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/MaxMindBinary/.gitignore b/src/Provider/MaxMindBinary/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/MaxMindBinary/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/MaxMindBinary.php b/src/Provider/MaxMindBinary/MaxMindBinary.php
similarity index 96%
rename from src/Provider/MaxMindBinary.php
rename to src/Provider/MaxMindBinary/MaxMindBinary.php
index d6d67a082..cf3aea863 100644
--- a/src/Provider/MaxMindBinary.php
+++ b/src/Provider/MaxMindBinary/MaxMindBinary.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\MaxMindBinary;
use Geocoder\Exception\FunctionNotFound;
use Geocoder\Exception\InvalidArgument;
@@ -16,6 +16,9 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractProvider;
+use Geocoder\Provider\IpAddressGeocoder;
+use Geocoder\Provider\Provider;
final class MaxMindBinary extends AbstractProvider implements Provider, IpAddressGeocoder
{
diff --git a/tests/Provider/MaxMindBinaryTest.php b/src/Provider/MaxMindBinary/Tests/MaxMindBinaryTest.php
similarity index 98%
rename from tests/Provider/MaxMindBinaryTest.php
rename to src/Provider/MaxMindBinary/Tests/MaxMindBinaryTest.php
index 6dfa85bf3..a36f5be53 100644
--- a/tests/Provider/MaxMindBinaryTest.php
+++ b/src/Provider/MaxMindBinary/Tests/MaxMindBinaryTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\MaxMindBinary\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\MaxMindBinary;
+use Geocoder\Provider\MaxMindBinary\MaxMindBinary;
class MaxMindBinaryTest extends TestCase
{
diff --git a/tests/Provider/fixtures/GeoLiteCity.dat b/src/Provider/MaxMindBinary/Tests/fixtures/GeoLiteCity.dat
similarity index 100%
rename from tests/Provider/fixtures/GeoLiteCity.dat
rename to src/Provider/MaxMindBinary/Tests/fixtures/GeoLiteCity.dat
diff --git a/src/Provider/MaxMindBinary/composer.json b/src/Provider/MaxMindBinary/composer.json
new file mode 100644
index 000000000..d1598c0db
--- /dev/null
+++ b/src/Provider/MaxMindBinary/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/maxmind-binary-provider",
+ "type": "library",
+ "description": "Geocoder MaxMindBinary adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\MaxMindBinary\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/MaxMindBinary/phpunit.xml.dist b/src/Provider/MaxMindBinary/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/MaxMindBinary/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/Nominatim/.gitignore b/src/Provider/Nominatim/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/Nominatim/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/Nominatim.php b/src/Provider/Nominatim/Nominatim.php
similarity index 96%
rename from src/Provider/Nominatim.php
rename to src/Provider/Nominatim/Nominatim.php
index c349e0ca5..a40a6fc2c 100644
--- a/src/Provider/Nominatim.php
+++ b/src/Provider/Nominatim/Nominatim.php
@@ -8,13 +8,16 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\Nominatim;
use Geocoder\Exception\InvalidServerResponse;
use Geocoder\Exception\UnsupportedOperation;
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\LocaleAwareGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
@@ -57,7 +60,7 @@ public function geocodeQuery(GeocodeQuery $query)
$address = $query->getText();
// This API does not support IPv6
if (filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
- throw new UnsupportedOperation('The '.get_called_class().' provider does not support IPv6 addresses.');
+ throw new UnsupportedOperation('The Nominatim provider does not support IPv6 addresses.');
}
if ('127.0.0.1' === $address) {
diff --git a/tests/Provider/NominatimTest.php b/src/Provider/Nominatim/Tests/NominatimTest.php
similarity index 98%
rename from tests/Provider/NominatimTest.php
rename to src/Provider/Nominatim/Tests/NominatimTest.php
index 804eae49c..30c166d13 100644
--- a/tests/Provider/NominatimTest.php
+++ b/src/Provider/Nominatim/Tests/NominatimTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\Nominatim\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
-use Geocoder\Provider\Nominatim;
+use Geocoder\Provider\Nominatim\Nominatim;
use Geocoder\Tests\TestCase;
class NominatimTest extends TestCase
@@ -337,7 +337,7 @@ public function testGeocodeWithLocalhostIPv4()
/**
* @expectedException \Geocoder\Exception\UnsupportedOperation
- * @expectedExceptionMessage The Geocoder\Provider\Nominatim provider does not support IPv6 addresses.
+ * @expectedExceptionMessage The Nominatim provider does not support IPv6 addresses.
*/
public function testGeocodeWithLocalhostIPv6()
{
@@ -409,7 +409,7 @@ public function testGeocodeWithRealIPv4WithLocale()
/**
* @expectedException \Geocoder\Exception\UnsupportedOperation
- * @expectedExceptionMessage The Geocoder\Provider\Nominatim provider does not support IPv6 addresses.
+ * @expectedExceptionMessage The Nominatim provider does not support IPv6 addresses.
*/
public function testGeocodeWithRealIPv6()
{
diff --git a/src/Provider/Nominatim/composer.json b/src/Provider/Nominatim/composer.json
new file mode 100644
index 000000000..96ee51c0d
--- /dev/null
+++ b/src/Provider/Nominatim/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/nominatim-provider",
+ "type": "library",
+ "description": "Geocoder Nominatim adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\Nominatim\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/Nominatim/phpunit.xml.dist b/src/Provider/Nominatim/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/Nominatim/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/OpenCage/.gitignore b/src/Provider/OpenCage/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/OpenCage/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Provider/OpenCage.php b/src/Provider/OpenCage/OpenCage.php
similarity index 97%
rename from src/Provider/OpenCage.php
rename to src/Provider/OpenCage/OpenCage.php
index 5106ae9e3..d564ee9ce 100644
--- a/src/Provider/OpenCage.php
+++ b/src/Provider/OpenCage/OpenCage.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\OpenCage;
use Geocoder\Exception\InvalidArgument;
use Geocoder\Exception\InvalidCredentials;
@@ -19,6 +19,9 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\LocaleAwareGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/tests/Provider/OpenCageTest.php b/src/Provider/OpenCage/Tests/OpenCageTest.php
similarity index 99%
rename from tests/Provider/OpenCageTest.php
rename to src/Provider/OpenCage/Tests/OpenCageTest.php
index 6b8ad33fa..e6c21df9b 100644
--- a/tests/Provider/OpenCageTest.php
+++ b/src/Provider/OpenCage/Tests/OpenCageTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\OpenCage\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\OpenCage;
+use Geocoder\Provider\OpenCage\OpenCage;
/**
* @author mtm
diff --git a/src/Provider/OpenCage/composer.json b/src/Provider/OpenCage/composer.json
new file mode 100644
index 000000000..6d8305925
--- /dev/null
+++ b/src/Provider/OpenCage/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/open-cage-provider",
+ "type": "library",
+ "description": "Geocoder OpenCage adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\OpenCage\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/OpenCage/phpunit.xml.dist b/src/Provider/OpenCage/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/OpenCage/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/TomTom/.gitignore b/src/Provider/TomTom/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/TomTom/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/tests/Provider/TomTomTest.php b/src/Provider/TomTom/Tests/TomTomTest.php
similarity index 99%
rename from tests/Provider/TomTomTest.php
rename to src/Provider/TomTom/Tests/TomTomTest.php
index 2341e78cc..8c21987e8 100644
--- a/tests/Provider/TomTomTest.php
+++ b/src/Provider/TomTom/Tests/TomTomTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\TomTom\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\TomTom;
+use Geocoder\Provider\TomTom\TomTom;
class TomTomTest extends TestCase
{
diff --git a/src/Provider/TomTom.php b/src/Provider/TomTom/TomTom.php
similarity index 97%
rename from src/Provider/TomTom.php
rename to src/Provider/TomTom/TomTom.php
index 2c04fd1c0..85b519c22 100644
--- a/src/Provider/TomTom.php
+++ b/src/Provider/TomTom/TomTom.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\TomTom;
use Geocoder\Exception\InvalidCredentials;
use Geocoder\Exception\InvalidServerResponse;
@@ -16,6 +16,9 @@
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\LocaleAwareGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/src/Provider/TomTom/composer.json b/src/Provider/TomTom/composer.json
new file mode 100644
index 000000000..6885fb977
--- /dev/null
+++ b/src/Provider/TomTom/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/tomtom-provider",
+ "type": "library",
+ "description": "Geocoder TomTom adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\TomTom\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/TomTom/phpunit.xml.dist b/src/Provider/TomTom/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/TomTom/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/src/Provider/Yandex/.gitignore b/src/Provider/Yandex/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/src/Provider/Yandex/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/tests/Provider/YandexTest.php b/src/Provider/Yandex/Tests/YandexTest.php
similarity index 99%
rename from tests/Provider/YandexTest.php
rename to src/Provider/Yandex/Tests/YandexTest.php
index 1a0b8b121..dbabbec5b 100644
--- a/tests/Provider/YandexTest.php
+++ b/src/Provider/Yandex/Tests/YandexTest.php
@@ -8,13 +8,13 @@
* @license MIT License
*/
-namespace Geocoder\Tests\Provider;
+namespace Geocoder\Provider\Yandex\Tests;
use Geocoder\Location;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
use Geocoder\Tests\TestCase;
-use Geocoder\Provider\Yandex;
+use Geocoder\Provider\Yandex\Yandex;
/**
* @author Antoine Corcy
diff --git a/src/Provider/Yandex.php b/src/Provider/Yandex/Yandex.php
similarity index 97%
rename from src/Provider/Yandex.php
rename to src/Provider/Yandex/Yandex.php
index 0dca42ad6..89fcf63f6 100644
--- a/src/Provider/Yandex.php
+++ b/src/Provider/Yandex/Yandex.php
@@ -8,12 +8,15 @@
* @license MIT License
*/
-namespace Geocoder\Provider;
+namespace Geocoder\Provider\Yandex;
use Geocoder\Exception\UnsupportedOperation;
use Geocoder\Exception\ZeroResults;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
+use Geocoder\Provider\AbstractHttpProvider;
+use Geocoder\Provider\LocaleAwareGeocoder;
+use Geocoder\Provider\Provider;
use Http\Client\HttpClient;
/**
diff --git a/src/Provider/Yandex/composer.json b/src/Provider/Yandex/composer.json
new file mode 100644
index 000000000..31b63a5c8
--- /dev/null
+++ b/src/Provider/Yandex/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "geocoder-php/yandex-provider",
+ "type": "library",
+ "description": "Geocoder Yandex adapter",
+ "keywords": [],
+ "homepage": "http://geocoder-php.org/Geocoder/",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "William Durand",
+ "email": "william.durand1@gmail.com"
+ }
+ ],
+ "require": {
+ "php": "^5.5 || ^7.0",
+ "willdurand/geocoder": "^4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "php-http/message": "^1.0",
+ "php-http/curl-client": "^1.7",
+ "symfony/phpunit-bridge": "^3.2",
+ "guzzlehttp/psr7": "^1.4"
+ },
+ "autoload": {
+ "psr-4": { "Geocoder\\Provider\\Yandex\\": "" },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0-dev"
+ }
+ }
+}
diff --git a/src/Provider/Yandex/phpunit.xml.dist b/src/Provider/Yandex/phpunit.xml.dist
new file mode 100644
index 000000000..7581e8757
--- /dev/null
+++ b/src/Provider/Yandex/phpunit.xml.dist
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+ ./Tests/
+
+
+
+
+
+ ./
+
+ ./Tests
+ ./vendor
+
+
+
+
diff --git a/tests/.cached_responses/078fa26249647f012c8c6bd8b5f0f7350d2a326c b/tests/.cached_responses/078fa26249647f012c8c6bd8b5f0f7350d2a326c
deleted file mode 100644
index 19eacb94a..000000000
--- a/tests/.cached_responses/078fa26249647f012c8c6bd8b5f0f7350d2a326c
+++ /dev/null
@@ -1,69 +0,0 @@
-s:2091:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "10",
- "short_name" : "10",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Kalbacher Hauptstraße",
- "short_name" : "Kalbacher Hauptstraße",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Kalbach-Riedberg",
- "short_name" : "Kalbach-Riedberg",
- "types" : [ "sublocality_level_1", "sublocality", "political" ]
- },
- {
- "long_name" : "Frankfurt",
- "short_name" : "Frankfurt",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Darmstadt",
- "short_name" : "DA",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Hessen",
- "short_name" : "HE",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "Germany",
- "short_name" : "DE",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "60437",
- "short_name" : "60437",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "Kalbacher Hauptstraße 10, 60437 Frankfurt, Germany",
- "geometry" : {
- "location" : {
- "lat" : 50.1889896,
- "lng" : 8.6366675
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 50.1903385802915,
- "lng" : 8.638016480291503
- },
- "southwest" : {
- "lat" : 50.1876406197085,
- "lng" : 8.635318519708498
- }
- }
- },
- "types" : [ "street_address" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/07cc30bd9868a729b3526f85cac0a4dee829eeb7 b/tests/.cached_responses/07cc30bd9868a729b3526f85cac0a4dee829eeb7
deleted file mode 100644
index e527b4834..000000000
--- a/tests/.cached_responses/07cc30bd9868a729b3526f85cac0a4dee829eeb7
+++ /dev/null
@@ -1 +0,0 @@
-s:6233:"{"response":{"Attribution":"","GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"22.256784,60.453947","found":"70","results":"5","boundedBy":{"Envelope":{"lowerCorner":"22.254288 60.451449","upperCorner":"22.259283 60.456445"}},"Point":{"pos":"22.256784 60.453947"},"kind":"house"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Bangårdsgatan, 36","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Bangårdsgatan, 36","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Bangårdsgatan","Premise":{"PremiseNumber":"36"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Bangårdsgatan, 36","boundedBy":{"Envelope":{"lowerCorner":"22.248557 60.450242","upperCorner":"22.265014 60.458371"}},"Point":{"pos":"22.256785 60.454307"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Ratapihankatu, 36","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Ratapihankatu, 36","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Ratapihankatu","Premise":{"PremiseNumber":"36"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Ratapihankatu, 36","boundedBy":{"Envelope":{"lowerCorner":"22.248557 60.450242","upperCorner":"22.265014 60.458371"}},"Point":{"pos":"22.256785 60.454307"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15b","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15b","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Humalistonkatu","Premise":{"PremiseNumber":"15b"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Humalistonkatu, 15b","boundedBy":{"Envelope":{"lowerCorner":"22.248125 60.449332","upperCorner":"22.264583 60.457461"}},"Point":{"pos":"22.256354 60.453397"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humlegårdsgatan, 15b","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humlegårdsgatan, 15b","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Humlegårdsgatan","Premise":{"PremiseNumber":"15b"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Humlegårdsgatan, 15b","boundedBy":{"Envelope":{"lowerCorner":"22.248125 60.449332","upperCorner":"22.264583 60.457461"}},"Point":{"pos":"22.256354 60.453397"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humlegårdsgatan, 15a","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humlegårdsgatan, 15a","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Humlegårdsgatan","Premise":{"PremiseNumber":"15a"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Humlegårdsgatan, 15a","boundedBy":{"Envelope":{"lowerCorner":"22.248889 60.449235","upperCorner":"22.265346 60.457364"}},"Point":{"pos":"22.257118 60.453299"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/09f2a6b07dc96ebc3d201efef948224d84720ee9 b/tests/.cached_responses/09f2a6b07dc96ebc3d201efef948224d84720ee9
deleted file mode 100644
index c2248e874..000000000
--- a/tests/.cached_responses/09f2a6b07dc96ebc3d201efef948224d84720ee9
+++ /dev/null
@@ -1 +0,0 @@
-s:169:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"abcdef, ghijkl, mnopqrs","found":"0","results":"5"}},"featureMember":[]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/104102f6aa3e287d6de3921e40b50342f8b49ed2 b/tests/.cached_responses/104102f6aa3e287d6de3921e40b50342f8b49ed2
deleted file mode 100644
index 876b4e238..000000000
--- a/tests/.cached_responses/104102f6aa3e287d6de3921e40b50342f8b49ed2
+++ /dev/null
@@ -1 +0,0 @@
-s:147:"{"error":{"code":400,"message":"Cannot perform query. Invalid query parameters.","details":["Unable to find address for the specified location."]}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/1672cbe5e923909ca43d5c7b0dd571d1bd9625a0 b/tests/.cached_responses/1672cbe5e923909ca43d5c7b0dd571d1bd9625a0
deleted file mode 100644
index 46241c53a..000000000
--- a/tests/.cached_responses/1672cbe5e923909ca43d5c7b0dd571d1bd9625a0
+++ /dev/null
@@ -1,125 +0,0 @@
-s:3840:"{
- "documentation" : "https://geocoder.opencagedata.com/api",
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2492,
- "reset" : 1482710400
- },
- "results" : [
- {
- "annotations" : {
- "DMS" : {
- "lat" : "29\u00b0 58' 44.42862'' N",
- "lng" : "31\u00b0 8' 3.25620'' E"
- },
- "MGRS" : "36RUU1999717924",
- "Maidenhead" : "KL59nx64cx",
- "Mercator" : {
- "x" : 3465847.502,
- "y" : 3479504.61
- },
- "OSM" : {
- "edit_url" : "https://www.openstreetmap.org/edit?way=4420397#map=17/29.97901/31.13424",
- "url" : "https://www.openstreetmap.org/?mlat=29.97901&mlon=31.13424#map=17/29.97901/31.13424"
- },
- "callingcode" : 20,
- "currency" : {
- "alternate_symbols" : [
- "LE",
- "E\u00a3",
- "L.E."
- ],
- "decimal_mark" : ".",
- "html_entity" : "£",
- "iso_code" : "EGP",
- "iso_numeric" : 818,
- "name" : "Egyptian Pound",
- "smallest_denomination" : 25,
- "subunit" : "Piastre",
- "subunit_to_unit" : 100,
- "symbol" : "\u062c.\u0645",
- "symbol_first" : 1,
- "thousands_separator" : ","
- },
- "geohash" : "stq4s3x22k4k5w9zc77h",
- "qibla" : 135.56,
- "sun" : {
- "rise" : {
- "apparent" : 1482641400,
- "astronomical" : 1482636240,
- "civil" : 1482639780,
- "nautical" : 1482637980
- },
- "set" : {
- "apparent" : 1482678180,
- "astronomical" : 1482683280,
- "civil" : 1482679740,
- "nautical" : 1482681540
- }
- },
- "timezone" : {
- "name" : "Africa/Cairo",
- "now_in_dst" : 0,
- "offset_sec" : 7200,
- "offset_string" : 200,
- "short_name" : "EET"
- },
- "what3words" : {
- "words" : "roosts.gems.scorch"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 29.9801279,
- "lng" : 31.1354031
- },
- "southwest" : {
- "lat" : 29.9781249,
- "lng" : 31.1330737
- }
- },
- "components" : {
- "_type" : "attraction",
- "attraction" : "Pyramid of Khufu",
- "country" : "Egypt",
- "country_code" : "eg",
- "postcode" : "12561",
- "road" : "Alex-Cairo Desert Rd Ext.",
- "state" : "Giza Governorate",
- "suburb" : "Kom al Akhdar",
- "village" : "Remaya Square"
- },
- "confidence" : 10,
- "formatted" : "Pyramid of Khufu, Alex-Cairo Desert Rd Ext., Kom al Akhdar, Remaya Square, 12561, Egypt",
- "geometry" : {
- "lat" : 29.9790079,
- "lng" : 31.1342378
- }
- }
- ],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "stay_informed" : {
- "blog" : "http://blog.opencagedata.com",
- "twitter" : "https://twitter.com/opencagedata"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Sun, 25 Dec 2016 01:12:50 GMT",
- "created_unix" : 1482628370
- },
- "total_results" : 1
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/18d9ead8c32cddb4a3e06b17971685ea711214a5 b/tests/.cached_responses/18d9ead8c32cddb4a3e06b17971685ea711214a5
deleted file mode 100644
index 764c7338a..000000000
--- a/tests/.cached_responses/18d9ead8c32cddb4a3e06b17971685ea711214a5
+++ /dev/null
@@ -1 +0,0 @@
-s:1117:"{"info":{"statuscode":0,"copyright":{"text":"\u00A9 2016 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"\u00A9 2016 MapQuest, Inc."},"messages":[]},"options":{"maxResults":1,"thumbMaps":true,"ignoreLatLngInput":false},"results":[{"providedLocation":{"latLng":{"lat":38.900206,"lng":-77.036991}},"locations":[{"street":"H Street Northwest","adminArea6":"","adminArea6Type":"Neighborhood","adminArea5":"Washington","adminArea5Type":"City","adminArea4":"","adminArea4Type":"County","adminArea3":"District of Columbia","adminArea3Type":"State","adminArea1":"US","adminArea1Type":"Country","postalCode":"20006","geocodeQualityCode":"B1AAA","geocodeQuality":"STREET","dragPoint":false,"sideOfStreet":"N","linkId":"0","unknownInput":"","type":"s","latLng":{"lat":38.900201,"lng":-77.036991},"displayLatLng":{"lat":38.900201,"lng":-77.036991},"mapUrl":"http://open.mapquestapi.com/staticmap/v4/getmap?key=io5RY14NTLzVuX48xoga7ICStRa8bOpR&type=map&size=225,160&pois=purple-1,38.90020133976049,-77.03699100349493,0,0,|¢er=38.90020133976049,-77.03699100349493&zoom=15&rand=-1750765875"}]}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/1a602fb4b503dc7750b4ba1bbe0d7df8f3f2cc97 b/tests/.cached_responses/1a602fb4b503dc7750b4ba1bbe0d7df8f3f2cc97
deleted file mode 100644
index bbcbda5c8..000000000
--- a/tests/.cached_responses/1a602fb4b503dc7750b4ba1bbe0d7df8f3f2cc97
+++ /dev/null
@@ -1,29 +0,0 @@
-s:587:"{
-"response": {
-"status": "Propper Request",
-"message": "Success",
-"notes": "The following results has been returned",
-"code": "200_1",
-"location": {
-"ip": "66.147.244.214",
-"owner": "UNIFIED LAYER",
-"continent_name": "NORTH AMERICA",
-"continent_code": "NA",
-"country_name": "UNITED STATES",
-"country_code": "US",
-"region_name": "UTAH",
-"region_code": "UT",
-"county_name": "UTAH",
-"city_name": "PROVO",
-"latitude": "40.3402",
-"longitude": "-111.6073",
-"timezone": "MST"
-},
-"unit_test": {
-"api_calls": "100",
-"current_calls": "10",
-"elapsed_time": "0.0184",
-"memory_usage": "1.88MB"
-}
-}
-}";
\ No newline at end of file
diff --git a/tests/.cached_responses/1c5bb23ad45167fa9d48bb8cb6a3dbda630d5bc4 b/tests/.cached_responses/1c5bb23ad45167fa9d48bb8cb6a3dbda630d5bc4
deleted file mode 100644
index c1e703b99..000000000
--- a/tests/.cached_responses/1c5bb23ad45167fa9d48bb8cb6a3dbda630d5bc4
+++ /dev/null
@@ -1,425 +0,0 @@
-s:12861:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "1",
- "short_name" : "1",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Avenue Gambetta",
- "short_name" : "Avenue Gambetta",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "1 Avenue Gambetta, 75020 Paris, France",
- "geometry" : {
- "location" : {
- "lat" : 48.8632028,
- "lng" : 2.3889749
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8645517802915,
- "lng" : 2.390323880291502
- },
- "southwest" : {
- "lat" : 48.8618538197085,
- "lng" : 2.387625919708498
- }
- }
- },
- "types" : [ "street_address" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Père-Lachaise",
- "short_name" : "Père-Lachaise",
- "types" : [ "neighborhood", "political" ]
- },
- {
- "long_name" : "20th arrondissement",
- "short_name" : "20th arrondissement",
- "types" : [ "sublocality_level_1", "sublocality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Père-Lachaise, Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.8707461,
- "lng" : 2.4064679
- },
- "southwest" : {
- "lat" : 48.856442,
- "lng" : 2.383115
- }
- },
- "location" : {
- "lat" : 48.8627872,
- "lng" : 2.3928087
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8707461,
- "lng" : 2.4064679
- },
- "southwest" : {
- "lat" : 48.856442,
- "lng" : 2.383115
- }
- }
- },
- "types" : [ "neighborhood", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "75020 Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.8784077,
- "lng" : 2.4164596
- },
- "southwest" : {
- "lat" : 48.8465946,
- "lng" : 2.3768622
- }
- },
- "location" : {
- "lat" : 48.8599825,
- "lng" : 2.4066412
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8784077,
- "lng" : 2.4164596
- },
- "southwest" : {
- "lat" : 48.8465946,
- "lng" : 2.3768622
- }
- }
- },
- "types" : [ "postal_code" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "20th arrondissement",
- "short_name" : "20th arrondissement",
- "types" : [ "sublocality_level_1", "sublocality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "20th arrondissement, Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.8784419,
- "lng" : 2.4163301
- },
- "southwest" : {
- "lat" : 48.846621,
- "lng" : 2.376885
- }
- },
- "location" : {
- "lat" : 48.8599825,
- "lng" : 2.4066412
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8784419,
- "lng" : 2.4163301
- },
- "southwest" : {
- "lat" : 48.846621,
- "lng" : 2.376885
- }
- }
- },
- "types" : [ "sublocality_level_1", "sublocality", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.224199
- }
- },
- "location" : {
- "lat" : 48.856614,
- "lng" : 2.3522219
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.224199
- }
- }
- },
- "types" : [ "locality", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.224199
- }
- },
- "location" : {
- "lat" : 48.8763337,
- "lng" : 2.3461207
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.224199
- }
- }
- },
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Île-de-France, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 49.241504,
- "lng" : 3.5590069
- },
- "southwest" : {
- "lat" : 48.1200811,
- "lng" : 1.44617
- }
- },
- "location" : {
- "lat" : 48.8499198,
- "lng" : 2.6370411
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 49.241504,
- "lng" : 3.5590069
- },
- "southwest" : {
- "lat" : 48.1200811,
- "lng" : 1.44617
- }
- }
- },
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 51.089166,
- "lng" : 9.560067799999999
- },
- "southwest" : {
- "lat" : 41.3423276,
- "lng" : -5.141227900000001
- }
- },
- "location" : {
- "lat" : 46.227638,
- "lng" : 2.213749
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 51.089166,
- "lng" : 8.233549099999999
- },
- "southwest" : {
- "lat" : 42.333014,
- "lng" : -4.795341899999999
- }
- }
- },
- "types" : [ "country", "political" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/1db7a34d556635fd88c6755e14df661ec0f5d721 b/tests/.cached_responses/1db7a34d556635fd88c6755e14df661ec0f5d721
deleted file mode 100644
index f43b7c098..000000000
--- a/tests/.cached_responses/1db7a34d556635fd88c6755e14df661ec0f5d721
+++ /dev/null
@@ -1 +0,0 @@
-s:814:"{"info":{"statuscode":0,"copyright":{"text":"\u00A9 2016 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"\u00A9 2016 MapQuest, Inc."},"messages":[]},"options":{"maxResults":5,"thumbMaps":false,"ignoreLatLngInput":false},"results":[{"providedLocation":{"location":"foobar, bazbar, bizbar"},"locations":[{"street":"","adminArea6":"","adminArea6Type":"Neighborhood","adminArea5":"","adminArea5Type":"City","adminArea4":"","adminArea4Type":"County","adminArea3":"","adminArea3Type":"State","adminArea1":"US","adminArea1Type":"Country","postalCode":"","geocodeQualityCode":"A1XXX","geocodeQuality":"COUNTRY","dragPoint":false,"sideOfStreet":"N","linkId":"0","unknownInput":"","type":"s","latLng":{"lat":39.78373,"lng":-100.445882},"displayLatLng":{"lat":39.78373,"lng":-100.445882}}]}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/219e74805aac89cbfc5f0810c1e2873a6da0ca08 b/tests/.cached_responses/219e74805aac89cbfc5f0810c1e2873a6da0ca08
deleted file mode 100644
index 35fd8591f..000000000
--- a/tests/.cached_responses/219e74805aac89cbfc5f0810c1e2873a6da0ca08
+++ /dev/null
@@ -1,34 +0,0 @@
-s:808:"{
- "documentation" : "https://geocoder.opencagedata.com/api",
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2499,
- "reset" : 1487548800
- },
- "results" : [],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "stay_informed" : {
- "blog" : "http://blog.opencagedata.com",
- "twitter" : "https://twitter.com/opencagedata"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Sun, 19 Feb 2017 14:22:13 GMT",
- "created_unix" : 1487514133
- },
- "total_results" : 0
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/2215bf948357a4049640a7e6cce1eca1b6bace39 b/tests/.cached_responses/2215bf948357a4049640a7e6cce1eca1b6bace39
deleted file mode 100644
index 04ab534d6..000000000
--- a/tests/.cached_responses/2215bf948357a4049640a7e6cce1eca1b6bace39
+++ /dev/null
@@ -1 +0,0 @@
-s:215:"BR,Brazil,26,"Santa Catarina",Florianpolis,-27.5833,-48.5667,,,America/Sao_Paulo,SA,,"Global Village Telecom","Global Village Telecom",gvt.net.br,"AS18881 Global Village Telecom",Cable/DSL,residential,26,99,46,93,,";
\ No newline at end of file
diff --git a/tests/.cached_responses/2b4f3a47fa3f17ffd4b8ebd05d1beeb991f7b77a b/tests/.cached_responses/2b4f3a47fa3f17ffd4b8ebd05d1beeb991f7b77a
deleted file mode 100644
index 1c5df80d6..000000000
--- a/tests/.cached_responses/2b4f3a47fa3f17ffd4b8ebd05d1beeb991f7b77a
+++ /dev/null
@@ -1,14 +0,0 @@
-s:244:"{
-"response": {
-"status": "Propper Request",
-"message": "Not Found",
-"notes": "No result set has been returned",
-"code": "200_2",
-"unit_test": {
-"api_calls": "100",
-"current_calls": "11",
-"elapsed_time": "0.0180",
-"memory_usage": "1.88MB"
-}
-}
-}";
\ No newline at end of file
diff --git a/tests/.cached_responses/2b61d5cd6c32b39a372c26fd0b8e0b4510f4cf79 b/tests/.cached_responses/2b61d5cd6c32b39a372c26fd0b8e0b4510f4cf79
deleted file mode 100644
index c9fbf95f3..000000000
--- a/tests/.cached_responses/2b61d5cd6c32b39a372c26fd0b8e0b4510f4cf79
+++ /dev/null
@@ -1,34 +0,0 @@
-s:808:"{
- "documentation" : "https://geocoder.opencagedata.com/api",
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2490,
- "reset" : 1482710400
- },
- "results" : [],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "stay_informed" : {
- "blog" : "http://blog.opencagedata.com",
- "twitter" : "https://twitter.com/opencagedata"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Sun, 25 Dec 2016 01:12:53 GMT",
- "created_unix" : 1482628373
- },
- "total_results" : 0
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/3097f7d2ed6ba5f3b96f76a180c09546b28ba24a b/tests/.cached_responses/3097f7d2ed6ba5f3b96f76a180c09546b28ba24a
deleted file mode 100644
index f7673ac4d..000000000
--- a/tests/.cached_responses/3097f7d2ed6ba5f3b96f76a180c09546b28ba24a
+++ /dev/null
@@ -1,602 +0,0 @@
-s:19081:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "I",
- "short_name" : "I",
- "types" : [ "premise" ]
- },
- {
- "long_name" : "33000",
- "short_name" : "33000",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Yucaipa Boulevard",
- "short_name" : "Yucaipa Blvd",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Yucaipa",
- "short_name" : "Yucaipa",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "San Bernardino County",
- "short_name" : "San Bernardino County",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "California",
- "short_name" : "CA",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "United States",
- "short_name" : "US",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "92399",
- "short_name" : "92399",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "I, 33000 Yucaipa Blvd, Yucaipa, CA 92399, USA",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 34.0376555,
- "lng" : -117.0858935
- },
- "southwest" : {
- "lat" : 34.0372333,
- "lng" : -117.086379
- }
- },
- "location" : {
- "lat" : 34.0374444,
- "lng" : -117.0861363
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 34.03879338029149,
- "lng" : -117.0847872697085
- },
- "southwest" : {
- "lat" : 34.0360954197085,
- "lng" : -117.0874852302915
- }
- }
- },
- "place_id" : "ChIJgzrGaMlW24ARt50DFFkKjmk",
- "types" : [ "premise" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Kerman Province",
- "short_name" : "Kerman Province",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "Iran",
- "short_name" : "IR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Kerman Province, Iran",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 32.062049,
- "lng" : 59.49789109999999
- },
- "southwest" : {
- "lat" : 26.0287301,
- "lng" : 54.438294
- }
- },
- "location" : {
- "lat" : 29.4850089,
- "lng" : 57.64390479999999
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 32.062049,
- "lng" : 59.49789109999999
- },
- "southwest" : {
- "lat" : 26.0287301,
- "lng" : 54.438294
- }
- }
- },
- "place_id" : "ChIJS-2glFm4_T4RnkEgVHP1HSY",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "I",
- "short_name" : "I",
- "types" : [ "premise" ]
- },
- {
- "long_name" : "501",
- "short_name" : "501",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Danville Boulevard",
- "short_name" : "Danville Blvd",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Danville",
- "short_name" : "Danville",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Contra Costa County",
- "short_name" : "Contra Costa County",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "California",
- "short_name" : "CA",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "United States",
- "short_name" : "US",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "94526",
- "short_name" : "94526",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "I, 501 Danville Blvd, Danville, CA 94526, USA",
- "geometry" : {
- "location" : {
- "lat" : 37.8249957,
- "lng" : -122.0063758
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 37.8263446802915,
- "lng" : -122.0050268197085
- },
- "southwest" : {
- "lat" : 37.8236467197085,
- "lng" : -122.0077247802915
- }
- }
- },
- "place_id" : "ChIJ26PFpFmLj4ARhaLsoWbblDI",
- "types" : [ "premise" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "I",
- "short_name" : "I",
- "types" : [ "premise" ]
- },
- {
- "long_name" : "2520",
- "short_name" : "2520",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Batchelder Street",
- "short_name" : "Batchelder St",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Sheepshead Bay",
- "short_name" : "Sheepshead Bay",
- "types" : [ "neighborhood", "political" ]
- },
- {
- "long_name" : "Brooklyn",
- "short_name" : "Brooklyn",
- "types" : [ "political", "sublocality", "sublocality_level_1" ]
- },
- {
- "long_name" : "Kings County",
- "short_name" : "Kings County",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "New York",
- "short_name" : "NY",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "United States",
- "short_name" : "US",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "11235",
- "short_name" : "11235",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "I, 2520 Batchelder St, Brooklyn, NY 11235, USA",
- "geometry" : {
- "location" : {
- "lat" : 40.5911442,
- "lng" : -73.9380312
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 40.5924931802915,
- "lng" : -73.9366822197085
- },
- "southwest" : {
- "lat" : 40.5897952197085,
- "lng" : -73.93938018029151
- }
- }
- },
- "place_id" : "ChIJyZexb4BEwokRhNccCpfiA58",
- "types" : [ "establishment", "point_of_interest", "premise" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "I",
- "short_name" : "I",
- "types" : [ "premise" ]
- },
- {
- "long_name" : "438",
- "short_name" : "438",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "West Main Street",
- "short_name" : "W Main St",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Rexburg",
- "short_name" : "Rexburg",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Madison County",
- "short_name" : "Madison County",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Idaho",
- "short_name" : "ID",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "United States",
- "short_name" : "US",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "83440",
- "short_name" : "83440",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "I, 438 W Main St, Rexburg, ID 83440, USA",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 43.8275347,
- "lng" : -111.7971569
- },
- "southwest" : {
- "lat" : 43.8273551,
- "lng" : -111.7973455
- }
- },
- "location" : {
- "lat" : 43.8274449,
- "lng" : -111.7972512
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 43.8287938802915,
- "lng" : -111.7959022197085
- },
- "southwest" : {
- "lat" : 43.8260959197085,
- "lng" : -111.7986001802915
- }
- }
- },
- "place_id" : "ChIJf5IJ5rELVFMRlHPAho_JhmQ",
- "types" : [ "establishment", "point_of_interest", "premise" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Building I",
- "short_name" : "I",
- "types" : [ "premise" ]
- },
- {
- "long_name" : "335",
- "short_name" : "335",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Buckingham Way",
- "short_name" : "Buckingham Way",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Lakeshore",
- "short_name" : "Lakeshore",
- "types" : [ "neighborhood", "political" ]
- },
- {
- "long_name" : "San Francisco",
- "short_name" : "SF",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "San Francisco County",
- "short_name" : "San Francisco County",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "California",
- "short_name" : "CA",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "United States",
- "short_name" : "US",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "94132",
- "short_name" : "94132",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "Building I, 335 Buckingham Way, San Francisco, CA 94132, USA",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 37.7281407,
- "lng" : -122.4798516
- },
- "southwest" : {
- "lat" : 37.727632,
- "lng" : -122.4804
- }
- },
- "location" : {
- "lat" : 37.7278863,
- "lng" : -122.4801258
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 37.72923533029149,
- "lng" : -122.4787768197085
- },
- "southwest" : {
- "lat" : 37.7265373697085,
- "lng" : -122.4814747802915
- }
- }
- },
- "place_id" : "ChIJDzsnLLt9j4ARY8t0BmEqY78",
- "types" : [ "establishment", "point_of_interest", "premise" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "I",
- "short_name" : "I",
- "types" : [ "premise" ]
- },
- {
- "long_name" : "Hatteras Street",
- "short_name" : "Hatteras St",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Woodland Hills",
- "short_name" : "Woodland Hills",
- "types" : [ "neighborhood", "political" ]
- },
- {
- "long_name" : "Los Angeles",
- "short_name" : "Los Angeles",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Los Angeles County",
- "short_name" : "Los Angeles County",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "California",
- "short_name" : "CA",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "United States",
- "short_name" : "US",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "91367",
- "short_name" : "91367",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "I, Hatteras St, Woodland Hills, CA 91367, USA",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 34.175959,
- "lng" : -118.6440356
- },
- "southwest" : {
- "lat" : 34.1756216,
- "lng" : -118.6441736
- }
- },
- "location" : {
- "lat" : 34.1757903,
- "lng" : -118.6441046
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 34.1771392802915,
- "lng" : -118.6427556197085
- },
- "southwest" : {
- "lat" : 34.1744413197085,
- "lng" : -118.6454535802915
- }
- }
- },
- "place_id" : "ChIJn0XwtN6dwoARYKGGTXha5ic",
- "types" : [ "premise" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "I",
- "short_name" : "I",
- "types" : [ "premise" ]
- },
- {
- "long_name" : "855",
- "short_name" : "855",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "North Park Road",
- "short_name" : "N Park Rd",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Wyomissing",
- "short_name" : "Wyomissing",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Berks County",
- "short_name" : "Berks County",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Pennsylvania",
- "short_name" : "PA",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "United States",
- "short_name" : "US",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "19610",
- "short_name" : "19610",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "I, 855 N Park Rd, Wyomissing, PA 19610, USA",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 40.3473097,
- "lng" : -75.9574569
- },
- "southwest" : {
- "lat" : 40.3469683,
- "lng" : -75.95774709999999
- }
- },
- "location" : {
- "lat" : 40.347139,
- "lng" : -75.95760199999999
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 40.34848798029149,
- "lng" : -75.95625301970848
- },
- "southwest" : {
- "lat" : 40.3457900197085,
- "lng" : -75.95895098029149
- }
- }
- },
- "place_id" : "ChIJ628O3tF2xokRtBg0oOkJliU",
- "types" : [ "establishment", "point_of_interest", "premise" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "'Adan Governorate",
- "short_name" : "'Adan Governorate",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "Yemen",
- "short_name" : "YE",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "'Adan Governorate, Yemen",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 12.92427,
- "lng" : 45.088718
- },
- "southwest" : {
- "lat" : 12.668484,
- "lng" : 44.4078031
- }
- },
- "location" : {
- "lat" : 12.8257481,
- "lng" : 44.7943804
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 12.92427,
- "lng" : 45.0821906
- },
- "southwest" : {
- "lat" : 12.6697487,
- "lng" : 44.4078031
- }
- }
- },
- "place_id" : "ChIJC_dB4JI_HhYR6LLj53OyVNE",
- "types" : [ "administrative_area_level_1", "political" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/32ae7d88654feada04b47acc206701b989f062a0 b/tests/.cached_responses/32ae7d88654feada04b47acc206701b989f062a0
deleted file mode 100644
index 41b9fd25a..000000000
--- a/tests/.cached_responses/32ae7d88654feada04b47acc206701b989f062a0
+++ /dev/null
@@ -1 +0,0 @@
-s:79:"US,UT,Provo,84606,40.218102,-111.613297,770,801,"Unified Layer","Unified Layer"";
\ No newline at end of file
diff --git a/tests/.cached_responses/3669ef360ff9827bba11a0eea3de35106d7dda6b b/tests/.cached_responses/3669ef360ff9827bba11a0eea3de35106d7dda6b
deleted file mode 100644
index 19d2c2229..000000000
--- a/tests/.cached_responses/3669ef360ff9827bba11a0eea3de35106d7dda6b
+++ /dev/null
@@ -1,34 +0,0 @@
-s:808:"{
- "documentation" : "https://geocoder.opencagedata.com/api",
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2489,
- "reset" : 1482710400
- },
- "results" : [],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "stay_informed" : {
- "blog" : "http://blog.opencagedata.com",
- "twitter" : "https://twitter.com/opencagedata"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Sun, 25 Dec 2016 01:12:56 GMT",
- "created_unix" : 1482628376
- },
- "total_results" : 0
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/3ae84fcfaa9ebc3c84ecfd569aaa8a024c732aaa b/tests/.cached_responses/3ae84fcfaa9ebc3c84ecfd569aaa8a024c732aaa
deleted file mode 100644
index 690a23b3a..000000000
--- a/tests/.cached_responses/3ae84fcfaa9ebc3c84ecfd569aaa8a024c732aaa
+++ /dev/null
@@ -1,60 +0,0 @@
-s:1736:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Lamar County",
- "short_name" : "Lamar County",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Texas",
- "short_name" : "TX",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "United States",
- "short_name" : "US",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Paris, TX, USA",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 33.7383781,
- "lng" : -95.435455
- },
- "southwest" : {
- "lat" : 33.6118529,
- "lng" : -95.62792789999999
- }
- },
- "location" : {
- "lat" : 33.6609389,
- "lng" : -95.55551299999999
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 33.7383781,
- "lng" : -95.435455
- },
- "southwest" : {
- "lat" : 33.6118529,
- "lng" : -95.62792789999999
- }
- }
- },
- "place_id" : "ChIJmysnFgZYSoYRSfPTL2YJuck",
- "types" : [ "locality", "political" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/3be7f42ac361de5b9bd9baa64a1e21d3fabbe109 b/tests/.cached_responses/3be7f42ac361de5b9bd9baa64a1e21d3fabbe109
deleted file mode 100644
index cb32082df..000000000
--- a/tests/.cached_responses/3be7f42ac361de5b9bd9baa64a1e21d3fabbe109
+++ /dev/null
@@ -1,104 +0,0 @@
-s:2992:"{
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2478,
- "reset" : 1422835200
- },
- "results" : [
- {
- "annotations" : {
- "DMS" : {
- "lat" : "54\u00b0 2' 55.96656'' N",
- "lng" : "2\u00b0 47' 56.21674'' W"
- },
- "MGRS" : "30UWE1316388978",
- "Maidenhead" : "IO84ob41dr",
- "Mercator" : {
- "x" : -311577.588,
- "y" : 7144803.727
- },
- "OSGB" : {
- "easting" : 347696.195,
- "gridref" : "SD 476 617",
- "northing" : 461750.824
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=54.04888&mlon=-2.79895#map=17/54.04888/-2.79895"
- },
- "callingcode" : 44,
- "geohash" : "gcw52r3cec2m35vkre86",
- "sun" : {
- "rise" : {
- "astronomical" : 1422769980,
- "civil" : 1422775020,
- "nautical" : 1422772500
- },
- "set" : {
- "astronomical" : 1422817020,
- "civil" : 1422811980,
- "nautical" : 1422814560
- }
- },
- "timezone" : {
- "name" : "Europe/London",
- "now_in_dst" : 0,
- "offset_sec" : 0,
- "offset_string" : 0,
- "short_name" : "GMT"
- },
- "what3words" : {
- "words" : "sheet.boost.nurse"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 54.0494992,
- "lng" : -2.79813
- },
- "southwest" : {
- "lat" : 54.0482731,
- "lng" : -2.7998815
- }
- },
- "components" : {
- "building" : "St Nicholas Arcades",
- "city" : "Lancaster",
- "country" : "United Kingdom",
- "country_code" : "gb",
- "county" : "Lancashire",
- "pedestrian" : "Lancaster Gate",
- "state" : "England",
- "state_district" : "North West England",
- "suburb" : "Vale"
- },
- "confidence" : 10,
- "formatted" : "Lancaster Gate, Vale, Lancaster, Lancashire, United Kingdom",
- "geometry" : {
- "lat" : 54.0488796,
- "lng" : -2.79894909568771
- }
- }
- ],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Sun, 01 Feb 2015 16:13:40 GMT",
- "created_unix" : 1422807220
- },
- "total_results" : 1,
- "we_are_hiring" : "http://lokku.com/#jobs"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/3c03719bb466bf51cad21b09d2013719d497f25b b/tests/.cached_responses/3c03719bb466bf51cad21b09d2013719d497f25b
deleted file mode 100644
index 9a98ebeda..000000000
--- a/tests/.cached_responses/3c03719bb466bf51cad21b09d2013719d497f25b
+++ /dev/null
@@ -1 +0,0 @@
-s:815:"{"info":{"statuscode":0,"copyright":{"text":"\u00A9 2017 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"\u00A9 2017 MapQuest, Inc."},"messages":[]},"options":{"maxResults":5,"thumbMaps":false,"ignoreLatLngInput":false},"results":[{"providedLocation":{"location":"abcdef, ghijkl, mnopqrs"},"locations":[{"street":"","adminArea6":"","adminArea6Type":"Neighborhood","adminArea5":"","adminArea5Type":"City","adminArea4":"","adminArea4Type":"County","adminArea3":"","adminArea3Type":"State","adminArea1":"US","adminArea1Type":"Country","postalCode":"","geocodeQualityCode":"A1XXX","geocodeQuality":"COUNTRY","dragPoint":false,"sideOfStreet":"N","linkId":"0","unknownInput":"","type":"s","latLng":{"lat":39.78373,"lng":-100.445882},"displayLatLng":{"lat":39.78373,"lng":-100.445882}}]}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/3d9807483befbba53bf23b60eadbb11d8f4341cc b/tests/.cached_responses/3d9807483befbba53bf23b60eadbb11d8f4341cc
deleted file mode 100644
index 13ebb3425..000000000
--- a/tests/.cached_responses/3d9807483befbba53bf23b60eadbb11d8f4341cc
+++ /dev/null
@@ -1,59 +0,0 @@
-s:1634:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.224199
- }
- },
- "location" : {
- "lat" : 48.856614,
- "lng" : 2.3522219
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.224199
- }
- }
- },
- "types" : [ "locality", "political" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/40a5092192b8f997799d382f5f05a16ee0d8208f b/tests/.cached_responses/40a5092192b8f997799d382f5f05a16ee0d8208f
deleted file mode 100644
index ffca56fa6..000000000
--- a/tests/.cached_responses/40a5092192b8f997799d382f5f05a16ee0d8208f
+++ /dev/null
@@ -1 +0,0 @@
-s:1093:"{"info":{"statuscode":0,"copyright":{"text":"\u00A9 2016 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"\u00A9 2016 MapQuest, Inc."},"messages":[]},"options":{"maxResults":1,"thumbMaps":true,"ignoreLatLngInput":false},"results":[{"providedLocation":{"latLng":{"lat":29.979216,"lng":31.134277}},"locations":[{"street":"Pyramid of Khufu","adminArea6":"","adminArea6Type":"Neighborhood","adminArea5":"Remaya Square","adminArea5Type":"City","adminArea4":"","adminArea4Type":"County","adminArea3":"Giza Governorate","adminArea3Type":"State","adminArea1":"EG","adminArea1Type":"Country","postalCode":"12561","geocodeQualityCode":"P1AAA","geocodeQuality":"POINT","dragPoint":false,"sideOfStreet":"N","linkId":"0","unknownInput":"","type":"s","latLng":{"lat":29.97901,"lng":31.134239},"displayLatLng":{"lat":29.97901,"lng":31.134239},"mapUrl":"http://open.mapquestapi.com/staticmap/v4/getmap?key=io5RY14NTLzVuX48xoga7ICStRa8bOpR&type=map&size=225,160&pois=purple-1,29.97900985,31.13423866230286,0,0,|¢er=29.97900985,31.13423866230286&zoom=15&rand=1196861333"}]}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/40a56f7770fc2a796eb01fc984f89a46eaeb3ad0 b/tests/.cached_responses/40a56f7770fc2a796eb01fc984f89a46eaeb3ad0
deleted file mode 100644
index 470731b8c..000000000
--- a/tests/.cached_responses/40a56f7770fc2a796eb01fc984f89a46eaeb3ad0
+++ /dev/null
@@ -1,64 +0,0 @@
-s:1854:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "10",
- "short_name" : "10",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Avenue Gambetta",
- "short_name" : "Avenue Gambetta",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "10 Avenue Gambetta, 75020 Paris, France",
- "geometry" : {
- "location" : {
- "lat" : 48.8631013,
- "lng" : 2.3888086
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8644502802915,
- "lng" : 2.390157580291502
- },
- "southwest" : {
- "lat" : 48.8617523197085,
- "lng" : 2.387459619708498
- }
- }
- },
- "types" : [ "street_address" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/415bd5046e65920c11f0b065db29d919cc956e46 b/tests/.cached_responses/415bd5046e65920c11f0b065db29d919cc956e46
deleted file mode 100644
index 90d334e2d..000000000
--- a/tests/.cached_responses/415bd5046e65920c11f0b065db29d919cc956e46
+++ /dev/null
@@ -1 +0,0 @@
-s:994:"{"results":[{"locations":[{"latLng":{"lng":-2.799034,"lat":54.048407},"adminArea4":"Lancashire","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Lancaster","street":"Lancaster Gate","adminArea1":"GB","adminArea3":"England","type":"s","displayLatLng":{"lng":-2.798949,"lat":54.04888},"linkId":0,"postalCode":"LA1 1LZ","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"ADDRESS","geocodeQualityCode":"L1AAA","mapUrl":"http://open.mapquestapi.com/staticmap/v4/getmap?key=Fmjtd|luu82908n1,85=o5-947550&type=map&size=225,160&pois=purple-1,54.048407,-2.799034,0,0|¢er=54.048407,-2.799034&zoom=15&rand=-205090343","adminArea3Type":"State"}],"providedLocation":{"latLng":{"lng":-2.799034,"lat":54.048407}}}],"options":{"ignoreLatLngInput":false,"maxResults":-1,"thumbMaps":true},"info":{"copyright":{"text":"© 2014 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2014 MapQuest, Inc."},"statuscode":0,"messages":[]}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/432c074000723c94e37a2554ab99af1deaaa74ba b/tests/.cached_responses/432c074000723c94e37a2554ab99af1deaaa74ba
deleted file mode 100644
index e015466ea..000000000
--- a/tests/.cached_responses/432c074000723c94e37a2554ab99af1deaaa74ba
+++ /dev/null
@@ -1 +0,0 @@
-s:4635:"{"spatialReference":{"wkid":4326,"latestWkid":4326},"locations":[{"name":"10 Downing Street, London, SW1A 2","extent":{"xmin":-0.128608,"ymin":51.502234999999999,"xmax":-0.126608,"ymax":51.504235000000001},"feature":{"geometry":{"x":-0.12760742099959543,"y":51.503234853000492},"attributes":{"Loc_name":"GBR.StreetAddress","Score":100,"Match_addr":"10 Downing Street, London, SW1A 2","Addr_type":"StreetAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"10","AddNumFrom":"1","AddNumTo":"12","Side":"R","StPreDir":"","StPreType":"","StName":"Downing Street","StType":"Street","StDir":"","StAddr":"10 Downing Street","Nbrhd":"","City":"London","Subregion":"","Region":"London","Postal":"SW1A 2","PostalExt":"","Country":"GBR","LangCode":"ENG","Distance":0,"X":-0.127608,"Y":51.503234999999997,"DisplayX":-0.127608,"DisplayY":51.503234999999997,"Xmin":-0.128608,"Xmax":-0.126608,"Ymin":51.502234999999999,"Ymax":51.504235000000001}}},{"name":"10 Downing Court, London, WC1N 1","extent":{"xmin":-0.124581,"ymin":51.522365000000001,"xmax":-0.122581,"ymax":51.524365000000003},"feature":{"geometry":{"x":-0.12358029499955592,"y":51.523364551000498},"attributes":{"Loc_name":"GBR.StreetAddress","Score":87.760000000000005,"Match_addr":"10 Downing Court, London, WC1N 1","Addr_type":"StreetAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"10","AddNumFrom":"1","AddNumTo":"16","Side":"R","StPreDir":"","StPreType":"","StName":"Downing Court","StType":"Court","StDir":"","StAddr":"10 Downing Court","Nbrhd":"","City":"London","Subregion":"","Region":"London","Postal":"WC1N 1","PostalExt":"","Country":"GBR","LangCode":"ENG","Distance":0,"X":-0.123581,"Y":51.523364999999998,"DisplayX":-0.123581,"DisplayY":51.523364999999998,"Xmin":-0.124581,"Xmax":-0.122581,"Ymin":51.522365000000001,"Ymax":51.524365000000003}}},{"name":"10 Downings, London, E6 6","extent":{"xmin":0.064957000000000001,"ymin":51.511741999999998,"xmax":0.066957000000000003,"ymax":51.513742000000001},"feature":{"geometry":{"x":0.065956714000435568,"y":51.512742433000483},"attributes":{"Loc_name":"GBR.StreetAddress","Score":86.769999999999996,"Match_addr":"10 Downings, London, E6 6","Addr_type":"StreetAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"10","AddNumFrom":"2","AddNumTo":"22","Side":"R","StPreDir":"","StPreType":"","StName":"Downings","StType":"","StDir":"","StAddr":"10 Downings","Nbrhd":"","City":"London","Subregion":"","Region":"London","Postal":"E6 6","PostalExt":"","Country":"GBR","LangCode":"ENG","Distance":0,"X":0.065957000000000002,"Y":51.512742000000003,"DisplayX":0.065957000000000002,"DisplayY":51.512742000000003,"Xmin":0.064957000000000001,"Xmax":0.066957000000000003,"Ymin":51.511741999999998,"Ymax":51.513742000000001}}},{"name":"Downing Street, London, SW1A 2","extent":{"xmin":-0.129081,"ymin":51.501170000000002,"xmax":-0.125081,"ymax":51.50517},"feature":{"geometry":{"x":-0.12708007299954716,"y":51.503170023000507},"attributes":{"Loc_name":"GBR.StreetName","Score":100,"Match_addr":"Downing Street, London, SW1A 2","Addr_type":"StreetName","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"Downing Street","StType":"Street","StDir":"","StAddr":"Downing Street","Nbrhd":"","City":"London","Subregion":"","Region":"London","Postal":"SW1A 2","PostalExt":"","Country":"GBR","LangCode":"ENG","Distance":0,"X":-0.127081,"Y":51.503169999999997,"DisplayX":-0.127081,"DisplayY":51.503169999999997,"Xmin":-0.129081,"Xmax":-0.125081,"Ymin":51.501170000000002,"Ymax":51.50517}}},{"name":"London","extent":{"xmin":-0.17721100000000001,"ymin":51.456420000000001,"xmax":-0.077211000000000002,"ymax":51.556420000000003},"feature":{"geometry":{"x":-0.12721005099956528,"y":51.506420009000465},"attributes":{"Loc_name":"GBR.AdminPlaces","Score":100,"Match_addr":"London","Addr_type":"Locality","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"1","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"London","City":"London","Subregion":"","Region":"London","Postal":"","PostalExt":"","Country":"GBR","LangCode":"ENG","Distance":0,"X":-0.12721099999999999,"Y":51.506419999999999,"DisplayX":-0.12721099999999999,"DisplayY":51.506419999999999,"Xmin":-0.17721100000000001,"Xmax":-0.077211000000000002,"Ymin":51.456420000000001,"Ymax":51.556420000000003}}}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/44aea91743871378ac841bf130d569bb55d4787e b/tests/.cached_responses/44aea91743871378ac841bf130d569bb55d4787e
deleted file mode 100644
index 2f57c77e7..000000000
--- a/tests/.cached_responses/44aea91743871378ac841bf130d569bb55d4787e
+++ /dev/null
@@ -1 +0,0 @@
-s:862:"{"info":{"statuscode":0,"copyright":{"text":"\u00A9 2016 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"\u00A9 2016 MapQuest, Inc."},"messages":[]},"options":{"maxResults":5,"thumbMaps":false,"ignoreLatLngInput":false},"results":[{"providedLocation":{"location":"10 Downing St, London, UK"},"locations":[{"street":"10 Downing Street","adminArea6":"Covent Garden","adminArea6Type":"Neighborhood","adminArea5":"London","adminArea5Type":"City","adminArea4":"","adminArea4Type":"County","adminArea3":"England","adminArea3Type":"State","adminArea1":"GB","adminArea1Type":"Country","postalCode":"SW1A 2AA","geocodeQualityCode":"P1CAX","geocodeQuality":"POINT","dragPoint":false,"sideOfStreet":"N","linkId":"0","unknownInput":"","type":"s","latLng":{"lat":51.50344,"lng":-0.127708},"displayLatLng":{"lat":51.50344,"lng":-0.127708}}]}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/496860e6bac01182fc2de777d0db4328d23d22a8 b/tests/.cached_responses/496860e6bac01182fc2de777d0db4328d23d22a8
deleted file mode 100644
index b7d95fac7..000000000
--- a/tests/.cached_responses/496860e6bac01182fc2de777d0db4328d23d22a8
+++ /dev/null
@@ -1,3 +0,0 @@
-s:478:"Unable to authenticate the request. Provided 'signature' is not valid for the provided client ID, or the provided 'client' is not valid.
-The signature was checked against the URL: /maps/api/geocode/json?address=Columbia%20University&key=&client=foo&signature=JhNhBpGovffbHQKJQd8eqaKVWvk=
-If this does not match the URL you requested, please ensure that your request is URL encoded correctly. Learn more: https://developers.google.com/maps/documentation/business/webservices/auth";
\ No newline at end of file
diff --git a/tests/.cached_responses/4c735004be97f717c7017340bd13444fe6ea7dde b/tests/.cached_responses/4c735004be97f717c7017340bd13444fe6ea7dde
deleted file mode 100644
index a23ab8fb9..000000000
--- a/tests/.cached_responses/4c735004be97f717c7017340bd13444fe6ea7dde
+++ /dev/null
@@ -1 +0,0 @@
-s:1283:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"foobar, bazbar, bizbar","found":"1","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Франция, Новая Аквитания, Ло и Гаронна, Округ Вийнёв-сюр-Лот, Сен-Этроп-де-Борн, Бизбар","precision":"other","AddressDetails":{"Country":{"AddressLine":"Новая Аквитания, Ло и Гаронна, Округ Вийнёв-сюр-Лот, Сен-Этроп-де-Борн, Бизбар","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Новая Аквитания","SubAdministrativeArea":{"SubAdministrativeAreaName":"Ло и Гаронна","Locality":{"LocalityName":"Сен-Этроп-де-Борн","DependentLocality":{"DependentLocalityName":"Бизбар"}}}}}},"id":"1800404471"}},"description":"Сен-Этроп-де-Борн, Округ Вийнёв-сюр-Лот, Ло и Гаронна, Новая Аквитания, Франция","name":"Бизбар","boundedBy":{"Envelope":{"lowerCorner":"0.641658 44.515125","upperCorner":"0.773458 44.609353"}},"Point":{"pos":"0.707558 44.562258"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/5078ebcff64b06509becdb7d5420a8914ffcca38 b/tests/.cached_responses/5078ebcff64b06509becdb7d5420a8914ffcca38
deleted file mode 100644
index 1669c1ab2..000000000
--- a/tests/.cached_responses/5078ebcff64b06509becdb7d5420a8914ffcca38
+++ /dev/null
@@ -1,3 +0,0 @@
-s:1020:"
-
-Bistrot Beaubourg, 25, Rue Quincampoix, Beaubourg, Quartier Saint-Merri, 4e Arrondissement, Paris, Île-de-France, France métropolitaine, 75004, FranceBistrot Beaubourg25Rue QuincampoixBeaubourgQuartier Saint-Merri4e ArrondissementParisParisÎle-de-FranceFrance75004fr";
\ No newline at end of file
diff --git a/tests/.cached_responses/50a9882a35dae378c9971f03cbdc5adbe70e64e7 b/tests/.cached_responses/50a9882a35dae378c9971f03cbdc5adbe70e64e7
deleted file mode 100644
index 706406be2..000000000
--- a/tests/.cached_responses/50a9882a35dae378c9971f03cbdc5adbe70e64e7
+++ /dev/null
@@ -1,6 +0,0 @@
-s:111:"{
- "error_message" : "The provided API key is invalid.",
- "results" : [],
- "status" : "REQUEST_DENIED"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/5171052f519113bd7888b35eb5881f4547f90be2 b/tests/.cached_responses/5171052f519113bd7888b35eb5881f4547f90be2
deleted file mode 100644
index b10cfd361..000000000
--- a/tests/.cached_responses/5171052f519113bd7888b35eb5881f4547f90be2
+++ /dev/null
@@ -1,55 +0,0 @@
-s:1554:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "CF37",
- "short_name" : "CF37",
- "types" : [ "postal_code_prefix", "postal_code" ]
- },
- {
- "long_name" : "Pontypridd",
- "short_name" : "Pontypridd",
- "types" : [ "postal_town" ]
- },
- {
- "long_name" : "United Kingdom",
- "short_name" : "GB",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Pontypridd CF37, UK",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 51.67344079999999,
- "lng" : -3.2729262
- },
- "southwest" : {
- "lat" : 51.5623438,
- "lng" : -3.4280718
- }
- },
- "location" : {
- "lat" : 51.6252313,
- "lng" : -3.349155300000001
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 51.67344079999999,
- "lng" : -3.2729262
- },
- "southwest" : {
- "lat" : 51.5623438,
- "lng" : -3.4280718
- }
- }
- },
- "place_id" : "ChIJJeD_wSsWbkgRpq5kg77iHSw",
- "types" : [ "postal_code_prefix", "postal_code" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/54c426ed3f2869a1b52d74736ddbed5280b87762 b/tests/.cached_responses/54c426ed3f2869a1b52d74736ddbed5280b87762
deleted file mode 100644
index 5a825471c..000000000
--- a/tests/.cached_responses/54c426ed3f2869a1b52d74736ddbed5280b87762
+++ /dev/null
@@ -1,349 +0,0 @@
-s:10573:"{
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2477,
- "reset" : 1422835200
- },
- "results" : [
- {
- "annotations" : {
- "DMS" : {
- "lat" : "52\u00b0 22' 28.12044'' N",
- "lng" : "9\u00b0 44' 18.79152'' E"
- },
- "MGRS" : "32UND5027702946",
- "Maidenhead" : "JO42ui89pu",
- "Mercator" : {
- "x" : 1084090.783,
- "y" : 6834256.383
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=52.37448&mlon=9.73855#map=17/52.37448/9.73855"
- },
- "callingcode" : 49,
- "geohash" : "u1qcvw7rkwrd4tdd9ej3",
- "sun" : {
- "rise" : {
- "astronomical" : 1422766980,
- "civil" : 1422771780,
- "nautical" : 1422769320
- },
- "set" : {
- "astronomical" : 1422814020,
- "civil" : 1422809220,
- "nautical" : 1422811680
- }
- },
- "timezone" : {
- "name" : "Europe/Berlin",
- "now_in_dst" : 0,
- "offset_sec" : 3600,
- "offset_string" : 100,
- "short_name" : "CET"
- },
- "what3words" : {
- "words" : "arranged.unity.dripped"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 52.4543349,
- "lng" : 9.9186208
- },
- "southwest" : {
- "lat" : 52.3051373,
- "lng" : 9.60443
- }
- },
- "components" : {
- "city" : "Hanover",
- "country" : "Germany",
- "country_code" : "de",
- "county" : "Region Hannover",
- "state" : "Lower Saxony"
- },
- "confidence" : 5,
- "formatted" : "Hanover, Region Hannover, Germany",
- "geometry" : {
- "lat" : 52.3744779,
- "lng" : 9.7385532
- }
- },
- {
- "annotations" : {
- "DMS" : {
- "lat" : "37\u00b0 44' 41.21880'' N",
- "lng" : "77\u00b0 26' 47.09940'' W"
- },
- "MGRS" : "18STG8445280316",
- "Maidenhead" : "FM17gr68kr",
- "Mercator" : {
- "x" : -8621295.649,
- "y" : 4517275.615
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=37.74478&mlon=-77.44642#map=17/37.74478/-77.44642"
- },
- "callingcode" : 1,
- "geohash" : "dq8ytxjpr9w2ccu2qg42",
- "sun" : {
- "rise" : {
- "astronomical" : 1422787320,
- "civil" : 1422791040,
- "nautical" : 1422789180
- },
- "set" : {
- "astronomical" : 1422749100,
- "civil" : 1422831780,
- "nautical" : 1422833640
- }
- },
- "timezone" : {
- "name" : "America/New_York",
- "now_in_dst" : 0,
- "offset_sec" : -18000,
- "offset_string" : -500,
- "short_name" : "EST"
- },
- "what3words" : {
- "words" : "depends.tries.latches"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 38.384783,
- "lng" : -76.8064165
- },
- "southwest" : {
- "lat" : 37.104783,
- "lng" : -78.0864165
- }
- },
- "components" : {
- "country" : "United States of America",
- "country_code" : "us",
- "county" : "Hanover",
- "state" : "Virginia"
- },
- "confidence" : 1,
- "formatted" : "Hanover, Virginia, United States of America",
- "geometry" : {
- "lat" : 37.744783,
- "lng" : -77.4464165
- }
- },
- {
- "annotations" : {
- "DMS" : {
- "lat" : "18\u00b0 23' 2.57604'' N",
- "lng" : "78\u00b0 7' 53.34698'' W"
- },
- "MGRS" : "17QRA0310635070",
- "Maidenhead" : "FK08wj42fe",
- "Mercator" : {
- "x" : -8697557.155,
- "y" : 2069080.962
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=18.38405&mlon=-78.13149#map=17/18.38405/-78.13149"
- },
- "callingcode" : 1,
- "geohash" : "d722w4dqu7n5263h1jy1",
- "sun" : {
- "rise" : {
- "astronomical" : 1422786600,
- "civil" : 1422789720,
- "nautical" : 1422788160
- },
- "set" : {
- "astronomical" : 1422750180,
- "civil" : 1422833460,
- "nautical" : 1422835020
- }
- },
- "timezone" : {
- "name" : "America/Jamaica",
- "now_in_dst" : 0,
- "offset_sec" : -18000,
- "offset_string" : -500,
- "short_name" : "EST"
- },
- "what3words" : {
- "words" : "gloom.endings.haste"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 18.4629985,
- "lng" : -77.9203782
- },
- "southwest" : {
- "lat" : 18.3044313,
- "lng" : -78.3450397
- }
- },
- "components" : {
- "country" : "Jamaica",
- "country_code" : "jm",
- "county" : "Hanover",
- "state_district" : "Cornwall County"
- },
- "confidence" : 3,
- "formatted" : "Hanover, Jamaica",
- "geometry" : {
- "lat" : 18.3840489,
- "lng" : -78.131485271539
- }
- },
- {
- "annotations" : {
- "DMS" : {
- "lat" : "43\u00b0 42' 11.90628'' N",
- "lng" : "72\u00b0 17' 18.83868'' W"
- },
- "MGRS" : "18TYP1847042493",
- "Maidenhead" : "FN33uq58it",
- "Mercator" : {
- "x" : -8047126.391,
- "y" : 5390110.179
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=43.70331&mlon=-72.28857#map=17/43.70331/-72.28857"
- },
- "callingcode" : 1,
- "geohash" : "dru8e5cn4qfnv2p2v8kr",
- "sun" : {
- "rise" : {
- "astronomical" : 1422786300,
- "civil" : 1422790380,
- "nautical" : 1422788340
- },
- "set" : {
- "astronomical" : 1422834060,
- "civil" : 1422829980,
- "nautical" : 1422832020
- }
- },
- "timezone" : {
- "name" : "America/New_York",
- "now_in_dst" : 0,
- "offset_sec" : -18000,
- "offset_string" : -500,
- "short_name" : "EST"
- },
- "what3words" : {
- "words" : "slacks.decides.paying"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 43.7709495,
- "lng" : -72.075688
- },
- "southwest" : {
- "lat" : 43.658591,
- "lng" : -72.3051329
- }
- },
- "components" : {
- "city" : "Hanover",
- "country" : "United States of America",
- "country_code" : "us",
- "county" : "Grafton County",
- "state" : "New Hampshire"
- },
- "confidence" : 5,
- "formatted" : "Hanover, Grafton County, New Hampshire, United States of America",
- "geometry" : {
- "lat" : 43.7033073,
- "lng" : -72.2885663
- }
- },
- {
- "annotations" : {
- "DMS" : {
- "lat" : "39\u00b0 48' 22.76892'' N",
- "lng" : "76\u00b0 59' 3.38460'' W"
- },
- "MGRS" : "18SUK3013908144",
- "Maidenhead" : "FM19mt13vm",
- "Mercator" : {
- "x" : -8569850.125,
- "y" : 4810477.842
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=39.80632&mlon=-76.98427#map=17/39.80632/-76.98427"
- },
- "callingcode" : 1,
- "geohash" : "dr162ntb8kv053u9scnp",
- "sun" : {
- "rise" : {
- "astronomical" : 1422787320,
- "civil" : 1422791160,
- "nautical" : 1422789180
- },
- "set" : {
- "astronomical" : 1422748920,
- "civil" : 1422831480,
- "nautical" : 1422833400
- }
- },
- "timezone" : {
- "name" : "America/New_York",
- "now_in_dst" : 0,
- "offset_sec" : -18000,
- "offset_string" : -500,
- "short_name" : "EST"
- },
- "what3words" : {
- "words" : "smug.dating.opera"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 39.832415,
- "lng" : -76.9634509
- },
- "southwest" : {
- "lat" : 39.791036,
- "lng" : -76.9999439
- }
- },
- "components" : {
- "city" : "Hanover",
- "country" : "United States of America",
- "country_code" : "us",
- "county" : "York County",
- "state" : "Pennsylvania"
- },
- "confidence" : 7,
- "formatted" : "Hanover, York County, Pennsylvania, United States of America",
- "geometry" : {
- "lat" : 39.8063247,
- "lng" : -76.9842735
- }
- }
- ],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Sun, 01 Feb 2015 16:13:41 GMT",
- "created_unix" : 1422807221
- },
- "total_results" : 5,
- "we_are_hiring" : "http://lokku.com/#jobs"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/550269b02d4e7b169acc513d86f0498d2f42d064 b/tests/.cached_responses/550269b02d4e7b169acc513d86f0498d2f42d064
deleted file mode 100644
index e25ba7d02..000000000
--- a/tests/.cached_responses/550269b02d4e7b169acc513d86f0498d2f42d064
+++ /dev/null
@@ -1 +0,0 @@
-s:4530:"{"response":{"Attribution":"","GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"2.388772,48.863216","found":"46","results":"5","boundedBy":{"Envelope":{"lowerCorner":"2.386276 48.860723","upperCorner":"2.391270 48.865713"}},"Point":{"pos":"2.388772 48.863216"},"kind":"street"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Avenue Gambetta","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Avenue Gambetta","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Avenue Gambetta"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Avenue Gambetta","boundedBy":{"Envelope":{"lowerCorner":"2.387497 48.86294","upperCorner":"2.406587 48.877067"}},"Point":{"pos":"2.400370 48.867035"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Place Auguste Métivier","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Place Auguste Métivier","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Place Auguste Métivier"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Place Auguste Métivier","boundedBy":{"Envelope":{"lowerCorner":"2.387974 48.863029","upperCorner":"2.388468 48.863307"}},"Point":{"pos":"2.388207 48.863189"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Rue des Amandiers","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Rue des Amandiers","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Rue des Amandiers"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Rue des Amandiers","boundedBy":{"Envelope":{"lowerCorner":"2.387974 48.863029","upperCorner":"2.389815 48.868309"}},"Point":{"pos":"2.389689 48.865927"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Rue Houdart","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Rue Houdart","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Rue Houdart"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Rue Houdart","boundedBy":{"Envelope":{"lowerCorner":"2.387273 48.863224","upperCorner":"2.388252 48.864599"}},"Point":{"pos":"2.387767 48.863912"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Square Jacaques Grynberg","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Square Jacaques Grynberg","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Square Jacaques Grynberg"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Square Jacaques Grynberg","boundedBy":{"Envelope":{"lowerCorner":"2.388899 48.863704","upperCorner":"2.389959 48.863929"}},"Point":{"pos":"2.389438 48.863758"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/5c3c39f84f7f0fb5ac05db00b6025efeb586fdf6 b/tests/.cached_responses/5c3c39f84f7f0fb5ac05db00b6025efeb586fdf6
deleted file mode 100644
index f906bb560..000000000
--- a/tests/.cached_responses/5c3c39f84f7f0fb5ac05db00b6025efeb586fdf6
+++ /dev/null
@@ -1 +0,0 @@
-s:205:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"179.861719,25.388300","found":"0","results":"5","Point":{"pos":"179.861719 25.388300"}}},"featureMember":[]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/5cd188e0df96f4069ca38190fb38b53681dac5e6 b/tests/.cached_responses/5cd188e0df96f4069ca38190fb38b53681dac5e6
deleted file mode 100644
index b0ae89e5f..000000000
--- a/tests/.cached_responses/5cd188e0df96f4069ca38190fb38b53681dac5e6
+++ /dev/null
@@ -1 +0,0 @@
-s:4502:"{"response":{"Attribution":"","GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Copenhagen, Denmark","found":"13","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Данія, Столичная область, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген"}}}}}}},"description":"Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.45295 55.614999","upperCorner":"12.65075 55.732585"}},"Point":{"pos":"12.567593 55.675676"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Данія, область Южная Дания, Миддельфарт, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"область Южная Дания, Миддельфарт, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"область Южная Дания","SubAdministrativeArea":{"SubAdministrativeAreaName":"Миддельфарт","Locality":{"LocalityName":"Копенгаген"}}}}}}},"description":"Миддельфарт, область Южная Дания, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"9.971219 55.454366","upperCorner":"9.974965 55.457398"}},"Point":{"pos":"9.972854 55.455739"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Данія, Столичная область, Копенгаген, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген","DependentLocality":{"DependentLocalityName":"Копенгаген"}}}}}}}},"description":"Копенгаген, Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.518464 55.703961","upperCorner":"12.551396 55.722553"}},"Point":{"pos":"12.534930 55.713258"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Данія, Столичная область, Копенгаген, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген","DependentLocality":{"DependentLocalityName":"Копенгаген"}}}}}}}},"description":"Копенгаген, Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.561736 55.689578","upperCorner":"12.594668 55.708176"}},"Point":{"pos":"12.578202 55.698878"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Данія, Столичная область, Копенгаген, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген","DependentLocality":{"DependentLocalityName":"Копенгаген"}}}}}}}},"description":"Копенгаген, Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.538361 55.681077","upperCorner":"12.571294 55.69968"}},"Point":{"pos":"12.554827 55.690380"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/626469fcef9b339686ba97899b36e1861c5d8002 b/tests/.cached_responses/626469fcef9b339686ba97899b36e1861c5d8002
deleted file mode 100644
index 527545ee8..000000000
--- a/tests/.cached_responses/626469fcef9b339686ba97899b36e1861c5d8002
+++ /dev/null
@@ -1 +0,0 @@
-s:789:"{"results":[{"locations":[{"latLng":{"lng":2.389089,"lat":48.863193},"adminArea4":"Paris","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Paris","street":"10 Avenue Gambetta","adminArea1":"FR","adminArea3":"Ile-de-France","type":"s","displayLatLng":{"lng":2.389089,"lat":48.863193},"linkId":0,"postalCode":"75020","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"POINT","geocodeQualityCode":"P1CXX","adminArea3Type":"State"}],"providedLocation":{"location":"10 avenue Gambetta, Paris, France"}}],"options":{"ignoreLatLngInput":false,"maxResults":5,"thumbMaps":false},"info":{"copyright":{"text":"© 2014 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2014 MapQuest, Inc."},"statuscode":0,"messages":[]}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/62ca8fb2b0f9a572c6fa1da347c0f24d69cb7bd3 b/tests/.cached_responses/62ca8fb2b0f9a572c6fa1da347c0f24d69cb7bd3
deleted file mode 100644
index 6a3bd9290..000000000
--- a/tests/.cached_responses/62ca8fb2b0f9a572c6fa1da347c0f24d69cb7bd3
+++ /dev/null
@@ -1,65 +0,0 @@
-s:1921:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "10",
- "short_name" : "10",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Avenue Gambetta",
- "short_name" : "Avenue Gambetta",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "Île-de-France",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "10 Avenue Gambetta, 75020 Paris, France",
- "geometry" : {
- "location" : {
- "lat" : 48.8631013,
- "lng" : 2.3888086
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8644502802915,
- "lng" : 2.390157580291502
- },
- "southwest" : {
- "lat" : 48.8617523197085,
- "lng" : 2.387459619708498
- }
- }
- },
- "place_id" : "ChIJ4b303vJt5kcRF9AQdh4ZjWc",
- "types" : [ "street_address" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/62e4933fa0d25492fd44994648cf5408c0e35e1d b/tests/.cached_responses/62e4933fa0d25492fd44994648cf5408c0e35e1d
deleted file mode 100644
index a9a38a7e2..000000000
--- a/tests/.cached_responses/62e4933fa0d25492fd44994648cf5408c0e35e1d
+++ /dev/null
@@ -1,126 +0,0 @@
-s:3915:"{
- "documentation" : "https://geocoder.opencagedata.com/api",
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2491,
- "reset" : 1482710400
- },
- "results" : [
- {
- "annotations" : {
- "DMS" : {
- "lat" : "38\u00b0 54' 1.81422'' N",
- "lng" : "77\u00b0 2' 12.83937'' W"
- },
- "MGRS" : "18SUJ2336607707",
- "Maidenhead" : "FM18lv56nc",
- "Mercator" : {
- "x" : -8575708.461,
- "y" : 4680593.136
- },
- "OSM" : {
- "edit_url" : "https://www.openstreetmap.org/edit?way=55326891#map=17/38.90050/-77.03690",
- "url" : "https://www.openstreetmap.org/?mlat=38.90050&mlon=-77.03690#map=17/38.90050/-77.03690"
- },
- "callingcode" : 1,
- "currency" : {
- "alternate_symbols" : [
- "US$"
- ],
- "decimal_mark" : ".",
- "disambiguate_symbol" : "US$",
- "html_entity" : "$",
- "iso_code" : "USD",
- "iso_numeric" : 840,
- "name" : "United States Dollar",
- "smallest_denomination" : 1,
- "subunit" : "Cent",
- "subunit_to_unit" : 100,
- "symbol" : "$",
- "symbol_first" : 1,
- "thousands_separator" : ","
- },
- "geohash" : "dqcjqcx7y5s0f3uj2swv",
- "qibla" : 56.56,
- "sun" : {
- "rise" : {
- "apparent" : 1482668700,
- "astronomical" : 1482662940,
- "civil" : 1482666900,
- "nautical" : 1482664860
- },
- "set" : {
- "apparent" : 1482702720,
- "astronomical" : 1482708480,
- "civil" : 1482704520,
- "nautical" : 1482706500
- }
- },
- "timezone" : {
- "name" : "America/New_York",
- "now_in_dst" : 0,
- "offset_sec" : -18000,
- "offset_string" : -500,
- "short_name" : "EST"
- },
- "what3words" : {
- "words" : "love.leader.empty"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 38.9006934,
- "lng" : -77.036723
- },
- "southwest" : {
- "lat" : 38.9003173,
- "lng" : -77.0371737
- }
- },
- "components" : {
- "_type" : "hotel",
- "city" : "Washington",
- "country" : "United States of America",
- "country_code" : "us",
- "hotel" : "Hay-Adams Hotel",
- "house_number" : "800",
- "neighbourhood" : "Golden Triangle",
- "postcode" : "20006",
- "road" : "16th Street Northwest",
- "state" : "District of Columbia",
- "suburb" : "Logan Circle"
- },
- "confidence" : 10,
- "formatted" : "Hay-Adams Hotel, 800 16th Street Northwest, Washington, DC 20006, United States of America",
- "geometry" : {
- "lat" : 38.900504,
- "lng" : -77.0368998
- }
- }
- ],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "stay_informed" : {
- "blog" : "http://blog.opencagedata.com",
- "twitter" : "https://twitter.com/opencagedata"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Sun, 25 Dec 2016 01:12:50 GMT",
- "created_unix" : 1482628370
- },
- "total_results" : 1
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/669625b0fc6af9725bd51c74781228e3746265b7 b/tests/.cached_responses/669625b0fc6af9725bd51c74781228e3746265b7
deleted file mode 100644
index 69cb97342..000000000
--- a/tests/.cached_responses/669625b0fc6af9725bd51c74781228e3746265b7
+++ /dev/null
@@ -1,223 +0,0 @@
-s:6548:"{
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2479,
- "reset" : 1422835200
- },
- "results" : [
- {
- "annotations" : {
- "DMS" : {
- "lat" : "48\u00b0 51' 47.49372'' N",
- "lng" : "2\u00b0 23' 20.72184'' E"
- },
- "MGRS" : "31UDQ5519412427",
- "Maidenhead" : "JN18eu67qd",
- "Mercator" : {
- "x" : 265952.215,
- "y" : 6219481.698
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=48.86319&mlon=2.38909#map=17/48.86319/2.38909"
- },
- "callingcode" : 33,
- "geohash" : "u09tyr78tz64jdcgfnhe",
- "sun" : {
- "rise" : {
- "astronomical" : 1422768600,
- "civil" : 1422773100,
- "nautical" : 1422770820
- },
- "set" : {
- "astronomical" : 1422815940,
- "civil" : 1422811440,
- "nautical" : 1422813720
- }
- },
- "timezone" : {
- "name" : "Europe/Paris",
- "now_in_dst" : 0,
- "offset_sec" : 3600,
- "offset_string" : 100,
- "short_name" : "CET"
- },
- "what3words" : {
- "words" : "listed.emphasis.greeting"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 48.8632427,
- "lng" : 2.3891394
- },
- "southwest" : {
- "lat" : 48.8631427,
- "lng" : 2.3890394
- }
- },
- "components" : {
- "city" : "Paris",
- "city_district" : "20th Arrondissement",
- "country" : "France",
- "country_code" : "fr",
- "county" : "Paris",
- "house_number" : "10",
- "neighbourhood" : "M\u00e9nilmontant",
- "postcode" : "75020",
- "road" : "Avenue Gambetta",
- "state" : "Ile-de-France",
- "suburb" : "P\u00e8re-Lachaise"
- },
- "confidence" : 10,
- "formatted" : "10 Avenue Gambetta, 75020 Paris, France",
- "geometry" : {
- "lat" : 48.8631927,
- "lng" : 2.3890894
- }
- },
- {
- "annotations" : {
- "DMS" : {
- "lat" : "48\u00b0 51' 57.03120'' N",
- "lng" : "2\u00b0 24' 11.53440'' E"
- },
- "MGRS" : "31UDQ5623112713",
- "Maidenhead" : "JN18eu87jt",
- "Mercator" : {
- "x" : 267523.446,
- "y" : 6219928.706
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=48.86584&mlon=2.40320#map=17/48.86584/2.40320"
- },
- "geohash" : "u09tyxvbntnvc0byxfwk",
- "sun" : {
- "rise" : {
- "astronomical" : 1422768600,
- "civil" : 1422773100,
- "nautical" : 1422770820
- },
- "set" : {
- "astronomical" : 1422815940,
- "civil" : 1422811440,
- "nautical" : 1422813720
- }
- },
- "timezone" : {
- "name" : "Europe/Paris",
- "now_in_dst" : 0,
- "offset_sec" : 3600,
- "offset_string" : 100,
- "short_name" : "CET"
- },
- "what3words" : {
- "words" : "enormous.eminent.targeted"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 2.417,
- "lng" : 48.874933
- },
- "southwest" : {
- "lat" : 2.389414,
- "lng" : 48.856749
- }
- },
- "components" : {
- "suburb" : "Gambetta"
- },
- "confidence" : 7,
- "formatted" : "Gambetta",
- "geometry" : {
- "lat" : 48.865842,
- "lng" : 2.403204
- }
- },
- {
- "annotations" : {
- "DMS" : {
- "lat" : "48\u00b0 51' 12.27600'' N",
- "lng" : "2\u00b0 20' 55.68000'' E"
- },
- "MGRS" : "31UDQ5223011364",
- "Maidenhead" : "JN18eu14ut",
- "Mercator" : {
- "x" : 261467.22,
- "y" : 6217831.297
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=48.85341&mlon=2.34880#map=17/48.85341/2.34880"
- },
- "geohash" : "u09tvmqrep8np02g7x9y",
- "sun" : {
- "rise" : {
- "astronomical" : 1422768600,
- "civil" : 1422773100,
- "nautical" : 1422770820
- },
- "set" : {
- "astronomical" : 1422815940,
- "civil" : 1422811440,
- "nautical" : 1422813720
- }
- },
- "timezone" : {
- "name" : "Europe/Paris",
- "now_in_dst" : 0,
- "offset_sec" : 3600,
- "offset_string" : 100,
- "short_name" : "CET"
- },
- "what3words" : {
- "words" : "estate.spells.blend"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 48.921822,
- "lng" : 2.485605
- },
- "southwest" : {
- "lat" : 48.796009,
- "lng" : 2.216784
- }
- },
- "components" : {
- "country" : "France",
- "county" : "Paris",
- "local administrative area" : "Paris",
- "state" : "\u00cele-de-France",
- "town" : "Paris"
- },
- "confidence" : 5,
- "formatted" : "Paris, France",
- "geometry" : {
- "lat" : 48.85341,
- "lng" : 2.3488
- }
- }
- ],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Sun, 01 Feb 2015 16:13:38 GMT",
- "created_unix" : 1422807218
- },
- "total_results" : 3,
- "we_are_hiring" : "http://lokku.com/#jobs"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/6a7bf47b3d523a1d34f7c4e8801a0fbde5d819f4 b/tests/.cached_responses/6a7bf47b3d523a1d34f7c4e8801a0fbde5d819f4
deleted file mode 100644
index 7314db108..000000000
--- a/tests/.cached_responses/6a7bf47b3d523a1d34f7c4e8801a0fbde5d819f4
+++ /dev/null
@@ -1 +0,0 @@
-s:960:"{"response":{"Attribution":"","GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"ул.Ленина, 19, Минск 220030, Республика Беларусь","found":"1","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Беларусь, Минск, улица Ленина, 19","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Минск, улица Ленина, 19","CountryNameCode":"BY","CountryName":"Беларусь","AdministrativeArea":{"AdministrativeAreaName":"Минск","Locality":{"LocalityName":"Минск","Thoroughfare":{"ThoroughfareName":"улица Ленина","Premise":{"PremiseNumber":"19"}}}}}}}},"description":"Минск, Беларусь","name":"улица Ленина, 19","boundedBy":{"Envelope":{"lowerCorner":"27.555237 53.893349","upperCorner":"27.571695 53.903069"}},"Point":{"pos":"27.563466 53.898209"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/6c0b6105c2ebc6913831bb0c5480e4ca2d8ea7c5 b/tests/.cached_responses/6c0b6105c2ebc6913831bb0c5480e4ca2d8ea7c5
deleted file mode 100644
index 2f3bbbf66..000000000
--- a/tests/.cached_responses/6c0b6105c2ebc6913831bb0c5480e4ca2d8ea7c5
+++ /dev/null
@@ -1 +0,0 @@
-s:67:"{"spatialReference":{"wkid":4326,"latestWkid":4326},"locations":[]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/6c6fa0f2c6632ec68d3d240ea0c17713093a32f7 b/tests/.cached_responses/6c6fa0f2c6632ec68d3d240ea0c17713093a32f7
deleted file mode 100644
index c20a96038..000000000
--- a/tests/.cached_responses/6c6fa0f2c6632ec68d3d240ea0c17713093a32f7
+++ /dev/null
@@ -1 +0,0 @@
-s:805:"{"results":[{"locations":[{"latLng":{"lng":8.636567,"lat":50.189062},"adminArea4":"","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Frankfurt","street":"Kalbacher Hauptstraße 10","adminArea1":"DE","adminArea3":"Hesse","type":"s","displayLatLng":{"lng":8.636567,"lat":50.189062},"linkId":0,"postalCode":"60437","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"POINT","geocodeQualityCode":"P1XXA","adminArea3Type":"State"}],"providedLocation":{"location":"Kalbacher Hauptstraße 10, 60437 Frankfurt, Germany"}}],"options":{"ignoreLatLngInput":false,"maxResults":5,"thumbMaps":false},"info":{"copyright":{"text":"© 2014 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2014 MapQuest, Inc."},"statuscode":0,"messages":[]}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/6fd2301c042980138c2d4b09fd4f352a38303ecc b/tests/.cached_responses/6fd2301c042980138c2d4b09fd4f352a38303ecc
deleted file mode 100644
index 97de72b02..000000000
--- a/tests/.cached_responses/6fd2301c042980138c2d4b09fd4f352a38303ecc
+++ /dev/null
@@ -1 +0,0 @@
-s:579:"{"authenticationResultCode":"ValidCredentials","brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png","copyright":"Copyright © 2016 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.","resourceSets":[{"estimatedTotal":0,"resources":[]}],"statusCode":200,"statusDescription":"OK","traceId":"088a0c35e82a4abaafa65e714a38d21b|DB40051719|7.7.0.0|DB4SCH010061262, DB4SCH010080619"}";
\ No newline at end of file
diff --git a/tests/.cached_responses/72a69855f28b41522dde9af4db6245333617ca27 b/tests/.cached_responses/72a69855f28b41522dde9af4db6245333617ca27
deleted file mode 100644
index 59dddda15..000000000
--- a/tests/.cached_responses/72a69855f28b41522dde9af4db6245333617ca27
+++ /dev/null
@@ -1 +0,0 @@
-s:1271:"{"authenticationResultCode":"ValidCredentials","brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png","copyright":"Copyright © 2015 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.","resourceSets":[{"estimatedTotal":1,"resources":[{"__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1","bbox":[48.859353282429325,2.3809437367578012,48.867078717570678,2.3966002632421985],"name":"10 Avenue Gambetta, 75020 Paris","point":{"type":"Point","coordinates":[48.863216,2.388772]},"address":{"addressLine":"10 Avenue Gambetta","adminDistrict":"IdF","adminDistrict2":"Paris","countryRegion":"France","formattedAddress":"10 Avenue Gambetta, 75020 Paris","locality":"Paris","postalCode":"75020"},"confidence":"Medium","entityType":"Address","geocodePoints":[{"type":"Point","coordinates":[48.863216,2.388772],"calculationMethod":"Interpolation","usageTypes":["Display","Route"]}],"matchCodes":["Good"]}]}],"statusCode":200,"statusDescription":"OK","traceId":"7bba06735b15417d864ae93a02705ab8|DB40180163|02.00.119.2100|DB4SCH010031557, DB4SCH010061359"}";
\ No newline at end of file
diff --git a/tests/.cached_responses/78e94cec78f29dc9bd208562ec13472eb3ae7457 b/tests/.cached_responses/78e94cec78f29dc9bd208562ec13472eb3ae7457
deleted file mode 100644
index 876b4e238..000000000
--- a/tests/.cached_responses/78e94cec78f29dc9bd208562ec13472eb3ae7457
+++ /dev/null
@@ -1 +0,0 @@
-s:147:"{"error":{"code":400,"message":"Cannot perform query. Invalid query parameters.","details":["Unable to find address for the specified location."]}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/809625d61a2d50f7b18b0824a0a1a84267de2b25 b/tests/.cached_responses/809625d61a2d50f7b18b0824a0a1a84267de2b25
deleted file mode 100644
index b2970dd40..000000000
--- a/tests/.cached_responses/809625d61a2d50f7b18b0824a0a1a84267de2b25
+++ /dev/null
@@ -1 +0,0 @@
-s:837:"{"info":{"statuscode":0,"copyright":{"text":"\u00A9 2017 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"\u00A9 2017 MapQuest, Inc."},"messages":[]},"options":{"maxResults":5,"thumbMaps":false,"ignoreLatLngInput":false},"results":[{"providedLocation":{"location":"367 Rue St-Paul E, Montr\u00E9al, Qu\u00E9bec"},"locations":[{"street":"","adminArea6":"","adminArea6Type":"Neighborhood","adminArea5":"","adminArea5Type":"City","adminArea4":"","adminArea4Type":"County","adminArea3":"","adminArea3Type":"State","adminArea1":"US","adminArea1Type":"Country","postalCode":"","geocodeQualityCode":"A1XXX","geocodeQuality":"COUNTRY","dragPoint":false,"sideOfStreet":"N","linkId":"0","unknownInput":"","type":"s","latLng":{"lat":39.78373,"lng":-100.445882},"displayLatLng":{"lat":39.78373,"lng":-100.445882}}]}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/867454f52ff07ab403df7cb308d961e25e54dea3 b/tests/.cached_responses/867454f52ff07ab403df7cb308d961e25e54dea3
deleted file mode 100644
index 402faa7e0..000000000
--- a/tests/.cached_responses/867454f52ff07ab403df7cb308d961e25e54dea3
+++ /dev/null
@@ -1 +0,0 @@
-s:1131:"{"response":{"Attribution":"","GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"10 avenue Gambetta, Paris, France","found":"1","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Франция, Иль-Де-Франс, Париж, XX округ, Avenue Gambetta, 10","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж, XX округ, Avenue Gambetta, 10","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж","DependentLocality":{"DependentLocalityName":"XX округ","Thoroughfare":{"ThoroughfareName":"Avenue Gambetta","Premise":{"PremiseNumber":"10"}}}}}}}}}},"description":"XX округ, Париж, Иль-Де-Франс, Франция","name":"Avenue Gambetta, 10","boundedBy":{"Envelope":{"lowerCorner":"2.380841 48.857747","upperCorner":"2.397298 48.868605"}},"Point":{"pos":"2.389069 48.863177"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/87d9131d36cefc486b1726e833c6e852ab44c929 b/tests/.cached_responses/87d9131d36cefc486b1726e833c6e852ab44c929
deleted file mode 100644
index 6120272fe..000000000
--- a/tests/.cached_responses/87d9131d36cefc486b1726e833c6e852ab44c929
+++ /dev/null
@@ -1 +0,0 @@
-s:1305:"{"authenticationResultCode":"ValidCredentials","brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png","copyright":"Copyright © 2015 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.","resourceSets":[{"estimatedTotal":1,"resources":[{"__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1","bbox":[48.8593536825758,2.3809437474984421,48.867079117717154,2.3966002741080024],"name":"10 Avenue Gambetta, 75020 Paris","point":{"type":"Point","coordinates":[48.863216400146477,2.3887720108032222]},"address":{"addressLine":"10 Avenue Gambetta","adminDistrict":"IdF","adminDistrict2":"Paris","countryRegion":"France","formattedAddress":"10 Avenue Gambetta, 75020 Paris","locality":"Paris","postalCode":"75020"},"confidence":"High","entityType":"Address","geocodePoints":[{"type":"Point","coordinates":[48.863216400146477,2.3887720108032222],"calculationMethod":"Interpolation","usageTypes":["Display","Route"]}],"matchCodes":["Good"]}]}],"statusCode":200,"statusDescription":"OK","traceId":"35653642b563464a8587835a9c7be49d|DB40190459|02.00.119.2100|DB4SCH010031557, DB4SCH010070355"}";
\ No newline at end of file
diff --git a/tests/.cached_responses/8818e01b5730caaa37d6e7c04cd6f020e93bb8cd b/tests/.cached_responses/8818e01b5730caaa37d6e7c04cd6f020e93bb8cd
deleted file mode 100644
index f81d4bfb1..000000000
--- a/tests/.cached_responses/8818e01b5730caaa37d6e7c04cd6f020e93bb8cd
+++ /dev/null
@@ -1 +0,0 @@
-s:3256:"{"response":{"Attribution":"","GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"29.198184,40.900640","found":"8","results":"5","boundedBy":{"Envelope":{"lowerCorner":"28.948183 40.650166","upperCorner":"29.448185 41.150162"}},"Point":{"pos":"29.198184 40.900640"},"kind":"locality"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, İstanbul, Adalar","precision":"other","AddressDetails":{"Country":{"AddressLine":"İstanbul, Adalar","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"İstanbul","SubAdministrativeArea":{"SubAdministrativeAreaName":"Adalar","Locality":{"LocalityName":"Adalar"}}}}}}},"description":"İstanbul, Türkiye","name":"Adalar","boundedBy":{"Envelope":{"lowerCorner":"29.10723 40.853544","upperCorner":"29.139021 40.876111"}},"Point":{"pos":"29.129562 40.874652"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, İstanbul, Sultanbeyli","precision":"other","AddressDetails":{"Country":{"AddressLine":"İstanbul, Sultanbeyli","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"İstanbul","SubAdministrativeArea":{"SubAdministrativeAreaName":"Sultanbeyli","Locality":{"LocalityName":"Sultanbeyli"}}}}}}},"description":"İstanbul, Türkiye","name":"Sultanbeyli","boundedBy":{"Envelope":{"lowerCorner":"29.244699 40.931768","upperCorner":"29.31192 41.00489"}},"Point":{"pos":"29.262001 40.968417"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, Kocaeli, Çayırova","precision":"other","AddressDetails":{"Country":{"AddressLine":"Kocaeli, Çayırova","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"Kocaeli","SubAdministrativeArea":{"SubAdministrativeAreaName":"Çayırova","Locality":{"LocalityName":"Çayırova"}}}}}}},"description":"Kocaeli, Türkiye","name":"Çayırova","boundedBy":{"Envelope":{"lowerCorner":"29.350808 40.807747","upperCorner":"29.422673 40.849022"}},"Point":{"pos":"29.372233 40.824215"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, Kocaeli, Darıca","precision":"other","AddressDetails":{"Country":{"AddressLine":"Kocaeli, Darıca","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"Kocaeli","SubAdministrativeArea":{"SubAdministrativeAreaName":"Darıca","Locality":{"LocalityName":"Darıca"}}}}}}},"description":"Kocaeli, Türkiye","name":"Darıca","boundedBy":{"Envelope":{"lowerCorner":"29.333462 40.753098","upperCorner":"29.425512 40.809364"}},"Point":{"pos":"29.384333 40.762176"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, İstanbul","precision":"other","AddressDetails":{"Country":{"AddressLine":"İstanbul","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"İstanbul","Locality":{"LocalityName":"İstanbul"}}}}}},"description":"Türkiye","name":"İstanbul","boundedBy":{"Envelope":{"lowerCorner":"28.595549 40.811398","upperCorner":"29.4288 41.199235"}},"Point":{"pos":"28.967111 41.008925"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/8d579eb3ca22f821281bd4f15c3eb1c3fd73fb11 b/tests/.cached_responses/8d579eb3ca22f821281bd4f15c3eb1c3fd73fb11
deleted file mode 100644
index a3101fa07..000000000
--- a/tests/.cached_responses/8d579eb3ca22f821281bd4f15c3eb1c3fd73fb11
+++ /dev/null
@@ -1,100 +0,0 @@
-s:2884:"{
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2496,
- "reset" : 1439856000
- },
- "results" : [
- {
- "annotations" : {
- "DMS" : {
- "lat" : "49\u00b0 8' 20.73264'' N",
- "lng" : "1\u00b0 39' 26.08632'' E"
- },
- "MGRS" : "31UDQ0206243786",
- "Maidenhead" : "JN09td83uj",
- "Mercator" : {
- "x" : 184483.803,
- "y" : 6266161.941
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=49.13909&mlon=1.65725#map=17/49.13909/1.65725"
- },
- "callingcode" : 33,
- "geohash" : "u09pt9qzbwsrft58uhm6",
- "sun" : {
- "rise" : {
- "astronomical" : 1439779140,
- "civil" : 1439784780,
- "nautical" : 1439782200
- },
- "set" : {
- "astronomical" : 1439845980,
- "civil" : 1439840400,
- "nautical" : 1439843040
- }
- },
- "timezone" : {
- "name" : "Europe/Paris",
- "now_in_dst" : 1,
- "offset_sec" : 7200,
- "offset_string" : 200,
- "short_name" : "CEST"
- },
- "what3words" : {
- "words" : "cocotier.maniable.arabesque"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 49.1391424,
- "lng" : 1.6572962
- },
- "southwest" : {
- "lat" : 49.1390424,
- "lng" : 1.6571962
- }
- },
- "components" : {
- "country" : "France",
- "country_code" : "fr",
- "county" : "Pontoise",
- "hotel" : "Les Jardins d'\u00c9picure",
- "postcode" : "95710",
- "road" : "Grande Rue",
- "state" : "\u00cele-de-France",
- "village" : "Bray-et-L\u00fb"
- },
- "confidence" : 10,
- "formatted" : "Les Jardins d'\u00c9picure, Grande Rue, 95710 Bray-et-L\u00fb, France",
- "geometry" : {
- "lat" : 49.1390924,
- "lng" : 1.6572462
- }
- }
- ],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "stay_informed" : {
- "blog" : "http://blog.opencagedata.com",
- "twitter" : "https://twitter.com/opencagedata"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Mon, 17 Aug 2015 14:29:15 GMT",
- "created_unix" : 1439821755
- },
- "total_results" : 1
-}";
\ No newline at end of file
diff --git a/tests/.cached_responses/92956923ac1e5bd136b3eba3c2d04064790a8897 b/tests/.cached_responses/92956923ac1e5bd136b3eba3c2d04064790a8897
deleted file mode 100644
index c3c0112ae..000000000
--- a/tests/.cached_responses/92956923ac1e5bd136b3eba3c2d04064790a8897
+++ /dev/null
@@ -1 +0,0 @@
-s:350:"{"address":{"Address":"3 Avenue Gambetta","Neighborhood":null,"City":"Paris","Subregion":null,"Region":null,"Postal":"75020","PostalExt":null,"CountryCode":"FRA","Match_addr":"3 Avenue Gambetta, 75020, Paris","Loc_name":"FRA.PointAddress"},"location":{"x":2.3890231620189906,"y":48.863307030162396,"spatialReference":{"wkid":4326,"latestWkid":4326}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/953161efe1c35df7b7e29f72b300acb94ceb6edb b/tests/.cached_responses/953161efe1c35df7b7e29f72b300acb94ceb6edb
deleted file mode 100644
index 315f09b4d..000000000
--- a/tests/.cached_responses/953161efe1c35df7b7e29f72b300acb94ceb6edb
+++ /dev/null
@@ -1 +0,0 @@
-s:1021:"{"info":{"statuscode":0,"copyright":{"text":"\u00A9 2016 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"\u00A9 2016 MapQuest, Inc."},"messages":[]},"options":{"maxResults":1,"thumbMaps":true,"ignoreLatLngInput":false},"results":[{"providedLocation":{"latLng":{"lat":25.3883,"lng":179.861719}},"locations":[{"street":"","adminArea6":"","adminArea6Type":"Neighborhood","adminArea5":"","adminArea5Type":"City","adminArea4":"","adminArea4Type":"County","adminArea3":"","adminArea3Type":"State","adminArea1":"XZ","adminArea1Type":"Country","postalCode":"","geocodeQualityCode":"A1XAX","geocodeQuality":"COUNTRY","dragPoint":false,"sideOfStreet":"N","linkId":"0","unknownInput":"","type":"s","latLng":{"lat":25.3883,"lng":179.861719},"displayLatLng":{"lat":25.3883,"lng":179.861719},"mapUrl":"http://open.mapquestapi.com/staticmap/v4/getmap?key=io5RY14NTLzVuX48xoga7ICStRa8bOpR&type=map&size=225,160&pois=purple-1,25.3883,179.861719,0,0,|¢er=25.3883,179.861719&zoom=2&rand=-277749992"}]}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/96ae7399b6a2153e8d2c7d11829830f2711efb9f b/tests/.cached_responses/96ae7399b6a2153e8d2c7d11829830f2711efb9f
deleted file mode 100644
index 8cecbc443..000000000
--- a/tests/.cached_responses/96ae7399b6a2153e8d2c7d11829830f2711efb9f
+++ /dev/null
@@ -1 +0,0 @@
-s:2444:"{"results":[{"locations":[{"latLng":{"lng":9.738553,"lat":52.374478},"adminArea4":"Region Hannover","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Hanover","street":"","adminArea1":"DE","adminArea3":"Lower Saxony","type":"s","displayLatLng":{"lng":9.738553,"lat":52.374478},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"CITY","geocodeQualityCode":"A5XBX","adminArea3Type":"State"},{"latLng":{"lng":-78.131485,"lat":18.384049},"adminArea4":"Hanover","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"","street":"","adminArea1":"JM","adminArea3":"","type":"s","displayLatLng":{"lng":-78.131485,"lat":18.384049},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"COUNTY","geocodeQualityCode":"A4XBX","adminArea3Type":"State"},{"latLng":{"lng":-72.288566,"lat":43.703307},"adminArea4":"Grafton County","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Hanover","street":"","adminArea1":"US","adminArea3":"NH","type":"s","displayLatLng":{"lng":-72.288566,"lat":43.703307},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"CITY","geocodeQualityCode":"A5XBX","adminArea3Type":"State"},{"latLng":{"lng":-76.984274,"lat":39.806325},"adminArea4":"York County","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Hanover","street":"","adminArea1":"US","adminArea3":"PA","type":"s","displayLatLng":{"lng":-76.984274,"lat":39.806325},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"CITY","geocodeQualityCode":"A5XBX","adminArea3Type":"State"},{"latLng":{"lng":-75.440663,"lat":40.651401},"adminArea4":"Lehigh County","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Hanover","street":"","adminArea1":"US","adminArea3":"PA","type":"s","displayLatLng":{"lng":-75.440663,"lat":40.651401},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"CITY","geocodeQualityCode":"A5XBX","adminArea3Type":"State"}],"providedLocation":{"location":"Hanover"}}],"options":{"ignoreLatLngInput":false,"maxResults":5,"thumbMaps":false},"info":{"copyright":{"text":"© 2014 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2014 MapQuest, Inc."},"statuscode":0,"messages":[]}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/997bf83a1e8720db46bcd6d6014582d4adeddda0 b/tests/.cached_responses/997bf83a1e8720db46bcd6d6014582d4adeddda0
deleted file mode 100644
index 61de0f907..000000000
--- a/tests/.cached_responses/997bf83a1e8720db46bcd6d6014582d4adeddda0
+++ /dev/null
@@ -1 +0,0 @@
-s:92:"US,TX,Plano,75093,33.034698,-96.813400,623,972,"Layered Technologies","Layered Technologies"";
\ No newline at end of file
diff --git a/tests/.cached_responses/a55a3475aa378796acc11c82fa9d4ecfd620430b b/tests/.cached_responses/a55a3475aa378796acc11c82fa9d4ecfd620430b
deleted file mode 100644
index 4ebd4b460..000000000
--- a/tests/.cached_responses/a55a3475aa378796acc11c82fa9d4ecfd620430b
+++ /dev/null
@@ -1 +0,0 @@
-s:4618:"{"spatialReference":{"wkid":4326,"latestWkid":4326},"locations":[{"name":"Paris, Île-de-France, France","extent":{"xmin":2.2897989999999999,"ymin":48.794407999999997,"xmax":2.4077989999999998,"ymax":48.912407999999999},"feature":{"geometry":{"x":2.3487985110004388,"y":48.853408154000476},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI1","Score":100,"Match_addr":"Paris, Île-de-France, France","Addr_type":"POI","Type":"National Capital","PlaceName":"Paris","Place_addr":"","Phone":"","URL":"","Rank":"1.75","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"","City":"","Subregion":"Paris","Region":"Île-de-France","Postal":"","PostalExt":"","Country":"FRA","LangCode":"","Distance":0,"X":2.3487990000000001,"Y":48.853408000000002,"DisplayX":2.3487990000000001,"DisplayY":48.853408000000002,"Xmin":2.2897989999999999,"Xmax":2.4077989999999998,"Ymin":48.794407999999997,"Ymax":48.912407999999999}}},{"name":"Paris, Texas, United States","extent":{"xmin":-95.644508000000002,"ymin":33.571938000000003,"xmax":-95.466508000000005,"ymax":33.749938},"feature":{"geometry":{"x":-95.555507168999668,"y":33.660938302000488},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI1","Score":100,"Match_addr":"Paris, Texas, United States","Addr_type":"POI","Type":"City","PlaceName":"Paris","Place_addr":"","Phone":"","URL":"","Rank":"8.94","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"","City":"","Subregion":"Lamar","Region":"Texas","Postal":"","PostalExt":"","Country":"USA","LangCode":"","Distance":0,"X":-95.555508000000003,"Y":33.660938000000002,"DisplayX":-95.555508000000003,"DisplayY":33.660938000000002,"Xmin":-95.644508000000002,"Xmax":-95.466508000000005,"Ymin":33.571938000000003,"Ymax":33.749938}}},{"name":"Parys, Free State, South Africa","extent":{"xmin":27.377268000000001,"ymin":-26.983297,"xmax":27.537268000000001,"ymax":-26.823297},"feature":{"geometry":{"x":27.457267939000474,"y":-26.903295856999591},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI1","Score":100,"Match_addr":"Parys, Free State, South Africa","Addr_type":"POI","Type":"City","PlaceName":"Paris","Place_addr":"","Phone":"","URL":"","Rank":"9.86","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"","City":"","Subregion":"Fezile Dabi District Municipality","Region":"Free State","Postal":"","PostalExt":"","Country":"ZAF","LangCode":"","Distance":0,"X":27.457267999999999,"Y":-26.903296999999998,"DisplayX":27.457267999999999,"DisplayY":-26.903296999999998,"Xmin":27.377268000000001,"Xmax":27.537268000000001,"Ymin":-26.983297,"Ymax":-26.823297}}},{"name":"Paris, Ontario, Canada","extent":{"xmin":-80.403327000000004,"ymin":43.179997,"xmax":-80.363326999999998,"ymax":43.219996999999999},"feature":{"geometry":{"x":-80.383326015999671,"y":43.199997326000471},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI1","Score":100,"Match_addr":"Paris, Ontario, Canada","Addr_type":"POI","Type":"City","PlaceName":"Paris","Place_addr":"","Phone":"","URL":"","Rank":"11.46","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"","City":"","Subregion":"","Region":"Ontario","Postal":"","PostalExt":"","Country":"CAN","LangCode":"","Distance":0,"X":-80.383326999999994,"Y":43.199997000000003,"DisplayX":-80.383326999999994,"DisplayY":43.199997000000003,"Xmin":-80.403327000000004,"Xmax":-80.363326999999998,"Ymin":43.179997,"Ymax":43.219996999999999}}},{"name":"Paris, Tennessee, United States","extent":{"xmin":-88.367711,"ymin":36.260997000000003,"xmax":-88.285711000000006,"ymax":36.342996999999997},"feature":{"geometry":{"x":-88.326709636999681,"y":36.301996940000492},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI1","Score":100,"Match_addr":"Paris, Tennessee, United States","Addr_type":"POI","Type":"City","PlaceName":"Paris","Place_addr":"","Phone":"","URL":"","Rank":"11.52","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"","City":"","Subregion":"Henry","Region":"Tennessee","Postal":"","PostalExt":"","Country":"USA","LangCode":"","Distance":0,"X":-88.326711000000003,"Y":36.301997,"DisplayX":-88.326711000000003,"DisplayY":36.301997,"Xmin":-88.367711,"Xmax":-88.285711000000006,"Ymin":36.260997000000003,"Ymax":36.342996999999997}}}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/a6f5a65e97797392de77ec60d1e9ad9d457144a4 b/tests/.cached_responses/a6f5a65e97797392de77ec60d1e9ad9d457144a4
deleted file mode 100644
index 398db4515..000000000
--- a/tests/.cached_responses/a6f5a65e97797392de77ec60d1e9ad9d457144a4
+++ /dev/null
@@ -1 +0,0 @@
-s:187:"US,"United States",UT,Utah,Provo,40.2181,-111.6133,770,801,America/Denver,NA,84606,"Unified Layer","Unified Layer",bluehost.com,"AS46606 Unified Layer",Corporate,residential,999,83,5,5,5,";
\ No newline at end of file
diff --git a/tests/.cached_responses/a7b501000bf5f094bdeef76a600c33e57a12d238 b/tests/.cached_responses/a7b501000bf5f094bdeef76a600c33e57a12d238
deleted file mode 100644
index 2f3bbbf66..000000000
--- a/tests/.cached_responses/a7b501000bf5f094bdeef76a600c33e57a12d238
+++ /dev/null
@@ -1 +0,0 @@
-s:67:"{"spatialReference":{"wkid":4326,"latestWkid":4326},"locations":[]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/aafd96b49c2dfb6251cfed2cc9e68f202e15ecf6 b/tests/.cached_responses/aafd96b49c2dfb6251cfed2cc9e68f202e15ecf6
deleted file mode 100644
index 4cff34ae7..000000000
--- a/tests/.cached_responses/aafd96b49c2dfb6251cfed2cc9e68f202e15ecf6
+++ /dev/null
@@ -1 +0,0 @@
-s:202:"US,"United States",TX,Texas,Plano,33.0347,-96.8134,623,972,America/Chicago,NA,75093,"Layered Technologies","Layered Technologies",,"AS22576 Layered Technologies, Inc.",Corporate,hosting,937,99,20,60,10,";
\ No newline at end of file
diff --git a/tests/.cached_responses/aff6db357af7468ba2958e32b3a72ab6720c9003 b/tests/.cached_responses/aff6db357af7468ba2958e32b3a72ab6720c9003
deleted file mode 100644
index c89c63853..000000000
--- a/tests/.cached_responses/aff6db357af7468ba2958e32b3a72ab6720c9003
+++ /dev/null
@@ -1,71 +0,0 @@
-s:2210:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "United States Embassy",
- "short_name" : "United States Embassy",
- "types" : [ "establishment", "point_of_interest" ]
- },
- {
- "long_name" : "2",
- "short_name" : "2",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Avenue Gabriel",
- "short_name" : "Avenue Gabriel",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "Île-de-France",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "75008",
- "short_name" : "75008",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "United States Embassy, 2 Avenue Gabriel, 75008 Paris, France",
- "geometry" : {
- "location" : {
- "lat" : 48.8676523,
- "lng" : 2.3199844
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8690012802915,
- "lng" : 2.321333380291502
- },
- "southwest" : {
- "lat" : 48.8663033197085,
- "lng" : 2.318635419708498
- }
- }
- },
- "partial_match" : true,
- "place_id" : "ChIJuWGFkM1v5kcR6W2hga86WU8",
- "types" : [ "embassy", "establishment", "point_of_interest" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/0e2695ed1038780f6fabf1a684587791e8be37f1 b/tests/.cached_responses/api.geoips.com_0e2695ed1038780f6fabf1a684587791e8be37f1
similarity index 100%
rename from tests/.cached_responses/0e2695ed1038780f6fabf1a684587791e8be37f1
rename to tests/.cached_responses/api.geoips.com_0e2695ed1038780f6fabf1a684587791e8be37f1
diff --git a/tests/.cached_responses/20a3f77b97b0b9cf0ea726c16618200a0b9d0225 b/tests/.cached_responses/api.geoips.com_20a3f77b97b0b9cf0ea726c16618200a0b9d0225
similarity index 100%
rename from tests/.cached_responses/20a3f77b97b0b9cf0ea726c16618200a0b9d0225
rename to tests/.cached_responses/api.geoips.com_20a3f77b97b0b9cf0ea726c16618200a0b9d0225
diff --git a/tests/.cached_responses/c6c75fa95131a790aba968d9267859bdd19e0c78 b/tests/.cached_responses/api.geoips.com_c6c75fa95131a790aba968d9267859bdd19e0c78
similarity index 100%
rename from tests/.cached_responses/c6c75fa95131a790aba968d9267859bdd19e0c78
rename to tests/.cached_responses/api.geoips.com_c6c75fa95131a790aba968d9267859bdd19e0c78
diff --git a/tests/.cached_responses/1c6d409ea3f33b963904640da05e4fa03acdaaee b/tests/.cached_responses/api.geonames.org_1c6d409ea3f33b963904640da05e4fa03acdaaee
similarity index 100%
rename from tests/.cached_responses/1c6d409ea3f33b963904640da05e4fa03acdaaee
rename to tests/.cached_responses/api.geonames.org_1c6d409ea3f33b963904640da05e4fa03acdaaee
diff --git a/tests/.cached_responses/4d379baf1d6bff9d4918f098c495a5d79ddabed6 b/tests/.cached_responses/api.geonames.org_4d379baf1d6bff9d4918f098c495a5d79ddabed6
similarity index 100%
rename from tests/.cached_responses/4d379baf1d6bff9d4918f098c495a5d79ddabed6
rename to tests/.cached_responses/api.geonames.org_4d379baf1d6bff9d4918f098c495a5d79ddabed6
diff --git a/tests/.cached_responses/79bff4e0349cf851754db4dd986e18242ca84428 b/tests/.cached_responses/api.geonames.org_79bff4e0349cf851754db4dd986e18242ca84428
similarity index 100%
rename from tests/.cached_responses/79bff4e0349cf851754db4dd986e18242ca84428
rename to tests/.cached_responses/api.geonames.org_79bff4e0349cf851754db4dd986e18242ca84428
diff --git a/tests/.cached_responses/965146c2ba972feb059e57b7319d519cc749d771 b/tests/.cached_responses/api.geonames.org_965146c2ba972feb059e57b7319d519cc749d771
similarity index 100%
rename from tests/.cached_responses/965146c2ba972feb059e57b7319d519cc749d771
rename to tests/.cached_responses/api.geonames.org_965146c2ba972feb059e57b7319d519cc749d771
diff --git a/tests/.cached_responses/44e7890e9b0d0400bcc062dcf777052025c91d60 b/tests/.cached_responses/api.hostip.info_44e7890e9b0d0400bcc062dcf777052025c91d60
similarity index 100%
rename from tests/.cached_responses/44e7890e9b0d0400bcc062dcf777052025c91d60
rename to tests/.cached_responses/api.hostip.info_44e7890e9b0d0400bcc062dcf777052025c91d60
diff --git a/tests/.cached_responses/d5b477a1473f52d2d992ee9be6b193f2ef655a5b b/tests/.cached_responses/api.hostip.info_d5b477a1473f52d2d992ee9be6b193f2ef655a5b
similarity index 100%
rename from tests/.cached_responses/d5b477a1473f52d2d992ee9be6b193f2ef655a5b
rename to tests/.cached_responses/api.hostip.info_d5b477a1473f52d2d992ee9be6b193f2ef655a5b
diff --git a/tests/.cached_responses/0ec0309330d12ae1719942dbb38dfd0ad3c5d731 b/tests/.cached_responses/api.opencagedata.com_0ec0309330d12ae1719942dbb38dfd0ad3c5d731
similarity index 100%
rename from tests/.cached_responses/0ec0309330d12ae1719942dbb38dfd0ad3c5d731
rename to tests/.cached_responses/api.opencagedata.com_0ec0309330d12ae1719942dbb38dfd0ad3c5d731
diff --git a/tests/.cached_responses/28734ecae5229fb0a03b8abbc85bbdb6beca0a34 b/tests/.cached_responses/api.opencagedata.com_28734ecae5229fb0a03b8abbc85bbdb6beca0a34
similarity index 100%
rename from tests/.cached_responses/28734ecae5229fb0a03b8abbc85bbdb6beca0a34
rename to tests/.cached_responses/api.opencagedata.com_28734ecae5229fb0a03b8abbc85bbdb6beca0a34
diff --git a/tests/.cached_responses/68e1c800084e1e48a6aa78075d636f7b44a577c7 b/tests/.cached_responses/api.opencagedata.com_68e1c800084e1e48a6aa78075d636f7b44a577c7
similarity index 100%
rename from tests/.cached_responses/68e1c800084e1e48a6aa78075d636f7b44a577c7
rename to tests/.cached_responses/api.opencagedata.com_68e1c800084e1e48a6aa78075d636f7b44a577c7
diff --git a/tests/.cached_responses/6a434939d9f721cd83137e9c456b1962c5dbeeb1 b/tests/.cached_responses/api.opencagedata.com_6a434939d9f721cd83137e9c456b1962c5dbeeb1
similarity index 100%
rename from tests/.cached_responses/6a434939d9f721cd83137e9c456b1962c5dbeeb1
rename to tests/.cached_responses/api.opencagedata.com_6a434939d9f721cd83137e9c456b1962c5dbeeb1
diff --git a/tests/.cached_responses/7bf63a8ca9ef4eb79905bde09cfe53b3f2f034ca b/tests/.cached_responses/api.opencagedata.com_7bf63a8ca9ef4eb79905bde09cfe53b3f2f034ca
similarity index 100%
rename from tests/.cached_responses/7bf63a8ca9ef4eb79905bde09cfe53b3f2f034ca
rename to tests/.cached_responses/api.opencagedata.com_7bf63a8ca9ef4eb79905bde09cfe53b3f2f034ca
diff --git a/tests/.cached_responses/8170b8ff787b2e4bb8176e955ebbc2641529665a b/tests/.cached_responses/api.opencagedata.com_8170b8ff787b2e4bb8176e955ebbc2641529665a
similarity index 100%
rename from tests/.cached_responses/8170b8ff787b2e4bb8176e955ebbc2641529665a
rename to tests/.cached_responses/api.opencagedata.com_8170b8ff787b2e4bb8176e955ebbc2641529665a
diff --git a/tests/.cached_responses/9dc55c1d48a1ba287a485a7a7e1351a39e6c266d b/tests/.cached_responses/api.opencagedata.com_9dc55c1d48a1ba287a485a7a7e1351a39e6c266d
similarity index 100%
rename from tests/.cached_responses/9dc55c1d48a1ba287a485a7a7e1351a39e6c266d
rename to tests/.cached_responses/api.opencagedata.com_9dc55c1d48a1ba287a485a7a7e1351a39e6c266d
diff --git a/tests/.cached_responses/adef4e872257cb73774056a6462601a02cdbcb5a b/tests/.cached_responses/api.opencagedata.com_adef4e872257cb73774056a6462601a02cdbcb5a
similarity index 100%
rename from tests/.cached_responses/adef4e872257cb73774056a6462601a02cdbcb5a
rename to tests/.cached_responses/api.opencagedata.com_adef4e872257cb73774056a6462601a02cdbcb5a
diff --git a/tests/.cached_responses/b155924593d4b1fa536d52f9f8caf580cb49d367 b/tests/.cached_responses/api.opencagedata.com_b155924593d4b1fa536d52f9f8caf580cb49d367
similarity index 100%
rename from tests/.cached_responses/b155924593d4b1fa536d52f9f8caf580cb49d367
rename to tests/.cached_responses/api.opencagedata.com_b155924593d4b1fa536d52f9f8caf580cb49d367
diff --git a/tests/.cached_responses/b915e19f3d1c1e591e17396943377d4a6a614683 b/tests/.cached_responses/api.opencagedata.com_b915e19f3d1c1e591e17396943377d4a6a614683
similarity index 100%
rename from tests/.cached_responses/b915e19f3d1c1e591e17396943377d4a6a614683
rename to tests/.cached_responses/api.opencagedata.com_b915e19f3d1c1e591e17396943377d4a6a614683
diff --git a/tests/.cached_responses/c744bc260ab5a66da33ab9c7a02a9d1ae20ce0c8 b/tests/.cached_responses/api.opencagedata.com_c744bc260ab5a66da33ab9c7a02a9d1ae20ce0c8
similarity index 100%
rename from tests/.cached_responses/c744bc260ab5a66da33ab9c7a02a9d1ae20ce0c8
rename to tests/.cached_responses/api.opencagedata.com_c744bc260ab5a66da33ab9c7a02a9d1ae20ce0c8
diff --git a/tests/.cached_responses/f4201a79c29273010a6b815cd29aae2495336004 b/tests/.cached_responses/api.opencagedata.com_f4201a79c29273010a6b815cd29aae2495336004
similarity index 100%
rename from tests/.cached_responses/f4201a79c29273010a6b815cd29aae2495336004
rename to tests/.cached_responses/api.opencagedata.com_f4201a79c29273010a6b815cd29aae2495336004
diff --git a/tests/.cached_responses/fde11bc68dbad0c7399bc711bbb7bf2e39bacc04 b/tests/.cached_responses/api.opencagedata.com_fde11bc68dbad0c7399bc711bbb7bf2e39bacc04
similarity index 100%
rename from tests/.cached_responses/fde11bc68dbad0c7399bc711bbb7bf2e39bacc04
rename to tests/.cached_responses/api.opencagedata.com_fde11bc68dbad0c7399bc711bbb7bf2e39bacc04
diff --git a/tests/.cached_responses/3e262b0d16f709138ab5c27e5ae7009df27e692b b/tests/.cached_responses/api.tomtom.com_3e262b0d16f709138ab5c27e5ae7009df27e692b
similarity index 100%
rename from tests/.cached_responses/3e262b0d16f709138ab5c27e5ae7009df27e692b
rename to tests/.cached_responses/api.tomtom.com_3e262b0d16f709138ab5c27e5ae7009df27e692b
diff --git a/tests/.cached_responses/4b209c50e1a1572c76e2700fc70399d4f173a621 b/tests/.cached_responses/api.tomtom.com_4b209c50e1a1572c76e2700fc70399d4f173a621
similarity index 100%
rename from tests/.cached_responses/4b209c50e1a1572c76e2700fc70399d4f173a621
rename to tests/.cached_responses/api.tomtom.com_4b209c50e1a1572c76e2700fc70399d4f173a621
diff --git a/tests/.cached_responses/5508e82fab1b2602a2125179fcb1a5d175bab9dc b/tests/.cached_responses/api.tomtom.com_5508e82fab1b2602a2125179fcb1a5d175bab9dc
similarity index 100%
rename from tests/.cached_responses/5508e82fab1b2602a2125179fcb1a5d175bab9dc
rename to tests/.cached_responses/api.tomtom.com_5508e82fab1b2602a2125179fcb1a5d175bab9dc
diff --git a/tests/.cached_responses/563c0ee41772350b9055aaef1ef92330f1e6d698 b/tests/.cached_responses/api.tomtom.com_563c0ee41772350b9055aaef1ef92330f1e6d698
similarity index 100%
rename from tests/.cached_responses/563c0ee41772350b9055aaef1ef92330f1e6d698
rename to tests/.cached_responses/api.tomtom.com_563c0ee41772350b9055aaef1ef92330f1e6d698
diff --git a/tests/.cached_responses/6e0f46692b3ef7e83b4e947928c3e5b4fb5e4248 b/tests/.cached_responses/api.tomtom.com_6e0f46692b3ef7e83b4e947928c3e5b4fb5e4248
similarity index 100%
rename from tests/.cached_responses/6e0f46692b3ef7e83b4e947928c3e5b4fb5e4248
rename to tests/.cached_responses/api.tomtom.com_6e0f46692b3ef7e83b4e947928c3e5b4fb5e4248
diff --git a/tests/.cached_responses/c1d00538a725d3dbb2aaaa3add8e5cc789a1aa02 b/tests/.cached_responses/api.tomtom.com_c1d00538a725d3dbb2aaaa3add8e5cc789a1aa02
similarity index 100%
rename from tests/.cached_responses/c1d00538a725d3dbb2aaaa3add8e5cc789a1aa02
rename to tests/.cached_responses/api.tomtom.com_c1d00538a725d3dbb2aaaa3add8e5cc789a1aa02
diff --git a/tests/.cached_responses/b4b2d13284994cec6e72bdf72a17ae8ee713888a b/tests/.cached_responses/b4b2d13284994cec6e72bdf72a17ae8ee713888a
deleted file mode 100644
index 211112d01..000000000
--- a/tests/.cached_responses/b4b2d13284994cec6e72bdf72a17ae8ee713888a
+++ /dev/null
@@ -1 +0,0 @@
-s:3873:"{"authenticationResultCode":"ValidCredentials","brandLogoUri":"http:\/\/dev.virtualearth.net\/Branding\/logo_powered_by.png","copyright":"Copyright © 2015 Microsoft and its suppliers. All rights reserved. This API cannot be accessed and the content and any results may not be used, reproduced or transmitted in any manner without express written permission from Microsoft Corporation.","resourceSets":[{"estimatedTotal":5,"resources":[{"__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1","bbox":[44.775325775146484,8.2711343765258789,44.795879364013672,8.2963142395019531],"name":"Castelnuovo Calcea, Piem., Italie","point":{"type":"Point","coordinates":[44.786701202392578,8.28419017791748]},"address":{"adminDistrict":"Piem.","adminDistrict2":"AT","countryRegion":"Italie","formattedAddress":"Castelnuovo Calcea, Piem., Italie","locality":"Castelnuovo Calcea"},"confidence":"High","entityType":"PopulatedPlace","geocodePoints":[{"type":"Point","coordinates":[44.786701202392578,8.28419017791748],"calculationMethod":"Rooftop","usageTypes":["Display"]}],"matchCodes":["Good"]},{"__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1","bbox":[46.02923583984375,11.473880767822266,46.073772430419922,11.519126892089844],"name":"Castelnuovo, Tr.A.A., Italie","point":{"type":"Point","coordinates":[46.051799774169922,11.497699737548828]},"address":{"adminDistrict":"Tr.A.A.","adminDistrict2":"TN","countryRegion":"Italie","formattedAddress":"Castelnuovo, Tr.A.A., Italie","locality":"Castelnuovo"},"confidence":"High","entityType":"PopulatedPlace","geocodePoints":[{"type":"Point","coordinates":[46.051799774169922,11.497699737548828],"calculationMethod":"Rooftop","usageTypes":["Display"]}],"matchCodes":["Good"]},{"__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1","bbox":[44.958910323794555,9.387852082690733,45.016851089779664,9.4970279832272357],"name":"Castelnuovo, Em.Rom., Italie","point":{"type":"Point","coordinates":[44.987880706787109,9.4424400329589844]},"address":{"adminDistrict":"Em.Rom.","adminDistrict2":"PC","countryRegion":"Italie","formattedAddress":"Castelnuovo, Em.Rom., Italie","locality":"Castelnuovo"},"confidence":"High","entityType":"Neighborhood","geocodePoints":[{"type":"Point","coordinates":[44.987880706787109,9.4424400329589844],"calculationMethod":"Rooftop","usageTypes":["Display"]}],"matchCodes":["Good"]},{"__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1","bbox":[43.797411300357055,11.014744487392822,43.855352066342164,11.121775898349366],"name":"Castelnuovo, Tosc., Italie","point":{"type":"Point","coordinates":[43.826381683349609,11.068260192871094]},"address":{"adminDistrict":"Tosc.","adminDistrict2":"PO","countryRegion":"Italie","formattedAddress":"Castelnuovo, Tosc., Italie","locality":"Castelnuovo"},"confidence":"High","entityType":"Neighborhood","geocodePoints":[{"type":"Point","coordinates":[43.826381683349609,11.068260192871094],"calculationMethod":"Rooftop","usageTypes":["Display"]}],"matchCodes":["Good"]},{"__type":"Location:http:\/\/schemas.microsoft.com\/search\/local\/ws\/rest\/v1","bbox":[42.266840316470336,13.574242599134211,42.324781082455445,13.678637497301336],"name":"Castelnuovo, Abr., Italie","point":{"type":"Point","coordinates":[42.295810699462891,13.626440048217773]},"address":{"adminDistrict":"Abr.","adminDistrict2":"AQ","countryRegion":"Italie","formattedAddress":"Castelnuovo, Abr., Italie","locality":"Castelnuovo"},"confidence":"High","entityType":"Neighborhood","geocodePoints":[{"type":"Point","coordinates":[42.295810699462891,13.626440048217773],"calculationMethod":"Rooftop","usageTypes":["Display"]}],"matchCodes":["Good"]}]}],"statusCode":200,"statusDescription":"OK","traceId":"b598695d63f34fdb8b711264d5e2bac9|DB40051734|02.00.119.2100|DB4SCH010060660, DB4SCH010070357"}";
\ No newline at end of file
diff --git a/tests/.cached_responses/b5d692ab2cba63003d06933655016a406d04dbcf b/tests/.cached_responses/b5d692ab2cba63003d06933655016a406d04dbcf
deleted file mode 100644
index 43d5e454d..000000000
--- a/tests/.cached_responses/b5d692ab2cba63003d06933655016a406d04dbcf
+++ /dev/null
@@ -1 +0,0 @@
-s:4125:"{"response":{"Attribution":"","GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"1600 Pennsylvania Ave, Washington","found":"33","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"United States, District of Columbia, Washington, Pennsylvania Ave NW, 1600","precision":"exact","AddressDetails":{"Country":{"AddressLine":"District of Columbia, Washington, Pennsylvania Ave NW, 1600","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"District of Columbia","SubAdministrativeArea":{"SubAdministrativeAreaName":"District of Columbia","Locality":{"LocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave NW","Premise":{"PremiseNumber":"1600"}}}}}}}}},"description":"Washington, District of Columbia, United States","name":"Pennsylvania Ave NW, 1600","boundedBy":{"Envelope":{"lowerCorner":"-77.046921 38.891265","upperCorner":"-77.030464 38.904125"}},"Point":{"pos":"-77.038692 38.897695"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, District of Columbia, Washington, Pennsylvania Ave SE","precision":"street","AddressDetails":{"Country":{"AddressLine":"District of Columbia, Washington, Pennsylvania Ave SE","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"District of Columbia","SubAdministrativeArea":{"SubAdministrativeAreaName":"District of Columbia","Locality":{"LocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave SE"}}}}}}}},"description":"Washington, District of Columbia, United States","name":"Pennsylvania Ave SE","boundedBy":{"Envelope":{"lowerCorner":"-77.003532 38.863739","upperCorner":"-76.946777 38.887825"}},"Point":{"pos":"-76.975235 38.875565"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, Maryland, Washington, Pennsylvania Ave","precision":"street","AddressDetails":{"Country":{"AddressLine":"Maryland, Washington, Pennsylvania Ave","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"Maryland","SubAdministrativeArea":{"SubAdministrativeAreaName":"Washington","Locality":{"Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave"}}}}}}}},"description":"Washington, Maryland, United States","name":"Pennsylvania Ave","boundedBy":{"Envelope":{"lowerCorner":"-77.724152 39.649717","upperCorner":"-77.717513 39.721407"}},"Point":{"pos":"-77.720774 39.685568"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, Pennsylvania, Washington, Pennsylvania Ave","precision":"street","AddressDetails":{"Country":{"AddressLine":"Pennsylvania, Washington, Pennsylvania Ave","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"Pennsylvania","Locality":{"DependentLocality":{"DependentLocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave"}}}}}}}},"description":"Washington, Pennsylvania, United States","name":"Pennsylvania Ave","boundedBy":{"Envelope":{"lowerCorner":"-79.890044 40.118144","upperCorner":"-79.867263 40.131418"}},"Point":{"pos":"-79.878914 40.124233"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, District of Columbia, Washington, Pennsylvania Avenue Rear SE","precision":"street","AddressDetails":{"Country":{"AddressLine":"District of Columbia, Washington, Pennsylvania Avenue Rear SE","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"District of Columbia","SubAdministrativeArea":{"SubAdministrativeAreaName":"District of Columbia","Locality":{"LocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Avenue Rear SE"}}}}}}}},"description":"Washington, District of Columbia, United States","name":"Pennsylvania Avenue Rear SE","boundedBy":{"Envelope":{"lowerCorner":"-76.98341 38.879315","upperCorner":"-76.981649 38.881175"}},"Point":{"pos":"-76.982790 38.879891"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/ba69ac95396013dc9abd1342b1132a4027939ede b/tests/.cached_responses/ba69ac95396013dc9abd1342b1132a4027939ede
deleted file mode 100644
index 908e19809..000000000
--- a/tests/.cached_responses/ba69ac95396013dc9abd1342b1132a4027939ede
+++ /dev/null
@@ -1,151 +0,0 @@
-s:4438:"{
- "licenses" : [
- {
- "name" : "CC-BY-SA",
- "url" : "http://creativecommons.org/licenses/by-sa/3.0/"
- },
- {
- "name" : "ODbL",
- "url" : "http://opendatacommons.org/licenses/odbl/summary/"
- }
- ],
- "rate" : {
- "limit" : 2500,
- "remaining" : 2476,
- "reset" : 1422835200
- },
- "results" : [
- {
- "annotations" : {
- "DMS" : {
- "lat" : "50\u00b0 11' 20.62320'' N",
- "lng" : "8\u00b0 38' 11.64123'' E"
- },
- "MGRS" : "32UMA7405659715",
- "Maidenhead" : "JO40he65jj",
- "Mercator" : {
- "x" : 961418.242,
- "y" : 6446240.668
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=50.18906&mlon=8.63657#map=17/50.18906/8.63657"
- },
- "callingcode" : 49,
- "geohash" : "u0yjs88uqx70ec4w60ur",
- "sun" : {
- "rise" : {
- "astronomical" : 1422767160,
- "civil" : 1422771780,
- "nautical" : 1422769440
- },
- "set" : {
- "astronomical" : 1422814380,
- "civil" : 1422809760,
- "nautical" : 1422812100
- }
- },
- "timezone" : {
- "name" : "Europe/Berlin",
- "now_in_dst" : 0,
- "offset_sec" : 3600,
- "offset_string" : 100,
- "short_name" : "CET"
- },
- "what3words" : {
- "words" : "whips.plank.daylight"
- }
- },
- "bounds" : {
- "northeast" : {
- "lat" : 50.1891212,
- "lng" : 8.6366633
- },
- "southwest" : {
- "lat" : 50.1890027,
- "lng" : 8.6364707
- }
- },
- "components" : {
- "city" : "Frankfurt",
- "city_district" : "Kalbach",
- "country" : "Germany",
- "country_code" : "de",
- "county" : "Frankfurt",
- "house_number" : "10",
- "postcode" : "60437",
- "road" : "Kalbacher Hauptstra\u00dfe",
- "state" : "Hesse",
- "state_district" : "Regierungsbezirk Darmstadt",
- "suburb" : "Kalbach"
- },
- "confidence" : 10,
- "formatted" : "Kalbacher Hauptstra\u00dfe 10, 60437 Frankfurt, Germany",
- "geometry" : {
- "lat" : 50.189062,
- "lng" : 8.63656700808489
- }
- },
- {
- "annotations" : {
- "DMS" : {
- "lat" : "50\u00b0 11' 16.08000'' N",
- "lng" : "8\u00b0 39' 47.52000'' E"
- },
- "MGRS" : "32UMA7595659565",
- "Maidenhead" : "JO40he95ob",
- "Mercator" : {
- "x" : 964383.013,
- "y" : 6446021.855
- },
- "OSM" : {
- "url" : "http://www.openstreetmap.org/?mlat=50.18780&mlon=8.66320#map=17/50.18780/8.66320"
- },
- "geohash" : "u0yjt0km5hn07v28j4fu",
- "sun" : {
- "rise" : {
- "astronomical" : 1422767160,
- "civil" : 1422771780,
- "nautical" : 1422769440
- },
- "set" : {
- "astronomical" : 1422814380,
- "civil" : 1422809760,
- "nautical" : 1422812100
- }
- },
- "timezone" : {
- "name" : "Europe/Berlin",
- "now_in_dst" : 0,
- "offset_sec" : 3600,
- "offset_string" : 100,
- "short_name" : "CET"
- },
- "what3words" : {
- "words" : "solder.lawn.smug"
- }
- },
- "components" : {
- "country" : "Germany",
- "postcode" : "60437"
- },
- "confidence" : 0,
- "formatted" : "60437, Germany",
- "geometry" : {
- "lat" : 50.1878,
- "lng" : 8.6632
- }
- }
- ],
- "status" : {
- "code" : 200,
- "message" : "OK"
- },
- "thanks" : "For using an OpenCage Data API",
- "timestamp" : {
- "created_http" : "Sun, 01 Feb 2015 16:13:42 GMT",
- "created_unix" : 1422807222
- },
- "total_results" : 2,
- "we_are_hiring" : "http://lokku.com/#jobs"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/bedce7311a3681bb27fc2d15b667c6b0ec12540d b/tests/.cached_responses/bedce7311a3681bb27fc2d15b667c6b0ec12540d
deleted file mode 100644
index c588fc1c8..000000000
--- a/tests/.cached_responses/bedce7311a3681bb27fc2d15b667c6b0ec12540d
+++ /dev/null
@@ -1 +0,0 @@
-s:203:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"31.134277,29.979216","found":"0","results":"5","Point":{"pos":"31.134277 29.979216"}}},"featureMember":[]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/c181c3f0f0d308dcf59024b03a203f30bb24a7df b/tests/.cached_responses/c181c3f0f0d308dcf59024b03a203f30bb24a7df
deleted file mode 100644
index 360848b2c..000000000
--- a/tests/.cached_responses/c181c3f0f0d308dcf59024b03a203f30bb24a7df
+++ /dev/null
@@ -1 +0,0 @@
-s:3842:"{"response":{"Attribution":"","GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"2.388772,48.863216","found":"7","results":"5","Point":{"pos":"2.388772 48.863216"}}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"Франция, Иль-Де-Франс, Париж, XX округ, Avenue Gambetta","precision":"street","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж, XX округ, Avenue Gambetta","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж","DependentLocality":{"DependentLocalityName":"XX округ","Thoroughfare":{"ThoroughfareName":"Avenue Gambetta"}}}}}}}}},"description":"XX округ, Париж, Иль-Де-Франс, Франция","name":"Avenue Gambetta","boundedBy":{"Envelope":{"lowerCorner":"2.387497 48.86294","upperCorner":"2.406587 48.877067"}},"Point":{"pos":"2.388773 48.863212"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Франция, Иль-Де-Франс, Париж, XX округ","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж, XX округ","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж","DependentLocality":{"DependentLocalityName":"XX округ"}}}}}}}},"description":"Париж, Иль-Де-Франс, Франция","name":"XX округ","boundedBy":{"Envelope":{"lowerCorner":"2.377939 48.846697","upperCorner":"2.416217 48.878252"}},"Point":{"pos":"2.399355 48.864848"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Франция, Иль-Де-Франс, Париж","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж"}}}}}}},"description":"Иль-Де-Франс, Франция","name":"Париж","boundedBy":{"Envelope":{"lowerCorner":"2.251232 48.815727","upperCorner":"2.416235 48.902474"}},"Point":{"pos":"2.341198 48.856929"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"area","text":"Франция, Иль-Де-Франс, Париж","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Париж","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж"}}}}}},"description":"Иль-Де-Франс, Франция","name":"Париж","boundedBy":{"Envelope":{"lowerCorner":"2.223824 48.815727","upperCorner":"2.469792 48.902474"}},"Point":{"pos":"2.341198 48.856929"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"area","text":"Франция, Иль-Де-Франс, Париж","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж"}}}}}},"description":"Иль-Де-Франс, Франция","name":"Париж","boundedBy":{"Envelope":{"lowerCorner":"2.223824 48.815727","upperCorner":"2.469792 48.902474"}},"Point":{"pos":"2.341198 48.856929"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/c31642f684868383c11c2dbdcde16af8cc4b7e3a b/tests/.cached_responses/c31642f684868383c11c2dbdcde16af8cc4b7e3a
deleted file mode 100644
index 79d46aaca..000000000
--- a/tests/.cached_responses/c31642f684868383c11c2dbdcde16af8cc4b7e3a
+++ /dev/null
@@ -1 +0,0 @@
-s:165:"Unable to authenticate the request. The 'signature' parameter is not required. Learn more: https://developers.google.com/maps/documentation/business/webservices/auth";
\ No newline at end of file
diff --git a/tests/.cached_responses/c7b4c0eac1b73b7eb7be01c558f330415f7ea0d6 b/tests/.cached_responses/c7b4c0eac1b73b7eb7be01c558f330415f7ea0d6
deleted file mode 100644
index a33132c90..000000000
--- a/tests/.cached_responses/c7b4c0eac1b73b7eb7be01c558f330415f7ea0d6
+++ /dev/null
@@ -1,65 +0,0 @@
-s:1907:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "10",
- "short_name" : "10",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Avenue Gambetta",
- "short_name" : "Avenue Gambetta",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "10 Avenue Gambetta, 75020 Paris, France",
- "geometry" : {
- "location" : {
- "lat" : 48.8631013,
- "lng" : 2.3888086
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8644502802915,
- "lng" : 2.390157580291502
- },
- "southwest" : {
- "lat" : 48.8617523197085,
- "lng" : 2.387459619708498
- }
- }
- },
- "place_id" : "ChIJ4b303vJt5kcRF9AQdh4ZjWc",
- "types" : [ "street_address" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/cec6934eb0dd48c6df916f7bb4e3b529dbdcd987 b/tests/.cached_responses/cec6934eb0dd48c6df916f7bb4e3b529dbdcd987
deleted file mode 100644
index 2f3bbbf66..000000000
--- a/tests/.cached_responses/cec6934eb0dd48c6df916f7bb4e3b529dbdcd987
+++ /dev/null
@@ -1 +0,0 @@
-s:67:"{"spatialReference":{"wkid":4326,"latestWkid":4326},"locations":[]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/d1c35cb39da7fe59b8d2472945443bd0879b8701 b/tests/.cached_responses/d1c35cb39da7fe59b8d2472945443bd0879b8701
deleted file mode 100644
index a33132c90..000000000
--- a/tests/.cached_responses/d1c35cb39da7fe59b8d2472945443bd0879b8701
+++ /dev/null
@@ -1,65 +0,0 @@
-s:1907:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "10",
- "short_name" : "10",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Avenue Gambetta",
- "short_name" : "Avenue Gambetta",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "75",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "IDF",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "10 Avenue Gambetta, 75020 Paris, France",
- "geometry" : {
- "location" : {
- "lat" : 48.8631013,
- "lng" : 2.3888086
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8644502802915,
- "lng" : 2.390157580291502
- },
- "southwest" : {
- "lat" : 48.8617523197085,
- "lng" : 2.387459619708498
- }
- }
- },
- "place_id" : "ChIJ4b303vJt5kcRF9AQdh4ZjWc",
- "types" : [ "street_address" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/d6014872b7aca9ebc46ab7806a7ca88fcd1fb213 b/tests/.cached_responses/d6014872b7aca9ebc46ab7806a7ca88fcd1fb213
deleted file mode 100644
index c558fc793..000000000
--- a/tests/.cached_responses/d6014872b7aca9ebc46ab7806a7ca88fcd1fb213
+++ /dev/null
@@ -1,5 +0,0 @@
-s:52:"{
- "results" : [],
- "status" : "ZERO_RESULTS"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/dc4860194c7a238376facd63e73c9d85bca8fc4a b/tests/.cached_responses/dc4860194c7a238376facd63e73c9d85bca8fc4a
deleted file mode 100644
index f2661dc68..000000000
--- a/tests/.cached_responses/dc4860194c7a238376facd63e73c9d85bca8fc4a
+++ /dev/null
@@ -1 +0,0 @@
-s:4933:"{"spatialReference":{"wkid":4326,"latestWkid":4326},"locations":[{"name":"367 Rue St-Paul E, Montréal, Québec, H2Y","extent":{"xmin":-73.552623999999994,"ymin":45.508505999999997,"xmax":-73.550623999999999,"ymax":45.510505999999999},"feature":{"geometry":{"x":-73.551622519999626,"y":45.509506023000483},"attributes":{"Loc_name":"CAN.PointAddress","Score":100,"Match_addr":"367 Rue St-Paul E, Montréal, Québec, H2Y","Addr_type":"PointAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"367","AddNumFrom":"","AddNumTo":"","Side":"L","StPreDir":"","StPreType":"Rue","StName":"St-Paul","StType":"","StDir":"E","StAddr":"367 Rue St-Paul E","Nbrhd":"","City":"Montréal","Subregion":"","Region":"Québec","Postal":"H2Y","PostalExt":"","Country":"CAN","LangCode":"FRE","Distance":0,"X":-73.551624000000004,"Y":45.509506000000002,"DisplayX":-73.551750999999996,"DisplayY":45.509529999999998,"Xmin":-73.552623999999994,"Xmax":-73.550623999999999,"Ymin":45.508505999999997,"Ymax":45.510505999999999}}},{"name":"367 Rue St-Paul E, Montréal, Québec, H2Y","extent":{"xmin":-73.552622,"ymin":45.508507000000002,"xmax":-73.550622000000004,"ymax":45.510506999999997},"feature":{"geometry":{"x":-73.55162106199964,"y":45.509506867000482},"attributes":{"Loc_name":"CAN.StreetAddress","Score":100,"Match_addr":"367 Rue St-Paul E, Montréal, Québec, H2Y","Addr_type":"StreetAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"367","AddNumFrom":"365","AddNumTo":"395","Side":"L","StPreDir":"","StPreType":"Rue","StName":"St-Paul","StType":"","StDir":"E","StAddr":"367 Rue St-Paul E","Nbrhd":"","City":"Montréal","Subregion":"","Region":"Québec","Postal":"H2Y","PostalExt":"","Country":"CAN","LangCode":"FRE","Distance":0,"X":-73.551621999999995,"Y":45.509506999999999,"DisplayX":-73.551621999999995,"DisplayY":45.509506999999999,"Xmin":-73.552622,"Xmax":-73.550622000000004,"Ymin":45.508507000000002,"Ymax":45.510506999999997}}},{"name":"367 Rue St-Paul O, Montréal, Québec, H2Y","extent":{"xmin":-73.557507000000001,"ymin":45.499980999999998,"xmax":-73.555507000000006,"ymax":45.501981000000001},"feature":{"geometry":{"x":-73.556505675999631,"y":45.500981156000478},"attributes":{"Loc_name":"CAN.PointAddress","Score":90.969999999999999,"Match_addr":"367 Rue St-Paul O, Montréal, Québec, H2Y","Addr_type":"PointAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"367","AddNumFrom":"","AddNumTo":"","Side":"L","StPreDir":"","StPreType":"Rue","StName":"St-Paul","StType":"","StDir":"O","StAddr":"367 Rue St-Paul O","Nbrhd":"","City":"Montréal","Subregion":"","Region":"Québec","Postal":"H2Y","PostalExt":"","Country":"CAN","LangCode":"FRE","Distance":0,"X":-73.556506999999996,"Y":45.500981000000003,"DisplayX":-73.556640999999999,"DisplayY":45.50103,"Xmin":-73.557507000000001,"Xmax":-73.555507000000006,"Ymin":45.499980999999998,"Ymax":45.501981000000001}}},{"name":"367 Rue St-Paul O, Montréal, Québec, H2Y","extent":{"xmin":-73.557485,"ymin":45.500014999999998,"xmax":-73.555485000000004,"ymax":45.502015},"feature":{"geometry":{"x":-73.556483514999627,"y":45.501014806000455},"attributes":{"Loc_name":"CAN.StreetAddress","Score":90.969999999999999,"Match_addr":"367 Rue St-Paul O, Montréal, Québec, H2Y","Addr_type":"StreetAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"367","AddNumFrom":"389","AddNumTo":"351","Side":"L","StPreDir":"","StPreType":"Rue","StName":"St-Paul","StType":"","StDir":"O","StAddr":"367 Rue St-Paul O","Nbrhd":"","City":"Montréal","Subregion":"","Region":"Québec","Postal":"H2Y","PostalExt":"","Country":"CAN","LangCode":"FRE","Distance":0,"X":-73.556484999999995,"Y":45.501015000000002,"DisplayX":-73.556484999999995,"DisplayY":45.501015000000002,"Xmin":-73.557485,"Xmax":-73.555485000000004,"Ymin":45.500014999999998,"Ymax":45.502015}}},{"name":"368 Rue St-Paul E, Montréal, Québec, H2Y","extent":{"xmin":-73.552828000000005,"ymin":45.507882000000002,"xmax":-73.550827999999996,"ymax":45.509881999999998},"feature":{"geometry":{"x":-73.551826745999676,"y":45.508881895000457},"attributes":{"Loc_name":"CAN.StreetAddress","Score":79,"Match_addr":"368 Rue St-Paul E, Montréal, Québec, H2Y","Addr_type":"StreetAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"368","AddNumFrom":"300","AddNumTo":"370","Side":"R","StPreDir":"","StPreType":"Rue","StName":"St-Paul","StType":"","StDir":"E","StAddr":"368 Rue St-Paul E","Nbrhd":"","City":"Montréal","Subregion":"","Region":"Québec","Postal":"H2Y","PostalExt":"","Country":"CAN","LangCode":"FRE","Distance":0,"X":-73.551828,"Y":45.508882,"DisplayX":-73.551828,"DisplayY":45.508882,"Xmin":-73.552828000000005,"Xmax":-73.550827999999996,"Ymin":45.507882000000002,"Ymax":45.509881999999998}}}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/2e6a031ba478499af66377691fddb5c23d3c47dc b/tests/.cached_responses/dev.virtualearth.net_2e6a031ba478499af66377691fddb5c23d3c47dc
similarity index 100%
rename from tests/.cached_responses/2e6a031ba478499af66377691fddb5c23d3c47dc
rename to tests/.cached_responses/dev.virtualearth.net_2e6a031ba478499af66377691fddb5c23d3c47dc
diff --git a/tests/.cached_responses/303fd29dabd64a5bdbbe55521028fd29928895b7 b/tests/.cached_responses/dev.virtualearth.net_303fd29dabd64a5bdbbe55521028fd29928895b7
similarity index 100%
rename from tests/.cached_responses/303fd29dabd64a5bdbbe55521028fd29928895b7
rename to tests/.cached_responses/dev.virtualearth.net_303fd29dabd64a5bdbbe55521028fd29928895b7
diff --git a/tests/.cached_responses/44aa09f2f7f9e93e852a970c51d2d345c7465378 b/tests/.cached_responses/dev.virtualearth.net_44aa09f2f7f9e93e852a970c51d2d345c7465378
similarity index 100%
rename from tests/.cached_responses/44aa09f2f7f9e93e852a970c51d2d345c7465378
rename to tests/.cached_responses/dev.virtualearth.net_44aa09f2f7f9e93e852a970c51d2d345c7465378
diff --git a/tests/.cached_responses/7410d3635d0f82161d5149df75f73b3b893081da b/tests/.cached_responses/dev.virtualearth.net_7410d3635d0f82161d5149df75f73b3b893081da
similarity index 100%
rename from tests/.cached_responses/7410d3635d0f82161d5149df75f73b3b893081da
rename to tests/.cached_responses/dev.virtualearth.net_7410d3635d0f82161d5149df75f73b3b893081da
diff --git a/tests/.cached_responses/895900a9d0c5a7cd1be0ce4915659e55d1fa30cf b/tests/.cached_responses/dev.virtualearth.net_895900a9d0c5a7cd1be0ce4915659e55d1fa30cf
similarity index 100%
rename from tests/.cached_responses/895900a9d0c5a7cd1be0ce4915659e55d1fa30cf
rename to tests/.cached_responses/dev.virtualearth.net_895900a9d0c5a7cd1be0ce4915659e55d1fa30cf
diff --git a/tests/.cached_responses/b71d8042b553a3f5444241908740ab71751c675c b/tests/.cached_responses/dev.virtualearth.net_b71d8042b553a3f5444241908740ab71751c675c
similarity index 100%
rename from tests/.cached_responses/b71d8042b553a3f5444241908740ab71751c675c
rename to tests/.cached_responses/dev.virtualearth.net_b71d8042b553a3f5444241908740ab71751c675c
diff --git a/tests/.cached_responses/b94d62baa794ea3f181f384945b406d4287d1db3 b/tests/.cached_responses/dev.virtualearth.net_b94d62baa794ea3f181f384945b406d4287d1db3
similarity index 100%
rename from tests/.cached_responses/b94d62baa794ea3f181f384945b406d4287d1db3
rename to tests/.cached_responses/dev.virtualearth.net_b94d62baa794ea3f181f384945b406d4287d1db3
diff --git a/tests/.cached_responses/c96ce4684694d1aaaaa7156d800514ff917fbf2d b/tests/.cached_responses/dev.virtualearth.net_c96ce4684694d1aaaaa7156d800514ff917fbf2d
similarity index 100%
rename from tests/.cached_responses/c96ce4684694d1aaaaa7156d800514ff917fbf2d
rename to tests/.cached_responses/dev.virtualearth.net_c96ce4684694d1aaaaa7156d800514ff917fbf2d
diff --git a/tests/.cached_responses/d8c89396b84fbe2ce4cc36cbb816c7af5d538804 b/tests/.cached_responses/dev.virtualearth.net_d8c89396b84fbe2ce4cc36cbb816c7af5d538804
similarity index 100%
rename from tests/.cached_responses/d8c89396b84fbe2ce4cc36cbb816c7af5d538804
rename to tests/.cached_responses/dev.virtualearth.net_d8c89396b84fbe2ce4cc36cbb816c7af5d538804
diff --git a/tests/.cached_responses/e0ccf4d194deb4ad691fa018d39155ad5bc61719 b/tests/.cached_responses/dev.virtualearth.net_e0ccf4d194deb4ad691fa018d39155ad5bc61719
similarity index 100%
rename from tests/.cached_responses/e0ccf4d194deb4ad691fa018d39155ad5bc61719
rename to tests/.cached_responses/dev.virtualearth.net_e0ccf4d194deb4ad691fa018d39155ad5bc61719
diff --git a/tests/.cached_responses/e12d20ba9bb816edf32799de4c5a27f5297cf2c0 b/tests/.cached_responses/e12d20ba9bb816edf32799de4c5a27f5297cf2c0
deleted file mode 100644
index 706406be2..000000000
--- a/tests/.cached_responses/e12d20ba9bb816edf32799de4c5a27f5297cf2c0
+++ /dev/null
@@ -1,6 +0,0 @@
-s:111:"{
- "error_message" : "The provided API key is invalid.",
- "results" : [],
- "status" : "REQUEST_DENIED"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/e2294089df3badb1749aeb75f2d34e457d340523 b/tests/.cached_responses/e2294089df3badb1749aeb75f2d34e457d340523
deleted file mode 100644
index c362b2907..000000000
--- a/tests/.cached_responses/e2294089df3badb1749aeb75f2d34e457d340523
+++ /dev/null
@@ -1,13 +0,0 @@
-s:294:"{
- "statusCode" : "OK",
- "statusMessage" : "",
- "ipAddress" : "74.125.45.100",
- "countryCode" : "US",
- "countryName" : "United States",
- "regionName" : "California",
- "cityName" : "Mountain View",
- "zipCode" : "94043",
- "latitude" : "37.406",
- "longitude" : "-122.079",
- "timeZone" : "-08:00"
-}";
\ No newline at end of file
diff --git a/tests/.cached_responses/e2ebbe682ca31f1de27507443ee8d4bc6828a07d b/tests/.cached_responses/e2ebbe682ca31f1de27507443ee8d4bc6828a07d
deleted file mode 100644
index e54181604..000000000
--- a/tests/.cached_responses/e2ebbe682ca31f1de27507443ee8d4bc6828a07d
+++ /dev/null
@@ -1 +0,0 @@
-s:5286:"{"spatialReference":{"wkid":4326,"latestWkid":4326},"locations":[{"name":"10 Avenue Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","extent":{"xmin":2.3880270000000001,"ymin":48.862253000000003,"xmax":2.3900269999999999,"ymax":48.864252999999998},"feature":{"geometry":{"x":2.3890266360004375,"y":48.86325290400049},"attributes":{"Loc_name":"FRA.PointAddress","Score":100,"Match_addr":"10 Avenue Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","Addr_type":"PointAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"10","AddNumFrom":"","AddNumTo":"","Side":"R","StPreDir":"","StPreType":"Avenue","StName":"Gambetta","StType":"","StDir":"","StAddr":"10 Avenue Gambetta","Nbrhd":"20e Arrondissement","City":"Paris","Subregion":"Paris","Region":"Île-de-France","Postal":"75020","PostalExt":"","Country":"FRA","LangCode":"FRE","Distance":0,"X":2.389027,"Y":48.863253,"DisplayX":2.3890699999999998,"DisplayY":48.86318,"Xmin":2.3880270000000001,"Xmax":2.3900269999999999,"Ymin":48.862253000000003,"Ymax":48.864252999999998}}},{"name":"10 Avenue Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","extent":{"xmin":2.3878010000000001,"ymin":48.862192999999998,"xmax":2.3898009999999998,"ymax":48.864193},"feature":{"geometry":{"x":2.3888008510004397,"y":48.863193011000476},"attributes":{"Loc_name":"FRA.StreetAddress","Score":100,"Match_addr":"10 Avenue Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","Addr_type":"StreetAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"10","AddNumFrom":"8","AddNumTo":"16","Side":"R","StPreDir":"","StPreType":"Avenue","StName":"Gambetta","StType":"","StDir":"","StAddr":"10 Avenue Gambetta","Nbrhd":"20e Arrondissement","City":"Paris","Subregion":"Paris","Region":"Île-de-France","Postal":"75020","PostalExt":"","Country":"FRA","LangCode":"FRE","Distance":0,"X":2.388801,"Y":48.863193000000003,"DisplayX":2.388801,"DisplayY":48.863193000000003,"Xmin":2.3878010000000001,"Xmax":2.3898009999999998,"Ymin":48.862192999999998,"Ymax":48.864193}}},{"name":"10 Place Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","extent":{"xmin":2.3974510000000002,"ymin":48.864136999999999,"xmax":2.399451,"ymax":48.866137000000002},"feature":{"geometry":{"x":2.3984510090004392,"y":48.865136839000456},"attributes":{"Loc_name":"FRA.StreetAddress","Score":86.730000000000004,"Match_addr":"10 Place Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","Addr_type":"StreetAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"10","AddNumFrom":"10","AddNumTo":"8","Side":"L","StPreDir":"","StPreType":"Place","StName":"Gambetta","StType":"","StDir":"","StAddr":"10 Place Gambetta","Nbrhd":"20e Arrondissement","City":"Paris","Subregion":"Paris","Region":"Île-de-France","Postal":"75020","PostalExt":"","Country":"FRA","LangCode":"FRE","Distance":0,"X":2.3984510000000001,"Y":48.865136999999997,"DisplayX":2.3984510000000001,"DisplayY":48.865136999999997,"Xmin":2.3974510000000002,"Xmax":2.399451,"Ymin":48.864136999999999,"Ymax":48.866137000000002}}},{"name":"10 Passage Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","extent":{"xmin":2.4010699999999998,"ymin":48.871113000000001,"xmax":2.40307,"ymax":48.873112999999996},"feature":{"geometry":{"x":2.4020699250004327,"y":48.872112859000481},"attributes":{"Loc_name":"FRA.StreetAddress","Score":86.730000000000004,"Match_addr":"10 Passage Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","Addr_type":"StreetAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"10","AddNumFrom":"2","AddNumTo":"32","Side":"R","StPreDir":"","StPreType":"Passage","StName":"Gambetta","StType":"","StDir":"","StAddr":"10 Passage Gambetta","Nbrhd":"20e Arrondissement","City":"Paris","Subregion":"Paris","Region":"Île-de-France","Postal":"75020","PostalExt":"","Country":"FRA","LangCode":"FRE","Distance":0,"X":2.4020700000000001,"Y":48.872112999999999,"DisplayX":2.4020700000000001,"DisplayY":48.872112999999999,"Xmin":2.4010699999999998,"Xmax":2.40307,"Ymin":48.871113000000001,"Ymax":48.873112999999996}}},{"name":"10 Passage Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","extent":{"xmin":2.4010099999999999,"ymin":48.871198999999997,"xmax":2.4030100000000001,"ymax":48.873199},"feature":{"geometry":{"x":2.4020101500004216,"y":48.872198898000477},"attributes":{"Loc_name":"FRA.PointAddress","Score":85.489999999999995,"Match_addr":"10 Passage Gambetta, 75020, 20e Arrondissement, Paris, Île-de-France","Addr_type":"PointAddress","Type":"","PlaceName":"","Place_addr":"","Phone":"","URL":"","Rank":"","AddBldg":"","AddNum":"10","AddNumFrom":"","AddNumTo":"","Side":"R","StPreDir":"","StPreType":"Passage","StName":"Gambetta","StType":"","StDir":"","StAddr":"10 Passage Gambetta","Nbrhd":"20e Arrondissement","City":"Paris","Subregion":"Paris","Region":"Île-de-France","Postal":"75020","PostalExt":"","Country":"FRA","LangCode":"FRE","Distance":0,"X":2.4020100000000002,"Y":48.872199000000002,"DisplayX":2.40204,"DisplayY":48.872190000000003,"Xmin":2.4010099999999999,"Xmax":2.4030100000000001,"Ymin":48.871198999999997,"Ymax":48.873199}}}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/e6ec14e48d1de32a5cfde0ba8b43d63eee1ab473 b/tests/.cached_responses/e6ec14e48d1de32a5cfde0ba8b43d63eee1ab473
deleted file mode 100644
index 4b54aa8fb..000000000
--- a/tests/.cached_responses/e6ec14e48d1de32a5cfde0ba8b43d63eee1ab473
+++ /dev/null
@@ -1,487 +0,0 @@
-s:14981:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "12",
- "short_name" : "12",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Avenue Gambetta",
- "short_name" : "Avenue Gambetta",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "Île-de-France",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "12 Avenue Gambetta, 75020 Paris, France",
- "geometry" : {
- "location" : {
- "lat" : 48.8630886,
- "lng" : 2.3889524
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 48.86443758029149,
- "lng" : 2.390301380291502
- },
- "southwest" : {
- "lat" : 48.8617396197085,
- "lng" : 2.387603419708498
- }
- }
- },
- "place_id" : "ChIJ9aLL3vJt5kcR61GCze3v6fg",
- "types" : [ "street_address" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Père-Lachaise",
- "short_name" : "Père-Lachaise",
- "types" : [ "neighborhood", "political" ]
- },
- {
- "long_name" : "20th arrondissement",
- "short_name" : "20th arrondissement",
- "types" : [ "political", "sublocality", "sublocality_level_1" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "Île-de-France",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "Père-Lachaise, 75020 Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.8707461,
- "lng" : 2.4064679
- },
- "southwest" : {
- "lat" : 48.856442,
- "lng" : 2.383115
- }
- },
- "location" : {
- "lat" : 48.8627872,
- "lng" : 2.3928087
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8707461,
- "lng" : 2.4064679
- },
- "southwest" : {
- "lat" : 48.856442,
- "lng" : 2.383115
- }
- }
- },
- "place_id" : "ChIJ8eVDMoxt5kcRHsuLm96IHm8",
- "types" : [ "neighborhood", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "20th arrondissement",
- "short_name" : "20th arrondissement",
- "types" : [ "political", "sublocality", "sublocality_level_1" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "Île-de-France",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "20th arrondissement, 75020 Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.8784419,
- "lng" : 2.4163301
- },
- "southwest" : {
- "lat" : 48.846621,
- "lng" : 2.376885
- }
- },
- "location" : {
- "lat" : 48.8599825,
- "lng" : 2.4066412
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8784419,
- "lng" : 2.4163301
- },
- "southwest" : {
- "lat" : 48.846621,
- "lng" : 2.376885
- }
- }
- },
- "place_id" : "ChIJ6_zai45t5kcRgBuUaMOCCwU",
- "types" : [ "political", "sublocality", "sublocality_level_1" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "Île-de-France",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.224199
- }
- },
- "location" : {
- "lat" : 48.856614,
- "lng" : 2.3522219
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.225193
- }
- }
- },
- "place_id" : "ChIJD7fiBh9u5kcRYJSMaMOCCwQ",
- "types" : [ "locality", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "75020",
- "short_name" : "75020",
- "types" : [ "postal_code" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "Île-de-France",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "75020 Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.8784077,
- "lng" : 2.4164596
- },
- "southwest" : {
- "lat" : 48.8465946,
- "lng" : 2.3768622
- }
- },
- "location" : {
- "lat" : 48.8599825,
- "lng" : 2.4066412
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.8784077,
- "lng" : 2.4164596
- },
- "southwest" : {
- "lat" : 48.8465946,
- "lng" : 2.3768622
- }
- }
- },
- "place_id" : "ChIJ6_zai45t5kcRMFLY4caCCxw",
- "types" : [ "postal_code" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Paris",
- "short_name" : "Paris",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Île-de-France",
- "short_name" : "Île-de-France",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Paris, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.224199
- }
- },
- "location" : {
- "lat" : 48.8565823,
- "lng" : 2.3522148
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 48.9021449,
- "lng" : 2.4699208
- },
- "southwest" : {
- "lat" : 48.815573,
- "lng" : 2.225193
- }
- }
- },
- "place_id" : "ChIJD7fiBh9u5kcRMCqLaMOCCwM",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Île-de-France",
- "short_name" : "Île-de-France",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Île-de-France, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 49.241504,
- "lng" : 3.5590069
- },
- "southwest" : {
- "lat" : 48.1200811,
- "lng" : 1.44617
- }
- },
- "location" : {
- "lat" : 48.8499198,
- "lng" : 2.6370411
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 49.241504,
- "lng" : 3.5590069
- },
- "southwest" : {
- "lat" : 48.1200811,
- "lng" : 1.44617
- }
- }
- },
- "place_id" : "ChIJF4ymA8Th5UcRcCWLaMOCCwE",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Paris Metropolitan Area",
- "short_name" : "Paris Metropolitan Area",
- "types" : [ "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "Paris Metropolitan Area, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 49.44956,
- "lng" : 3.5590339
- },
- "southwest" : {
- "lat" : 48.065382,
- "lng" : 1.3557489
- }
- },
- "location" : {
- "lat" : 48.8575712,
- "lng" : 2.2771715
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 49.44956,
- "lng" : 3.5590339
- },
- "southwest" : {
- "lat" : 48.065382,
- "lng" : 1.3557489
- }
- }
- },
- "place_id" : "ChIJW36m20gL5kcRiMnAEpHgyq8",
- "types" : [ "political" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- }
- ],
- "formatted_address" : "France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 51.1241999,
- "lng" : 9.6624999
- },
- "southwest" : {
- "lat" : 41.3253001,
- "lng" : -5.5591
- }
- },
- "location" : {
- "lat" : 46.227638,
- "lng" : 2.213749
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 51.0891285,
- "lng" : 9.5597934
- },
- "southwest" : {
- "lat" : 41.3423369,
- "lng" : -5.142141899999999
- }
- }
- },
- "place_id" : "ChIJMVd4MymgVA0R99lHx5Y__Ws",
- "types" : [ "country", "political" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/e94720de05023c70276c2d5bd6da4cb5fac1d9c0 b/tests/.cached_responses/e94720de05023c70276c2d5bd6da4cb5fac1d9c0
deleted file mode 100644
index f8c8a6191..000000000
--- a/tests/.cached_responses/e94720de05023c70276c2d5bd6da4cb5fac1d9c0
+++ /dev/null
@@ -1,139 +0,0 @@
-s:4246:"{
- "results" : [
- {
- "address_components" : [
- {
- "long_name" : "Mars",
- "short_name" : "Mars",
- "types" : [ "premise" ]
- },
- {
- "long_name" : "553",
- "short_name" : "553",
- "types" : [ "street_number" ]
- },
- {
- "long_name" : "Mayfield Avenue",
- "short_name" : "Mayfield Ave",
- "types" : [ "route" ]
- },
- {
- "long_name" : "Stanford",
- "short_name" : "Stanford",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Santa Clara County",
- "short_name" : "Santa Clara County",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "California",
- "short_name" : "CA",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "United States",
- "short_name" : "US",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "94305",
- "short_name" : "94305",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "Mars, 553 Mayfield Ave, Stanford, CA 94305, USA",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 37.4228412,
- "lng" : -122.1684629
- },
- "southwest" : {
- "lat" : 37.4225549,
- "lng" : -122.1687414
- }
- },
- "location" : {
- "lat" : 37.4226981,
- "lng" : -122.1686022
- },
- "location_type" : "ROOFTOP",
- "viewport" : {
- "northeast" : {
- "lat" : 37.4240470302915,
- "lng" : -122.1672531697085
- },
- "southwest" : {
- "lat" : 37.4213490697085,
- "lng" : -122.1699511302915
- }
- }
- },
- "place_id" : "ChIJ2wRSV9G6j4ARxRAjnwkScEg",
- "types" : [ "premise" ]
- },
- {
- "address_components" : [
- {
- "long_name" : "Mars",
- "short_name" : "Mars",
- "types" : [ "locality", "political" ]
- },
- {
- "long_name" : "Loire",
- "short_name" : "Loire",
- "types" : [ "administrative_area_level_2", "political" ]
- },
- {
- "long_name" : "Auvergne-Rhône-Alpes",
- "short_name" : "Auvergne-Rhône-Alpes",
- "types" : [ "administrative_area_level_1", "political" ]
- },
- {
- "long_name" : "France",
- "short_name" : "FR",
- "types" : [ "country", "political" ]
- },
- {
- "long_name" : "42750",
- "short_name" : "42750",
- "types" : [ "postal_code" ]
- }
- ],
- "formatted_address" : "42750 Mars, France",
- "geometry" : {
- "bounds" : {
- "northeast" : {
- "lat" : 46.16754599999999,
- "lng" : 4.285343999999999
- },
- "southwest" : {
- "lat" : 46.1321061,
- "lng" : 4.2198459
- }
- },
- "location" : {
- "lat" : 46.15299599999999,
- "lng" : 4.245787
- },
- "location_type" : "APPROXIMATE",
- "viewport" : {
- "northeast" : {
- "lat" : 46.16754599999999,
- "lng" : 4.285343999999999
- },
- "southwest" : {
- "lat" : 46.1321061,
- "lng" : 4.2198459
- }
- }
- },
- "place_id" : "ChIJufZ_AsqK80cREBDoy688CQQ",
- "types" : [ "locality", "political" ]
- }
- ],
- "status" : "OK"
-}
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/ef93c6b24dba369f1a4a9fc28896e8d684e9fc0b b/tests/.cached_responses/ef93c6b24dba369f1a4a9fc28896e8d684e9fc0b
deleted file mode 100644
index 1d6698f6f..000000000
--- a/tests/.cached_responses/ef93c6b24dba369f1a4a9fc28896e8d684e9fc0b
+++ /dev/null
@@ -1 +0,0 @@
-s:29:",,,,,,,,,,INVALID_LICENSE_KEY";
\ No newline at end of file
diff --git a/tests/.cached_responses/f2b9972477ad1c4da9f4dba2320b5263b3e9a635 b/tests/.cached_responses/f2b9972477ad1c4da9f4dba2320b5263b3e9a635
deleted file mode 100644
index e9583f5a5..000000000
--- a/tests/.cached_responses/f2b9972477ad1c4da9f4dba2320b5263b3e9a635
+++ /dev/null
@@ -1,3 +0,0 @@
-s:412:"
-
-";
\ No newline at end of file
diff --git a/tests/.cached_responses/f2f260d0ad7dd06a62acc8b9fda5df8011decc6c b/tests/.cached_responses/f2f260d0ad7dd06a62acc8b9fda5df8011decc6c
deleted file mode 100644
index 52eb20813..000000000
--- a/tests/.cached_responses/f2f260d0ad7dd06a62acc8b9fda5df8011decc6c
+++ /dev/null
@@ -1 +0,0 @@
-s:169:"{"response":{"Attribution":"","GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"foobar","found":"0","results":"5"}},"featureMember":[]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/f37e71dcc3669458af456ee103cfb9300060b0ed b/tests/.cached_responses/f37e71dcc3669458af456ee103cfb9300060b0ed
deleted file mode 100644
index 8c1ba4ce9..000000000
--- a/tests/.cached_responses/f37e71dcc3669458af456ee103cfb9300060b0ed
+++ /dev/null
@@ -1 +0,0 @@
-s:3683:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"10 Downing St, London, UK","found":"21","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"hydro","text":"Russian Federation, reka Uk","precision":"other","AddressDetails":{"Country":{"AddressLine":"reka Uk","CountryNameCode":"RU","CountryName":"Russian Federation","Locality":{"Premise":{"PremiseName":"reka Uk"}}}},"id":"143671752"}},"description":"Russian Federation","name":"reka Uk","boundedBy":{"Envelope":{"lowerCorner":"57.179313 54.912139","upperCorner":"57.57105 54.976958"}},"Point":{"pos":"57.361294 54.921857"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"railway","text":"Russian Federation, Vostochno-Sibirskaya zheleznaya doroga, stantsiya Uk","precision":"other","AddressDetails":{"Country":{"AddressLine":"Vostochno-Sibirskaya zheleznaya doroga, stantsiya Uk","CountryNameCode":"RU","CountryName":"Russian Federation","Country":{"Locality":""}}},"id":"100103898"}},"description":"Vostochno-Sibirskaya zheleznaya doroga, Russian Federation","name":"stantsiya Uk","boundedBy":{"Envelope":{"lowerCorner":"98.854962 55.075216","upperCorner":"98.871419 55.084657"}},"Point":{"pos":"98.86319 55.079937"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Russian Federation, Irkutskaya oblast, Nizhneudinskiy rayon, poselok gorodskogo tipa Uk","precision":"other","AddressDetails":{"Country":{"AddressLine":"Irkutskaya oblast, Nizhneudinskiy rayon, poselok gorodskogo tipa Uk","CountryNameCode":"RU","CountryName":"Russian Federation","AdministrativeArea":{"AdministrativeAreaName":"Irkutskaya oblast","SubAdministrativeArea":{"SubAdministrativeAreaName":"Nizhneudinskiy rayon","Locality":{"LocalityName":"poselok gorodskogo tipa Uk"}}}}},"id":"53109048"}},"description":"Nizhneudinskiy rayon, Irkutskaya oblast, Russian Federation","name":"poselok gorodskogo tipa Uk","boundedBy":{"Envelope":{"lowerCorner":"98.836591 55.061019","upperCorner":"98.921545 55.085471"}},"Point":{"pos":"98.859058 55.076814"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Russian Federation, Chelyabinskaya oblast, Ashinskiy rayon, posyolok Uk","precision":"other","AddressDetails":{"Country":{"AddressLine":"Chelyabinskaya oblast, Ashinskiy rayon, posyolok Uk","CountryNameCode":"RU","CountryName":"Russian Federation","AdministrativeArea":{"AdministrativeAreaName":"Chelyabinskaya oblast","SubAdministrativeArea":{"SubAdministrativeAreaName":"Ashinskiy rayon","Locality":{"LocalityName":"posyolok Uk"}}}}},"id":"53154124"}},"description":"Ashinskiy rayon, Chelyabinskaya oblast, Russian Federation","name":"posyolok Uk","boundedBy":{"Envelope":{"lowerCorner":"57.249453 54.931738","upperCorner":"57.291773 54.961067"}},"Point":{"pos":"57.259029 54.940934"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"hydro","text":"Russian Federation, Tyumenskaya oblast, gorodskoy okrug Zavodoukovsk, reka Uk","precision":"other","AddressDetails":{"Country":{"AddressLine":"Tyumenskaya oblast, gorodskoy okrug Zavodoukovsk, reka Uk","CountryNameCode":"RU","CountryName":"Russian Federation","AdministrativeArea":{"AdministrativeAreaName":"Tyumenskaya oblast","SubAdministrativeArea":{"SubAdministrativeAreaName":"gorodskoy okrug Zavodoukovsk","Locality":{"Premise":{"PremiseName":"reka Uk"}}}}}},"id":"143671757"}},"description":"gorodskoy okrug Zavodoukovsk, Tyumenskaya oblast, Russian Federation","name":"reka Uk","boundedBy":{"Envelope":{"lowerCorner":"66.401418 56.496617","upperCorner":"66.959981 56.549393"}},"Point":{"pos":"66.676742 56.515901"}}}]}}}";
\ No newline at end of file
diff --git a/tests/.cached_responses/f5c2c376bcb725d2d715f659951cadf2043da287 b/tests/.cached_responses/f5c2c376bcb725d2d715f659951cadf2043da287
deleted file mode 100644
index ad386f3a2..000000000
--- a/tests/.cached_responses/f5c2c376bcb725d2d715f659951cadf2043da287
+++ /dev/null
@@ -1,3 +0,0 @@
-s:473:"Unable to authenticate the request. Provided 'signature' is not valid for the provided client ID, or the provided 'client' is not valid.
-The signature was checked against the URL: /maps/api/geocode/json?address=Columbia%20University&client=foo&signature=9dJq1hPF7_iwafUpnqXUqEkP0gY=
-If this does not match the URL you requested, please ensure that your request is URL encoded correctly. Learn more: https://developers.google.com/maps/documentation/business/webservices/auth";
\ No newline at end of file
diff --git a/tests/.cached_responses/ff149227816fd8aa631f7bb4adc09725bc839493 b/tests/.cached_responses/ff149227816fd8aa631f7bb4adc09725bc839493
deleted file mode 100644
index b596e531f..000000000
--- a/tests/.cached_responses/ff149227816fd8aa631f7bb4adc09725bc839493
+++ /dev/null
@@ -1,7 +0,0 @@
-s:136:"{
- "statusCode" : "OK",
- "statusMessage" : "",
- "ipAddress" : "74.125.45.100",
- "countryCode" : "US",
- "countryName" : "United States"
-}";
\ No newline at end of file
diff --git a/tests/.cached_responses/ff8490e4a2c2807ff0377406abf3491c6b24c2df b/tests/.cached_responses/ff8490e4a2c2807ff0377406abf3491c6b24c2df
deleted file mode 100644
index 3e3d58627..000000000
--- a/tests/.cached_responses/ff8490e4a2c2807ff0377406abf3491c6b24c2df
+++ /dev/null
@@ -1 +0,0 @@
-s:4729:"{"spatialReference":{"wkid":4326,"latestWkid":4326},"locations":[{"name":"Hannover, Niedersachsen, Deutschland","extent":{"xmin":9.6292190000000009,"ymin":52.266516000000003,"xmax":9.8372189999999993,"ymax":52.474516000000001},"feature":{"geometry":{"x":9.7332190380004135,"y":52.370515506000459},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI1","Score":100,"Match_addr":"Hannover, Niedersachsen, Deutschland","Addr_type":"POI","Type":"State Capital","PlaceName":"Hannover","Place_addr":"","Phone":"","URL":"","Rank":"3","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"","City":"","Subregion":"","Region":"Niedersachsen","Postal":"","PostalExt":"","Country":"DEU","LangCode":"","Distance":0,"X":9.7332190000000001,"Y":52.370516000000002,"DisplayX":9.7332190000000001,"DisplayY":52.370516000000002,"Xmin":9.6292190000000009,"Xmax":9.8372189999999993,"Ymin":52.266516000000003,"Ymax":52.474516000000001}}},{"name":"Hannover, North Dakota, United States","extent":{"xmin":-101.44654,"ymin":47.091386999999997,"xmax":-101.40654000000001,"ymax":47.131386999999997},"feature":{"geometry":{"x":-101.4265391569997,"y":47.111386795000499},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI1","Score":100,"Match_addr":"Hannover, North Dakota, United States","Addr_type":"POI","Type":"City","PlaceName":"Hannover","Place_addr":"","Phone":"","URL":"","Rank":"12.5","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"","City":"","Subregion":"Oliver","Region":"North Dakota","Postal":"","PostalExt":"","Country":"USA","LangCode":"","Distance":0,"X":-101.42654,"Y":47.111387000000001,"DisplayX":-101.42654,"DisplayY":47.111387000000001,"Xmin":-101.44654,"Xmax":-101.40654000000001,"Ymin":47.091386999999997,"Ymax":47.131386999999997}}},{"name":"Hannover, Maryland, United States","extent":{"xmin":-77.460257999999996,"ymin":39.371768000000003,"xmax":-77.420258000000004,"ymax":39.411768000000002},"feature":{"geometry":{"x":-77.440257128999633,"y":39.391768472000479},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI1","Score":100,"Match_addr":"Hannover, Maryland, United States","Addr_type":"POI","Type":"City","PlaceName":"Hannover","Place_addr":"","Phone":"","URL":"","Rank":"12.5","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"","City":"","Subregion":"Frederick","Region":"Maryland","Postal":"","PostalExt":"","Country":"USA","LangCode":"","Distance":0,"X":-77.440258,"Y":39.391767999999999,"DisplayX":-77.440258,"DisplayY":39.391767999999999,"Xmin":-77.460257999999996,"Xmax":-77.420258000000004,"Ymin":39.371768000000003,"Ymax":39.411768000000002}}},{"name":"Hannöver, Niedersachsen, Deutschland","extent":{"xmin":8.5029380000000003,"ymin":53.170197999999999,"xmax":8.5109379999999994,"ymax":53.178198000000002},"feature":{"geometry":{"x":8.5069383810004524,"y":53.174198173000491},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI1","Score":100,"Match_addr":"Hannöver, Niedersachsen, Deutschland","Addr_type":"POI","Type":"City","PlaceName":"Hannöver","Place_addr":"","Phone":"","URL":"","Rank":"12.5","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"","Nbrhd":"","City":"","Subregion":"","Region":"Niedersachsen","Postal":"","PostalExt":"","Country":"DEU","LangCode":"","Distance":0,"X":8.5069379999999999,"Y":53.174197999999997,"DisplayX":8.5069379999999999,"DisplayY":53.174197999999997,"Xmin":8.5029380000000003,"Xmax":8.5109379999999994,"Ymin":53.170197999999999,"Ymax":53.178198000000002}}},{"name":"Hannover","extent":{"xmin":-48.854391,"ymin":-26.286807,"xmax":-48.844391000000002,"ymax":-26.276807000000002},"feature":{"geometry":{"x":-48.849389793999649,"y":-26.281805980999593},"attributes":{"Loc_name":"Gaz.WorldGazetteer.POI2","Score":100,"Match_addr":"Hannover","Addr_type":"POI","Type":"Hotel","PlaceName":"Hannover","Place_addr":"Rua Doutor João Colin, Joinville, Sul","Phone":"","URL":"","Rank":"19","AddBldg":"","AddNum":"","AddNumFrom":"","AddNumTo":"","Side":"","StPreDir":"","StPreType":"","StName":"","StType":"","StDir":"","StAddr":"Rua Doutor João Colin","Nbrhd":"América","City":"Joinville","Subregion":"Santa Catarina","Region":"Sul","Postal":"","PostalExt":"","Country":"BRA","LangCode":"POR","Distance":0,"X":-48.849390999999997,"Y":-26.281807000000001,"DisplayX":-48.849390999999997,"DisplayY":-26.281807000000001,"Xmin":-48.854391,"Xmax":-48.844391000000002,"Ymin":-26.286807,"Ymax":-26.276807000000002}}}]}";
\ No newline at end of file
diff --git a/tests/.cached_responses/500b2d9369a4fc679d5ceb9a418cf02bf10d013d b/tests/.cached_responses/freegeoip.net_500b2d9369a4fc679d5ceb9a418cf02bf10d013d
similarity index 100%
rename from tests/.cached_responses/500b2d9369a4fc679d5ceb9a418cf02bf10d013d
rename to tests/.cached_responses/freegeoip.net_500b2d9369a4fc679d5ceb9a418cf02bf10d013d
diff --git a/tests/.cached_responses/77986275ed32e32047ac76a39223f623f52033bc b/tests/.cached_responses/freegeoip.net_77986275ed32e32047ac76a39223f623f52033bc
similarity index 100%
rename from tests/.cached_responses/77986275ed32e32047ac76a39223f623f52033bc
rename to tests/.cached_responses/freegeoip.net_77986275ed32e32047ac76a39223f623f52033bc
diff --git a/tests/.cached_responses/bcc32e827a944478cb862d570202ef3e941ff8ef b/tests/.cached_responses/freegeoip.net_bcc32e827a944478cb862d570202ef3e941ff8ef
similarity index 100%
rename from tests/.cached_responses/bcc32e827a944478cb862d570202ef3e941ff8ef
rename to tests/.cached_responses/freegeoip.net_bcc32e827a944478cb862d570202ef3e941ff8ef
diff --git a/tests/.cached_responses/d1b17a8025172d4e89a00e1386d65cfff66ca0ce b/tests/.cached_responses/freegeoip.net_d1b17a8025172d4e89a00e1386d65cfff66ca0ce
similarity index 100%
rename from tests/.cached_responses/d1b17a8025172d4e89a00e1386d65cfff66ca0ce
rename to tests/.cached_responses/freegeoip.net_d1b17a8025172d4e89a00e1386d65cfff66ca0ce
diff --git a/tests/.cached_responses/ec36afcdc6f9803d67dedca58c4421f83ecedda5 b/tests/.cached_responses/freegeoip.net_ec36afcdc6f9803d67dedca58c4421f83ecedda5
similarity index 100%
rename from tests/.cached_responses/ec36afcdc6f9803d67dedca58c4421f83ecedda5
rename to tests/.cached_responses/freegeoip.net_ec36afcdc6f9803d67dedca58c4421f83ecedda5
diff --git a/tests/.cached_responses/1ece1b149ef392c5f0da11797f637e7ae221bd17 b/tests/.cached_responses/geocode-maps.yandex.ru_1ece1b149ef392c5f0da11797f637e7ae221bd17
similarity index 100%
rename from tests/.cached_responses/1ece1b149ef392c5f0da11797f637e7ae221bd17
rename to tests/.cached_responses/geocode-maps.yandex.ru_1ece1b149ef392c5f0da11797f637e7ae221bd17
diff --git a/tests/.cached_responses/5ded45ea75499ea33bc71c8cbca1ab897dae8164 b/tests/.cached_responses/geocode-maps.yandex.ru_5ded45ea75499ea33bc71c8cbca1ab897dae8164
similarity index 100%
rename from tests/.cached_responses/5ded45ea75499ea33bc71c8cbca1ab897dae8164
rename to tests/.cached_responses/geocode-maps.yandex.ru_5ded45ea75499ea33bc71c8cbca1ab897dae8164
diff --git a/tests/.cached_responses/6e6f03453e3d167c8f98f8e81b4967b63c8c7a6f b/tests/.cached_responses/geocode-maps.yandex.ru_6e6f03453e3d167c8f98f8e81b4967b63c8c7a6f
similarity index 100%
rename from tests/.cached_responses/6e6f03453e3d167c8f98f8e81b4967b63c8c7a6f
rename to tests/.cached_responses/geocode-maps.yandex.ru_6e6f03453e3d167c8f98f8e81b4967b63c8c7a6f
diff --git a/tests/.cached_responses/806a1ce8d9d47a3d77256ce030cd99a1270265fa b/tests/.cached_responses/geocode-maps.yandex.ru_806a1ce8d9d47a3d77256ce030cd99a1270265fa
similarity index 100%
rename from tests/.cached_responses/806a1ce8d9d47a3d77256ce030cd99a1270265fa
rename to tests/.cached_responses/geocode-maps.yandex.ru_806a1ce8d9d47a3d77256ce030cd99a1270265fa
diff --git a/tests/.cached_responses/80749871012997dfec54797b934863b875718034 b/tests/.cached_responses/geocode-maps.yandex.ru_80749871012997dfec54797b934863b875718034
similarity index 100%
rename from tests/.cached_responses/80749871012997dfec54797b934863b875718034
rename to tests/.cached_responses/geocode-maps.yandex.ru_80749871012997dfec54797b934863b875718034
diff --git a/tests/.cached_responses/b21e6fa348985653ed3827c87beccbe62378ae6b b/tests/.cached_responses/geocode-maps.yandex.ru_b21e6fa348985653ed3827c87beccbe62378ae6b
similarity index 100%
rename from tests/.cached_responses/b21e6fa348985653ed3827c87beccbe62378ae6b
rename to tests/.cached_responses/geocode-maps.yandex.ru_b21e6fa348985653ed3827c87beccbe62378ae6b
diff --git a/tests/.cached_responses/b561a90296204f3883bf43c99f9458b058641a69 b/tests/.cached_responses/geocode-maps.yandex.ru_b561a90296204f3883bf43c99f9458b058641a69
similarity index 100%
rename from tests/.cached_responses/b561a90296204f3883bf43c99f9458b058641a69
rename to tests/.cached_responses/geocode-maps.yandex.ru_b561a90296204f3883bf43c99f9458b058641a69
diff --git a/tests/.cached_responses/e4a5a17ff82fb94a41b081c6495045090de216eb b/tests/.cached_responses/geocode-maps.yandex.ru_e4a5a17ff82fb94a41b081c6495045090de216eb
similarity index 100%
rename from tests/.cached_responses/e4a5a17ff82fb94a41b081c6495045090de216eb
rename to tests/.cached_responses/geocode-maps.yandex.ru_e4a5a17ff82fb94a41b081c6495045090de216eb
diff --git a/tests/.cached_responses/fe183030953fd61ac7624981101f2ddee3a74fce b/tests/.cached_responses/geocode-maps.yandex.ru_fe183030953fd61ac7624981101f2ddee3a74fce
similarity index 100%
rename from tests/.cached_responses/fe183030953fd61ac7624981101f2ddee3a74fce
rename to tests/.cached_responses/geocode-maps.yandex.ru_fe183030953fd61ac7624981101f2ddee3a74fce
diff --git a/tests/.cached_responses/1ce0be7ae2d67336e2a518dd3178c52f76fbcce7 b/tests/.cached_responses/geocode.arcgis.com_1ce0be7ae2d67336e2a518dd3178c52f76fbcce7
similarity index 100%
rename from tests/.cached_responses/1ce0be7ae2d67336e2a518dd3178c52f76fbcce7
rename to tests/.cached_responses/geocode.arcgis.com_1ce0be7ae2d67336e2a518dd3178c52f76fbcce7
diff --git a/tests/.cached_responses/1dac1d346611ac8378808669fad531fcc546e3c2 b/tests/.cached_responses/geocode.arcgis.com_1dac1d346611ac8378808669fad531fcc546e3c2
similarity index 100%
rename from tests/.cached_responses/1dac1d346611ac8378808669fad531fcc546e3c2
rename to tests/.cached_responses/geocode.arcgis.com_1dac1d346611ac8378808669fad531fcc546e3c2
diff --git a/tests/.cached_responses/c7abb019bf97168e3592af5c1bade9fa1776e583 b/tests/.cached_responses/geocode.arcgis.com_c7abb019bf97168e3592af5c1bade9fa1776e583
similarity index 100%
rename from tests/.cached_responses/c7abb019bf97168e3592af5c1bade9fa1776e583
rename to tests/.cached_responses/geocode.arcgis.com_c7abb019bf97168e3592af5c1bade9fa1776e583
diff --git a/tests/.cached_responses/449b9a39becbb1c7f63058d6c61109a2fd7eec1d b/tests/.cached_responses/geocode.arcgis.com_cec6934eb0dd48c6df916f7bb4e3b529dbdcd987
similarity index 100%
rename from tests/.cached_responses/449b9a39becbb1c7f63058d6c61109a2fd7eec1d
rename to tests/.cached_responses/geocode.arcgis.com_cec6934eb0dd48c6df916f7bb4e3b529dbdcd987
diff --git a/tests/.cached_responses/2b10e5c4f337ed9aec7473c99b2117f93d2596bb b/tests/.cached_responses/geoip.maxmind.com_ef93c6b24dba369f1a4a9fc28896e8d684e9fc0b
similarity index 100%
rename from tests/.cached_responses/2b10e5c4f337ed9aec7473c99b2117f93d2596bb
rename to tests/.cached_responses/geoip.maxmind.com_ef93c6b24dba369f1a4a9fc28896e8d684e9fc0b
diff --git a/tests/.cached_responses/0f43a58ebd454856eb180e2fd842cde3b4851d54 b/tests/.cached_responses/maps.googleapis.com_0f43a58ebd454856eb180e2fd842cde3b4851d54
similarity index 100%
rename from tests/.cached_responses/0f43a58ebd454856eb180e2fd842cde3b4851d54
rename to tests/.cached_responses/maps.googleapis.com_0f43a58ebd454856eb180e2fd842cde3b4851d54
diff --git a/tests/.cached_responses/2574881cbb127d2489bfa79c4e7ac99356045946 b/tests/.cached_responses/maps.googleapis.com_2574881cbb127d2489bfa79c4e7ac99356045946
similarity index 100%
rename from tests/.cached_responses/2574881cbb127d2489bfa79c4e7ac99356045946
rename to tests/.cached_responses/maps.googleapis.com_2574881cbb127d2489bfa79c4e7ac99356045946
diff --git a/tests/.cached_responses/077ddc6eb7863c6f23c5fc2c53a0f1ea6565132c b/tests/.cached_responses/maps.googleapis.com_38e9e4c7cf868e12eed5ac09ea93e2a2e4f5222e
similarity index 100%
rename from tests/.cached_responses/077ddc6eb7863c6f23c5fc2c53a0f1ea6565132c
rename to tests/.cached_responses/maps.googleapis.com_38e9e4c7cf868e12eed5ac09ea93e2a2e4f5222e
diff --git a/tests/.cached_responses/419422af84cd5e3c0ff2237106f45849ae21ba5d b/tests/.cached_responses/maps.googleapis.com_62ca8fb2b0f9a572c6fa1da347c0f24d69cb7bd3
similarity index 100%
rename from tests/.cached_responses/419422af84cd5e3c0ff2237106f45849ae21ba5d
rename to tests/.cached_responses/maps.googleapis.com_62ca8fb2b0f9a572c6fa1da347c0f24d69cb7bd3
diff --git a/tests/.cached_responses/65760b8fc8d216f997a2e5b2ce499881426f7353 b/tests/.cached_responses/maps.googleapis.com_65760b8fc8d216f997a2e5b2ce499881426f7353
similarity index 100%
rename from tests/.cached_responses/65760b8fc8d216f997a2e5b2ce499881426f7353
rename to tests/.cached_responses/maps.googleapis.com_65760b8fc8d216f997a2e5b2ce499881426f7353
diff --git a/tests/.cached_responses/666c1a5489aef43598b1248853f404ce735a178e b/tests/.cached_responses/maps.googleapis.com_666c1a5489aef43598b1248853f404ce735a178e
similarity index 100%
rename from tests/.cached_responses/666c1a5489aef43598b1248853f404ce735a178e
rename to tests/.cached_responses/maps.googleapis.com_666c1a5489aef43598b1248853f404ce735a178e
diff --git a/tests/.cached_responses/76bfa26856cf18916b4c3633fdd7a168aca808e4 b/tests/.cached_responses/maps.googleapis.com_76bfa26856cf18916b4c3633fdd7a168aca808e4
similarity index 100%
rename from tests/.cached_responses/76bfa26856cf18916b4c3633fdd7a168aca808e4
rename to tests/.cached_responses/maps.googleapis.com_76bfa26856cf18916b4c3633fdd7a168aca808e4
diff --git a/tests/.cached_responses/97387ac4fe9d9965f0e431afef9a7658bc37d0db b/tests/.cached_responses/maps.googleapis.com_97387ac4fe9d9965f0e431afef9a7658bc37d0db
similarity index 100%
rename from tests/.cached_responses/97387ac4fe9d9965f0e431afef9a7658bc37d0db
rename to tests/.cached_responses/maps.googleapis.com_97387ac4fe9d9965f0e431afef9a7658bc37d0db
diff --git a/tests/.cached_responses/a53bce694f80aedda3015334f4b723cd4acde8c4 b/tests/.cached_responses/maps.googleapis.com_a53bce694f80aedda3015334f4b723cd4acde8c4
similarity index 100%
rename from tests/.cached_responses/a53bce694f80aedda3015334f4b723cd4acde8c4
rename to tests/.cached_responses/maps.googleapis.com_a53bce694f80aedda3015334f4b723cd4acde8c4
diff --git a/tests/.cached_responses/b4881e20c1834c926e681a039a8c593175a3da81 b/tests/.cached_responses/maps.googleapis.com_b4881e20c1834c926e681a039a8c593175a3da81
similarity index 100%
rename from tests/.cached_responses/b4881e20c1834c926e681a039a8c593175a3da81
rename to tests/.cached_responses/maps.googleapis.com_b4881e20c1834c926e681a039a8c593175a3da81
diff --git a/tests/.cached_responses/b558a51ba438947022f30e634c1d8b7c80318f8f b/tests/.cached_responses/maps.googleapis.com_b558a51ba438947022f30e634c1d8b7c80318f8f
similarity index 100%
rename from tests/.cached_responses/b558a51ba438947022f30e634c1d8b7c80318f8f
rename to tests/.cached_responses/maps.googleapis.com_b558a51ba438947022f30e634c1d8b7c80318f8f
diff --git a/tests/.cached_responses/c5f7c8a897a5dc608a4bd7010ebb18148c365b42 b/tests/.cached_responses/maps.googleapis.com_c5f7c8a897a5dc608a4bd7010ebb18148c365b42
similarity index 100%
rename from tests/.cached_responses/c5f7c8a897a5dc608a4bd7010ebb18148c365b42
rename to tests/.cached_responses/maps.googleapis.com_c5f7c8a897a5dc608a4bd7010ebb18148c365b42
diff --git a/tests/.cached_responses/cfb04203ce37220220cb9227d0564782f50e418c b/tests/.cached_responses/maps.googleapis.com_cfb04203ce37220220cb9227d0564782f50e418c
similarity index 100%
rename from tests/.cached_responses/cfb04203ce37220220cb9227d0564782f50e418c
rename to tests/.cached_responses/maps.googleapis.com_cfb04203ce37220220cb9227d0564782f50e418c
diff --git a/tests/.cached_responses/38e9e4c7cf868e12eed5ac09ea93e2a2e4f5222e b/tests/.cached_responses/maps.googleapis.com_d6014872b7aca9ebc46ab7806a7ca88fcd1fb213
similarity index 100%
rename from tests/.cached_responses/38e9e4c7cf868e12eed5ac09ea93e2a2e4f5222e
rename to tests/.cached_responses/maps.googleapis.com_d6014872b7aca9ebc46ab7806a7ca88fcd1fb213
diff --git a/tests/.cached_responses/0c12f4f957e3d74973643462d8bd3b7b3f693341 b/tests/.cached_responses/maps.googleapis.com_e12d20ba9bb816edf32799de4c5a27f5297cf2c0
similarity index 100%
rename from tests/.cached_responses/0c12f4f957e3d74973643462d8bd3b7b3f693341
rename to tests/.cached_responses/maps.googleapis.com_e12d20ba9bb816edf32799de4c5a27f5297cf2c0
diff --git a/tests/.cached_responses/f193fe9dd35f789ff9aa6bfa7f281f8435675c96 b/tests/.cached_responses/maps.googleapis.com_f193fe9dd35f789ff9aa6bfa7f281f8435675c96
similarity index 100%
rename from tests/.cached_responses/f193fe9dd35f789ff9aa6bfa7f281f8435675c96
rename to tests/.cached_responses/maps.googleapis.com_f193fe9dd35f789ff9aa6bfa7f281f8435675c96
diff --git a/tests/.cached_responses/f4892d1b3cb12cdbe6cc2bf48c4e2c43be5830b8 b/tests/.cached_responses/maps.googleapis.com_f4892d1b3cb12cdbe6cc2bf48c4e2c43be5830b8
similarity index 100%
rename from tests/.cached_responses/f4892d1b3cb12cdbe6cc2bf48c4e2c43be5830b8
rename to tests/.cached_responses/maps.googleapis.com_f4892d1b3cb12cdbe6cc2bf48c4e2c43be5830b8
diff --git a/tests/.cached_responses/03602a736ae8bbdc991878c66335f7ca9135f2a9 b/tests/.cached_responses/nominatim.openstreetmap.org_03602a736ae8bbdc991878c66335f7ca9135f2a9
similarity index 100%
rename from tests/.cached_responses/03602a736ae8bbdc991878c66335f7ca9135f2a9
rename to tests/.cached_responses/nominatim.openstreetmap.org_03602a736ae8bbdc991878c66335f7ca9135f2a9
diff --git a/tests/.cached_responses/4b0bd12dfc3c0157ea016fa5c05223058dd1b76a b/tests/.cached_responses/nominatim.openstreetmap.org_4b0bd12dfc3c0157ea016fa5c05223058dd1b76a
similarity index 100%
rename from tests/.cached_responses/4b0bd12dfc3c0157ea016fa5c05223058dd1b76a
rename to tests/.cached_responses/nominatim.openstreetmap.org_4b0bd12dfc3c0157ea016fa5c05223058dd1b76a
diff --git a/tests/.cached_responses/4bed90c3f8c22ec4988b230c4ff59b6b52627eef b/tests/.cached_responses/nominatim.openstreetmap.org_4bed90c3f8c22ec4988b230c4ff59b6b52627eef
similarity index 100%
rename from tests/.cached_responses/4bed90c3f8c22ec4988b230c4ff59b6b52627eef
rename to tests/.cached_responses/nominatim.openstreetmap.org_4bed90c3f8c22ec4988b230c4ff59b6b52627eef
diff --git a/tests/.cached_responses/4c72af0d07ec2c259cb15efcf589c316c0c82e6b b/tests/.cached_responses/nominatim.openstreetmap.org_4c72af0d07ec2c259cb15efcf589c316c0c82e6b
similarity index 100%
rename from tests/.cached_responses/4c72af0d07ec2c259cb15efcf589c316c0c82e6b
rename to tests/.cached_responses/nominatim.openstreetmap.org_4c72af0d07ec2c259cb15efcf589c316c0c82e6b
diff --git a/tests/.cached_responses/4f7534aa2e94ac20419bbfbb74e1f74774bb7557 b/tests/.cached_responses/nominatim.openstreetmap.org_4f7534aa2e94ac20419bbfbb74e1f74774bb7557
similarity index 100%
rename from tests/.cached_responses/4f7534aa2e94ac20419bbfbb74e1f74774bb7557
rename to tests/.cached_responses/nominatim.openstreetmap.org_4f7534aa2e94ac20419bbfbb74e1f74774bb7557
diff --git a/tests/.cached_responses/5a19b55840d25d8e77d43cc6adc9bdacc996cb44 b/tests/.cached_responses/nominatim.openstreetmap.org_5a19b55840d25d8e77d43cc6adc9bdacc996cb44
similarity index 100%
rename from tests/.cached_responses/5a19b55840d25d8e77d43cc6adc9bdacc996cb44
rename to tests/.cached_responses/nominatim.openstreetmap.org_5a19b55840d25d8e77d43cc6adc9bdacc996cb44
diff --git a/tests/.cached_responses/5fe9effc0ccab24faebeebf23de3fa39cd757363 b/tests/.cached_responses/nominatim.openstreetmap.org_5fe9effc0ccab24faebeebf23de3fa39cd757363
similarity index 100%
rename from tests/.cached_responses/5fe9effc0ccab24faebeebf23de3fa39cd757363
rename to tests/.cached_responses/nominatim.openstreetmap.org_5fe9effc0ccab24faebeebf23de3fa39cd757363
diff --git a/tests/.cached_responses/6a4ae313a554ce122d3912e4fb7374c1fdd1a856 b/tests/.cached_responses/nominatim.openstreetmap.org_6a4ae313a554ce122d3912e4fb7374c1fdd1a856
similarity index 100%
rename from tests/.cached_responses/6a4ae313a554ce122d3912e4fb7374c1fdd1a856
rename to tests/.cached_responses/nominatim.openstreetmap.org_6a4ae313a554ce122d3912e4fb7374c1fdd1a856
diff --git a/tests/.cached_responses/7df0443a2fd6a14b81f22209fd212d98c62ed524 b/tests/.cached_responses/nominatim.openstreetmap.org_7df0443a2fd6a14b81f22209fd212d98c62ed524
similarity index 100%
rename from tests/.cached_responses/7df0443a2fd6a14b81f22209fd212d98c62ed524
rename to tests/.cached_responses/nominatim.openstreetmap.org_7df0443a2fd6a14b81f22209fd212d98c62ed524
diff --git a/tests/.cached_responses/8960a60f3466b49d9a09075839852f6c200e5e4b b/tests/.cached_responses/nominatim.openstreetmap.org_8960a60f3466b49d9a09075839852f6c200e5e4b
similarity index 100%
rename from tests/.cached_responses/8960a60f3466b49d9a09075839852f6c200e5e4b
rename to tests/.cached_responses/nominatim.openstreetmap.org_8960a60f3466b49d9a09075839852f6c200e5e4b
diff --git a/tests/.cached_responses/be681adc5986454189a0d95c2830d6c79eb8b460 b/tests/.cached_responses/nominatim.openstreetmap.org_be681adc5986454189a0d95c2830d6c79eb8b460
similarity index 100%
rename from tests/.cached_responses/be681adc5986454189a0d95c2830d6c79eb8b460
rename to tests/.cached_responses/nominatim.openstreetmap.org_be681adc5986454189a0d95c2830d6c79eb8b460
diff --git a/tests/.cached_responses/ce43e8faf06636796f1dd94f88a7790ec217e3df b/tests/.cached_responses/nominatim.openstreetmap.org_ce43e8faf06636796f1dd94f88a7790ec217e3df
similarity index 100%
rename from tests/.cached_responses/ce43e8faf06636796f1dd94f88a7790ec217e3df
rename to tests/.cached_responses/nominatim.openstreetmap.org_ce43e8faf06636796f1dd94f88a7790ec217e3df
diff --git a/tests/.cached_responses/d978eaebb36463da620bc1d1c3ad121394c6e7e4 b/tests/.cached_responses/nominatim.openstreetmap.org_d978eaebb36463da620bc1d1c3ad121394c6e7e4
similarity index 100%
rename from tests/.cached_responses/d978eaebb36463da620bc1d1c3ad121394c6e7e4
rename to tests/.cached_responses/nominatim.openstreetmap.org_d978eaebb36463da620bc1d1c3ad121394c6e7e4
diff --git a/tests/.cached_responses/dd900f7ec766f797a270157ae50ba69b6ac7ee9f b/tests/.cached_responses/nominatim.openstreetmap.org_dd900f7ec766f797a270157ae50ba69b6ac7ee9f
similarity index 100%
rename from tests/.cached_responses/dd900f7ec766f797a270157ae50ba69b6ac7ee9f
rename to tests/.cached_responses/nominatim.openstreetmap.org_dd900f7ec766f797a270157ae50ba69b6ac7ee9f
diff --git a/tests/.cached_responses/f6426793c127696e7727ad76e712cb1516407a1f b/tests/.cached_responses/nominatim.openstreetmap.org_f6426793c127696e7727ad76e712cb1516407a1f
similarity index 100%
rename from tests/.cached_responses/f6426793c127696e7727ad76e712cb1516407a1f
rename to tests/.cached_responses/nominatim.openstreetmap.org_f6426793c127696e7727ad76e712cb1516407a1f
diff --git a/tests/.cached_responses/f650be9c07be19f4c0e01889d990883dfa9ae1e0 b/tests/.cached_responses/nominatim.openstreetmap.org_f650be9c07be19f4c0e01889d990883dfa9ae1e0
similarity index 100%
rename from tests/.cached_responses/f650be9c07be19f4c0e01889d990883dfa9ae1e0
rename to tests/.cached_responses/nominatim.openstreetmap.org_f650be9c07be19f4c0e01889d990883dfa9ae1e0
diff --git a/tests/.cached_responses/00e393f649a7c0571a788302e9b747eb2ed102e8 b/tests/.cached_responses/open.mapquestapi.com_00e393f649a7c0571a788302e9b747eb2ed102e8
similarity index 100%
rename from tests/.cached_responses/00e393f649a7c0571a788302e9b747eb2ed102e8
rename to tests/.cached_responses/open.mapquestapi.com_00e393f649a7c0571a788302e9b747eb2ed102e8
diff --git a/tests/.cached_responses/6d58a2755e3b2b48c91491749077d0bff866e466 b/tests/.cached_responses/open.mapquestapi.com_6d58a2755e3b2b48c91491749077d0bff866e466
similarity index 100%
rename from tests/.cached_responses/6d58a2755e3b2b48c91491749077d0bff866e466
rename to tests/.cached_responses/open.mapquestapi.com_6d58a2755e3b2b48c91491749077d0bff866e466
diff --git a/tests/.cached_responses/8e66a9540d4157894f4c9c78173254892f289f6e b/tests/.cached_responses/open.mapquestapi.com_8e66a9540d4157894f4c9c78173254892f289f6e
similarity index 100%
rename from tests/.cached_responses/8e66a9540d4157894f4c9c78173254892f289f6e
rename to tests/.cached_responses/open.mapquestapi.com_8e66a9540d4157894f4c9c78173254892f289f6e
diff --git a/tests/.cached_responses/ab45b4bc10e142bdede13b52b19edc0adf411759 b/tests/.cached_responses/open.mapquestapi.com_ab45b4bc10e142bdede13b52b19edc0adf411759
similarity index 100%
rename from tests/.cached_responses/ab45b4bc10e142bdede13b52b19edc0adf411759
rename to tests/.cached_responses/open.mapquestapi.com_ab45b4bc10e142bdede13b52b19edc0adf411759
diff --git a/tests/.cached_responses/00a3bd9f9306c9ae3b8aa7aa0c85d71d6d5de8fa b/tests/.cached_responses/search.mapzen.com_00a3bd9f9306c9ae3b8aa7aa0c85d71d6d5de8fa
similarity index 100%
rename from tests/.cached_responses/00a3bd9f9306c9ae3b8aa7aa0c85d71d6d5de8fa
rename to tests/.cached_responses/search.mapzen.com_00a3bd9f9306c9ae3b8aa7aa0c85d71d6d5de8fa
diff --git a/tests/.cached_responses/404ab562295927999aba94e1e615fca96186879e b/tests/.cached_responses/search.mapzen.com_404ab562295927999aba94e1e615fca96186879e
similarity index 100%
rename from tests/.cached_responses/404ab562295927999aba94e1e615fca96186879e
rename to tests/.cached_responses/search.mapzen.com_404ab562295927999aba94e1e615fca96186879e
diff --git a/tests/.cached_responses/56e8d5a5657a1015d32ab35096598c62df39852a b/tests/.cached_responses/search.mapzen.com_56e8d5a5657a1015d32ab35096598c62df39852a
similarity index 100%
rename from tests/.cached_responses/56e8d5a5657a1015d32ab35096598c62df39852a
rename to tests/.cached_responses/search.mapzen.com_56e8d5a5657a1015d32ab35096598c62df39852a
diff --git a/tests/.cached_responses/c04af40112605168a2260e602918c6ef37f235cd b/tests/.cached_responses/search.mapzen.com_c04af40112605168a2260e602918c6ef37f235cd
similarity index 100%
rename from tests/.cached_responses/c04af40112605168a2260e602918c6ef37f235cd
rename to tests/.cached_responses/search.mapzen.com_c04af40112605168a2260e602918c6ef37f235cd
diff --git a/tests/.cached_responses/e472c244bd0475c86ecc1803d7555f1209010733 b/tests/.cached_responses/search.mapzen.com_e472c244bd0475c86ecc1803d7555f1209010733
similarity index 100%
rename from tests/.cached_responses/e472c244bd0475c86ecc1803d7555f1209010733
rename to tests/.cached_responses/search.mapzen.com_e472c244bd0475c86ecc1803d7555f1209010733
diff --git a/tests/.cached_responses/853b3bc10655038ca62e39c97cdb31ba71201476 b/tests/.cached_responses/www.geoplugin.net_853b3bc10655038ca62e39c97cdb31ba71201476
similarity index 100%
rename from tests/.cached_responses/853b3bc10655038ca62e39c97cdb31ba71201476
rename to tests/.cached_responses/www.geoplugin.net_853b3bc10655038ca62e39c97cdb31ba71201476
diff --git a/tests/.cached_responses/f740d06107ce2f0d84b55f13bacf38572393d44c b/tests/.cached_responses/www.geoplugin.net_f740d06107ce2f0d84b55f13bacf38572393d44c
similarity index 100%
rename from tests/.cached_responses/f740d06107ce2f0d84b55f13bacf38572393d44c
rename to tests/.cached_responses/www.geoplugin.net_f740d06107ce2f0d84b55f13bacf38572393d44c
diff --git a/tests/CachedResponseClient.php b/tests/CachedResponseClient.php
index 7341109ef..1473dff58 100644
--- a/tests/CachedResponseClient.php
+++ b/tests/CachedResponseClient.php
@@ -39,12 +39,12 @@ public function __construct(HttpClient $delegate, $useCache = false, $apiKey = n
public function sendRequest(RequestInterface $request)
{
$url = (string) $request->getUri();
+ $host = (string) $request->getUri()->getHost();
if ($this->apiKey) {
$url = str_replace($this->apiKey, '[apikey]', $url);
}
- $file = sprintf('%s/%s/%s', __DIR__, $this->cacheDir, sha1($url));
-
+ $file = sprintf('%s/%s/%s_%s', __DIR__, $this->cacheDir, $host, sha1($url));
if ($this->useCache && is_file($file) && is_readable($file)) {
return new Response(200, [], Psr7\stream_for(unserialize(file_get_contents($file))));
}
diff --git a/tests/Functional/LiskovSubstitutionPrincipleTest.php b/tests/Functional/LiskovSubstitutionPrincipleTest.php
index 2bcc3556b..84c21ab56 100644
--- a/tests/Functional/LiskovSubstitutionPrincipleTest.php
+++ b/tests/Functional/LiskovSubstitutionPrincipleTest.php
@@ -11,7 +11,6 @@
namespace geocoder\tests\Functional;
use Geocoder\Collection;
-use Geocoder\Geocoder;
use Geocoder\Location;
use Geocoder\Model\AdminLevelCollection;
use Geocoder\Model\Bounds;
@@ -19,23 +18,17 @@
use Geocoder\Model\Country;
use Geocoder\Model\Query\GeocodeQuery;
use Geocoder\Model\Query\ReverseQuery;
-use Geocoder\Provider\ArcGISOnline;
-use Geocoder\Provider\BingMaps;
-use Geocoder\Provider\FreeGeoIp;
-use Geocoder\Provider\GeoIPs;
-use Geocoder\Provider\Geonames;
-use Geocoder\Provider\GeoPlugin;
-use Geocoder\Provider\GoogleMaps;
-use Geocoder\Provider\MapQuest;
-use Geocoder\Provider\Mapzen;
-use Geocoder\Provider\Nominatim;
-use Geocoder\Provider\OpenCage;
+use Geocoder\Provider\BingMaps\BingMaps;
+use Geocoder\Provider\FreeGeoIp\FreeGeoIp;
+use Geocoder\Provider\GeoIPs\GeoIPs;
+use Geocoder\Provider\GeoPlugin\GeoPlugin;
+use Geocoder\Provider\GoogleMaps\GoogleMaps;
+use Geocoder\Provider\Nominatim\Nominatim;
+use Geocoder\Provider\OpenCage\OpenCage;
use Geocoder\Provider\Provider;
-use Geocoder\Provider\TomTom;
-use Geocoder\Provider\Yandex;
use Geocoder\Tests\CachedResponseClient;
use Http\Client\HttpClient;
-use Http\Adapter\Guzzle6\Client as GuzzleClient;
+use Http\Client\Curl\Client as HttplugClient;
/**
* Test all adapters and make sure they provide the similar result.
@@ -176,7 +169,7 @@ public function getIpAddressProvider()
protected function getAdapter($apiKey = null)
{
return new CachedResponseClient(
- new GuzzleClient(),
+ new HttplugClient(),
isset($_SERVER['USE_CACHED_RESPONSES']) && true === $_SERVER['USE_CACHED_RESPONSES'],
$apiKey
);
diff --git a/tests/TestCase.php b/tests/TestCase.php
index e1b831ade..011915f48 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -14,7 +14,7 @@
use GuzzleHttp\Psr7\Response;
use Http\Client\HttpClient;
use Http\Mock\Client as MockClient;
-use Http\Adapter\Guzzle6\Client as GuzzleClient;
+use Http\Client\Curl\Client as HttplugClient;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
@@ -34,7 +34,7 @@ protected function getMockAdapter($expects = null)
$expects = $this->once();
}
- $stream = $this->getMock('Psr\Http\Message\StreamInterface');
+ $stream = $this->getMockBuilder('Psr\Http\Message\StreamInterface')->getMock();
$stream
->expects($expects)
->method('__toString')
@@ -93,7 +93,7 @@ protected function getMockAdapterWithRequestCallback(callable $requestCallback)
protected function getAdapter($apiKey = null)
{
return new CachedResponseClient(
- new GuzzleClient(),
+ new HttplugClient(),
$this->useCache(),
$apiKey
);