[fusion-commits] r2673 - trunk/widgets/Query

[svn_fusion at osgeo.org]

Author: jng
Date: 2013-03-22 10:38:59 -0700 (Fri, 22 Mar 2013)
New Revision: 2673

Modified:
   trunk/widgets/Query/querymain.php
Log:
#550: Query: Use MapMessage prompts for spatial filter geometry digitization. Also cancel any active digitizations on unload()

Modified: trunk/widgets/Query/querymain.php
===================================================================
--- trunk/widgets/Query/querymain.php	2013-03-22 17:28:15 UTC (rev 2672)
+++ trunk/widgets/Query/querymain.php	2013-03-22 17:38:59 UTC (rev 2673)
@@ -61,6 +61,9 @@
     $zoomLocal = GetLocalizedString('QUERYZOOM', $locale );
     $selectLocal = GetLocalizedString('QUERYSELECT', $locale );
     $errorLocal = GetLocalizedString('QUERYERROR', $locale );
+    
+    $rectangleHelpLocal = GetLocalizedString('REDLINEEDITRECTANGLEHELP', $locale );
+    $polygonHelpLocal = GetLocalizedString('REDLINEEDITPOLYGONHELP', $locale );
 
     try
     {
@@ -177,11 +180,15 @@
         function OnDigitizeRectangle()
         {
             ClearDigitization();
+            var map = Fusion.getMapByName(mapName).mapWidget;
+            map.message.info("<?= $rectangleHelpLocal ?>");
             DigitizeRectangle(OnRectangleDigitized);
         }
 
         function OnRectangleDigitized(rectangle)
         {
+            var map = Fusion.getMapByName(mapName).mapWidget;
+            map.message.clear();
             var geomText = "5,"
                 + rectangle.Point1.X + "," + rectangle.Point1.Y + ","
                 + rectangle.Point2.X + "," + rectangle.Point1.Y + ","
@@ -195,11 +202,15 @@
         function OnDigitizePolygon()
         {
             ClearDigitization();
+            var map = Fusion.getMapByName(mapName).mapWidget;
+            map.message.info("<?= $polygonHelpLocal ?>");
             DigitizePolygon(OnPolyonDigitized);
         }
 
         function OnPolyonDigitized(polygon)
         {
+            var map = Fusion.getMapByName(mapName).mapWidget;
+            map.message.clear();
             var geomText = polygon.Count;
             for (var i = 0; i < polygon.Count; i++)
             {
@@ -404,6 +415,7 @@
 
         function OnUnload()
         {
+            ClearDigitization();
             ToggleSpatialFilter(false);
         }