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

Merge remote-tracking branch 'origin/master' into clipper

Browse source
This commit is contained in:
artemp 2013-02-20 10:35:47 +00:00
commit 617542c136
12 changed files with 1110 additions and 615 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
SConstruct
View file

@ -641,6 +641,47 @@ def rollback_option(context,variable):
if item.key == variable: if item.key == variable:
env[variable] = item.default env[variable] = item.default
def update_linux_project_files():
headers_content = []
source_content = []
directories = [
'include',
'src',
'bindings',
'boost',
'plugins',
'deps',
]
def iterate_dirs(headers_content, source_content, d):
for root, subFolders, files in os.walk(d):
for f in files:
if f.endswith(".h") or f.endswith(".hpp"):
headers_content.append(" ../%s \\" % os.path.join(root, f))
if f.endswith(".cpp") or f.endswith(".c"):
source_content.append(" ../%s \\" % os.path.join(root, f))
for sd in subFolders:
headers_content, source_content = \
iterate_dirs(headers_content, source_content, sd)
return headers_content, source_content
for d in directories:
headers_content, source_content = \
iterate_dirs(headers_content, source_content, d)
headers_content.sort()
headers_content = ['HEADERS += \\'] + headers_content + ['','']
source_content.sort()
source_content = ['SOURCES += \\'] + source_content + ['','']
files_name = os.path.join('.', 'workspace', 'All.files')
f = open(files_name, "w")
f.writelines([l + '\n' for l in headers_content])
f.writelines([l + '\n' for l in source_content])
f.close()
def FindBoost(context, prefixes, thread_flag): def FindBoost(context, prefixes, thread_flag):
"""Routine to auto-find boost header dir, lib dir, and library naming structure. """Routine to auto-find boost header dir, lib dir, and library naming structure.
@ -1807,3 +1848,7 @@ if not HELP_REQUESTED:
if os.path.exists(plugin_path): if os.path.exists(plugin_path):
color_print(3,"Notice: removing out of date plugin: '%s'" % plugin_path) color_print(3,"Notice: removing out of date plugin: '%s'" % plugin_path)
os.unlink(plugin_path) os.unlink(plugin_path)
# update linux project files
if env['PLATFORM'] == 'Linux':
update_linux_project_files()

2
include/mapnik/memory_datasource.hpp
View file

@ -42,6 +42,7 @@ public:
datasource::datasource_t type() const; datasource::datasource_t type() const;
featureset_ptr features(query const& q) const; featureset_ptr features(query const& q) const;
featureset_ptr features_at_point(coord2d const& pt, double tol = 0) const; featureset_ptr features_at_point(coord2d const& pt, double tol = 0) const;
void set_envelope(box2d<double> const& box);
box2d<double> envelope() const; box2d<double> envelope() const;
boost::optional<geometry_t> get_geometry_type() const; boost::optional<geometry_t> get_geometry_type() const;
layer_descriptor get_descriptor() const; layer_descriptor get_descriptor() const;
@ -52,6 +53,7 @@ private:
mapnik::layer_descriptor desc_; mapnik::layer_descriptor desc_;
datasource::datasource_t type_; datasource::datasource_t type_;
bool bbox_check_; bool bbox_check_;
mutable box2d<double> extent_;
}; };
} }

22
plugins/input/occi/occi_datasource.cpp
View file

@ -237,44 +237,48 @@ occi_datasource::occi_datasource(parameters const& params)
switch (type_oid) switch (type_oid)
{ {
case oracle::occi::OCCIBOOL: case oracle::occi::OCCIBOOL:
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Boolean));
break;
case oracle::occi::OCCIINT: case oracle::occi::OCCIINT:
case oracle::occi::OCCIUNSIGNED_INT: case oracle::occi::OCCIUNSIGNED_INT:
case oracle::occi::OCCIROWID:
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Integer)); desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Integer));
break; break;
case oracle::occi::OCCIFLOAT: case oracle::occi::OCCIFLOAT:
case oracle::occi::OCCIBFLOAT: case oracle::occi::OCCIBFLOAT:
case oracle::occi::OCCIDOUBLE: case oracle::occi::OCCIDOUBLE:
case oracle::occi::OCCIBDOUBLE: case oracle::occi::OCCIBDOUBLE:
case oracle::occi::OCCINUMBER:
case oracle::occi::OCCI_SQLT_NUM:
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Double)); desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Double));
break; break;
case oracle::occi::OCCINUMBER:
case oracle::occi::OCCI_SQLT_NUM:
case oracle::occi::OCCICHAR: case oracle::occi::OCCICHAR:
case oracle::occi::OCCISTRING: case oracle::occi::OCCISTRING:
case oracle::occi::OCCI_SQLT_AFC: case oracle::occi::OCCI_SQLT_AFC:
case oracle::occi::OCCI_SQLT_AVC: case oracle::occi::OCCI_SQLT_AVC:
case oracle::occi::OCCI_SQLT_CHR: case oracle::occi::OCCI_SQLT_CHR:
case oracle::occi::OCCI_SQLT_LNG:
case oracle::occi::OCCI_SQLT_LVC: case oracle::occi::OCCI_SQLT_LVC:
case oracle::occi::OCCI_SQLT_RDD:
case oracle::occi::OCCI_SQLT_STR: case oracle::occi::OCCI_SQLT_STR:
case oracle::occi::OCCI_SQLT_VCS: case oracle::occi::OCCI_SQLT_VCS:
case oracle::occi::OCCI_SQLT_VNU: case oracle::occi::OCCI_SQLT_VNU:
case oracle::occi::OCCI_SQLT_VBI: case oracle::occi::OCCI_SQLT_VBI:
case oracle::occi::OCCI_SQLT_VST: case oracle::occi::OCCI_SQLT_VST:
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::String));
break;
case oracle::occi::OCCIDATE: case oracle::occi::OCCIDATE:
case oracle::occi::OCCITIMESTAMP:
case oracle::occi::OCCIINTERVALDS:
case oracle::occi::OCCIINTERVALYM:
case oracle::occi::OCCI_SQLT_DAT: case oracle::occi::OCCI_SQLT_DAT:
case oracle::occi::OCCI_SQLT_DATE: case oracle::occi::OCCI_SQLT_DATE:
case oracle::occi::OCCIROWID:
case oracle::occi::OCCI_SQLT_RDD:
case oracle::occi::OCCI_SQLT_RID:
case oracle::occi::OCCI_SQLT_TIME: case oracle::occi::OCCI_SQLT_TIME:
case oracle::occi::OCCI_SQLT_TIME_TZ: case oracle::occi::OCCI_SQLT_TIME_TZ:
case oracle::occi::OCCITIMESTAMP:
case oracle::occi::OCCI_SQLT_TIMESTAMP: case oracle::occi::OCCI_SQLT_TIMESTAMP:
case oracle::occi::OCCI_SQLT_TIMESTAMP_LTZ: case oracle::occi::OCCI_SQLT_TIMESTAMP_LTZ:
case oracle::occi::OCCI_SQLT_TIMESTAMP_TZ: case oracle::occi::OCCI_SQLT_TIMESTAMP_TZ:
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::String));
break;
case oracle::occi::OCCIINTERVALDS:
case oracle::occi::OCCIINTERVALYM:
case oracle::occi::OCCI_SQLT_INTERVAL_YM: case oracle::occi::OCCI_SQLT_INTERVAL_YM:
case oracle::occi::OCCI_SQLT_INTERVAL_DS: case oracle::occi::OCCI_SQLT_INTERVAL_DS:
case oracle::occi::OCCIANYDATA: case oracle::occi::OCCIANYDATA:

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

@ -98,7 +98,7 @@ feature_ptr occi_featureset::next()
if (use_wkb_) if (use_wkb_)
{ {
Blob blob = rs_->getBlob (1); Blob blob = rs_->getBlob(1);
blob.open(oracle::occi::OCCI_LOB_READONLY); blob.open(oracle::occi::OCCI_LOB_READONLY);
int size = blob.length(); int size = blob.length();
@ -143,44 +143,50 @@ feature_ptr occi_featureset::next()
switch (type_oid) switch (type_oid)
{ {
case oracle::occi::OCCIBOOL: case oracle::occi::OCCIBOOL:
feature->put(fld_name, (rs_->getInt(i + 1) != 0));
break;
case oracle::occi::OCCIINT: case oracle::occi::OCCIINT:
case oracle::occi::OCCIUNSIGNED_INT: case oracle::occi::OCCIUNSIGNED_INT:
case oracle::occi::OCCIROWID: feature->put(fld_name, static_cast<mapnik::value_integer>(rs_->getInt(i + 1)));
feature->put(fld_name,static_cast<mapnik::value_integer>(rs_->getInt (i + 1)));
break; break;
case oracle::occi::OCCIFLOAT: case oracle::occi::OCCIFLOAT:
case oracle::occi::OCCIBFLOAT: case oracle::occi::OCCIBFLOAT:
feature->put(fld_name, (double)rs_->getFloat(i + 1));
break;
case oracle::occi::OCCIDOUBLE: case oracle::occi::OCCIDOUBLE:
case oracle::occi::OCCIBDOUBLE: case oracle::occi::OCCIBDOUBLE:
feature->put(fld_name, rs_->getDouble(i + 1));
break;
case oracle::occi::OCCINUMBER: case oracle::occi::OCCINUMBER:
case oracle::occi::OCCI_SQLT_NUM: case oracle::occi::OCCI_SQLT_NUM:
feature->put(fld_name,rs_->getDouble (i + 1));
break;
case oracle::occi::OCCICHAR: case oracle::occi::OCCICHAR:
case oracle::occi::OCCISTRING: case oracle::occi::OCCISTRING:
case oracle::occi::OCCI_SQLT_AFC: case oracle::occi::OCCI_SQLT_AFC:
case oracle::occi::OCCI_SQLT_AVC: case oracle::occi::OCCI_SQLT_AVC:
case oracle::occi::OCCI_SQLT_CHR: case oracle::occi::OCCI_SQLT_CHR:
case oracle::occi::OCCI_SQLT_LNG:
case oracle::occi::OCCI_SQLT_LVC: case oracle::occi::OCCI_SQLT_LVC:
case oracle::occi::OCCI_SQLT_RDD:
case oracle::occi::OCCI_SQLT_STR: case oracle::occi::OCCI_SQLT_STR:
case oracle::occi::OCCI_SQLT_VCS: case oracle::occi::OCCI_SQLT_VCS:
case oracle::occi::OCCI_SQLT_VNU: case oracle::occi::OCCI_SQLT_VNU:
case oracle::occi::OCCI_SQLT_VBI: case oracle::occi::OCCI_SQLT_VBI:
case oracle::occi::OCCI_SQLT_VST: case oracle::occi::OCCI_SQLT_VST:
feature->put(fld_name,(UnicodeString) tr_->transcode (rs_->getString (i + 1).c_str())); case oracle::occi::OCCIROWID:
break; case oracle::occi::OCCI_SQLT_RDD:
case oracle::occi::OCCI_SQLT_RID:
case oracle::occi::OCCIDATE: case oracle::occi::OCCIDATE:
case oracle::occi::OCCITIMESTAMP:
case oracle::occi::OCCIINTERVALDS:
case oracle::occi::OCCIINTERVALYM:
case oracle::occi::OCCI_SQLT_DAT: case oracle::occi::OCCI_SQLT_DAT:
case oracle::occi::OCCI_SQLT_DATE: case oracle::occi::OCCI_SQLT_DATE:
case oracle::occi::OCCI_SQLT_TIME: case oracle::occi::OCCI_SQLT_TIME:
case oracle::occi::OCCI_SQLT_TIME_TZ: case oracle::occi::OCCI_SQLT_TIME_TZ:
case oracle::occi::OCCITIMESTAMP:
case oracle::occi::OCCI_SQLT_TIMESTAMP: case oracle::occi::OCCI_SQLT_TIMESTAMP:
case oracle::occi::OCCI_SQLT_TIMESTAMP_LTZ: case oracle::occi::OCCI_SQLT_TIMESTAMP_LTZ:
case oracle::occi::OCCI_SQLT_TIMESTAMP_TZ: case oracle::occi::OCCI_SQLT_TIMESTAMP_TZ:
feature->put(fld_name, (UnicodeString)tr_->transcode(rs_->getString(i + 1).c_str()));
break;
case oracle::occi::OCCIINTERVALDS:
case oracle::occi::OCCIINTERVALYM:
case oracle::occi::OCCI_SQLT_INTERVAL_YM: case oracle::occi::OCCI_SQLT_INTERVAL_YM:
case oracle::occi::OCCI_SQLT_INTERVAL_DS: case oracle::occi::OCCI_SQLT_INTERVAL_DS:
case oracle::occi::OCCIANYDATA: case oracle::occi::OCCIANYDATA:

1
plugins/input/occi/occi_types.cpp
View file

@ -74,6 +74,7 @@ std::string occi_enums::resolve_datatype(int type_id)
case oracle::occi::OCCI_SQLT_AVC: return "OCCI_SQLT_AVC"; case oracle::occi::OCCI_SQLT_AVC: return "OCCI_SQLT_AVC";
case oracle::occi::OCCI_SQLT_CHR: return "OCCI_SQLT_CHR"; case oracle::occi::OCCI_SQLT_CHR: return "OCCI_SQLT_CHR";
case oracle::occi::OCCI_SQLT_LVC: return "OCCI_SQLT_LVC"; case oracle::occi::OCCI_SQLT_LVC: return "OCCI_SQLT_LVC";
case oracle::occi::OCCI_SQLT_LNG: return "OCCI_SQLT_LNG";
case oracle::occi::OCCI_SQLT_STR: return "OCCI_SQLT_STR"; case oracle::occi::OCCI_SQLT_STR: return "OCCI_SQLT_STR";
case oracle::occi::OCCI_SQLT_VCS: return "OCCI_SQLT_VCS"; case oracle::occi::OCCI_SQLT_VCS: return "OCCI_SQLT_VCS";
case oracle::occi::OCCI_SQLT_VNU: return "OCCI_SQLT_VNU"; case oracle::occi::OCCI_SQLT_VNU: return "OCCI_SQLT_VNU";

15
src/memory_datasource.cpp
View file

@ -96,12 +96,19 @@ featureset_ptr memory_datasource::features_at_point(coord2d const& pt, double to
return boost::make_shared<memory_featureset>(box,*this); return boost::make_shared<memory_featureset>(box,*this);
} }
void memory_datasource::set_envelope(box2d<double> const& box)
{
extent_ = box;
}
box2d<double> memory_datasource::envelope() const box2d<double> memory_datasource::envelope() const
{ {
box2d<double> ext; if (!extent_.valid())
accumulate_extent func(ext); {
std::for_each(features_.begin(),features_.end(),func); accumulate_extent func(extent_);
return ext; std::for_each(features_.begin(),features_.end(),func);
}
return extent_;
} }
boost::optional<datasource::geometry_t> memory_datasource::get_geometry_type() const boost::optional<datasource::geometry_t> memory_datasource::get_geometry_type() const

1
workspace/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
*.user*

1018
workspace/All.files Normal file
View file

File diff suppressed because it is too large Load diff

152
workspace/agg.pri
View file

@ -1,152 +0,0 @@
HEADERS += \
$$PWD/../deps/agg/include/agg_alpha_mask_u8.h \
$$PWD/../deps/agg/include/agg_arc.h \
$$PWD/../deps/agg/include/agg_array.h \
$$PWD/../deps/agg/include/agg_arrowhead.h \
$$PWD/../deps/agg/include/agg_basics.h \
$$PWD/../deps/agg/include/agg_bezier_arc.h \
$$PWD/../deps/agg/include/agg_bitset_iterator.h \
$$PWD/../deps/agg/include/agg_blur.h \
$$PWD/../deps/agg/include/agg_bounding_rect.h \
$$PWD/../deps/agg/include/agg_bspline.h \
$$PWD/../deps/agg/include/agg_clip_liang_barsky.h \
$$PWD/../deps/agg/include/agg_color_gray.h \
$$PWD/../deps/agg/include/agg_color_rgba.h \
$$PWD/../deps/agg/include/agg_config.h \
$$PWD/../deps/agg/include/agg_conv_adaptor_vcgen.h \
$$PWD/../deps/agg/include/agg_conv_adaptor_vpgen.h \
$$PWD/../deps/agg/include/agg_conv_bspline.h \
$$PWD/../deps/agg/include/agg_conv_clip_polygon.h \
$$PWD/../deps/agg/include/agg_conv_clip_polyline.h \
$$PWD/../deps/agg/include/agg_conv_close_polygon.h \
$$PWD/../deps/agg/include/agg_conv_concat.h \
$$PWD/../deps/agg/include/agg_conv_contour.h \
$$PWD/../deps/agg/include/agg_conv_curve.h \
$$PWD/../deps/agg/include/agg_conv_dash.h \
$$PWD/../deps/agg/include/agg_conv_gpc.h \
$$PWD/../deps/agg/include/agg_conv_marker_adaptor.h \
$$PWD/../deps/agg/include/agg_conv_marker.h \
$$PWD/../deps/agg/include/agg_conv_segmentator.h \
$$PWD/../deps/agg/include/agg_conv_shorten_path.h \
$$PWD/../deps/agg/include/agg_conv_smooth_poly1.h \
$$PWD/../deps/agg/include/agg_conv_stroke.h \
$$PWD/../deps/agg/include/agg_conv_transform.h \
$$PWD/../deps/agg/include/agg_conv_unclose_polygon.h \
$$PWD/../deps/agg/include/agg_curves.h \
$$PWD/../deps/agg/include/agg_dda_line.h \
$$PWD/../deps/agg/include/agg_ellipse_bresenham.h \
$$PWD/../deps/agg/include/agg_ellipse.h \
$$PWD/../deps/agg/include/agg_embedded_raster_fonts.h \
$$PWD/../deps/agg/include/agg_font_cache_manager.h \
$$PWD/../deps/agg/include/agg_gamma_functions.h \
$$PWD/../deps/agg/include/agg_gamma_lut.h \
$$PWD/../deps/agg/include/agg_glyph_raster_bin.h \
$$PWD/../deps/agg/include/agg_gradient_lut.h \
$$PWD/../deps/agg/include/agg_gsv_text.h \
$$PWD/../deps/agg/include/agg_image_accessors.h \
$$PWD/../deps/agg/include/agg_image_filters.h \
$$PWD/../deps/agg/include/agg_line_aa_basics.h \
$$PWD/../deps/agg/include/agg_math.h \
$$PWD/../deps/agg/include/agg_math_stroke.h \
$$PWD/../deps/agg/include/agg_path_length.h \
$$PWD/../deps/agg/include/agg_path_storage.h \
$$PWD/../deps/agg/include/agg_path_storage_integer.h \
$$PWD/../deps/agg/include/agg_pattern_filters_rgba.h \
$$PWD/../deps/agg/include/agg_pixfmt_amask_adaptor.h \
$$PWD/../deps/agg/include/agg_pixfmt_gray.h \
$$PWD/../deps/agg/include/agg_pixfmt_rgba.h \
$$PWD/../deps/agg/include/agg_pixfmt_rgb.h \
$$PWD/../deps/agg/include/agg_pixfmt_rgb_packed.h \
$$PWD/../deps/agg/include/agg_pixfmt_transposer.h \
$$PWD/../deps/agg/include/agg_rasterizer_cells_aa.h \
$$PWD/../deps/agg/include/agg_rasterizer_compound_aa.h \
$$PWD/../deps/agg/include/agg_rasterizer_outline_aa.h \
$$PWD/../deps/agg/include/agg_rasterizer_outline.h \
$$PWD/../deps/agg/include/agg_rasterizer_scanline_aa.h \
$$PWD/../deps/agg/include/agg_rasterizer_sl_clip.h \
$$PWD/../deps/agg/include/agg_renderer_base.h \
$$PWD/../deps/agg/include/agg_renderer_markers.h \
$$PWD/../deps/agg/include/agg_renderer_mclip.h \
$$PWD/../deps/agg/include/agg_renderer_outline_aa.h \
$$PWD/../deps/agg/include/agg_renderer_outline_image.h \
$$PWD/../deps/agg/include/agg_renderer_primitives.h \
$$PWD/../deps/agg/include/agg_renderer_raster_text.h \
$$PWD/../deps/agg/include/agg_renderer_scanline.h \
$$PWD/../deps/agg/include/agg_rendering_buffer_dynarow.h \
$$PWD/../deps/agg/include/agg_rendering_buffer.h \
$$PWD/../deps/agg/include/agg_rounded_rect.h \
$$PWD/../deps/agg/include/agg_scanline_bin.h \
$$PWD/../deps/agg/include/agg_scanline_boolean_algebra.h \
$$PWD/../deps/agg/include/agg_scanline_p.h \
$$PWD/../deps/agg/include/agg_scanline_storage_aa.h \
$$PWD/../deps/agg/include/agg_scanline_storage_bin.h \
$$PWD/../deps/agg/include/agg_scanline_u.h \
$$PWD/../deps/agg/include/agg_shorten_path.h \
$$PWD/../deps/agg/include/agg_simul_eq.h \
$$PWD/../deps/agg/include/agg_span_allocator.h \
$$PWD/../deps/agg/include/agg_span_converter.h \
$$PWD/../deps/agg/include/agg_span_gouraud_gray.h \
$$PWD/../deps/agg/include/agg_span_gouraud.h \
$$PWD/../deps/agg/include/agg_span_gouraud_rgba.h \
$$PWD/../deps/agg/include/agg_span_gradient_alpha.h \
$$PWD/../deps/agg/include/agg_span_gradient.h \
$$PWD/../deps/agg/include/agg_span_image_filter_gray.h \
$$PWD/../deps/agg/include/agg_span_image_filter.h \
$$PWD/../deps/agg/include/agg_span_image_filter_rgba.h \
$$PWD/../deps/agg/include/agg_span_image_filter_rgb.h \
$$PWD/../deps/agg/include/agg_span_interpolator_adaptor.h \
$$PWD/../deps/agg/include/agg_span_interpolator_linear.h \
$$PWD/../deps/agg/include/agg_span_interpolator_persp.h \
$$PWD/../deps/agg/include/agg_span_interpolator_trans.h \
$$PWD/../deps/agg/include/agg_span_pattern_gray.h \
$$PWD/../deps/agg/include/agg_span_pattern_rgba.h \
$$PWD/../deps/agg/include/agg_span_pattern_rgb.h \
$$PWD/../deps/agg/include/agg_span_solid.h \
$$PWD/../deps/agg/include/agg_span_subdiv_adaptor.h \
$$PWD/../deps/agg/include/agg_trans_affine.h \
$$PWD/../deps/agg/include/agg_trans_bilinear.h \
$$PWD/../deps/agg/include/agg_trans_double_path.h \
$$PWD/../deps/agg/include/agg_trans_lens.h \
$$PWD/../deps/agg/include/agg_trans_perspective.h \
$$PWD/../deps/agg/include/agg_trans_single_path.h \
$$PWD/../deps/agg/include/agg_trans_viewport.h \
$$PWD/../deps/agg/include/agg_trans_warp_magnifier.h \
$$PWD/../deps/agg/include/agg_vcgen_bspline.h \
$$PWD/../deps/agg/include/agg_vcgen_contour.h \
$$PWD/../deps/agg/include/agg_vcgen_dash.h \
$$PWD/../deps/agg/include/agg_vcgen_markers_term.h \
$$PWD/../deps/agg/include/agg_vcgen_smooth_poly1.h \
$$PWD/../deps/agg/include/agg_vcgen_stroke.h \
$$PWD/../deps/agg/include/agg_vcgen_vertex_sequence.h \
$$PWD/../deps/agg/include/agg_vertex_sequence.h \
$$PWD/../deps/agg/include/agg_vpgen_clip_polygon.h \
$$PWD/../deps/agg/include/agg_vpgen_clip_polyline.h \
$$PWD/../deps/agg/include/agg_vpgen_segmentator.h
SOURCES += \
$$PWD/../deps/agg/src/agg_arc.cpp \
$$PWD/../deps/agg/src/agg_arrowhead.cpp \
$$PWD/../deps/agg/src/agg_bezier_arc.cpp \
$$PWD/../deps/agg/src/agg_bspline.cpp \
$$PWD/../deps/agg/src/agg_curves.cpp \
$$PWD/../deps/agg/src/agg_embedded_raster_fonts.cpp \
$$PWD/../deps/agg/src/agg_gsv_text.cpp \
$$PWD/../deps/agg/src/agg_image_filters.cpp \
$$PWD/../deps/agg/src/agg_line_aa_basics.cpp \
$$PWD/../deps/agg/src/agg_line_profile_aa.cpp \
$$PWD/../deps/agg/src/agg_rounded_rect.cpp \
$$PWD/../deps/agg/src/agg_sqrt_tables.cpp \
$$PWD/../deps/agg/src/agg_trans_affine.cpp \
$$PWD/../deps/agg/src/agg_trans_double_path.cpp \
$$PWD/../deps/agg/src/agg_trans_single_path.cpp \
$$PWD/../deps/agg/src/agg_trans_warp_magnifier.cpp \
$$PWD/../deps/agg/src/agg_vcgen_bspline.cpp \
$$PWD/../deps/agg/src/agg_vcgen_contour.cpp \
$$PWD/../deps/agg/src/agg_vcgen_dash.cpp \
$$PWD/../deps/agg/src/agg_vcgen_markers_term.cpp \
$$PWD/../deps/agg/src/agg_vcgen_smooth_poly1.cpp \
$$PWD/../deps/agg/src/agg_vcgen_stroke.cpp \
$$PWD/../deps/agg/src/agg_vpgen_clip_polygon.cpp \
$$PWD/../deps/agg/src/agg_vpgen_clip_polyline.cpp \
$$PWD/../deps/agg/src/agg_vpgen_segmentator.cpp

48
workspace/bindings.pri
View file

@ -1,48 +0,0 @@
HEADERS += \
$$PWD/../bindings/python/mapnik_enumeration.hpp \
$$PWD/../bindings/python/mapnik_svg.hpp \
$$PWD/../bindings/python/mapnik_value_converter.hpp \
$$PWD/../bindings/python/python_grid_utils.hpp \
$$PWD/../bindings/python/python_optional.hpp
SOURCES += \
$$PWD/../bindings/python/mapnik_color.cpp \
$$PWD/../bindings/python/mapnik_coord.cpp \
$$PWD/../bindings/python/mapnik_datasource.cpp \
$$PWD/../bindings/python/mapnik_datasource_cache.cpp \
$$PWD/../bindings/python/mapnik_envelope.cpp \
$$PWD/../bindings/python/mapnik_expression.cpp \
$$PWD/../bindings/python/mapnik_feature.cpp \
$$PWD/../bindings/python/mapnik_featureset.cpp \
$$PWD/../bindings/python/mapnik_font_engine.cpp \
$$PWD/../bindings/python/mapnik_geometry.cpp \
$$PWD/../bindings/python/mapnik_grid.cpp \
$$PWD/../bindings/python/mapnik_grid_view.cpp \
$$PWD/../bindings/python/mapnik_image.cpp \
$$PWD/../bindings/python/mapnik_image_view.cpp \
$$PWD/../bindings/python/mapnik_layer.cpp \
$$PWD/../bindings/python/mapnik_logger.cpp \
$$PWD/../bindings/python/mapnik_line_pattern_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_line_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_map.cpp \
$$PWD/../bindings/python/mapnik_markers_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_palette.cpp \
$$PWD/../bindings/python/mapnik_parameters.cpp \
$$PWD/../bindings/python/mapnik_point_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_polygon_pattern_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_polygon_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_proj_transform.cpp \
$$PWD/../bindings/python/mapnik_projection.cpp \
$$PWD/../bindings/python/mapnik_python.cpp \
$$PWD/../bindings/python/mapnik_query.cpp \
$$PWD/../bindings/python/mapnik_raster_colorizer.cpp \
$$PWD/../bindings/python/mapnik_raster_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_rule.cpp \
$$PWD/../bindings/python/mapnik_shield_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_stroke.cpp \
$$PWD/../bindings/python/mapnik_style.cpp \
$$PWD/../bindings/python/mapnik_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_text_symbolizer.cpp \
$$PWD/../bindings/python/mapnik_view_transform.cpp \
$$PWD/../bindings/python/python_cairo.cpp

300
workspace/mapnik.pro
View file

@ -8,312 +8,16 @@ TEMPLATE = lib
INCLUDEPATH = \ INCLUDEPATH = \
../deps/agg/include \ ../deps/agg/include \
../deps/threadpool \
../include \ ../include \
/usr/lib/oracle/11.2.0.3/client/include
HEADERS += \ include(All.files)
../include/mapnik/formatting/base.hpp \
../include/mapnik/formatting/expression.hpp \
../include/mapnik/formatting/format.hpp \
../include/mapnik/formatting/list.hpp \
../include/mapnik/formatting/registry.hpp \
../include/mapnik/formatting/text.hpp \
../include/mapnik/grid/grid.hpp \
../include/mapnik/grid/grid_pixel.hpp \
../include/mapnik/grid/grid_pixfmt.hpp \
../include/mapnik/grid/grid_rasterizer.hpp \
../include/mapnik/grid/grid_renderer.hpp \
../include/mapnik/grid/grid_rendering_buffer.hpp \
../include/mapnik/grid/grid_util.hpp \
../include/mapnik/grid/grid_view.hpp \
../include/mapnik/internal/dump_xml.hpp \
../include/mapnik/json/feature_collection_grammar.hpp \
../include/mapnik/json/feature_collection_parser.hpp \
../include/mapnik/json/feature_generator_grammar.hpp \
../include/mapnik/json/feature_grammar.hpp \
../include/mapnik/json/geojson_generator.hpp \
../include/mapnik/json/geometry_generator_grammar.hpp \
../include/mapnik/svg/svg_converter.hpp \
../include/mapnik/svg/svg_generator.hpp \
../include/mapnik/svg/svg_output_attributes.hpp \
../include/mapnik/svg/svg_output_grammars.hpp \
../include/mapnik/svg/svg_parser.hpp \
../include/mapnik/svg/svg_path_adapter.hpp \
../include/mapnik/svg/svg_path_attributes.hpp \
../include/mapnik/svg/svg_path_commands.hpp \
../include/mapnik/svg/svg_path_grammar.hpp \
../include/mapnik/svg/svg_path_iterator.hpp \
../include/mapnik/svg/svg_path_parser.hpp \
../include/mapnik/svg/svg_points_grammar.hpp \
../include/mapnik/svg/svg_renderer.hpp \
../include/mapnik/svg/svg_storage.hpp \
../include/mapnik/svg/svg_transform_grammar.hpp \
../include/mapnik/text_placements/base.hpp \
../include/mapnik/text_placements/dummy.hpp \
../include/mapnik/text_placements/list.hpp \
../include/mapnik/text_placements/registry.hpp \
../include/mapnik/text_placements/simple.hpp \
../include/mapnik/util/container_adapter.hpp \
../include/mapnik/util/conversions.hpp \
../include/mapnik/util/dasharray_parser.hpp \
../include/mapnik/util/deepcopy.hpp \
../include/mapnik/util/geometry_svg_generator.hpp \
../include/mapnik/util/geometry_to_ds_type.hpp \
../include/mapnik/util/geometry_to_wkb.hpp \
../include/mapnik/util/geometry_to_wkt.hpp \
../include/mapnik/util/geometry_wkt_generator.hpp \
../include/mapnik/util/vertex_iterator.hpp \
../include/mapnik/wkt/wkt_factory.hpp \
../include/mapnik/wkt/wkt_grammar.hpp \
../include/mapnik/agg_helpers.hpp \
../include/mapnik/agg_pattern_source.hpp \
../include/mapnik/agg_rasterizer.hpp \
../include/mapnik/agg_renderer.hpp \
../include/mapnik/attribute.hpp \
../include/mapnik/attribute_collector.hpp \
../include/mapnik/attribute_descriptor.hpp \
../include/mapnik/boolean.hpp \
../include/mapnik/box2d.hpp \
../include/mapnik/building_symbolizer.hpp \
../include/mapnik/cairo_renderer.hpp \
../include/mapnik/char_info.hpp \
../include/mapnik/color.hpp \
../include/mapnik/color_factory.hpp \
../include/mapnik/config.hpp \
../include/mapnik/config_error.hpp \
../include/mapnik/coord.hpp \
../include/mapnik/coord_array.hpp \
../include/mapnik/css_color_grammar.hpp \
../include/mapnik/ctrans.hpp \
../include/mapnik/debug.hpp \
../include/mapnik/datasource.hpp \
../include/mapnik/datasource_cache.hpp \
../include/mapnik/distance.hpp \
../include/mapnik/ellipsoid.hpp \
../include/mapnik/enumeration.hpp \
../include/mapnik/expression_evaluator.hpp \
../include/mapnik/expression_grammar.hpp \
../include/mapnik/expression_node.hpp \
../include/mapnik/expression_string.hpp \
../include/mapnik/factory.hpp \
../include/mapnik/fastmath.hpp \
../include/mapnik/feature.hpp \
../include/mapnik/feature_factory.hpp \
../include/mapnik/feature_kv_iterator.hpp \
../include/mapnik/feature_layer_desc.hpp \
../include/mapnik/feature_style_processor.hpp \
../include/mapnik/feature_type_style.hpp \
../include/mapnik/filter_factory.hpp \
../include/mapnik/filter_featureset.hpp \
../include/mapnik/font_engine_freetype.hpp \
../include/mapnik/font_set.hpp \
../include/mapnik/gamma_method.hpp \
../include/mapnik/geom_util.hpp \
../include/mapnik/geometry.hpp \
../include/mapnik/global.hpp \
../include/mapnik/gradient.hpp \
../include/mapnik/graphics.hpp \
../include/mapnik/hextree.hpp \
../include/mapnik/hit_test_filter.hpp \
../include/mapnik/image_compositing.hpp \
../include/mapnik/image_data.hpp \
../include/mapnik/image_reader.hpp \
../include/mapnik/image_util.hpp \
../include/mapnik/image_view.hpp \
../include/mapnik/jpeg_io.hpp \
../include/mapnik/label_collision_detector.hpp \
../include/mapnik/layer.hpp \
../include/mapnik/line_pattern_symbolizer.hpp \
../include/mapnik/line_symbolizer.hpp \
../include/mapnik/load_map.hpp \
../include/mapnik/map.hpp \
../include/mapnik/mapped_memory_cache.hpp \
../include/mapnik/marker.hpp \
../include/mapnik/marker_cache.hpp \
../include/mapnik/markers_placement.hpp \
../include/mapnik/markers_symbolizer.hpp \
../include/mapnik/memory.hpp \
../include/mapnik/memory_datasource.hpp \
../include/mapnik/memory_featureset.hpp \
../include/mapnik/octree.hpp \
../include/mapnik/palette.hpp \
../include/mapnik/params.hpp \
../include/mapnik/parse_path.hpp \
../include/mapnik/path_expression_grammar.hpp \
../include/mapnik/pixel_position.hpp \
../include/mapnik/placement_finder.hpp \
../include/mapnik/plugin.hpp \
../include/mapnik/png_io.hpp \
../include/mapnik/point_symbolizer.hpp \
../include/mapnik/polygon_pattern_symbolizer.hpp \
../include/mapnik/polygon_symbolizer.hpp \
../include/mapnik/pool.hpp \
../include/mapnik/processed_text.hpp \
../include/mapnik/proj_transform.hpp \
../include/mapnik/projection.hpp \
../include/mapnik/ptree_helpers.hpp \
../include/mapnik/quad_tree.hpp \
../include/mapnik/query.hpp \
../include/mapnik/raster.hpp \
../include/mapnik/raster_colorizer.hpp \
../include/mapnik/raster_symbolizer.hpp \
../include/mapnik/rule.hpp \
../include/mapnik/save_map.hpp \
../include/mapnik/scale_denominator.hpp \
../include/mapnik/segment.hpp \
../include/mapnik/shield_symbolizer.hpp \
../include/mapnik/sql_utils.hpp \
../include/mapnik/stroke.hpp \
../include/mapnik/svg_renderer.hpp \
../include/mapnik/symbolizer.hpp \
../include/mapnik/symbolizer_helpers.hpp \
../include/mapnik/text_path.hpp \
../include/mapnik/text_properties.hpp \
../include/mapnik/text_symbolizer.hpp \
../include/mapnik/tiff_io.hpp \
../include/mapnik/timer.hpp \
../include/mapnik/unicode.hpp \
../include/mapnik/utils.hpp \
../include/mapnik/value.hpp \
../include/mapnik/value_error.hpp \
../include/mapnik/version.hpp \
../include/mapnik/vertex.hpp \
../include/mapnik/vertex_vector.hpp \
../include/mapnik/warp.hpp \
../include/mapnik/wkb.hpp \
../include/mapnik/xml_loader.hpp \
../include/mapnik/xml_node.hpp \
../include/mapnik/xml_tree.hpp
SOURCES += \
../src/agg/agg_renderer.cpp \
../src/agg/process_building_symbolizer.cpp \
../src/agg/process_line_pattern_symbolizer.cpp \
../src/agg/process_line_symbolizer.cpp \
../src/agg/process_markers_symbolizer.cpp \
../src/agg/process_point_symbolizer.cpp \
../src/agg/process_polygon_pattern_symbolizer.cpp \
../src/agg/process_polygon_symbolizer.cpp \
../src/agg/process_raster_symbolizer.cpp \
../src/agg/process_shield_symbolizer.cpp \
../src/agg/process_text_symbolizer.cpp \
../src/formatting/base.cpp \
../src/formatting/expression.cpp \
../src/formatting/format.cpp \
../src/formatting/list.cpp \
../src/formatting/registry.cpp \
../src/formatting/text.cpp \
../src/grid/grid_renderer.cpp \
../src/grid/process_building_symbolizer.cpp \
../src/grid/process_line_pattern_symbolizer.cpp \
../src/grid/process_line_symbolizer.cpp \
../src/grid/process_markers_symbolizer.cpp \
../src/grid/process_point_symbolizer.cpp \
../src/grid/process_polygon_pattern_symbolizer.cpp \
../src/grid/process_polygon_symbolizer.cpp \
../src/grid/process_raster_symbolizer.cpp \
../src/grid/process_shield_symbolizer.cpp \
../src/grid/process_text_symbolizer.cpp \
../src/json/feature_collection_parser.cpp \
../src/json/geojson_generator.cpp \
../src/svg/process_building_symbolizer.cpp \
../src/svg/process_line_pattern_symbolizer.cpp \
../src/svg/process_line_symbolizer.cpp \
../src/svg/process_markers_symbolizer.cpp \
../src/svg/process_point_symbolizer.cpp \
../src/svg/process_polygon_pattern_symbolizer.cpp \
../src/svg/process_polygon_symbolizer.cpp \
../src/svg/process_raster_symbolizer.cpp \
../src/svg/process_shield_symbolizer.cpp \
../src/svg/process_symbolizers.cpp \
../src/svg/process_text_symbolizer.cpp \
../src/svg/svg_generator.cpp \
../src/svg/svg_output_attributes.cpp \
../src/svg/svg_renderer.cpp \
../src/text_placements/base.cpp \
../src/text_placements/dummy.cpp \
../src/text_placements/list.cpp \
../src/text_placements/registry.cpp \
../src/text_placements/simple.cpp \
../src/wkt/wkt_factory.cpp \
../src/arrow.cpp \
../src/box2d.cpp \
../src/building_symbolizer.cpp \
../src/cairo_renderer.cpp \
../src/color.cpp \
../src/config_error.cpp \
../src/conversions.cpp \
../src/datasource_cache.cpp \
../src/debug.cpp \
../src/deepcopy.cpp \
../src/distance.cpp \
../src/expression.cpp \
../src/expression_string.cpp \
../src/feature_kv_iterator.cpp \
../src/feature_style_processor.cpp \
../src/feature_type_style.cpp \
../src/font_engine_freetype.cpp \
../src/font_set.cpp \
../src/gamma_method.cpp \
../src/gradient.cpp \
../src/graphics.cpp \
../src/image_compositing.cpp \
../src/image_reader.cpp \
../src/image_util.cpp \
../src/jpeg_reader.cpp \
../src/layer.cpp \
../src/libxml2_loader.cpp \
../src/line_pattern_symbolizer.cpp \
../src/line_symbolizer.cpp \
../src/load_map.cpp \
../src/map.cpp \
../src/mapped_memory_cache.cpp \
../src/marker_cache.cpp \
../src/markers_placement.cpp \
../src/markers_symbolizer.cpp \
../src/memory.cpp \
../src/memory_datasource.cpp \
../src/palette.cpp \
../src/parse_path.cpp \
../src/placement_finder.cpp \
../src/plugin.cpp \
../src/png_reader.cpp \
../src/point_symbolizer.cpp \
../src/polygon_pattern_symbolizer.cpp \
../src/polygon_symbolizer.cpp \
../src/processed_text.cpp \
../src/proj_transform.cpp \
../src/projection.cpp \
../src/rapidxml_loader.cpp \
../src/raster_colorizer.cpp \
../src/save_map.cpp \
../src/scale_denominator.cpp \
../src/shield_symbolizer.cpp \
../src/stroke.cpp \
../src/svg_parser.cpp \
../src/svg_path_parser.cpp \
../src/svg_points_parser.cpp \
../src/svg_transform_parser.cpp \
../src/symbolizer.cpp \
../src/symbolizer_helpers.cpp \
../src/text_properties.cpp \
../src/text_symbolizer.cpp \
../src/tiff_reader.cpp \
../src/unicode.cpp \
../src/warp.cpp \
../src/wkb.cpp \
../src/xml_tree.cpp
OTHER_FILES += \ OTHER_FILES += \
../SConstruct \ ../SConstruct \
../config.py \ ../config.py \
../CHANGELOG.md ../CHANGELOG.md
include(agg.pri)
include(plugins.pri)
include(bindings.pri)
unix { unix {
DEFINES += LINUX=1 MAPNIK_LOG=1 DEFINES += LINUX=1 MAPNIK_LOG=1
} }

93
workspace/plugins.pri
View file

@ -1,93 +0,0 @@
HEADERS += \
$$PWD/../plugins/input/csv/csv_datasource.hpp \
$$PWD/../plugins/input/gdal/gdal_featureset.hpp \
$$PWD/../plugins/input/gdal/gdal_datasource.hpp \
$$PWD/../plugins/input/geos/geos_datasource.hpp \
$$PWD/../plugins/input/geos/geos_featureset.hpp \
$$PWD/../plugins/input/kismet/kismet_featureset.hpp \
$$PWD/../plugins/input/kismet/kismet_datasource.hpp \
$$PWD/../plugins/input/kismet/kismet_types.hpp \
$$PWD/../plugins/input/occi/occi_featureset.hpp \
$$PWD/../plugins/input/occi/occi_datasource.hpp \
$$PWD/../plugins/input/occi/occi_types.hpp \
$$PWD/../plugins/input/occi/spatial_classesh.h \
$$PWD/../plugins/input/occi/spatial_classesm.h \
$$PWD/../plugins/input/ogr/ogr_converter.hpp \
$$PWD/../plugins/input/ogr/ogr_featureset.hpp \
$$PWD/../plugins/input/ogr/ogr_datasource.hpp \
$$PWD/../plugins/input/ogr/ogr_layer_ptr.hpp \
$$PWD/../plugins/input/ogr/ogr_feature_ptr.hpp \
$$PWD/../plugins/input/ogr/ogr_index.hpp \
$$PWD/../plugins/input/ogr/ogr_index_featureset.hpp \
$$PWD/../plugins/input/osm/basiccurl.h \
$$PWD/../plugins/input/osm/dataset_deliverer.h \
$$PWD/../plugins/input/osm/osm.h \
$$PWD/../plugins/input/osm/osmparser.h \
$$PWD/../plugins/input/osm/osmtagtypes.h \
$$PWD/../plugins/input/osm/osm_featureset.hpp \
$$PWD/../plugins/input/osm/osm_datasource.hpp \
$$PWD/../plugins/input/postgis/connection.hpp \
$$PWD/../plugins/input/postgis/connection_manager.hpp \
$$PWD/../plugins/input/postgis/cursorresultset.hpp \
$$PWD/../plugins/input/postgis/postgis_datasource.hpp \
$$PWD/../plugins/input/postgis/postgis_featureset.hpp \
$$PWD/../plugins/input/postgis/resultset.hpp \
$$PWD/../plugins/input/raster/raster_info.hpp \
$$PWD/../plugins/input/raster/raster_featureset.hpp \
$$PWD/../plugins/input/raster/raster_datasource.hpp \
$$PWD/../plugins/input/rasterlite/rasterlite_include.hpp \
$$PWD/../plugins/input/rasterlite/rasterlite_featureset.hpp \
$$PWD/../plugins/input/rasterlite/rasterlite_datasource.hpp \
$$PWD/../plugins/input/shape/dbffile.hpp \
$$PWD/../plugins/input/shape/shape.hpp \
$$PWD/../plugins/input/shape/shape_datasource.hpp \
$$PWD/../plugins/input/shape/shape_featureset.hpp \
$$PWD/../plugins/input/shape/shapefile.hpp \
$$PWD/../plugins/input/shape/shape_index_featureset.hpp \
$$PWD/../plugins/input/shape/shape_io.hpp \
$$PWD/../plugins/input/shape/shp_index.hpp \
$$PWD/../plugins/input/sqlite/sqlite_connection.hpp \
$$PWD/../plugins/input/sqlite/sqlite_featureset.hpp \
$$PWD/../plugins/input/sqlite/sqlite_datasource.hpp \
$$PWD/../plugins/input/sqlite/sqlite_types.hpp
SOURCES += \
$$PWD/../plugins/input/csv/csv_datasource.cpp \
$$PWD/../plugins/input/gdal/gdal_featureset.cpp \
$$PWD/../plugins/input/gdal/gdal_datasource.cpp \
$$PWD/../plugins/input/geos/geos_datasource.cpp \
$$PWD/../plugins/input/geos/geos_featureset.cpp \
$$PWD/../plugins/input/kismet/kismet_featureset.cpp \
$$PWD/../plugins/input/kismet/kismet_datasource.cpp \
$$PWD/../plugins/input/occi/occi_featureset.cpp \
$$PWD/../plugins/input/occi/occi_datasource.cpp \
$$PWD/../plugins/input/occi/occi_types.cpp \
$$PWD/../plugins/input/occi/spatial_classesm.cpp \
$$PWD/../plugins/input/occi/spatial_classeso.cpp \
$$PWD/../plugins/input/ogr/ogr_converter.cpp \
$$PWD/../plugins/input/ogr/ogr_featureset.cpp \
$$PWD/../plugins/input/ogr/ogr_datasource.cpp \
$$PWD/../plugins/input/ogr/ogr_index_featureset.cpp \
$$PWD/../plugins/input/osm/basiccurl.cpp \
$$PWD/../plugins/input/osm/dataset_deliverer.cpp \
$$PWD/../plugins/input/osm/osm.cpp \
$$PWD/../plugins/input/osm/osmparser.cpp \
$$PWD/../plugins/input/osm/osm_featureset.cpp \
$$PWD/../plugins/input/osm/osm_datasource.cpp \
$$PWD/../plugins/input/osm/render.cpp \
$$PWD/../plugins/input/postgis/postgis_datasource.cpp \
$$PWD/../plugins/input/postgis/postgis_featureset.cpp \
$$PWD/../plugins/input/raster/raster_info.cpp \
$$PWD/../plugins/input/raster/raster_featureset.cpp \
$$PWD/../plugins/input/raster/raster_datasource.cpp \
$$PWD/../plugins/input/rasterlite/rasterlite_featureset.cpp \
$$PWD/../plugins/input/rasterlite/rasterlite_datasource.cpp \
$$PWD/../plugins/input/shape/dbffile.cpp \
$$PWD/../plugins/input/shape/shape.cpp \
$$PWD/../plugins/input/shape/shape_datasource.cpp \
$$PWD/../plugins/input/shape/shape_featureset.cpp \
$$PWD/../plugins/input/shape/shape_index_featureset.cpp \
$$PWD/../plugins/input/shape/shape_io.cpp \
$$PWD/../plugins/input/sqlite/sqlite_featureset.cpp \
$$PWD/../plugins/input/sqlite/sqlite_datasource.cpp