diff --git a/src/Plugin/search_api/data_type/LocationDataType.php b/src/Plugin/search_api/data_type/LocationDataType.php
index a07ac33..b31b2e6 100644
--- a/src/Plugin/search_api/data_type/LocationDataType.php
+++ b/src/Plugin/search_api/data_type/LocationDataType.php
@@ -15,22 +15,4 @@ use Drupal\search_api\DataType\DataTypePluginBase;
  */
 class LocationDataType extends DataTypePluginBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getValue($value) {
-    $geom = \geoPHP::load($value);
-
-    if ($geom) {
-      $centroid = $geom->getCentroid();
-      $lon = $centroid->getX();
-      $lat = $centroid->getY();
-
-      return "$lat,$lon";
-    }
-    else {
-      return $value;
-    }
-  }
-
 }
diff --git a/src/Plugin/search_api_location/location_input/Geocode.php b/src/Plugin/search_api_location/location_input/Geocode.php
index 552299a..953a4f3 100644
--- a/src/Plugin/search_api_location/location_input/Geocode.php
+++ b/src/Plugin/search_api_location/location_input/Geocode.php
@@ -22,7 +22,7 @@ class Geocode extends LocationInputPluginBase {
   public function getParsedInput($input) {
     $active_plugins = $this->getActivePlugins();
     /** @var \Geocoder\Model\AddressCollection $geocoded_addresses */
-    $geocoded_addresses = \Drupal::service('geocoder')->geocode($input, $active_plugins);
+    $geocoded_addresses = \Drupal::service('geocoder')->geocode($input['value'], $active_plugins);
 
     if ($geocoded_addresses) {
       return $geocoded_addresses->first()->getLatitude() . ',' . $geocoded_addresses->first()->getLongitude();
@@ -40,7 +40,7 @@ class Geocode extends LocationInputPluginBase {
     $active_plugins = [];
     foreach ($plugins as $id => $plugin) {
       if ($plugin['checked']) {
-        $active_plugins[(int) $plugin['weight']] = $id;
+        $active_plugins[$id] = $id;
       }
     }