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

+ support of WKB geometry collection

Browse source
This commit is contained in:
Lucio Asnaghi 2010-11-18 21:52:20 +00:00
parent 23e1904dca
commit ba034abb1f
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/wkb.cpp
View file

@ -111,6 +111,7 @@ public:
read_multipolygon(feature);
break;
case wkbGeometryCollection:
read_collection(feature);
break;
default:
break;
@ -141,6 +142,7 @@ public:
read_multipolygon_2(feature);
break;
case wkbGeometryCollection:
read_collection_2(feature);
break;
default:
break;
@ -329,7 +331,6 @@ private:
read_coords(ar);
poly->set_capacity(capacity);
poly->move_to(ar[0].x,ar[0].y);
for (int j=1;j<num_points;++j)
{
poly->line_to(ar[j].x,ar[j].y);
@ -339,8 +340,28 @@ private:
}
feature.add_geometry(poly);
}
};
void read_collection(Feature & feature)
{
int num_geometries=read_integer();
for (int i=0;i<num_geometries;++i)
{
pos_+=1; // skip byte order
read(feature);
}
}
void read_collection_2(Feature & feature)
{
int num_geometries=read_integer();
for (int i=0;i<num_geometries;++i)
{
pos_+=1; // skip byte order
read_multi(feature);
}
}
};
void geometry_utils::from_wkb (Feature & feature,
const char* wkb,
unsigned size,