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

formatting

Browse source
This commit is contained in:
Dane Springmeyer 2010-01-29 01:54:15 +00:00
parent 0c8c91b0f8
commit 5f8d1713a8
1 changed files with 180 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

357
plugins/input/shape/shape_featureset.cpp
View file

@ -43,15 +43,15 @@ shape_featureset<filterT>::shape_featureset(const filterT& filter,
typename std::set<std::string>::const_iterator pos=attribute_names.begin();
while (pos!=attribute_names.end())
{
for (int i=0;i<shape_.dbf().num_fields();++i)
{
if (shape_.dbf().descriptor(i).name_ == *pos)
{
attr_ids_.push_back(i);
break;
}
}
++pos;
for (int i=0;i<shape_.dbf().num_fields();++i)
{
if (shape_.dbf().descriptor(i).name_ == *pos)
{
attr_ids_.push_back(i);
break;
}
}
++pos;
}
}
@ -64,182 +64,185 @@ feature_ptr shape_featureset<filterT>::next()
if (pos < std::streampos(file_length_ * 2))
{
shape_.move_to(pos);
int type=shape_.type();
feature_ptr feature(new Feature(shape_.id_));
if (type == shape_io::shape_point)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
++count_;
}
else if (type == shape_io::shape_pointm)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
shape_.shp().skip(8); //m
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
++count_;
}
else if (type == shape_io::shape_pointz)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
shape_.shp().skip(8*2); // m, z
geometry2d * point=new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
++count_;
}
else
{
while (!filter_.pass(shape_.current_extent()))
{
int reclen=shape_.reclength_;
if (!shape_.shp().is_eof())
{
long pos = shape_.shp().pos();
//std::cerr << pos << " " << reclen << std::endl;
shape_.move_to(pos + 2 * reclen - 36);
}
else
{
return feature_ptr();
}
}
switch (type)
{
case shape_io::shape_multipoint:
{
int num_points = shape_.shp().read_ndr_integer();
for (int i=0; i< num_points;++i)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
}
++count_;
break;
}
case shape_io::shape_multipointm:
{
int num_points = shape_.shp().read_ndr_integer();
for (int i=0; i< num_points;++i)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
}
// skip m
shape_.shp().skip(2*8 + 8*num_points);
++count_;
break;
}
case shape_io::shape_multipointz:
{
unsigned num_points = shape_.shp().read_ndr_integer();
for (unsigned i=0; i< num_points;++i)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
}
// skip z
shape_.shp().skip(2*8 + 8*num_points);
// check if we have measure data
if ( shape_.reclength_ == num_points * 16 + 36)
{
// skip m
shape_.shp().skip(2*8 + 8*num_points);
}
++count_;
break;
}
case shape_io::shape_polyline:
{
geometry2d * line = shape_.read_polyline();
feature->add_geometry(line);
++count_;
break;
}
case shape_io::shape_polylinem:
{
geometry2d * line = shape_.read_polylinem();
feature->add_geometry(line);
++count_;
break;
}
case shape_io::shape_polylinez:
{
geometry2d * line = shape_.read_polylinez();
feature->add_geometry(line);
++count_;
break;
shape_.move_to(pos);
int type=shape_.type();
feature_ptr feature(new Feature(shape_.id_));
if (type == shape_io::shape_point)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
++count_;
}
else if (type == shape_io::shape_pointm)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
shape_.shp().skip(8); //m
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
++count_;
}
else if (type == shape_io::shape_pointz)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
shape_.shp().skip(8*2); // m, z
geometry2d * point=new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
++count_;
}
else
{
while (!filter_.pass(shape_.current_extent()))
{
int reclen=shape_.reclength_;
if (!shape_.shp().is_eof())
{
long pos = shape_.shp().pos();
//std::cerr << pos << " " << reclen << std::endl;
shape_.move_to(pos + 2 * reclen - 36);
}
else
{
return feature_ptr();
}
}
case shape_io::shape_polygon:
{
geometry2d * poly = shape_.read_polygon();
feature->add_geometry(poly);
++count_;
break;
}
case shape_io::shape_polygonm:
{
geometry2d * poly = shape_.read_polygonm();
feature->add_geometry(poly);
++count_;
break;
}
case shape_io::shape_polygonz:
switch (type)
{
geometry2d * poly = shape_.read_polygonz();
feature->add_geometry(poly);
++count_;
break;
case shape_io::shape_multipoint:
{
int num_points = shape_.shp().read_ndr_integer();
for (int i=0; i< num_points;++i)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
}
++count_;
break;
}
case shape_io::shape_multipointm:
{
int num_points = shape_.shp().read_ndr_integer();
for (int i=0; i< num_points;++i)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
}
// skip m
shape_.shp().skip(2*8 + 8*num_points);
++count_;
break;
}
case shape_io::shape_multipointz:
{
unsigned num_points = shape_.shp().read_ndr_integer();
for (unsigned i=0; i< num_points;++i)
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
}
// skip z
shape_.shp().skip(2*8 + 8*num_points);
// check if we have measure data
if ( shape_.reclength_ == num_points * 16 + 36)
{
// skip m
shape_.shp().skip(2*8 + 8*num_points);
}
++count_;
break;
}
case shape_io::shape_polyline:
{
geometry2d * line = shape_.read_polyline();
feature->add_geometry(line);
++count_;
break;
}
case shape_io::shape_polylinem:
{
geometry2d * line = shape_.read_polylinem();
feature->add_geometry(line);
++count_;
break;
}
case shape_io::shape_polylinez:
{
geometry2d * line = shape_.read_polylinez();
feature->add_geometry(line);
++count_;
break;
}
case shape_io::shape_polygon:
{
geometry2d * poly = shape_.read_polygon();
feature->add_geometry(poly);
++count_;
break;
}
case shape_io::shape_polygonm:
{
geometry2d * poly = shape_.read_polygonm();
feature->add_geometry(poly);
++count_;
break;
}
case shape_io::shape_polygonz:
{
geometry2d * poly = shape_.read_polygonz();
feature->add_geometry(poly);
++count_;
break;
}
}
}
}
if (attr_ids_.size())
{
shape_.dbf().move_to(shape_.id_);
std::vector<int>::const_iterator pos=attr_ids_.begin();
std::vector<int>::const_iterator end=attr_ids_.end();
while (pos!=end)
{
try
{
shape_.dbf().add_attribute(*pos,*tr_,*feature);//TODO optimize!!!
}
catch (...)
{
std::clog << "error processing attributes " << std::endl;
}
++pos;
}
}
return feature;
}
if (attr_ids_.size())
{
shape_.dbf().move_to(shape_.id_);
std::vector<int>::const_iterator pos=attr_ids_.begin();
std::vector<int>::const_iterator end=attr_ids_.end();
while (pos!=end)
{
try
{
shape_.dbf().add_attribute(*pos,*tr_,*feature);//TODO optimize!!!
}
catch (...)
{
std::clog << "error processing attributes " << std::endl;
}
++pos;
}
}
return feature;
}
else
{
#ifdef MAPNIK_DEBUG
std::clog<<" total shapes read="<<count_<<"\n";
std::clog<<" total shapes read="<<count_<<"\n";
#endif
return feature_ptr();
return feature_ptr();
}
}