Merge pull request #455 from ahocevar/455

Support Subdomains in Openlayers WMTS. r=@sbrunner
This commit is contained in:
ahocevar
2012-09-13 07:07:11 -07:00

View File

@@ -418,10 +418,19 @@ OpenLayers.Layer.WMTS = OpenLayers.Class(OpenLayers.Layer.Grid, {
var matrixId = this.matrix.identifier;
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") {
params = this.params;
if (typeof this.url === "string" && this.url.indexOf("{") !== -1) {
var template = this.url.replace(/\{/g, "${");
if (url.indexOf("{") !== -1) {
var template = url.replace(/\{/g, "${");
var context = {
// spec does not make clear if capital S or not
style: this.style, Style: this.style,
@@ -455,11 +464,6 @@ OpenLayers.Layer.WMTS = OpenLayers.Class(OpenLayers.Layer.Grid, {
path = path + this.matrixSet + "/" + this.matrix.identifier +
"/" + 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(/\/$/)) {
url = url + "/";
}