From 8c74e616df40035eee743acba51dd750e8eeff8c Mon Sep 17 00:00:00 2001
From: fredj <frederic.junod@camptocamp.com>
Date: Mon, 5 Dec 2011 09:37:15 +0100
Subject: [PATCH] Remove undefined variables

---
 lib/OpenLayers/Layer/KaMapCache.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/OpenLayers/Layer/KaMapCache.js b/lib/OpenLayers/Layer/KaMapCache.js
index 4cf8e7efa4..eaa66e9c6f 100644
--- a/lib/OpenLayers/Layer/KaMapCache.js
+++ b/lib/OpenLayers/Layer/KaMapCache.js
@@ -88,7 +88,7 @@ OpenLayers.Layer.KaMapCache = OpenLayers.Class(OpenLayers.Layer.KaMap, {
      */
     initialize: function(name, url, params, options) {
         OpenLayers.Layer.KaMap.prototype.initialize.apply(this, arguments);
-        this.extension = this.IMAGE_EXTENSIONS[this.params.i.toLowerCase() || DEFAULT_FORMAT];
+        this.extension = this.IMAGE_EXTENSIONS[this.params.i.toLowerCase() || this.DEFAULT_FORMAT];
     },
 
     /**
@@ -111,18 +111,8 @@ OpenLayers.Layer.KaMapCache = OpenLayers.Class(OpenLayers.Layer.KaMap, {
 
         var metaX = Math.floor(pX / this.tileSize.w / this.params.metaTileSize.w) * this.tileSize.w * this.params.metaTileSize.w;
         var metaY = Math.floor(pY / this.tileSize.h / this.params.metaTileSize.h) * this.tileSize.h * this.params.metaTileSize.h;
-
-        // if url is not a string, it should be an array of strings,
-        // in which case we will deterministically select one of them in
-        // order to evenly distribute requests to different urls.
-        //
-        var url = this.url;
-        if (OpenLayers.Util.isArray(url)) {
-            url = this.selectUrl(paramsString, url);
-        }  
     
         var components = [
-            url,
             "/",
             this.params.map,
             "/",
@@ -140,8 +130,13 @@ OpenLayers.Layer.KaMapCache = OpenLayers.Class(OpenLayers.Layer.KaMap, {
             ".",
             this.extension
           ];
-          
-        return components.join("");
+
+        var url = this.url;
+
+        if (OpenLayers.Util.isArray(url)) {
+            url = this.selectUrl(components.join(''), url);
+        }
+        return url + components.join("");
     },
 
     CLASS_NAME: "OpenLayers.Layer.KaMapCache"