Changeset 395

Timestamp:

09/09/08 16:19:47 (4 months ago)

Author:

arneke

Message:

Minor KML tweaks, configuration file update

Location:

trunk/geowebcache/src/main

Files:

• java/org/geowebcache/layer/GridCalculator.java (modified) (1 diff)
• java/org/geowebcache/layer/wms/WMSHttpHelper.java (modified) (1 diff)
• java/org/geowebcache/service/kml/KMLService.java (modified) (2 diffs)
• resources/geowebcache.xml (modified) (2 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/layer/GridCalculator.java

@@ -400 +400 @@
         }
         
-        //TODO fix negative number to return more than one top tile
+        //TODO fix negative number to return more than one top tile, 
+        // give -1 for z, but then -{x} , -{y}
         
         // Exception for EPSG:4326, which can zoom out to two tiles
-        if (gridX == 2 && gridY == 1) {
+        if (gridX == 2 && gridY == 1 && boundsGridLevels[0][0] != boundsGridLevels[0][2] ) {
             zoomedOutGridLoc = new int[3];
             zoomedOutGridLoc[0] = -1;

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

@@ -177 +177 @@
             String responseMime = wmsBackendCon.getContentType();
             String requestMime = wmsparams.getFormat();
-            if (responseMime != null
+            if (responseCode != 204
+                    && responseMime != null
                     && ! mimeStringCheck(requestMime,responseMime)) {
                 String message = null;

trunk/geowebcache/src/main/java/org/geowebcache/service/kml/KMLService.java

@@ -27 +27 @@
 import org.apache.commons.logging.LogFactory;
 import org.geowebcache.GeoWebCacheException;
+import org.geowebcache.layer.OutOfBoundsException;
 import org.geowebcache.layer.SRS;
 import org.geowebcache.layer.TileLayer;
@@ -350 +351 @@
             try {
                 tile.setWrapperMimeType(null);
-                tileLayer.getTile(tile);
+                try { 
+                    tileLayer.getTile(tile);
+                } catch (OutOfBoundsException oobe) {
+                    log.error("Out of bounds: " + Arrays.toString(tile.getTileIndex()) 
+                            + " should never habe been linked to.");
+                    throw oobe;
+                }
                 tile.setWrapperMimeType(XMLMime.kmz);
             } catch (IOException ioe) {

trunk/geowebcache/src/main/resources/geowebcache.xml

@@ -69 +69 @@
   </grids>
   <wmsUrl>
-    <string>http://sigma.openplans.org:80/geoserver/wms</string>
+    <string>http://sigma.openplans.org/geoserver/wms</string>
   </wmsUrl>
   <wmsLayers>topp:states</wmsLayers>
@@ -140 +140 @@
   -->
   <wmsUrl>
-    <string>http://sigma.openplans.org:80/geoserver/wms</string>
+    <string>http://sigma.openplans.org/geoserver/wms</string>
     <string>http://atlas.openplans.org:8080/geoserver/wms</string>
   </wmsUrl>