diff --git a/plugins/input/postgis/postgis.cpp b/plugins/input/postgis/postgis.cpp index 156b289a1..708065720 100644 --- a/plugins/input/postgis/postgis.cpp +++ b/plugins/input/postgis/postgis.cpp @@ -125,14 +125,12 @@ postgis_datasource::postgis_datasource(parameters const& params) int type_oid = rs->getTypeOID(i); switch (type_oid) { - case 17285: // geometry - desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Geometry)); - break; case 21: // int2 case 23: // int4 desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Integer,false,length)); break; - case 701: // float8 + case 700: // float4 + case 701: // float8 desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Double,false,length)); case 1042: // bpchar case 1043: // varchar @@ -140,8 +138,9 @@ postgis_datasource::postgis_datasource(parameters const& params) desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::String)); break; default: // shouldn't get here +#ifdef MAPNIK_DEBUG clog << "unknown type_oid="< rs=conn->executeQuery(s.str(),1); return featureset_ptr(new postgis_featureset(rs,props.size())); } diff --git a/plugins/input/postgis/postgisfs.cpp b/plugins/input/postgis/postgisfs.cpp index eca4b1d85..d66dc0d25 100644 --- a/plugins/input/postgis/postgisfs.cpp +++ b/plugins/input/postgis/postgisfs.cpp @@ -56,7 +56,7 @@ feature_ptr postgis_featureset::next() std::string name = rs_->getFieldName(pos); const char* buf=rs_->getValue(pos); int oid = rs_->getTypeOID(pos); - + if (oid==23) //int4 { int val = int4net(buf); @@ -85,8 +85,10 @@ feature_ptr postgis_featureset::next() } else { +#ifdef MAPNIK_DEBUG std::clog << "uknown OID = " << oid << " FIXME \n"; - boost::put(*feature,name,0); +#endif + //boost::put(*feature,name,0); } } ++count_;