artemp
1c3dbdd3ab
postgis.input + use mapnik-geometry
2015-02-19 16:05:09 +01:00
Dane Springmeyer
4b3f69e851
#2651 is fixed, remove workaround in postgis plugin
2015-01-28 18:18:09 -08:00
Dane Springmeyer
ec111c8a27
add extra metadata to lyr desc + use for srid/keyfield in postgis - closes #2650
2015-01-22 18:44:56 -08:00
Dane Springmeyer
4a1f4a9b5e
Use geometry_table_ rather than table_ for SRID lookup
...
- this will result in a faster query in the case that
the user provides an explicit geometry_table option
2015-01-22 15:55:30 -08:00
artemp
5361d21beb
move mapnik::noncopyable to mapnik::util::noncopyable where it belongs
2015-01-07 13:11:09 +01:00
artemp
333965b588
update copyright year
2014-11-20 15:25:50 +01:00
Dane Springmeyer
437d486bbd
fix building with PLUGIN_LINKING=static
2014-11-11 14:42:53 -08:00
Dane Springmeyer
83588937b9
silence boost warnings
2014-10-21 16:37:27 -07:00
Sandro Santilli
0d098a0467
Bring postgis simplification factor back to 1/20 of a pixel
...
This was the value in 2.2.x and was accidentally changed as part
of a completely unrelated commit, see:
http://github.com/mapnik/mapnik/issues/1639#issuecomment-53388951
2014-08-26 13:03:22 +02:00
Dane Springmeyer
44844f7bd0
postgis: disable NOTICES by default - refs #2296
2014-08-12 20:30:34 -07:00
Dane Springmeyer
d27b45553a
use emplace/emplace_back over insert/push_back - refs #2336
2014-08-05 15:19:37 -07:00
Dane Springmeyer
8feedd94cd
rename mapnik::boolean to mapnik::boolean_type - closes #1899
2014-07-28 19:46:49 -07:00
Sandro Santilli
25c237fdd9
Ensure read-only transactions
...
Closes #2142
2014-07-16 11:04:39 +02:00
artemp
fe215a684e
c++11 style : replace (almost) all typedef with type alias's
2014-07-07 18:23:15 +01:00
artemp
0702679bb0
don't call *params.get<std::string>("type"), instead use static datasource::name()
...
(FIXME: consider removing redundant 'name' in feature_layer_descriptor)
2014-06-26 10:51:24 +01:00
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
artemp
c698079f5e
+ log Null geometry case ( via @TomH )
2013-05-15 15:09:53 +01:00
artemp
99dcc76860
+ log Null geometry case ( via @TomH )
2013-05-15 15:07:17 +01:00
artemp
06e4105310
+ check if geometry record (WKB) is not Null before attempting to parse
2013-05-15 14:39:24 +01:00
artemp
4dd1189ac8
+ check if geometry record (WKB) is not Null before attempting to parse
2013-05-15 14:38:54 +01:00
artemp
86aeee1ea1
+ remove an empty line at the begining
2013-05-15 14:31:57 +01:00
artemp
4915bf138e
mapnik::value + add move ctor
...
mapnik::feature + pass attributes by r-value.
2013-05-07 12:04:06 +01:00
Toby Collett
ac09541243
Use shared pointer reference count to track pools
...
By using the shared pointer reference count to track the connections
in the connection pool we no longer have to explicitly return them
to the pool.
This resolves an issue where cursor feature sets were returning their
connections before they were done with them, causing a potential race
with another connection user.
2013-04-29 20:33:57 +00:00
Dane Springmeyer
83eb8f2595
fix handling of null values for feature id in sqlite/postgis input - closes #1817
2013-04-17 15:34:21 -07:00
Dane Springmeyer
60c6592c4e
fix spelling of unknown
2013-04-17 14:23:04 -07:00
Dane Springmeyer
9da1f35b5e
plugins do not need to store nulls / save space - refs #1644
2013-04-11 16:05:29 -07:00
Sandro Santilli
0c5d5ca99c
Fix postgresql connection leaks
...
Return connection to pool on connection error (see #1708 )
Fix leaks on persist_connection=false (#1711 )
Includes testcase for #1711
2013-03-15 10:34:22 +01:00
Dane Springmeyer
d861636fbc
move const char string2value interface to use iterators
2013-02-26 12:07:36 -05:00
Dane Springmeyer
b5c06965ac
refactor expression and value type usage to speed up compile time
2013-01-08 14:17:31 -08:00
Dane Springmeyer
4bd5484cdb
fixup includes and value type and params usage across plugins
2013-01-04 09:23:06 -08:00
Dane Springmeyer
66a5c26fdc
leverage mapnik::value_integer for feature.id() and grid rendering buffer - refs #1662
2012-12-19 19:24:52 -08:00
artemp
94bda55793
Merge branch 'master' into bigint
2012-12-18 21:50:30 +00:00
Dane Springmeyer
5758e6d9de
Loosen simplification factor to 1/20 of pixel (master branch) - closes #1639
2012-12-18 11:57:45 -08:00
artemp
a38b252ccd
Merge branch 'master' into bigint
...
Conflicts:
plugins/input/geojson/geojson_datasource.cpp
plugins/input/postgis/postgis_featureset.cpp
2012-12-18 13:57:39 +00:00
Dane Springmeyer
7b39333234
remove as much mutable as possible
2012-12-17 12:59:15 -08:00
Dane Springmeyer
bdfdca99e9
fix debug output
2012-12-17 10:51:10 -08:00
Dane Springmeyer
c5410fac7e
remove bind option for datasources - refs #962
2012-12-17 10:03:07 -08:00
artemp
c4bae9d30a
Merge branch 'master' into bigint
...
Conflicts:
bindings/python/mapnik_feature.cpp
plugins/input/shape/dbfile.cpp
2012-12-14 10:01:21 +00:00
Dane Springmeyer
7c58bf9fcb
replace boost::trim with faster custom trim - closes #1633
2012-12-07 14:06:13 -08:00
artemp
855aea95e0
+ mapnik::value and mapnik::parameters - initial support for 64-bit integers
2012-12-03 13:12:09 +00:00
Dane Springmeyer
8bfc330015
postgis: do not fatally throw if metadata queries fail - closes #1609 and closes #1565
2012-11-28 20:19:11 -08:00
Dane Springmeyer
0548d6037b
fix postgres null connection error adding space for better formatting
2012-11-28 18:20:34 -08:00
Dane Springmeyer
1baeb7036c
cleanup unused code
2012-11-28 18:20:09 -08:00
artemp
cff52c9f73
+ fix typo
2012-11-28 19:16:10 +00:00
artemp
99141fa5e5
+ support initialSize_ updates
...
+ move maxSize_/initialSize_ logic into pool.hpp
2012-11-28 17:38:18 +00:00
artemp
a3fe851737
+ overwrite pool::maxSize_ with max value
2012-11-28 17:04:53 +00:00
Dane Springmeyer
9afaf091b1
postgis plugin: avoid printing the password if connection fails - amends 19deb86591
2012-11-27 18:37:22 -08:00
artemp
cec34dd5a6
+ better error msg
2012-11-27 12:49:19 +00:00
artemp
b114e8219c
+ add status() method to reduce code duplication
2012-11-27 12:48:22 +00:00
artemp
85192afe2b
+ avoid creating duplicate attributes
2012-10-26 12:15:31 +01:00
Dane Springmeyer
65b19680e0
followup to 69fb17cd3c - make sure to report literal in descriptor
2012-10-05 14:49:12 -07:00
