Remove vector code from files
This commit is contained in:
@@ -1,30 +1,9 @@
|
||||
goog.provide('ol.source.WMSGetFeatureInfoMethod');
|
||||
goog.provide('ol.source.wms');
|
||||
|
||||
goog.require('goog.net.XhrIo');
|
||||
goog.require('goog.object');
|
||||
goog.require('goog.uri.utils');
|
||||
|
||||
|
||||
/**
|
||||
* Method to use to get WMS feature info.
|
||||
* @enum {string}
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.source.WMSGetFeatureInfoMethod = {
|
||||
/**
|
||||
* Load the info in an IFRAME. Only works with `text/html` and `text/plain` as
|
||||
* `INFO_FORMAT`.
|
||||
*/
|
||||
IFRAME: 'iframe',
|
||||
/**
|
||||
* Use an asynchronous GET request. Requires CORS headers or a server at the
|
||||
* same origin as the application script.
|
||||
*/
|
||||
XHR_GET: 'xhr_get'
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @param {string} baseUrl WMS base URL.
|
||||
* @param {Object.<string, string|number>} params Request parameters.
|
||||
@@ -61,62 +40,3 @@ ol.source.wms.getUrl =
|
||||
|
||||
return goog.uri.utils.appendParamsFromMap(baseUrl, baseParams);
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @param {string} url URL as provided by the url function.
|
||||
* @param {ol.Pixel} pixel Pixel.
|
||||
* @param {ol.source.WMSGetFeatureInfoOptions} options Options as defined in the
|
||||
* source.
|
||||
* @param {function(string)} success Callback function for successful queries.
|
||||
* @param {function()=} opt_error Optional callback function for unsuccessful
|
||||
* queries.
|
||||
*/
|
||||
ol.source.wms.getFeatureInfo =
|
||||
function(url, pixel, options, success, opt_error) {
|
||||
// TODO: This could be done in a smarter way if the url function was not a
|
||||
// closure
|
||||
url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo')
|
||||
.replace(ol.source.wms.regExes.layers, 'LAYERS=$1&QUERY_LAYERS=$1');
|
||||
options = /** @type {ol.source.WMSGetFeatureInfoOptions} */
|
||||
(goog.isDef(options) ? goog.object.clone(options) : {});
|
||||
var localOptions = /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({
|
||||
method: ol.source.WMSGetFeatureInfoMethod.IFRAME,
|
||||
params: {}
|
||||
});
|
||||
goog.object.extend(localOptions, options);
|
||||
var params = {'INFO_FORMAT': 'text/html'},
|
||||
version = parseFloat(url.match(ol.source.wms.regExes.version)[1]),
|
||||
x = Math.round(pixel[0]),
|
||||
y = Math.round(pixel[1]);
|
||||
if (version >= 1.3) {
|
||||
goog.object.extend(params, {'I': x, 'J': y});
|
||||
} else {
|
||||
goog.object.extend(params, {'X': x, 'Y': y});
|
||||
}
|
||||
goog.object.extend(params, localOptions.params);
|
||||
url = goog.uri.utils.appendParamsFromMap(url, params);
|
||||
if (localOptions.method == ol.source.WMSGetFeatureInfoMethod.IFRAME) {
|
||||
goog.global.setTimeout(function() {
|
||||
success('<iframe seamless src="' + url + '"></iframe>');
|
||||
}, 0);
|
||||
} else if (localOptions.method == ol.source.WMSGetFeatureInfoMethod.XHR_GET) {
|
||||
goog.net.XhrIo.send(url, function(event) {
|
||||
var xhr = event.target;
|
||||
if (xhr.isSuccess()) {
|
||||
success(xhr.getResponseText());
|
||||
} else if (goog.isDef(opt_error)) {
|
||||
opt_error();
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @enum {RegExp}
|
||||
*/
|
||||
ol.source.wms.regExes = {
|
||||
layers: (/LAYERS=([^&]+)/),
|
||||
version: (/VERSION=([^&]+)/)
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user