Commit graph

4259 commits

Author SHA1 Message Date
Dane Springmeyer
adcce7102d be explicit to avoid compile error if includes change 2012-02-24 16:14:02 -08:00
Dane Springmeyer
3839dd363f more pep8 for tests 2012-02-24 13:15:48 -08:00
Dane Springmeyer
0a37a1591e fixup whitespace with pep8 tricks from https://gist.github.com/1903033 2012-02-24 13:13:56 -08: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
Hermann Kraus
99a3c9fec9 Remove multiple consecutive empty <xmltext> nodes. 2012-02-24 12:37:23 +01: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
84daf7a2ad Merge branch 'master' of https://github.com/mapnik/mapnik 2012-02-23 11:48:59 -08:00
Dane Springmeyer
02eb9067e0 fix linking with msvc by declaring text_placements 2012-02-23 11:47:45 -08:00
Dane Springmeyer
6db1ba176b fix compile on windows by including round() from global.hpp 2012-02-23 11:46:53 -08:00
Dane Springmeyer
524d6bea5f avoid implicit cast from sqlite_int64 to int 2012-02-23 09:50:06 -08:00
Dane Springmeyer
2d1f2d19cc fix compile of shield_symbolizer.hpp on windows 2012-02-23 09:22:51 -08:00
Hermann Kraus
2955983264 Fix #1095. 2012-02-23 18:10:50 +01:00
Hermann Kraus
e79f13df1f Add debug helper for XML. 2012-02-23 18:10:49 +01:00
Artem Pavlenko
8767ca8275 + add set_pixel method 2012-02-23 14:32:20 +00: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
Dane Springmeyer
4a3bd9cd58 Merge branch 'master' of github.com:mapnik/mapnik 2012-02-22 14:54:26 -08:00
Dane Springmeyer
4a192c319b ensure mean_sort_cmp adheres to strict weak ordering requirement - more properly fixes #1087 2012-02-22 14:54:10 -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
03bfc015a6 DEBUG_UNDEFINED should also trap illegal instructions 2012-02-21 11:04:09 -08:00
Dane Springmeyer
4c4bfc8fc5 remove all usage of lexical_cast in postgis plugin - refs #1055 2012-02-21 11:03:33 -08:00
Dane Springmeyer
f17031084c use new conversions header - refs #1055 2012-02-21 10:59:11 -08:00
Dane Springmeyer
3c2938b812 add header with simple spirit string conversion functions- refs #1055 2012-02-21 10:57:58 -08:00
Hermann Kraus
d203d56d34 Update tests. 2012-02-21 10:21:40 +01:00
Dane Springmeyer
8568c62e8e Merge branch 'master' of github.com:mapnik/mapnik 2012-02-20 22:54:09 -08:00
Dane Springmeyer
9213dd5426 fixup multi-symbolizer processing function 2012-02-20 22:53:54 -08:00
Dane Springmeyer
6a0ce99e22 maintain compile with boost <= 1.47 2012-02-20 17:09:14 -08:00
Hermann Kraus
0759d1b0dc Update reference images. 2012-02-21 00:06:54 +01: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
Hermann Kraus
73339b3936 Render ShieldSymbolizer tests with varying width. Triggers the problem in #1078.
Update script to handle case when no reference image is found.
2012-02-20 17:45:47 +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
f20007a965 + add to_geojson() method to mapnik.Path 2012-02-20 12:05:11 +00:00
Artem Pavlenko
6e498ad062 + update to use new names
+ add geometry_generator
2012-02-20 12:03:56 +00:00