Merge branch 'master' into wmtscaps

2011-11-07 22:42:30 +01:00
parent 797c479b6e 2555813762
commit 6c5c468e91
10 changed files with 98 additions and 33 deletions
@@ -114,10 +114,13 @@ OpenLayers.Format.WMTSCapabilities = OpenLayers.Class(OpenLayers.Format.XML.Vers
            
            layer = new OpenLayers.Layer.WMTS(
                OpenLayers.Util.applyDefaults(config, {
-                    url: capabilities.operationsMetadata.GetTile.dcp.http.get,
+                    url: config.requestEncoding === "REST" && layerDef.resourceUrl ?
+                        layerDef.resourceUrl.tile.template :
+                        capabilities.operationsMetadata.GetTile.dcp.http.get,
                    name: layerDef.title,
                    style: style.identifier,
-                    matrixIds: matrixSet.matrixIds
+                    matrixIds: matrixSet.matrixIds,
+                    tileFullExtent: matrixSet.bounds
                })
            );
        }