Artem Pavlenko
5011cee98c
+ upgrade postgis.input to work with feature_impl
2012-01-16 13:19:31 -05:00
Artem Pavlenko
d207580feb
don't forget to init context_ptr
2012-01-16 13:18:00 -05:00
Artem Pavlenko
87e4f22966
+ update raster plugin to work with new feature_factory
2012-01-16 09:51: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
Artem Pavlenko
4c39a34ddf
Merge branch 'master' into feature_impl
2012-01-13 10:25:47 +00: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
46d53cb40d
plugins/
...
pass by value
2012-01-12 14:05:03 -08:00
Dane Springmeyer
95c7e4a076
plugins/
...
pass by value
2012-01-12 14:05:03 -08:00
Artem Pavlenko
86ea7f2951
remove unused data members
2012-01-12 12:28:53 +00:00
Artem Pavlenko
159a69a0bb
add shape_utils
2012-01-12 12:20:39 +00:00
Artem Pavlenko
0bb8adbbdc
factor out common code to reduce duplication (shape_utils)
2012-01-12 12:18:50 +00:00
Artem Pavlenko
c6338f82af
use boost::noncopyable
2012-01-12 10:11:01 +00:00
Artem Pavlenko
3bd41e45a4
upgrade shape.input to new feature impl
2012-01-12 10:04:08 +00: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
1fa26fa067
close #970 by removing non-north-up restriction which appears not to be working properly
2012-01-09 08:39:22 -08:00
Dane Springmeyer
8d11b0f16e
close #970 by removing non-north-up restriction which appears not to be working properly
2012-01-09 08:39:22 -08:00
Artem Pavlenko
02eb5b8f12
shape: check if multiple parts are interior rings or separate
...
polygons. Currently only test if first coordinate inside exterior
ring and assume first ring is exterior.
If this approach is not robust enough we can calculate ring orientations
instead. Shape file convention is: CW - exterior, CCW - interior.
very simple
2012-01-05 16:24:38 +00:00
Artem Pavlenko
faaa4f6e3f
shape: check if multiple parts are interior rings or separate
...
polygons. Currently only test if first coordinate inside exterior
ring and assume first ring is exterior.
If this approach is not robust enough we can calculate ring orientations
instead. Shape file convention is: CW - exterior, CCW - interior.
very simple
2012-01-05 16:24:38 +00:00
Dane Springmeyer
c551626916
finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries
2011-12-21 12:22:05 -08:00
Dane Springmeyer
89a09208e8
finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries
2011-12-21 12:22:05 -08:00
Dane Springmeyer
b51c06f5ad
scons: when linking statically include other required libpq deps
2011-12-19 10:51:38 -08:00
Dane Springmeyer
1131d480e9
scons: when linking statically include other required libpq deps
2011-12-19 10:51:38 -08:00
Dane Springmeyer
0bb2cc2d49
add support for 'intersects' token in sqlite plugin - closes #809
2011-12-16 10:05:54 -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
c7a6dc597a
sqlite: when building rtree sql, only try WHERE substitution if not doing join
2011-12-16 08:14:08 -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
1b8e49d13b
sqlite: improve the error message when geometry_field could not be autodetected
2011-12-16 07:48:02 -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
95264a2dcb
Merge branch 'master' of github.com:mapnik/mapnik
2011-12-16 06:50:32 -08:00
Dane Springmeyer
39801bf943
Merge branch 'master' of github.com:mapnik/mapnik
2011-12-16 06:50:32 -08:00
Dane Springmeyer
6e18e307ee
Add missing break
2011-12-15 17:18:22 -08:00
Dane Springmeyer
d4b85f55f9
Add missing break
2011-12-15 17:18:22 -08:00
Artem Pavlenko
726cea7ba4
Merge branch 'master' into geometry_cleanup
2011-12-14 14:04:30 +00:00
Artem Pavlenko
ed7abc5c51
Merge branch 'master' into geometry_cleanup
2011-12-14 14:04:30 +00:00
Dane Springmeyer
0bb1073b3f
csv plugin: allow values with leading zeros to stay as strings - closes #993 - refs https://github.com/mapbox/tilemill/issues/1007
2011-12-12 15:55:33 -08:00
Dane Springmeyer
143efad7cd
csv plugin: allow values with leading zeros to stay as strings - closes #993 - refs https://github.com/mapbox/tilemill/issues/1007
2011-12-12 15:55:33 -08:00
Dane Springmeyer
c0f918114e
sqlite: fixup rtree bbox entries to use cumulative extent of multipolygons to avoid contraint errors
2011-12-12 08:30:46 -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
bf2c8c4e9f
make shape_io work with geometry_container concept
2011-12-09 12:25:13 +00:00
Artem Pavlenko
02dce6a756
make shape_io work with geometry_container concept
2011-12-09 12:25:13 +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
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
71b281e1cc
osm plugin: report a decent error if the .osm file is not found
2011-12-05 14:30:55 -08:00
Dane Springmeyer
cb504ea4c9
osm plugin: report a decent error if the .osm file is not found
2011-12-05 14:30:55 -08:00
Dane Springmeyer
2fa5bf191a
ogr plugin: throw if non-existant fields are queried - refs #792
2011-12-05 13:57:00 -08:00
Dane Springmeyer
70a191e8d7
ogr plugin: throw if non-existant fields are queried - refs #792
2011-12-05 13:57:00 -08:00
Dane Springmeyer
17852d5140
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
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
Dane Springmeyer
ddeca1e81e
csv plugin: ensure that the datasource throws if invalid attributes are queried to keep consistent with other datasource - refs #792
2011-12-05 12:03:38 -08:00
Dane Springmeyer
37fee4b674
csv plugin: ensure that the datasource throws if invalid attributes are queried to keep consistent with other datasource - refs #792
2011-12-05 12:03:38 -08:00
Dane Springmeyer
01b0c0b15a
catch a few more mapnik2 references
2011-11-23 20:35:43 -08:00
Dane Springmeyer
b1492d24ab
catch a few more mapnik2 references
2011-11-23 20:35:43 -08: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
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
e92d0362a6
sqlite: add (currently unused) in-memory rtree creation code
2011-11-20 16:42:28 -08:00
Dane Springmeyer
d8c6529654
sqlite: add (currently unused) in-memory rtree creation code
2011-11-20 16:42:28 -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
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
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
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
9cf15bac0f
alternate in-memory rtree generation, and remove debug output
2011-11-19 11:36:35 -08:00
Dane Springmeyer
f2a4e0c57d
alternate in-memory rtree generation, and remove debug output
2011-11-19 11:36:35 -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
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
3d66455c64
ensure proper error output from postgis plugin - refs #955
2011-11-17 11:36:16 -08:00
Dane Springmeyer
e99e6da1e5
ensure proper error output from postgis plugin - refs #955
2011-11-17 11:36:16 -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
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
baebf4f1f2
scons: get linking correct to sqlite dependecies if linking is static
2011-11-15 12:07:46 -08:00
Dane Springmeyer
a6608814d0
scons: get linking correct to sqlite dependecies if linking is static
2011-11-15 12:07:46 -08:00
kunitoki
1251a57e4e
- allow occi to compile with new changes in mapnik::sql_utils
...
- cache table_from_sql instead of recomputing on each query
2011-11-15 14:04:58 +01:00
kunitoki
ef27ecf1cb
- allow occi to compile with new changes in mapnik::sql_utils
...
- cache table_from_sql instead of recomputing on each query
2011-11-15 14:04:58 +01:00
Dane Springmeyer
41663b1941
csv: avoid invalid dereference
2011-11-14 00:34:26 -08:00
Dane Springmeyer
f8a9095e81
csv: avoid invalid dereference
2011-11-14 00:34:26 -08:00
Dane Springmeyer
39d199aa49
code formatting
2011-11-13 19:54:32 -08:00
Dane Springmeyer
4654312d00
code formatting
2011-11-13 19:54:32 -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
ce9e44b5f2
plugin code formatting based on emacs format in utils/format_source_files
2011-11-13 19:37:50 -08:00
Dane Springmeyer
5205960326
csv: code formatting
2011-11-13 19:33:57 -08:00
Dane Springmeyer
3fd56f82f5
csv: code formatting
2011-11-13 19:33:57 -08:00
Dane Springmeyer
b3b938a804
sqlite: let sqlite automatically rollback if needed to avoid potential rollback against no transaction
2011-11-13 19:19:22 -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
73feb36dba
sqlite: trim all types of valid quote characters on table names
2011-11-13 16:41:54 -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
a527bb25e2
sqlite: step_next for a prepared statement must only return SQLITE_DONE
2011-11-13 16:41:34 -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
b1c2d9f680
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
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
67682f1f36
update hello world build script
2011-11-11 17:03:21 -08:00
Dane Springmeyer
6f665bf7ec
update hello world build script
2011-11-11 17:03:21 -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
c8b2ddfaba
reduce the size of plugin libraries by hiding unneeded symbols
2011-11-11 15:37:10 -08:00
Dane Springmeyer
85b938806b
fix csv plugin build
2011-11-11 12:17:39 -08:00
Dane Springmeyer
62753ad245
fix csv plugin build
2011-11-11 12:17:39 -08:00
Dane Springmeyer
df166f5eff
ensure parallel builds work with csv plugin and kismet links to boost thread
2011-11-11 12:13:41 -08:00
Dane Springmeyer
6b98546466
ensure parallel builds work with csv plugin and kismet links to boost thread
2011-11-11 12:13:41 -08:00
Dane Springmeyer
4e4769745f
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
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
89e13d304d
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
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
d6cc803ef9
sqlite: proper cleanup if rtree index creation fails
2011-11-09 17:44:50 -08:00
Dane Springmeyer
3ed640a15f
sqlite: proper cleanup if rtree index creation fails
2011-11-09 17:44:50 -08:00
Dane Springmeyer
a058639b24
use c++ style includes
2011-11-09 16:45:18 -08:00
Dane Springmeyer
40ae0efd26
use c++ style includes
2011-11-09 16:45:18 -08:00
Dane Springmeyer
2172e0a409
Merge pull request #943 from mapnik/sqlite-refactor
...
Sqlite refactor
2011-11-09 15:47:58 -08:00
Dane Springmeyer
b0bad47d78
Merge pull request #943 from mapnik/sqlite-refactor
...
Sqlite refactor
2011-11-09 15:47:58 -08:00
Artem Pavlenko
3194707fd3
use rint from global.hpp in windows
2011-11-08 11:50:56 +00:00
Artem Pavlenko
6b0e414aa1
use rint from global.hpp in windows
2011-11-08 11:50:56 +00:00
Dane Springmeyer
6b7635119c
Merge branch 'master' into sqlite-refactor
2011-11-04 20:44:15 -07:00
Dane Springmeyer
dcd19e05e5
Merge branch 'master' into sqlite-refactor
2011-11-04 20:44:15 -07:00
Dane Springmeyer
da4a7af14c
csv: detect as wkt columns with 'geom' substring and use more aggressive detection for blank lines
2011-11-04 07:18:40 -04:00
Dane Springmeyer
a6dfb7b6a4
csv: detect as wkt columns with 'geom' substring and use more aggressive detection for blank lines
2011-11-04 07:18:40 -04:00
Dane Springmeyer
6257ac57c9
sqlite: futher refactoring of sqlite plugin, allowing all tests to pass
2011-11-03 19:51:37 -04: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
a92c46ff5d
Merge branch 'master' into sqlite-refactor
2011-11-03 09:44:02 -04:00
Dane Springmeyer
426b26650e
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
6295501ead
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
e6ac5d8881
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
16ab2ba895
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
7f2d3e09f2
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
0d9170cda2
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
b3c2bfef01
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
74d0af396e
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
08bdb2f36a
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
69806f2728
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
d5eb3b4b9c
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
820e1865dc
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
225a8c4eaf
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
03137cf523
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
Dane Springmeyer
988567e040
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
a061562866
- 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
