Ticket #1023: tms_serviceVersion.patch

tests/Layer/test_TMS.html

@@ -119 +119 @@
-     */
-    function test_10_Layer_TMS_getURL(t) {
-
-2
+3
-        
-        var map = new OpenLayers.Map('map', options);
-        var options = {'layername':'basic', 'type':'png'}; 
@@ -128 +128 @@
-        map.setCenter(new OpenLayers.LonLat(0,0), 9);
-        var tileurl = layer.getURL(new OpenLayers.Bounds(3.515625,45,4.21875,45.703125));
-        t.eq(tileurl, "http://labs.metacarta.com/wms-c/Basic.py/1.0.0/basic/9/261/192.png", "Tile URL is correct");
+    
+        var layer2 = layer.clone();
+        layer2.serviceVersion = "1.2.3";
+        map.addLayer(layer2);
+        tileurl = layer2.getURL(new OpenLayers.Bounds(3.515625,45,4.21875,45.703125));
+        t.eq(tileurl, "http://labs.metacarta.com/wms-c/Basic.py/1.2.3/basic/9/261/192.png", "TMS serviceVersion is correct");
-
-        layer.url = ["http://tilecache1/", "http://tilecache2/", "http://tilecache3/"];
-        tileurl = layer.getURL(new OpenLayers.Bounds(3.515625,45,4.21875,45.703125));

lib/OpenLayers/Layer/TMS.js

@@ -14 +14 @@
-OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
-
-    /**
+     * APIProperty: serviceVersion
+     * {String}
+     */
+    serviceVersion: "1.0.0",
+
+    /**
-     * APIProperty: isBaseLayer
-     * {Boolean}
-     */
@@ -91 +97 @@
-        var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
-        var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
-        var z = this.map.getZoom();
-"1.0.0"
+this.serviceVersion
-        var url = this.url;
-        if (url instanceof Array) {
-            url = this.selectUrl(path, url);