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

9319 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Artem Pavlenko
8536b8a536 + better naming 2012-02-20 12:03:07 +00:00
Artem Pavlenko
68df26baba + add to_geojson method to mapnik.Feature 2012-02-20 10:55:25 +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
725ceaadc1 Fix problem introduced in 060545b9aa. 2012-02-19 17:12:08 +01:00
Hermann Kraus
6fe0637425 Complete support for formatting types. 2012-02-19 02:03:25 +01:00
Hermann Kraus
76cdd7a254 Merge branch 'master' into python-textplacement 2012-02-19 01:00:52 +01:00
Hermann Kraus
d56f05b4ec Move compare() to own file. 
Increase threshold.
 2012-02-18 17:51:18 +01:00
Hermann Kraus
0ba24d7480 Simply clean script. 2012-02-18 17:29:48 +01:00
Hermann Kraus
e466d5bfd1 Merge commit '1ac4c0ca534c8667f4a13a0756af0b873b44192e' 2012-02-18 17:23:38 +01:00
Hermann Kraus
e0f6474d9b Merge commit '95aa6904dfde5732fd330752efaf4fbc15105651' from ramunasd/master 
Conflicts:
	tests/visual_tests/shieldsymbolizer-1-500-reference.png
	tests/visual_tests/shieldsymbolizer-1.xml
 2012-02-18 17:21:02 +01:00
Hermann Kraus
b449cb5e6d Add correct reference image. 2012-02-18 16:46:36 +01:00
Hermann Kraus
f4ec936202 Improve test case again. 2012-02-18 16:45:35 +01:00
Hermann Kraus
2ea6ab216c Fix text height calculation. 
Closes #1078.
 2012-02-18 16:43:05 +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
db168a0db7 Update test case. 2012-02-18 13:06:25 +01:00
Hermann Kraus
93d119464c Add new class to avoid mixing different types of positions. 2012-02-18 12:12:45 +01:00
Ramunas
1ac4c0ca53 remove notices due to inkscape metadata 2012-02-18 10:45:58 +02:00
Ramunas
5c82265ef8 Merge branch 'master' of git://github.com/mapnik/mapnik 
Conflicts:
	tests/visual_tests/shieldsymbolizer-1.xml
 2012-02-18 09:57:23 +02:00
Hermann Kraus
665f0a51a0 Remove old reference image. 2012-02-18 01:24:00 +01:00
Hermann Kraus
0814824b35 Use uppercase letters. 2012-02-18 01:23:25 +01:00
Hermann Kraus
212171b9ee Add visual test for ShieldSymbolizer. 2012-02-18 01:17:29 +01:00
Hermann Kraus
980cdd9e92 Use text_placements registry. 2012-02-18 00:39:14 +01:00
Ramunas
95aa6904df compute image difference & update reference images 2012-02-18 00:19:07 +02:00
Hermann Kraus
53fa19af5a Update test. 2012-02-17 21:00:40 +01:00
Hermann Kraus
3508ec5fb4 Merge branch 'master' into python-textplacement 2012-02-17 20:54:48 +01:00
Hermann Kraus
6db956ca83 Split file. 2012-02-17 20:53:00 +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
Hermann Kraus
f06bda1c1c Split file. 2012-02-17 15:50:24 +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
7b22d69932 Revert "+ fix shield/text positioning - we still need to floor both text and shield" 
floor is removed from position calculation now, resulting in better marker and text matching.
Refs #1078.

This reverts commit 009a1e45a7.
 2012-02-17 00:59:20 +01:00