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

519 commits

Author SHA1 Message Date
Dane Springmeyer
404e221c25 fix #2239 2014-05-11 12:40:24 -07:00
artemp
99bbb10290 c++11 : use int types from <cstdint> 2014-05-06 18:06:47 +01:00
Dane Springmeyer
9e9747ffad Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 
Conflicts:
	src/agg/process_building_symbolizer.cpp
	src/cairo_context.cpp
	src/cairo_renderer.cpp
	src/grid/process_building_symbolizer.cpp
	src/grid/process_line_pattern_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
	tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
	tests/python_tests/images/support/marker-text-line-scale-factor-1.png
	tests/python_tests/images/support/marker-text-line-scale-factor-10.png
	tests/python_tests/images/support/marker-text-line-scale-factor-100.png
	tests/python_tests/images/support/marker-text-line-scale-factor-2.png
	tests/python_tests/images/support/marker-text-line-scale-factor-5.png
	tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
	tests/visual_tests/test.py
 2014-04-24 21:44:28 -07:00
Dane Springmeyer
2e6de5cc97 remove unused variables 2014-03-18 14:09:44 -07:00
Dane Springmeyer
0a26485d28 add simple, c++ version of nik2img 2014-02-10 10:46:48 -08:00
Dane Springmeyer
f286363ad0 more consistent memset/memcpy usage 2014-01-28 15:05:10 -08:00
Dane Springmeyer
777e067770 remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082 2014-01-27 12:24:20 -08:00
artemp
eb3da7d32d c++11 : use nullptr instead of NULL 2013-11-27 15:54:16 +00:00
Dane Springmeyer
66347f78e6 rework tests: always run locally 2013-11-22 12:01:02 -08:00
Dane Springmeyer
08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	bindings/python/mapnik_building_symbolizer.cpp
	bindings/python/mapnik_debug_symbolizer.cpp
	bindings/python/mapnik_line_pattern_symbolizer.cpp
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_markers_symbolizer.cpp
	bindings/python/mapnik_point_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
	bindings/python/mapnik_python.cpp
	bindings/python/mapnik_raster_symbolizer.cpp
	bindings/python/mapnik_shield_symbolizer.cpp
	bindings/python/mapnik_symbolizer.cpp
 2013-11-07 09:21:05 -08:00
Dane Springmeyer
d0619bc402 update copyright year for scons build files 2013-11-05 16:54:13 -08:00
Dane Springmeyer
710d558218 scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
Dane Springmeyer
153c7cce60 fix compile of pgsql2sqlite 2013-09-23 11:37:16 -07:00
artemp
0eada70845 + use const std::unique_ptr< []> instead of boost::scoped_array 2013-09-20 15:01:58 +01:00
artemp
62af2e6765 + replace <boost/shared_ptr.hpp> with <memory> 2013-09-20 14:13:23 +01:00
artemp
b315eb2167 + use std::shared_ptr and std::make_shared 2013-09-20 14:01:27 +01:00
artemp
4f4e2b001e Merge branch 'master' into c++11 
Conflicts:
	SConstruct
	benchmark/run.cpp
	bindings/python/mapnik_datasource.cpp
	bindings/python/mapnik_feature.cpp
	bindings/python/python_optional.hpp
	include/mapnik/css_color_grammar.hpp
	include/mapnik/expression_grammar.hpp
	include/mapnik/feature.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/image_filter_types.hpp
	include/mapnik/image_util.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_grammar.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/tiff_io.hpp
	include/mapnik/util/geometry_svg_generator.hpp
	include/mapnik/util/geometry_wkt_generator.hpp
	include/mapnik/utils.hpp
	include/mapnik/webp_io.hpp
	include/mapnik/wkt/wkt_grammar.hpp
	plugins/input/shape/shape_datasource.cpp
	plugins/input/shape/shapefile.hpp
	src/expression_grammar.cpp
	src/expression_string.cpp
	src/image_util.cpp
	src/json/feature_collection_parser.cpp
	src/json/feature_parser.cpp
	src/miniz.c
	src/symbolizer_helpers.cpp
	src/tiff_reader.cpp
	src/webp_reader.cpp
	tests/cpp_tests/geometry_converters_test.cpp
	tests/cpp_tests/image_io_test.cpp
	tests/cpp_tests/map_request_test.cpp
	tests/python_tests/image_test.py
	tests/visual_tests/test.py
 2013-08-30 09:46:09 +01:00
Dane Springmeyer
4f01eb05b1 scons: correctly propagate DEFINES across builds 2013-07-23 20:03:00 -04:00
Dane Springmeyer
2533e8137f fix syntax 2013-07-14 15:28:22 -04:00
Dane Springmeyer
0fa2d4aca7 fix syntax 2013-07-14 15:27:58 -04:00
Dane Springmeyer
75f3eaed67 scons: more linux static linking fixes 2013-07-14 15:26:24 -04:00
Dane Springmeyer
e02a4ebd9d shapeindex: if statically linking then bring in mapnik dep libs 2013-07-14 13:01:26 -04:00
Dane Springmeyer
4bc28d547b handle lacking return value handling caught by coverity 2013-07-04 14:31:46 -04:00
Dane Springmeyer
0365d3e081 start centralizing filesystem operations in mapnik::util::fs - refs #1177 2013-06-02 19:28:24 -07:00
Dane Springmeyer
fe6d860fa4 remove mapnik-config.bat (for windows only) which is now versioned in mapnik-packaging repo: 173186c77b 2013-05-23 16:06:07 -07:00
Dane Springmeyer
47e62804be rundemo.gyp now working on windows 2013-05-23 00:46:55 -07:00
Dane Springmeyer
d5bf5e86c6 fix plugins and fonts path in mapnik-config.bat 2013-05-22 23:46:57 -07:00
Dane Springmeyer
019873a9d2 further fixes to mapnik-config.bat 2013-05-22 22:27:38 -07:00
Dane Springmeyer
a20adb86be add agg includes directory 2013-05-22 22:12:09 -07:00
Dane Springmeyer
fa7e4e2494 excape path separators to be more gyp friendly 2013-05-22 22:07:00 -07:00
Dane Springmeyer
00035b92d7 add static version of mapnik-config.bat for windows 2013-05-22 21:40:14 -07:00
Dane Springmeyer
bd3ba15638 improve reporting in mapnik-config of new options at 2.0.0 2013-05-21 14:09:49 -07:00
Dane Springmeyer
3fbf4df67d add support for statically linking datasource input plugins - closes #1810 and #1821 - refs #249 2013-05-16 11:55:58 -07:00
Dane Springmeyer
101ea276d1 add mapnik version number reporting to mapnik-config 2013-05-10 13:45:18 -07:00
Dane Springmeyer
55519212f7 add --all-flags to mapnik-config - closes #1839 2013-05-10 13:27:44 -07:00
Dane Springmeyer
7518c9c2c2 default to clang++ on OS X and start reporting CXX compiler used in mapnik-config - closes #1839 2013-05-10 13:24:41 -07:00
artemp
58927b404c c++11 
+ replace BOOST_FOREACH with for( : )
+ remove boost/foreach.hpp
+ fix benchmarks (17,18)
 2013-04-24 16:40:35 +01:00
Dane Springmeyer
c55002e9b7 mapnik-config: start reporting dependency link flags again as they are needed to link command line apps (though not for bundles) 2013-04-10 17:05:33 -07:00
Dane Springmeyer
faa78864b6 mapnik-config also add cxxflags to cflags for full backwards compatibility with previous behavior 2013-03-19 00:15:04 -07:00
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
Dane Springmeyer
cb12defd2c quadtree: remove unused variable 2011-11-02 13:30:40 -04:00
Dane Springmeyer
2a374e270b tweak the mapnik-speed-check script to allow being customized to test load times 2011-10-28 15:13:52 -07:00
Dane Springmeyer
f71149ca53 tweak the mapnik-speed-check script to allow being customized to test load times 2011-10-28 15:13:52 -07:00
Dane Springmeyer
d8f19fab05 always link to boost system - closes #931 2011-10-25 19:29:51 -07:00
Dane Springmeyer
e3b0e56ff4 always link to boost system - closes #931 2011-10-25 19:29:51 -07:00
kunitoki
f85965142d - small script to keep copyright aligned in all files (bindings have different copyright owners, need to understand if we need to keep those as they are) 2011-10-23 15:11:14 +02:00
kunitoki
873a4112b0 - small script to keep copyright aligned in all files (bindings have different copyright owners, need to understand if we need to keep those as they are) 2011-10-23 15:11:14 +02:00
kunitoki
90cc117fb2 - added --git-revision to mapnik-config 
- related to #903
 2011-10-19 00:22:47 +02:00
kunitoki
31f42bd5c1 - added --git-revision to mapnik-config 
- related to #903
 2011-10-19 00:22:47 +02:00
kunitoki
f28da245f3 - fix mapnik-config --version 
- closes #903
 2011-10-19 00:13:38 +02:00
kunitoki
8ed3b4aa0d - fix mapnik-config --version 
- closes #903
 2011-10-19 00:13:38 +02:00
Dane Springmeyer
7616cd45db move epydoc stuff out of docs/ folder and into utils 2011-10-12 12:17:26 -07:00
Hermann Kraus
f08f8ce008 Update upgrade_map scripts to support new Text/ShieldSymbolizer syntax. 2011-09-15 23:22:55 +00:00
Artem Pavlenko
c1929716a0 + don't link to LIBMAPNIK_LIBS 2011-09-13 11:54:27 +00:00
Artem Pavlenko
5476e8410b + amend input plug-ins to use new wkb interface 2011-09-13 11:54:20 +00:00
Dane Springmeyer
19ee3ae8af provide fix for #807 in upgrading map xml script 2011-09-12 20:28:35 +00:00
Dane Springmeyer
6752760c9a rename the 'howfast.py' script to a more user friendly name 'mapnik-speed-check' 2011-09-10 18:27:31 +00:00
Dane Springmeyer
962b2afb85 fix ms output 2011-09-10 18:22:57 +00:00
Dane Springmeyer
a9fa9ca8b3 output in milliseconds for min and avg 2011-09-09 23:47:27 +00:00
Dane Springmeyer
ec8588ffad scons: fix spacing between cppaths and cxxflags 2011-09-01 15:06:11 +00:00
Dane Springmeyer
22c39d91ba scons: rename all SConscript files to more friendly name of 'build' with a python extension for quick syntax detection in editors 2011-08-30 05:32:01 +00:00
Dane Springmeyer
ba03f91d26 scons: maintain cairo/cairomm cflags in 'mapnik config --cflags' output 2011-08-30 05:17:50 +00:00
Dane Springmeyer
ecbfc4cdb4 scons: fix cxxflags concatenation 2011-08-29 23:02:57 +00:00
Dane Springmeyer
6cb31bd109 scons: better propagation of libmapnik build flags to command line utilities and mapnik-config - also remove conditional flags on specific cairo rendering .cpp files as this was not working right - closes #837 2011-08-29 21:12:22 +00:00
Dane Springmeyer
6b83382f2e scons/mapnik-config: if agg is built and linked internally do not advertise as a depedency link because it will not be available 2011-08-22 16:58:40 +00:00
Dane Springmeyer
23fab382d6 scons: refactor mapnik-config, breaking out --libs, --ldflags, and --dep-libs and offering json output of core config - closes #789 2011-08-13 17:07:05 +00:00
Dane Springmeyer
3974f333a7 scons: add missing import 2011-08-12 21:36:12 +00:00
Dane Springmeyer
97f6add14e scons: fix a few more scons files 2011-08-12 21:32:16 +00:00
Dane Springmeyer
3e67c1d694 scons: centralize install path info 2011-08-12 21:31:28 +00:00
Dane Springmeyer
9ae28abe50 scons: copy to avoid duplicate libs 2011-08-12 19:58:49 +00:00
Dane Springmeyer
915a77a2f7 scons: use different constructions environment to avoid potential conflict when building libmapnik.a 2011-08-12 17:09:22 +00:00
Artem Pavlenko
3436fe0f05 + handle null shapes 2011-08-12 16:43:12 +00:00
Dane Springmeyer
af62ad9c27 scons: collect and propogate the libs used to link libmapnik 2011-08-11 21:11:11 +00:00
Dane Springmeyer
8f1d434e0e make mapnik-config executable in place and fix missing cairo flags - a bug that snuck in after r2996 2011-08-04 20:32:40 +00:00
Dane Springmeyer
f30a9c67c1 better support for possible manifestations of text-transform in 0.7.2 2011-07-07 21:22:02 +00:00
Dane Springmeyer
191f14d33c include cairo/cairomm libs and cflags in mapnik-config output - closes #723 and #787 2011-06-29 14:44:40 +00:00
Dane Springmeyer
b578c02c54 make renderer type a template argument of agg svg renderer 2011-05-17 06:18:06 +00:00
Dane Springmeyer
c5f587c29c remove unecessary linking to boost_thread 2011-05-13 03:12:38 +00:00
Dane Springmeyer
c19ede5070 remove last references to boost_iostreams dependency 2011-05-10 15:57:45 +00:00
Dane Springmeyer
1070b293ad tabs -> spaces 2011-05-04 15:53:36 +00:00
Dane Springmeyer
78fe0364b9 remove iostreams linkage, no longer used 2011-05-02 16:48:41 +00:00
Dane Springmeyer
9da2d701a5 further template the svg_renderer based on pixfmt 2011-04-26 17:38:18 +00:00
Artem Pavlenko
d1903cb463 + don't link to boost::iostreams 2011-04-07 15:34:33 +00:00
Artem Pavlenko
0e0b7a578c + implement memory mapping using boost::interprocess 
+ cache mapped memory regions for re-use
 2011-04-06 13:02:31 +00:00
Tom Hughes
c9472e650c Link svg2png against libagg directly as some recent distributions 
like Fedora 14 don't allow the linker to resolve symbols indirectly
anymore.
 2011-04-05 22:09:43 +00:00
Dane Springmeyer
d2a455a0fb pgsql2sqlite: leverage common functions in sql_utils, vaccuum db when finished 2011-04-04 03:51:29 +00:00
Dane Springmeyer
a73bb9d2cd pgsql2sqlite: better error output, limit 'table' param to flag option rather than positional arg so the two do not conflict 2011-04-04 03:48:39 +00:00
Dane Springmeyer
649e4498c1 handle return of system call 2011-04-01 23:55:19 +00:00
Jon Burgess
80557f7b16 Fix setting of minimum-version if map already has minimum_version. Before this fix the value would be overwritten by the underscore2dash(root) step. 2011-03-15 22:49:08 +00:00
Dane Springmeyer
a5284bada6 add missing DEFINES to mapnik-config cflags that C++ programs need that compile against mapnik headers including expressions 2011-03-04 22:05:29 +00:00
Dane Springmeyer
6ff45e91fe add handling of markers_symbolizer to upgrade_map_xml.py script 2011-02-15 18:41:20 +00:00
Dane Springmeyer
5876abcc30 handle potential xinclude nesting 2011-02-09 23:36:09 +00:00
Dane Springmeyer
af8e859d66 simplify the svg2png command line tool 2011-02-09 06:50:27 +00:00
Dane Springmeyer
93214f83a7 update mapnik2 upgrade script to help with handling r2582 2011-02-05 03:21:02 +00:00
Dane Springmeyer
c5833a6db8 remove unmaintained autotools scripts 2011-02-04 22:22:16 +00:00
Dane Springmeyer
50532801f3 change min_distance and min_padding to minimum_distance and minimum_padding to match python and mimimum_version 2011-02-02 04:20:53 +00:00
Dane Springmeyer
ec0270ad05 enable rendering a list of svg like $ svg2png *svg 2011-01-26 09:14:57 +00:00
Dane Springmeyer
7686af3b7b no need for fancy transforms 2011-01-26 01:27:16 +00:00
Robert Coup
ed306d7cbe #654 add svg2png utility 2011-01-26 01:19:01 +00:00
Dane Springmeyer
b4d092722d fixup return types for mapnik-config and add test of basic returns 2011-01-05 20:52:08 +00:00
Dane Springmeyer
65e96cf2b7 more cleanup after removal of unneeded cpp file 'shapefile.cpp' 2011-01-05 02:07:12 +00:00
Dane Springmeyer
0bc3c1bf33 do not use DESTDIR when reporting install values in mapnik-config 2010-12-22 06:58:21 +00:00
Dane Springmeyer
20349d42f6 touchup and actuall install the 'howfast.py' little performance testing script 2010-12-16 16:32:06 +00:00
Dane Springmeyer
d11a180bb8 add draft xml dtd for validating xml stylesheets - thx manelclos - #684 2010-12-13 17:53:25 +00:00
Dane Springmeyer
798c1d3aba set the minimum_version of mapnik to 0.7.2 for the upgrade script so that we don't break styles that will likely be compatible with 0.7.2 - thanks ebrelsford for reporting this issue 2010-12-02 00:33:25 +00:00
Dane Springmeyer
b24dd5df91 scons: make sure to only create install targets if actually installing - needed to prevent installing during uninstall action if not previously installed 2010-11-29 20:21:02 +00:00
Dane Springmeyer
d927e89bd0 add very basic script for timing rendering of single map given iterations and bbox 2010-11-24 02:03:09 +00:00
Dane Springmeyer
4060f80841 expose the SVN_REVISION in mapnik-config 2010-11-17 19:43:03 +00:00
Dane Springmeyer
a17c91c647 append input/ dir 2010-11-16 23:59:03 +00:00
Dane Springmeyer
704596ff97 fix input_plugins variable 2010-11-16 23:57:16 +00:00
Dane Springmeyer
4068eca05c typo 2010-11-16 23:53:06 +00:00
Dane Springmeyer
86e2fb3f31 actually catch the SYSTEM_FONTS variable this time 2010-11-16 23:50:51 +00:00
Dane Springmeyer
8045d32608 mapnik-config: correctly honor any customization of the fonts path such as passing SYSTEM_FONTS 2010-11-16 23:22:51 +00:00
Dane Springmeyer
46fe1e3e7c fix argument name of mapnik-config so that we can query input-plugins 2010-11-15 22:14:43 +00:00
Lucio Asnaghi
e53b490167 - added verbose option to shapeindex 2010-11-10 11:55:22 +00:00
Dane Springmeyer
61940db92f tweak the upgrade logic so that we don't loose existing attributes - allows upgrading a partially compliant xml 2010-11-08 19:54:28 +00:00
Dane Springmeyer
16ee468c78 set the minimum_version when upgrading 2010-11-08 19:12:29 +00:00
Artem Pavlenko
ab101401cd + simplify geometry implementation 
+ removed multiple geometry typedefs
+ use geometry_type
+ revert to storing vertices in vector_vertex
  (previous implementation using std::vector was
   fragmenting heap causing performance issues with large geometries)
+ FIXME: hit_test is broken!
 2010-11-03 13:19:15 +00:00
Dane Springmeyer
9ec12e731e make sure not to let the user overwrite their style when upgrading 2010-10-22 00:23:02 +00:00
Dane Springmeyer
6ebb182c11 actually add fix for #621 2010-09-26 11:52:06 +00:00
Dane Springmeyer
3549fea396 enable upgrading xml for attribute changes (e.g text_convert -> text_transform) 2010-09-18 19:33:13 +00:00
Dane Springmeyer
523b09701e Add the ability to pass custom CXXFLAGS and LDFLAGS that will be prioritized above other compiler and linker flags 2010-09-18 18:02:15 +00:00
Dane Springmeyer
3f2f9fb4e5 avoid serializing xml to a string but rather write directly from tree (tree.tostring() is buggy with everything except lxml) 2010-08-26 21:44:43 +00:00
Dane Springmeyer
b4e989a85a only support reading xinclude if we are using lxml 2010-08-26 20:45:08 +00:00
Dane Springmeyer
594b019879 refactor upgrade_map_xml.py script to avoid custom dependency on lxml.objectify 2010-08-26 20:42:50 +00:00
Dane Springmeyer
410981c9fb add indenting support to upgrade_map_xml.py and add wally's alternative that is able to do the black magic needed to maintain entities 2010-08-20 22:20:45 +00:00
Dane Springmeyer
930b2cc7b6 better handling and error reporting around ogr layer names and indexes, renamed ogr plugins index file to 'ogrindex' to avoid collision with shape plugins index (when using common shapefile between each as the indexes appear incompatible) 2010-08-20 21:20:55 +00:00
Hermann Kraus
d3bb11456f Last Summer of Code changes: Support metawriter in upgrade_map_xml.py, fix attribute collector. 2010-08-16 19:14:21 +00:00
Dane Springmeyer
6da5983e94 add xinclude support for libxml2 based parser - thanks oldtopos - closes #567 2010-08-10 06:01:16 +00:00
Dane Springmeyer
26e4fedfde be careful with output streams 2010-07-22 01:16:48 +00:00
Dane Springmeyer
9800e38764 fixup install location of mapnik2.pc for pkg-config 2010-07-21 01:54:50 +00:00
Dane Springmeyer
3e06e21189 fix cppflag construction 2010-07-19 23:01:52 +00:00
Artem Pavlenko
91a109120b + align attribute names with W3C standards 
rename 'bgcolor' to 'background-color'
+ update upgrade_map_xml.py
 2010-07-19 12:01:34 +00:00
Dane Springmeyer
42891914ab scons: add uninstall actions for mapnik-config scripts added in r2039) 2010-07-18 21:40:24 +00:00
Dane Springmeyer
31c60dc066 add mapnik-config script and pkg-config file - #175 2010-07-18 21:34:08 +00:00
Dane Springmeyer
a4872eb522 add tweak to uninstall target missed in r2036 2010-07-18 20:40:15 +00:00
Dane Springmeyer
267b48de49 add ability to uninstall all tracked scons targets using an 'uninstall' argument like 'scons uninstall' - closes #311 2010-07-18 20:39:05 +00:00
Dane Springmeyer
200e9096e9 strip the file extention of '.shp', if provided, as the shapefile driver does not expect the ext. This allows a directory of shapefiles to be indexed like: 2010-07-16 23:28:53 +00:00
Artem Pavlenko
aa0e17afd1 + check cached connection status before returning. 
if PQstatus(conn) == CONNECTION_BAD attempt to
  create a new one
+ expose "conect_timeout" PG connection parameter
  default to 4 sec
+ throw mapnik::datasource exception if connection
  is 'bad' in mapnik::features(..)
 2010-07-02 11:42:35 +00:00
Carlos López
ccacc471d1 Added a second parameter to indicate the name of the file the updated xml will be written to. 2010-06-29 08:59:50 +00:00
Artem Pavlenko
4388ff5fbc + Building/Raster symbolizers support 2010-06-02 12:53:13 +00:00
Artem Pavlenko
0f597b2809 + Add basic format functions and script. 
Usage:
      cd $mapnik_source/utils/format_source_files
      ./format_source_files.sh
  (TODO: just a starting point to remove tabs,
  needs some more work)
 2010-06-02 11:03:39 +00:00
Artem Pavlenko
246731874b + apply 'mapnik-format' to *.cpp *.hpp 2010-06-02 11:03:30 +00:00
Dane Springmeyer
25c936c1e6 more demo/utilities working with mapnik2 2010-05-07 19:46:05 +00:00
Dane Springmeyer
15c7ab6233 add ability install XML upgrade script 2010-04-28 05:35:26 +00:00
Artem Pavlenko
d51111e6e5 + check expression needs converting 
+ convert PolygonSymbolizer to use attributes
 2010-04-09 18:47:04 +00:00
Artem Pavlenko
c51bac877e + add map_xml upgrade script (mapnik->mapnik2) 2010-04-09 18:46:56 +00:00
Artem Pavlenko
1acc288349 + better data types mapping 2010-04-09 18:46:17 +00:00
Artem Pavlenko
75dc292eb9 + link to mapnik2 
+ add newline at the end of file
 2010-03-24 10:30:15 +00:00
Dane Springmeyer
e77ff7bd11 directly link boost_system to ogrindex if available 2010-02-21 03:07:47 +00:00
Dane Springmeyer
07186fc6bb ensure shapeindex links against boost system if available (boost >=1.35) to avoid potential problems in indirect linking on linux (essentially directly dynamically linking like we previously only did on os x) - closes #517 2010-02-21 01:00:09 +00:00