sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix numeric2string to output the correct number of digits following the decimal point. Hopefully this covers all the cases correctly.

Browse source
This commit is contained in:
Jon Burgess 2009-09-12 11:31:53 +00:00
parent e8cff82a53
commit 6485039a0e
1 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
plugins/input/postgis/postgisfs.cpp
View file

@ -84,33 +84,47 @@ std::string numeric2string(const char* buf)
}
}
ss << digits[d++];
} else
if (d == 0)
ss << "0";
else
ss << "0000";
i--;
} else {
if (d == 0)
ss << "0";
else
ss << "0000";
}
i--;
}
if (dscale > 0)
{
ss << '.';
while ( i >= -dscale)
// dscale counts the number of decimal digits following the point, not the numeric digits
while (dscale > 0)
{
if (i <= weight && d < ndigits) {
// All the digits following the decimal point must be padded
switch(digits[d]) {
case 0 ... 9:
ss << "000";
break;
case 10 ... 99:
ss << "00";
break;
case 100 ... 999:
ss << "0";
break;
}
ss << digits[d++];
int value;
if (i <= weight && d < ndigits)
value = digits[d++];
else
value = 0;
// Output up to 4 decimal digits for this value
if (dscale > 0) {
ss << (value / 1000);
value %= 1000;
dscale--;
}
if (dscale > 0) {
ss << (value / 100);
value %= 100;
dscale--;
}
if (dscale > 0) {
ss << (value / 10);
value %= 10;
dscale--;
}
if (dscale > 0) {
ss << value;
dscale--;
}
i--;
}
}