From ac411d8b9ec2614f1f1fe436c7753706f62de12f Mon Sep 17 00:00:00 2001
From: Ammon Shepherd <ammon.shepherd@gmail.com>
Date: Tue, 19 Jan 2021 15:46:05 -0500
Subject: [PATCH] Update deprecated AsText and GeomFromText functions

---
 helpers/Mysql.php              | 4 ++--
 models/NeatlineRecordTable.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/helpers/Mysql.php b/helpers/Mysql.php
index 416c0c6f1..69dad8bc2 100644
--- 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
index 1152b4efa..cf4dd7cf0 100644
--- 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.
             );