[fusion-commits] r3029 - in branches/fusion-mg31: . widgets/Search

[svn_fusion at osgeo.org]

Author: jng
Date: 2018-03-08 06:30:34 -0800 (Thu, 08 Mar 2018)
New Revision: 3029

Modified:
   branches/fusion-mg31/
   branches/fusion-mg31/widgets/Search/Search.php
Log:
Merged revision(s) 3028 from trunk:
Speculative fix for: https://trac.osgeo.org/mapguide/ticket/2770

Just because we set $bHasPoint = true, don't blindly assume that the geometry we read out is also going to be a point. Render out the default non-point result row if the geometry is not a point.
........


Index: branches/fusion-mg31
===================================================================
--- branches/fusion-mg31	2018-03-08 14:29:30 UTC (rev 3028)
+++ branches/fusion-mg31	2018-03-08 14:30:34 UTC (rev 3029)

Property changes on: branches/fusion-mg31
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
 /sandbox/robust_error_handling:2818-2825
 /sandbox/stamen:2873-2875
 /sandbox/tiling:2845-2846
-/trunk:2946,2950,2954,2956,2960,2964,2993-2995,2999,3003
\ No newline at end of property
+/trunk:2946,2950,2954,2956,2960,2964,2993-2995,2999,3003,3028
\ No newline at end of property
Modified: branches/fusion-mg31/widgets/Search/Search.php
===================================================================
--- branches/fusion-mg31/widgets/Search/Search.php	2018-03-08 14:29:30 UTC (rev 3028)
+++ branches/fusion-mg31/widgets/Search/Search.php	2018-03-08 14:30:34 UTC (rev 3029)
@@ -278,8 +278,10 @@
                                 $coord = $geom->GetCoordinate();
                                 $x = $coord->GetX();
                                 $y = $coord->GetY();
+                                echo sprintf("<td class=\"%s\" id=\"%d:%d\" onmousemove=\"SelectRow(%d)\" onclick=\"PointCellClicked('%s', %g, %g, %g)\"> %s</td>\n", !($row%2)? "Search" : "Search2", $row, $i, $row, $selText, $x, $y, $pointZoom, $val);
+                            } else {
+                                echo sprintf("<td class=\"%s\" id=\"%d:%d\" onmousemove=\"SelectRow(%d)\" onclick=\"CellClicked('%s')\"> %s</td>\n", !($row%2)? "Search" : "Search2", $row, $i, $row, $selText, $val);
                             }
-                            echo sprintf("<td class=\"%s\" id=\"%d:%d\" onmousemove=\"SelectRow(%d)\" onclick=\"PointCellClicked('%s', %g, %g, %g)\"> %s</td>\n", !($row%2)? "Search" : "Search2", $row, $i, $row, $selText, $x, $y, $pointZoom, $val);
                         } catch (MgException $ex) {
                             echo sprintf("<td class=\"%s\" id=\"%d:%d\" onmousemove=\"SelectRow(%d)\" onclick=\"CellClicked('%s')\"> %s</td>\n", !($row%2)? "Search" : "Search2", $row, $i, $row, $selText, $val);
                         }