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

temp fix to compile FIXME

Browse source
This commit is contained in:
Artem Pavlenko 2012-01-12 10:04:49 +00:00 • committed by Artem Pavlenko
parent 3bd41e45a4
commit 0eb8e2d246
8 changed files with 54 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bindings/python/mapnik_feature.cpp
View file

@ -42,6 +42,7 @@ namespace {
using mapnik::Feature;
using mapnik::geometry_utils;
using mapnik::from_wkt;
using mapnik::context_ptr;
void feature_add_geometries_from_wkb(Feature &feature, std::string wkb)
{
@ -269,18 +270,19 @@ void export_feature()
UnicodeString_from_python_str();
class_<Feature,boost::shared_ptr<Feature>,
boost::noncopyable>("Feature",init<int>("Default ctor."))
.def("id",&Feature::id)
.def("__str__",&Feature::to_string)
.def("add_geometries_from_wkb", &feature_add_geometries_from_wkb)
.def("add_geometries_from_wkt", &feature_add_geometries_from_wkt)
//.def("add_geometry", add_geometry)
//.def("num_geometries",&Feature::num_geometries)
//.def("get_geometry", make_function(get_geom1,return_value_policy<reference_existing_object>()))
.def("geometries",make_function(&Feature::paths,return_value_policy<reference_existing_object>()))
.def("envelope", &Feature::envelope)
.def(map_indexing_suite2<Feature, true >())
.def("iteritems",iterator<Feature> ())
// TODO define more mapnik::Feature methods
;
boost::noncopyable>("Feature",init<context_ptr, int>("Default ctor."))
.def("id",&Feature::id)
.def("__str__",&Feature::to_string)
.def("add_geometries_from_wkb", &feature_add_geometries_from_wkb)
.def("add_geometries_from_wkt", &feature_add_geometries_from_wkt)
//.def("add_geometry", add_geometry)
//.def("num_geometries",&Feature::num_geometries)
//.def("get_geometry", make_function(get_geom1,return_value_policy<reference_existing_object>()))
.def("geometries",make_function(&Feature::paths,return_value_policy<reference_existing_object>()))
// FIXME
//.def("envelope", &Feature::envelope)
// .def(map_indexing_suite2<Feature, true >())
// .def("iteritems",iterator<Feature> ())
// TODO define more mapnik::Feature methods
;
}

3
demo/viewer/mapwidget.cpp
View file

@ -170,6 +170,8 @@ void MapWidget::mousePressEvent(QMouseEvent* e)
feature_ptr feat = fs->next();
if (feat)
{
// FIXME
/*
std::map<std::string,mapnik::value> const& props = feat->props();
std::map<std::string,mapnik::value>::const_iterator itr=props.begin();
for (; itr!=props.end();++itr)
@ -180,6 +182,7 @@ void MapWidget::mousePressEvent(QMouseEvent* e)
itr->second.to_string().c_str()));
}
}
*/
typedef mapnik::coord_transform2<mapnik::CoordTransform,mapnik::geometry_type> path_type;
for (unsigned i=0; i<feat->num_geometries();++i)

5
include/mapnik/grid/grid.hpp
View file

@ -111,8 +111,10 @@ public:
inline void add_feature(mapnik::Feature const& feature)
{
// copies feature props
// FIXME
/*
std::map<std::string,value> fprops = feature.props();
lookup_type lookup_value;
if (key_ == id_name_)
@ -154,6 +156,7 @@ public:
{
std::clog << "### Warning: key '" << key_ << "' was blank for " << feature << "\n";
}
*/
}
inline void add_property_name(std::string const& name)

5
include/mapnik/metawriter.hpp
View file

@ -61,6 +61,11 @@ public:
{
return m_.end();
}
UnicodeString const& get(std::string const& key) const
{
return (*this)[key];
}
private:
property_map m_;
UnicodeString not_found_;

7
src/agg/process_raster_symbolizer.cpp
View file

@ -46,10 +46,11 @@ void agg_renderer<T>::process(raster_symbolizer const& sym,
raster_ptr const& source=feature.get_raster();
if (source)
{
// FIXME
// If there's a colorizer defined, use it to color the raster in-place
raster_colorizer_ptr colorizer = sym.get_colorizer();
if (colorizer)
colorizer->colorize(source,feature.props());
//raster_colorizer_ptr colorizer = sym.get_colorizer();
//if (colorizer)
// colorizer->colorize(source,feature.props());
box2d<double> target_ext = box2d<double>(source->ext_);
prj_trans.backward(target_ext, PROJ_ENVELOPE_POINTS);

18
src/memory_datasource.cpp
View file

@ -116,14 +116,16 @@ void memory_datasource::clear()
void point_datasource::add_point(double x, double y, const char* key, const char* value)
{
feature_ptr feature(feature_factory::create(feature_id_));
++feature_id_;
geometry_type * pt = new geometry_type(Point);
pt->move_to(x,y);
feature->add_geometry(pt);
transcoder tr("utf-8");
(*feature)[key] = tr.transcode(value);
this->push(feature);
// FIXME
//feature_ptr feature(feature_factory::create(feature_id_));
// ++feature_id_;
// geometry_type * pt = new geometry_type(Point);
// pt->move_to(x,y);
// feature->add_geometry(pt);
// transcoder tr("utf-8");
// (*feature)[key] = tr.transcode(value);
// this->push(feature);
}
}

5
src/metawriter.cpp
View file

@ -105,6 +105,8 @@ void metawriter_json_stream::write_properties(Feature const& feature, metawriter
{
*f_ << "}," << //Close coordinates object
"\n \"properties\": {";
// FIXME
/*
std::map<std::string, value> const &fprops = feature.props();
int i = 0;
BOOST_FOREACH(std::string p, properties)
@ -122,7 +124,8 @@ void metawriter_json_stream::write_properties(Feature const& feature, metawriter
*f_ << "\n \"" << p << "\":\"" << text << "\"";
}
}
*/
*f_ << "\n} }";
}

13
src/metawriter_inmem.cpp
View file

@ -39,16 +39,19 @@ using mapnik::metawriter_properties;
// intersect a set of properties with those in the feature descriptor
map<string,value> intersect_properties(const Feature &feature, const metawriter_properties &properties) {
const map<string, value> &fprops = feature.props();
map<string,value> nprops;
// FIXME
//const map<string, value> &fprops = feature.props();
map<string,value> nprops;
/*
BOOST_FOREACH(string p, properties) {
map<string, value>::const_iterator itr = fprops.find(p);
map<string, value>::const_iterator itr = fprops.find(p);
if (itr != fprops.end()) {
nprops.insert(*itr);
}
}
}
*/
return nprops;
}
} // end anonymous namespace