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

1133 commits

Author SHA1 Message Date
jhollinger2
0aad860a75 Add repeat-distance to text symbolizer properties. 
Update collision detector to handle minimum-distance and repeat-distance seperately.
Update placement_finder to use repeat-distance.
Update group symbolizer to handle minimum-distance and repeat-distance.
 2014-08-03 16:10:21 -04:00
Dane Springmeyer
2901860cee fix iterator type 2014-07-30 23:54:27 -07:00
Dane Springmeyer
1fa31d5d20 remove force-odd-labels - refs #2120 2014-07-29 14:37:29 -07:00
Dane Springmeyer
a8b9ecf54d avoid unused variable warnings in disabled python text_placement bindings 2014-07-29 09:39:07 -07:00
artemp
0cf6e47006 c++ char_properties -> evaluated_format_properties 2014-07-28 17:22:32 +01:00
artemp
51cf60125e rename source files to reflect class name e.g layout -> text_layout 2014-07-28 12:10:34 +01:00
artemp
70059cc346 remove redundant ExpressionFormat node 2014-07-25 14:26:13 +01:00
Dane Springmeyer
8dd47cd204 add missing files that instanciate grammars for python bindings 2014-07-24 15:46:18 -07:00
Dane Springmeyer
c5be70ff65 refactor spirit grammars 2014-07-24 14:31:59 -07:00
Dane Springmeyer
8dcd85a708 iwyu 2014-07-23 14:02:36 -07:00
artemp
e67f046a0e start re-factoring char_property (TODO: change name!) 2014-07-23 16:19:14 +01:00
Dane Springmeyer
881603e94a iwyu 2014-07-22 23:58:27 -07:00
Dane Springmeyer
3de2457799 fwd declare layer 2014-07-22 23:11:12 -07:00
Dane Springmeyer
64e70fb374 iwyu 2014-07-22 22:40:39 -07:00
artemp
1f17620e18 make methods pure virtual where appropriate 
pass std::string by const ref (!)
c++ style
 2014-07-15 11:15:26 +01:00
artemp
72bae0d6b8 text properties : displacement expr 2014-07-15 10:15:56 +01:00
artemp
8c6015ec60 first take at cleaning-up text placement code 
(NOTE: get_text_info is temp disabled in python bindings)
 2014-07-09 11:31:03 +01:00
artemp
fe215a684e c++11 style : replace (almost) all typedef with type alias's 2014-07-07 18:23:15 +01: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
f66d93d0ec fix compile of binding/python/mapnik_image.cpp after cairo header shuffling 2014-06-09 10:49:54 -07:00
artemp
b6bab7d0bb move cairo renderer into its own subdir 2014-06-06 13:38:00 +01:00
artemp
6297c72f02 preserve old MemoryDatasource interface in Python 2014-05-30 11:03:57 +01:00
artemp
f9cf23b59f memory_datasource: support datasource interface 2014-05-30 10:16:49 +01:00
artemp
659a715fc5 python : add comparison operators to Map/Layer/Datasource 2014-05-28 15:40:59 +01:00
Dane Springmeyer
e300a41dca variables now available as postgis datasource tokens 2014-05-13 20:47:22 -07:00
Dane Springmeyer
2f8451b99a variables support for cairo/grid/svg 2014-05-13 18:24:17 -07:00
Dane Springmeyer
2c661ed3d5 support for render time variables 2014-05-11 13:08:24 -07:00
artemp
99bbb10290 c++11 : use int types from <cstdint> 2014-05-06 18:06:47 +01:00
Dane Springmeyer
ef837eb92f c++11 optimizations for faster map loading 2014-04-28 17:10:00 -07:00
Dane Springmeyer
f3a824c2cc grid renderer: remove old method and fix tests 2014-04-24 22:18:36 -07:00
Dane Springmeyer
06bbedaffb fix raster colorizer access from python 2014-04-24 22:01:58 -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
e94876ebe4 Merge pull request #2160 from MapQuest/expr-v2-group-symbolizer 
Group Symbolizer
 2014-04-03 11:52:21 -07:00
Dane Springmeyer
804c90d46e fix c++11/clang-3.4/linux compile issue - closes #2022 2014-03-18 14:17:25 -07:00
Dane Springmeyer
6433d9482e Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 
Conflicts:
	include/mapnik/symbolizer.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_pattern_symbolizer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_pattern_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/cairo_renderer.cpp
	src/feature_type_style.cpp
	src/grid/process_line_pattern_symbolizer.cpp
	src/grid/process_line_symbolizer.cpp
	src/grid/process_markers_symbolizer.cpp
	src/grid/process_polygon_pattern_symbolizer.cpp
	src/grid/process_polygon_symbolizer.cpp
 2014-03-10 00:05:56 -07:00
Dane Springmeyer
277ae93d2c make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165 
Conflicts:
	src/agg/agg_renderer.cpp
 2014-02-27 11:17:09 -08:00
Jordan Hollinger
533820c63f Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2-group-symbolizer 
Conflicts:
	src/text/placement_finder.cpp
	tests/visual_tests/test.py
 2014-02-25 14:21:51 -05:00
artemp
19c2b76e10 remove unused text_symbolizer.hpp/cpp 2014-02-25 14:25:23 +00:00
Matt Amos
a25b480593 Python interface for group symbolizer. 
Boost::Python interface, and added a test to check that it works.
Looks like it fails at the moment due to other changes - a lot of
the python symbolizer tests show the same thing.
 2014-02-18 16:38:58 -05:00
Jordan Hollinger
d39db43e96 Add python binding for Layout node in format tree. 2014-01-30 06:33:29 -05:00
Jordan Hollinger
269b038147 Extract text layout related properties (e.g. displacement, alignments) into seperate object from other placement related text symbolizer properties. 2014-01-30 06:01:57 -05:00
Dane Springmeyer
a98de6a348 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 
Conflicts:
	include/mapnik/expression_grammar_impl.hpp
	src/expression.cpp
 2014-01-27 13:56:36 -08:00
Dane Springmeyer
84166882d9 minimum boost version is 1.47 - remove obsolete code handling older versions 2014-01-27 13:19:21 -08:00
Dane Springmeyer
99bf263afd Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 2014-01-21 21:01:48 -08:00
Dane Springmeyer
2a826e7fc8 fix linux linking order in python bindings 2014-01-20 11:15:10 -08:00
Dane Springmeyer
2b08987903 Merge branch 'master' into expr-v2 2014-01-17 19:59:05 -08:00
Dane Springmeyer
453c29c09f accept woff (web font) format - closes #2113 2013-12-20 17:19:49 -05:00
artemp
b7dda95d84 move symbolizer to json into core 
symbolizer json grammar (needs more work)
 2013-12-10 15:51:07 -05:00
artemp
329224d272 revive stroke linecap/linejoin 2013-12-09 18:46:02 -05:00
artemp
6126286555 add equality comparator `` .def(self == self) // __eq__`` 2013-12-09 14:52:47 -05:00
artemp
7bae4b806c add __hash__ to all symbolizers 2013-12-09 14:52:47 -05:00
artemp
6a3f60954a add extract method to access underlying type from mapnik.Symbolizer 2013-12-09 13:43:42 -05:00
artemp
11080bf903 NumericWrapper helper class to pass correct numeric type 
value_bool, value_integer, value_double to symbolizer property
(there must be a better way ;)
 2013-12-09 12:37:42 -05:00
artemp
9392e0f21e use mapnik::value_xxx types 2013-12-06 14:36:45 +00:00
artemp
12dbc035cc enumeration_wrapper to python converter (work-in-progress) 2013-12-05 16:31:30 +00:00
artemp
8a0c3692f6 python bindings : output property value 2013-12-05 16:30:19 +00:00
artemp
1d453426da __str__ : initial naive stub implementation 2013-12-05 11:32:21 +00:00
artemp
0708e6a07b python : revive mapnik.Symbolizers (required by mapnik.Rule.symbols) 2013-12-05 10:18:25 +00:00
Dane Springmeyer
e9ca9c8790 symbolizer-expressions replayed against latest master 2013-11-27 22:50:15 -08:00
artemp
eb3da7d32d c++11 : use nullptr instead of NULL 2013-11-27 15:54:16 +00:00
Dane Springmeyer
dffd0a6e9e add has_svg_renderer status to python bindings 2013-11-22 15:49:39 -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
1c56f0dc19 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-21 13:09:52 -08:00
Dane Springmeyer
9688562df3 python render_with_detector: respect scale_factor and offsets - refs #2075 2013-11-17 20:10:20 -08:00
Dane Springmeyer
03fdf7e596 Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	src/deepcopy.cpp
	src/expression.cpp
	src/rule.cpp
 2013-11-13 20:00:13 -08:00
Dane Springmeyer
5de5ffb764 remove unused and broken deepcopy support to be replaced in #2081 - refs #1390 and #946 2013-11-13 19:26:17 -08:00
Dane Springmeyer
53e95bb506 Merge pull request #2074 from mapnik/text-refactor 
Organize text code in subdirectory
 2013-11-08 17:31:52 -08:00
Dane Springmeyer
cb614af83e iwyu 2013-11-07 20:24:10 -08:00
Dane Springmeyer
c7a6265869 organize text code in subdirectory 2013-11-07 20:09:22 -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
fe5b3713ba python bindings: reduce compile times by consolidating code in fewer cpp files 2013-11-05 15:11:23 -08:00
artemp
afd58da6e2 geojson - feature_collection_parser 
(allow single feature and geometry input)
 2013-11-04 12:39:10 +00:00
Dane Springmeyer
0d58a8aee4 merge with 2.3.x 2013-10-28 14:45:52 -07:00
Dane Springmeyer
86dfa0778a fix cairo reference counting and add more cairo context tests - closes #2031 2013-10-28 12:46:44 -07:00
Dane Springmeyer
882ee3cb32 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-10-23 21:12:54 -07:00
Dane Springmeyer
5a2954dab7 attempt to fix boost python with c++11 and boost 1.49 - refs #2022 2013-10-23 15:42:01 -07:00
Dane Springmeyer
710d558218 scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
artemp
7adee4ab36 c++11 : remove boost::make_shared includes 2013-10-17 15:09:56 +01:00
Dane Springmeyer
1aad73b2ad iwyu 2013-10-14 17:47:51 -04:00
Hermann Kraus
765dda465c Only call function if it is actually built. 2013-10-14 02:34:28 +02:00
Hermann Kraus
cf7aa83bd8 Only call function if it is actually built. 2013-10-14 02:24:36 +02:00
artemp
3edfc69c81 == c++11 
use std::tuple with std::get<>
 2013-10-11 12:36:04 +01:00
Dane Springmeyer
f9e630bbd3 Merge remote-tracking branch 'origin/2.3.x' 2013-10-02 18:23:09 -07:00
Dane Springmeyer
ac961feb64 expose mapnik.Color.packed to get unsigned rgba value 2013-10-01 21:30:49 -07:00
Dane Springmeyer
e9ad589e13 Add boost version header 2013-10-01 09:35:36 -07:00
artemp
c0461280be + add get_pointer impl for std::shared_ptr<T> 
when building agaist boost version < 1.53
 2013-10-01 15:08:46 +01:00
artemp
a3c329a6f8 == Boost.Python std::shared_ptr == 
+ ensure mapnik::memory_datasource is wrapped in std::shared_ptr in Python bindings
+ register implicit conversion from std::shared_ptr<memory_datasource> to std::shared_pre<datasource>

ref #2020
 2013-10-01 14:48:54 +01:00
Dane Springmeyer
0f4ba4dfd5 sync with 2.3.x branch 2013-09-25 20:04:31 -07:00
Dane Springmeyer
feaddaeed0 fix raster colorizer via python 2013-09-25 15:22:57 -07:00
artemp
10196f35b4 Merge branch 'c++11' into c++11-revised 
Conflicts:
	bindings/python/python_grid_utils.cpp
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/value.hpp
	src/agg/process_building_symbolizer.cpp
	src/cairo_renderer.cpp
	src/grid/process_building_symbolizer.cpp
 2013-09-23 08:53:36 +01: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
Dane Springmeyer
5d12a345ae start using c++11 features: auto/for/unique_ptr/variadic args - refs #1972 2013-09-19 20:19:01 -07:00
Dane Springmeyer
30c8ca5f66 minor formatting to sync cleaner with master 2013-09-18 19:04:44 -07:00
Dane Springmeyer
d79ecf882f merge with master 2013-09-18 18:49:32 -07:00
Dane Springmeyer
7a6ab9b0ed sync a few files with master 2013-09-18 18:47:44 -07:00
Dane Springmeyer
722aa4ae14 python: add support for __geo_interface__ - closes #2009 2013-09-18 16:08:34 -07:00
artemp
ec0bdb21ad Merge branch 'geometry-types' into c++11 2013-09-16 14:18:22 +01:00
Dane Springmeyer
6bfbb53eac optimized WKTReader for parsing WKT into geometry paths 2013-09-15 23:23:43 -07:00