054af09032
This updates ESLint and our shared eslint-config-openlayers to use Prettier. Most formatting changes were automatically applied with this:
npm run lint -- --fix
A few manual changes were required:
* In `examples/offscreen-canvas.js`, the `//eslint-disable-line` comment needed to be moved to the appropriate line to disable the error about the `'worker-loader!./offscreen-canvas.worker.js'` import.
* In `examples/webpack/exapmle-builder.js`, spaces could not be added after a couple `function`s for some reason. While editing this, I reworked `ExampleBuilder` to be a class.
* In `src/ol/format/WMSGetFeatureInfo.js`, the `// @ts-ignore` comment needed to be moved down one line so it applied to the `parsersNS` argument.
28 lines
858 B
JavaScript
28 lines
858 B
JavaScript
/**
|
|
* @module ol/uri
|
|
*/
|
|
|
|
/**
|
|
* Appends query parameters to a URI.
|
|
*
|
|
* @param {string} uri The original URI, which may already have query data.
|
|
* @param {!Object} params An object where keys are URI-encoded parameter keys,
|
|
* and the values are arbitrary types or arrays.
|
|
* @return {string} The new URI.
|
|
*/
|
|
export function appendParams(uri, params) {
|
|
const keyParams = [];
|
|
// Skip any null or undefined parameter values
|
|
Object.keys(params).forEach(function (k) {
|
|
if (params[k] !== null && params[k] !== undefined) {
|
|
keyParams.push(k + '=' + encodeURIComponent(params[k]));
|
|
}
|
|
});
|
|
const qs = keyParams.join('&');
|
|
// remove any trailing ? or &
|
|
uri = uri.replace(/[?&]$/, '');
|
|
// append ? or & depending on whether uri has existing parameters
|
|
uri = uri.indexOf('?') === -1 ? uri + '?' : uri + '&';
|
|
return uri + qs;
|
|
}
|