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

598 commits

Author SHA1 Message Date
Dane Springmeyer
23fb010ea2 disable dlclose when building with --coverage - refs #3344 2016-03-03 15:02:03 -08:00
Dane Springmeyer
833703026d add COVERAGE configure option - only set coverage flags on libmapnik and plugins - refs #3344 2016-03-03 14:19:12 -08:00
Dane Springmeyer
52cabfd107 expat is no longer a must have cairo dep since cairo can be built without fontconfig [skip ci] 2016-02-03 10:57:09 -08:00
Dane Springmeyer
8115659fa6 Default to vizibility=hidden and inlines-hidden - refs #1863 2016-01-11 16:51:14 -08:00
Blake Thompson
dfa62c88d8 fix for santize address errors 2015-12-27 21:40:10 -06:00
Dane Springmeyer
59723ae693 restore -Wno-unsequenced, accidentally dropped in 7608040906 2015-12-01 13:59:45 -05:00
Dane Springmeyer
5eefd8b1ec better harfbuzz ft check - refs #3166 2015-11-09 11:11:07 -08:00
Dane Springmeyer
8e1996d6c6 Scons: check for harfbuzz with freetype support 2015-11-09 10:58:16 -08:00
Dane Springmeyer
7608040906 centralize warning suppression 2015-11-07 17:53:09 -08:00
Dane Springmeyer
8813e73cfc rename SHAPE_MEMORY_MAPPED_FILE to MAPNIK_MEMORY_MAPPED_FILE 2015-10-16 13:34:53 -07:00
Dane Springmeyer
e161253631 remove last reference to pre versioning [skip ci] 2015-10-12 13:56:13 -07:00
Dane Springmeyer
98e8a12d78 Fix #3124 2015-10-12 13:38:15 -07:00
Dane Springmeyer
c9a4d3d8ef remove MAPNIK_VERSION_IS_RELEASE logic from scons - refs #3123 2015-10-12 10:41:11 -07:00
Dane Springmeyer
67718ed8e1 rename nik2img to mapnik-render 2015-10-12 10:38:58 -07:00
Dane Springmeyer
8d11151382 rename csvindex to mapnik-index since we'll soon support geojson 2015-10-07 08:33:24 -07:00
artemp
f3efff3885 add csvindex build option 2015-10-01 15:17:22 +01:00
artemp
877cd2c75e update copyright year 2015-10-01 15:11:50 +01:00
Blake Thompson
ab2855a130 Made it so that singleton deleted at exit could be turned off. 2015-08-11 11:34:35 -05:00
Dane Springmeyer
2af5a75dd7 default to ptree xml parser (rapidxml inside boost) instead of libxml2 2015-07-30 11:22:23 -07:00
artemp
ffcacf3509 make libxml2 optional dependency (XMLPARSER=libxml2) 2015-07-30 13:14:37 +02:00
Dane Springmeyer
6f61c0e6c4 fix building both postgis and pgraster plugins together - closes #2986 2015-07-27 16:21:31 -07:00
Dane Springmeyer
2048be7b30 move occi, osm, rasterlite to non-core repo 84b0bfecb3 - refs #2980 2015-07-16 11:46:10 -07:00
Dane Springmeyer
0d86afff36 start using -Wsign-compare and -Wshadow + fix heaps of warnings - refs #2907 2015-06-12 14:51:18 -07:00
Blake Thompson
a138b8717d Removed angus clipper library from code and updated all visual tests to master 2015-06-02 14:14:21 -05:00
Dane Springmeyer
ea3eb674c7 default compiler to cc/c++ / remove obsolete special casing for os x 2015-05-24 13:51:45 -07:00
Dane Springmeyer
4667e9470a more portable workaround for gil c++11 bug - closes #2859 2015-05-24 13:48:04 -07:00
Paul Norman
f0364c40a9 Remove stray " in HOST config line 2015-05-23 16:53:00 -07:00
Jiri Drbalek
848044e8c4 fix compilation error due to boost scoped enum with boost < 1.51 2015-05-17 19:44:48 +00:00
Matt Amos
a5cf088568 Fix compilation error due to Boost scoped enum & C++11 mode. 
Boost versions before 1.57 are broken when the system package and Mapnik are compiled against different standards. On Ubuntu 14.04 using boost 1.54, it breaks scoped enums. It's a bit of a hack to just turn it off like this, but seems the only available work-around. See https://svn.boost.org/trac/boost/ticket/6779 for more details.
 2015-05-16 21:41:40 +01:00
Dane Springmeyer
41ad16f4d7 hello world plugin is now standalone at https://github.com/mapnik/hello-world-input-plugin - refs #2790 2015-05-11 17:07:33 -07:00
Dane Springmeyer
a5e258344e make target to setup python bindings + run visual tests 2015-05-04 00:30:25 -07:00
Dane Springmeyer
2de1805aa3 make mapnik-config able to report relative paths to share/ data 2015-04-27 16:02:41 -07:00
Dane Springmeyer
edf7616b19 reorganize c++ tests 2015-04-25 22:08:12 +02:00
Dane Springmeyer
c03998d4c9 remove obsolete c++ test files 2015-04-25 10:43:14 +02:00
Dane Springmeyer
8bb605e2e9 move python bindings out of core #2773 - now at https://github.com/mapnik/python-mapnik 2015-04-24 09:04:00 +02:00
Dane Springmeyer
686731cade remove python plugin from core 
- now at https://github.com/mapnik/non-core-plugins
 - refs #2773, #1875, #1337,
 2015-04-24 08:51:56 +02:00
Dane Springmeyer
7c9a18b16b scons: make harfbuzz min version recommended but not strict 2015-03-04 16:26:12 -08:00
Dane Springmeyer
d5e3dba3df scons: cross compilation fixes 2015-03-04 16:25:15 -08:00
Dane Springmeyer
4b5cc89626 support PG_INCLUDES/PG_LIBS for pointing to libpq (instead of pg_config) 2015-02-20 13:22:23 -08:00
Dane Springmeyer
f08dcf9a83 scons+bootstrap: use absolute paths, but don't resolve symlinks 
- relative paths continue to be supported in the config.py to make it easy
   to share config.py versions across systems
 - os.path.realpath was previously used to internally create absolute paths
   but now we use os.path.abspath instead to avoid resolving symlinks to keep
   the internally stored paths as simple as possible
 - this all will allow mapnik-config to report more similar paths to what was
   passed in (just absolute)
 2015-02-20 12:56:08 -08:00
Dane Springmeyer
7ab9ade36d fix oracle library name 2015-02-17 11:32:54 -08:00
Dane Springmeyer
a2dabb370d fix build+link of oracle plugin 2015-02-16 23:09:16 -08:00
Dane Springmeyer
2bc761d99a fixup harfbuzz version check - refs #2694 #2544 2015-02-09 17:52:09 -08:00
Jiri Drbalek
4fcf0ea3e8 scons: check for harfbuzz version 2015-02-09 14:15:22 +00:00
Dane Springmeyer
f0b0ee3e7e scons: collect pycairo flags at configure time 2015-02-02 18:59:29 -08:00
Dane Springmeyer
1c4799f680 remove stray remains of large_geojson plugin (now part of geojson plugin formally) 2015-01-27 18:16:56 -08:00
artemp
2f42cb91cc Merge branch 'master' into large-geojson 2015-01-26 09:16:06 +01:00
Dane Springmeyer
93570f820a mason bootstrap: expat and sqlite_rtree fixes 2015-01-24 08:51:16 -08:00
Dane Springmeyer
2652649ea0 scons: fix sqlite_rtree linux configure test in absence of pkg-config 2015-01-24 08:41:06 -08:00
Dane Springmeyer
6ab91b2300 allow manually passing lib/include paths for libxml2 and freetype 2015-01-23 09:12:11 -08:00
artemp
788fd8c80b large_geojson.input - initial implementation 2015-01-16 16:22:46 +01:00
Dane Springmeyer
f8bedf4f65 support building without dlopen support 
Conflicts:
	SConstruct
 2014-12-17 11:55:22 -08:00
Dane Springmeyer
bc3f59af12 new c++ tiff tests - refs #2491 2014-12-08 14:52:52 -05:00
Dane Springmeyer
ba4230c8ad stop setting -Wsign-compare since this is too noisy as a default 2014-12-05 09:44:54 -05:00
Dane Springmeyer
ad52fc7637 get mapnik version in a less brittle way 2014-10-23 01:02:14 -07:00
Dane Springmeyer
f6e077fb08 remove unused scons function 2014-10-23 00:41:06 -07:00
Dane Springmeyer
ed425b7f3f move local boost headers into deps directory 2014-10-22 23:51:44 -07:00
Dane Springmeyer
a0dc3df575 move mapnik-config back to utils/ 2014-10-22 23:46:33 -07:00
Dane Springmeyer
27666bb686 ignore -Wunsequenced warnings 2014-10-22 15:34:04 -07:00
Dane Springmeyer
e88748c57e stop defaulting to -Wextra [skip ci] 2014-10-21 20:31:48 -07:00
Dane Springmeyer
95b301deb4 set ignore unknown pragmas after -Wall and -Wextra 2014-10-21 20:22:33 -07:00
Dane Springmeyer
dcfa056413 merge 2014-10-21 19:49:03 -07:00
Dane Springmeyer
d25f0c316a silence more warnings 2014-10-21 17:44:47 -07:00
Dane Springmeyer
83588937b9 silence boost warnings 2014-10-21 16:37:27 -07:00
Dane Springmeyer
44bc5b59d6 break out wkt/json grammars into separate libraries 2014-10-13 01:06:36 -07:00
Dane Springmeyer
87e5df48de scons: fix memory leak in configure test 2014-10-06 17:23:18 -07:00
Dane Springmeyer
00382775a9 more make clean fixes 2014-09-29 21:20:01 -07:00
Dane Springmeyer
b56168d0a4 actually fix make clean first run - refs #2112 2014-09-24 15:59:08 -07:00
Dane Springmeyer
97dcd2fd59 only accept JOBS via make setting and default to 1 - closes #2430 2014-09-23 11:25:01 -07:00
Dane Springmeyer
6fe0f93e70 remove svg renderer test 2014-08-24 13:46:33 -07:00
Dane Springmeyer
920b92a3ef improve error message when c++11 compiler is not available - refs #2376 2014-08-21 15:03:57 -07:00
Dane Springmeyer
4e12b999f0 pull in pgraster plugin by @strk from 2.3.x to master/3.x - refs #2329 #1660 2014-08-12 15:03:51 -07:00
Dane Springmeyer
5a35422ee5 build: remove -finline-functions which is no longer supported by clang-3.5 2014-08-08 12:00:20 -07:00
Dane Springmeyer
cbe643c3f5 scons: no need to link to fontconfig in static cairo build 2014-08-07 19:16:59 -07:00
Dane Springmeyer
8af453e77d scons: fix first-run clean problem #2112 2014-07-29 17:54:49 -07:00
Dane Springmeyer
468bd150b7 scons: fix 'make clean' so it actually runs completely 2014-07-24 19:06:42 -07:00
Dane Springmeyer
d5ac946706 remove libcurl dependency 
Conflicts:
	plugins/input/osm/dataset_deliverer.cpp
	plugins/input/osm/osm.cpp
	plugins/input/osm/osm_datasource.cpp
	plugins/input/osm/test.cpp
 2014-06-16 09:52:26 -07:00
Dane Springmeyer
d0b357cab7 scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging 2014-06-09 13:55:56 -07:00
Dane Springmeyer
92bf9782f8 scons: fix path remove to be less aggressive 2014-05-13 15:25:16 -07: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
e618a65498 fix #2185 2014-03-20 16:02:47 -07:00
Dane Springmeyer
811e93cdc4 update visual tests against freetype 2.5.3 2014-03-10 11:38:42 -07:00
Dane Springmeyer
0a26485d28 add simple, c++ version of nik2img 2014-02-10 10:46:48 -08:00
Dane Springmeyer
f6b74ff819 fix #2141 2014-02-05 12:32:21 -08:00
Dane Springmeyer
587a1c1bff remove compile workaround for old OS X gcc since we only support c++11/clang++ now at Mapnik 3.x - refs #1835 2014-01-27 12:23:33 -08:00
Dane Springmeyer
63ea37b4c2 further no terminal port 2014-01-26 14:49:03 -08:00
Dane Springmeyer
87e0ae8124 adapt build to use BOOST_SPIRIT_NO_PREDEFINED_TERMINALS 2014-01-26 14:00:58 -08:00
Dane Springmeyer
fd6474b65e improve configure doc for FULL_LIB_PATH and ENABLE_SONAME 2014-01-21 21:15:57 -08:00
Dane Springmeyer
0e38731152 add ENABLE_SONAME option + embed rpath/loader_path by default - closes #1225 2014-01-20 20:16:08 -08:00
Dane Springmeyer
fede08d4da fix boost_regex icu detection on linux when statically linking 2014-01-20 14:19:41 -08:00
Dane Springmeyer
66347f78e6 rework tests: always run locally 2013-11-22 12:01:02 -08:00
Dane Springmeyer
64d5153aea Improved support for international text 
- Implementation by @herm for GSOC 2012 (http://mapnik.org/news/2012/10/06/gsoc2012-status9/)
 - C++11 port, improvements, optimizations by @artemp
 - Testing and integration with master by @springmeyer
 - Thank you to all the support from @behdad along the way
 - Thanks for help testing @toton6868, @stephankn, @nirvn, @mfrasca, @simonsonc and many others

Refs: #2073,#2070,#2038,#2037,#1953,#1820,#1819,#1714,#1634,#1547,#1532,#1319,#1208,#1154,#1146
 2013-11-22 00:06:32 -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
ca25d6797a Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-04 09:40:58 -08:00
Dane Springmeyer
4fb6f25dcd scons: back off using -Wshadow since this triggers too much spurious noise with g++-4.7 and clang++/libc++ 2013-11-04 09:39:24 -08:00
Dane Springmeyer
f998b2bda6 Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	deps/agg/build.py
	deps/clipper/build.py
	include/mapnik/feature_style_processor_impl.hpp
	plugins/input/csv/csv_datasource.cpp
 2013-11-03 23:10:21 -08:00
Dane Springmeyer
26f362db9a scons: do not (yet) default to using -Wconversion -Wno-sign-conversion 2013-11-03 23:07:03 -08:00
Dane Springmeyer
0f8c931530 scons: suncc support is not maintained, remove it 2013-11-03 23:07:02 -08:00
Dane Springmeyer
c1da56a6a0 scons: specialize default search path for icu on OS X since homebrew is so common now and icu is 'key-only' 2013-10-31 21:14:24 -07:00