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

479 commits

Author SHA1 Message Date
Hermann Kraus
2b5274c21b Merge branch 'textplacement-rename' into python-textplacement 2012-02-12 13:57:51 +01:00
Hermann Kraus
52702d3a20 Rename filter_factory to expression. 2012-02-12 13:06:39 +01:00
Hermann Kraus
86d32afac5 Add string constructor for text node. 2012-02-12 01:49:54 +01:00
Hermann Kraus
c94d32b41b Add bindings for formating::list_node. 2012-02-11 11:21:33 +01:00
Hermann Kraus
03e9cac7f6 Merge branch 'master' into python-textplacement 2012-02-08 01:18:01 +01:00
Dane Springmeyer
16828ec161 use row/col instead of x/y for clearer grid resolution function 2012-02-07 13:44:08 -08:00
Hermann Kraus
3cafd214de New test case. 2012-02-05 21:32:03 +01:00
Hermann Kraus
a47019ac7b Better tests. 
Reference images.
 2012-02-05 16:29:27 +01:00
Hermann Kraus
37b2054041 Copy constructor for CharProperties. 2012-02-05 15:11:08 +01:00
Hermann Kraus
099ec85da6 Implement add_expression and helper classes. 
Update test.
 2012-02-05 04:09:09 +01:00
Hermann Kraus
4230c72fd6 Test case for python bindings. 2012-02-05 01:48:25 +01:00
Dane Springmeyer
b3819633bd fix point WKT format 2012-02-01 17:03:31 -08:00
Dane Springmeyer
915addc51d update grid rendering interface to new feature impl 2012-02-01 10:43:23 -08: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
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
2d50c840fe Update tests. 2012-01-28 19:37:13 +01:00
Hermann Kraus
a606f3cd9a Correctly initialize directory for run_tests.py 2012-01-28 17:12:52 +01:00
Hermann Kraus
604b8db016 Update tests. 2012-01-27 23:15:12 +01:00
Hermann Kraus
92ca0b74ed Update clean.sh. 2012-01-27 23:15:12 +01:00
Artem Pavlenko
d1f16bb227 merge textplacement-merge into feature_impl 2012-01-26 13:04:08 +00:00
Hermann Kraus
51d8718701 Move tests to new location. 2012-01-25 23:31:07 +01:00
Hermann Kraus
cd5c1c6ab4 Add reference image for formating test. 2012-01-25 23:26:39 +01:00
Hermann Kraus
26c13d4df4 Add tests for text formating. 2012-01-25 18:46:27 +01:00
Dane Springmeyer
4cb9aa44b5 update tests to python api for features 2012-01-24 15:16:40 -08:00
Dane Springmeyer
e542e90fcf get most of the tests passing 2012-01-24 00:27:44 -08:00
Hermann Kraus
047cda5d1b Fix some tests. 2012-01-20 00:45:15 +01:00
Hermann Kraus
a1c80d1a4c Add full set of tests for text placement. 2012-01-20 00:18:37 +01:00
Hermann Kraus
537231f60e Remove glyph symbolizer. 2012-01-19 20:34:09 +01:00
Artem Pavlenko
e699ba17cb Merge branch 'master' into feature_impl 2012-01-18 07:48:57 -05:00
Dane Springmeyer
425f20fb68 ogr plugin: for geometry type inspection support older gdal/ogr versions - fixes compile on ubuntu oneiric 2012-01-17 18:43:01 -05:00
Dane Springmeyer
fb80de8dfe ogr plugin: for geometry type inspection support older gdal/ogr versions - fixes compile on ubuntu oneiric 2012-01-17 18:43:01 -05:00
Dane Springmeyer
820b9a2b25 merge master with feature_impl 2012-01-17 17:47:27 -05:00
Dane Springmeyer
63891cec15 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Dane Springmeyer
b0d0d06564 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Dane Springmeyer
acc0d6e302 cleanup python datasource api simplifying access to descriptors 2012-01-11 20:03:47 -08:00
Dane Springmeyer
2a137908c3 cleanup python datasource api simplifying access to descriptors 2012-01-11 20:03:47 -08:00
Hermann Kraus
f4f1e84420 Fix the problem reported in #1003 (NE, NW, SE not working for text-placement=simple). 
Add test cases for this problem.

Conflicts:

	src/text_placements.cpp
	tests/data/placement/clean.sh
	tests/data/placement/test.py
 2012-01-09 23:30:22 +01:00
Hermann Kraus
cbcb545b65 Fix the problem reported in #1003 (NE, NW, SE not working for text-placement=simple). 
Add test cases for this problem.

Conflicts:

	src/text_placements.cpp
	tests/data/placement/clean.sh
	tests/data/placement/test.py
 2012-01-09 23:30:22 +01:00
Dane Springmeyer
f83b0edbe5 make failing osm plugin test a todo 2012-01-05 18:49:41 -08:00
Dane Springmeyer
e649bb42cf make failing osm plugin test a todo 2012-01-05 18:49:41 -08:00
Dane Springmeyer
b7c69a8462 test cleanup 2012-01-05 18:48:20 -08:00
Dane Springmeyer
80d18dedc3 test cleanup 2012-01-05 18:48:20 -08:00
Dane Springmeyer
fa93ad7de5 more wkb/wkt tests 2012-01-05 18:26:01 -08:00
Dane Springmeyer
8ce9da421f more wkb/wkt tests 2012-01-05 18:26:01 -08:00
Dane Springmeyer
70bb3805e2 test wkb collection output to match wkt output 2012-01-05 17:30:21 -08:00
Dane Springmeyer
b925c79e4d test wkb collection output to match wkt output 2012-01-05 17:30:21 -08:00
Dane Springmeyer
47e5aff668 enable tests comparing wkt/wkb output between shapefiles read with shape.input and ogr.input now that shape reading is fixed up 2012-01-05 16:46:19 -08:00
Dane Springmeyer
66dcf9f316 enable tests comparing wkt/wkb output between shapefiles read with shape.input and ogr.input now that shape reading is fixed up 2012-01-05 16:46:19 -08:00
Dane Springmeyer
68e5811491 make failing ogr/shape comparison a todo 2011-12-22 14:37:32 -08:00
Dane Springmeyer
654f579ac9 make failing ogr/shape comparison a todo 2011-12-22 14:37:32 -08:00
Dane Springmeyer
84b7d198d4 fixup fontset tests 2011-12-22 12:48:11 -08:00
Dane Springmeyer
e72330e38c fixup fontset tests 2011-12-22 12:48:11 -08:00
Dane Springmeyer
b820cf7807 Merge branch 'geometry_cleanup' 2011-12-22 12:42:05 -08:00
Dane Springmeyer
323c36db61 Merge branch 'geometry_cleanup' 2011-12-22 12:42:05 -08:00
Dane Springmeyer
2701f93a04 test cleanups 2011-12-22 12:41:51 -08:00
Dane Springmeyer
477ac9c4f9 test cleanups 2011-12-22 12:41:51 -08:00
Dane Springmeyer
62983ef214 fix import 2011-12-22 12:20:03 -08:00
Dane Springmeyer
cf4315945f fix import 2011-12-22 12:20:03 -08:00
Dane Springmeyer
bed779b465 tests: maintain python 2.5 support 2011-12-22 12:19:40 -08:00
Dane Springmeyer
77cb946f8d tests: maintain python 2.5 support 2011-12-22 12:19:40 -08:00
Dane Springmeyer
ddeac9a16d more tests for geometry wkt and wkb io 2011-12-21 15:27:53 -08:00
Dane Springmeyer
6d30e8f126 more tests for geometry wkt and wkb io 2011-12-21 15:27:53 -08:00
Dane Springmeyer
b12498f967 add test comparing geometry handling between ogr and shape plugin - currently fails 2011-12-21 12:26:03 -08:00
Dane Springmeyer
7b7fc5eb94 add test comparing geometry handling between ogr and shape plugin - currently fails 2011-12-21 12:26:03 -08:00
Dane Springmeyer
89a09208e8 finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries 2011-12-21 12:22:05 -08:00
Dane Springmeyer
c551626916 finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries 2011-12-21 12:22:05 -08:00
Dane Springmeyer
b06a517f02 initial map deepcopy test 2011-12-20 12:46:35 -08:00
Dane Springmeyer
ec611832ab initial map deepcopy test 2011-12-20 12:46:35 -08:00
Dane Springmeyer
2c1f5b6ea7 tests for fontsets 2011-12-20 12:46:20 -08:00
Dane Springmeyer
2d59f401b5 tests for fontsets 2011-12-20 12:46:20 -08:00
Dane Springmeyer
58c00c844a test fontset non-existance 2011-12-20 12:40:14 -08:00
Dane Springmeyer
94e44fcd62 test fontset non-existance 2011-12-20 12:40:14 -08:00
Dane Springmeyer
ea1e5cabb7 more robust sqlite subquery tests and first tests of \!intersects\! token - refs #809 2011-12-16 09:58:09 -08:00
Dane Springmeyer
312e98a869 more robust sqlite subquery tests and first tests of \!intersects\! token - refs #809 2011-12-16 09:58:09 -08:00
Dane Springmeyer
6aefbd0d99 update tests as per #992 2011-12-16 07:22:52 -08:00
Dane Springmeyer
90b5cf69cc update tests as per #992 2011-12-16 07:22:52 -08:00
Dane Springmeyer
53dd1be72a python 2.5 compatibility 2011-12-13 17:02:00 -08:00
Dane Springmeyer
5f84df96d4 python 2.5 compatibility 2011-12-13 17:02:00 -08:00
Dane Springmeyer
9ac6e4b12e tests: no need to test sqlite through ogr anymore - native impl is robust and has its own tests now 2011-12-13 13:52:11 -08:00
Dane Springmeyer
754581f278 tests: no need to test sqlite through ogr anymore - native impl is robust and has its own tests now 2011-12-13 13:52:11 -08:00
Dane Springmeyer
e3d9bc2c6e add readme to svg test dir 2011-12-12 16:02:12 -08:00
Dane Springmeyer
d0cbb77864 add readme to svg test dir 2011-12-12 16:02:12 -08:00
Dane Springmeyer
7ea7838f21 add new csv test 2011-12-12 16:00:53 -08:00
Dane Springmeyer
077eb4c865 add new csv test 2011-12-12 16:00:53 -08:00
Dane Springmeyer
143efad7cd csv plugin: allow values with leading zeros to stay as strings - closes #993 - refs https://github.com/mapbox/tilemill/issues/1007 2011-12-12 15:55:33 -08:00
Dane Springmeyer
0bb1073b3f csv plugin: allow values with leading zeros to stay as strings - closes #993 - refs https://github.com/mapbox/tilemill/issues/1007 2011-12-12 15:55:33 -08:00
Dane Springmeyer
f0241c0170 fully spell out parameters on the map object - refs #977 2011-12-05 18:05:35 -08:00
Dane Springmeyer
9203639640 fully spell out parameters on the map object - refs #977 2011-12-05 18:05:35 -08:00
Dane Springmeyer
b78b8e735b add ability to have typed arbitrary parameters in xml - refs #977 2011-12-05 14:46:38 -08:00
Dane Springmeyer
9e924bfa11 add ability to have typed arbitrary parameters in xml - refs #977 2011-12-05 14:46:38 -08:00
Dane Springmeyer
1d30cb5698 add basic tests for osm plugin 2011-12-05 14:30:18 -08:00
Dane Springmeyer
dbce93669a add basic tests for osm plugin 2011-12-05 14:30:18 -08:00
Dane Springmeyer
7c0bceb6de tests: ensure ogr plugin throws on non-existant field names (currently fails) - refs #792 2011-12-05 13:33:37 -08:00
Dane Springmeyer
e3e0755f70 tests: ensure ogr plugin throws on non-existant field names (currently fails) - refs #792 2011-12-05 13:33:37 -08:00
Dane Springmeyer
df64c1690c add tests for reading shapefiles via ogr 2011-12-05 13:32:37 -08:00
Dane Springmeyer
d836571a8d add tests for reading shapefiles via ogr 2011-12-05 13:32:37 -08:00
Dane Springmeyer
75190a7050 tests: test sqlite error behavior on non-existant fields - refs #984/#792 2011-12-05 13:24:11 -08:00
Dane Springmeyer
1f2a55172e tests: test sqlite error behavior on non-existant fields - refs #984/#792 2011-12-05 13:24:11 -08:00
Dane Springmeyer
9cb1c9c7f7 tests: ensure shapefile plugin throws if invalid query is made - refs #792 2011-12-05 12:17:30 -08:00