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

184 commits

Author SHA1 Message Date
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
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
artemp
700b5978d8 + check bounding box intersections if use_spatial_index=false (#971) 2012-07-02 18:15:18 +01:00
Dane Springmeyer
39bae3825e remove plugin usage of lexical cast - refs #1055 2012-06-22 16:49:53 -04: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
c88fcc8f04 revert unintended change to sqlite in a7e150a593 2012-04-03 16:33:06 -07:00
Dane Springmeyer
a7e150a593 tests: add simple tests for postgis 'bbox' token replacement 2012-04-02 19:29:06 -07:00
Hermann Kraus
c3cd50ff57 Complete new XML structure. 2012-03-07 19:16:41 +01:00
Dane Springmeyer
524d6bea5f avoid implicit cast from sqlite_int64 to int 2012-02-23 09:50:06 -08:00
Dane Springmeyer
77c58e487d whitespace fixes 2012-02-01 17:37:35 -08:00
Dane Springmeyer
aa6da2dce9 collect context before featureset creation in sqlite 2012-01-23 23:51:31 -08:00
Artem Pavlenko
4f48cce42e push column names into context_type 2012-01-23 08:39:22 +00:00
Dane Springmeyer
9097ea0ceb update sqlite and osm datasources to new feature impl 2012-01-19 16:34:33 -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
Dane Springmeyer
834310f2d8 refactor 2012-01-14 22:35:40 -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
04dd46315e add support for 'intersects' token in sqlite plugin - closes #809 2011-12-16 10:05:54 -08:00
Dane Springmeyer
b518402686 sqlite: when building rtree sql, only try WHERE substitution if not doing join 2011-12-16 08:14:08 -08:00
Dane Springmeyer
0ebf79e5ea sqlite: improve the error message when geometry_field could not be autodetected 2011-12-16 07:48:02 -08:00
Dane Springmeyer
39801bf943 Merge branch 'master' of github.com:mapnik/mapnik 2011-12-16 06:50:32 -08:00
Dane Springmeyer
d4b85f55f9 Add missing break 2011-12-15 17:18:22 -08:00
Dane Springmeyer
c837078b38 sqlite: fixup rtree bbox entries to use cumulative extent of multipolygons to avoid contraint errors 2011-12-12 08:30:46 -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
Dane Springmeyer
d5252187d3 sqlite: ensure non-existant columns requested in query prompt error by switching quoting character to brackets - closes #984 - refs #792 2011-12-05 13:22:00 -08: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
Dane Springmeyer
d8c6529654 sqlite: add (currently unused) in-memory rtree creation code 2011-11-20 16:42:28 -08:00
Dane Springmeyer
f2a4e0c57d alternate in-memory rtree generation, and remove debug output 2011-11-19 11:36:35 -08:00
Dane Springmeyer
a6608814d0 scons: get linking correct to sqlite dependecies if linking is static 2011-11-15 12:07:46 -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
1653fe0b93 sqlite: let sqlite automatically rollback if needed to avoid potential rollback against no transaction 2011-11-13 19:19:22 -08:00
Dane Springmeyer
422d112d38 sqlite: trim all types of valid quote characters on table names 2011-11-13 16:41:54 -08:00
Dane Springmeyer
7ef5778d96 sqlite: step_next for a prepared statement must only return SQLITE_DONE 2011-11-13 16:41:34 -08:00
Dane Springmeyer
a4715aa8df sqlite: disassociate extent calculation from rtree auto-index creation, and grab immediate lock on rtree table 2011-11-13 16:02:27 -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
5669226166 sqlite: autoquote table names that start with numbers to better support natural earth conversions from shapefiles 2011-11-10 09:42:04 -08:00
Dane Springmeyer
bdc726a525 sqlite: return success or failure from rtree indexing function and report available tables if the pragma table_info() fails 2011-11-09 19:18:12 -08:00
Dane Springmeyer
3ed640a15f sqlite: proper cleanup if rtree index creation fails 2011-11-09 17:44:50 -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
03137cf523 first pass at refactoring bind() to be more manageable in sqlite plugin - refs #928 2011-10-28 21:24:47 -07:00
kunitoki
b779e406d0 - aligned coding style in sqlite plugin 2011-10-22 14:50:24 +02:00
Dane Springmeyer
5e25e7cd6c sqlite: use boost::trim for dequoting of std::string 2011-10-21 03:41:20 -07:00
Dane Springmeyer
39e1588f12 sqlite: restore original sqlite dequoting function as the previous simplification did not work 2011-10-21 01:55:07 -07:00
kunitoki
f9c65b8a91 - avoid using temporary pointer in sqlite blob/text resultsets 2011-10-19 13:25:08 +02:00
kunitoki
3e60fa2d5a - favour speed for already specified keys 2011-10-19 00:44:20 +02:00
kunitoki
8383603703 - fixed nose tests on attachdb (still this code seems a bit messy?) 2011-10-19 00:42:49 +02:00
kunitoki
ba6e6d9c31 - improved automatic determination of key_field from pragma table_info. 
- avoid using rowid if we don't have a primary key
 2011-10-18 23:51:01 +02:00
kunitoki
5d72d50f74 - added some comments to clear that using rowid as default key_field for sqlite is *EXTREMELY* dangerous (aka no primary key, unexpected results may appear) 
- more cosmetics in sqlite plugin
- refactor unquote function to be lighter and simpler
 2011-10-18 23:32:25 +02:00
kunitoki
8b9d05db0a - fixed a problem in automatic sqlite wkb format determination code 
- other cosmetics in sqlite datasource
 2011-10-18 22:53:47 +02:00
kunitoki
b23697e1b3 - cosmetics changes to sqlite datasource plugin 
- added initial wkbAuto to auto determine WKB type in sqlite
 2011-10-18 22:19:03 +02:00
Dane Springmeyer
98c9e455fa fix spelling 2011-10-13 14:24:50 -07:00
Dane Springmeyer
f1b8452794 sqlite: report rtree index creation failure - patch from kkaefer - closes #884 2011-09-15 21:58:20 +00:00
Artem Pavlenko
5476e8410b + amend input plug-ins to use new wkb interface 2011-09-13 11:54:20 +00:00
Dane Springmeyer
436df62f3b proper order of api calls in sqlite - #refs 872 2011-09-13 00:00:35 +00:00
Dane Springmeyer
5fcc403135 sqlite: move init logic into bind() 2011-09-02 21:21:01 +00:00
Dane Springmeyer
546edcc684 sqlite: improve debug output mode 2011-09-02 13:50:40 +00:00
Dane Springmeyer
3c2b154c52 fix nightlies compile on boost 1.42 2011-09-02 01:38:24 +00:00
Dane Springmeyer
7d60c12e33 sqlite: skip feature parsing when things go wrong upstream in sqlite - https://github.com/mapnik/node-mapnik/issues/61 2011-09-02 00:56:42 +00:00
Dane Springmeyer
aa9bdf0d5a sqlite: complete symlinks so that the proper relative path can be fetched for an attached db reference - closes #859 2011-09-01 23:23:29 +00:00
Dane Springmeyer
7b89a580f6 quote the index table to avoid sql failures during index creation if the table has characters like needing quotes like ':' 2011-08-31 22:47:37 +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
9446b871f8 sqlite: fix the ifdef checking so that we actually enable sqlite_open_v2 usages, and also pass the READ mode to avoid undefined behavior - re-closes #797 2011-08-29 17:46:51 +00:00
Dane Springmeyer
79eedca66f sqlite: warn at compile time if you've got an ancient version of sqlite so users have a clue as to why maps may not be blazingly fast on 'stable' systems 2011-08-25 19:11:07 +00:00
Dane Springmeyer
d5eb58a46a sqlite: fix and optimize unicode dequoting of double quoted field names returned from subqueries 2011-08-24 00:32:00 +00:00
Dane Springmeyer
c227b9a6a5 sqlite: move to 64bit id types for generation of index, and improve error message when pragma table_info fails 2011-08-17 20:39:07 +00:00
Dane Springmeyer
d3211372a4 sqlite: support both single and double quoted table names 2011-08-16 23:24:02 +00:00
Dane Springmeyer
aaf9d960d7 sqlite: properly initialize rowid default 2011-08-16 23:05:19 +00:00
Dane Springmeyer
5596ff5960 sqlite: unquote fields to avoid filter failures - preliminary fix for #822 2011-08-16 21:36:58 +00:00
Dane Springmeyer
6d5c6d7458 sqlite: query from geometry_table_ rather than table_ to hopefully avoid problems with rowid being missing from subquery 2011-08-16 16:45:03 +00:00
Dane Springmeyer
9f4deb00c0 sqlite: do not warn anymore about a spatial index being missing because it will be created automatically 2011-08-16 16:27:49 +00:00
Dane Springmeyer
443297efe8 sqlite: better error handling around key_field, when not manually supplied 2011-08-16 16:17:54 +00:00
Dane Springmeyer
40df7f57c3 sqlite: add auto-indexing of sqlite files if use_spatial_index=true and a spatial index is missing (which is the case for ogr2ogr -f SQLite created sqlite files) 2011-08-15 20:02:57 +00:00
Dane Springmeyer
cfe49fcaf6 sqlite: enable dynamic querying of extent as a last fallback for non-spatialite and non-indexed sqlite files 2011-08-13 02:52:46 +00:00
Dane Springmeyer
17d5173678 restore compile with boost 1.42 2011-08-13 01:44:37 +00:00
Dane Springmeyer
3e67c1d694 scons: centralize install path info 2011-08-12 21:31:28 +00:00
Dane Springmeyer
f1b8f02110 sqlite: fix relative path logic for attachdb - closes #817 2011-08-12 19:26:30 +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
00866525fd sqlite: better error checking and reporting around an rtree spatial index that is empty 2011-08-10 23:42:47 +00:00
Dane Springmeyer
4a4ac626ef sqlite: handle a potentially quoted geometry table 2011-08-10 22:48:50 +00:00
Dane Springmeyer
572da8766f only leverage sqlite3_open_v2 in versions of sqlite that support it - ammends r3039 - see also #797 2011-07-16 19:34:26 +00:00
Dane Springmeyer
b18a536194 apply patch from stella for faster sqlite reads - closes #797 2011-07-14 00:28:04 +00:00
Dane Springmeyer
4049b74923 touchup sqlite error message 2011-07-13 01:40:36 +00:00
Dane Springmeyer
c357fcbf9d use proper mapnik::value_null in sqlite features rather than empty strings 2011-07-12 01:00:27 +00:00
Dane Springmeyer
55b37160e4 support attachdb, initdb, and index_table parameters in sqlite plugin - patch and tests from stella - closes #793 2011-07-11 17:46:53 +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
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
Dane Springmeyer
4dbc58a55b use 'column affinity' type logic to detect the geometry_field if not specified, and throw if not known or if extent cannot be determined 2011-04-04 03:56:15 +00:00
Dane Springmeyer
f891b0f61f sqlite plugin: add features_at_point() impl 2011-04-02 04:54:26 +00:00
Dane Springmeyer
5a1842aad1 remove tabs 2011-04-02 03:45:50 +00:00
Dane Springmeyer
c66b3b250c sqlite plugin: add rowid to the fields 2011-04-01 22:30:21 +00:00
Dane Springmeyer
6517f52dcf sqlite plugin: aggregate extents from rtree spatial index 2011-04-01 04:35:56 +00:00
Dane Springmeyer
ede84d5932 sqlite plugin: get type checking correct based on SQlite's loosy goosy 'Column Affinity' 2011-04-01 02:51:28 +00:00
Dane Springmeyer
690ee25c36 sqlite plugin: unless <table> param is a subquery use PRAGMA table_info to query column names and types, and if SQLITE_NULL is encountered when inspecting actual query values fallback to empty strings since mapnik does not have a NULL type 2011-04-01 01:22:19 +00:00
Dane Springmeyer
73e8dd06a0 sqlite plugin: plugin is mature enough now: throw if sql errors are encountered 2011-04-01 01:20:34 +00:00
Dane Springmeyer
23639271fe throw if table is not supplied, quote field names, use spatial index to get extent, and default to built in alias for the primary key ('rowid') if key_field is not supplied 2011-03-31 22:32:22 +00:00
Dane Springmeyer
d3d59c7ac4 fix spelling 2011-03-18 01:11:53 +00:00
Dane Springmeyer
ea895f7837 add geometry_table option to sqlite plugin, which if provided, allows spatial indexes to be used with subqueries 2011-03-17 23:50:16 +00:00
Dane Springmeyer
c5833a6db8 remove unmaintained autotools scripts 2011-02-04 22:22:16 +00:00