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

1159 commits

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