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

+ fixed 'optional' measure in multipointz

Browse source
This commit is contained in:
Artem Pavlenko 2010-01-20 15:26:14 +00:00
parent bff83c6ac0
commit af2440b4e7
1 changed files with 45 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,10 +59,9 @@ shape_featureset<filterT>::shape_featureset(const filterT& filter,
template <typename filterT>
feature_ptr shape_featureset<filterT>::next()
{
using mapnik::point_impl;
std::streampos pos=shape_.shp().pos();
if (pos < std::streampos(file_length_ * 2))
{
shape_.move_to(pos);
@ -81,7 +80,7 @@ feature_ptr shape_featureset<filterT>::next()
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
shape_.shp().read_double();//m
shape_.shp().skip(8); //m
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
@ -91,8 +90,7 @@ feature_ptr shape_featureset<filterT>::next()
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
shape_.shp().read_double();//z
shape_.shp().read_double();//m
shape_.shp().skip(8*2); // m, z
geometry2d * point=new point_impl;
point->move_to(x,y);
feature->add_geometry(point);
@ -101,25 +99,23 @@ feature_ptr shape_featureset<filterT>::next()
else
{
while (!filter_.pass(shape_.current_extent()))
{
unsigned reclen=shape_.reclength_;
{
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:
case shape_io::shape_multipointm:
case shape_io::shape_multipointz:
{
int num_points = shape_.shp().read_ndr_integer();
for (int i=0; i< num_points;++i)
@ -130,10 +126,48 @@ feature_ptr shape_featureset<filterT>::next()
point->move_to(x,y);
feature->add_geometry(point);
}
// ignore m and z for now
++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();
@ -209,7 +243,6 @@ feature_ptr shape_featureset<filterT>::next()
}
}
template <typename filterT>
shape_featureset<filterT>::~shape_featureset() {}