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

csv: use braces in all cases

Browse source
This commit is contained in:
Dane Springmeyer 2011-11-01 20:48:30 -04:00
parent 6dbb12e52c
commit 16ab2ba895
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/input/csv/csv_datasource.cpp
View file

@ -586,7 +586,9 @@ void csv_datasource::parse_csv(T& stream,
{
boost::put(*feature,fld_name,mapnik::value_null());
if (feature_count == 1)
{
desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::String));
}
}
// only true strings are this long
else if (value_length > 20)
@ -594,7 +596,9 @@ void csv_datasource::parse_csv(T& stream,
UnicodeString ustr = tr.transcode(value.c_str());
boost::put(*feature,fld_name,ustr);
if (feature_count == 1)
{
desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::String));
}
}
else if ((value[0] >= '0' && value[0] <= '9') || value[0] == '-')
@ -609,14 +613,18 @@ void csv_datasource::parse_csv(T& stream,
{
boost::put(*feature,fld_name,float_val);
if (feature_count == 1)
{
desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::Double));
}
}
else
{
int val = static_cast<int>(float_val);
boost::put(*feature,fld_name,val);
if (feature_count == 1)
{
desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::Integer));
}
}
}
else
@ -625,7 +633,9 @@ void csv_datasource::parse_csv(T& stream,
UnicodeString ustr = tr.transcode(value.c_str());
boost::put(*feature,fld_name,ustr);
if (feature_count == 1)
{
desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::String));
}
}
}
else
@ -635,13 +645,17 @@ void csv_datasource::parse_csv(T& stream,
{
boost::put(*feature,fld_name,true);
if (feature_count == 1)
{
desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::Boolean));
}
}
else if(value_lower == "false")
{
boost::put(*feature,fld_name,false);
if (feature_count == 1)
{
desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::Boolean));
}
}
else
{
@ -649,7 +663,9 @@ void csv_datasource::parse_csv(T& stream,
UnicodeString ustr = tr.transcode(value.c_str());
boost::put(*feature,fld_name,ustr);
if (feature_count == 1)
{
desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::String));
}
}
}
}