Merge branch 'bug/mysql-functions'

performant-software · May 19, 2021 · e27de89 · e27de89
2 parents 9bed14d + ac411d8
commit e27de89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/helpers/Mysql.php b/helpers/Mysql.php
@@ -19,7 +19,7 @@ function nl_setGeometry($coverage)
 {
 	$coverage_or_default = $coverage ?: "POINT(0 0)";
     return new Zend_Db_Expr("COALESCE(
-        GeomFromText('{$coverage_or_default}'), GeomFromText('POINT(0 0)')
+        ST_GeomFromText('{$coverage_or_default}'), ST_GeomFromText('POINT(0 0)')
     )");
 }
 
@@ -32,5 +32,5 @@ function nl_setGeometry($coverage)
  */
 function nl_getGeometry($column)
 {
-    return new Zend_Db_Expr('NULLIF(AsText(coverage), "POINT(0 0)")');
+    return new Zend_Db_Expr('NULLIF(ST_AsText(coverage), "POINT(0 0)")');
 }
diff --git a/models/NeatlineRecordTable.php b/models/NeatlineRecordTable.php
@@ -163,7 +163,7 @@ protected function filterExtent()
             $bb = $this->params['extent'];
 
             $this->select->where(
-                "MBRIntersects(coverage, GeomFromText(?)) OR
+                "MBRIntersects(coverage, ST_GeomFromText(?)) OR
                 is_wms = 1", $bb // Always match WMS layers.
             );