[fusion-commits] r1446 - in branches/fusion-1.0: MapGuide lib widgets widgets/Search

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-08-01 15:22:16 -0400 (Fri, 01 Aug 2008)
New Revision: 1446

Modified:
   branches/fusion-1.0/MapGuide/MapGuide.js
   branches/fusion-1.0/MapGuide/MapGuideViewerApi.js
   branches/fusion-1.0/lib/Map.js
   branches/fusion-1.0/widgets/Search/Search.templ
   branches/fusion-1.0/widgets/ViewOptions.js
Log:
closes #89: make calls to setSelection consistent; patch applied to 1.0 branch;
also adds missing method for ViewOptions widget

Modified: branches/fusion-1.0/MapGuide/MapGuide.js
===================================================================
--- branches/fusion-1.0/MapGuide/MapGuide.js	2008-08-01 19:21:15 UTC (rev 1445)
+++ branches/fusion-1.0/MapGuide/MapGuide.js	2008-08-01 19:22:16 UTC (rev 1446)
@@ -628,7 +628,7 @@
       var params = {
           'mapname': this.getMapName(),
           'session': this.getSessionID(),
-          'selection': encodeURIComponent(selText),
+          'selection': selText,
           'seq': Math.random()
       };
       var options = {onSuccess: OpenLayers.Function.bind(this.processQueryResults, this, zoomTo), 

Modified: branches/fusion-1.0/MapGuide/MapGuideViewerApi.js
===================================================================
--- branches/fusion-1.0/MapGuide/MapGuideViewerApi.js	2008-08-01 19:21:15 UTC (rev 1445)
+++ branches/fusion-1.0/MapGuide/MapGuideViewerApi.js	2008-08-01 19:22:16 UTC (rev 1446)
@@ -40,7 +40,7 @@
     var Fusion = window.top.Fusion;
     var mapWidget = Fusion.getWidgetById(mapWidgetId);
     if (mapWidget && mapWidget.isMapLoaded()) {
-        mapWidget.setSelection(selectionXml, true, true);
+        mapWidget.setSelection(selectionXml, true);
     }
 }
 

Modified: branches/fusion-1.0/lib/Map.js
===================================================================
--- branches/fusion-1.0/lib/Map.js	2008-08-01 19:21:15 UTC (rev 1445)
+++ branches/fusion-1.0/lib/Map.js	2008-08-01 19:22:16 UTC (rev 1446)
@@ -389,13 +389,13 @@
      },
 
      /**
-      * Function: setSelectionXML
+      * Function: setSelection
       *
       * sets a Selection XML back to the server
       */
-      setSelection: function(selText, requery, zoomTo) {
+      setSelection: function(selText, zoomTo) {
          for (var i=0; i<this.aMaps.length; i++ ) {
-             this.aMaps[i].setSelection(selText, requery, zoomTo);
+             this.aMaps[i].setSelection(selText, zoomTo);
          }
       },
 

Modified: branches/fusion-1.0/widgets/Search/Search.templ
===================================================================
--- branches/fusion-1.0/widgets/Search/Search.templ	2008-08-01 19:21:15 UTC (rev 1445)
+++ branches/fusion-1.0/widgets/Search/Search.templ	2008-08-01 19:22:16 UTC (rev 1446)
@@ -83,7 +83,7 @@
 function CellClicked(sel)
 {
     var map = GetParent().Fusion.getMapByName(mapName);
-    map.setSelection(sel, false, true);
+    map.setSelection(sel, true);
 }
 
 function highlightRow(index, mode)

Modified: branches/fusion-1.0/widgets/ViewOptions.js
===================================================================
--- branches/fusion-1.0/widgets/ViewOptions.js	2008-08-01 19:21:15 UTC (rev 1445)
+++ branches/fusion-1.0/widgets/ViewOptions.js	2008-08-01 19:22:16 UTC (rev 1446)
@@ -64,6 +64,10 @@
         this.oMenu.show(e);
     },
 
+    setViewOptions: function(units) {
+      this.getMap().setViewOptions(units);
+    },
+    
     setMapUnits: function() {
       var units = this.displayUnits ? this.displayUnits : this.getMap().getUnits();
       this.getMap().setViewOptions(units);