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

5981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hermann Kraus
90f0287a21 Merge commit '95ceee84fac2cd9dffad0931889522a87c723537' into harfbuzz 
Conflicts:
	src/cairo_renderer.cpp
 2013-03-16 12:59:07 +01:00
Hermann Kraus
a2aaea1cd0 Merge commit '1d114b5e2fd4b5f9cd64013d3eec89fd00d580a5' into harfbuzz 2013-03-16 12:47:52 +01:00
Hermann Kraus
df7c2b5c0e Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:46:01 +01:00
Hermann Kraus
4d54696265 Merge commit '8dca9dbb2b9012caf9d37ae60906756aa6c0e037' into harfbuzz 
Conflicts:
	src/agg/process_shield_symbolizer.cpp
	src/grid/process_shield_symbolizer.cpp
 2013-03-16 12:44:46 +01:00
Hermann Kraus
0c62b481f6 Merge commit 'cd064305fc8cf7fee1806e495d9016a5ce1e5d7f' into harfbuzz 
Conflicts:
	src/cairo_renderer.cpp
 2013-03-16 12:44:01 +01:00
Hermann Kraus
a9973837ef Merge commit '0b9ebe21dd593b9b87c6388291b79a5c5a4af4e4' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:39:47 +01:00
Hermann Kraus
55d8492b77 Merge commit 'e2a76e09b3e3614174d24aa43165151f599c9d8e' into harfbuzz 
Conflicts:
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
 2013-03-16 12:38:22 +01:00
Hermann Kraus
ad905f1ff8 Merge commit '00517a507f68237874630dae1821c8a2c844bc3d' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:34:59 +01:00
Hermann Kraus
c4cdd89076 Merge commit 'b9b97ba6526aebbe920e0bd29b8dc8dc35267cfc' into harfbuzz 
Conflicts:
	src/load_map.cpp
 2013-03-16 12:31:56 +01:00
Hermann Kraus
d522d997e8 Merge commit '4432b75f53b30d02ecf5add1e84f6b78cd572f98' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:28:15 +01:00
Hermann Kraus
784ef8f76a Merge commit 'a537c58afa450e1ffe6bbd8978d2e122b55c9942' into harfbuzz 
Conflicts:
	include/mapnik/symbolizer.hpp
 2013-03-16 12:24:02 +01:00
Hermann Kraus
606361b75c Merge commit '940bb9827585885c6eaef9b1d4c62a38f4e81ea9' into harfbuzz 
Conflicts:
	tests/visual_tests/test.py
 2013-03-16 12:21:31 +01:00
Hermann Kraus
3ea335af66 Merge commit '7cf4a00af9530ba2aa46ba1a4a5cb2cb41fe166a' into harfbuzz 2013-03-16 12:13:11 +01:00
Dane Springmeyer
95ceee84fa sync cairo shield rendering with agg - closes #1602 - amends bd9609c370 2012-12-02 22:46:58 -08:00
Dane Springmeyer
e9ca5b47e2 finish support for dbf logical type, strip handling of memo, and add tests for all basic types - refs #1614 2012-12-02 21:37:39 -08:00
Dane Springmeyer
9da47afc05 update changelog after #1614 2012-12-02 19:58:40 -08:00
Dane Springmeyer
7d408d523c close #1548 with explict handling of point geometries and amend 629d768eae for cairo/grid renderers to ensure proper placement on lines (refs #1604,#1350,#1607) 2012-12-02 19:53:44 -08:00
Dane Springmeyer
388ac9799d add a local symlink on linux to libmapnik.so.MAJOR.MINOR to enable easy local testing (without install) - refs #1618 2012-12-02 19:15:22 -08:00
Dane Springmeyer
1d114b5e2f add make check target that aliases make test-local - refs #1618 2012-12-02 18:30:32 -08:00
Dane Springmeyer
be05aa5b60 add palette.to_string() method and add python tests of fixed palette functionality 2012-11-30 12:31:58 -08:00
Dane Springmeyer
4436721371 fix potential compile due to error problematic defines that did not get properly cleaned up in a986aedd05 - refs #1400 2012-11-30 11:27:06 -08:00
Dane Springmeyer
bf33e0eaa5 pretty print expected json grids in visual tests 2012-11-29 18:02:38 -08:00
Dane Springmeyer
f192a3e9f5 Merge branch 'master' of github.com:mapnik/mapnik 2012-11-29 17:58:51 -08:00
Dane Springmeyer
6d1dec63c7 Merge pull request #1615 from strk/master-fix-marker-multi-policy-test 
Fix marker-multi-policy test. Closes #1612
 2012-11-29 17:57:01 -08:00
Dane Springmeyer
4e9f6c12eb Merge branch 'master' of github.com:mapnik/mapnik 2012-11-29 17:53:06 -08:00
Dane Springmeyer
abb7ed865c Merge pull request #1616 from strk/master-whole-centroid 
Fix "whole" multi centroid computation
 2012-11-29 17:52:28 -08:00
Dane Springmeyer
53acae94be as discussed with @artemp - there should be no need or benefit to trying to handle F type in dbf since it is a foxpro extension that shapefiles do not commonly use 2012-11-29 17:44:06 -08:00
artemp
26889c4761 + support 'logical' type #1614 2012-11-29 17:19:34 +00:00
Sandro Santilli
54d75d946b Fix "whole" multi centroid computation 
Includes testcase.
Closes #1606
 2012-11-29 17:55:13 +01:00
Sandro Santilli
60e3f81331 Fix marker-multi-policy test. Closes #1612 2012-11-29 15:00:26 +01:00
artemp
85e00d6596 Merge remote-tracking branch 'origin/master' 2012-11-29 10:36:18 +00:00
artemp
430e75e0ac + better stdout 2012-11-29 10:35:03 +00:00
artemp
913e1d0cfe + don't expect we _must_ consume all input when parsing numbers 
some DBF can have some junk appended to records #1605
 2012-11-29 10:23:51 +00:00
Dane Springmeyer
363fc2ddd0 fix logic error 2012-11-28 21:18:17 -08:00
Dane Springmeyer
52c3f8ff6e disable bbox intersection testing when caching features on the fly during rendering - closes #1543 2012-11-28 20:56:08 -08:00
Dane Springmeyer
53922be94e fix method name - refs #1562 2012-11-28 20:54:39 -08:00
Dane Springmeyer
65c995ce0e add #1562 to master changelog 2012-11-28 20:24:20 -08:00
Dane Springmeyer
57aa6dd052 add serialization of line_symbolizer offset - closes #1562 2012-11-28 20:21:22 -08:00
Dane Springmeyer
8bfc330015 postgis: do not fatally throw if metadata queries fail - closes #1609 and closes #1565 2012-11-28 20:19:11 -08:00
Dane Springmeyer
5f900206d1 formatting 2012-11-28 19:33:09 -08:00
Dane Springmeyer
629d768eae use middle_point placement algorithm for marker POINT placement on lines - closes #1604 - refs #1350 and refs #1607 2012-11-28 19:23:56 -08:00
Dane Springmeyer
f2276d97a0 modify agg conv classes to support type() member - closes #1607 refs #1604 2012-11-28 19:22:10 -08:00
Dane Springmeyer
a2d82af5c1 add postgis threaded stress test (though queries still runs serially) 2012-11-28 19:15:29 -08:00
Dane Springmeyer
0548d6037b fix postgres null connection error adding space for better formatting 2012-11-28 18:20:34 -08:00
Dane Springmeyer
1baeb7036c cleanup unused code 2012-11-28 18:20:09 -08:00
Dane Springmeyer
2ee6c9aca1 Merge branch 'master' of github.com:mapnik/mapnik 2012-11-28 17:48:14 -08:00
Dane Springmeyer
46f8ce3ce7 finish bringing back to life the SVG_RENDERER - now outputs geometries again - closes #1438 2012-11-28 17:45:05 -08:00
Dane Springmeyer
1f7459d29d install svg/output headers if SVG_RENDERER is requested 2012-11-28 17:21:38 -08:00
Dane Springmeyer
46ee60b398 fix row_limit behavior in shape.input to stop reading when count = row_limit, not just when count > row_limit 2012-11-28 14:15:53 -08:00
artemp
cff52c9f73 + fix typo 2012-11-28 19:16:10 +00:00