Artem Pavlenko
50b5d06a48
Merge remote-tracking branch 'origin/feature_impl' into feature_impl
...
Conflicts:
include/mapnik/feature.hpp
2012-01-17 12:39:16 -05:00
Artem Pavlenko
ab69053daa
Merge branch 'master' into feature_impl
2012-01-17 10:37:47 -05:00
Dane Springmeyer
6a2a847c3b
remove unused shx code
2012-01-17 10:06:59 -05:00
Dane Springmeyer
09857d6e8c
support as low as geos v3.1.0 - closes #1031
2012-01-17 01:48:02 -05:00
Artem Pavlenko
e17c6ec5ff
feature_impl update
2012-01-16 17:55:44 -05:00
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
Artem Pavlenko
4c39a34ddf
Merge branch 'master' into feature_impl
2012-01-13 10:25:47 +00: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
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
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
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
1131d480e9
scons: when linking statically include other required libpq deps
2011-12-19 10:51:38 -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
Artem Pavlenko
ed7abc5c51
Merge branch 'master' into geometry_cleanup
2011-12-14 14:04:30 +00: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
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
02dce6a756
make shape_io work with geometry_container concept
2011-12-09 12:25:13 +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
cb504ea4c9
osm plugin: report a decent error if the .osm file is not found
2011-12-05 14:30:55 -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
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
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
b1492d24ab
catch a few more mapnik2 references
2011-11-23 20:35:43 -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
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
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
f2a4e0c57d
alternate in-memory rtree generation, and remove debug output
2011-11-19 11:36:35 -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
e99e6da1e5
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
a6608814d0
scons: get linking correct to sqlite dependecies if linking is static
2011-11-15 12:07:46 -08: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
f8a9095e81
csv: avoid invalid dereference
2011-11-14 00:34:26 -08:00
Dane Springmeyer
4654312d00
code formatting
2011-11-13 19:54:32 -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
3fd56f82f5
csv: code formatting
2011-11-13 19:33:57 -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