Upgrade Search API from 8.x-1.15 to 8.x-1.16 breaks Geolocation field type indexing and seems other field types with computed value

The source of problem is in this part of code: search_api/src/Utility/FieldsHelper.php - function extractFieldValues()

    // Process complex data types.
    if ($definition instanceof ComplexDataDefinitionInterface) {
      $main_property_name = $definition->getMainPropertyName();
      $data_properties = $data->getProperties();
      if (isset($data_properties[$main_property_name])) {
        return $this->extractFieldValues($data_properties[$main_property_name]);
      }
      return [];
    }

geolocation field type provide 'value' as $main_property_name, but in $values - 'value' key is missing, here is $values contents:

values:array(3)
  lat:"-73.138260"
  lng:"40.792240"
  data:null

Previous version of this code from 1.15 is:

    $value = $data->getValue();
    $definition = $data->getDataDefinition();
    if ($definition instanceof ComplexDataDefinitionInterface) {
      $property = $definition->getMainPropertyName();
      return isset($value[$property]) ? [$value[$property]] : [];
    }
    if (is_array($value)) {
      return array_values($value);
    }
    return [$value];

that works well with this field type.

Quick solution is replace:

      return [];

with old logic, like this:

      $value = $data->getValue();
      return isset($value[$main_property_name]) ? [$value[$main_property_name]] : [];

because only with getValue(); field returns 'value' key, that act as $main_property_name, because it is not stored in database, but calculated dynamically.

After proposed changes - all becomes work right. Patch is attached

Can anybody lookup - is this right way to fix described issue?

I investigate deeper and seems found better solution: for geolocation field type the value property is computed, but function getProperties($include_computed = FALSE) don't include computed properties by default.

So simply enabling $include_computed solve the issue too, so I change line:

      $data_properties = $data->getProperties();

to

      $data_properties = $data->getProperties(true);

Patch is attached.