OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Rename farm_map_geofield_geometry_combine() to farm_map_combine_geoms().

This commit is contained in:
Michael Stenta 2019-12-31 10:43:08 -05:00
parent 11c02e2ab8
commit 2bd13f2e0e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/farm/farm_map/farm_map.geo.inc
View File

@ -14,7 +14,7 @@
* @return object|bool
* Returns a GeoPHP object, or FALSE on failure.
*/
function farm_map_geofield_geometry_combine($geoms = array()) {
function farm_map_combine_geoms($geoms = array()) {
// If no geometries were found, return an empty geometry.
if (empty($geoms)) {

2
modules/farm/farm_map/farm_map.module
View File

@ -260,7 +260,7 @@ function farm_map_geofield_populate(&$entity, $geoms = array()) {
}
// Combine the WKT geometries into a single GeoPHP geometry.
$geometry = farm_map_geofield_geometry_combine($geoms);
$geometry = farm_map_combine_geoms($geoms);
// If that didn't work, bail.
if (empty($geometry)) {