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

1429 commits

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