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

367 commits

Author SHA1 Message Date
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
Manel Clos
8f7083d14d Add tolerance parameter to features_at_point 
Make map.query_point() always pass tolerance to datasources
 2012-09-28 15:12:10 +02:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
artemp
69fb17cd3c + port 170e23440f to master 2012-09-05 10:58:21 +01:00
Dane Springmeyer
a12b8f1d2f c++ style 2012-09-03 10:27:48 -07:00
Dane Springmeyer
2e44e8c470 postgis: do not attempt to parse an empty extent string 2012-08-30 15:04:05 -07:00
Dane Springmeyer
9a51b31e01 postgis: only warn for non-geometry type attributes 2012-08-28 16:23:09 -07:00
Dane Springmeyer
ac418a7d4e remote the last references 2012-08-27 16:43:40 -07:00
Dane Springmeyer
241bf28da0 'include what you use' in plugins to set up for future forward declarations in mapnik/feature.hpp and mapnik/datasource.hpp 2012-07-24 19:21:55 -07:00
Dane Springmeyer
a1d6579da2 silence a few compiler warnings 2012-07-23 17:21:29 -07:00
Dane Springmeyer
669c4906d4 avoid c-linkage warning with datasources - closes #1323 2012-07-20 18:34:41 -07:00
Dane Springmeyer
e36081a5c0 change geometry_utils::from_wkb to return a bool that signifies if at least one wkb path was parsed - refs #1333 and #1305 2012-07-20 15:09:01 -07:00
Sandro Santilli
ceffa76bdc Provide !pixel_width! and !pixel_height! tokens (#1181) 2012-04-24 12:56:07 +02:00
kunitoki
47b6f8e454 - avoid parsing parameters in features() (postgis new simplify geometries) 
- renamed simplify to simplify_geometries
 2012-04-19 22:05:57 +02:00
Sandro Santilli
f7c5e69315 PostGIS vectors reduction, XML parameter driven (#1136) 2012-04-17 17:03:20 +02:00
Dane Springmeyer
74d4f84787 formatting 2012-04-16 22:23:05 -07:00
kunitoki
74342e3083 - no need to #ifdef all the time: the compiler should optimize out the log calls when no MAPNIK_LOG is defined 
- initially got rid of those ifdefs in plugins only
 2012-04-09 12:05:49 +02:00
kunitoki
8c58a9aa73 - improved again the logging facilities 
- aligned the plugins to using the new methods with severity
- implemented per object severity, with fallback to global (with global functions to set them programmatically)
- initial check in of logger python bindings (todo)
 2012-04-09 03:00:51 +02:00
kunitoki
1f351e0e09 implement new debug system 2012-04-08 02:20:56 +02:00
Dane Springmeyer
b21d8a9957 avoid copy 2012-04-06 14:29:13 -07:00
Dane Springmeyer
b7f714f7ec postgis: primary key autodetection will now only happen if 'autodetect_key_field' is set to true - maintains current behavior - refs #804 2012-04-05 11:05:14 -07:00
Dane Springmeyer
10848f9d04 postgis: warn in the unlikely case of a numeric primary key 2012-04-02 18:13:27 -07:00
Dane Springmeyer
763e84a6e9 postgis: add support for auto-detection of primary key field - closes #804 - refs #753 2012-04-02 16:20:41 -07:00
Dane Springmeyer
f6a0f80f32 make note of need for 64bit int support in code comments for postgis plugin - refs #895 2012-04-02 15:42:52 -07:00
kunitoki
4a7966498c - postgis resultset cosmetics 2012-03-31 22:24:32 +02:00
kunitoki
14bc344898 - cosmetics in postgis datasource 2012-03-28 22:10:48 +02:00
Artem Pavlenko
242385f16d use mapnik::util namespace for conversions 2012-03-23 11:08:39 +00:00
Dane Springmeyer
b36739fd88 apply mapnik_format.el formatting 2012-03-13 07:59:22 -07:00
Hermann Kraus
2b68cea0a1 Merge branch 'new-xml' 
Conflicts:
	include/mapnik/config_error.hpp
	include/mapnik/ptree_helpers.hpp
	src/formatting/text.cpp
	src/libxml2_loader.cpp
	src/load_map.cpp
	src/metawriter_factory.cpp
	src/text_placements/registry.cpp
	src/text_placements/simple.cpp
 2012-03-13 11:11:28 +01:00
Artem Pavlenko
302b7f1696 Revert "update rasterlite, occi, csv, hello_world, and rundemo" 
This reverts commit ab7f6ee75c.
 2012-03-09 15:33:36 +00:00
Artem Pavlenko
254b3c9fa7 Merge branch 'master' into geometry-clipping 
Conflicts:
	SConstruct
	include/mapnik/symbolizer_helpers.hpp
	src/placement_finder.cpp
 2012-03-09 14:18:41 +00:00
Dane Springmeyer
ab7f6ee75c update rasterlite, occi, csv, hello_world, and rundemo 2012-03-09 12:58:16 +00:00
Hermann Kraus
c3cd50ff57 Complete new XML structure. 2012-03-07 19:16:41 +01:00
Dane Springmeyer
f90b410ece formatting to use const& as per 6462af3 2012-03-05 11:10:04 -08:00
Artem Pavlenko
726724b3c7 pass by ref 
move conversions impl into .cpp
 2012-03-01 18:36:13 +00:00
Dane Springmeyer
e4ce3d1929 cast to avoid msvc warning 2012-02-24 16:14:34 -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
1c07372a13 postgis: make sure to add key_field to feature context 2012-02-14 14:58:09 -08:00
Dane Springmeyer
6dfb3604a4 postgis: remove last usage of deprecated functions - fully supporting postgis 2.0 - closes #1083 2012-02-14 13:07:05 -08:00
Dane Springmeyer
b44a63ac1f link all remaining plugins to boost_system to avoid potential linking errors with boost-trunk (upcoming 1.49) - closes #1070 2012-02-09 16:00:11 -08:00
Dane Springmeyer
77c58e487d whitespace fixes 2012-02-01 17:37:35 -08:00
Dane Springmeyer
60f1dadcd8 add code comment 2012-02-01 16:17:59 -08:00
Artem Pavlenko
79d44e1bf8 Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl 2012-01-24 14:39:13 +00:00
Artem Pavlenko
75024c3fa1 Merge branch 'master' into feature_impl 2012-01-24 12:48:19 +00:00
Artem Pavlenko
19deb86591 append connection string to connection error message 2012-01-24 12:36:33 +00:00
Dane Springmeyer
62cf7cb2fe no need for collecting size in postgis plugin 2012-01-23 23:50:50 -08:00
Artem Pavlenko
7601095e24 move context's typedef inside to avoid poluting global namespace 2012-01-19 17:36:27 -05:00
Artem Pavlenko
a88186fef8 no need for boost::noncopyable in derived classes 2012-01-18 09:13:29 -05:00
Dane Springmeyer
820b9a2b25 merge master with feature_impl 2012-01-17 17:47:27 -05:00
Dane Springmeyer
63891cec15 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Dane Springmeyer
b0d0d06564 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Artem Pavlenko
5011cee98c + upgrade postgis.input to work with feature_impl 2012-01-16 13:19:31 -05:00
Dane Springmeyer
66a0cfc81f refactor 2012-01-14 22:35:40 -08:00
Dane Springmeyer
834310f2d8 refactor 2012-01-14 22:35:40 -08:00
Dane Springmeyer
2c4a86d4cb Merge branch 'master' of github.com:mapnik/mapnik into geometry_type_descriptor 2012-01-12 18:48:53 -08:00
Dane Springmeyer
e716d6f440 Merge branch 'master' of github.com:mapnik/mapnik into geometry_type_descriptor 2012-01-12 18:48:53 -08:00
Dane Springmeyer
95c7e4a076 plugins/ 
pass by value
 2012-01-12 14:05:03 -08:00
Dane Springmeyer
46d53cb40d plugins/ 
pass by value
 2012-01-12 14:05:03 -08:00
Dane Springmeyer
975afebd87 ensure all plugins report best guess at top level geometry_type using new descriptor attribute 2012-01-11 20:03:23 -08:00
Dane Springmeyer
7be62e594a ensure all plugins report best guess at top level geometry_type using new descriptor attribute 2012-01-11 20:03:23 -08:00
Dane Springmeyer
1131d480e9 scons: when linking statically include other required libpq deps 2011-12-19 10:51:38 -08:00
Dane Springmeyer
b51c06f5ad scons: when linking statically include other required libpq deps 2011-12-19 10:51:38 -08:00
Artem Pavlenko
cc60b74921 Simplify geometry model to support: Point/LineString/Polygon 
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
 2011-12-06 12:53:16 +00:00
Artem Pavlenko
7209988fb0 Simplify geometry model to support: Point/LineString/Polygon 
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
 2011-12-06 12:53:16 +00:00
Artem Pavlenko
b689670ffd switch back from mapnik2 to mapnik 
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
 2011-11-23 11:33:58 +00:00
Artem Pavlenko
14700dba16 switch back from mapnik2 to mapnik 
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
 2011-11-23 11:33:58 +00:00
Dane Springmeyer
de673c6d12 postgis: for an empty table (with null results for extent) return early rather than allowing and printing a lexical cast failure 2011-11-20 16:41:47 -08:00
Dane Springmeyer
4ab17c9690 postgis: for an empty table (with null results for extent) return early rather than allowing and printing a lexical cast failure 2011-11-20 16:41:47 -08:00
Dane Springmeyer
5b94e637a6 postgis: support PostGIS 2.x - always use ST prefix (removing old testing code) and fixup other debug output - closes #893 and closes #956 2011-11-20 14:29:51 -08:00
Dane Springmeyer
3b72597f1d postgis: support PostGIS 2.x - always use ST prefix (removing old testing code) and fixup other debug output - closes #893 and closes #956 2011-11-20 14:29:51 -08:00
Dane Springmeyer
328ecd8c78 use std::string as is convention and comment last bit of unused mutex support in connection manager 2011-11-19 11:35:07 -08:00
Dane Springmeyer
bb38fa986a use std::string as is convention and comment last bit of unused mutex support in connection manager 2011-11-19 11:35:07 -08:00
Dane Springmeyer
e99e6da1e5 ensure proper error output from postgis plugin - refs #955 2011-11-17 11:36:16 -08:00
Dane Springmeyer
3d66455c64 ensure proper error output from postgis plugin - refs #955 2011-11-17 11:36:16 -08:00
Dane Springmeyer
ae68acf633 postgis: avoid empty error messages (closes #955) and more verbosity in general if postgres connection fails 2011-11-16 11:27:48 -08:00
Dane Springmeyer
dddd6fa781 postgis: avoid empty error messages (closes #955) and more verbosity in general if postgres connection fails 2011-11-16 11:27:48 -08:00
Dane Springmeyer
ce9e44b5f2 plugin code formatting based on emacs format in utils/format_source_files 2011-11-13 19:37:50 -08:00
Dane Springmeyer
62a5e457f1 plugin code formatting based on emacs format in utils/format_source_files 2011-11-13 19:37:50 -08:00
Dane Springmeyer
c8b2ddfaba reduce the size of plugin libraries by hiding unneeded symbols 2011-11-11 15:37:10 -08:00
Dane Springmeyer
1d881af35a reduce the size of plugin libraries by hiding unneeded symbols 2011-11-11 15:37:10 -08:00
Dane Springmeyer
d965bcbeae sqlite: futher refactoring of sqlite plugin, allowing all tests to pass 2011-11-03 19:51:37 -04:00
Dane Springmeyer
6257ac57c9 sqlite: futher refactoring of sqlite plugin, allowing all tests to pass 2011-11-03 19:51:37 -04:00
kunitoki
290ca729ba - copyright fixes in postgis plugin 2011-10-23 21:23:04 +02:00
kunitoki
267ee85dea - copyright fixes in postgis plugin 2011-10-23 21:23:04 +02:00
Dane Springmeyer
3bd19a30b4 use boost:make_shared more widely - refs #909 2011-10-17 16:41:12 -07:00
Dane Springmeyer
8420e8a9c6 use boost:make_shared more widely - refs #909 2011-10-17 16:41:12 -07:00
Artem Pavlenko
5476e8410b + amend input plug-ins to use new wkb interface 2011-09-13 11:54:20 +00:00
Dane Springmeyer
7c72c31951 postgis: expose min/max scale controls on datasource to direct when mapnik should pull features by bbox intersection, or the more accurate (and likely to fetch more correct features) approach of Intersection with geometries - addresses part of original problem in #876 2011-09-11 19:46:09 +00:00
Dane Springmeyer
57c8d5edd8 postgis: actually pass num_attr to ensure that feature attribute count takes into account a custom supplied key_field 2011-09-06 13:42:16 +00:00
Dane Springmeyer
1dc3d279c1 postgis: dont' report being bound unless the connection succedded such that we actually are 2011-09-01 21:10:09 +00:00
Dane Springmeyer
d03ffeb60f postgis: remove reference to unused timer 2011-09-01 00:56:40 +00:00
Dane Springmeyer
8447dc31e2 revert accidental modification to postgis build.py 2011-08-30 05:35:09 +00:00
Dane Springmeyer
22c39d91ba scons: rename all SConscript files to more friendly name of 'build' with a python extension for quick syntax detection in editors 2011-08-30 05:32:01 +00:00
Dane Springmeyer
3e67c1d694 scons: centralize install path info 2011-08-12 21:31:28 +00:00
Dane Springmeyer
0493b5086d formatting 2011-08-12 19:55:04 +00:00
Dane Springmeyer
82ac99611e add LINKING option to control whether libmapnik is build static or shared and RUNTIME_LINK options to trigger dependency flags to compile against static libs 2011-08-11 19:14:00 +00:00
Dane Springmeyer
0e490b1c25 ensure if 'key_field' is requested that the attribute also is available as a proper attribute 2011-07-29 20:08:09 +00:00
Dane Springmeyer
0613439c0d refactor postgis unique id support via 'key_field' keyword moving validation to datasource bind() and fixing attribute count to ensure 'key_field' also shows up in the attributes 2011-07-29 19:57:45 +00:00
Dane Springmeyer
3d862034cd allow '[field] is null' syntax to work with the understanding this may have unintended consequences and we should likely ultimately replace with proper 'is' equality support for nulls - track issue at http://trac.mapnik.org/ticket/794 2011-07-12 01:48:36 +00:00
Dane Springmeyer
560f5718c3 support boolean type reporting in postgis plugin 2011-07-12 01:45:49 +00:00
Dane Springmeyer
e84119aed9 directly link libmapnik in plugins (not just darwin) - patch from Stella L. - closes #790 2011-07-05 23:41:17 +00:00
Dane Springmeyer
c093d2ad4d add ability to supply a key_field (attribute name) to be used for feature ids + fix potential table alias quoting failure 2011-06-13 21:58:11 +00:00
Dane Springmeyer
14bc0be880 postgis: make sure to report boolean fields 2011-05-31 23:30:59 +00:00
Dane Springmeyer
49fd1f93d1 use boost::make_shared across plugins to avoid explicit new and ensure fast and exception safe allocation 2011-05-16 23:41:34 +00:00
Artem Pavlenko
ec0436fcd9 + consistent [h,c]pp files naming 2011-05-10 14:22:47 +00:00
Artem Pavlenko
81f96909be + use feature_factory to create features 2011-05-09 13:52:14 +00:00
Dane Springmeyer
c6980f2fd8 make sure datasource feature ids start at 1, like shapefile and sqlite plugins 2011-04-29 20:00:45 +00:00
Dane Springmeyer
9bfecac34e postgis: clear the result before throwing 2011-04-11 22:11:14 +00:00
Dane Springmeyer
7d6ed703f4 move numeric2string to sql_utils.hpp 2011-04-04 03:46:41 +00:00
Dane Springmeyer
5a1842aad1 remove tabs 2011-04-02 03:45:50 +00:00
Dane Springmeyer
3b25621258 fix typos in postgis plugin error reporting 2011-04-01 06:27:52 +00:00
Dane Springmeyer
f76d94cec9 fix up postgis error message formatting when no schema is used 2011-03-05 18:01:05 +00:00
Dane Springmeyer
c5833a6db8 remove unmaintained autotools scripts 2011-02-04 22:22:16 +00:00
Dane Springmeyer
f671ef20da scons: ensure libmapnik is built before any plugins that link to it on osx, needed for builds with -jN 2010-12-21 20:46:44 +00:00
Artem Pavlenko
6638423104 + reset head 2010-11-22 11:25:27 +00:00
Dane Springmeyer
a95d6938ad avoid compiler errors on os x 2010-11-19 23:03:35 +00:00
Lucio Asnaghi
2906ba8d0d + postgis logging cosmetics 2010-11-18 23:42:33 +00:00
Lucio Asnaghi
cffa0a07d6 + aligned postgis to use the new box2d::from_string 
+ thrash usage of static string for datasource name
 2010-11-14 14:56:35 +00:00
Dane Springmeyer
f9d229c7dc postgis: also split extent string on spaces 2010-11-14 08:34:33 +00:00
Dane Springmeyer
385ad05205 create an sql_utils header for all sql-based plugins to be able to leverage, and move the postgis table_from_sql function into it 2010-11-11 16:33:30 +00:00
Artem Pavlenko
ab101401cd + simplify geometry implementation 
+ removed multiple geometry typedefs
+ use geometry_type
+ revert to storing vertices in vector_vertex
  (previous implementation using std::vector was
   fragmenting heap causing performance issues with large geometries)
+ FIXME: hit_test is broken!
 2010-11-03 13:19:15 +00:00