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

276 commits

Author SHA1 Message Date
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