Changeset 3213 for contribs

Timestamp:

11/04/09 03:21:06 (3 years ago)

Author:

cmoullet

Message:

Openlayers needs a ? in the url to work correctly

Files:

• contribs/mapfish-api/trunk/MapFishApi/js/Permalink.js (modified) (6 diffs)

contribs/mapfish-api/trunk/MapFishApi/js/Permalink.js

@@ -48 +48 @@
     draw: function() {
         OpenLayers.Control.prototype.draw.apply(this, arguments);
-    
+
         this.map.events.on({
             'moveend': this.updateLink,
@@ -59 +59 @@
         // moved yet.
         this.updateLink();
-    
+
         return this.div;
-    },  
-   
-    /** 
+    },
+
+    /**
      * Method: updateLink()
      *
@@ -71 +71 @@
         var href = this.base;
         if (href.indexOf('?') != -1) {
-            href = href.substring( 0, href.indexOf('?') );
+            href = href.substring(0, href.indexOf('?'));
         }
 
         href += '?' + OpenLayers.Util.getParameterString(this.createParams());
         if (this.element) {
-           this.element.value = href; // FIXME: only OK for input fields
+            this.element.value = href; // FIXME: only OK for input fields
         }
     },
@@ -92 +92 @@
     createParams: function(center, zoom, layers) {
         if (this.map) {
-           center = center || this.map.getCenter();
+            center = center || this.map.getCenter();
         } else {
             return '';
         }
+        ;
+
+        if (OpenLayers.String.contains(this.base, '?')) {
+        } else {
+            this.base = this.base + "?";
+        }
+        ;
 
         var params = OpenLayers.Util.getParameters(this.base);
@@ -113 +120 @@
             if (this.displayProjection) {
                 var mapPosition = OpenLayers.Projection.transform(
-                  { x: lon, y: lat },
-                  this.map.getProjectionObject(),
-                  this.displayProjection );
+                { x: lon, y: lat },
+                        this.map.getProjectionObject(),
+                        this.displayProjection);
                 lon = mapPosition.x;
                 lat = mapPosition.y;
             }
-            params[this.coordsParams.lat] = Math.round(lat*100000)/100000;
-            params[this.coordsParams.lon] = Math.round(lon*100000)/100000;
+            params[this.coordsParams.lat] = Math.round(lat * 100000) / 100000;
+            params[this.coordsParams.lon] = Math.round(lon * 100000) / 100000;
 
             // layers selection
@@ -126 +133 @@
             var layertree = this.api.tree;
             if (layertree) {
-                var nodes = []; 
+                var nodes = [];
                 var checkedNodes = layertree.getChecked();
                 for (var i = 0, len = checkedNodes.length; i < len; i++) {