Commit graph

330 commits

Author SHA1 Message Date
Dane Springmeyer
28d59decb8 mapnik-utils: make fonts/inputplugins actually relative and dynamically constructed if they can be 2013-03-15 13:31:10 -07:00
Dane Springmeyer
1056038163 formatting 2013-03-14 18:34:21 -07:00
Dane Springmeyer
e2c7283522 Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443 2013-03-13 19:49:59 -07:00
Dane Springmeyer
bdc262d711 remove old versioning strings 2013-03-13 13:06:10 -07:00
Dane Springmeyer
e703629b47 add --cflags - to make things will break without out - we can remove at 3.x 2013-03-02 23:17:03 -05:00
artemp
5826c1c6ec + add deps/agg directory 2013-03-01 11:08:58 -05:00
artemp
7ad2d12633 + treat .h as c++ 2013-02-28 13:59:12 -05:00
artemp
0745d07a79 + use cxxflags option 2013-02-27 10:01:39 -05:00
Dane Springmeyer
4543032a0d fix dynamic prefix detection on linux - closes #1701 2013-01-25 01:18:29 -08:00
Dane Springmeyer
6f91aaa77d supress ldflags and dep-libs in mapnik-config if we are statically linking deps 2013-01-23 22:00:25 -08:00
Dane Springmeyer
98a145acd0 avoid hardcoding prefix that mapnik-config knows about and rather determine on the fly based on where it is installed (helps with package building and should be harmless otherwise) 2013-01-23 21:58:04 -08:00
Dane Springmeyer
0e8d224ecb remove uneeded usage of boost::lexical_cast - refs #1687 2013-01-11 11:11:20 -08:00
Dane Springmeyer
94ff584190 finish complete removal of any trace of cairomm/libsigc++ - amends f25d4d9279 and closes #1681 2013-01-09 12:49:39 -08:00
Dane Springmeyer
d44b4f5749 copy numeric2string function to pgsql2sqlite code (no need to keep in sql_utils.hpp) and fix compile 2013-01-09 11:06:22 -08:00
Dane Springmeyer
bb27156df0 use internal noncopyable class to speed up compile times slightly 2012-12-16 18:19:52 -08:00
artemp
7fd96359dd + more tests 2012-12-10 22:06:55 +00:00
artemp
d0de7e872f + better stdout 2012-12-03 18:21:32 +00:00
artemp
40175253d6 + more checks 2012-12-03 18:15:34 +00:00
artemp
46d6026356 + verify content lengths 2012-12-03 17:47:59 +00:00
artemp
a571aab548 + utility for interrogating ESRI shape files 2012-12-03 16:49:36 +00:00
Dane Springmeyer
5da14ef9e9 handle demultiplying the png before saving - solves gray halo reported in #1312 (when testing with svg2png utility) 2012-10-03 14:00:48 -07:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
Dane Springmeyer
a56c63bed1 start installing agg headers so that c++ programs using mapnik can use more of the mapnik api - closes #1383 2012-08-27 18:45:04 -07:00
Dane Springmeyer
5120d0398d add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438 2012-08-27 17:58:49 -07:00
Dane Springmeyer
ac418a7d4e remote the last references 2012-08-27 16:43:40 -07:00
Dane Springmeyer
d9fa1cb0c2 remove old $ cruft 2012-08-24 13:49:28 -07:00
Dane Springmeyer
0533b76a98 fix spelling in mapnik-config 2012-08-24 09:47:59 -07:00
Dane Springmeyer
909802983c make sure mapnik-config can still report the git revision if git or its metadata is not available via a special file we will create a tagging/tarball stage - closes #1170 2012-08-22 14:44:58 -07:00
Dane Springmeyer
cbd45941b1 remove unmaintained DTD - refs #1402 2012-08-16 13:05:08 -07:00
Dane Springmeyer
d850ee8b76 correct various old trac links to point to github - closes #1396 2012-08-16 12:27:58 -07:00
Dane Springmeyer
e6e7b4c700 svg2png: inflate the rendering canvas to avoid edge affect for 100% w/h svgs 2012-07-30 16:37:34 -07:00
Dane Springmeyer
4288cad41e svg2png: no need to scale the svg marker down 2012-07-24 14:24:24 -07:00
Dane Springmeyer
2ba016b08b make the svg2png return value sensitive to auto_open results 2012-07-23 17:52:26 -07:00
Dane Springmeyer
5014694591 allow auto-opening of rendered svg on linux 2012-07-23 17:41:52 -07:00
Dane Springmeyer
e36081a5c0 change geometry_utils::from_wkb to return a bool that signifies if at least one wkb path was parsed - refs #1333 and #1305 2012-07-20 15:09:01 -07:00
artemp
4b4cfdd462 + link to boost_system if boost_version >= 1.50 2012-07-02 18:10:48 +01:00
artemp
e69c44e3d3 + use ST_xxx 2012-07-02 17:59:47 +01:00
Dane Springmeyer
09426bf324 remove option to link againt external AGG - our local copy has critical fixes and is required 2012-05-24 17:05:51 -07:00
Artem Pavlenko
a72ee4ba66 Merge branch 'master' into compositing
Conflicts:
	include/mapnik/image_compositing.hpp
	include/mapnik/util/conversions.hpp
	include/mapnik/value.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/png_reader.cpp
	src/svg_parser.cpp
	utils/svg2png/svg2png.cpp
2012-05-01 12:35:49 +01:00
Dane Springmeyer
f8c58c22c6 scons: fixup pgsql2pqlite build by ensuring CXXFLAGS are passed 2012-04-23 12:48:30 -07:00
Dane Springmeyer
c69db365db scons: pass proper CXXFLAGS to svg2png build 2012-04-23 15:22:04 -04:00
Dane Springmeyer
e986bce7f6 format c++ tests 2012-04-16 22:33:37 -07:00
Dane Springmeyer
9fe698e409 svg2png: better error output 2012-04-11 12:35:07 -07:00
Dane Springmeyer
65f5909e93 svg2png: only open automatically if requested 2012-04-11 10:41:50 -07:00
Dane Springmeyer
14841f6931 svg2png: avoid a few lines of spurious valgrand output re: still reachable xml2 parser structures 2012-04-11 10:17:03 -07:00
Dane Springmeyer
b22d043d80 svg2png: only attempt to open automatically on os x, and do not return after first rendered 2012-04-11 09:49:50 -07:00
Dane Springmeyer
c6c08e50e4 embed version in the epydoc output 2012-04-09 13:54:33 -07:00
Artem Pavlenko
603a6e133b + use agg::pixfmt_rgba32 2012-04-03 13:13:37 +01:00
Dane Springmeyer
78b53b4afe rename dtd 2012-03-14 15:33:55 -07:00
Dane Springmeyer
ba9c6dd220 mapnik-speed-check: ensure the bbox arg is set properly 2012-03-09 12:04:37 -08:00
Dane Springmeyer
c272835335 yet another -fpermissive - refs #1082, #950 and #1001 2012-02-14 12:03:44 -08:00
Matt Amos
38e7b7cce0 Still need to increment pos counter in shapeindex even when the geometry is null, otherwise reads are possible beyond the end of file. 2012-02-10 15:21:02 +00:00
Dane Springmeyer
3fa794c6ac whitespace fixes 2012-02-01 17:37:58 -08:00
Dane Springmeyer
6b584e826a clean up more mapnik2 references 2012-02-01 16:44:50 -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
Artem Pavlenko
d1f16bb227 merge textplacement-merge into feature_impl 2012-01-26 13:04:08 +00:00
Artem Pavlenko
b89f5cbbbc update pdsql2sqlite to new feature_impl 2012-01-23 08:40:16 +00:00
Hermann Kraus
537231f60e Remove glyph symbolizer. 2012-01-19 20:34:09 +01:00
Dane Springmeyer
fadb593878 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-21 12:58:32 -08:00
Dane Springmeyer
6a6c493e03 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-21 12:58:32 -08:00
Dane Springmeyer
9f4fa0b820 fixup static linking for pgsql2sqlite build 2011-12-21 12:58:10 -08:00
Dane Springmeyer
3ede1b13db fixup static linking for pgsql2sqlite build 2011-12-21 12:58:10 -08:00
Dane Springmeyer
de932bd99b remove last reference to multiple_geometries option 2011-12-21 12:22:43 -08:00
Dane Springmeyer
b6e78ab06b remove last reference to multiple_geometries option 2011-12-21 12:22:43 -08:00
Dane Springmeyer
fd895f9533 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-16 16:07:57 -08:00
Dane Springmeyer
b2762b3a91 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-16 16:07:57 -08:00
Dane Springmeyer
bc7457097b update as per #992 2011-12-16 07:41:36 -08:00
Dane Springmeyer
a8aef1f92c update as per #992 2011-12-16 07:41:36 -08:00
Dane Springmeyer
6330978cce move the json config into the main script 2011-12-14 15:51:57 -08:00
Dane Springmeyer
d03815276e move the json config into the main script 2011-12-14 15:51:57 -08:00
Artem Pavlenko
20478770ac cleanup unused code 2011-12-08 19:46:07 +00:00
Artem Pavlenko
377ff553bb cleanup unused code 2011-12-08 19:46:07 +00:00
Artem Pavlenko
5259982792 update to_wkb params 2011-12-08 18:16:15 +00:00
Artem Pavlenko
11b44c20cd update to_wkb params 2011-12-08 18:16:15 +00:00
Dane Springmeyer
b8632c20d4 remove non-existant option 2011-12-07 13:02:29 -08:00
Dane Springmeyer
c2e1256eae remove non-existant option 2011-12-07 13:02:29 -08:00
Dane Springmeyer
1700ffe9cf remove svn revision reporting as it is not longer relevant to git versioned mapnik 2011-12-06 16:52:50 -08:00
Dane Springmeyer
1190f3003d remove svn revision reporting as it is not longer relevant to git versioned mapnik 2011-12-06 16:52:50 -08:00
Artem Pavlenko
96d4958170 output all attributes 2011-12-02 17:18:28 +00:00
Artem Pavlenko
977c50d459 output all attributes 2011-12-02 17:18:28 +00:00
Artem Pavlenko
55f5fed310 add geometry_to_wkb test utililty 2011-12-02 16:34:22 +00:00
Artem Pavlenko
c5adf240b0 add geometry_to_wkb test utililty 2011-12-02 16:34:22 +00:00
Dane Springmeyer
01b0c0b15a catch a few more mapnik2 references 2011-11-23 20:35:43 -08:00
Dane Springmeyer
b1492d24ab catch a few more mapnik2 references 2011-11-23 20:35:43 -08:00
Dane Springmeyer
7b6696ff06 remove last traces of ogcserver 2011-11-23 20:30:53 -08:00
Dane Springmeyer
a1eb094e41 remove last traces of ogcserver 2011-11-23 20:30:53 -08:00
Artem Pavlenko
14700dba16 switch back from mapnik2 to mapnik
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Artem Pavlenko
b689670ffd switch back from mapnik2 to mapnik
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Dane Springmeyer
baebf4f1f2 scons: get linking correct to sqlite dependecies if linking is static 2011-11-15 12:07:46 -08:00
Dane Springmeyer
a6608814d0 scons: get linking correct to sqlite dependecies if linking is static 2011-11-15 12:07:46 -08:00
Dane Springmeyer
39d199aa49 code formatting 2011-11-13 19:54:32 -08:00
Dane Springmeyer
4654312d00 code formatting 2011-11-13 19:54:32 -08:00
Dane Springmeyer
f5d0f8c351 catch more directories in the formatting script 2011-11-13 19:39:43 -08:00
Dane Springmeyer
01bd36623c catch more directories in the formatting script 2011-11-13 19:39:43 -08:00
Dane Springmeyer
1c2530cdad fix compile of pgsql2sqlite 2011-11-13 15:02:29 -08:00
Dane Springmeyer
cccacb3f2c fix compile of pgsql2sqlite 2011-11-13 15:02:29 -08:00
Dane Springmeyer
1dc734f6fe strip whitespace in emacs config 2011-11-09 16:26:37 -08:00
Dane Springmeyer
a4439c1efa strip whitespace in emacs config 2011-11-09 16:26:37 -08:00
Dane Springmeyer
15949b077a quadtree: remove unused variable 2011-11-02 13:30:40 -04:00