Dane Springmeyer
96f89e34b3
Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables
2014-05-13 20:51:57 -07:00
Dane Springmeyer
e300a41dca
variables now available as postgis datasource tokens
2014-05-13 20:47:22 -07:00
Dane Springmeyer
2f8451b99a
variables support for cairo/grid/svg
2014-05-13 18:24:17 -07:00
artemp
f0fd0aa8ce
font_engine : use FT_New_Library/FT_Done_Library with custom memory management (ref #2209 #2210 )
2014-05-13 12:43:59 +01:00
Dane Springmeyer
29d92fd162
Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables
2014-05-12 21:26:04 -07:00
Dane Springmeyer
039e620147
don't allow marker-spacing less than 1 - fixes #2218
2014-05-12 21:25:49 -07:00
Dane Springmeyer
1e3f062af8
Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables
2014-05-12 08:45:15 -07:00
artemp
ba35dfe3b0
mapnik::value - return 'infinity' if rhs == 0 to avoid division by zero
2014-05-12 10:14:10 +01:00
artemp
1a32cc5630
+ add eq/neq operators value_null <--> T
2014-05-12 10:12:09 +01:00
Dane Springmeyer
2c661ed3d5
support for render time variables
2014-05-11 13:08:24 -07:00
Dane Springmeyer
7364a30e67
improve handling of colors as expressions
2014-05-08 00:45:18 -07:00
artemp
99bbb10290
c++11 : use int types from <cstdint>
2014-05-06 18:06:47 +01:00
Dane Springmeyer
d7bb97a22e
simplify code
2014-05-05 18:16:42 -07:00
Dane Springmeyer
74c7e67d60
Various c++11 improvements
...
- std::make_unique
- avoiding uneccessary std::move calls which make actually prevent rvo (http://stackoverflow.com/questions/4986673/c11-rvalues-and-move-semantics-confusion )
- more c++11 for loops
2014-05-05 16:02:42 -07:00
Dane Springmeyer
439fc9f700
fix variable shadowing in placements_list.hpp
2014-05-05 10:44:59 -07:00
Dane Springmeyer
356cc85ad8
cleanup + rename svg_transform parser
2014-04-30 10:55:46 -07:00
Dane Springmeyer
97a45f21bb
all static grammar usage const + xml_tree cleanups
2014-04-30 10:42:05 -07:00
Dane Springmeyer
8c1e69fdb8
static grammars
...
- construct on first use
- allows for faster map loading and unloading of xml loading tree
- modified expression and transform grammars to not take args/not crash
- simplifies interfaces, allows fast parsing from python without passing grammar instance
2014-04-30 00:11:27 -07:00
Dane Springmeyer
c399812c34
Merge pull request #2230 from MapQuest/jh-fix-group-symbolizer-text
...
Group symbolizer serialization
2014-04-29 11:01:37 -07:00
Jordan Hollinger
9ec187505b
Add serialization for group symbolizer components.
2014-04-29 12:08:05 -04:00
Dane Springmeyer
ad10497503
cache result of parse_expression to speed up map loading - refs #1167
2014-04-28 18:02:14 -07:00
Dane Springmeyer
ef837eb92f
c++11 optimizations for faster map loading
2014-04-28 17:10:00 -07:00
Dane Springmeyer
73517c9104
fix return value for string2bool
2014-04-27 08:51:14 -07:00
Dane Springmeyer
b7b1acaa50
optimize string2bool
2014-04-25 21:46:40 -07:00
Dane Springmeyer
9e9747ffad
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
src/agg/process_building_symbolizer.cpp
src/cairo_context.cpp
src/cairo_renderer.cpp
src/grid/process_building_symbolizer.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.png
tests/python_tests/images/support/marker-text-line-scale-factor-10.png
tests/python_tests/images/support/marker-text-line-scale-factor-100.png
tests/python_tests/images/support/marker-text-line-scale-factor-2.png
tests/python_tests/images/support/marker-text-line-scale-factor-5.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/test.py
2014-04-24 21:44:28 -07:00
Dane Springmeyer
acb83a8796
fix compile with clang: 'addition of default argument on redeclaration makes this constructor a default constructor'
2014-04-24 21:13:35 -07:00
Dane Springmeyer
39737c5f1d
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
.travis.yml
CHANGELOG.md
bindings/python/build.py
include/mapnik/feature_style_processor_context.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/json/feature_collection_grammar.hpp
include/mapnik/json/feature_collection_parser.hpp
include/mapnik/json/feature_generator_grammar.hpp
include/mapnik/json/feature_parser.hpp
include/mapnik/json/geojson_generator.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_parser.hpp
plugins/input/gdal/gdal_featureset.cpp
plugins/input/geojson/geojson_datasource.cpp
plugins/input/occi/occi_featureset.cpp
plugins/input/osm/osm_featureset.cpp
plugins/input/postgis/build.py
plugins/input/postgis/connection.hpp
src/agg/agg_renderer.cpp
src/build.py
src/cairo_context.cpp
src/datasource_cache.cpp
src/grid/process_line_symbolizer.cpp
src/grid/process_polygon_pattern_symbolizer.cpp
src/grid/process_polygon_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/json/feature_grammar.cpp
tests/cpp_tests/fontset_runtime_test.cpp
tests/visual_tests/images/collision-600-400-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png
tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png
tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png
tests/visual_tests/test.py
2014-04-24 14:50:55 -07:00
Dane Springmeyer
34771d20dd
add newlines to avoid pedantic warnings
2014-04-24 12:53:08 -07:00
Dane Springmeyer
c4dbcf93bc
fix version in code comment
2014-04-15 17:26:02 -04:00
Dane Springmeyer
d577b0814b
remove uneeded asserts in png_io
2014-04-09 19:34:13 -04:00
Dane Springmeyer
cf784f5e29
restore agg polygon clipper
2014-04-09 00:28:18 -04:00
Dane Springmeyer
e94876ebe4
Merge pull request #2160 from MapQuest/expr-v2-group-symbolizer
...
Group Symbolizer
2014-04-03 11:52:21 -07:00
Dane Springmeyer
080b8e174c
fixup c++ style in offset_converter
2014-03-18 17:31:15 -07:00
Dane Springmeyer
83ad5f5a25
fix a few g++-4.8 warnings on linux
2014-03-18 14:52:41 -07:00
Dane Springmeyer
cb3db66b82
std::make_unique
2014-03-10 21:34:48 -07:00
Dane Springmeyer
7d5e0f1f91
one step closer to expression support for line cap/join
2014-03-10 13:00:47 -07:00
Dane Springmeyer
91eda81699
pass string by const&
2014-03-10 13:00:14 -07:00
Dane Springmeyer
24aaa0a6de
post merge cleanups
2014-03-10 10:47:43 -07:00
Dane Springmeyer
6433d9482e
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
include/mapnik/symbolizer.hpp
src/agg/agg_renderer.cpp
src/agg/process_line_pattern_symbolizer.cpp
src/agg/process_line_symbolizer.cpp
src/agg/process_polygon_pattern_symbolizer.cpp
src/agg/process_polygon_symbolizer.cpp
src/cairo_renderer.cpp
src/feature_type_style.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_line_symbolizer.cpp
src/grid/process_markers_symbolizer.cpp
src/grid/process_polygon_pattern_symbolizer.cpp
src/grid/process_polygon_symbolizer.cpp
2014-03-10 00:05:56 -07:00
Dane Springmeyer
dc8a13c44e
rename a few variables to avoid likely clashes
2014-03-09 21:29:52 -07:00
Dane Springmeyer
21555b51c2
avoid double application of scale_factor - refs #1926
2014-02-27 13:28:25 -08:00
Dane Springmeyer
3dd05bd171
support scale_factor in geometry-transform translate and scale - refs #1926
2014-02-27 13:28:03 -08:00
Dane Springmeyer
b1cfe548b0
avoid double application of scale_factor - refs #1926
2014-02-27 13:20:58 -08:00
Dane Springmeyer
e49f63730e
support scale_factor in geometry-transform translate and scale - refs #1926
2014-02-27 11:55:58 -08:00
Dane Springmeyer
277ae93d2c
make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165
...
Conflicts:
src/agg/agg_renderer.cpp
2014-02-27 11:17:09 -08:00
Dane Springmeyer
4e957c9cac
make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165
2014-02-27 10:11:17 -08:00
Jordan Hollinger
533820c63f
Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2-group-symbolizer
...
Conflicts:
src/text/placement_finder.cpp
tests/visual_tests/test.py
2014-02-25 14:21:51 -05:00
artemp
19c2b76e10
remove unused text_symbolizer.hpp/cpp
2014-02-25 14:25:23 +00:00
Jordan Hollinger
08ea56996a
Add shield symbolizer support in group symbolizer processing.
...
Update some test cases to use ShieldSymbolizer instead of point and text.
2014-02-25 08:53:35 -05:00
artemp
ecc5acbdb9
attempt to handle multi-polygons in shape.input
2014-02-24 15:20:06 +00:00
