From 0702679bb0dbb76617d015dac224fdc71111050b Mon Sep 17 00:00:00 2001 From: artemp Date: Thu, 26 Jun 2014 10:51:24 +0100 Subject: [PATCH] don't call *params.get("type"), instead use static datasource::name() (FIXME: consider removing redundant 'name' in feature_layer_descriptor) --- plugins/input/csv/csv_datasource.cpp | 52 +++++++++---------- plugins/input/gdal/gdal_datasource.cpp | 2 +- plugins/input/geojson/geojson_datasource.cpp | 4 +- plugins/input/occi/occi_datasource.cpp | 2 +- plugins/input/ogr/ogr_datasource.cpp | 2 +- plugins/input/osm/osm_datasource.cpp | 2 +- plugins/input/postgis/postgis_datasource.cpp | 2 +- plugins/input/python/python_datasource.cpp | 2 +- plugins/input/raster/raster_datasource.cpp | 4 +- .../rasterlite/rasterlite_datasource.cpp | 2 +- plugins/input/shape/shape_datasource.cpp | 2 +- plugins/input/sqlite/sqlite_datasource.cpp | 2 +- .../templates/helloworld/hello_datasource.cpp | 4 +- .../input/topojson/topojson_datasource.cpp | 2 +- src/memory_datasource.cpp | 3 +- 15 files changed, 44 insertions(+), 43 deletions(-) diff --git a/plugins/input/csv/csv_datasource.cpp b/plugins/input/csv/csv_datasource.cpp index fe78abad3..f8478a09c 100644 --- a/plugins/input/csv/csv_datasource.cpp +++ b/plugins/input/csv/csv_datasource.cpp @@ -57,23 +57,23 @@ using mapnik::parameters; DATASOURCE_PLUGIN(csv_datasource) csv_datasource::csv_datasource(parameters const& params) - : datasource(params), - desc_(*params.get("type"), *params.get("encoding", "utf-8")), - extent_(), - filename_(), - inline_string_(), - file_length_(0), - row_limit_(*params.get("row_limit", 0)), - features_(), - escape_(*params.get("escape", "")), - separator_(*params.get("separator", "")), - quote_(*params.get("quote", "")), - headers_(), - manual_headers_(mapnik::util::trim_copy(*params.get("headers", ""))), - strict_(*params.get("strict", false)), - filesize_max_(*params.get("filesize_max", 20.0)), // MB - ctx_(std::make_shared()), - extent_initialized_(false) + : datasource(params), + desc_(csv_datasource::name(), *params.get("encoding", "utf-8")), + extent_(), + filename_(), + inline_string_(), + file_length_(0), + row_limit_(*params.get("row_limit", 0)), + features_(), + escape_(*params.get("escape", "")), + separator_(*params.get("separator", "")), + quote_(*params.get("quote", "")), + headers_(), + manual_headers_(mapnik::util::trim_copy(*params.get("headers", ""))), + strict_(*params.get("strict", false)), + filesize_max_(*params.get("filesize_max", 20.0)), // MB + ctx_(std::make_shared()), + extent_initialized_(false) { /* TODO: general: @@ -475,16 +475,16 @@ void csv_datasource::parse_csv(T & stream, { std::ostringstream s; s << "CSV Plugin: # of columns(" - << num_fields << ") > # of headers(" - << num_headers << ") parsed for row " << line_number << "\n"; + << num_fields << ") > # of headers(" + << num_headers << ") parsed for row " << line_number << "\n"; throw mapnik::datasource_exception(s.str()); } else if (num_fields < num_headers) { std::ostringstream s; s << "CSV Plugin: # of headers(" - << num_headers << ") > # of columns(" - << num_fields << ") parsed for row " << line_number << "\n"; + << num_headers << ") > # of columns(" + << num_fields << ") parsed for row " << line_number << "\n"; if (strict_) { throw mapnik::datasource_exception(s.str()); @@ -691,9 +691,9 @@ void csv_datasource::parse_csv(T & stream, } } else if ((value[0] >= '0' && value[0] <= '9') || - value[0] == '-' || - value[0] == '+' || - value[0] == '.') + value[0] == '-' || + value[0] == '+' || + value[0] == '.') { bool has_e = value.find("e") != std::string::npos; if (has_dot || has_e) @@ -805,14 +805,14 @@ void csv_datasource::parse_csv(T & stream, s << "CSV Plugin: does your csv have valid headers?\n"; if (!parsed_x) { - s << "Could not detect or parse any rows named 'x' or 'longitude' " + s << "Could not detect or parse any rows named 'x' or 'longitude' " << "for line " << line_number << " but found " << headers_.size() << " with values like: " << csv_line << "\n" << "for: " << boost::algorithm::join(collected, ",") << "\n"; } if (!parsed_y) { - s << "Could not detect or parse any rows named 'y' or 'latitude' " + s << "Could not detect or parse any rows named 'y' or 'latitude' " << "for line " << line_number << " but found " << headers_.size() << " with values like: " << csv_line << "\n" << "for: " << boost::algorithm::join(collected, ",") << "\n"; diff --git a/plugins/input/gdal/gdal_datasource.cpp b/plugins/input/gdal/gdal_datasource.cpp index 41f944d8a..dd6043f0c 100644 --- a/plugins/input/gdal/gdal_datasource.cpp +++ b/plugins/input/gdal/gdal_datasource.cpp @@ -76,7 +76,7 @@ inline GDALDataset* gdal_datasource::open_dataset() const gdal_datasource::gdal_datasource(parameters const& params) : datasource(params), - desc_(*params.get("type"), "utf-8"), + desc_(gdal_datasource::name(), "utf-8"), nodata_value_(params.get("nodata")), nodata_tolerance_(*params.get("nodata_tolerance",1e-12)) { diff --git a/plugins/input/geojson/geojson_datasource.cpp b/plugins/input/geojson/geojson_datasource.cpp index 56e20ea5b..3f32bed78 100644 --- a/plugins/input/geojson/geojson_datasource.cpp +++ b/plugins/input/geojson/geojson_datasource.cpp @@ -94,9 +94,9 @@ struct attr_value_converter : public boost::static_visitor("type"), + desc_(geojson_datasource::name(), *params.get("encoding","utf-8")), file_(*params.get("file","")), extent_(), diff --git a/plugins/input/occi/occi_datasource.cpp b/plugins/input/occi/occi_datasource.cpp index ead590406..e1165c666 100644 --- a/plugins/input/occi/occi_datasource.cpp +++ b/plugins/input/occi/occi_datasource.cpp @@ -76,7 +76,7 @@ occi_datasource::occi_datasource(parameters const& params) scale_denom_token_("!scale_denominator!"), pixel_width_token_("!pixel_width!"), pixel_height_token_("!pixel_height!"), - desc_(*params.get("type"), *params.get("encoding", "utf-8")), + desc_(occi_datasource::name(), *params.get("encoding", "utf-8")), use_wkb_(*params.get("use_wkb", false)), row_limit_(*params.get("row_limit", 0)), row_prefetch_(*params.get("row_prefetch", 100)), diff --git a/plugins/input/ogr/ogr_datasource.cpp b/plugins/input/ogr/ogr_datasource.cpp index ec5bf22c0..f538984ad 100644 --- a/plugins/input/ogr/ogr_datasource.cpp +++ b/plugins/input/ogr/ogr_datasource.cpp @@ -61,7 +61,7 @@ ogr_datasource::ogr_datasource(parameters const& params) : datasource(params), extent_(), type_(datasource::Vector), - desc_(*params.get("type"), *params.get("encoding", "utf-8")), + desc_(ogr_datasource::name(), *params.get("encoding", "utf-8")), indexed_(false) { init(params); diff --git a/plugins/input/osm/osm_datasource.cpp b/plugins/input/osm/osm_datasource.cpp index e97cc909b..da78284f4 100644 --- a/plugins/input/osm/osm_datasource.cpp +++ b/plugins/input/osm/osm_datasource.cpp @@ -52,7 +52,7 @@ osm_datasource::osm_datasource(const parameters& params) : datasource (params), extent_(), type_(datasource::Vector), - desc_(*params.get("type"), *params.get("encoding", "utf-8")) + desc_(osm_datasource::name(), *params.get("encoding", "utf-8")) { osm_data_ = nullptr; std::string osm_filename = *params.get("file", ""); diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp index 41fddcd0b..fc3814693 100644 --- a/plugins/input/postgis/postgis_datasource.cpp +++ b/plugins/input/postgis/postgis_datasource.cpp @@ -70,7 +70,7 @@ postgis_datasource::postgis_datasource(parameters const& params) srid_(*params.get("srid", 0)), extent_initialized_(false), simplify_geometries_(false), - desc_(*params.get("type"), "utf-8"), + desc_(postgis_datasource::name(), "utf-8"), creator_(params.get("host"), params.get("port"), params.get("dbname"), diff --git a/plugins/input/python/python_datasource.cpp b/plugins/input/python/python_datasource.cpp index 0b4125c93..1b7c16fc2 100644 --- a/plugins/input/python/python_datasource.cpp +++ b/plugins/input/python/python_datasource.cpp @@ -21,7 +21,7 @@ DATASOURCE_PLUGIN(python_datasource) python_datasource::python_datasource(parameters const& params) : datasource(params), - desc_(*params.get("type"), *params.get("encoding","utf-8")), + desc_(python_datasource::name(), *params.get("encoding","utf-8")), factory_(*params.get("factory", "")) { // extract any remaining parameters as keyword args for the factory diff --git a/plugins/input/raster/raster_datasource.cpp b/plugins/input/raster/raster_datasource.cpp index 7f3e02000..db8e3ffd3 100644 --- a/plugins/input/raster/raster_datasource.cpp +++ b/plugins/input/raster/raster_datasource.cpp @@ -46,8 +46,8 @@ using mapnik::image_reader; DATASOURCE_PLUGIN(raster_datasource) raster_datasource::raster_datasource(parameters const& params) -: datasource(params), - desc_(*params.get("type"), "utf-8"), + : datasource(params), + desc_(raster_datasource::name(), "utf-8"), extent_initialized_(false) { MAPNIK_LOG_DEBUG(raster) << "raster_datasource: Initializing..."; diff --git a/plugins/input/rasterlite/rasterlite_datasource.cpp b/plugins/input/rasterlite/rasterlite_datasource.cpp index 418865c5c..b6e07556f 100644 --- a/plugins/input/rasterlite/rasterlite_datasource.cpp +++ b/plugins/input/rasterlite/rasterlite_datasource.cpp @@ -72,7 +72,7 @@ inline void* rasterlite_datasource::open_dataset() const rasterlite_datasource::rasterlite_datasource(parameters const& params) : datasource(params), - desc_(*params.get("type"),"utf-8") + desc_(rasterlite_datasource::name(),"utf-8") { MAPNIK_LOG_DEBUG(rasterlite) << "rasterlite_datasource: Initializing..."; diff --git a/plugins/input/shape/shape_datasource.cpp b/plugins/input/shape/shape_datasource.cpp index e027990ab..bda2a711c 100644 --- a/plugins/input/shape/shape_datasource.cpp +++ b/plugins/input/shape/shape_datasource.cpp @@ -62,7 +62,7 @@ shape_datasource::shape_datasource(parameters const& params) file_length_(0), indexed_(false), row_limit_(*params.get("row_limit",0)), - desc_(*params.get("type"), *params.get("encoding","utf-8")) + desc_(shape_datasource::name(), *params.get("encoding","utf-8")) { #ifdef MAPNIK_STATS mapnik::progress_timer __stats__(std::clog, "shape_datasource::init"); diff --git a/plugins/input/sqlite/sqlite_datasource.cpp b/plugins/input/sqlite/sqlite_datasource.cpp index 8d7a06482..f8d910040 100644 --- a/plugins/input/sqlite/sqlite_datasource.cpp +++ b/plugins/input/sqlite/sqlite_datasource.cpp @@ -66,7 +66,7 @@ sqlite_datasource::sqlite_datasource(parameters const& params) row_offset_(*params.get("row_offset", 0)), row_limit_(*params.get("row_limit", 0)), intersects_token_("!intersects!"), - desc_(*params.get("type"), *params.get("encoding", "utf-8")), + desc_(sqlite_datasource::name(), *params.get("encoding", "utf-8")), format_(mapnik::wkbAuto) { /* TODO diff --git a/plugins/input/templates/helloworld/hello_datasource.cpp b/plugins/input/templates/helloworld/hello_datasource.cpp index 681e8f045..96307409f 100644 --- a/plugins/input/templates/helloworld/hello_datasource.cpp +++ b/plugins/input/templates/helloworld/hello_datasource.cpp @@ -11,8 +11,8 @@ using mapnik::parameters; DATASOURCE_PLUGIN(hello_datasource) hello_datasource::hello_datasource(parameters const& params) -: datasource(params), - desc_(*params.get("type"), *params.get("encoding","utf-8")), + : datasource(params), + desc_(hello_datasource::name(), *params.get("encoding","utf-8")), extent_() { this->init(params); diff --git a/plugins/input/topojson/topojson_datasource.cpp b/plugins/input/topojson/topojson_datasource.cpp index 1d4e7b3af..7e2f40ea6 100644 --- a/plugins/input/topojson/topojson_datasource.cpp +++ b/plugins/input/topojson/topojson_datasource.cpp @@ -143,7 +143,7 @@ struct collect_attributes_visitor : public boost::static_visitor topojson_datasource::topojson_datasource(parameters const& params) : datasource(params), type_(datasource::Vector), - desc_(*params.get("type"), + desc_(topojson_datasource::name(), *params.get("encoding","utf-8")), file_(*params.get("file","")), extent_(), diff --git a/src/memory_datasource.cpp b/src/memory_datasource.cpp index efa27c984..cac659522 100644 --- a/src/memory_datasource.cpp +++ b/src/memory_datasource.cpp @@ -72,7 +72,8 @@ const char * memory_datasource::name() memory_datasource::memory_datasource(parameters const& params) : datasource(params), - desc_(*params.get("type"), *params.get("encoding","utf-8")), + desc_(memory_datasource::name(), + *params.get("encoding","utf-8")), type_(datasource::Vector), bbox_check_(*params.get("bbox_check", true)) {}