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

1924 commits

Author SHA1 Message Date
Artem Pavlenko
2e7ed0f589 + format/correct doc string 2012-04-03 13:08:10 +01:00
Artem Pavlenko
1bc2af9104 + expose pixel_format_type 2012-04-03 13:03:59 +01:00
Artem Pavlenko
84cb7b4c54 vertex converter dispatch - intial impl 2012-04-03 13:01:06 +01:00
Dane Springmeyer
d9cb76f7a1 postgis: support mixed case table names - closes #1159 2012-04-02 19:21:14 -07:00
kunitoki
d516cf9f46 - cosmetics 2012-03-28 21:59:40 +02:00
Artem Pavlenko
8038561984 + move renderer to agg_helpers 2012-03-28 12:02:03 +01:00
Dane Springmeyer
2edaefd0d6 cairo: match AGG functionality, adding support for dynamic ellipse drawing and loading from svg icons - closes #1071 (refs #952 - this is stopgap until we refactor and merge with point_symbolizer) 2012-03-27 19:21:11 -04:00
Artem Pavlenko
9840c7df4c Merge branch 'master' into compositing 
Conflicts:
	include/mapnik/util/dasharray_parser.hpp
	src/agg/process_line_symbolizer.cpp
	src/image_compositing.cpp
 2012-03-26 09:05:02 +01:00
Dane Springmeyer
18774354a6 support case insensitive booleans - closes #1141 2012-03-23 20:08:47 -07:00
Dane Springmeyer
149fca1626 I need a beer - followup to e4ae1f660d 2012-03-23 19:19:50 -07:00
Dane Springmeyer
e4ae1f660d boost 1.42 compatibility - fixes #1145 2012-03-23 19:09:38 -07:00
Dane Springmeyer
ea5a46f230 remove the storage and serialization of 'font-directory' and 'minimum-version' since there is no strong need to have them accessible after initial parsing 2012-03-23 18:14:14 -07:00
Dane Springmeyer
2ff8c3344e avoid copy 2012-03-23 11:22:00 -07:00
Artem Pavlenko
76054df89d + add 'wsp' delimiter support 
+ re-arrange grammar a bit
 2012-03-23 13:19:02 +00:00
Artem Pavlenko
38fafc14bc + impl dasharray parser (supports 'none') 
+ skip 0,0 dashes in load_map
 2012-03-23 13:18:49 +00:00
Artem Pavlenko
d76136ba40 use mapnik::util namespace for conversions 2012-03-23 13:18:33 +00:00
Artem Pavlenko
97a9abc8f3 + add 'wsp' delimiter support 
+ re-arrange grammar a bit
 2012-03-23 12:56:26 +00:00
Artem Pavlenko
b4e96c35b5 + impl dasharray parser (supports 'none') 
+ skip 0,0 dashes in load_map
 2012-03-23 11:58:07 +00:00
Artem Pavlenko
242385f16d use mapnik::util namespace for conversions 2012-03-23 11:08:39 +00:00
Artem Pavlenko
97eb078adb + re-use renderer (TODO) 2012-03-23 09:34:26 +00:00
Dane Springmeyer
d23a4b63b9 expose both a clipped and unclipped labeling path type 2012-03-22 16:36:25 -07:00
Dane Springmeyer
2e2bce3126 formatting 2012-03-22 16:31:57 -07:00
Artem Pavlenko
bc2589960b + add missing files 2012-03-21 17:34:41 +00:00
Artem Pavlenko
95cfb061af + experimental compositing symbolizer (fill only) 2012-03-21 15:47:33 +00:00
Artem Pavlenko
aefa23fb5b + boost::bimap based enum<->string lookup table 
+ fix pixel_format bgra -> rgba
 2012-03-21 15:45:23 +00:00
Dane Springmeyer
4843572e1b move image_compositing to cpp file 2012-03-19 15:42:30 -07:00
Artem Pavlenko
b2ca10f3a0 + always premultiply destination buffer for correct ops 
(ensure no color component exceeds alpha channel)
 2012-03-19 21:19:52 +00:00
Artem Pavlenko
9e3e5bb74a Merge remote-tracking branch 'origin/master' 2012-03-19 19:45:32 +00:00
Hermann Kraus
9b62a19cf4 Implement justify-alignment=auto. 
Closes #1125.
 2012-03-19 17:12:53 +01:00
Artem Pavlenko
e06c456789 even better, use BOOST_FOREACH 2012-03-19 10:46:44 +00:00
Artem Pavlenko
aef214292e don't rely on compiler for-loop optimisation 2012-03-19 10:11:55 +00:00
ldp
1542e3e513 add ignore-placement to MarkersSymbolizer 2012-03-18 22:35:02 +01:00
Dane Springmeyer
cdc6376719 be explicit about zero-division protection 2012-03-16 14:49:56 -07:00
Artem Pavlenko
70512dc03b + add optional smothing to line_symbolizer 
( TODO: conv_dash )
 2012-03-15 10:26:53 +00:00
Dane Springmeyer
2abe02bd96 make available MAPNIK_VERSION_STRING in c++ header (not just in python) and add MAPNIK_VERSION_IS_RELEASE define that indicates if the code is released 2012-03-14 18:30:32 -07:00
Artem Pavlenko
3e4733c51a + refactor join/cap settings (agg_helper.hpp) 2012-03-14 17:21:04 +00:00
Dane Springmeyer
8e0ed96756 fix whitespace 2012-03-14 09:12:26 -07:00
Dane Springmeyer
8451e8897d Merge branch 'master' of github.com:mapnik/mapnik 2012-03-14 08:57:13 -07:00
Dane Springmeyer
07d4e45521 fix compile with boost 1.42-1.44 after 2b68cea0a1 2012-03-14 08:56:07 -07:00
Artem Pavlenko
108b99725c + refactor gamma setting logic to avoid code duplication 
( agg_helpers.hpp )
 2012-03-14 15:45:35 +00:00
Artem Pavlenko
87b22c29b2 + add optional polygon smoothing ( 0.0 < smooth < 1.0 ) 
using agg_conv_poly1_curve
 2012-03-14 15:01:31 +00:00
Dane Springmeyer
2f10469c8d apply mapnik_format.el formatting 2012-03-13 07:54:32 -07:00
Hermann Kraus
2b68cea0a1 Merge branch 'new-xml' 
Conflicts:
	include/mapnik/config_error.hpp
	include/mapnik/ptree_helpers.hpp
	src/formatting/text.cpp
	src/libxml2_loader.cpp
	src/load_map.cpp
	src/metawriter_factory.cpp
	src/text_placements/registry.cpp
	src/text_placements/simple.cpp
 2012-03-13 11:11:28 +01:00
Hermann Kraus
150de2aac5 Add rapidxml parser. 2012-03-13 09:02:53 +01:00
Dane Springmeyer
42f9fe03d2 remove old shim 2012-03-12 13:21:38 -07:00
Artem Pavlenko
207ecfd597 remove camel-case names from layer.[h,c]pp 2012-03-12 15:39:59 +00:00
Hermann Kraus
f25a2231ff Warn about unused XML elements. 2012-03-12 02:12:58 +01:00
Hermann Kraus
02d8a98b3f Improve error messages. 2012-03-12 01:09:26 +01:00
Hermann Kraus
502773bea6 Only one grammar object per XML tree. 2012-03-11 23:24:28 +01:00
Dane Springmeyer
ddd3956f0e expose a clear method for the marker_cache and mapped_memory_cache - closes #1022 2012-03-09 15:16:01 -08:00
Dane Springmeyer
9d0bfa9d4e the std::map storing font_face pointers is a cache - name it clearly 2012-03-09 14:47:04 -08:00
Artem Pavlenko
e8758b96a6 + fix init order 2012-03-09 14:26:52 +00:00
Artem Pavlenko
254b3c9fa7 Merge branch 'master' into geometry-clipping 
Conflicts:
	SConstruct
	include/mapnik/symbolizer_helpers.hpp
	src/placement_finder.cpp
 2012-03-09 14:18:41 +00:00
Artem Pavlenko
961ab51aef + fix previous merge error 2012-03-09 13:23:50 +00:00
Artem Pavlenko
d8d5298f4e + update cairo_renderer to use clipped paths 2012-03-09 12:56:54 +00:00
Artem Pavlenko
40b9553722 + add clipping to text/shield/markers 
Conflicts:

	include/mapnik/symbolizer_helpers.hpp
 2012-03-09 12:54:13 +00:00
Artem Pavlenko
c12161bf19 + clip geometries before applying any 
transformations.
 2012-03-09 12:44:29 +00:00
Dane Springmeyer
99a181e196 fix spelling 2012-03-09 12:37:27 +00:00
Hermann Kraus
b71460d4dd Don't return pointer to dead object. 2012-03-09 13:26:11 +01:00
Hermann Kraus
cd8cfc6527 Improve error messages. 2012-03-08 18:52:53 +01:00
Dane Springmeyer
f1aee03912 forward declare marker so marker_cache api access is cleaner 2012-03-08 08:37:58 -08:00
Hermann Kraus
2a7709a0cf Dump xml tree. 2012-03-08 01:29:19 +01:00
Hermann Kraus
c3cd50ff57 Complete new XML structure. 2012-03-07 19:16:41 +01:00
Hermann Kraus
daf30ca0d1 Update metawriter_factory.hpp 2012-03-07 15:26:13 +01:00
Hermann Kraus
9a05dc1828 Add XML functions. 2012-03-07 03:57:31 +01:00
Hermann Kraus
f214675c69 Modify all other files for new XML structure. 2012-03-07 02:23:16 +01:00
Hermann Kraus
7d3fd0755d Complete XML changes in load_map.cpp 2012-03-07 01:35:37 +01:00
Hermann Kraus
7a052f81f7 Update more functions. 2012-03-06 18:17:23 +01:00
Hermann Kraus
ac50834d92 Convert parse_map_include to xml_node. 2012-03-06 15:47:08 +01:00
Hermann Kraus
191d0f907a Convert first function to new XML structure. 2012-03-06 15:18:11 +01:00
Dane Springmeyer
3c594efec8 fix spelling 2012-03-05 17:59:07 -08:00
Dane Springmeyer
2287668562 initialize members of char_info - refs #1114 2012-03-05 14:51:14 -08:00
Dane Springmeyer
3dafe6080d rework text_path ctor to ensure members are properly initialized - refs #1114 2012-03-05 14:15:01 -08:00
Dane Springmeyer
f3c4f9eec7 initialize members of text_symbolizer_properties and char_properties - refs #1114 2012-03-05 13:48:35 -08:00
Dane Springmeyer
e9c043a42a ensure members are initialized (refs #1114) 2012-03-05 13:32:02 -08:00
Dane Springmeyer
90fb50b158 initialize sx,sy in ctrans (refs #1114) and avoid possible divide by zero condition (refs #1110) 2012-03-05 13:29:20 -08:00
Dane Springmeyer
87da7c2e3e ptree_helpers: ensure proper return type upon exception (TODO: needs larger cleanup) 2012-03-05 12:34:10 -08:00
Dane Springmeyer
f81108d5b3 formatting 2012-03-05 12:09:22 -08:00
Dane Springmeyer
7dfc6d9ccd pass doubles by value in find_line_circle_intersection 2012-03-05 11:50:20 -08:00
Dane Springmeyer
f90b410ece formatting to use const& as per 6462af3 2012-03-05 11:10:04 -08:00
Dane Springmeyer
232256e136 load_map_string: do not pass optional arg by const& and better error if string is empty 2012-03-05 10:44:20 -08:00
Hermann Kraus
481271cb76 Add new XML data structure and modify XML parser to work with this structure. 2012-03-05 16:49:54 +01:00
Hermann Kraus
ad86e9aebc Reenable text meta writers. 2012-03-04 23:25:13 +01:00
Hermann Kraus
5578bdb6f9 Remove has_dimensions and dimensions from text_placement_info. 
This functionality is better provided by placement_finder.additional_boxes.
 2012-03-04 16:38:40 +01:00
Hermann Kraus
46272d836b Move more variables from text_placements_info to placement_finder. 
Refs #1048.
 2012-03-04 13:32:10 +01:00
Hermann Kraus
4638b28c36 Store pointer to char_info in text_path instead of pointer to char_properties. 2012-03-04 03:53:39 +01:00
Hermann Kraus
b4eddaab24 Move variables from text_placements_info to placement_finder. 
Reuse placement_finder objects.
Pass feature to placement_finder.
Refs #1048.
 2012-03-04 01:49:01 +01:00
Dane Springmeyer
e622c9548d Merge branch 'master' of github.com:mapnik/mapnik 2012-03-02 18:47:11 -08:00
Hermann Kraus
2bf9d9dbdf Fix handling of empty XML nodes. 
Closes #1106.
 2012-03-03 01:12:23 +01:00
Dane Springmeyer
ca3bd722c1 Merge branch 'master' of github.com:mapnik/mapnik 2012-03-02 10:01:11 -08:00
Artem Pavlenko
726724b3c7 pass by ref 
move conversions impl into .cpp
 2012-03-01 18:36:13 +00:00
Dane Springmeyer
a837b1ae80 specialize getting strings from ptree to avoid excess copying 2012-02-28 20:13:37 -08:00
Dane Springmeyer
7c8341e7c3 formatting 2012-02-28 20:12:13 -08:00
Dane Springmeyer
ce3078fa98 inline to avoid duplicate symbol errors with gcc 2012-02-25 09:29:14 -08:00
Dane Springmeyer
9aff28f768 fix compile with boost 1.42 2012-02-24 19:22:48 -08:00
Dane Springmeyer
e6abd143a8 c++ casts to avoid compiler warnings on msvc 2012-02-24 18:58:34 -08:00
Dane Springmeyer
8cb23ca382 remove uneeded default cases 2012-02-24 18:57:37 -08:00
Dane Springmeyer
954eb5c539 reduce usage of boost::lexical_cast during map parsing by using spirit2-based conversion functions - refs #1055 2012-02-24 18:26:48 -08:00
Dane Springmeyer
2f134657b4 speed up xml loading by avoiding repeated grammar creation - refs #1028 (TODO - still need to handle text/shield expressions) 2012-02-24 16:34:39 -08:00
Dane Springmeyer
b1f5f701cc Merge branch 'master' of github.com:mapnik/mapnik 2012-02-24 16:27:37 -08:00
Dane Springmeyer
128f43bc79 remove used functions in ptree_helpers.hpp 2012-02-24 16:25:46 -08:00
Hermann Kraus
1906cddf04 Improve error messages. 2012-02-25 00:57:05 +01:00
Dane Springmeyer
a917b7b410 fix the ability of external libraries to link mapnik on windows 2012-02-24 11:32:16 -08:00
Artem Pavlenko
4aa957d373 Merge remote-tracking branch 'origin/master' 2012-02-24 18:09:15 +00:00
Artem Pavlenko
917e684bdd dummy decrement() and advance(p) to compile with vc10 (untested) 2012-02-24 18:07:13 +00:00
Dane Springmeyer
2a4fa323cf declare feature_impl and context_type for windows symbol visibility 2012-02-24 09:25:32 -08:00
Dane Springmeyer
dccaff73d9 Merge branch 'master' of github.com:mapnik/mapnik 2012-02-23 18:55:59 -08:00
Dane Springmeyer
9c2e0f478a c++ style 2012-02-23 18:55:48 -08:00
Dane Springmeyer
37d76eccb4 Add explicit header 2012-02-23 18:55:20 -08:00
Dane Springmeyer
e88b8c9cac boost 1.42 compatibility 2012-02-23 15:52:04 -08:00
Dane Springmeyer
871650a3c2 specialize string2int conversion to avoid std::string ctor 2012-02-23 13:11:25 -08:00
Dane Springmeyer
02eb9067e0 fix linking with msvc by declaring text_placements 2012-02-23 11:47:45 -08:00
Dane Springmeyer
2d1f2d19cc fix compile of shield_symbolizer.hpp on windows 2012-02-23 09:22:51 -08:00
Hermann Kraus
e79f13df1f Add debug helper for XML. 2012-02-23 18:10:49 +01:00
Artem Pavlenko
abd57d2acb + use boost::scoped_ptr for auto memory managment 
+ remove delete/new from create_palette
 2012-02-23 12:26:16 +00:00
Artem Pavlenko
61c6b7e6b2 + use boost::range algorithms for brevity 2012-02-23 12:10:32 +00:00
Artem Pavlenko
9db9e7d161 Merge remote-tracking branch 'origin/master' 2012-02-23 10:23:31 +00:00
Artem Pavlenko
00787ec12d + implement 'filter' iterator to output key/value pairs 
where value is not value_null().
+ use it in json::feature_generator to have more compact json
 2012-02-23 10:21:29 +00:00
Dane Springmeyer
56aeae1b52 fix broken python linking after 6a0ce99e22 2012-02-22 16:45:02 -08:00
Artem Pavlenko
8fe79f910f Merge remote-tracking branch 'origin/master' 2012-02-22 22:47:28 +00:00
Artem Pavlenko
00abb57ffa add missing image_width fix 2012-02-22 22:46:35 +00:00
Dane Springmeyer
188ba774b9 rollback part of 5dee576 - avoiding skipping nodes with <= 3 pixels as this fixed only symptoms of the hextree crash and not the root cause (note: divide by zero fix is maintained) 2012-02-22 14:32:12 -08:00
Artem Pavlenko
5b49d64a48 Merge remote-tracking branch 'origin/master' 2012-02-22 17:17:25 +00:00
Artem Pavlenko
199adc17d0 fix reduced image width calc 2012-02-22 17:16:07 +00:00
Dane Springmeyer
5dee576df2 hextree: avoid memory corruption in create_palette_rek() by not skipping <3 pixel nodes and avoid potential divide by zero in assign_node_colors() (led to hang on osx) - closes #1087 2012-02-21 22:37:56 -05:00
Dane Springmeyer
3c2938b812 add header with simple spirit string conversion functions- refs #1055 2012-02-21 10:57:58 -08:00
Dane Springmeyer
9213dd5426 fixup multi-symbolizer processing function 2012-02-20 22:53:54 -08:00
Hermann Kraus
a05faceb11 Fix ShieldSymbolizer line placement. 
Refs #1078, https://github.com/MapQuest/MapQuest-Mapnik-Style/issues/8.
 2012-02-21 00:06:54 +01:00
Artem Pavlenko
80cf0c2bd5 make generators noncopyable 2012-02-20 22:19:50 +00:00
Hermann Kraus
46f80cc6aa Use double instead of int and avoid rounding when possible. 
Closes #1078.
 2012-02-20 19:32:34 +01:00
Artem Pavlenko
6f5d16bfe3 + make feature_collection_parser a template so we can 
instantiate with different iterator types
  e.g std::string::const_iterator and
  boost::spirit::multi_pass<std::istreambuf_iterator<char> >
 2012-02-20 16:23:31 +00:00
Artem Pavlenko
6e498ad062 + update to use new names 
+ add geometry_generator
 2012-02-20 12:03:56 +00:00
Artem Pavlenko
8536b8a536 + better naming 2012-02-20 12:03:07 +00:00
Artem Pavlenko
3953a94636 + geojson generator interface 2012-02-20 10:53:58 +00:00
Artem Pavlenko
8e40537c48 + fix ident 2012-02-20 10:53:15 +00:00
Artem Pavlenko
256d23d5bc + cleanup 2012-02-20 10:52:39 +00:00
Artem Pavlenko
d8005e3486 + feature/geometry geojson generator impl 2012-02-20 10:51:45 +00:00
Hermann Kraus
76cdd7a254 Merge branch 'master' into python-textplacement 2012-02-19 01:00:52 +01:00
Hermann Kraus
6efdb3969e Handle text position differently. 
Should fix part of the ShieldSymbolizer problems.
Refs #1078.
 2012-02-18 14:39:13 +01:00
Hermann Kraus
2843ff3da8 Fix placement_finder.hpp includes. 2012-02-18 14:03:21 +01:00
Hermann Kraus
bb3ad18c95 Rename starting_{x,y} to center to reflect actual meaning. 2012-02-18 13:07:23 +01:00
Hermann Kraus
93d119464c Add new class to avoid mixing different types of positions. 2012-02-18 12:12:45 +01:00
Hermann Kraus
980cdd9e92 Use text_placements registry. 2012-02-18 00:39:14 +01:00
Hermann Kraus
3508ec5fb4 Merge branch 'master' into python-textplacement 2012-02-17 20:54:48 +01:00
Hermann Kraus
481e172b8e Add placement registry. 2012-02-17 20:15:16 +01:00
Hermann Kraus
2c6502e791 Merge branch 'master' of github.com:mapnik/mapnik 2012-02-17 19:52:38 +01:00
Hermann Kraus
7c98b8c9c0 Add XML name registry. 
Allows users to add new types to XML styles.
 2012-02-17 19:45:13 +01:00
Artem Pavlenko
b5bc17304c Merge remote-tracking branch 'origin/master' 2012-02-17 10:48:49 +00:00
Artem Pavlenko
c6a091937f + add get_optional to mapnik::feature_impl 
returns -> boost::optional<mapnik::value const&>
+ use get_optional in feature_kv_iterator to avoid
  throwing exceptions
 2012-02-17 10:46:29 +00:00
Dane Springmeyer
9be9b09d72 Merge branch 'master' of github.com:mapnik/mapnik 2012-02-16 17:44:34 -08:00
Dane Springmeyer
a5e1a66fe6 c++ style in hextree.hpp to aid in debugging - no functional change 2012-02-16 17:44:04 -08:00
Hermann Kraus
44beaf1bdf Make ShieldSymbolizer variables doubles. 
Refs #1078.
 2012-02-17 00:03:46 +01:00
Artem Pavlenko
63735982ee + remove const from parameters passed by-value 2012-02-16 15:35:27 +00:00
Hermann Kraus
ceda45249f Merge branch 'master' into python-textplacement 2012-02-16 00:18:44 +01:00
Hermann Kraus
819ee98041 Rename properties=>defauls, default_format=>format. 2012-02-16 00:17:22 +01:00
Hermann Kraus
4602338e0c Add ExpressionFormat: Allow changing text format based on expressions. 
Closes #1036.
Refs #1048.
 2012-02-15 21:38:24 +01:00
Artem Pavlenko
c83ab1d14e Merge remote-tracking branch 'origin/master' 2012-02-15 19:20:17 +00:00
Hermann Kraus
a2c2ad40e2 Make markers_placement a bit simpler and add sanity checks. 
refs #974.
 2012-02-15 20:06:50 +01:00
Artem Pavlenko
01497bfc36 + add typedef size_type to mapnik::vertex_vector 
+ remove set_capacity() method - no longer required
 2012-02-15 15:16:33 +00:00
Dane Springmeyer
a13b3f650c when feature put/get throws, print the key that does not exist 2012-02-14 14:57:03 -08:00
Artem Pavlenko
8116ba4809 ident 2012-02-14 18:35:00 +00:00
Artem Pavlenko
7e8207236e ident 2012-02-14 18:34:29 +00:00
Artem Pavlenko
dc4cc8f197 + base class already derived from boost::noncopyable 2012-02-14 18:33:39 +00:00
Artem Pavlenko
58b51b208e use standard_wide::space 2012-02-14 18:33:05 +00:00
Dane Springmeyer
9d5591b77a add argument 2012-02-13 22:02:23 -08:00
Dane Springmeyer
a18927a0b1 Add include 2012-02-13 11:59:04 -08:00
Dane Springmeyer
cafb98ed88 qi::omit works with boost >=1.46 but not <=1.45 - refs #1074 2012-02-13 11:47:55 -08:00
Hermann Kraus
be464f0c5b Move code for makers placement from hpp to cpp. 2012-02-13 20:20:09 +01:00
Dane Springmeyer
08216606ee formatting 2012-02-13 11:01:25 -08:00
Hermann Kraus
043dba3786 Merge branch 'cleanup-includes' 2012-02-13 19:37:20 +01:00
Hermann Kraus
f3dc78506b Remove almost empty unused headers. 2012-02-13 18:07:47 +01:00
Hermann Kraus
01e3450dff Add warning for filter_factory.hpp. 2012-02-13 17:03:42 +01:00
Artem Pavlenko
06ae6ae845 + fix #1042 - don't use omit[...] directive with boost_1_42_0 2012-02-13 12:12:13 +00:00
Hermann Kraus
828316bffd Remove unused file. 2012-02-12 23:44:05 +01:00
Hermann Kraus
d3e191ff73 Merge branch 'master' into python-textplacement 
Conflicts:
	include/mapnik/formatting/list.hpp
 2012-02-12 22:58:02 +01:00
Hermann Kraus
1fd7f9d543 Fix spelling error. 2012-02-12 22:48:44 +01:00
Hermann Kraus
2b5274c21b Merge branch 'textplacement-rename' into python-textplacement 2012-02-12 13:57:51 +01:00
Hermann Kraus
52702d3a20 Rename filter_factory to expression. 2012-02-12 13:06:39 +01:00
Hermann Kraus
32b492fac1 Fix includes. 2012-02-12 04:06:34 +01:00
Hermann Kraus
9eccd58ed5 Merge branch 'textplacement-rename' into python-textplacement 
Conflicts:
	include/mapnik/text_processing.hpp
 2012-02-12 04:01:58 +01:00
Hermann Kraus
69f153bf8f Fix all includes. 2012-02-12 03:55:13 +01:00
Hermann Kraus
91ddbd4f73 Move other text placement files. 2012-02-12 03:16:33 +01:00
Hermann Kraus
34638b9e3c Split text_placements.hpp 2012-02-12 03:11:58 +01:00
Hermann Kraus
18004ca7fb Move processed_text. 2012-02-12 02:52:00 +01:00
Hermann Kraus
fbe929810b Fix most includes. 2012-02-12 02:47:26 +01:00
Hermann Kraus
6c29a12f24 Move text_symbolizer_properties. 2012-02-12 02:24:26 +01:00
Hermann Kraus
d7da55be15 Move char_properties. 2012-02-12 02:19:31 +01:00
Hermann Kraus
508ce0b65d Move formating::format_node. 2012-02-12 02:10:08 +01:00
Hermann Kraus
390b70eb44 Move formating::list_node. 2012-02-12 02:07:36 +01:00
Hermann Kraus
e37070f177 Move formating::text_node. 2012-02-12 02:05:27 +01:00
Hermann Kraus
e2c75c5eef Move formating::node. 2012-02-12 02:01:25 +01:00
Hermann Kraus
dc665bdea1 Merge branch 'master' into python-textplacement 2012-02-12 01:49:15 +01:00
Hermann Kraus
3b2767f167 Add additional constructor for common use case. 2012-02-12 01:48:25 +01:00
Hermann Kraus
67faac351b Merge branch 'master' into python-textplacement 2012-02-11 11:25:28 +01:00
Hermann Kraus
7ef1c3544e Bugfix: Collect expressions for formating::format_node. 2012-02-11 11:24:33 +01:00
Hermann Kraus
c94d32b41b Add bindings for formating::list_node. 2012-02-11 11:21:33 +01:00
Dane Springmeyer
4bf8a7f69e boost 1.42 compatibility 2012-02-10 10:31:11 -08:00
Artem Pavlenko
6a015dcd59 Merge remote-tracking branch 'origin/master' 2012-02-10 11:59:12 +00:00
Artem Pavlenko
602264d368 + implement 'in situ' boost::spirit::qi based geojson parser 2012-02-10 11:56:53 +00:00
Artem Pavlenko
f19bcafbf6 + make wkt_parser noncopyable 2012-02-10 10:53:04 +00:00
Artem Pavlenko
ff66cc1326 + check if index is valid in to_string() 
+ output feature id
 2012-02-10 10:52:06 +00:00
Hermann Kraus
1d50aa1b85 Make interface consistent with similar classes. 2012-02-08 01:16:37 +01:00
Artem Pavlenko
958097600c add wkt_parser class for grammar re-usage 
implement from_wkt in terms of wkt_parser
 2012-02-06 22:49:47 +00:00
Artem Pavlenko
8366da08ee fix compiler warnings about ref to temp obj (@springmeyer) 2012-02-06 09:42:53 +00:00
Hermann Kraus
b5627c0f5c Reduce warnings. 2012-02-05 18:10:29 +01:00
Hermann Kraus
a8e2fb1301 Enable depreaction warnings. 2012-02-05 16:31:29 +01:00
Hermann Kraus
e298d141da Improve expression handling. 2012-02-05 03:11:00 +01:00
Hermann Kraus
0a030d55e6 Remove left over declaration. 2012-02-03 23:33:34 +01:00
Hermann Kraus
9c92bf713d Easier syntax by hiding internal data type. 2012-02-03 00:34:14 +01:00
Dane Springmeyer
17d13cff67 whitespace fixes - closes #911 2012-02-01 17:53:35 -08:00
Dane Springmeyer
1cafc03a46 whitespace fixes 2012-02-01 17:49:28 -08:00
Dane Springmeyer
07d7d7d537 convert to using feature_ptr rather than const& for renderers 2012-02-01 16:37:05 -08:00
Dane Springmeyer
915addc51d update grid rendering interface to new feature impl 2012-02-01 10:43:23 -08:00
Hermann Kraus
cc886d1688 Merge branch 'feature-text-merge' 2012-01-31 16:52:28 +01:00
Hermann Kraus
06ce3f7eec Merge remote-tracking branch 'herm/textplacement-merge' 2012-01-31 16:37:37 +01:00
Hermann Kraus
72f061b75a Revert 0c5fc9f246. 
For new text placment branch a different solution is needed.
 2012-01-31 16:36:40 +01:00
Hermann Kraus
1a16e9c5ab Remove class text_processor. 2012-01-31 16:24:58 +01: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
Artem Pavlenko
7f91fb7b1e change read_xxx_xxx methods to not return 
input value by ref.
 2012-01-31 09:46:21 +00:00
Artem Pavlenko
cad0261e55 check if index is valid before pushing back value. 2012-01-31 09:45:06 +00:00
Artem Pavlenko
f53122ea04 add setter for geometry type 
add default ctor (eGeomType->Unknown)
 2012-01-30 20:46:39 +00:00
Artem Pavlenko
39bafa0cf1 add push_new member function which allows modifying 
current features context (useful when datasource schema
is unknown, so we update context as we go along).
 2012-01-30 14:05:41 +00:00
Hermann Kraus
49225d7468 Handle additional boxes from ShieldSymbolizer. 2012-01-29 20:28:32 +01:00
Hermann Kraus
16e5fefb4d Remove text_placement_info::initialize() to avoid incorrect usage of this object. 2012-01-29 20:04:31 +01:00
Hermann Kraus
49a3b3c52c Make code easier to read by using std::pair instead of boost::tuple for position. 2012-01-29 17:33:43 +01: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
Hermann Kraus
09459683e9 Update symbolizer helpers for ShieldSymbolizer. 
Correctly handle point placement for TextSymbolizer. (Tries each possible placement for each point).
 2012-01-29 04:49:02 +01:00
Hermann Kraus
a3871e52b7 Rename set_values_from_xml to from_xml. 2012-01-28 17:13:41 +01:00
Hermann Kraus
ff07b4bce0 placement_element => text_path 2012-01-28 00:09:58 +01:00
Hermann Kraus
d6b8209a9d Rewrote text processing to use a tree structure. 
Reduces the number of classes and simplifies extension.
 2012-01-27 23:15:12 +01:00
Artem Pavlenko
be9b622d1d revert previous bogus change 2012-01-27 17:01:07 +00:00
Artem Pavlenko
09687ce331 Merge branch 'master' into feature-text-merge 2012-01-27 12:51:13 +00:00
Artem Pavlenko
f646aa2228 add support for escaped characters/hex notataion i.e \x20 
allow both single and double quoted strings
 2012-01-27 12:43:43 +00:00
Artem Pavlenko
77772e8470 add basic polygon sorting 2012-01-27 09:47:04 +00:00
Hermann Kraus
dbc1280731 Process more than one geometry. 
Start work on ShieldSymbolizer.
 2012-01-26 20:05:38 +01:00
Hermann Kraus
1bd3e3678c Really use filtered geometries. 2012-01-26 18:13:40 +01:00
Artem Pavlenko
ff44b53583 use geometries_to_process 2012-01-26 16:25:26 +00:00
Artem Pavlenko
5c6fdc780f return member variable by const reference 2012-01-26 13:07:28 +00:00
Artem Pavlenko
36a23367a6 + fix compilation issues 2012-01-26 13:05:41 +00:00
Artem Pavlenko
d1f16bb227 merge textplacement-merge into feature_impl 2012-01-26 13:04:08 +00:00
Artem Pavlenko
c405d61e1c remove <config.hpp> 2012-01-25 20:23:14 +00:00
Artem Pavlenko
06e91a56c6 remove <config.hpp> 2012-01-25 20:21:06 +00:00
Hermann Kraus
37ba77550c More documentation. 2012-01-25 18:46:27 +01:00
Hermann Kraus
1106dcb445 Support for cairo + grid renderer. 2012-01-25 16:17:38 +01:00
Hermann Kraus
bdc20f766b Complete symbolizer_helpers.hpp for TextSymbolizer. 2012-01-25 15:44:19 +01:00
Artem Pavlenko
d146bcc380 Merge branch 'master' into feature_impl 2012-01-25 10:04:03 +00:00
Hermann Kraus
0c5fc9f246 Merge pull request #1050 from rfw/text-placements-python 
Add text placements to Python API.
 2012-01-24 18:11:13 -08:00
Tony Young
d0d692cb82 Add text placements to Python API. 2012-01-25 12:57:26 +13:00
Hermann Kraus
469568862b Add documentation. 2012-01-24 23:42:54 +01:00
Hermann Kraus
3b887972b8 Start work on new symbolizer helpers. 2012-01-23 19:02:35 +01:00
Artem Pavlenko
663b4adfa2 feature_impl : add get paths by const reference method 
python : fix helper functions declarations
 2012-01-23 14:22:14 +00:00
Hermann Kraus
31fd5647f2 Use font manager and char properties in text engine. 2012-01-22 20:51:09 +01:00
Hermann Kraus
1527fed59c Remove unused includes. 2012-01-22 20:08:45 +01:00
Hermann Kraus
b945dff774 Fix metawriters. 2012-01-22 19:57:32 +01:00
Hermann Kraus
9d2a6088b1 New placement finder. 2012-01-22 18:41:04 +01:00
Hermann Kraus
a95524ae35 Remove old variables. 2012-01-22 18:36:17 +01:00
Hermann Kraus
3dab67732e Remove old variables. 2012-01-22 18:33:53 +01:00
Hermann Kraus
78c4464ad7 Remove next_position_only(). 2012-01-22 18:29:55 +01:00
Hermann Kraus
e0b5e15507 Remove old functions from text_placements. 2012-01-22 18:20:34 +01:00
Hermann Kraus
67eb73eab9 Return correct size information from font engine. 2012-01-22 17:53:45 +01:00
Hermann Kraus
2143267db3 Remove boost::make_shared(). 2012-01-22 17:06:14 +01:00
Hermann Kraus
4490e1afaf Add missing get_positions() function. 2012-01-22 16:25:19 +01:00
Hermann Kraus
7fd9fb0c88 Small fixes. 2012-01-22 03:32:21 +01:00
Hermann Kraus
7d03b46079 Update attribute_collector to use get_all_expressions(). 2012-01-22 03:25:19 +01:00
Hermann Kraus
7d01f509ab Add text_placement_info_list functions. 2012-01-22 03:11:55 +01:00
Hermann Kraus
cc048986d8 Text size as float. 2012-01-22 02:38:46 +01:00
Hermann Kraus
6506edebf2 Add deprecation warnings. 2012-01-22 02:33:00 +01:00
Hermann Kraus
5f62584385 Add header for list placement. (Unused so far.) 2012-01-22 02:23:39 +01:00
Hermann Kraus
f460f90ec6 Add new text_placement functions, but keep old stuff to ensure mapnik compiles. 2012-01-22 02:22:55 +01:00
Hermann Kraus
b7f8e356f4 Make text_path use char_info. 2012-01-22 01:43:13 +01:00
Hermann Kraus
5fd7035527 Move font engine functions from .hpp to .cpp. 2012-01-21 01:47:02 +01:00
Hermann Kraus
34405a5d9e Replace dimension_t by char_info. 2012-01-21 00:35:24 +01:00
Hermann Kraus
533b95f0e6 Enable XML parser to return multiple <xmltext> nodes. 2012-01-21 00:02:44 +01:00
Hermann Kraus
e177cd52a7 Rename opacity to image_opacity. 2012-01-20 22:45:47 +01:00
Hermann Kraus
21a58b7b7a Add missing includes. 2012-01-20 22:43:05 +01:00
Hermann Kraus
6a50f91a10 Add text_processing.hpp/cpp 2012-01-20 22:30:12 +01:00
Hermann Kraus
abae1a1fec Remove unused file. 2012-01-20 22:28:06 +01:00
Hermann Kraus
e553dbcd82 Add missing includes. 2012-01-20 22:23:14 +01:00
Hermann Kraus
b14e6c57db Remove unused include. 2012-01-20 22:22:42 +01:00
Hermann Kraus
2a95f7271b Add char_info.hpp 2012-01-20 22:22:14 +01:00
Hermann Kraus
7d8924921c Fix header for ShieldSymbolizer (6efb7a863d). 
Add more default constructors.
 2012-01-20 22:14:08 +01:00
Artem Pavlenko
bae5bd292f move building_symbolizer into separate hpp/cpp 2012-01-19 18:26:15 -05:00
Hermann Kraus
e977df778a Remove unused "anchor" attribute from Text/ShieldSymbolizer. 2012-01-20 00:09:25 +01:00
Artem Pavlenko
7601095e24 move context's typedef inside to avoid poluting global namespace 2012-01-19 17:36:27 -05:00
Artem Pavlenko
29e8bcc47c add method to access attribute values by index 2012-01-19 16:57:15 -05:00
Artem Pavlenko
096082ba9b Merge branch 'master' into feature_impl 2012-01-19 16:11:03 -05:00
Hermann Kraus
537231f60e Remove glyph symbolizer. 2012-01-19 20:34:09 +01:00
Artem Pavlenko
e7fdf1fa51 more files... 2012-01-19 12:57:34 -05:00
Artem Pavlenko
6dc4aaac9d more files... 2012-01-19 12:57:34 -05:00
Artem Pavlenko
ab314b44a4 + use mapnik::gamma_method_e for all symbolizers 
+ fixes #1042 : avoid pushin duplcaite name into boost.python registry
 2012-01-19 12:45:24 -05:00
Artem Pavlenko
0f002077e1 + use mapnik::gamma_method_e for all symbolizers 
+ fixes #1042 : avoid pushin duplcaite name into boost.python registry
 2012-01-19 12:45:24 -05:00
Artem Pavlenko
a6a540cb68 Merge branch 'master' into feature_impl 2012-01-18 09:40:55 -05:00
Artem Pavlenko
034b270eb4 Merge pull request #1023 from tarnowsc/master 
Making the gamma-method for polygon symbolizer
 2012-01-18 06:35:54 -08:00
Artem Pavlenko
8fd505790e Merge pull request #1023 from tarnowsc/master 
Making the gamma-method for polygon symbolizer
 2012-01-18 06:35:54 -08:00
Artem Pavlenko
43fafa6ca0 + move feature_kv_iterotor into *.cpp to avoid cyclic deps 
+ expose kv iterator directly on feature_impl
 2012-01-18 09:15:52 -05:00
Artem Pavlenko
745a20d4c3 make mapnik::Feature base class noncopyable 2012-01-18 09:12:46 -05:00
Artem Pavlenko
63a3399036 Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl 2012-01-17 17:58:34 -05:00
Dane Springmeyer
820b9a2b25 merge master with feature_impl 2012-01-17 17:47:27 -05:00
Artem Pavlenko
0658bf8f5a + check index in valid range+ 
+ add size() and context() methods
 2012-01-17 17:32:33 -05:00
Artem Pavlenko
fbbd1d4dcf re-enable colorizer support 2012-01-17 14:16:03 -05:00
Artem Pavlenko
50b5d06a48 Merge remote-tracking branch 'origin/feature_impl' into feature_impl 
Conflicts:
	include/mapnik/feature.hpp
 2012-01-17 12:39:16 -05:00
Artem Pavlenko
7944d31c2e use key_value (typedef to std::string) 
throw std::out_of_range if key doesn't exist
add has_key(key_value const&) method
 2012-01-17 11:23:32 -05:00
Dane Springmeyer
5414648538 use std::size_t for mapnik::context mapping type 2012-01-17 10:56:59 -05:00
Dane Springmeyer
136239f88b remove mapnik::point_datasource from c++ and mapnik.PointDatasource from python bindings 2012-01-17 09:58:45 -05:00
Dane Springmeyer
eec02f02bb cleanup 2012-01-17 01:47:42 -05:00
Dane Springmeyer
c42e0901d2 cleanup 2012-01-17 01:47:42 -05:00
Dane Springmeyer
63891cec15 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Dane Springmeyer
b0d0d06564 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Artem Pavlenko
7b8934933e add size() method 2012-01-16 13:20:26 -05:00
Dane Springmeyer
66a0cfc81f refactor 2012-01-14 22:35:40 -08:00
Dane Springmeyer
834310f2d8 refactor 2012-01-14 22:35:40 -08:00
Cezary Tarnowski
93ff232ca2 #1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke 2012-01-13 18:20:03 +01:00
Cezary Tarnowski
53fc770495 #1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke 2012-01-13 18:20:03 +01:00
Artem Pavlenko
946667948f fix names 2012-01-13 17:18:43 +00:00
Artem Pavlenko
d75eb788f3 + expose iterator interface in mapnik::context 
+ make feature_kv_iterator friend of feature_impl
 2012-01-13 17:17:40 +00:00
Artem Pavlenko
ede232d2c1 + apply mapnik coding convention 2012-01-13 16:30:03 +00:00
Artem Pavlenko
8a4fb0b47e + add typedefs 2012-01-13 14:50:36 +00:00
Cezary Tarnowski
e7a751987d Merge remote-tracking branch 'upstream/master' 2012-01-13 14:49:59 +01:00
Cezary Tarnowski
afa8ecefc4 Merge remote-tracking branch 'upstream/master' 2012-01-13 14:49:59 +01:00
Artem Pavlenko
da7574065d + envelope() method 
+ put(std::string const&, mapnik::value const&)
 2012-01-13 12:02:02 +00:00
Artem Pavlenko
3ed378e09e fix include 2012-01-12 17:31:32 +00:00
Artem Pavlenko
45e867aac1 feature_impl: key/value forward iterator 2012-01-12 17:29:42 +00:00
Cezary Tarnowski
c007a608ff Adding gamma-method to polygon symbolizer 2012-01-12 16:58:10 +01:00
Cezary Tarnowski
c7cfdef8d4 Adding gamma-method to polygon symbolizer 2012-01-12 16:58:10 +01:00
Artem Pavlenko
0bb8adbbdc factor out common code to reduce duplication (shape_utils) 2012-01-12 12:18:50 +00:00
Artem Pavlenko
14aa8281ce format 2012-01-12 10:18:15 +00:00
Artem Pavlenko
4cd95d9d1c fix init order 2012-01-12 10:10:40 +00:00
Artem Pavlenko
0eb8e2d246 temp fix to compile FIXME 2012-01-12 10:04:49 +00:00
Artem Pavlenko
f02ef7ed0e keep old names 2012-01-12 09:43:54 +00:00
Artem Pavlenko
377aad79ce more friendly interface 2012-01-12 09:40:58 +00:00
Artem Pavlenko
dd4007bc51 + return bvalue by const ref 
+ feature impl update
 2012-01-12 09:35:57 +00:00
Artem Pavlenko
d65186106f update feature factory to work with new features 2012-01-12 09:32:21 +00:00
Artem Pavlenko
f4d3a536f2 new leaner feature impl (shared context) 2012-01-12 09:31:11 +00:00
Dane Springmeyer
967652efb6 include/ 
add utility for converting paths to string geometry type name - refs #701
 2012-01-11 20:02:38 -08:00
Dane Springmeyer
e7f1c58dee include/ 
add utility for converting paths to string geometry type name - refs #701
 2012-01-11 20:02:38 -08:00
Dane Springmeyer
33bd76f24f add geometry_type to mapnik::layer_descriptor - empty unless set by datasources - refs #701 2012-01-11 20:02:30 -08:00
Dane Springmeyer
ca68a77a46 add geometry_type to mapnik::layer_descriptor - empty unless set by datasources - refs #701 2012-01-11 20:02:30 -08:00
Dane Springmeyer
aad26ace9f formatting 2012-01-11 15:58:59 -08:00
Dane Springmeyer
d865555af2 formatting 2012-01-11 15:58:59 -08:00
Tom MacWright
54ecfdbe9f Merge branch 'master' into unbuffered_extent 2012-01-09 13:13:09 -05:00
Tom MacWright
1640252b69 Merge branch 'master' into unbuffered_extent 2012-01-09 13:13:09 -05:00
Artem Pavlenko
e9cb534ee3 + store face index for faster access 
+ avoid memory leaks
 2012-01-09 13:09:19 +00:00
Artem Pavlenko
1ad6e107d3 + store face index for faster access 
+ avoid memory leaks
 2012-01-09 13:09:19 +00:00
Dane Springmeyer
ca1b5ea7ac Revert "recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001" 
This reverts commit 60059970fa.
 2012-01-08 16:07:17 -08:00
Dane Springmeyer
156026c581 Revert "recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001" 
This reverts commit 60059970fa.
 2012-01-08 16:07:17 -08:00
Dane Springmeyer
60059970fa recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 2012-01-08 16:03:04 -08:00
Dane Springmeyer
69f4cece93 recommend 1.46 since that dodges the ubuntu issue with interprocess - refs #950 and #1001 2012-01-08 16:03:04 -08:00
Artem Pavlenko
884e83cda8 delete trailing white space 2012-01-05 11:40:27 +00:00
Artem Pavlenko
9e6e7d0211 delete trailing white space 2012-01-05 11:40:27 +00:00
Artem Pavlenko
cb8ee2e239 don't use boost foreach on geometry_container - type deduction 
issues ??
 2012-01-05 11:38:43 +00:00
Artem Pavlenko
0aa44b84f9 don't use boost foreach on geometry_container - type deduction 
issues ??
 2012-01-05 11:38:43 +00:00
Artem Pavlenko
1b5e281647 implement wkb converter for multi geometries 2012-01-05 10:57:22 +00:00
Artem Pavlenko
e33326a561 implement wkb converter for multi geometries 2012-01-05 10:57:22 +00:00
Tom MacWright
bb5f274265 Adds unbuffered_extent_ to queries from feature_style_processor. 
Creates a new constructor for query. Currently this is used
by the jit_datasource.
 2011-12-20 16:12:37 -05:00
Tom MacWright
0fb717486c Adds unbuffered_extent_ to queries from feature_style_processor. 
Creates a new constructor for query. Currently this is used
by the jit_datasource.
 2011-12-20 16:12:37 -05:00
Dane Springmeyer
d7c720f0af python: reflect fontsets to enable fuller test of map.deepcopy - closes #348 2011-12-20 12:34:27 -08:00
Dane Springmeyer
bbeeaada4d python: reflect fontsets to enable fuller test of map.deepcopy - closes #348 2011-12-20 12:34:27 -08:00
Artem Pavlenko
c71a02e24d add poor man's deepcopy method : 
'''
mapnik::util::deepcopy(map_in,map_out);
'''
 2011-12-20 16:26:30 +00:00
Artem Pavlenko
b3b330bcb7 add poor man's deepcopy method : 
'''
mapnik::util::deepcopy(map_in,map_out);
'''
 2011-12-20 16:26:30 +00:00
Artem Pavlenko
43c837399d copy filter expressions fix 
use const_iterator
 2011-12-20 16:16:17 +00:00
Artem Pavlenko
6c248c70f9 copy filter expressions fix 
use const_iterator
 2011-12-20 16:16:17 +00:00
Artem Pavlenko
145362c6f7 refactor symbolizer deepcopy semantics into internal structure 2011-12-19 13:30:30 +00:00
Artem Pavlenko
a99392d3df refactor symbolizer deepcopy semantics into internal structure 2011-12-19 13:30:30 +00:00
Dane Springmeyer
b62cebf9b5 renable to_wkt after g++ compile fix in 0aef7cc55a 2011-12-17 11:55:30 -08:00
Dane Springmeyer
d940a7cc52 renable to_wkt after g++ compile fix in 0aef7cc55a 2011-12-17 11:55:30 -08:00
Artem Pavlenko
b4fd857a66 Merge remote-tracking branch 'origin/master' 2011-12-17 11:45:08 +00:00
Artem Pavlenko
365e42cd0e Merge remote-tracking branch 'origin/master' 2011-12-17 11:45:08 +00:00
Artem Pavlenko
0aef7cc55a provide attribute customization point : 
template <>
struct is_container<mapnik::geometry_container>
    : mpl::false_
{};

TODO: This is somewhat non-intuitive in this context but
keeps gcc and darwin toolsets happy.
 2011-12-17 11:41:24 +00:00
Artem Pavlenko
843411df86 provide attribute customization point : 
template <>
struct is_container<mapnik::geometry_container>
    : mpl::false_
{};

TODO: This is somewhat non-intuitive in this context but
keeps gcc and darwin toolsets happy.
 2011-12-17 11:41:24 +00:00
Dane Springmeyer
261c9e41e5 temporarily comment to_wkt until we can fix compile with g++ (only works currently with clang++) 2011-12-16 10:07:30 -08:00
Dane Springmeyer
05a09de211 temporarily comment to_wkt until we can fix compile with g++ (only works currently with clang++) 2011-12-16 10:07:30 -08:00
Dane Springmeyer
5357080dc6 c++ style cast 2011-12-16 10:06:18 -08:00
Dane Springmeyer
4b28739274 c++ style cast 2011-12-16 10:06:18 -08:00
Artem Pavlenko
726cea7ba4 Merge branch 'master' into geometry_cleanup 2011-12-14 14:04:30 +00:00
Artem Pavlenko
ed7abc5c51 Merge branch 'master' into geometry_cleanup 2011-12-14 14:04:30 +00:00
Artem Pavlenko
fad6c614e8 remove title, abstract data members from mapnik::rule 2011-12-13 16:47:45 +00:00
Artem Pavlenko
46fea8e890 remove title, abstract data members from mapnik::rule 2011-12-13 16:47:45 +00:00
Artem Pavlenko
bf9dd32e2c remove title,abstract members from layer class 2011-12-13 16:34:10 +00:00
Artem Pavlenko
d24e0436ea remove title,abstract members from layer class 2011-12-13 16:34:10 +00:00
Artem Pavlenko
e228b1143d + support GEOMETRYCOLLECTION in WKT generator 2011-12-13 16:33:27 +00:00
Artem Pavlenko
98e8164ce1 + support GEOMETRYCOLLECTION in WKT generator 2011-12-13 16:33:27 +00:00
Cezary Tarnowski
b438a56ada refactoring following comment on pull request 2011-12-13 15:28:18 +01:00
Cezary Tarnowski
79af8fdbc9 refactoring following comment on pull request 2011-12-13 15:28:18 +01:00
Artem Pavlenko
7e8e600790 + WKT generator for mapnik::geometry_container 2011-12-12 18:19:52 +00:00
Artem Pavlenko
4f1438db01 + WKT generator for mapnik::geometry_container 2011-12-12 18:19:52 +00:00
Cezary Tarnowski
85a55d9fa2 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-12 11:29:00 +01:00
Cezary Tarnowski
0882f0e668 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-12 11:29:00 +01:00
Artem Pavlenko
4c8bb5c0d5 Merge branch 'master' into geometry_cleanup 2011-12-12 09:20:21 +00:00
Artem Pavlenko
bf4f442b8d Merge branch 'master' into geometry_cleanup 2011-12-12 09:20:21 +00:00
Dane Springmeyer
1c4b67ba98 Merge pull request #916 from kkaefer/grouped-rendering 
Grouped rendering
 2011-12-11 22:36:22 -08:00
Dane Springmeyer
e5ab14a298 Merge pull request #916 from kkaefer/grouped-rendering 
Grouped rendering
 2011-12-11 22:36:22 -08:00
Artem Pavlenko
14c3102c31 fix typo 2011-12-09 12:24:51 +00:00
Artem Pavlenko
9d5d52a48f fix typo 2011-12-09 12:24:51 +00:00
Artem Pavlenko
0236a7af27 Merge branch 'master' into geometry_cleanup 2011-12-09 11:43:51 +00:00
Artem Pavlenko
4ca89c4801 Merge branch 'master' into geometry_cleanup 2011-12-09 11:43:51 +00:00
Artem Pavlenko
0d0f9fa0ba SVG generator impl 2011-12-09 11:29:34 +00:00
Artem Pavlenko
05fbb2b646 SVG generator impl 2011-12-09 11:29:34 +00:00
Artem Pavlenko
d700162834 + increase coordinates precision 2011-12-09 11:28:41 +00:00
Artem Pavlenko
9f89ce17a6 + increase coordinates precision 2011-12-09 11:28:41 +00:00
Cezary Tarnowski
8bf359451d Adding support for height as expression for building symbolizer 2011-12-09 12:08:50 +01:00
Cezary Tarnowski
c5eb808059 Adding support for height as expression for building symbolizer 2011-12-09 12:08:50 +01:00
Artem Pavlenko
108d1559c1 Merge branch 'master' into geometry_cleanup 2011-12-08 16:51:21 +00:00
Artem Pavlenko
3a20edbfbd Merge branch 'master' into geometry_cleanup 2011-12-08 16:51:21 +00:00
Artem Pavlenko
446b55fc87 pass const reference 2011-12-08 16:20:04 +00:00
Artem Pavlenko
a5de8154d6 pass const reference 2011-12-08 16:20:04 +00:00
Artem Pavlenko
32ba92d063 fix include 2011-12-08 16:07:51 +00:00
Artem Pavlenko
525fc6ecbc fix include 2011-12-08 16:07:51 +00:00
Artem Pavlenko
f77fb2a530 add bool to_wkt(std::string & wkt, mapnik::geometry_type const& geom) 2011-12-08 15:34:34 +00:00
Artem Pavlenko
3f27b184ba add bool to_wkt(std::string & wkt, mapnik::geometry_type const& geom) 2011-12-08 15:34:34 +00:00
Artem Pavlenko
00e621c8b9 remove unused header 2011-12-08 15:27:26 +00:00
Artem Pavlenko
b923c3679f remove unused header 2011-12-08 15:27:26 +00:00
Artem Pavlenko
bc9fc07d20 rename to reflect 'generator' bit 2011-12-08 15:25:06 +00:00
Artem Pavlenko
495d3eac40 rename to reflect 'generator' bit 2011-12-08 15:25:06 +00:00
Artem Pavlenko
6d0f5c066b boost::spirit::karma based WKT generator 2011-12-08 15:18:01 +00:00
Artem Pavlenko
67180bcc64 boost::spirit::karma based WKT generator 2011-12-08 15:18:01 +00:00
Artem Pavlenko
1941a87de9 initial SVG generator support (TODO) 2011-12-08 15:17:22 +00:00
Artem Pavlenko
9fe561d442 initial SVG generator support (TODO) 2011-12-08 15:17:22 +00:00
Artem Pavlenko
b4c0d9bdee better naming 2011-12-08 15:15:51 +00:00
Artem Pavlenko
8e49054aa6 better naming 2011-12-08 15:15:51 +00:00
Artem Pavlenko
ee404ff8c4 adapt mapnik::geometry_type to work with boost::spirit 2011-12-08 15:12:56 +00:00
Artem Pavlenko
e7faae1069 adapt mapnik::geometry_type to work with boost::spirit 2011-12-08 15:12:56 +00:00
Konstantin Käfer
ac8b4c6d2d Merge branch 'master' into grouped-rendering 
Conflicts:
	include/mapnik/feature_type_style.hpp
	src/feature_type_style.cpp
 2011-12-07 22:02:29 +01:00
Konstantin Käfer
f7cdee8312 Merge branch 'master' into grouped-rendering 
Conflicts:
	include/mapnik/feature_type_style.hpp
	src/feature_type_style.cpp
 2011-12-07 22:02:29 +01:00
Artem Pavlenko
00ed6ffd5e Merge branch 'master' into geometry_cleanup 2011-12-07 09:29:41 +00:00
Artem Pavlenko
39507d30f0 Merge branch 'master' into geometry_cleanup 2011-12-07 09:29:41 +00:00
Artem Pavlenko
283e2066e9 fix missing qualifier 2011-12-07 09:16:24 +00:00
Artem Pavlenko
0aab8c0944 fix missing qualifier 2011-12-07 09:16:24 +00:00
Dane Springmeyer
59d0e306cf include <cstring> to std::memcpy on linux - refs #76 and closes #987 2011-12-06 16:57:34 -08:00
Dane Springmeyer
a016dbe2c7 include <cstring> to std::memcpy on linux - refs #76 and closes #987 2011-12-06 16:57:34 -08:00
Artem Pavlenko
77adf6cec6 + make geometry noncopyable 
+ make ctor explicit
 2011-12-06 16:25:30 +00:00
Artem Pavlenko
9f27706e81 + make geometry noncopyable 
+ make ctor explicit
 2011-12-06 16:25:30 +00:00
Artem Pavlenko
7209988fb0 Simplify geometry model to support: Point/LineString/Polygon 
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
 2011-12-06 12:53:16 +00:00
Artem Pavlenko
cc60b74921 Simplify geometry model to support: Point/LineString/Polygon 
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
 2011-12-06 12:53:16 +00:00
Artem Pavlenko
77ddcaf81b implement vertex_iterator on vertex_vector 2011-12-06 11:19:24 +00:00
Artem Pavlenko
2c9e151c41 implement vertex_iterator on vertex_vector 2011-12-06 11:19:24 +00:00
Artem Pavlenko
91617e7b21 cleanup typedefs, changed template params: vertex_type -> coord_type 2011-12-06 11:17:14 +00:00
Artem Pavlenko
d09fe46a04 cleanup typedefs, changed template params: vertex_type -> coord_type 2011-12-06 11:17:14 +00:00
Artem Pavlenko
2b05d69fef fix typedef names, expose value_type 2011-12-06 11:15:37 +00:00
Artem Pavlenko
a4e08da00b fix typedef names, expose value_type 2011-12-06 11:15:37 +00:00
Artem Pavlenko
b8ce995acd better typedef names 
remove unused header
 2011-12-06 10:34:25 +00:00
Artem Pavlenko
2d95518b22 better typedef names 
remove unused header
 2011-12-06 10:34:25 +00:00
Artem Pavlenko
4e57134c8c geometry type is known at this stage. 2011-12-06 09:04:44 +00:00
Artem Pavlenko
b8bd9676fc geometry type is known at this stage. 2011-12-06 09:04:44 +00:00
Artem Pavlenko
a0f216a7cd + fix spelling 2011-12-05 15:04:54 +00:00
Artem Pavlenko
a4f024bfd2 + fix spelling 2011-12-05 15:04:54 +00:00
Artem Pavlenko
c683be63d2 Merge remote-tracking branch 'origin/master' 2011-12-05 14:28:03 +00:00
Artem Pavlenko
42fb73a41e Merge remote-tracking branch 'origin/master' 2011-12-05 14:28:03 +00:00
Artem Pavlenko
5335a144bd vertex iterator implementation (forward traversal) 2011-12-05 14:23:20 +00:00
Artem Pavlenko
10cc71834a vertex iterator implementation (forward traversal) 2011-12-05 14:23:20 +00:00
kunitoki
d6cbdd3412 Merge branch 'master' of github.com:mapnik/mapnik 2011-12-05 11:12:02 +01:00
kunitoki
b883f4ad75 Merge branch 'master' of github.com:mapnik/mapnik 2011-12-05 11:12:02 +01:00
kunitoki
784ec6f22e - initial implementation of the geotiff output by using libgeotiff, not complete (issue #967) 2011-12-05 11:10:13 +01:00
kunitoki
e5ba275794 - initial implementation of the geotiff output by using libgeotiff, not complete (issue #967) 2011-12-05 11:10:13 +01:00
Dane Springmeyer
fde9d9c0b7 fix compile on linux by adding <cstdio> include - thx misterboo for report - closes #978 2011-12-03 13:50:26 -08:00
Dane Springmeyer
1b4b0e6eb0 fix compile on linux by adding <cstdio> include - thx misterboo for report - closes #978 2011-12-03 13:50:26 -08:00
Dane Springmeyer
60de1c80cd add support for arbitrary, custom parameters to be attached to the map during load and serialized when saved - refs #977 2011-12-02 17:48:09 -08:00
Dane Springmeyer
b03ce6e607 add support for arbitrary, custom parameters to be attached to the map during load and serialized when saved - refs #977 2011-12-02 17:48:09 -08:00
Dane Springmeyer
437f71cdef allow mapnik::value_holder to store nulls, mainly to make it possible to return PyNone in python bindings 2011-12-02 17:01:38 -08:00
Dane Springmeyer
744eca6555 allow mapnik::value_holder to store nulls, mainly to make it possible to return PyNone in python bindings 2011-12-02 17:01:38 -08:00
Artem Pavlenko
797477de51 geometry to wkb initial implementation 2011-12-02 16:33:50 +00:00
Artem Pavlenko
4659a4d697 geometry to wkb initial implementation 2011-12-02 16:33:50 +00:00
kunitoki
e011cab6e0 - initial support for producing maps as tiff files (should be pretty straightforward to implement geotiff from here) 2011-11-28 16:59:19 +01:00
kunitoki
b0d0c97544 - initial support for producing maps as tiff files (should be pretty straightforward to implement geotiff from here) 2011-11-28 16:59:19 +01:00
Artem Pavlenko
e940fb374d add vc++ 2008 to the list. 2011-11-22 10:01:40 +00:00
Artem Pavlenko
cfc05aac6d add vc++ 2008 to the list. 2011-11-22 10:01:40 +00:00
Dane Springmeyer
e1de25318d allow compile with msvs - make_shared is preferable but vs compiler cannot handle it 2011-11-21 20:28:47 -08:00
Dane Springmeyer
fc005aa050 allow compile with msvs - make_shared is preferable but vs compiler cannot handle it 2011-11-21 20:28:47 -08:00
Dane Springmeyer
7491d08b67 silence a few msvc cast warnings 2011-11-18 15:55:27 -08:00
Dane Springmeyer
4a8b5f27d2 silence a few msvc cast warnings 2011-11-18 15:55:27 -08:00
Dane Springmeyer
6c76896677 keep proper type in text sym deep copy - refs #946 2011-11-18 15:09:16 -08:00
Dane Springmeyer
07291106a9 keep proper type in text sym deep copy - refs #946 2011-11-18 15:09:16 -08:00
Artem Pavlenko
771a8ad72f use mutex from base class 2011-11-18 09:39:57 +00:00
Artem Pavlenko
81c00d9cc5 use mutex from base class 2011-11-18 09:39:57 +00:00
Dane Springmeyer
3520033b0d in multithreaded mode lock before creating a datasource - closes #951 2011-11-17 18:47:09 -08:00
Dane Springmeyer
1a93e5c407 in multithreaded mode lock before creating a datasource - closes #951 2011-11-17 18:47:09 -08:00
Dane Springmeyer
43f2fa7075 Merge branch 'master' into gsoc-crundel 2011-11-09 16:57:20 -08:00
Dane Springmeyer
d0d2efbf54 Merge branch 'master' into gsoc-crundel 2011-11-09 16:57:20 -08:00
Dane Springmeyer
da56cbd392 minor includes fixups 2011-11-09 16:41:07 -08:00
Dane Springmeyer
9b3c42190d minor includes fixups 2011-11-09 16:41:07 -08:00
Dane Springmeyer
6257ac57c9 sqlite: futher refactoring of sqlite plugin, allowing all tests to pass 2011-11-03 19:51:37 -04:00
Dane Springmeyer
d965bcbeae sqlite: futher refactoring of sqlite plugin, allowing all tests to pass 2011-11-03 19:51:37 -04:00
Dane Springmeyer
1adbbdb571 grid: initialize variables to avoid compiler warnings 2011-11-02 13:31:15 -04:00
Dane Springmeyer
2169bcb92f grid: initialize variables to avoid compiler warnings 2011-11-02 13:31:15 -04:00
Dane Springmeyer
4ba7f5218a formatting 2011-10-28 18:04:24 -07:00
Dane Springmeyer
4ffb26d78d formatting 2011-10-28 18:04:24 -07:00
Artem Pavlenko
cfe071fbc4 don't skip white space in attributes names 2011-10-28 11:24:19 +01:00
Artem Pavlenko
14ab337363 don't skip white space in attributes names 2011-10-28 11:24:19 +01:00
Artem Pavlenko
9c5e988098 return by value 2011-10-28 11:24:17 +01:00
Artem Pavlenko
d1401b9e07 return by value 2011-10-28 11:24:17 +01:00
Artem Pavlenko
a3ba07f6b4 avoid creating default initialised values if key doesn't exist 2011-10-28 11:24:10 +01:00
Artem Pavlenko
694094d28b avoid creating default initialised values if key doesn't exist 2011-10-28 11:24:10 +01:00
Artem Pavlenko
a35b9c4eaa add support for fractional text size 
( use FT_Set_Char_Size )
NOTE: ensure it works as expected, currently
I see different results from different fonts.
 2011-10-28 11:24:08 +01:00
Artem Pavlenko
87c1d126b8 add support for fractional text size 
( use FT_Set_Char_Size )
NOTE: ensure it works as expected, currently
I see different results from different fonts.
 2011-10-28 11:24:08 +01:00
unknown
91f15d9e30 add missing overload 
# Please enter the commit message for your changes. Lines starting
 2011-10-28 10:52:29 +01:00
unknown
a8348c5bf5 add missing overload 
# Please enter the commit message for your changes. Lines starting
 2011-10-28 10:52:29 +01:00
Dane Springmeyer
06040d5847 Merge branch 'master' of github.com:mapnik/mapnik 2011-10-25 15:08:19 -07:00
Dane Springmeyer
6761cb0436 Merge branch 'master' of github.com:mapnik/mapnik 2011-10-25 15:08:19 -07:00
kunitoki
9a251e972d - small cosmetics 2011-10-23 16:36:51 +02:00
kunitoki
592e97ffe7 - small cosmetics 2011-10-23 16:36:51 +02:00
kunitoki
eb13c8c6be - another bunch of coding style fixes in includes 2011-10-23 16:09:47 +02:00
kunitoki
d574d4da0c - another bunch of coding style fixes in includes 2011-10-23 16:09:47 +02:00
kunitoki
4a2151acec - fix copyright repeats 2011-10-23 15:23:14 +02:00
kunitoki
154fb73d84 - fix copyright repeats 2011-10-23 15:23:14 +02:00
kunitoki
f1fb0c1939 - fix copyright to 2011 (script to do this will follow) 2011-10-23 15:04:25 +02:00
kunitoki
596757a269 - fix copyright to 2011 (script to do this will follow) 2011-10-23 15:04:25 +02:00
Dane Springmeyer
2f7d85e6d8 touchup feature.to_string() operator to display id differently than attributes 2011-10-22 17:27:02 -07:00
Dane Springmeyer
95035b2519 touchup feature.to_string() operator to display id differently than attributes 2011-10-22 17:27:02 -07:00
Dane Springmeyer
cad0c600cc add a new, experimental coord_transform impl to support offsetting line verticies - closes #180 - next task of exposing functionality refs #927 2011-10-21 17:39:20 -07:00
Dane Springmeyer
c92e7ab497 add a new, experimental coord_transform impl to support offsetting line verticies - closes #180 - next task of exposing functionality refs #927 2011-10-21 17:39:20 -07:00
Dane Springmeyer
e0e47f50dd remove area as it is unused (not needed by anything yet) - closes #846 2011-10-21 15:55:58 -07:00
Dane Springmeyer
d1c8818029 remove area as it is unused (not needed by anything yet) - closes #846 2011-10-21 15:55:58 -07:00
Artem Pavlenko
986edc3c6e Merge pull request #909 from MapQuest/expose-label-collision-detector 
Exposed the label collision detector
 2011-10-21 12:20:21 -07:00
Artem Pavlenko
c7e1174d6b Merge pull request #909 from MapQuest/expose-label-collision-detector 
Exposed the label collision detector
 2011-10-21 12:20:21 -07:00
Artem Pavlenko
f762059d5c use static_cast 2011-10-21 20:02:34 +01:00
Artem Pavlenko
b8ed785d7d use static_cast 2011-10-21 20:02:34 +01:00
Artem Pavlenko
2fadf1f2d3 Merge pull request #922 from xificurk/ctrans-cleanup 
code cleanup
 2011-10-21 09:55:23 -07:00
Artem Pavlenko
ba0bdbd07e Merge pull request #922 from xificurk/ctrans-cleanup 
code cleanup
 2011-10-21 09:55:23 -07:00
Robert Coup
17892c3b01 Merge branch 'master' into gsoc-crundel 2011-10-20 12:03:02 -07:00
Robert Coup
5df4d4fbb9 Merge branch 'master' into gsoc-crundel 2011-10-20 12:03:02 -07:00
Artem Pavlenko
480f8a390d revert back bool logic 
update urls -> https://github.com/mapnik/mapnik/issues/794
 2011-10-20 14:38:04 +01:00
Artem Pavlenko
c87c05911b revert back bool logic 
update urls -> https://github.com/mapnik/mapnik/issues/794
 2011-10-20 14:38:04 +01:00
Robert Coup
a321ec7843 crundel: Add setter for rastercolorizer stops 2011-10-19 23:59:26 -07:00
Robert Coup
82ba2e2553 crundel: Add setter for rastercolorizer stops 2011-10-19 23:59:26 -07:00
Robert Coup
03d809bb4f crundel: add set_displacement(position) method to text_symbolizer 2011-10-19 23:58:56 -07:00
Robert Coup
e8c281f593 crundel: add set_displacement(position) method to text_symbolizer 2011-10-19 23:58:56 -07:00
Robert Coup
48311f375c crundel: add deep-copy option for copying rules and feature_type_styles 2011-10-19 23:57:21 -07:00
Robert Coup
fae9f98014 crundel: add deep-copy option for copying rules and feature_type_styles 2011-10-19 23:57:21 -07:00
Petr Morávek [Xificurk]
27c65de120 code cleanup 2011-10-19 23:45:24 +02:00
Petr Morávek [Xificurk]
7f57119dbd code cleanup 2011-10-19 23:45:24 +02:00
Artem Pavlenko
2bb37b15a9 use make_shared 2011-10-19 17:34:09 +01:00
Artem Pavlenko
298b7fa253 use make_shared 2011-10-19 17:34:09 +01:00
Artem Pavlenko
978cb50d41 use M_PI from <mapnik/global.hpp> 2011-10-19 15:32:25 +01:00
Artem Pavlenko
1e70af3c5a use M_PI from <mapnik/global.hpp> 2011-10-19 15:32:25 +01:00
Artem Pavlenko
911981aefd + various win32 fixes, mainly adding extra namespace qualifiers 
for vc++10, MAPNIK_DECL ...
 2011-10-19 15:29:24 +01:00
Artem Pavlenko
9088d7bbc8 + various win32 fixes, mainly adding extra namespace qualifiers 
for vc++10, MAPNIK_DECL ...
 2011-10-19 15:29:24 +01:00
Artem Pavlenko
001d79903e qualify attribute -> mapnik::attribute (vc10) 2011-10-19 15:19:55 +01:00
Artem Pavlenko
49cb8c7368 qualify attribute -> mapnik::attribute (vc10) 2011-10-19 15:19:55 +01:00
Artem Pavlenko
9dbedacdda add round() and M_PI support for windows builds 2011-10-19 15:17:48 +01:00
Artem Pavlenko
d40f5d7d59 add round() and M_PI support for windows builds 2011-10-19 15:17:48 +01:00
Artem Pavlenko
fa7efc9390 remove operator-= from box2d 2011-10-19 15:14:01 +01:00
Artem Pavlenko
9a37fee17d remove operator-= from box2d 2011-10-19 15:14:01 +01:00
kunitoki
2372a60ff7 - cosmetics changes to sqlite datasource plugin 
- added initial wkbAuto to auto determine WKB type in sqlite
 2011-10-18 22:19:03 +02:00
kunitoki
b23697e1b3 - cosmetics changes to sqlite datasource plugin 
- added initial wkbAuto to auto determine WKB type in sqlite
 2011-10-18 22:19:03 +02:00
Dane Springmeyer
1fe029c6e9 Merge pull request #908 from MapQuest/shield-placement-bug 
Fixed bug in shield line placement
 2011-10-17 14:08:50 -07:00
Dane Springmeyer
b7a4906978 Merge pull request #908 from MapQuest/shield-placement-bug 
Fixed bug in shield line placement
 2011-10-17 14:08:50 -07:00
Konstantin Käfer
763ece8db6 group-by attribute for Layer 2011-10-13 01:30:18 +02:00
Dane Springmeyer
3c14ada217 enable contruction of a memory_featureset from a std::vector<feature_ptr> 2011-10-11 17:29:42 -07:00
Matt Amos
b5c4bb77de Exposed the label collision detector outside the agg_render object 
and via Python, allowing detectors to be re-used across renderings.
 2011-10-12 01:05:35 +01:00
Matt Amos
3f47de0e81 Fixed bug in shield line placement when dx/dy are used to shift 
the label relative to the placement point.
 2011-10-12 01:02:28 +01:00
Dane Springmeyer
f8e2a3ed1b fix compile on ppc (big endian) systems 2011-10-10 14:03:43 -07:00
Artem Pavlenko
c97399b0f6 + move <unicode> includes to .cpp 
+ disble 'ubidi_getBaseDirection' check for ICU < 4.6
 2011-09-26 08:58:33 +00:00
Artem Pavlenko
3d6ea00c66 + linewrap-patch-r3362.patch from dimka (#189) 2011-09-25 19:43:02 +00:00
Dane Springmeyer
00e8f06f13 ensure the experimental svg_renderer compiles 2011-09-16 16:18:10 +00:00
Alberto Valverde
4444907855 ported warer warping functionallity to cairo renderer. Closes #887 2011-09-16 14:34:14 +00:00
Alberto Valverde
e41abb0e12 add a label attribute to colorizer_stop 2011-09-16 13:32:16 +00:00
Alberto Valverde
97431c8de4 made mesh_size configurable 2011-09-16 12:21:21 +00:00
Alberto Valverde
6ffbd07174 use AGG for interpolation when warping rasters 2011-09-13 15:41:39 +00:00
Artem Pavlenko
d5e57afac0 + move compositing into core lib 2011-09-13 15:31:07 +00:00
Artem Pavlenko
fad2d7739b + change wkb interface to work directly on ptr_vector<geometry_type> 
+ expose ptr_vector<geometry_type> in feature
 2011-09-13 11:54:04 +00:00
Dane Springmeyer
67df69834f allow reprojection of batches of points - patch cherry picked from albertov's work on optimizing raster reprojection performance (upcoming) - closes #877 2011-09-12 18:30:34 +00:00
Dane Springmeyer
ac3e43e5a4 support faster wgs84->merc transforms, a very common reprojection scenario in web mapping - added benefit of this approach is easy clipping for robust handling of out of bounds mercator coords - closes #839 2011-09-12 02:10:58 +00:00
Dane Springmeyer
0ec7ef6d46 renderers can now report to image if any features have been rendered via im.painted(), and im.background now uses boost optional to allow easy detection of whether a background has been set - closes #875 2011-09-11 06:24:26 +00:00
Dane Springmeyer
67d7a3a6f0 add alternative line rasterizer that can be enabled to draw faster lines at the expense of dropping short geometries - for thin lines has nicer look but should not be used with think lines - refs #873 2011-09-09 23:45:49 +00:00
Artem Pavlenko
a59c961c1f + add missing save_to_file overloads 
+ remove dummy rgba_palette args
 2011-09-09 12:40:30 +00:00
Artem Pavlenko
aba5f21936 + applied patch from itayperl (bidi-mirroring-SVN-r3110.patch) 2011-09-08 15:08:17 +00:00
Artem Pavlenko
53b50c871c + modify WKT parser to work with ptr_vector<geometry_type> 
+ fix memory leaks in wkt_grammar
+ add support for GEOMETRYCOLLECTION
 2011-09-08 11:52:51 +00:00
Artem Pavlenko
e5de1ac285 + looks like it has been pasted twice, 
removing duplicates.
 2011-09-08 07:57:37 +00:00
Dane Springmeyer
d9e09e1221 add fastmath.hpp 2011-09-08 03:50:22 +00:00
Artem Pavlenko
02c143895d + refactor palette stuff a bit 
TODO: We need to change save_to_file|string interface
  to avoid passing dummy rgba_palette objects.
 2011-09-07 15:01:25 +00:00
Dane Springmeyer
25196e3a8e revise png palette api by removing default arguments to ensure no temporary references 2011-09-07 00:45:18 +00:00
Dane Springmeyer
aa5cfad4b7 add minimum-path-length to text_symbolizer - closes #865 2011-09-04 17:33:48 +00:00
Artem Pavlenko
2c5f723344 + oops, corrected:) 2011-09-01 19:21:03 +00:00
Artem Pavlenko
9a9e5fb2e3 Iterate unusedPool until we get 'valid' connection or 
create a new one if usedPool.size() < maxSize_.
 2011-09-01 19:20:26 +00:00
Dane Springmeyer
964cfdd423 newline 2011-09-01 05:19:13 +00:00
Dane Springmeyer
c61decc3e8 more includes for timer 2011-09-01 04:48:09 +00:00
Dane Springmeyer
f9358f005f ensure the timer compiles on osx with clang++ - patch from rcoup 2011-09-01 04:33:39 +00:00
Dane Springmeyer
5f548cbe26 new timer.hpp that includes both cpu and wall clock output - patch from rcoup - refs #780 2011-09-01 01:06:33 +00:00
Dane Springmeyer
b2dc2fa6d2 move feature_style_processor to cpp 2011-09-01 00:44:27 +00:00
Dane Springmeyer
106173914c avoid compiler warning 2011-09-01 00:42:23 +00:00
Dane Springmeyer
a013cd5032 add support for fixed color palettes when encoding to png 2011-08-31 02:28:14 +00:00
Dane Springmeyer
00d059b39c expose blend pixel methods for grid renderer 2011-08-30 22:26:59 +00:00
Dane Springmeyer
9e87c9f914 apply patch from Peter Körner adding AlsoFilter functionality - closes #820 2011-08-30 17:38:27 +00:00
Dane Springmeyer
caf541d87e add support for controlling zlib compression level and strategy when encoding to png - patch from kkaefer - closes #841 2011-08-26 05:58:21 +00:00
Dane Springmeyer
4a0ed78cb7 add ability to discard a timer without it later printing 2011-08-24 23:15:22 +00:00
Dane Springmeyer
ae41899152 simply and cleanup the wall clock timer 2011-08-24 22:02:07 +00:00
Dane Springmeyer
d3211372a4 sqlite: support both single and double quoted table names 2011-08-16 23:24:02 +00:00
Dane Springmeyer
d5035d0474 remove const from setter 2011-08-11 22:58:53 +00:00
Dane Springmeyer
81bf8b3d06 expose the name2file mapping of font family/style and font file publically so apps can ask mapnik where a given font face was found on the filesystem 2011-07-29 18:03:45 +00:00
Hermann Kraus
53e0b22c2b Added metawriter helper function. 2011-07-28 22:59:05 +00:00
Dane Springmeyer
da337036d4 avoid compiler warning re intialization order 2011-07-27 04:34:02 +00:00
Dane Springmeyer
f14fc9dcf7 improve code comments around transforms and intersection checks 2011-07-21 21:53:39 +00:00
Dane Springmeyer
c5c729b17c fix typo (map_ext.intersects(map_ext) -> map_ext.intersects(layer_ext)) and add small optimization so that if projections are equal we don't check intersection twice before returning no hit 2011-07-21 21:14:06 +00:00
Hermann Kraus
8bb6df1a07 Optionally output JSON data with pixel coordinates. 2011-07-16 12:24:52 +00:00
Dane Springmeyer
3d862034cd allow '[field] is null' syntax to work with the understanding this may have unintended consequences and we should likely ultimately replace with proper 'is' equality support for nulls - track issue at http://trac.mapnik.org/ticket/794 2011-07-12 01:48:36 +00:00
Dane Springmeyer
a726787a40 add mapnik::Boolean type so we can report attributes with boolean type - closes #795 2011-07-11 22:34:08 +00:00
Dane Springmeyer
4356144e4a shuffle attribute_descriptor class to its own header, previously extant but unused 2011-07-11 21:03:39 +00:00
Dane Springmeyer
aab601da64 comment unused struct that trips up clang++ 2011-07-09 01:05:52 +00:00
Dane Springmeyer
161d978fb4 support hsl colors for boost versions 1.42 - 1.45 2011-07-01 18:54:01 +00:00
Dane Springmeyer
eab80c5a91 fixup proj_init error message 2011-06-30 17:59:27 +00:00
Dane Springmeyer
476e04c4c7 add gamma to polygon-pattern-symbolizer, useful for avoiding AA affects at tile edges so that global patterns can have seamless alignment 2011-06-28 22:37:35 +00:00
Dane Springmeyer
4e229ac516 more sql utility functions for handling quoting 2011-06-13 21:43:37 +00:00
Artem Pavlenko
9bc45c9ca1 + addd boost::equality_comparable<box2d<T> 2011-06-07 21:16:03 +00:00
Artem Pavlenko
1d2abb8206 + add support for CSS3 HSL colors: http://www.w3.org/TR/css3-color/#hsl-color 2011-06-07 16:14:11 +00:00
Artem Pavlenko
4a72a7d680 + fix color(std::string const& ) ctor to initialize r,g,b,a. 
+ impl eq ops using boost::equality_comparable.
+ output alpha in to_hex_string if not 255.
 2011-06-07 16:14:02 +00:00
Artem Pavlenko
bc3d784b85 + change ingterface to work with std::string 2011-06-07 16:13:54 +00:00
Dane Springmeyer
3d81a07f06 support for png 1.5.x, should work fine with 1.4.x - closes #772 2011-06-05 21:02:55 +00:00
Dane Springmeyer
ef6af65f17 remove debug output 2011-06-03 22:11:51 +00:00
Dane Springmeyer
e93bfa7a5a add a grid_view class to allow subsetting of grids for metatiling 2011-06-03 05:55:28 +00:00
Dane Springmeyer
001f38fc57 expose get/set of key and resolution on grid renamed from join_field/step 2011-06-03 01:55:26 +00:00
Dane Springmeyer
3654e92ee4 nearest neighbor resampling impl for grid array 2011-06-01 17:22:56 +00:00
Dane Springmeyer
2bec001a44 add missing change to header for r2942 2011-05-31 22:44:48 +00:00
Dane Springmeyer
fcdf033004 restore boost 1.41 -> 1.44 compatibility 2011-05-31 17:34:09 +00:00
Hermann Kraus
8474976353 Prepare for merging "text_placement_info" and "placement". 2011-05-30 01:16:21 +00:00
Hermann Kraus
de089f0d68 Add alignment to text_placement_info. 2011-05-29 22:33:41 +00:00
Dane Springmeyer
8322a96575 code cleanup 2011-05-27 21:00:19 +00:00
Artem Pavlenko
b6f02e6d4d + adapt mapnik::color as fusion sequence to avoid intermediate data structure 2011-05-26 10:07:37 +00:00
Dane Springmeyer
7a17c7e597 load_map_from_string has always accepted a base path argument to drive the interpretation of relative paths in the stylesheet when loaded in memory- this really should be a full map property so that it can be known on the map object after parsing and changed if the map is saved to a new location 2011-05-25 23:48:07 +00:00
Dane Springmeyer
e4329847d2 shape.input: re-assign feature id's once we know their correct value after reading geometry up to the dbf link - TODO - we should be able to look ahead to avoid this re-assign 2011-05-20 01:41:28 +00:00
Dane Springmeyer
ba15947a4f add Projection.expanded() function to ask proj4 what its internal, normalized definition looks like (useful only for debugging) 2011-05-17 19:05:15 +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
b3c258c9a8 allow usage of boost::make_shared in gdal featureset construction by passing const reference - #760 2011-05-16 22:17:50 +00:00
Dane Springmeyer
aeb1b7f963 renable previous (non-agg) internal bilinear scaling method for testing #759a 2011-05-12 16:43:23 +00:00
Dane Springmeyer
90fbd6a204 use boost::make_shared to avoid explicit new and ensure fast and exception safe allocation 2011-05-10 21:09:54 +00:00
Dane Springmeyer
301824e60d remove unused header 2011-05-10 21:05:35 +00:00
Artem Pavlenko
3bef010056 + move feature_factory.hpp include to impl file 2011-05-09 13:52:06 +00:00
Artem Pavlenko
692af5cbc1 + use boost::make_shared to improve shared_ptr 
allocation locality
 2011-05-09 13:51:58 +00:00
Artem Pavlenko
82a71649b6 + remove extra namespace qualifiers 2011-05-09 09:11:57 +00:00
Artem Pavlenko
7b620a9f71 + cleanup/formatting 2011-05-09 09:11:49 +00:00
Dane Springmeyer
d05b0c539f apply major refactor of RasterColorizer by ben moores from https://github.com/BenMoores/mapnik-trunk/wiki/RasterColorizer - closes #523 2011-05-04 00:20:17 +00:00
Dane Springmeyer
2f77de0bf9 add a few more centroid algorithms for testing 2011-05-03 21:38:02 +00:00
Dane Springmeyer
adb44a6ec2 account for scaling and alpha of bitmap images in grid_renderer 2011-05-02 22:33:11 +00:00
Dane Springmeyer
e69f17eb35 add ability to pass a scaling ratio just to the affine scaling - needed by grid_renderer 2011-05-02 22:30:50 +00:00
Dane Springmeyer
b6c5c57713 label_position on lines should take the middle point to preserve previous behavior before move to path type geometries - patch from Ldp - closes #740 and #668 2011-04-30 00:43:57 +00:00
Dane Springmeyer
157d52e38f add option to collect the total extent of all placement bboxs to enable passing along to metawriters - modified patch from kevin.kreaiser - closes #755 2011-04-30 00:06:27 +00:00
Dane Springmeyer
ab94fd43d8 add test for grid generation, and make sure point_datasource feature id starts at 1 (as datasources should) 2011-04-29 19:25:00 +00:00
Dane Springmeyer
da4893d8fe declare dlf ctor explicit 2011-04-29 17:40:55 +00:00
Dane Springmeyer
b072de4769 create layer descriptor when memory_datasource is created - TODO - gather attribute descriptors as features are added 2011-04-28 17:36:36 +00:00
Hermann Kraus
6650f999b9 char is to short for unicode chars. Replace it with unsigned int. Should fix #746. 2011-04-27 20:28:53 +00:00
Dane Springmeyer
5eea164b5a add grid_renderer backend 2011-04-26 21:44:52 +00:00
Dane Springmeyer
9da2d701a5 further template the svg_renderer based on pixfmt 2011-04-26 17:38:18 +00:00
Dane Springmeyer
318465ef53 output feature id when printing feature to string 2011-04-19 22:41:16 +00:00
Dane Springmeyer
424eef4a2f refactor feature_style_processor a bit to allow passing reference of names as arg apply_to_layer. Will set up for more potential flexibility around passing pre-populated query names. 2011-04-19 04:23:11 +00:00
Dane Springmeyer
74bb2da73b avoid uninitialized variable warning 2011-04-18 18:48:57 +00:00
Dane Springmeyer
5c799b2174 skip rendering specific coordinates which cannot be back projected from the layer srs into the map srs, avoiding the previous outcome of full skipping of features (this is at the cost of potentially odd looking polygons, but should not impact performance) - closes #308 2011-04-15 22:13:23 +00:00
Dane Springmeyer
69eb5c4579 first forward map ext to layer srs, falling back to backward projecting layer to map (previous behavior). Also leverage new clip function of box2d<double> class - closes #402, #548, and #549 (and indirectly fixes #308 combined with #506) - see also http://trac.mapnik.org/wiki/BoundsClipping 2011-04-15 18:39:07 +00:00
Dane Springmeyer
92a36f21ff early return if layer has no styles 2011-04-15 07:19:44 +00:00
Dane Springmeyer
fd54be4cc5 if 'maximum-extent' is provided, clip map query extent to it allowing one simple and fast way of controlling out of bounds coordinates when projecting into/from layer projection - see also solution at #549 2011-04-15 07:13:08 +00:00
Dane Springmeyer
8998296f7b add 'maximum-extent' attribute to map and use this, if set, in place of calculated layer extents in zoom_all() 2011-04-14 02:20:33 +00:00
Dane Springmeyer
ff006dd3f0 allow copy of mapnik::projection when proj_transform is created - closes #658 - TODO - consider using shared_ptr 2011-04-13 21:30:39 +00:00
Dane Springmeyer
383d8a3f15 add proj_transform forward/backward box2d implementation 2011-04-13 19:40:44 +00:00