sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4043 commits 112 branches 95 tags 181 MiB
Commit graph

4043 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom MacWright
ad293b4cca Merge branch 'statistics' into statistics-tilemill 2012-02-06 16:49:03 -05:00
Tom MacWright
a2ab9b5588 More fixes 2012-02-06 16:48:51 -05:00
Tom MacWright
d031452a70 Merge branch 'statistics' into statistics-tilemill 2012-02-06 15:36:46 -05:00
Tom MacWright
d12b4e322f Updating ogr and csv to output null stats 2012-02-06 15:36:29 -05:00
Tom MacWright
83d26c4994 tree-porting from tilemill-binary 2012-02-06 13:45:35 -05:00
Tom MacWright
534d111e02 Clarify naming, addresses @springmeyer's comment 2012-02-02 13:30:01 -05:00
Tom MacWright
8d9fb2b540 Fix up shared_ptr impl. Fixes #1060. 2012-02-02 13:22:38 -05:00
Tom MacWright
9c1af869b6 Switched to shared_ptr at the cost of a segfault 2012-02-02 10:36:57 -05:00
Tom MacWright
f836a43bca Head of stats changes - moving towards shared_ptr 2012-02-02 10:06:37 -05:00
Tom MacWright
6f06316f28 Merge branch 'master' of https://github.com/mapnik/mapnik into statistics 2012-02-01 15:53:36 -05:00
Tom MacWright
ff450b4998 Actual data-based sqlite statistics test, fix kinks in the implementation. 2012-02-01 15:52:17 -05:00
Tom MacWright
d1c65beb1c First working shot of statistics in sqlite. Needs test coverage next 2012-02-01 15:44:05 -05:00
Dane Springmeyer
cf8e036574 warn if non bitmap (svg) files are used for pattern symbolizers as this is not currently supported - refs #1010 and #1045 2012-02-01 12:27:57 -08:00
Tom MacWright
55d5a8ae82 Merge branch 'master' of https://github.com/mapnik/mapnik into statistics 2012-02-01 13:58:22 -05:00
Dane Springmeyer
915addc51d update grid rendering interface to new feature impl 2012-02-01 10:43:23 -08:00
Hermann Kraus
30bef5c955 Fast math. 
@de94a3e: Yes, we need them. :-)
 2012-02-01 12:49:16 +01:00
Artem Pavlenko
e4f7f1074a + validate input tuple length 
+ fix index in extract<double>
 2012-01-31 20:46:36 +00:00
Tom MacWright
abe4a39717 Merge branch 'master' into statistics 2012-01-31 14:58:16 -05:00
Artem Pavlenko
54ad01d670 Merge remote-tracking branch 'origin/master' 2012-01-31 18:03:08 +00:00
Artem Pavlenko
de94a3e82f comment out unused variables 2012-01-31 18:01:19 +00:00
Hermann Kraus
d2e26b5495 Python bindings for char_properties. 2012-01-31 18:28:02 +01:00
Hermann Kraus
ac672230fa Merge branch 'master' of github.com:mapnik/mapnik 2012-01-31 17:54:15 +01:00
Artem Pavlenko
8db933a6ae Merge remote-tracking branch 'origin/master' 2012-01-31 16:52:01 +00:00
Artem Pavlenko
796bd5d8c2 remove duplicate enumeration registration 2012-01-31 16:51:14 +00:00
Hermann Kraus
a1d2211060 Update dependency graph. 2012-01-31 17:39:28 +01:00
Dane Springmeyer
e4a11c0d07 use correct context type 2012-01-31 08:35:40 -08:00
Hermann Kraus
cc886d1688 Merge branch 'feature-text-merge' 2012-01-31 16:52:28 +01:00
Hermann Kraus
06ce3f7eec Merge remote-tracking branch 'herm/textplacement-merge' 2012-01-31 16:37:37 +01:00
Hermann Kraus
72f061b75a Revert 0c5fc9f246. 
For new text placment branch a different solution is needed.
 2012-01-31 16:36:40 +01:00
Hermann Kraus
1a16e9c5ab Remove class text_processor. 2012-01-31 16:24:58 +01:00
Artem Pavlenko
a395f974f3 small fix 2012-01-31 12:00:36 +00:00
Artem Pavlenko
e00e8f98aa if geometries are polygons, default to 'largest_box' only 
for label placement.
TODO: expose settings in XML
 2012-01-31 11:52:43 +00:00
Artem Pavlenko
b90de4874c Merge branch 'textplacement-merge' into feature-text-merge 
Conflicts:
	docs/textrendering.gv
	include/mapnik/building_symbolizer.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_placements.hpp
	include/mapnik/text_placements_list.hpp
	include/mapnik/text_placements_simple.hpp
	include/mapnik/text_processing.hpp
	plugins/input/shape/shape_utils.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/load_map.cpp
	src/placement_finder.cpp
	src/shield_symbolizer.cpp
	src/text_placements.cpp
	src/text_processing.cpp
	src/text_symbolizer.cpp
	tests/visual_tests/clean.sh
	tests/visual_tests/test.py

Merge herm/textplacement-merge
 2012-01-31 11:09:55 +00:00
Artem Pavlenko
7f91fb7b1e change read_xxx_xxx methods to not return 
input value by ref.
 2012-01-31 09:46:21 +00:00
Artem Pavlenko
cad0261e55 check if index is valid before pushing back value. 2012-01-31 09:45:06 +00:00
Tom MacWright
95bef08977 merge and adapt to new features work 2012-01-30 18:55:20 -05:00
Tom MacWright
96b3281bd6 Stub out statistics on common datasources 2012-01-30 17:37:36 -05:00
Artem Pavlenko
f53122ea04 add setter for geometry type 
add default ctor (eGeomType->Unknown)
 2012-01-30 20:46:39 +00:00
Artem Pavlenko
39bafa0cf1 add push_new member function which allows modifying 
current features context (useful when datasource schema
is unknown, so we update context as we go along).
 2012-01-30 14:05:41 +00:00
Hermann Kraus
e4340c0f89 Python bindings for text_symbolizer_properties. 2012-01-30 03:32:25 +01:00
Hermann Kraus
89ce699616 Update text rendering dependency graph. 2012-01-29 23:17:38 +01:00
Hermann Kraus
49225d7468 Handle additional boxes from ShieldSymbolizer. 2012-01-29 20:28:32 +01:00
Hermann Kraus
16e5fefb4d Remove text_placement_info::initialize() to avoid incorrect usage of this object. 2012-01-29 20:04:31 +01:00
Hermann Kraus
49a3b3c52c Make code easier to read by using std::pair instead of boost::tuple for position. 2012-01-29 17:33:43 +01:00
Hermann Kraus
822786e41c Remove no-text attribute. One can simply leave the text empty if one wants this. 2012-01-29 13:10:14 +01:00
Hermann Kraus
e564b00370 New test. 2012-01-29 05:11:59 +01:00
Hermann Kraus
4a3a3fd82c ShieldSymbolizer for Cairo. 2012-01-29 05:03:38 +01:00
Hermann Kraus
3e59503e25 ShieldSymbolizer for Grid renderer. 2012-01-29 04:57:56 +01:00
Hermann Kraus
09459683e9 Update symbolizer helpers for ShieldSymbolizer. 
Correctly handle point placement for TextSymbolizer. (Tries each possible placement for each point).
 2012-01-29 04:49:02 +01:00
Hermann Kraus
2d50c840fe Update tests. 2012-01-28 19:37:13 +01:00