Dane Springmeyer
|
a92c46ff5d
|
Merge branch 'master' into sqlite-refactor
|
2011-11-03 09:44:02 -04:00 |
|
Dane Springmeyer
|
6c8e4b2de0
|
csv: back off of null and boolean detection since using strings is more predictable across rows
|
2011-11-02 11:07:59 -04:00 |
|
Dane Springmeyer
|
1eff83530a
|
csv: also start auto-detecting ';' and '|' characters as likely separators
|
2011-11-01 21:11:10 -04:00 |
|
Dane Springmeyer
|
2dfb5e5489
|
csv: use braces in all cases
|
2011-11-01 20:48:30 -04:00 |
|
Dane Springmeyer
|
4cec91ff82
|
csv: handle empty headers, an apparently common situation with large government data
|
2011-11-01 20:33:05 -04:00 |
|
Dane Springmeyer
|
705a573d29
|
csv: use unsigned to avoid compiler warnings
|
2011-11-01 11:55:23 -04:00 |
|
Dane Springmeyer
|
bdb9857cf0
|
csv: remove protective string checks now that spirit parsing is working
|
2011-10-31 19:12:13 -04:00 |
|
Dane Springmeyer
|
b2c54c98dd
|
csv: be more strict about spirit parsing, iterate headers list to avoid dropping trailing nulls, and fixup exception handling a bit
|
2011-10-31 19:09:29 -04:00 |
|
Dane Springmeyer
|
80fbbfbf1b
|
Merge branch 'master' into sqlite-refactor
|
2011-10-31 15:03:03 -04:00 |
|
Dane Springmeyer
|
043a7e3c11
|
format error messages
|
2011-10-31 13:43:56 -04:00 |
|
Dane Springmeyer
|
d20caee776
|
Merge branch 'master' into sqlite-refactor
|
2011-10-29 22:56:57 -07:00 |
|
Dane Springmeyer
|
bcf4c2967e
|
when statically linking, proj linking is needed for libgdal
|
2011-10-29 22:33:49 -07:00 |
|
Dane Springmeyer
|
c760af4425
|
get feature count incrementing working more properly
|
2011-10-28 21:50:31 -07:00 |
|
Dane Springmeyer
|
ffc92f1893
|
first pass at refactoring bind() to be more manageable in sqlite plugin - refs #928
|
2011-10-28 21:24:47 -07:00 |
|
Dane Springmeyer
|
b4daf1a4b0
|
add option to ogr driver to force usage of a single driver when attempting to open files - can shave very slightly off of load times if ogr is built with a lot of drivers
|
2011-10-28 15:16:34 -07:00 |
|
kunitoki
|
535a730da3
|
- again forgot a refactoring that breaks the previous 2 commits. hopefully should compile now.
|
2011-10-24 12:05:01 +02:00 |
|
kunitoki
|
e9397ee98c
|
- forgot a file in previous commit (closes #472 again)
|
2011-10-24 11:56:02 +02:00 |
|
kunitoki
|
c314041a5a
|
- implemented sql query in OGR plugin (closes #472)
|
2011-10-24 11:53:33 +02:00 |
|
kunitoki
|
267ee85dea
|
- copyright fixes in postgis plugin
|
2011-10-23 21:23:04 +02:00 |
|
kunitoki
|
44ade30e7a
|
- small copyright fix in ogr plugin
|
2011-10-23 21:21:28 +02:00 |
|
kunitoki
|
cf3f6156c3
|
- aligned code style in geos plugin
|
2011-10-23 21:19:56 +02:00 |
|
kunitoki
|
d7f68cc8f5
|
- copyright fixes in shape plugin
|
2011-10-23 21:09:59 +02:00 |
|
kunitoki
|
339d236bc3
|
- more coding style fixes in rasterlite plugin
|
2011-10-23 16:35:02 +02:00 |
|
kunitoki
|
78cfd88ac4
|
- modified coding style in raster plugin
|
2011-10-23 16:31:25 +02:00 |
|
kunitoki
|
05a32a18e5
|
- aligned coding style in osm plugin
|
2011-10-22 16:04:05 +02:00 |
|
kunitoki
|
2a4fe24ea9
|
- modified coding style in shape plugin
|
2011-10-22 15:27:28 +02:00 |
|
kunitoki
|
c0273234b6
|
- aligned coding style in sqlite plugin
|
2011-10-22 14:50:24 +02:00 |
|
kunitoki
|
f1460b78cd
|
- fix indentation and trailing spaces (generally coding style) in rasterlite plugin partially related to #911
|
2011-10-22 14:29:54 +02:00 |
|
kunitoki
|
86d2f9ef19
|
- removed a refuse of the past in ogr plugin
|
2011-10-22 14:29:08 +02:00 |
|
kunitoki
|
8333b51439
|
- removed a refuse of the past in occi plugin
|
2011-10-22 14:28:41 +02:00 |
|
kunitoki
|
2045506a3d
|
- removed a refuse of the past in kismet plugin
|
2011-10-22 14:28:07 +02:00 |
|
kunitoki
|
abea816e42
|
- removed a refuse of the past in gdal plugin
|
2011-10-22 14:27:21 +02:00 |
|
kunitoki
|
26fbcb51ef
|
- fix indentation and trailing spaces (generally coding style) in occi plugin partially related to #911
|
2011-10-22 03:33:03 +02:00 |
|
kunitoki
|
35739ae917
|
- fix indentation and trailing spaces (generally coding style) in kismet plugin partially related to #911
- implemented srs datasource option in kismet plugin (was hardcoded and not changeable)
|
2011-10-22 03:10:45 +02:00 |
|
kunitoki
|
f1c73645cf
|
- fix indentation and trailing spaces (generally coding style) in gdal plugin partially related to #911
|
2011-10-22 02:46:29 +02:00 |
|
kunitoki
|
13df914d06
|
- fix indentation and trailing spaces (generally coding style) in ogr plugin partially related to #911
|
2011-10-22 02:27:06 +02:00 |
|
Artem Pavlenko
|
664d3c4ca6
|
Merge pull request #910 from MapQuest/multi-tile-policy
Added a 'multi' tiled raster plugin reader for virtual images
|
2011-10-21 12:26:44 -07:00 |
|
Dane Springmeyer
|
bc18b60e1c
|
sqlite: use boost::trim for dequoting of std::string
|
2011-10-21 03:41:20 -07:00 |
|
Dane Springmeyer
|
6a9da44c79
|
sqlite: restore original sqlite dequoting function as the previous simplification did not work
|
2011-10-21 01:55:07 -07:00 |
|
kunitoki
|
9438ee0fdd
|
- avoid using temporary pointer in sqlite blob/text resultsets
|
2011-10-19 13:25:08 +02:00 |
|
kunitoki
|
b7af62acfe
|
- cleaned up readability of occi featureset by using named const variables
|
2011-10-19 13:23:22 +02:00 |
|
Dane Springmeyer
|
6de1e75390
|
csv plugin: also detect lat/lon/long field names as likely geometry columns
|
2011-10-18 19:27:23 -07:00 |
|
Dane Springmeyer
|
2e4deb1a09
|
csv plugin: fix newlines detectio, fix first feature detection, and work around spirit number parsing issues
|
2011-10-18 18:21:19 -07:00 |
|
kunitoki
|
289b8daed0
|
- favour speed for already specified keys
|
2011-10-19 00:44:20 +02:00 |
|
kunitoki
|
9f227b2dd4
|
- fixed nose tests on attachdb (still this code seems a bit messy?)
|
2011-10-19 00:42:49 +02:00 |
|
kunitoki
|
ee6a0d9dba
|
- 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
|
1aa96ace1c
|
- 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
|
020f870bb7
|
- fixed a problem in automatic sqlite wkb format determination code
- other cosmetics in sqlite datasource
|
2011-10-18 22:53:47 +02:00 |
|
kunitoki
|
2372a60ff7
|
- cosmetics changes to sqlite datasource plugin
- added initial wkbAuto to auto determine WKB type in sqlite
|
2011-10-18 22:19:03 +02:00 |
|
Matt Amos
|
20ca69c3ea
|
Added Python test for multi-tile raster policy.
|
2011-10-18 14:34:58 +01:00 |
|
Matt Amos
|
ed0e7a50d6
|
Merge branch 'master' into multi-tile-policy
|
2011-10-18 13:40:35 +01:00 |
|
Dane Springmeyer
|
3708d43e99
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2011-10-17 16:42:06 -07:00 |
|
Dane Springmeyer
|
8420e8a9c6
|
use boost:make_shared more widely - refs #909
|
2011-10-17 16:41:12 -07:00 |
|
Dane Springmeyer
|
f5b08ed821
|
clean up usage of boost::tokenizer
|
2011-10-17 11:18:44 -07:00 |
|
Dane Springmeyer
|
c15892ff04
|
skip blank lines earlier and implement a 20 MB filesize limit (at least until alternative, non-memory based featureset iterator is implemented)
|
2011-10-17 11:03:50 -07:00 |
|
Dane Springmeyer
|
d50b175fc3
|
Merge branch 'master' into csv_plugin
|
2011-10-14 20:31:36 -07:00 |
|
Dane Springmeyer
|
8f11ffd921
|
add boost::spirit for speed boost, add strict/quiet modes, expose quote/sep/escape chars, allow user supplied headers
|
2011-10-14 20:28:23 -07:00 |
|
Dane Springmeyer
|
98c9e455fa
|
fix spelling
|
2011-10-13 14:24:50 -07:00 |
|
Dane Springmeyer
|
cb3b509da3
|
add new csv datasource plugin
|
2011-10-11 18:11:59 -07:00 |
|
Matt Amos
|
d29f609052
|
Added a 'multi' tiled raster plugin reader for virtual images
already present as tiles on disk.
|
2011-10-12 01:08:03 +01: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
|
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
|
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
|
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
|
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
|
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
|
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
|
7121f6269a
|
add row_limit option to shapefile driver to allow limiting the number of features rendered - closes #741
|
2011-08-26 07:02:36 +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
|
f2074ae3af
|
fix example code
|
2011-08-12 19:55:15 +00:00 |
|
Dane Springmeyer
|
0493b5086d
|
formatting
|
2011-08-12 19:55:04 +00:00 |
|
Dane Springmeyer
|
f1b8f02110
|
sqlite: fix relative path logic for attachdb - closes #817
|
2011-08-12 19:26:30 +00:00 |
|
Artem Pavlenko
|
4b09f3d750
|
+ skip null shapes
|
2011-08-12 16:43:28 +00:00 |
|
Artem Pavlenko
|
7a00511a56
|
+ cleanup
|
2011-08-12 16:43:21 +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 |
|
Artem Pavlenko
|
9a49b81318
|
+ check if pos is valid while iterating through
shapes (don't use eof()!)
+ handle null_shapes better (TODO:testing)
|
2011-08-11 11:04:19 +00:00 |
|
Artem Pavlenko
|
5ddd7052e4
|
+ apply try/catch around the attribute loop
+ code formatting
|
2011-08-11 11:04:04 +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 |
|