ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

polyline: Improved decoding loops to be more robust

Browse Source
This commit is contained in:
Tobias Bieniek
2013-03-11 20:32:25 +01:00
parent 8330586ee2
commit 0df5b4cad2
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/ol/parser/polyline.js
View File

@@ -213,19 +213,22 @@ ol.parser.polyline.encodeUnsignedIntegers = function(numbers) {
ol.parser.polyline.decodeUnsignedIntegers = function(encoded) {
var numbers = new Array();
var current = 0;
var shift = 0;
var encodedLength = encoded.length;
for (var i = 0; i < encodedLength;) {
var result = 0;
var shift = 0;
for (var i = 0; i < encodedLength; ++i) {
var b = encoded.charCodeAt(i) - 63;
var b;
do {
b = encoded.charCodeAt(i++) - 63;
result |= (b & 0x1f) << shift;
current |= (b & 0x1f) << shift;
if (b < 0x20) {
numbers.push(current);
current = 0;
shift = 0;
} else {
shift += 5;
} while (b >= 0x20);
numbers.push(result);
}
}
return numbers;
@@ -316,12 +319,17 @@ ol.parser.polyline.decodeUnsignedInteger = function(encoded) {
var result = 0;
var shift = 0;
var b, i = 0;
do {
b = encoded.charCodeAt(i++) - 63;
var encodedLength = encoded.length;
for (var i = 0; i < encodedLength; ++i) {
var b = encoded.charCodeAt(i) - 63;
result |= (b & 0x1f) << shift;
if (b < 0x20)
break;
shift += 5;
} while (b >= 0x20);
}
return result;
};