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
Robert Coup
1dce437120
#622 add optional late-binding of datasources
2010-10-24 06:34:18 +00:00
Dane Springmeyer
523b09701e
Add the ability to pass custom CXXFLAGS and LDFLAGS that will be prioritized above other compiler and linker flags
2010-09-18 18:02:15 +00:00
Dane Springmeyer
fbd0e4954c
remove duplicate locks - handled in pool.hpp already (mapnik held up fine this way in the wms benchmarks)
2010-09-14 17:08:18 +00:00
Dane Springmeyer
1cd1593513
fix spelling error in 'initial_size' and ditch lowercasing method which will not work unless applied before the query object is created
2010-08-28 03:09:49 +00:00
Dane Springmeyer
5b50b59fe8
add the ability to control usage of ST_ prefix on AsBinary (as there may be performance impl), force lowercasing attribute names, and toggle forcing 2d geometries
2010-08-18 21:00:09 +00:00
Dane Springmeyer
267b48de49
add ability to uninstall all tracked scons targets using an 'uninstall' argument like 'scons uninstall' - closes #311
2010-07-18 20:39:05 +00:00
Dane Springmeyer
2a9d2e8192
place built plugin targets in input/ directory to make local registration easier
2010-07-13 23:26:05 +00:00
Artem Pavlenko
4baccf2ee3
+ corrected mistype
2010-07-02 11:52:11 +00:00
Artem Pavlenko
aa0e17afd1
+ check cached connection status before returning.
...
if PQstatus(conn) == CONNECTION_BAD attempt to
create a new one
+ expose "conect_timeout" PG connection parameter
default to 4 sec
+ throw mapnik::datasource exception if connection
is 'bad' in mapnik::features(..)
2010-07-02 11:42:35 +00:00
Artem Pavlenko
2fbc476d19
+ formatting
2010-06-25 15:23:09 +00:00
Artem Pavlenko
e7d9db9735
+ remove forward decl of transcoder (using mapnik::transcoder) is
...
sufficient
2010-06-18 15:38:44 +00:00
Dane Springmeyer
682f7ef9de
move to full usage of ST_* prefix for postgis functions, which allows support for ST_AsBinary that works with the new postgis 1.5 geography type. NOTE: this drops support for <= postgis 1.2
2010-06-05 23:50:41 +00:00
Dane Springmeyer
b1070d22c8
postgis/oracle: use mapnik::boolean type for 'estimate_extent' rather than std::string, and strip double quotes as the estimated_extent function operates on single quotes - improves upon #393
2010-03-17 22:03:39 +00:00
Artem Pavlenko
e7bfba10fe
+ enanble installation of mapnik2 side by side with mapnik
2010-03-17 21:03:02 +00:00
Artem Pavlenko
081545eb7e
+ remove unused *.hpp file
2010-03-17 13:55:27 +00:00
Alberto Valverde
6476c3b850
fixed construction of extimated_extent query since it expects the names of the schema, table and geometry_column single-quoted
2010-03-16 18:42:05 +00:00
Artem Pavlenko
bce0dab02a
+ lets postgis return geometry in native byte order
...
(wkb reader can handle both 'NDR' and 'XDR')
2010-03-08 11:55:24 +00:00
Dane Springmeyer
badbc8706f
apply modified patch from Mak Kolybabi fixing up postgres schema support in PostGIS plugin - closes #500 - extends #260
2010-02-19 21:04:45 +00:00
Dane Springmeyer
f87790cd5b
merge a few small 0.7 branch changes back into trunk
2010-01-11 00:36:51 +00:00
Artem Pavlenko
47dc1e197b
+ merge mapnik2 to trunk
2009-12-16 20:02:06 +00:00
Dane Springmeyer
f60fa76242
merge 0.7. branch changes back into trunk
2009-12-15 19:25:35 +00:00
Dane Springmeyer
4dd6259903
add optional 'geometry_table' and 'extent_from_subquery' parameter and 'scale_denominator' substitution ability to PostGIS driver while enhancing error reporting - closes #260,#426,#456, updates CHANGELOG with other recent PostGIS enhancements and fixes
2009-12-11 01:50:55 +00:00
Dane Springmeyer
c1ed612b2d
grok quoted table,schema, and geometry names by unquoting before attempting geometry columns lookup - thanks avar for the report - closes #393
2009-12-05 04:32:38 +00:00
Dane Springmeyer
b104253d9c
Add ability to link to custom icu lib name, and remove the unneeded linking to icudata on osx, while offering compiler flags required for compiling against libicucore provided by Apple
2009-11-24 20:32:41 +00:00
Dane Springmeyer
29afe237c8
add postgres int8 type to collected attributes - #384
2009-10-22 21:42:40 +00:00
Artem Pavlenko
2dcf88b392
+ wall-clock timer from auf
...
(see #439 for more details)
2009-10-20 20:32:53 +00:00
Dane Springmeyer
a0411b8d4c
postgis: make sure to close the attribute collection resultset and print the type name of unknown oid attribute values when in debug
2009-10-14 17:42:27 +00:00
Dane Springmeyer
60ca6a5677
postgis: allow for altering the default behavior of keeping open postgresql connections until the whole process ends - when 'persist_connection' = false new connections will be opened and closed for each datasource instance. ( closes #434 )
2009-10-14 04:21:46 +00:00
Dane Springmeyer
e6306010f8
when a SQL query sent to postgres fails, output the whole thing so users know what mapnik tried to send (as the PSQL error hint truncates the sql)
2009-10-02 05:16:15 +00:00
Jon Burgess
6485039a0e
Fix numeric2string to output the correct number of digits following the decimal point. Hopefully this covers all the cases correctly.
2009-09-12 11:31:53 +00:00
Jon Burgess
e8cff82a53
Fix numeric2string() to insert the correct number of 0's when building the string. This problem was reported as: [Mapnik-users] unusual problem with Mapnik output.
2009-09-12 10:49:35 +00:00
Dane Springmeyer
9c3594fb30
postgis: add patch exposing srid parameter and when geometry_field also is provided avoid querying geometry_columns. Also fixed problem of missing srid in the bbox substitution. Thanks rcoup for revised patch - closes #376
2009-08-28 15:57:29 +00:00
Dane Springmeyer
c7f85e70f8
postgis: add a hint if the extent parsing fails
2009-08-27 21:24:00 +00:00
Dane Springmeyer
9a0bb92acd
Improve handling of BBOX query substitution - closes #415
2009-08-27 03:54:52 +00:00
Dane Springmeyer
72f9c5badc
postgis: throw errors if sql queries fail - closes #363
2009-08-27 03:13:42 +00:00
Dane Springmeyer
434c303e83
postgis: add patch from migurski to allow for the passing of a 'bbox' token enabling optimized placement of the bbox/intersects query for complex subqueries- closes #415
2009-08-22 00:51:35 +00:00
Dane Springmeyer
d6cf82efb0
+support for BigInt(int8) datatype in postgres, closes #384
2009-07-17 04:30:11 +00:00
Artem Pavlenko
ae96fffee0
+ use MAPNIK_BIG_ENDIAN
...
+ support for reading int16_t
+ allow compiling shape.input with or without memory mapped files support
( define SHAPE_MEMORY_MAPPED_FILE to enable)
2009-07-07 23:56:01 +00:00
Artem Pavlenko
597889261b
+ query WKB in platform native format
2009-06-29 14:31:39 +00:00
Artem Pavlenko
15569af061
+ specify a byte order to ST_AsBinary (patch from ssinger)
2009-06-29 14:21:56 +00:00
Artem Pavlenko
84fcabcec3
+ trim bpchar type
2009-06-25 19:59:33 +00:00
Artem Pavlenko
be1d437e8b
trim tokens when parsing extent
2009-04-27 18:39:33 +00:00