Changeset 371

Timestamp:

09/03/08 14:02:44 (4 months ago)

Author:

arneke

Message:

Attempt to add parent linking capability to KML and fix debuggrid. Google Earth tends to chew up all CPU with it, so commented out again.

Location:

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

Files:

• KMLDebugGridLayer.java (modified) (16 diffs)
• KMLService.java (modified) (7 diffs)

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

@@ -18 +18 @@
 
 import java.io.IOException;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Properties;
-import java.util.Vector;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.geowebcache.GeoWebCacheException;
 import org.geowebcache.cache.Cache;
@@ -32 +30 @@
 import org.geowebcache.cache.CacheKey;
 import org.geowebcache.layer.BadTileException;
+import org.geowebcache.layer.Grid;
 import org.geowebcache.layer.SRS;
 import org.geowebcache.layer.TileLayer;
 import org.geowebcache.mime.MimeType;
-import org.geowebcache.mime.XMLMime;
 import org.geowebcache.tile.Tile;
 import org.geowebcache.util.wms.BBOX;
@@ -52 +50 @@
     public static final int IS_KMZ = 100;
     
-    private static Log log = LogFactory.getLog(org.geowebcache.service.kml.KMLDebugGridLayer.class);
+    //private static Log log = LogFactory.getLog(org.geowebcache.service.kml.KMLDebugGridLayer.class);
     
     private static KMLDebugGridLayer instance;
@@ -61 +59 @@
     public void lazyLayerInitialization(CacheFactory c){
         //blah
+
     }
     
@@ -66 +65 @@
     
     private KMLDebugGridLayer() {
-        
+        super.grids = new Hashtable<SRS,Grid>();
+        grids.put(SRS.getEPSG4326(), new Grid(SRS.getEPSG4326(),BBOX.WORLD4326, BBOX.WORLD4326, null));
     }
     
@@ -77 +77 @@
     
     public void acquireLayerLock() {
-        // TODO Auto-generated method stub
-        //log.warn("acquireLayerLock()");
     }
 
     public void destroy() {
-        // TODO Auto-generated method stub
-        //log.warn("destroy()");
     }
 
     public Tile doNonMetatilingRequest(Tile tile) throws GeoWebCacheException {
-        // TODO Auto-generated method stub
-        //log.warn("doNonMetatilingRequest(int[] gridLoc, int idx,String formatStr)");
-        return null;
-    }
-
-    public BBOX getBboxForGridLoc(int srsIdx, int[] gridLoc) {
-        // TODO Auto-generated method stub
-        //log.warn("done - getBboxForGridLoc(int srsIdx, int[] gridLoc)");
-        
-        double tileWidth = 180.0 / Math.pow(2, gridLoc[2]);
-
-        BBOX bbox = new BBOX(
-                     -180.0 + tileWidth * gridLoc[0],
-                     -90.0 + tileWidth * gridLoc[1],
-                     -180.0 + tileWidth * (gridLoc[0] + 1),
-                     -90.0 + tileWidth * (gridLoc[1] + 1));
-        
-        return bbox;
-    }
-
-    public BBOX getBounds(int srsIdx) {
-        // TODO Auto-generated method stub
-        //log.warn("done - getBounds");
+        return null;
+    }
+
+    public BBOX getBounds(SRS srs) {
         return new BBOX(-180.0, -90.0, 180.0, 90.0);
     }
 
     public Cache getCache() {
-        // TODO Auto-generated method stub
-        //log.warn("getCache");
         return null;
     }
 
     public CacheKey getCacheKey() {
-        // TODO Auto-generated method stub
-        //log.warn("done - getCacheKey");
         return this;
     }
 
     public String getCachePrefix() {
-        // TODO Auto-generated method stub
-        //log.warn("done - getCachePrefix");
-        return null;
-    }
-
-    public int[][] getCoveredGridLevels(int srsIdx, BBOX bounds) {
-        // TODO Auto-generated method stub
-        //log.warn("getCoveredGridLevels(int srsIdx, BBOX bounds)");
         return null;
     }
 
     public MimeType getDefaultMimeType() {
-        // TODO Auto-generated method stub
-        //log.warn("getDefaultMimeType()");
-        return null;
-    }
-
-    public int[] getGridLocForBounds(int srsIdx, BBOX bounds)
-            throws BadTileException {
-        // TODO Auto-generated method stub
-        //log.warn("getGridLocForBounds(int srsIdx, BBOX bounds)");
         return null;
     }
 
     public int[] getMetaTilingFactors() {
-        // TODO Auto-generated method stub
-        //log.warn("getMetaTilingFactors()");
         return null;
     }
 
     public List <MimeType> getMimeTypes() {
-        // TODO Auto-generated method stub
-        //log.warn("getMimeTypes()");
         return null;
     }
 
     public String getName() {
-        // TODO Auto-generated method stub
-        //log.warn("done - getName()");
         return "Debug grid";
     }
 
     public SRS[] getProjections() {
-        // TODO Auto-generated method stub
-        //log.warn("done - getProjections()");
-        
         SRS[] srsList = { SRS.getEPSG4326() };
         return srsList;
@@ -177 +124 @@
 
     public double[] getResolutions(int srsIdx) {
-        // TODO Auto-generated method stub
-        //log.warn("getResolutions()");
         return null;
     }
 
     public Tile getTile(Tile tile)
-            throws GeoWebCacheException, IOException {
-        // TODO Auto-generated method stub
-        //log.warn("getResponse(TileRequest tileRequest,ServiceRequest servReq, HttpServletResponse response)");
-        
+            throws GeoWebCacheException, IOException {        
         int[] gridLoc = tile.getTileIndex();
 
-        BBOX bbox = this.getBboxForGridLoc(0, gridLoc);
+        BBOX bbox = this.getBboxForGridLoc(SRS.getEPSG4326(), gridLoc);
        
         String data  = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -226 +168 @@
     }
 
-    public int getSRSIndex(SRS reqSRS) {
-        // TODO Auto-generated method stub
-        //log.warn("done - getSRSIndex");
-        return 0;
-    }
-
     public String getStyles() {
-        // TODO Auto-generated method stub
-        //log.warn("getStyles()");
-        return null;
-    }
-
-    public int[][] getZoomInGridLoc(int srsIdx, int[] gridLoc) {
+        return null;
+    }
+
+    public int[][] getZoomInGridLoc(SRS srs, int[] gridLoc) {
         //log.warn("done - getZoomInGridLoc(srsIdx, gridLoc)");
         
@@ -265 +199 @@
 
     public int getZoomStart() {
-        // TODO Auto-generated method stub
-        //log.warn("getZoomStart()");
         return 0;
     }
 
     public int getZoomStop() {
-        // TODO Auto-generated method stub
-        //log.warn("getZoomStop()");
         return 25;
     }
 
-    public int[] getZoomedOutGridLoc(int srsIdx) {
-        // TODO Auto-generated method stub
-        //log.warn("done - getZoomedOutGridLoc");
-        int[] zoomedOutGridLoc = new int[3];
-        zoomedOutGridLoc[0] = -1;
-        zoomedOutGridLoc[1] = -1;
-        zoomedOutGridLoc[2] = -1;
-        
-        return zoomedOutGridLoc;
-    }
-
     public Boolean initialize() {
-        // TODO Auto-generated method stub
-        //log.warn("initialize()");
         return true;
     }
 
     public Boolean isInitialized() {
-        // TODO Auto-generated method stub
-        //log.warn("isInitialized()");
         return true;
     }
@@ -301 +216 @@
     public void putTile(Tile tile, Object ck, int[] gridLoc)
             throws CacheException {
-        // TODO Auto-generated method stub
-        //log.warn("putTile");
     }
 
     public void releaseLayerLock() {
-        // TODO Auto-generated method stub
-        //log.warn("releaseLayerLock()");
     }
 
     public void setExpirationHeader(HttpServletResponse response) {
-        // TODO Auto-generated method stub
-        //log.warn("setExpirationHeader");
     }
 
     public String supportsBbox(SRS srs, BBOX bounds)
             throws GeoWebCacheException {
-        // TODO Auto-generated method stub
-        //log.warn("supportsBbox");
         return null;
     }
 
     public boolean supportsFormat(String formatStr) throws GeoWebCacheException {
-        // TODO Auto-generated method stub
-        //log.warn("supportsFormat");
         return false;
     }
 
     public boolean supportsSRS(SRS srs) throws GeoWebCacheException {
-        // TODO Auto-generated method stub
-        //log.warn("supportsProjection");
-        return false;
-    }
-
-    // Returns the KML for the tile, but not a cached KMZ overlay
-//    public boolean tryCacheFetch(Tile tile) {
-//        // TODO Auto-generated method stub
-//        //log.warn("done - tryCacheFetch");
-//        
-//        Vector<Integer> lst = (Vector<Integer>) tile;
-//        
-//        int kmz = lst.get(0);
-//        
-//        if(kmz != KMLDebugGridLayer.IS_KMZ) {
-//            return true;
-//        } else {
-//            System.out.println("OOPS");
-//        }
-//        
-//        return false;
-//    }
+        return false;
+    }
 
     public boolean get(Tile tile, long ttl) throws CacheException {
-        // TODO Auto-generated method stub
+
         return true;
     }
 
     public String getDefaultKeyBeanId() {
-        // TODO Auto-generated method stub
+
         return null;
     }
 
     public String getDefaultPrefix(String param) throws CacheException {
-        // TODO Auto-generated method stub
+
         return null;
     }
@@ -369 +254 @@
     
     public void init(Properties props) throws CacheException {
-        // TODO Auto-generated method stub
+
         
     }
 
     public boolean remove(Tile tile) throws CacheException {
-        // TODO Auto-generated method stub
+
         return false;
     }
 
     public void removeAll() throws CacheException {
-        // TODO Auto-generated method stub
+
         
     }
@@ -385 +270 @@
     /** Cache interface **/
     public void set(Object key, Object obj, long ttl) throws CacheException {
-        // TODO Auto-generated method stub
+
         
     }
 
     public void setDefaultKeyBeanId(String defaultKeyBeanId) {
-        // TODO Auto-generated method stub
+
         
     }
 
     public void setUp(String cachePrefix) throws CacheException {
-        // TODO Auto-generated method stub
+
         
     }
@@ -401 +286 @@
     public void setApplicationContext(ApplicationContext arg0)
             throws BeansException {
-        // TODO Auto-generated method stub
+
         
     }
@@ -421 +306 @@
 
     public int getType() {
-        // TODO Auto-generated method stub
+
         return 0;
     }
 
     public void init() {
-        // TODO Auto-generated method stub
+
         
     }
 
     public void putTile(Tile tile) throws CacheException {
-        // TODO Auto-generated method stub
+
         
     }
 
     public void set(Tile tile, long ttl) throws CacheException {
-        // TODO Auto-generated method stub
+
         
     }
 
     public boolean tryCacheFetch(Tile tile) {
-        // TODO Auto-generated method stub
+
         return false;
     }
@@ -447 +332 @@
     public boolean get(CacheKey keyProto, Tile tile, long ttl)
             throws CacheException, GeoWebCacheException {
-        // TODO Auto-generated method stub
+
         return false;
     }
 
     public boolean remove(CacheKey keyProto, Tile tile) throws CacheException {
-        // TODO Auto-generated method stub
         return false;
     }
@@ -458 +342 @@
     public void set(CacheKey keyProto, Tile tile, long ttl)
             throws CacheException, GeoWebCacheException {
-        // TODO Auto-generated method stub
-        
     }
 
     public Object createKey(Tile tile) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-
-    @Override
+        return null;
+    }
+
     public void setCacheFactory(CacheFactory cacheFactory) {
-        // TODO Auto-generated method stub
-        
-    }
-
-
-
-    @Override
+    }
+
     public BBOX getBboxForGridLoc(SRS srs, int[] gridLoc) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-
-    @Override
+        double tileWidth = 180.0 / Math.pow(2, gridLoc[2]);
+
+        BBOX bbox = new BBOX(
+                     -180.0 + tileWidth * gridLoc[0],
+                     -90.0 + tileWidth * gridLoc[1],
+                     -180.0 + tileWidth * (gridLoc[0] + 1),
+                     -90.0 + tileWidth * (gridLoc[1] + 1));
+        
+        return bbox;
+    }
+
     public int[][] getCoveredGridLevels(SRS srs, BBOX bounds) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-
-    @Override
+        return null;
+    }
+
     public int[] getGridLocForBounds(SRS srs, BBOX bounds)
             throws BadTileException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-
-    @Override
-    public int[][] getZoomInGridLoc(SRS srs, int[] gridLoc) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-
-    @Override
+        return null;
+    }
+
     public int[] getZoomedOutGridLoc(SRS srs) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
+        // log.warn("done - getZoomedOutGridLoc");
+        int[] zoomedOutGridLoc = new int[3];
+        zoomedOutGridLoc[0] = -1;
+        zoomedOutGridLoc[1] = -1;
+        zoomedOutGridLoc[2] = -1;
+
+        return zoomedOutGridLoc;
+
+    }
+
     public void seedTile(Tile tile, boolean tryCache)
             throws GeoWebCacheException, IOException {
-        // TODO Auto-generated method stub
         
     }

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

@@ -19 +19 @@
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Arrays;
 
 import javax.servlet.http.HttpServletRequest;
@@ -147 +148 @@
         if(tile.getLayerId().equalsIgnoreCase(KMLDebugGridLayer.LAYERNAME)) {
             tile.setHint(HINT_DEBUGGRID);
-        }
-        
+            tile.setRequestHandler(Tile.RequestHandler.SERVICE);
+        }
+        
+        //System.out.println(Arrays.toString(tile.getTileIndex()) + " " + tile.servletReq.getHeader("referer"));
         return tile;
     }
@@ -171 +174 @@
         }
         tile.setTileLayer(layer);
-        
         
         //TODO this needs to be done more nicely
@@ -406 +408 @@
                 tile.getMimeType() instanceof ImageMime));
 
+        buf.append("\n<!-- Network links to subtiles -->\n");
         // 2) Network links, only to tiles within bounds
         int[][] linkGridLocs = tileLayer.getZoomInGridLoc(srs, gridLoc);
@@ -421 +424 @@
                         linkGridLocs[i]);
                 
-                // Always use absolute URLs for these
-                String gridLocUrl = tile.getUrlPrefix() + gridLocString(linkGridLocs[i]) 
-                +"." +tile.getMimeType().getFileExtension()+ "." + tile.getWrapperMimeType().getFileExtension();
-
                 String gridLocStr = gridLocString(linkGridLocs[i]);
                 
-                buf.append(createNetworkLinkElement(tileLayer, linkBbox, gridLocUrl, gridLocStr));
+                // Always use absolute URLs for these
+                String gridLocUrl = tile.getUrlPrefix() 
+                    + gridLocStr +"." +tile.getMimeType().getFileExtension()
+                    + "." + tile.getWrapperMimeType().getFileExtension();
+
+                buf.append(createNetworkLinkElement(tileLayer, linkBbox, gridLocUrl, gridLocStr,-1));
                 //moreData++;
             }
         }
-
-        // 3) Overlay, should be relative 
+        
+// The following was a nice try, unfortunately Google Earth appears to go to 100% CPU etc...
+// and the pane on the left hand side with the tile tree doesn't really know what to do
+// with new parents....
+//
+//        buf.append("\n<!-- Network link to parent or sibling tile -->\n");
+//        // 4) Add link to parent or sibling tile
+//        //    Just in case someone comes in via a search result
+//        //    Sibling = other hemisphere, when at zoom level 0
+//        if(gridLoc[2] >= 0) {
+//            int z = gridLoc[2] - 1;
+//            int x = Math.min((int) Math.round((gridLoc[0] -0.01) / 2.0), 2*(1 << z) - 1);
+//            int y = Math.min((int) Math.round((gridLoc[1] -0.01) / 2.0), (1 << z) - 1);
+//            
+//            
+//            // Override if we're linking to the sibling top tile
+//            if(gridLoc[2] == 0 && tile.getLayer().getZoomedOutGridLoc(srs)[2] == -1) {
+//                if(gridLoc[0] == 0) {
+//                    x = 1;
+//                } else {
+//                    x = 0;
+//                }
+//                y = 0;
+//                z = 0;
+//            }
+//            
+//            int[] parentGridLoc = {x,y,z};
+//            
+//            BBOX linkBbox = tileLayer.getBboxForGridLoc(srs,parentGridLoc);
+//            
+//            // Absolute URLs for these
+//            String gridLocStr = gridLocString(parentGridLoc);
+//            
+//            String gridLocUrl = tile.getUrlPrefix() 
+//                + gridLocStr +"." +tile.getMimeType().getFileExtension()
+//                + "." + tile.getWrapperMimeType().getFileExtension();
+//            
+//            buf.append(createNetworkLinkElement(tileLayer, linkBbox, gridLocUrl, gridLocStr, 385));
+//        }
+        
+        buf.append("\n<!-- Network link to actual content -->\n");
+        // 5) Overlay, should be relative 
         if (tile.getMimeType() instanceof ImageMime) {
             buf.append(
@@ -442 +486 @@
             String gridLocStr = gridLocString(gridLoc);
             String gridLocUrl = gridLocStr + "." + tile.getMimeType().getFileExtension();
+            
             if(isPackaged) {
                 gridLocUrl = "data_" + gridLocUrl;
             }
-            buf.append(createNetworkLinkElement(tileLayer, bbox, gridLocUrl, gridLocStr));
+            
+            int maxLodPixels = -1;
+            if(tile.getLayer() instanceof KMLDebugGridLayer) {
+                maxLodPixels = 385;
+            }
+            
+            buf.append(createNetworkLinkElement(tileLayer, bbox, gridLocUrl, gridLocStr, maxLodPixels));
         }
 
@@ -489 +540 @@
      */
     private static String createNetworkLinkElement(
-            TileLayer layer, BBOX bbox, String gridLocUrl, String tileIdx) {
-        
-        int maxLodPixels = -1;
-        
-        
-        // Hack
-        if(layer instanceof KMLDebugGridLayer && gridLocUrl.startsWith("data_")) {
-            maxLodPixels = 385;
-        }
+            TileLayer layer, BBOX bbox, String gridLocUrl, String tileIdx, int maxLodPixels) {
       
         String xml = "\n<NetworkLink>"