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

2093 commits

Author SHA1 Message Date
Dane Springmeyer
1a771f07c6 Add a 64 bit enabled grid type 2012-12-19 19:16:49 -08:00
Dane Springmeyer
8e9ff61190 centralize header with grid_renderer base type 2012-12-19 19:15:07 -08:00
Dane Springmeyer
c8e5094858 remove hardcoding of color_type in grid_marker_helper 2012-12-19 18:25:17 -08:00
Dane Springmeyer
3df8574c84 remove hardcoding of expected pixel types in agg svg renderer 2012-12-19 18:04:49 -08:00
artemp
b75b54a787 + fix bigint support 
+ fixup cpp tests
 2012-12-18 20:34:27 +00:00
artemp
f5dd9e53c4 + calc int_parser/generator type from mapnik::value_integer 2012-12-18 18:05:45 +00:00
artemp
e331566ac7 + wrap return value into mapnik::value_integer 2012-12-18 15:18:40 +00:00
artemp
a38b252ccd Merge branch 'master' into bigint 
Conflicts:
	plugins/input/geojson/geojson_datasource.cpp
	plugins/input/postgis/postgis_featureset.cpp
 2012-12-18 13:57:39 +00:00
artemp
e82e5e2fb3 + default to 6 digit precision in wkt generator for now 2012-12-18 12:12:43 +00:00
artemp
274fbf8f7a + ensure 'close path' handled correcly 
(currenlty SEG_CLOSE command must have valid x,y)
+ implement real_policies in wkt and geojson generators
 2012-12-18 11:44:35 +00:00
Artem Pavlenko
e7891a99ce Merge pull request #1653 from strk/master-float-scientific 
Implement scientific notation for double-to-string
 2012-12-18 02:48:29 -08:00
Dane Springmeyer
c7ed1f93d7 update svg_renderer 2012-12-17 19:13:00 -08:00
Dane Springmeyer
8d2b00ea75 fix member name 2012-12-17 13:12:31 -08:00
Dane Springmeyer
43244efb7d Merge branch 'master' of github.com:mapnik/mapnik into no-bind 2012-12-17 13:03:11 -08:00
Dane Springmeyer
14f80192df add internal noncopyable header 2012-12-17 10:32:00 -08:00
Sandro Santilli
e8b7b82bbb Implement scientific notation for double-to-string 
Also fixes tests for 1e5 expecting fixed precision rather than
scientific notation (stringstream gives scientific notation indeed)

The only still failing test now is the one having less than 16
significant digits of precision, due to the boost bug:
https://svn.boost.org/trac/boost/ticket/7785
 2012-12-17 19:29:44 +01:00
Dane Springmeyer
c5410fac7e remove bind option for datasources - refs #962 2012-12-17 10:03:07 -08:00
Dane Springmeyer
bb27156df0 use internal noncopyable class to speed up compile times slightly 2012-12-16 18:19:52 -08:00
artemp
93ad451cd1 + use mapnik::value_xxx 2012-12-14 10:25:20 +00:00
artemp
c4bae9d30a Merge branch 'master' into bigint 
Conflicts:
	bindings/python/mapnik_feature.cpp
	plugins/input/shape/dbfile.cpp
 2012-12-14 10:01:21 +00:00
artemp
bc9be37f89 Merge remote-tracking branch 'origin/master' 2012-12-13 09:35:56 +00:00
artemp
7ded35ef94 + support attribute collection policy accross renderer backends 2012-12-13 09:35:03 +00:00
artemp
dd327140f4 + add attribute collection policy 2012-12-13 09:33:55 +00:00
Dane Springmeyer
772c7f52fc knock out some msvc compiler warnings 2012-12-12 15:59:27 -08:00
Dane Springmeyer
3fd7909ba0 fix compile on windows with msvc 2010 - closes #1646 2012-12-12 15:09:07 -08:00
Artem Pavlenko
e60a3f7703 Merge pull request #1632 from strk/master-float-labels 
Fix float data conversion to string
 2012-12-12 06:21:17 -08:00
Dane Springmeyer
22b159d93d enable [attr!=null] filtering - which finishes #794 and closes #1642 - refs #796 2012-12-11 19:37:46 -08:00
Dane Springmeyer
a4f3be02b5 print null for features with value_null type in debugging output 2012-12-11 18:06:53 -08:00
Dane Springmeyer
e928c483bf properly support tolerance in shape filter_at_point - refs #1640 2012-12-11 14:46:52 -08:00
Dane Springmeyer
6b84269343 add pad method on box2d to help tighten otherwise verbose code 2012-12-11 13:56:25 -08:00
artemp
562fada9d0 + return default (value_null) if attribute is not present 2012-12-11 15:44:19 +00:00
Dane Springmeyer
574fec8403 fix includes in new trim header to allow linux compile 2012-12-07 16:30:36 -08:00
Dane Springmeyer
7c58bf9fcb replace boost::trim with faster custom trim - closes #1633 2012-12-07 14:06:13 -08:00
Dane Springmeyer
c0021d0760 remove unused iostream includes and unnecessary usage of ostringstream - refs #1055 2012-12-06 23:06:12 -08:00
Dane Springmeyer
f3c23c28c3 remove uneeded debugging prints 2012-12-06 21:20:42 -08:00
Dane Springmeyer
390706b8c7 remove all remaining stringstream usage in load_map to avoid perf hit from locale lock - refs #1055 2012-12-06 20:15:27 -08:00
Dane Springmeyer
80630e905b formatting 2012-12-06 18:46:23 -08:00
Sandro Santilli
b51b357123 Fix float data conversion to string 
Fixes precision digits, closing #430
Also avoids forcing a trailing '.0', closing #1627
 2012-12-06 12:07:48 +01:00
artemp
cd435172d4 + fix expression grammar to work with mapnik::value_integer 2012-12-06 09:51:38 +00:00
artemp
511399f3c1 + correct types 2012-12-06 09:50:36 +00:00
artemp
8fa88a71b6 Merge branch 'master' into bigint 2012-12-03 13:14:31 +00:00
artemp
855aea95e0 + mapnik::value and mapnik::parameters - initial support for 64-bit integers 2012-12-03 13:12:09 +00:00
Dane Springmeyer
7d408d523c close #1548 with explict handling of point geometries and amend 629d768eae for cairo/grid renderers to ensure proper placement on lines (refs #1604,#1350,#1607) 2012-12-02 19:53:44 -08:00
Dane Springmeyer
be05aa5b60 add palette.to_string() method and add python tests of fixed palette functionality 2012-11-30 12:31:58 -08:00
Sandro Santilli
54d75d946b Fix "whole" multi centroid computation 
Includes testcase.
Closes #1606
 2012-11-29 17:55:13 +01:00
Dane Springmeyer
363fc2ddd0 fix logic error 2012-11-28 21:18:17 -08:00
Dane Springmeyer
52c3f8ff6e disable bbox intersection testing when caching features on the fly during rendering - closes #1543 2012-11-28 20:56:08 -08:00
Dane Springmeyer
629d768eae use middle_point placement algorithm for marker POINT placement on lines - closes #1604 - refs #1350 and refs #1607 2012-11-28 19:23:56 -08:00
Dane Springmeyer
2ee6c9aca1 Merge branch 'master' of github.com:mapnik/mapnik 2012-11-28 17:48:14 -08:00
Dane Springmeyer
46f8ce3ce7 finish bringing back to life the SVG_RENDERER - now outputs geometries again - closes #1438 2012-11-28 17:45:05 -08:00
Dane Springmeyer
1f7459d29d install svg/output headers if SVG_RENDERER is requested 2012-11-28 17:21:38 -08:00
artemp
f56a365a03 + add comment 2012-11-28 19:15:48 +00:00
artemp
99141fa5e5 + support initialSize_ updates 
+ move maxSize_/initialSize_ logic into pool.hpp
 2012-11-28 17:38:18 +00:00
artemp
35fba36bcc + add getter/setter for maxSize 2012-11-28 17:04:12 +00:00
artemp
db3fd368ba + remove default args from Pool ctor 
+ use back() for brevity
 2012-11-27 12:45:07 +00:00
Dane Springmeyer
37804ed0a5 formatting 2012-11-26 16:15:28 -08:00
Dane Springmeyer
275231c410 initialize all values in markers_placement 2012-11-26 15:57:58 -08:00
Dane Springmeyer
f39c3ad857 add marker-multi-policy parameter to support user-configurable rendering behavior for multi-geometries when using either point or interior placement - closes #1573, refs #1555 2012-11-20 17:58:39 -08:00
Dane Springmeyer
eebc8cc73e add image/grid clear methods to make it easier to quickly re-use previously allocated objects for rendering - closes #1571 2012-11-11 21:35:50 -08:00
Alexandre Bonnasseau
267975c388 Coding style correction : tabs to spaces 2012-11-09 11:57:10 +01:00
Dane Springmeyer
663c5ef726 remove commented code 2012-11-08 19:12:58 -05:00
Dane Springmeyer
53c5933dbd amend 2d0bd726c3 - patch from @lightmare - refs #1557 2012-11-08 16:33:18 -05:00
Alexandre Bonnasseau
efff5f0ef0 Issue #1545 - override buffer-size parameter at layer level - revised 2012-11-08 15:51:22 +01:00
Dane Springmeyer
2d0bd726c3 remove uneeded loop in no alpha octree encoding - refs #1557 2012-11-06 12:38:58 -05:00
Dane Springmeyer
6b155dbc85 format as per mapnik c++ style 2012-11-06 11:53:23 -05:00
Dane Springmeyer
211b102ec5 support writing full color png with rgb only (no alpha) - closes #1559 2012-11-06 11:44:44 -05:00
Dane Springmeyer
2446e573c9 remove unused alpha handling code in octree originally added in 201461e8c9 but made redundant in b3711b07d1 2012-11-06 09:37:06 -05:00
Dane Springmeyer
cd3cc31752 support writing rgb (no a) images with miniz - refs #1554 2012-11-06 09:19:40 -05:00
Dane Springmeyer
5a99d7fbdb add miniz support - closes #1554 2012-11-04 07:10:05 -05:00
Dane Springmeyer
a1e00cc374 mapnik c++ style 2012-11-04 06:13:17 -05:00
Dane Springmeyer
d97d8c35a3 formatting 2012-11-01 14:52:02 -07:00
Dane Springmeyer
fb10c670bc renable value_type for coord_transform (needed for SVG_RENDERER) - patch from michael_us (mapniknet project) 2012-11-01 10:47:49 -07:00
Dane Springmeyer
2cf429db08 start disabling svg_renderer features to get closer to compiling - refs #1438 2012-11-01 10:05:50 -07:00
Dane Springmeyer
82b15bdd68 be more explicit about unsigned type for rgba_palette::quantize 2012-10-30 16:55:06 -07:00
Dane Springmeyer
9040d2ac9d fix feature-cache for rasters - TODO: no intersection check option for memory_featureset 2012-10-26 18:18:35 -07:00
Mickey Rose
c3702404cb image_filter: make 'gray' and 'invert' filters honor alpha 2012-10-20 00:08:23 +02:00
Mickey Rose
b335d5ea8e image_filter: extract apply_filter boilerplate, pass filter by reference 2012-10-19 22:05:40 +02:00
Dane Springmeyer
1c9aa5bc09 remove debugging print - refs #1477 2012-10-16 12:23:26 -07:00
Hermann Kraus
15076eb743 Remove unused include. 2012-10-13 19:04:50 +02:00
Dane Springmeyer
c53b6075eb properly set MAPNIK_DECL for mapnik::rule - closes #1527 2012-10-10 12:35:02 -07:00
Dane Springmeyer
ccda92fed1 Revert "finish moving symbolizers out of rule" 
This reverts commit 20a317860d.
 2012-10-10 10:51:06 -07:00
Dane Springmeyer
1f11aeb95a Revert "move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527" 
This reverts commit bf5ffd04f4.
 2012-10-10 10:50:56 -07:00
Dane Springmeyer
20a317860d finish moving symbolizers out of rule 2012-10-10 10:02:45 -07:00
Dane Springmeyer
bf5ffd04f4 move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527 2012-10-10 09:32:29 -07:00
Dane Springmeyer
fb10f58357 shuffle color function 2012-10-04 17:59:34 -07:00
Dane Springmeyer
a6129e9a80 add premultiply/demultiply methods for mapnik::color - refs #1519 2012-10-04 13:53:58 -07:00
artemp
3072b3f581 Merge remote-tracking branch 'origin/master' 2012-10-04 12:17:07 +01:00
artemp
eaf6049909 + template on geometry/path concept 2012-10-04 12:15:51 +01:00
Dane Springmeyer
c27530ec7b remove inefficient and no longer used mapnik::raster constructor - refs #1516 2012-10-03 18:22:18 -07:00
Dane Springmeyer
f4ead94c37 make raster non-copyable 2012-10-03 15:40:43 -07:00
Dane Springmeyer
24adb81390 c++ style 2012-10-03 14:58:12 -07:00
Dane Springmeyer
05195ca68d Merge pull request #1444 from sigmapi/issue1107 
Fix for issue #1107
 2012-10-03 13:06:45 -07:00
Dane Springmeyer
e11650fd84 c++ style 2012-10-03 13:06:30 -07:00
Dane Springmeyer
86e805b33e Merge pull request #1499 from manelclos/master 
Query tolerance for features_at_point
 2012-10-03 11:50:29 -07:00
Dane Springmeyer
2e737e07b2 alternative mapnik::raster constructor that allows less copying - refs #1508 2012-10-02 21:46:31 -07:00
Dane Springmeyer
798b101f0c finish #1512 and adjust tests to use new parameter 2012-10-01 17:09:28 -07:00
Dane Springmeyer
09726626cf add 'premultiplied' property on raster symbolizer to allow user to control (in rare cases) the premultiplied status of images in cases where tiffs mis-report it - closes #1512 2012-10-01 16:14:41 -07:00
Dane Springmeyer
ef28a1db80 cleanup includes in rule/feature_style_processor and move code to rule.cpp and raster_symbolizer.cpp 2012-10-01 15:01:12 -07:00
artemp
d1eefb63b1 Merge remote-tracking branch 'origin/master' 2012-10-01 16:59:01 +01:00
artemp
d24175e80e + style : assigment init for built-in types 2012-10-01 16:57:31 +01:00
artemp
f03e08bbba + make rewind() const 2012-10-01 15:45:30 +01:00
artemp
30f14e0878 Merge branch 'master' into conv_simplify 2012-10-01 10:21:56 +01:00
artemp
b9fed932b9 + template vertex_iterator on path_type 
+ rename vertex_iterator to path_iterator
 2012-10-01 10:20:10 +01:00
artemp
780ea26af3 Merge remote-tracking branch 'origin' into conv_simplify 2012-09-28 19:49:01 +01:00
artemp
3ffe8ec21c + add premultiplied_alpha flag to mapnik::raster 2012-09-28 16:43:05 +01:00
artemp
77e585895f + add premultiplied_alpha method to image_reader 
* tiff - TIFFTAG_EXTRASAMPLES
  * png  - non-premultiplied alpha (http://www.libpng.org/pub/png/spec/1.1/PNG-Rationale.html)
  * jpeg - no-alpha channel, ensure pre-multiplied model
 2012-09-28 16:37:21 +01:00
Manel Clos
8f7083d14d Add tolerance parameter to features_at_point 
Make map.query_point() always pass tolerance to datasources
 2012-09-28 15:12:10 +02:00
artemp
02e7aef9c9 + restore g++/darwin fix - #1507 2012-09-28 09:43:29 +01:00
artemp
bb27ab5d1b + formatting 2012-09-27 16:09:20 +01:00
artemp
2427daa403 + make WKT generator templated on geometry type - the goal is to be able 
to use generator for any type that implements 'vertex' concept
 2012-09-27 16:07:14 +01:00
artemp
42bcf4ea98 + make WKT generator templated on geometry type - the goal is to be able 
to use generator for any type that implements 'vertex' concept
 2012-09-27 16:04:29 +01:00
artemp
03315ff893 + formatting 2012-09-27 16:03:21 +01:00
artemp
8228d99186 + cleanups: use preincrement iterators in for loop etc .. 2012-09-27 16:02:14 +01:00
artemp
a537c58afa + work-in-progress.. 2012-09-26 14:26:12 +01:00
Hermann Kraus
1e6e2bdaa7 Merge branch 'master' into harfbuzz 
Conflicts:
	bindings/python/mapnik/__init__.py
 2012-09-23 13:28:08 +02:00
Hermann Kraus
bbedec3437 Clean up directory structure. 2012-09-23 02:52:40 +02:00
artemp
09d11122d5 Merge branch 'master' into conv_simplify 2012-09-18 10:36:14 +01:00
Dane Springmeyer
91a932d7e9 declare windows symbols for wkt and json parsing - closes #1491 2012-09-17 15:28:05 -07:00
artemp
01ae1a179d Merge branch 'master' into conv_simplify 2012-09-17 11:35:15 +01:00
Hermann Kraus
fa62234179 Merge branch 'master' into harfbuzz 2012-09-15 02:06:35 +02:00
Dane Springmeyer
ad8e4e4cc7 Merge pull request #1366 from mapnik/debugsymbolizer 
Debug Symbolizer
 2012-09-14 16:43:38 -07:00
Hermann Kraus
406904a1f6 Merge branch 'master' into harfbuzz 
Conflicts:
	bindings/python/mapnik/__init__.py
	include/mapnik/font_engine_freetype.hpp
	src/load_map.cpp
 2012-09-15 01:39:33 +02:00
Dane Springmeyer
56585d11d9 when using style level compositing or image filters still trigger style processing callbacks even if we return without querying the data if there are active rules - closes #1477 2012-09-14 16:13:37 -07:00
Dane Springmeyer
1b3dcda87d add method off style to check for active rules 2012-09-14 16:11:37 -07:00
Dane Springmeyer
8cfb40ae2f refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance) 2012-09-14 14:17:45 -07:00
Hermann Kraus
dc6ecc4be7 Reenable wrap-before and add tests for it. 2012-09-14 18:53:52 +02:00
artemp
d42c88ab4a + check sleve_cont has at least two vertices 2012-09-14 13:12:53 +01:00
artemp
820a0e92ab + discard 'almost' adjacent vertices 
+ enforce 'min_size' in output path
 2012-09-13 15:41:51 +01:00
artemp
06bae0a76c + zhao-saalfield intial impl (TODO: optimize) 2012-09-12 15:20:33 +01:00
Hermann Kraus
297bfeb454 Merge branch 'master' into harfbuzz 
Conflicts:
	src/symbolizer_helpers.cpp
 2012-09-08 01:26:47 +02:00
Hermann Kraus
c862d3f672 Solve naming conflict. 2012-09-08 00:29:49 +02:00
Hermann Kraus
85e075b8ea Merge branch 'master' into harfbuzz 
Conflicts:
	bindings/python/mapnik_text_placement.cpp
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/map.hpp
	include/mapnik/metawriter.hpp
	include/mapnik/metawriter_inmem.hpp
	include/mapnik/metawriter_json.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_properties.hpp
	src/agg/process_shield_symbolizer.cpp
	src/build.py
	src/cairo_renderer.cpp
	src/feature_style_processor.cpp
	src/grid/process_shield_symbolizer.cpp
	src/metawriter.cpp
	src/metawriter_inmem.cpp
	src/placement_finder.cpp
	src/processed_text.cpp
	src/symbolizer_helpers.cpp
	tests/visual_tests/images/lines-shield-200-reference.png
	tests/visual_tests/images/lines-shield-400-reference.png
	tests/visual_tests/images/lines-shield-600-reference.png
	tests/visual_tests/images/lines-shield-800-reference.png
	tests/visual_tests/styles/formatting.xml
	tests/visual_tests/test.py
 2012-09-07 19:07:31 +02:00
artemp
29423cfc1c Merge branch 'master' into conv_simplify 
Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
 2012-09-07 16:46:02 +01:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
artemp
11e6ba0c09 + make client methods non-static in classes derived from 
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
 2012-09-07 14:56:30 +01:00
artemp
8fa0742a53 + make client methods non-static in classes derived from 
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
 2012-09-07 14:51:25 +01:00
artemp
5f8bb423e8 Merge branch 'conv_simplify' of git://github.com/kkaefer/mapnik into kkaefer-conv_simplify 2012-09-06 13:12:39 +01:00
artemp
a513d3f97d + code: avoid exposing unsafe static methods in datasource_cache ( #1451) 
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage

TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
      safeguard from accidental deleting a 'singleton' pointer
 2012-09-05 12:53:37 +01:00
Hermann Kraus
786f798cab Use double instead of unsigned while parsing XML. 
Closes #1469.
 2012-09-05 02:15:58 +02:00
Dane Springmeyer
f29726edf1 no need for a default message for datasource_exception 2012-09-03 11:41:51 -07:00
Dane Springmeyer
551f1e0c66 c++ style 2012-09-03 10:52:36 -07:00
Dane Springmeyer
a12b8f1d2f c++ style 2012-09-03 10:27:48 -07:00
Dane Springmeyer
56ae40d059 c++ style 2012-09-03 10:02:39 -07:00
Dane Springmeyer
90391f3bee remove unused typedef 2012-08-29 18:39:16 -07:00
Colin Rundel
bd5df80f75 Minimal roll back const changes 
Changes to expression_ptr and path_expression_ptr are causing runtime issues with the python bindings
 2012-08-29 16:41:48 -04:00
Colin Rundel
dc3763885c More parser clean up - color parser 
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
 2012-08-29 16:41:48 -04:00
Colin Rundel
10001f1d4b Expression parsing simplification 
Similar idea to path expression parsing cleanup
 2012-08-29 16:41:44 -04:00
Colin Rundel
1d0c817170 Make path_expression_ptr have const contents, cleanup 2012-08-29 16:41:43 -04:00
Colin Rundel
0e5f71408e Simplified path_parse implementation 
path_parse and path_parse_from_string were redundant, replaced with overloaded path_parse function to achieve the same functionality.

Additional consistency cleanup in load_map.cpp.
 2012-08-29 16:41:43 -04:00
Dane Springmeyer
de5970f45e shuffle the mapnik::hue_to_rgb method - no need for it to be in the cpp file 2012-08-28 20:08:43 -07:00
Konstantin Käfer
ae865a59fb Merge branch 'master' into conv_simplify 
Conflicts:
	include/mapnik/vertex_converters.hpp
 2012-08-28 20:37:27 +02:00
Dane Springmeyer
f348d177ee fix the include install directory nesting 2012-08-27 18:54:08 -07: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
83e2bc70ff include what you use 2012-08-27 18:39:33 -07:00
Dane Springmeyer
c9bd0c8e51 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-27 17:59:14 -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
Colin Rundel
12f2c247b3 Added set_name to font_set class 2012-08-27 16:09:29 -04:00
Dane Springmeyer
c7c8c468ab apply patch from @rundel to make color grammar more modular (TODO - do this with all grammars) - closes #1440 2012-08-26 17:50:30 -07:00
Hermann Kraus
1acac72b7a Remove fastmath.hpp as it is no longer needed. 
Closes #1301.
 2012-08-26 02:28:30 +02:00
Dane Springmeyer
fa0678cc5a json generator: fix escape chars as per json spec, which is a subset of c/c++ 2012-08-25 11:24:45 -07:00
Konstantin Käfer
fd3aa8a01a Merge branch 'expose_feature_style_processor' into conv_simplify 2012-08-25 15:02:18 +02:00
Konstantin Käfer
7c9700237f move feature_style_processor to an implementation header file 
This allows other applications to create custom instances of the feature_style_processor with their own template arguments without forcing freuquent recompiles in mapnik itself
 2012-08-25 13:35:41 +02:00
Panagiotis Skintzos
e34dc99f3a Exposed the label collision detector outside of Cairo renderer and added Python bindings (issue #1107) 2012-08-25 11:43:31 +02:00
Hermann Kraus
f40464a815 Remove old placement_finder code and rename placement_finder_ng => placement_finder. 2012-08-25 00:27:58 +02:00
Hermann Kraus
5fbda3e579 Merge line placement code paths for Text- and ShieldSymbolizer. 
Enables label-position-tolerance for ShieldSymbolizer.
 2012-08-25 00:16:57 +02:00
Konstantin Käfer
13c46b6cc6 Merge branch 'master' into conv_simplify 
Conflicts:
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
 2012-08-24 23:29:43 +02:00
Konstantin Käfer
4e1423cefe Merge branch 'master' of git://github.com/mapnik/mapnik into conv_simplify 
Conflicts:
	src/cairo_renderer.cpp
 2012-08-24 23:24:31 +02:00
Dane Springmeyer
13bcd3f17f now working on mapnik v2.2.0-pre 2012-08-23 15:19:56 -07:00
Dane Springmeyer
a25aac80f7 setting up for mapnik v2.1.0 release 2012-08-23 14:50:36 -07:00
Dane Springmeyer
c0539406d8 fix includes post bf3efbeab8 - refs #1435 2012-08-23 11:34:13 -07:00
Dane Springmeyer
a3254965fe double csv parsing speeds when handling wkt encoded geometries - refs #1436 2012-08-23 09:07:06 -07:00
Dane Springmeyer
bf3efbeab8 move image filter grammar to cpp and re-use in load map by attaching to xml_tree - closes #1435 2012-08-23 08:13:22 -07:00
Dane Springmeyer
ce03b3599b expose svg output for geometries - refs #1437 (TODO: support svg_multi_generator) 2012-08-22 19:13:37 -07:00
Dane Springmeyer
fc63bd0d24 avoid compile error due to namespace clash with wkt generator - refs #1437 2012-08-22 19:11:01 -07:00
Dane Springmeyer
23808b0523 finish full back comptibility for raster-mode - refs #1206 and #1432 2012-08-22 18:09:01 -07:00
Dane Springmeyer
6edbec86d9 apply patch from @lightmare to better hanle 2 point geometries - refs #1425 2012-08-22 13:34:31 -07:00
Dane Springmeyer
a02801beb9 geometry.hpp does not need to use geom_util.hpp - this include cleanup exposed #1430 2012-08-22 13:27:44 -07:00
Dane Springmeyer
948531e9d0 fix namespacing for wkt generator code - refs #1330 2012-08-22 09:54:01 -07:00
Dane Springmeyer
e8101a070a partially repair backward compatibility in python for 'marker-type' - refs #1427 and #1285 2012-08-21 16:36:15 -07:00
Dane Springmeyer
0eff77c03e return without rendering if label placement algorithm returns false indicating a degenerate geometry - closes #1423 and refs #1424 2012-08-21 12:51:39 -07:00
Dane Springmeyer
a75014c056 convert interior_position to return bool 2012-08-21 11:23:36 -07:00
Dane Springmeyer
b76c8e5c64 +reflect building symbolizer in python 2012-08-20 18:17:00 -07:00
Dane Springmeyer
55646ce236 fix group_by on layer to be std::string const& and reflect in python 2012-08-20 16:26:41 -07:00
Hermann Kraus
accbc139a5 Preallocate memory for glyphs. 2012-08-20 00:08:13 +02:00
Mickey Rose
5ca715c1e0 transform expressions: disallow space-separated compound arguments, refs #1389 2012-08-19 19:30:51 +02:00
Hermann Kraus
a1f0af112e Support ShieldSymbolizer. 2012-08-17 18:31:55 +02:00
artemp
9810557cdc + geojson geometry parser implementation 2012-08-17 12:47:41 +01:00
artemp
21f86761a7 + json: split feature_grammar into geometry and feature grammars 2012-08-17 11:25:21 +01:00
Hermann Kraus
d8fad34aa3 Remove lots of old code in symbolizer_helpers and restructure code to 
avoid the need for different helpers for text and shield symbolizers.
 2012-08-17 02:54:08 +02:00
Dane Springmeyer
372f384365 fix typo: missing comma in severity enum 2012-08-16 16:09:52 -07:00
Dane Springmeyer
a986aedd05 remove 'info' and 'fatal' severities for logging to simplify framework - closes #1400 2012-08-16 15:52:32 -07:00
Konstantin Käfer
b243f03c90 use a set to make visvalingam a lot faster 2012-08-16 22:26:58 +02:00
Dane Springmeyer
bfc92a469c fix and doc out behavior of register_fonts 2012-08-16 12:29:13 -07:00
Konstantin Käfer
22150f908f add facilities to choose the simplification algorithm 2012-08-16 16:53:38 +02:00
Konstantin Käfer
eace6eeb2b don't crash on empty geometries 2012-08-16 15:59:05 +02:00
Dane Springmeyer
c7c8d910c4 fix linking with svg2png on windows - closes #1375 2012-08-15 19:16:11 -07:00
Dane Springmeyer
de3afda3bc remove css_color_grammar_deprecated.hpp 2012-08-15 16:59:22 -07:00
Dane Springmeyer
4cf1484b53 disable colorize-alpha comp-op as per #1371 2012-08-15 14:46:58 -07:00
Dane Springmeyer
71e0edc7bf forward declare CoordTransform in map.hpp 2012-08-15 10:33:31 -07:00
Dane Springmeyer
2b108b7cdb fixup includes 2012-08-15 10:26:20 -07:00
artemp
a991c73a98 + geojson grammar : close linear_rings 2012-08-15 16:53:28 +01:00
artemp
c4765d72ce + close linear_rings in WKT parser 2012-08-15 16:42:46 +01:00
artemp
aecf0531f5 + remove metawriters for the upcoming 2.1 release 2012-08-15 09:47:03 +01:00
Hermann Kraus
f9edcb71e0 Reenable support for metawriters. 
Implementations in individual metawriters are still missing.
 2012-08-15 02:11:11 +02:00
Dane Springmeyer
7a5f06656c allow setting marker width/height together with transform 2012-08-14 17:11:08 -07:00
artemp
34ce663460 + change agg-stack-filter grammar to expect fun(a,b) notation 2012-08-14 20:03:49 +01:00
artemp
8d14ac7e00 + use comma and space as delimiters 2012-08-14 19:57:28 +01:00
Konstantin Käfer
483ba77084 otf visvalingam/whyatt simplification 2012-08-14 20:40:37 +02:00
Konstantin Käfer
dcd7a07c8e simplify-tolerance property boilerplate 2012-08-14 17:04:57 +02:00
Dane Springmeyer
e2b3322934 use typedef for color_type 2012-08-13 11:26:34 -07:00
Hermann Kraus
1dba0581c2 Merge branch 'master' into harfbuzz 
Conflicts:
	src/cairo_renderer.cpp
 2012-08-12 12:32:35 +02:00
Hermann Kraus
ec58dd9f18 Implement jalign for line placements. 2012-08-12 03:34:48 +02:00
Hermann Kraus
37a5552bbd Implement offsets and multiline rendering. 2012-08-12 02:46:26 +02:00
Hermann Kraus
14891379d0 Add compatibility layer with normal path interface. 2012-08-11 23:26:45 +02:00
Hermann Kraus
46fa3cab43 Reenable grid renderer. 2012-08-11 21:47:45 +02:00
Hermann Kraus
9927ae6f60 Change text_renderer class. 2012-08-11 21:22:26 +02:00
Hermann Kraus
ffc3a5d52a Add bounding box calculation. 2012-08-11 20:34:57 +02:00
Hermann Kraus
2e22d740cf Store the value of sin(angle) and cos(angle) instead of recomputing them every time. 2012-08-11 19:14:28 +02:00
Hermann Kraus
503c1862ba Simplify code. 2012-08-11 04:19:11 +02:00
Hermann Kraus
48290546d9 Remove duplicate code. 2012-08-11 02:48:56 +02:00
Hermann Kraus
6eebda886d Implement scoped_state. 2012-08-10 02:39:03 +02:00
Hermann Kraus
2a1925c3ff Respect dx value. 2012-08-10 02:21:46 +02:00
Hermann Kraus
2252e128bd Add rewind function. 2012-08-10 02:14:05 +02:00
artemp
b05344863a + implement markers_dispatch to match AGG output 2012-08-09 17:46:55 +01:00
artemp
973bc00fd7 + correct types 2012-08-09 12:41:08 +01:00
artemp
67b93fac50 + geojson generator : allow empty properties 2012-08-08 16:00:01 +01:00
Dane Springmeyer
cf192ee771 further refactoring of marker_helpers to help set up for using from grid renderer 2012-08-06 11:39:09 -07:00
Dane Springmeyer
53c873ca49 make public the grid_renderer buffer type like AGG renderer 2012-08-06 11:37:27 -07:00
Hermann Kraus
3db18cfa50 Correctly handle glyph clusters. 2012-08-06 01:26:24 +02:00
Hermann Kraus
b7ac16d460 Bug fix: Stored state was incomplete. 2012-08-06 00:32:28 +02:00
Hermann Kraus
e380a20b6c Merge branch 'master' into harfbuzz 
Conflicts:
	src/symbolizer_helpers.cpp
 2012-08-05 16:29:09 +02:00
Hermann Kraus
6a27a2ae76 Implement auto-upright. 2012-08-05 14:57:14 +02:00
Hermann Kraus
5115658ecc Function to print pixel_position to stream. 2012-08-05 01:52:13 +02:00
Hermann Kraus
0b1c983d40 Add option for selecting which text should be upright. 2012-08-05 01:51:42 +02:00
Hermann Kraus
30ee700b7c Store full state. 2012-08-05 01:17:32 +02:00
Hermann Kraus
f20e90a524 Improve angle calculation. 2012-08-05 00:14:29 +02:00
Hermann Kraus
53fa3ff1e1 Implement line placements. 2012-08-04 23:14:32 +02:00
Hermann Kraus
5cb7cb8c59 Remove old code. 2012-08-04 22:11:44 +02:00
Hermann Kraus
593b401c16 Fix some bugs in vertex_cache. 2012-08-04 20:50:32 +02:00
Hermann Kraus
b299ca2533 Rename path_processor => vertex_cache because a different class with the same name already exists. 2012-08-04 19:14:48 +02:00
Hermann Kraus
f8739c7504 Add angle() and set_offset(). 2012-08-04 18:22:19 +02:00
Hermann Kraus
cbcafe89e3 Add functions to save/restore path processor's state. 2012-08-04 17:47:29 +02:00
Hermann Kraus
29274294b3 Only the constructor needs to be a template. 2012-08-04 16:58:07 +02:00
Hermann Kraus
30672d91cb Add function to enlarge bbox2d. 2012-08-04 02:12:15 +02:00
Hermann Kraus
5e259bf064 Remove unused code. 2012-08-04 02:09:49 +02:00
Hermann Kraus
f5af6d3d26 Update path_processor to handle non-continuous paths. 2012-08-04 02:01:36 +02:00
Dane Springmeyer
9284c6369d correct rendering behavior of marker-opacity, which should not, as per svg, override fill-opacity and stroke-opacity but should combine with it 2012-08-03 14:14:03 -07:00
Hermann Kraus
ef0aae3733 Merge branch 'master' into harfbuzz 
Conflicts:
	src/build.py
 2012-08-03 19:27:09 +02:00
artemp
9e95d88acd + make typedefs public 2012-08-03 15:39:20 +01:00
artemp
5f26d82ca2 + correct typedef logic (avoid redefining types) 2012-08-03 15:38:02 +01:00