Dane Springmeyer
|
d0b357cab7
|
scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging
|
2014-06-09 13:55:56 -07:00 |
|
Dane Springmeyer
|
e300a41dca
|
variables now available as postgis datasource tokens
|
2014-05-13 20:47:22 -07:00 |
|
artemp
|
99bbb10290
|
c++11 : use int types from <cstdint>
|
2014-05-06 18:06:47 +01: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
|
02d4e7fd06
|
postgis geometry type detection - fall through to detecting type on individual geometries if the geometry_columns only reports 'geometry' - refs mapbox/tilemill/#2099
|
2014-04-22 15:31:06 -07:00 |
|
Dane Springmeyer
|
1dd481f8f7
|
fallback if pkg-config fails for libcurl or libpq
|
2014-04-09 09:40:40 -04:00 |
|
Dane Springmeyer
|
7351879e6f
|
Merge pull request #2193 from strk/2.3.x-no-terminate-pgis-dtor
Do not throw in postgis_datasource destruction if backend is down
|
2014-04-04 18:20:59 -07:00 |
|
Dane Springmeyer
|
55ba8d38ae
|
Merge pull request #2182 from strk/2.3.x-all-async
Have all queries use the async interface
|
2014-04-03 23:59:11 -07:00 |
|
Dane Springmeyer
|
ce1ff9902e
|
better linking for postgis.input using pkg-config
|
2014-04-02 13:26:33 -07:00 |
|
Sandro Santilli
|
32680434fe
|
Do not throw in postgis_datasource destruction if backend is down
... and persist_connections is true!
Closes #2191
|
2014-03-26 15:39:53 +01:00 |
|
Sandro Santilli
|
9d04d9fef9
|
Do not throw in postgis_datasource destruction if backend is down
... and persist_connections is true!
Closes #2191
|
2014-03-26 15:35:55 +01:00 |
|
Dane Springmeyer
|
6c4ea66509
|
postgis: use max float for no-op bbox token - closes #2158
|
2014-03-12 13:31:45 -07:00 |
|
Dane Springmeyer
|
551718df59
|
postgis: use max float for no-op bbox token - closes #2158
|
2014-03-12 13:31:14 -07:00 |
|
Sandro Santilli
|
bf3500d757
|
Have all queries use the async interface
|
2014-03-11 11:10:41 +01:00 |
|
Sandro Santilli
|
ca9b0fccab
|
Do not attempt to PQclear a null PQresult*
|
2014-03-09 21:07:34 -07:00 |
|
Dane Springmeyer
|
b1e9aa2140
|
Merge pull request #2176 from strk/2.3.x-segfault-on-execute
Do not attempt to PQclear a null PQresult*
|
2014-03-09 21:04:48 -07:00 |
|
Sandro Santilli
|
749118cdee
|
Make sure status() returns a message also on bad connection
Closes #2173.
|
2014-03-09 21:03:44 -07:00 |
|
Sandro Santilli
|
d36c39d9be
|
Make sure status() returns a message also on bad connection
Closes #2173.
|
2014-03-06 10:18:21 +01:00 |
|
Sandro Santilli
|
9a1996620e
|
Do not attempt to PQclear a null PQresult*
|
2014-03-06 10:04:10 +01:00 |
|
Dane Springmeyer
|
871b17f5d9
|
fix postgis plugin linking when statically linking on linux - refs mapnik/mapnik-packaging#123
|
2014-02-27 14:40:14 -08:00 |
|
Dane Springmeyer
|
f2021971f0
|
fix postgis plugin linking when statically linking on linux - refs mapnik/mapnik-packaging#123
|
2014-02-27 14:23:57 -08:00 |
|
artemp
|
eb3da7d32d
|
c++11 : use nullptr instead of NULL
|
2013-11-27 15:54:16 +00:00 |
|
Dane Springmeyer
|
03fdf7e596
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
src/deepcopy.cpp
src/expression.cpp
src/rule.cpp
|
2013-11-13 20:00:13 -08:00 |
|
Dane Springmeyer
|
6844863a89
|
Abort pending postgis connections when exception occurs
- patch from @abonnasseau
- closes #2042
- refs #2069
|
2013-11-12 18:38:39 -08:00 |
|
Dane Springmeyer
|
f998b2bda6
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
deps/agg/build.py
deps/clipper/build.py
include/mapnik/feature_style_processor_impl.hpp
plugins/input/csv/csv_datasource.cpp
|
2013-11-03 23:10:21 -08:00 |
|
Dane Springmeyer
|
2d268d3a95
|
features_with_context: no need for default arg
|
2013-11-03 23:07:03 -08:00 |
|
Dane Springmeyer
|
710d558218
|
scons: simplify linkflags/ldflags setting / attempt to fix #2025
|
2013-10-22 16:35:46 -04:00 |
|
artemp
|
be56a61dea
|
+ input plugins: don't link to boost_thread
(python bindings still need boost_thread via thread_specific_ptr usage)
|
2013-10-11 15:17:32 +01:00 |
|
artemp
|
3edfc69c81
|
== c++11
use std::tuple with std::get<>
|
2013-10-11 12:36:04 +01:00 |
|
artemp
|
89586fbdf1
|
+ only extract expected types from mapnik::parameters
aka mapnik::value_xxx types
|
2013-10-09 15:32:47 +01:00 |
|
Dane Springmeyer
|
681f8853d3
|
pull in changes from master
|
2013-09-24 22:57:01 -07:00 |
|
Dane Springmeyer
|
e8b00ab8a9
|
minor c++ style fixes
|
2013-09-23 17:37:46 -07:00 |
|
Dane Springmeyer
|
01344baffb
|
maintain default of max_size=10 and improve error output in the case max_size < max_async_connections
|
2013-09-23 17:32:42 -07:00 |
|
Dane Springmeyer
|
dc1d568501
|
code cleanup, consistent debug output
|
2013-09-23 14:57:23 -07:00 |
|
artemp
|
e2f5e35616
|
+ opps, 'auto' is c++11
|
2013-09-20 17:19:23 +01:00 |
|
artemp
|
0eada70845
|
+ use const std::unique_ptr< []> instead of boost::scoped_array
|
2013-09-20 15:01:58 +01:00 |
|
artemp
|
09ce29489e
|
use const std::unique_ptr<> instead of boost::scoped_ptr<>
|
2013-09-20 14:22:58 +01:00 |
|
artemp
|
62af2e6765
|
+ replace <boost/shared_ptr.hpp> with <memory>
|
2013-09-20 14:13:23 +01:00 |
|
artemp
|
b315eb2167
|
+ use std::shared_ptr and std::make_shared
|
2013-09-20 14:01:27 +01:00 |
|
Dane Springmeyer
|
5c77edcc5e
|
remove uneeded usage of std::move
|
2013-09-18 20:24:51 -07:00 |
|
artemp
|
95026329ce
|
+ fix err message typo
|
2013-09-16 10:40:48 +01:00 |
|
artemp
|
ac8a0f01eb
|
c++ style : std::map
|
2013-09-16 10:39:52 +01:00 |
|
artemp
|
23b1948c6e
|
+ minor tweaks
|
2013-09-16 10:03:54 +01:00 |
|
David Marteau
|
7495d2f381
|
[mappy] Parallel feature requests supports - PostGIS async requests
|
2013-09-11 14:04:10 +02:00 |
|
artemp
|
4f4e2b001e
|
Merge branch 'master' into c++11
Conflicts:
SConstruct
benchmark/run.cpp
bindings/python/mapnik_datasource.cpp
bindings/python/mapnik_feature.cpp
bindings/python/python_optional.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/expression_grammar.hpp
include/mapnik/feature.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/image_filter_types.hpp
include/mapnik/image_util.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_grammar.hpp
include/mapnik/processed_text.hpp
include/mapnik/tiff_io.hpp
include/mapnik/util/geometry_svg_generator.hpp
include/mapnik/util/geometry_wkt_generator.hpp
include/mapnik/utils.hpp
include/mapnik/webp_io.hpp
include/mapnik/wkt/wkt_grammar.hpp
plugins/input/shape/shape_datasource.cpp
plugins/input/shape/shapefile.hpp
src/expression_grammar.cpp
src/expression_string.cpp
src/image_util.cpp
src/json/feature_collection_parser.cpp
src/json/feature_parser.cpp
src/miniz.c
src/symbolizer_helpers.cpp
src/tiff_reader.cpp
src/webp_reader.cpp
tests/cpp_tests/geometry_converters_test.cpp
tests/cpp_tests/image_io_test.cpp
tests/cpp_tests/map_request_test.cpp
tests/python_tests/image_test.py
tests/visual_tests/test.py
|
2013-08-30 09:46:09 +01:00 |
|
Dane Springmeyer
|
75ca01889c
|
scons: only hardcode static linking libs on os x
|
2013-07-14 15:17:00 -04:00 |
|
Dane Springmeyer
|
18ab68f03f
|
iwyu
|
2013-06-21 12:00:48 -07:00 |
|
Dane Springmeyer
|
3fbf4df67d
|
add support for statically linking datasource input plugins - closes #1810 and #1821 - refs #249
|
2013-05-16 11:55:58 -07:00 |
|
artemp
|
499f8aefc5
|
+ fix accidental typo :)
|
2013-05-15 15:13:19 +01:00 |
|
artemp
|
682b85b27d
|
+ fix accidental typo :)
|
2013-05-15 15:12:28 +01:00 |
|