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

- cleaned up readability of occi featureset by using named const variables

Browse source
This commit is contained in:
kunitoki 2011-10-19 13:23:22 +02:00
parent 1b1822a65a
commit 0de5fdf622
1 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
plugins/input/occi/occi_featureset.cpp
View file

@ -241,14 +241,18 @@ void occi_featureset::convert_geometry (SDOGeometry* geom, feature_ptr feature,
{ {
if (ordinates_size >= dimensions) if (ordinates_size >= dimensions)
{ {
const bool is_single_geom = true;
const bool is_point_type = false;
const bool multiple_geoms = false;
convert_ordinates (feature, convert_ordinates (feature,
mapnik::LineString, mapnik::LineString,
elem_info, elem_info,
ordinates, ordinates,
dimensions, dimensions,
true, // is_single_geom is_single_geom,
false, // is_point_type is_point_type,
false); // multiple_geometries multiple_geoms);
} }
} }
break; break;
@ -256,14 +260,18 @@ void occi_featureset::convert_geometry (SDOGeometry* geom, feature_ptr feature,
{ {
if (ordinates_size >= dimensions) if (ordinates_size >= dimensions)
{ {
const bool is_single_geom = true;
const bool is_point_type = false;
const bool multiple_geoms = false;
convert_ordinates (feature, convert_ordinates (feature,
mapnik::Polygon, mapnik::Polygon,
elem_info, elem_info,
ordinates, ordinates,
dimensions, dimensions,
true, // is_single_geom is_single_geom,
false, // is_point_type is_point_type,
false); // multiple_geometries multiple_geoms);
} }
} }
break; break;
@ -273,6 +281,7 @@ void occi_featureset::convert_geometry (SDOGeometry* geom, feature_ptr feature,
{ {
const bool is_single_geom = false; const bool is_single_geom = false;
const bool is_point_type = true; const bool is_point_type = true;
const bool multiple_geoms = true;
// Todo - force using true as multiple_geometries until we have proper multipoint handling // Todo - force using true as multiple_geometries until we have proper multipoint handling
// http://trac.mapnik.org/ticket/458 // http://trac.mapnik.org/ticket/458
@ -282,9 +291,9 @@ void occi_featureset::convert_geometry (SDOGeometry* geom, feature_ptr feature,
elem_info, elem_info,
ordinates, ordinates,
dimensions, dimensions,
false, // is_single_geom is_single_geom,
true, // is_point_type is_point_type,
true); // multiple_geometries multiple_geoms);
} }
} }
break; break;
@ -292,13 +301,16 @@ void occi_featureset::convert_geometry (SDOGeometry* geom, feature_ptr feature,
{ {
if (ordinates_size >= dimensions) if (ordinates_size >= dimensions)
{ {
const bool is_single_geom = false;
const bool is_point_type = false;
convert_ordinates (feature, convert_ordinates (feature,
mapnik::LineString, mapnik::LineString,
elem_info, elem_info,
ordinates, ordinates,
dimensions, dimensions,
false, // is_single_geom is_single_geom,
false, // is_point_type is_point_type,
multiple_geometries); multiple_geometries);
} }
@ -308,13 +320,16 @@ void occi_featureset::convert_geometry (SDOGeometry* geom, feature_ptr feature,
{ {
if (ordinates_size >= dimensions) if (ordinates_size >= dimensions)
{ {
const bool is_single_geom = false;
const bool is_point_type = false;
convert_ordinates (feature, convert_ordinates (feature,
mapnik::Polygon, mapnik::Polygon,
elem_info, elem_info,
ordinates, ordinates,
dimensions, dimensions,
false, // is_single_geom is_single_geom,
false, // is_point_type is_point_type,
multiple_geometries); multiple_geometries);
} }
@ -332,8 +347,8 @@ void occi_featureset::convert_geometry (SDOGeometry* geom, feature_ptr feature,
elem_info, elem_info,
ordinates, ordinates,
dimensions, dimensions,
false, // is_single_geom, is_single_geom,
false, // is_point_type is_point_type,
multiple_geometries); multiple_geometries);
} }
} }