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

Use regular expression instead of String#endsWith() check

Browse Source
This commit is contained in:
Andreas Hocevar
2016-02-14 18:05:15 +01:00
parent 09517659b1
commit cd2dfc7f10
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ol/source/tilearcgisrestsource.js
View File

@@ -2,7 +2,6 @@ goog.provide('ol.source.TileArcGISRest');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.math'); goog.require('goog.math');
goog.require('goog.string');
goog.require('goog.uri.utils'); goog.require('goog.uri.utils');
goog.require('ol'); goog.require('ol');
goog.require('ol.TileCoord'); goog.require('ol.TileCoord');
@@ -109,20 +108,13 @@ ol.source.TileArcGISRest.prototype.getRequestUrl_ = function(tileCoord, tileSize
url = urls[index]; url = urls[index];
} }
if (!goog.string.endsWith(url, '/')) { var modifiedUrl = url
url = url + '/'; .replace(/MapServer\/?$/, 'MapServer/export')
} .replace(/ImageServer\/?$/, 'ImageServer/exportImage');
if (modifiedUrl == url) {
// If a MapServer, use export. If an ImageServer, use exportImage.
if (goog.string.endsWith(url, 'MapServer/')) {
url = url + 'export';
} else if (goog.string.endsWith(url, 'ImageServer/')) {
url = url + 'exportImage';
} else {
goog.asserts.fail('Unknown Rest Service', url); goog.asserts.fail('Unknown Rest Service', url);
} }
return goog.uri.utils.appendParamsFromMap(modifiedUrl, params);
return goog.uri.utils.appendParamsFromMap(url, params);
}; };