ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

URL switching for all REST encoded WMTS layers.

Browse Source
This commit is contained in:
ahocevar
2012-05-25 14:54:06 +02:00
parent a29009be91
commit 99dd0bbcb2
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Layer/WMTS.js
+11 -7
View File
@@ -417,10 +417,19 @@ OpenLayers.Layer.WMTS = OpenLayers.Class(OpenLayers.Layer.Grid, {
var matrixId = this.matrix.identifier; var matrixId = this.matrix.identifier;
var dimensions = this.dimensions, params; var dimensions = this.dimensions, params;
if (OpenLayers.Util.isArray(this.url)) {
url = this.selectUrl([
this.version, this.style, this.matrixSet,
this.matrix.identifier, info.row, info.col
].join(","), this.url);
} else {
url = this.url;
}
if (this.requestEncoding.toUpperCase() === "REST") { if (this.requestEncoding.toUpperCase() === "REST") {
params = this.params; params = this.params;
if (typeof this.url === "string" && this.url.indexOf("{") !== -1) { if (url.indexOf("{") !== -1) {
var template = this.url.replace(/\{/g, "${"); var template = url.replace(/\{/g, "${");
var context = { var context = {
// spec does not make clear if capital S or not // spec does not make clear if capital S or not
style: this.style, Style: this.style, style: this.style, Style: this.style,
@@ -454,11 +463,6 @@ OpenLayers.Layer.WMTS = OpenLayers.Class(OpenLayers.Layer.Grid, {
path = path + this.matrixSet + "/" + this.matrix.identifier + path = path + this.matrixSet + "/" + this.matrix.identifier +
"/" + info.row + "/" + info.col + "." + this.formatSuffix; "/" + info.row + "/" + info.col + "." + this.formatSuffix;
if (OpenLayers.Util.isArray(this.url)) {
url = this.selectUrl(path, this.url);
} else {
url = this.url;
}
if (!url.match(/\/$/)) { if (!url.match(/\/$/)) {
url = url + "/"; url = url + "/";
} }