Revert "Issue #3406303 by progga, itamair: Pass additional parameters to geocoders"

This reverts commit ccb63852.

geocoder.api.php

@@ -8,26 +8,15 @@
 /**
  * Alter the Address String to Geocode.
  *
- * Allow other modules to adjust the address string.
+ * Allow others modules to adjust the address string.
  *
  * @param string $address_string
  *   The address string to geocode.
- */
+ * */
 function hook_geocode_address_string_alter(string &$address_string) {
   // Make custom alterations to adjust the address string.
 }
 
-/**
- * Alter the address GeocodeQuery.
- *
- * Allow other modules to adjust the address GeocodeQuery.
- *
- * @param Geocoder\Query\GeocodeQuery $address
- *   The address query to geocode.
- */
-function hook_geocode_address_geocode_query(Geocoder\Query\GeocodeQuery $address) {
-}
-
 /**
  * Alter the Coordinates to Reverse Geocode.
  *
@@ -37,7 +26,7 @@ function hook_geocode_address_geocode_query(Geocoder\Query\GeocodeQuery $address
  *   The latitude.
  * @param string $longitude
  *   The longitude.
- */
+ * */
 function hook_reverse_geocode_coordinates_alter(string &$latitude, string &$longitude) {
   // Make custom alterations to the Coordinates to Reverse Geocode.
 }
@@ -51,7 +40,7 @@ function hook_reverse_geocode_coordinates_alter(string &$latitude, string &$long
  *   The geojson array.
  *
  * @see DumperPluginManager->setCountryFromGeojson
- */
+ * */
 function hook_geocode_country_code_alter(string &$country_code, array $geojson_array) {
   // Make custom alterations to the Country Code.
 }

src/Geocoder.php

@@ -7,10 +7,8 @@ namespace Drupal\geocoder;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Logger\LoggerChannelTrait;
 use Geocoder\Model\AddressCollection;
-use Geocoder\Query\GeocodeQuery;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\geocoder\Entity\GeocoderProvider;
-use Geocoder\Provider\Provider as ProviderInterface;
 
 /**
  * Provides a geocoder factory class.
@@ -59,14 +57,9 @@ class Geocoder implements GeocoderInterface {
   /**
    * {@inheritdoc}
    */
-  public function geocode(GeocodeQuery|string $address, array $providers) {
-    // Allow other modules to adjust the address.
-    if (is_string($address)) {
-      $this->moduleHandler->alter('geocode_address_string', $address);
-    }
-    else {
-      $this->moduleHandler->alter('geocode_address_geocode_query', $address);
-    }
+  public function geocode(string $address_string, array $providers) {
+    // Allow others modules to adjust the address string.
+    $this->moduleHandler->alter('geocode_address_string', $address_string);
 
     /** @var \Drupal\geocoder\GeocoderProviderInterface $provider */
     foreach ($providers as $provider) {
@@ -81,23 +74,9 @@ class Geocoder implements GeocoderInterface {
             throw new \Exception(sprintf("Unable to define a GeocoderProvider from string '%s'", $provider_id));
           }
         }
-
-        if (is_string($address)) {
-          $result = $provider->getPlugin()->geocode($address);
-        }
-        elseif ($provider->getPlugin() instanceof ProviderInterface) {
-          /** @var \Geocoder\Provider\Provider $provider_plugin */
-          $provider_plugin = $provider->getPlugin();
-          try {
-            $result = $provider_plugin->geocodeQuery($address);
-          }
-          catch (\Exception $e) {
-            $this->getLogger('geocoder')->warning($e->getMessage());
-          }
-        }
-
+        $result = $provider->getPlugin()->geocode($address_string);
         if (!isset($result) || $result->isEmpty()) {
-          throw new \Exception(sprintf('Unable to geocode "%s" with the %s provider.', $address, $provider->id()));
+          throw new \Exception(sprintf('Unable to geocode "%s" with the %s provider.', $address_string, $provider->id()));
         }
         return $result;
       }
@@ -112,7 +91,7 @@ class Geocoder implements GeocoderInterface {
    * {@inheritdoc}
    */
   public function reverse(string $latitude, string $longitude, array $providers): ?AddressCollection {
-    // Allow other modules to adjust the coordinates.
+    // Allow others modules to adjust the coordinates.
     $this->moduleHandler->alter('reverse_geocode_coordinates', $latitude, $longitude);
 
     /** @var \Drupal\geocoder\GeocoderProviderInterface $provider */

src/GeocoderInterface.php

@@ -3,7 +3,6 @@
 namespace Drupal\geocoder;
 
 use Geocoder\Model\AddressCollection;
-use Geocoder\Query\GeocodeQuery;
 
 /**
  * Provides a geocoder factory method interface.
@@ -13,15 +12,15 @@ interface GeocoderInterface {
   /**
    * Geocodes a string.
    *
-   * @param \Geocoder\Query\GeocodeQuery|string $address
-   *   The GeocodeQuery or string to geocode.
+   * @param string $address_string
+   *   The string to geocode.
    * @param \Drupal\geocoder\GeocoderProviderInterface[] $providers
    *   A list of Geocoder providers to use to perform the geocoding.
    *
    * @return \Geocoder\Model\AddressCollection|\Geometry|null
    *   An address collection or NULL on geocoding failure.
    */
-  public function geocode(GeocodeQuery|string $address, array $providers);
+  public function geocode(string $address_string, array $providers);
 
   /**
    * Reverse geocodes coordinates.

tests/src/Kernel/GeocoderKernelTest.php

@@ -4,7 +4,6 @@ namespace Drupal\Tests\geocoder\Kernel;
 
 use Drupal\geocoder\Entity\GeocoderProvider;
 use Drupal\KernelTests\KernelTestBase;
-use Geocoder\Query\GeocodeQuery;
 
 /**
  * Tests basic Geocoder functionality.
@@ -16,7 +15,7 @@ class GeocoderKernelTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['geocoder', 'geocoder_test_provider'];
+  protected static $modules = ['geocoder'];
 
   /**
    * Our test provider.
@@ -59,36 +58,4 @@ class GeocoderKernelTest extends KernelTestBase {
     ]));
   }
 
-  /**
-   * Tests geocoding a GeocodeQuery.
-   *
-   * Tries the "random" Geocoder which cannot geocode a GeocodeQuery.
-   */
-  public function testRandomGeocodeWithGeocodeQuery() {
-    /** @var \Drupal\geocoder\GeocoderInterface $geocoder */
-    $geocoder = \Drupal::service('geocoder');
-    $this->assertEmpty($geocoder->geocode(GeocodeQuery::create('123 Foo Street'), [
-      'random',
-    ]));
-  }
-
-  /**
-   * Tests geocoding a GeocodeQuery.
-   *
-   * Tries the "geocoder_test_provider" Geocoder which can geocode a
-   * GeocodeQuery.
-   */
-  public function testGeocodeWithGeocodeQuery() {
-    GeocoderProvider::create([
-      'id'     => 'geocoder_test_provider',
-      'plugin' => 'geocoder_test_provider',
-    ])->save();
-
-    /** @var \Drupal\geocoder\GeocoderInterface $geocoder */
-    $geocoder = \Drupal::service('geocoder');
-    $this->assertNotEmpty($geocoder->geocode(GeocodeQuery::create('123 Foo Street'), [
-      'geocoder_test_provider',
-    ]));
-  }
-
 }