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

203 commits

Author SHA1 Message Date
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
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
Lucio Asnaghi
ce3e7e5eeb + sqlite logging cosmetics 2010-11-18 23:36:21 +00:00
Lucio Asnaghi
4b81b977b4 + sqlite datasource query fix when using select sub-queries 2010-11-15 11:06:21 +00:00
Lucio Asnaghi
973aaf1247 + aligned sqlite to use the new box2d::from_string 
+ thrash usage of static string for datasource name
 2010-11-14 14:51:04 +00:00
Lucio Asnaghi
2cc9435576 - forgot to declare a namespace (oops!) 2010-11-12 00:31:04 +00:00
Lucio Asnaghi
07f455ebaa + use mapnik::table_from_sql in sqlite and occi plugins (after change r2337 thanx to dane) 2010-11-12 00:12:47 +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
d4306abf7d sqlite: skip reading featureset if no wkb is found; rasterlite: link to boost libs on mac os x 2010-10-01 20:16:49 +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
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
Dane Springmeyer
810c63cb51 revert unintended changes from r1804 against gdal and sqlite plugins 2010-05-30 03:23:59 +00:00
Dane Springmeyer
a84b397f48 markers_converter.hpp was moved to markers_placement.hpp 2010-05-30 03:17:59 +00:00
Artem Pavlenko
e7bfba10fe + enanble installation of mapnik2 side by side with mapnik 2010-03-17 21:03:02 +00:00
Artem Pavlenko
47dc1e197b + merge mapnik2 to trunk 2009-12-16 20:02:06 +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
e7c9d02fd3 add 'base' path option to sql,gdal, and ogr plugins and touchup handling of missing files with boost filesystem - closes #263 2009-03-30 20:19:57 +00:00
Andreas Volz
887518fc57 - install plugins in lib/mapnik/input 
- Fix: no sqlite3 for kismet
- python files compile and install
 2009-03-25 23:11:49 +00:00
Andreas Volz
cab469eefb - added new et input plugin 
- add missing files to plugins Makefile.am
- split debugging and tracing
- documentation
 2009-03-22 22:26:42 +00:00
Artem Pavlenko
bad446da1d + check if *.sqlite file exists and avoid creating a new one 2009-03-11 23:39:26 +00:00
Lucio Asnaghi
af3fa7dc76 + sqlite.input: whitespace fix 
+ occi.input: added table_from_sql to allow specify SELECT statements in table parameter
+ occi.input: added use_spatial_index parameter (on by default)
+ occi.input: improved determination of query columns type
 2009-02-24 09:58:31 +00:00
Artem Pavlenko
2cb4265091 + revert to "limit 1" logic 
+ discard everything after table name when building 
  table descriptor to avoid seq scan
 2009-02-23 23:26:50 +00:00
Artem Pavlenko
7537c14d77 + small fix 2009-02-23 22:22:14 +00:00
Artem Pavlenko
f4f1cd4c59 + initial support for 'SELECT' statements in <table> param. 
+ use limit 0 to avoid lengthy queries (does it work ?)
 2009-02-23 22:13:21 +00:00
Lucio Asnaghi
72c9d29ea6 - sqlite.input: revert back the check for spatial index virtual table in sqlite_master 
- sqlite.input: default of key_field is now OGC_FID (artem)
 2009-02-23 16:04:57 +00:00
Lucio Asnaghi
556095af04 - sqlite.input: added row_offset and row_limit to parameters 
- sqlite.input: added wkb_format parameter for selecting WKB format (generic/spatialite)
- sqlite.input: commented check of the spatial index
- wkb.hpp: removed wkqSQLite in favour of wkbSpatiaLite
 2009-02-23 15:00:25 +00:00
Artem Pavlenko
484ab6cc1c + use "the_geom" as a default geometry field 2009-02-23 13:31:56 +00:00
Dane Springmeyer
90f3703505 scons: add option called 'LIB_DIR_NAME' to control the relative directory where input plugins are installed and where python looks to register them 2009-02-23 00:47:01 +00:00
Artem Pavlenko
76a4800231 + use standard WKB by default 2009-02-22 20:53:45 +00:00
Andreas Volz
c64269e1e3 support for sqlite3 and ogr 2009-02-18 22:17:00 +00:00
Artem Pavlenko
f8fec4ab88 + corrected SQL 2009-02-16 22:06:41 +00:00
Lucio Asnaghi
2c81706eb5 Following #223: 
+ improvements to the wkb converter
+ improved sqlite index usage
+ added more parameters to sqlite datasource
 2009-02-10 19:09:16 +00:00
Artem Pavlenko
7d2f492ef2 + sqlite-input-plugin.patch (kunitoki) 
+ wkb-sqlite.patch (kunitoki)
+ very preliminary spatial index support (idx_<tablename>_<geometry_field>)
 2009-02-09 19:43:57 +00:00