Changeset 324

Timestamp:

08/14/08 23:14:12 (3 months ago)

Author:

arneke

Message:

Parse metatiling param from getCapabilitiesConfiguration

Location:

trunk/geowebcache/src/main/java/org/geowebcache

Files:

• layer/wms/WMSLayer.java (modified) (1 diff)
• util/GetCapabilitiesConfiguration.java (modified) (1 diff)

trunk/geowebcache/src/main/java/org/geowebcache/layer/wms/WMSLayer.java

@@ -140 +140 @@
     public WMSLayer(String layerName, CacheFactory cacheFactory,
             String wmsURL, List<String> mimeFormats,
-            List<Grid> grids, int[] metaWidthHeight) {
+            List<Grid> grids, int[] metaWidthHeight,
+            String vendorParams) {
      
         name = layerName;
         initCacheFactory = cacheFactory;
         this.WMSurl = wmsURL;
-        super.mimeFormats = mimeFormats;
-        super.grids = grids;
+        this.mimeFormats = mimeFormats;
+        this.grids = grids;
         this.metaWidthHeight = metaWidthHeight;
-        expireClients = GWCVars.CACHE_USE_WMS_BACKEND_VALUE;
-        expireCache = GWCVars.CACHE_NEVER_EXPIRE;
+        this.expireClients = GWCVars.CACHE_USE_WMS_BACKEND_VALUE;
+        this.expireCache = GWCVars.CACHE_NEVER_EXPIRE;
+        this.vendorParameters = vendorParams;
     }
     

trunk/geowebcache/src/main/java/org/geowebcache/util/GetCapabilitiesConfiguration.java

@@ -207 +207 @@
         mimeFormats.add("image/jpeg");
         
-        int[] metaWidthHeight = {4,4};
+        String[] metaStrings = this.metaTiling.split("x");
+        
+        int[] metaWidthHeight = { Integer.parseInt(metaStrings[0]), Integer.parseInt(metaStrings[1])};
+        
         // TODO We're dropping the styles now...
         return new WMSLayer(name, this.cacheFactory,
-                wmsurl, mimeFormats, grids, metaWidthHeight);
+                wmsurl, mimeFormats, grids, metaWidthHeight, this.vendorParameters);
     }