Project

General

Profile

« Previous | Next » 

Revision 43c5bf8b

Added by Andreas Kohlbecker almost 4 years ago

ref #8972 refactoring: moving map compose method into maps.inc and simplifying code

View differences:

modules/cdm_dataportal/includes/maps.inc
400 400
  return $out;
401 401
}
402 402

  
403

  
403
/**
404
 * Composes a map with the location points of the passed $type_designations.
405
 *
406
 * @param $type_designations
407
 *
408
 * @return array
409
 *     A drupal render array or an empty array in case there are no point to show.
410
 *
411
 * @ingroup compose
412
 */
413
function compose_type_designations_map($type_designations)
414
{
415
  $typedesignations_uuid_param = cdm_uuid_list_parameter_value($type_designations);
416
  $kml_request_uri = cdm_compose_url(CDM_WS_KML_TYPEDESIGNATIONS, array($typedesignations_uuid_param));
417
  $map_render_array = compose_map('specimens', null, $kml_request_uri, null, null, []);
418
  return $map_render_array;
419
}
404 420

  
405 421

  
406 422
/**
......
560 576
  $kml_request_url = cdm_compose_url(CDM_WS_KML_TAXON_OCCURRENCE, array($taxon->uuid), http_build_query(relationship_filter_query_parameters()));
561 577

  
562 578
  $map_visibility = variable_get(SPECIMEN_MAP_VISIBILITY, SPECIMEN_MAP_VISIBILITY_DEFAULT);
563
  if ($map_visibility == 'always' ||
564
    variable_get(SPECIMEN_MAP_VISIBILITY, SPECIMEN_MAP_VISIBILITY_DEFAULT) == 'automatic' &&
579
  if ($map_visibility == 'always' || $map_visibility == 'automatic' &&
565 580
    (isset($occurrence_queryDto->fieldUnitPoints[0]) || isset($occurrence_queryDto->derivedUnitPoints[0]))) {
566 581
    $occurrence_query = $occurrence_queryDto->occurrenceQuery;
567 582
    $legend_format_query = null;
modules/cdm_dataportal/includes/name.inc
892 892
  return $render_array;
893 893
}
894 894

  
895
/**
896
 * Composes a map with the location points of the passed $type_designations.
897
 *
898
 * @param $type_designations
899
 *
900
 * @return array
901
 *     A drupal render array or an empty array in case there are no point to show.
902
 *
903
 * @ingroup compose
904
 */
905
function compose_type_designations_map($type_designations)
906
{
907
  $typedesignations_uuid_param = cdm_uuid_list_parameter_value($type_designations);
908
  $kml_request_uri = cdm_compose_url(CDM_WS_KML_TYPEDESIGNATIONS, array($typedesignations_uuid_param));
909
  $map_render_array = compose_map('specimens', null, $kml_request_uri, null, null, []);
910
  return $map_render_array;
911
}
912 895

  
913 896
/**
914 897
 * Composes the TypedEntityReference to name type designations passed as associatve array.

Also available in: Unified diff