From 9905b204480d0924829f9d695fbe12f0060bbf34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 17 Apr 2018 11:22:05 +0200 Subject: [PATCH] Improve naming --- lib/cartodb/middleware/coordinates.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/cartodb/middleware/coordinates.js b/lib/cartodb/middleware/coordinates.js index 9a83f181..3d1e54af 100644 --- a/lib/cartodb/middleware/coordinates.js +++ b/lib/cartodb/middleware/coordinates.js @@ -1,5 +1,5 @@ -const positiveIntegerNumber = /^\d+$/; -const integerNumber = /^-?\d+$/; +const positiveIntegerNumberRegExp = /^\d+$/; +const integerNumberRegExp = /^-?\d+$/; const invalidZoomMessage = function (zoom) { return `Invalid zoom value (${zoom}). It should be an integer number greather or equal to 0`; }; @@ -14,7 +14,7 @@ module.exports = function coordinates (validate = { z: true, x: true, y: true }) return function coordinatesMiddleware (req, res, next) { const { z, x, y } = req.params; - if (validate.z && !positiveIntegerNumber.test(z)) { + if (validate.z && !positiveIntegerNumberRegExp.test(z)) { const err = new Error(invalidZoomMessage(z)); err.http_status = 400; @@ -22,14 +22,14 @@ module.exports = function coordinates (validate = { z: true, x: true, y: true }) } // Negative values for x param are valid. The x param is wrapped - if (validate.x && !integerNumber.test(x)) { + if (validate.x && !integerNumberRegExp.test(x)) { const err = new Error(invalidCoordXMessage(x)); err.http_status = 400; return next(err); } - if (validate.y && !positiveIntegerNumber.test(y)) { + if (validate.y && !positiveIntegerNumberRegExp.test(y)) { const err = new Error(invalidCoordYMessage(y)); err.http_status = 400;