Make sure baseURL are absolute when printing #270
Conversation
| @@ -271,7 +271,7 @@ ngeo.Print.prototype.encodeWmsLayer_ = function(arr, opacity, url, params) { | |||
| goog.object.remove(customParams, 'FORMAT'); | |||
|
|
|||
| var object = /** @type {MapFishPrintWmsLayer} */ ({ | |||
| baseURL: url, | |||
| baseURL: url.match(/^https?:/) ? url : 'http:' + url, | |||
There was a problem hiding this comment.
This assume that, if url doesn't start with http or https it will start with //. That doesn't sound correct to me. What if url looks like path/to/wms or /path/to/wms?
GeoExt's print provider includes a getAbsoluteUrl function that we could copy to ngeo. The function would be simpler in ngeo as we don't need to support IE < 9.
|
PR updated: I now use the getAbsuloteUrl from geoExt. |
| * @param {string} url | ||
| * @return {string} Absolute URL. | ||
| */ | ||
| ngeo.Print.prototype.getAbsoluteUrl_ = function(url) { |
There was a problem hiding this comment.
You can make this function static: ngeo.Print.getAbsolute_.
There was a problem hiding this comment.
And do not forget the @private annotation.
|
PR update:
|
| @@ -252,14 +252,16 @@ ngeo.Print.prototype.encodeImageWmsLayer_ = function(arr, layer) { | |||
|
|
|||
| var url = source.getUrl(); | |||
| var params = source.getParams(); | |||
| this.encodeWmsLayer_(arr, layer.getOpacity(), url, params); | |||
| if (goog.isDefAndNotNull(url)) { | |||
There was a problem hiding this comment.
You can just use if (goog.isDef(url)) here no?
There was a problem hiding this comment.
I think so yes. Is it problematic to use goog.isDefAndNotNull(url) instead?
There was a problem hiding this comment.
It's more processing. It's confusing for readers of the code, who may think that source.getUrl() may return null. I've become strict with typing, and I think it's right :)
|
This PR's branch needs to be rebased. |
- Import the getAbsolute function from GeoExt - Drop compatibility for IE < 9
|
Make sure baseURL are absolute when printing
|
Thanks. |
No description provided.