commit fffcd112f355966f3b3670cc79d3cd2524ad55ca
parent 3adb56b15b37367d2e824579143a6f8e9c17663c
Author: Sergej Orlov <wladimirych@gmail.com>
Date: Sat, 27 Oct 2018 19:57:07 +0200
[jnx] in hashState deserialize make less strict check for longitude #151
Diffstat:
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/lib/leaflet.control.jnx/hash-state.js b/src/lib/leaflet.control.jnx/hash-state.js
@@ -20,20 +20,30 @@ L.Control.JNX.include({
},
unserializeState: function(values) {
+
function validateFloat(value, min, max) {
value = parseFloat(value);
- if (isNaN(value) || value < min || value > max) {
+ if (isNaN(value)) {
throw new Error('INVALID VALUE');
}
return value;
}
+ function validateFloatRange(value, min, max) {
+ value = validateFloat(value);
+ if (value < min || value > max) {
+ throw new Error('INVALID VALUE');
+ }
+ return value;
+
+ }
+
if (values && values.length === 4) {
try {
- var south = validateFloat(values[0], -86, 86),
- west = validateFloat(values[1], -180, 180),
- north = validateFloat(values[2], -86, 86),
- east = validateFloat(values[3], -180, 180);
+ var south = validateFloatRange(values[0], -86, 86),
+ west = validateFloat(values[1]),
+ north = validateFloatRange(values[2], -86, 86),
+ east = validateFloat(values[3]);
} catch (e) {
if (e.message === 'INVALID VALUE') {
return false;