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
Dane Springmeyer
15a624fa79
update readmes for template plugins
2012-07-10 14:54:05 -07:00
Dane Springmeyer
d3b375713b
properly populate the context
2012-07-10 14:51:13 -07:00
Dane Springmeyer
86f137fd25
recompile stale targets during deploy
2012-07-10 14:50:43 -07:00
Dane Springmeyer
c227ea8b5f
add sample Makefile for local dev
2012-07-10 14:46:00 -07:00
Dane Springmeyer
f79fd4634e
make markdown files
2012-07-10 14:28:52 -07:00
artemp
700b5978d8
+ check bounding box intersections if use_spatial_index=false ( #971 )
2012-07-02 18:15:18 +01:00
Dane Springmeyer
37c9142515
csv plugin: also detect fields named 'lng' as longitude
2012-06-25 10:18:09 -07:00
Dane Springmeyer
39bae3825e
remove plugin usage of lexical cast - refs #1055
2012-06-22 16:49:53 -04:00
Artem Pavlenko
8d4534de78
+ remove debug print
2012-06-14 15:10:32 +01:00
Artem Pavlenko
ddfe15025b
+ use rtree index
2012-06-14 14:41:15 +01:00
Artem Pavlenko
e89eb99e28
+ geojson input plugin (thanks, @tmcw!)
2012-06-13 13:30:58 +01:00
Sandro Santilli
ceffa76bdc
Provide !pixel_width! and !pixel_height! tokens ( #1181 )
2012-04-24 12:56:07 +02:00
kunitoki
47b6f8e454
- avoid parsing parameters in features() (postgis new simplify geometries)
...
- renamed simplify to simplify_geometries
2012-04-19 22:05:57 +02:00
Sandro Santilli
f7c5e69315
PostGIS vectors reduction, XML parameter driven ( #1136 )
2012-04-17 17:03:20 +02:00
Dane Springmeyer
74d4f84787
formatting
2012-04-16 22:23:05 -07:00
Dane Springmeyer
e21bcb35a1
whitespace
2012-04-16 22:22:35 -07:00
Dane Springmeyer
e947d7eac9
ogr: fix reading of geometry type for datasources like geojson that need to read first feature to detect the type propertly
2012-04-12 13:04:59 -07:00
kunitoki
46d45e8496
- decrease the default number of connection in oracle pool
2012-04-10 15:53:58 +02:00
kunitoki
8f36d47a13
- fixed a potential buffer overflow in geos plugin error reporting
...
- updated changelog for new logging system
2012-04-10 10:24:53 +02:00
Dane Springmeyer
bfb0f22788
fix compile of geos datasource
2012-04-09 17:19:03 -07:00
kunitoki
a902a08aab
- added logging to file
...
- started working on the logger bindings
- cleanups some error reporting with cerr/clog in the library
2012-04-10 00:25:31 +02:00
kunitoki
b60c508c1c
- finish thrashing all the useless ifdef MAPNIK_LOG
2012-04-09 21:41:56 +02: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
Dane Springmeyer
31303ff341
shape plugin: only add feature value if parsing is successful
2012-04-07 17:56:58 -07:00
kunitoki
af201551b8
got rid of old CVS $Id comments kludge in files
2012-04-08 02:45:01 +02:00
kunitoki
1f351e0e09
implement new debug system
2012-04-08 02:20:56 +02:00
Dane Springmeyer
b21d8a9957
avoid copy
2012-04-06 14:29:13 -07:00
Dane Springmeyer
b7f714f7ec
postgis: primary key autodetection will now only happen if 'autodetect_key_field' is set to true - maintains current behavior - refs #804
2012-04-05 11:05:14 -07:00
Dane Springmeyer
c88fcc8f04
revert unintended change to sqlite in a7e150a593
2012-04-03 16:33:06 -07:00
Dane Springmeyer
46b16c917e
support nodata for paletted images and allow user to set nodata on-the-fly - closes #1160 and #1161 - refs #688 and refs #730 and refs #50 and refs #1018
2012-04-03 16:06:36 -07:00
Dane Springmeyer
a7e150a593
tests: add simple tests for postgis 'bbox' token replacement
2012-04-02 19:29:06 -07:00
Dane Springmeyer
253a1e4b4b
occi: fix invalid concatenation uncovered by latest clang++
2012-04-02 19:20:09 -07:00
Dane Springmeyer
10848f9d04
postgis: warn in the unlikely case of a numeric primary key
2012-04-02 18:13:27 -07:00
Dane Springmeyer
763e84a6e9
postgis: add support for auto-detection of primary key field - closes #804 - refs #753
2012-04-02 16:20:41 -07:00
Dane Springmeyer
f6a0f80f32
make note of need for 64bit int support in code comments for postgis plugin - refs #895
2012-04-02 15:42:52 -07:00
kunitoki
4a7966498c
- postgis resultset cosmetics
2012-03-31 22:24:32 +02:00
kunitoki
14bc344898
- cosmetics in postgis datasource
2012-03-28 22:10:48 +02:00
kunitoki
7dbe1279bf
- reorder constructor initialization list to avoid warnings in raster datasource
2012-03-28 22:01:45 +02:00
Artem Pavlenko
242385f16d
use mapnik::util namespace for conversions
2012-03-23 11:08:39 +00:00
Hermann Kraus
94634d4691
Correctly parse empty elements in OSM datasource.
2012-03-20 23:13:15 +01:00
Hermann Kraus
bd9fe739e5
Throw in OSM datasource if not all parameters are specified but bind is requested.
2012-03-20 23:13:15 +01:00
Dane Springmeyer
9556584b0c
create context in init list
2012-03-16 13:43:48 -07:00
Artem Pavlenko
385ca5b5b5
Merge remote-tracking branch 'origin/master'
2012-03-13 16:44:36 +00:00
Dane Springmeyer
b36739fd88
apply mapnik_format.el formatting
2012-03-13 07:59:22 -07:00
Artem Pavlenko
3f681a7504
+ move mapnik::context_ptr to initialization list
2012-03-13 10:19:46 +00:00
Artem Pavlenko
3891922b28
use const ref and avoid creating temp std::string
2012-03-13 10:11:58 +00:00
Hermann Kraus
2b68cea0a1
Merge branch 'new-xml'
...
Conflicts:
include/mapnik/config_error.hpp
include/mapnik/ptree_helpers.hpp
src/formatting/text.cpp
src/libxml2_loader.cpp
src/load_map.cpp
src/metawriter_factory.cpp
src/text_placements/registry.cpp
src/text_placements/simple.cpp
2012-03-13 11:11:28 +01:00
Hermann Kraus
c2f9e3b637
Include correct file in csv datasource.
2012-03-11 23:07:39 +01:00
Artem Pavlenko
302b7f1696
Revert "update rasterlite, occi, csv, hello_world, and rundemo"
...
This reverts commit ab7f6ee75c
.
2012-03-09 15:33:36 +00:00
Artem Pavlenko
254b3c9fa7
Merge branch 'master' into geometry-clipping
...
Conflicts:
SConstruct
include/mapnik/symbolizer_helpers.hpp
src/placement_finder.cpp
2012-03-09 14:18:41 +00:00
Dane Springmeyer
ab7f6ee75c
update rasterlite, occi, csv, hello_world, and rundemo
2012-03-09 12:58:16 +00:00
Hermann Kraus
c3cd50ff57
Complete new XML structure.
2012-03-07 19:16:41 +01:00
Dane Springmeyer
f90b410ece
formatting to use const& as per 6462af3
2012-03-05 11:10:04 -08:00
Dane Springmeyer
ab4c9da7ad
fixup ogr plugin error string output
2012-03-04 22:28:02 -08:00
Artem Pavlenko
c25e8c7d94
Merge remote-tracking branch 'origin/master'
2012-03-02 09:34:57 +00:00
Hermann Kraus
69824314ed
Simplify OSM plugin.
2012-03-02 01:01:13 +01:00
Hermann Kraus
9eec4eb1be
Fix OSM plugin.
2012-03-02 00:51:44 +01:00
Artem Pavlenko
726724b3c7
pass by ref
...
move conversions impl into .cpp
2012-03-01 18:36:13 +00:00
Dane Springmeyer
5bdaf44a7a
Revert "shape: check if multiple parts are interior rings or separate"
...
This reverts commit faaa4f6e3f
.
2012-02-26 22:11:22 -08:00
Dane Springmeyer
5a7de9c0db
remove uneeded default cases
2012-02-24 18:58:12 -08:00
Dane Springmeyer
74502b9d15
remove uneeded default cases
2012-02-24 18:56:58 -08:00
Dane Springmeyer
e4ce3d1929
cast to avoid msvc warning
2012-02-24 16:14:34 -08:00
Dane Springmeyer
524d6bea5f
avoid implicit cast from sqlite_int64 to int
2012-02-23 09:50:06 -08:00
Dane Springmeyer
4c4bfc8fc5
remove all usage of lexical_cast in postgis plugin - refs #1055
2012-02-21 11:03:33 -08:00
Dane Springmeyer
9be9b09d72
Merge branch 'master' of github.com:mapnik/mapnik
2012-02-16 17:44:34 -08:00
Artem Pavlenko
c83ab1d14e
Merge remote-tracking branch 'origin/master'
2012-02-15 19:20:17 +00:00
Artem Pavlenko
01497bfc36
+ add typedef size_type to mapnik::vertex_vector
...
+ remove set_capacity() method - no longer required
2012-02-15 15:16:33 +00:00
Dane Springmeyer
4ad9b4d282
formatting
2012-02-14 16:07:23 -08:00
Dane Springmeyer
1c07372a13
postgis: make sure to add key_field to feature context
2012-02-14 14:58:09 -08:00
Dane Springmeyer
6dfb3604a4
postgis: remove last usage of deprecated functions - fully supporting postgis 2.0 - closes #1083
2012-02-14 13:07:05 -08:00
Dane Springmeyer
e2d398f6db
add permissive flag to ogr and shape plugins to work around boost interprocess compile bug - closes #1082 - refs #950 and #1001
2012-02-14 10:33:40 -08:00
Dane Springmeyer
00a2bec062
silence signed/unsigned compiler warning
2012-02-13 11:01:58 -08:00
Dane Springmeyer
b866b6d51c
remove uneeded variables
2012-02-13 11:01:44 -08:00
Dane Springmeyer
c33d534b80
link to boost system
2012-02-09 16:00:39 -08:00
Dane Springmeyer
b44a63ac1f
link all remaining plugins to boost_system to avoid potential linking errors with boost-trunk (upcoming 1.49) - closes #1070
2012-02-09 16:00:11 -08:00
Dane Springmeyer
1e2897b28d
update rasterlite to new feature_impl
2012-02-02 09:00:02 -08:00
Dane Springmeyer
0e701dd899
initialize context in init list
2012-02-02 08:58:20 -08:00
Dane Springmeyer
77c58e487d
whitespace fixes
2012-02-01 17:37:35 -08:00
Dane Springmeyer
60f1dadcd8
add code comment
2012-02-01 16:17:59 -08:00
Dane Springmeyer
e4a11c0d07
use correct context type
2012-01-31 08:35:40 -08:00
Artem Pavlenko
79d44e1bf8
Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl
2012-01-24 14:39:13 +00:00
Artem Pavlenko
75024c3fa1
Merge branch 'master' into feature_impl
2012-01-24 12:48:19 +00:00
Artem Pavlenko
19deb86591
append connection string to connection error message
2012-01-24 12:36:33 +00:00
Dane Springmeyer
aa6da2dce9
collect context before featureset creation in sqlite
2012-01-23 23:51:31 -08:00
Dane Springmeyer
62cf7cb2fe
no need for collecting size in postgis plugin
2012-01-23 23:50:50 -08:00
Dane Springmeyer
c576291346
push value into context for gdal plugin
2012-01-23 23:50:24 -08:00
Artem Pavlenko
4f48cce42e
push column names into context_type
2012-01-23 08:39:22 +00:00
Artem Pavlenko
54941d2893
+ refactor attribute validating
...
+ fix context in feature_at_point
2012-01-20 12:29:17 -05:00
Artem Pavlenko
1f98e0ce4e
+ fix context init
...
+ cleanup
2012-01-20 11:07:29 -05:00
Artem Pavlenko
6d6f213c8f
Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl
2012-01-19 17:38:49 -05:00
Artem Pavlenko
7601095e24
move context's typedef inside to avoid poluting global namespace
2012-01-19 17:36:27 -05:00
Dane Springmeyer
9097ea0ceb
update sqlite and osm datasources to new feature impl
2012-01-19 16:34:33 -05:00
Dane Springmeyer
b7032316d4
update the ogr plugin to use new feature_impl
2012-01-19 12:55:07 -05:00
Artem Pavlenko
5ebe4d4ea3
+ fix name
2012-01-19 11:08:07 -05:00
Artem Pavlenko
a88186fef8
no need for boost::noncopyable in derived classes
2012-01-18 09:13:29 -05:00
Artem Pavlenko
e699ba17cb
Merge branch 'master' into feature_impl
2012-01-18 07:48:57 -05:00
Dane Springmeyer
425f20fb68
ogr plugin: for geometry type inspection support older gdal/ogr versions - fixes compile on ubuntu oneiric
2012-01-17 18:43:01 -05:00
Dane Springmeyer
fb80de8dfe
ogr plugin: for geometry type inspection support older gdal/ogr versions - fixes compile on ubuntu oneiric
2012-01-17 18:43:01 -05:00
Artem Pavlenko
63a3399036
Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl
2012-01-17 17:58:34 -05:00
Artem Pavlenko
7f816eaeca
fix init order
2012-01-17 17:58:00 -05:00
Dane Springmeyer
820b9a2b25
merge master with feature_impl
2012-01-17 17:47:27 -05:00
Artem Pavlenko
436fc91c3e
Merge pull request #1021 from mapnik/geometry_type_descriptor
...
Add Geometry type descriptor
2012-01-17 11:31:24 -08:00
Artem Pavlenko
9407991be4
Merge pull request #1021 from mapnik/geometry_type_descriptor
...
Add Geometry type descriptor
2012-01-17 11:31:24 -08:00
Dane Springmeyer
e4c03f6a54
adapt occi, geos, and kismet plugins to new feature impl
2012-01-17 14:22:21 -05:00
Dane Springmeyer
f0e37a9fa1
update csv plugin to use new feature interface
2012-01-17 13:34:08 -05:00
Dane Springmeyer
e1ba3f723d
add issue # to code comments
2012-01-17 13:33:35 -05:00
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
2a64b478ef
support as low as geos v3.1.0 - closes #1031
2012-01-17 01:48:02 -05:00
Dane Springmeyer
09857d6e8c
support as low as geos v3.1.0 - closes #1031
2012-01-17 01:48:02 -05:00
Dane Springmeyer
63891cec15
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
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
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
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
kunitoki
2a7d41f1ff
- 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
088561bd5e
- 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
290ca729ba
- 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
0026d23638
- 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
9967132b78
- 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
2cf56bf767
- 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
49335bc00e
- 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
76cadccd6b
- 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
8b53f78d1d
- 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
a7b67566b2
- 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
b779e406d0
- 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
b03f0fc226
- 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
d67de4ab4a
- 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
41bb8fd38c
- 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
3341b7b7d2
- 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
ce5acb94b4
- 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
0427a9b054
- 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
1270076460
- 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
3d0de64051
- 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
kunitoki
10d35add23
- 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
Artem Pavlenko
4e22542bce
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
5e25e7cd6c
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
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
9438ee0fdd
- avoid using temporary pointer in sqlite blob/text resultsets
2011-10-19 13:25:08 +02:00
kunitoki
f9c65b8a91
- 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
kunitoki
0de5fdf622
- 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
90154e0a1a
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
Dane Springmeyer
0cd3048e60
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
3e60fa2d5a
- 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
8383603703
- 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
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
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
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
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
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
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
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
Matt Amos
20ca69c3ea
Added Python test for multi-tile raster policy.
2011-10-18 14:34:58 +01:00
Matt Amos
517fc59f77
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
Matt Amos
49e872049c
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
a6522fde77
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
3bd19a30b4
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
Dane Springmeyer
17854e6c4f
shape: improve the error message when an invalid attribute is requested
2011-08-05 21:20:21 +00:00
Dane Springmeyer
0e490b1c25
ensure if 'key_field' is requested that the attribute also is available as a proper attribute
2011-07-29 20:08:09 +00:00
Dane Springmeyer
0613439c0d
refactor postgis unique id support via 'key_field' keyword moving validation to datasource bind() and fixing attribute count to ensure 'key_field' also shows up in the attributes
2011-07-29 19:57:45 +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
3d862034cd
allow '[field] is null' syntax to work with the understanding this may have unintended consequences and we should likely ultimately replace with proper 'is' equality support for nulls - track issue at http://trac.mapnik.org/ticket/794
2011-07-12 01:48:36 +00:00
Dane Springmeyer
560f5718c3
support boolean type reporting in postgis plugin
2011-07-12 01:45:49 +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
ccfbf175a0
handle timestamps and floats in shapefile dbf reader
2011-07-12 00:59:43 +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
c093d2ad4d
add ability to supply a key_field (attribute name) to be used for feature ids + fix potential table alias quoting failure
2011-06-13 21:58:11 +00:00
Dane Springmeyer
14bc0be880
postgis: make sure to report boolean fields
2011-05-31 23:30:59 +00:00
Dane Springmeyer
4dd2e9eda5
large potential performance boost for ogr datasources
2011-05-26 07:30:49 +00:00
Dane Springmeyer
050fe14eaa
fix occi compile
2011-05-23 15:54:58 +00:00
Dane Springmeyer
e4329847d2
shape.input: re-assign feature id's once we know their correct value after reading geometry up to the dbf link - TODO - we should be able to look ahead to avoid this re-assign
2011-05-20 01:41:28 +00:00
Dane Springmeyer
978dc29568
detect top level shape geometry type and throw if multipatch since we don't support it
2011-05-19 21:48:45 +00:00
Dane Springmeyer
136a6de680
disable unused 'support' for shape type and shx
2011-05-19 21:31:25 +00:00
Dane Springmeyer
e901058eba
skip null geometries for indexed shapefiles (already skip for non-indexed) to avoid invalid reads - TODO - consider not adding to index to avoid need to skip
2011-05-19 21:24:08 +00:00
Artem Pavlenko
bfd27f6047
+ revert make_shared in kismet_thread (introduced in #2907 )
2011-05-19 16:39:55 +00:00
Dane Springmeyer
e588b2e135
cache iterator in shape_index_featureset
2011-05-18 01:56:06 +00:00
Dane Springmeyer
ca90c34d17
use boost::make_shared feature factory for ogr featuresets
2011-05-18 01:28:22 +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
b3c258c9a8
allow usage of boost::make_shared in gdal featureset construction by passing const reference - #760
2011-05-16 22:17:50 +00:00
Dane Springmeyer
c19ede5070
remove last references to boost_iostreams dependency
2011-05-10 15:57:45 +00:00
Artem Pavlenko
f811d096b5
+ consistent file naming, cleaups
2011-05-10 15:03:09 +00:00
Artem Pavlenko
ec0436fcd9
+ consistent [h,c]pp files naming
2011-05-10 14:22:47 +00:00
Dane Springmeyer
df8022fb3f
do not link to iostreams
2011-05-09 22:23:36 +00:00
Artem Pavlenko
81f96909be
+ use feature_factory to create features
2011-05-09 13:52:14 +00:00
Dane Springmeyer
1070b293ad
tabs -> spaces
2011-05-04 15:53:36 +00:00
Dane Springmeyer
d05b0c539f
apply major refactor of RasterColorizer by ben moores from https://github.com/BenMoores/mapnik-trunk/wiki/RasterColorizer - closes #523
2011-05-04 00:20:17 +00:00
Dane Springmeyer
caeaf920d7
remove used variable
2011-04-29 20:04:36 +00:00
Dane Springmeyer
c6980f2fd8
make sure datasource feature ids start at 1, like shapefile and sqlite plugins
2011-04-29 20:00:45 +00:00
Dane Springmeyer
769f5fe3a9
fix curly braces
2011-04-22 23:28:45 +00:00
Dane Springmeyer
5578e5f659
ogr plugin: allow features will null geometries (rendering ultimately will be skipped) instead of breaking early - closes #754
2011-04-21 19:19:07 +00:00
Dane Springmeyer
fac00a5c74
explicit link to libmapnik.dylib
2011-04-20 03:06:32 +00:00
Dane Springmeyer
e1b00387ca
occi.input: remove unused header
2011-04-13 18:13:26 +00:00
Dane Springmeyer
b020783087
helloworld.input - comment fix
2011-04-13 18:13:07 +00:00
Dane Springmeyer
8fa2c6b4da
raster.input: touchup error output
2011-04-13 17:50:40 +00:00
Dane Springmeyer
9bfecac34e
postgis: clear the result before throwing
2011-04-11 22:11:14 +00:00
Artem Pavlenko
7191d56a16
+ throw image_reader_exception if we can't read tiff file
...
+ catch image_reader_exceptions in raster.input
+ re-throw in bind()
2011-04-11 21:17:10 +00:00
Dane Springmeyer
da722262e6
upgrade syntax to mapnik2
2011-04-09 05:35:25 +00:00
Artem Pavlenko
cccdd048eb
+ use mapped_memory_cache for memory mapped files
2011-04-07 15:24:52 +00:00
Artem Pavlenko
878bc6b6da
+ remove boost::iostreams includes
2011-04-07 15:15:46 +00:00
Artem Pavlenko
7c3896f3a3
+ cleanups
2011-04-07 15:09:20 +00:00
Artem Pavlenko
3d0697f343
+ update SConscript to reflect previous change
2011-04-07 13:45:05 +00:00
Artem Pavlenko
02fffbd89f
+ better naming: dbffile -> dbfile
2011-04-07 13:44:57 +00:00
Artem Pavlenko
e81761d270
+ remove boost::iostreams dependency
2011-04-07 13:35:21 +00:00
Artem Pavlenko
0e0b7a578c
+ implement memory mapping using boost::interprocess
...
+ cache mapped memory regions for re-use
2011-04-06 13:02:31 +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
7d6ed703f4
move numeric2string to sql_utils.hpp
2011-04-04 03:46:41 +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
3b25621258
fix typos in postgis plugin error reporting
2011-04-01 06:27:52 +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
b8663b67e3
handle NODATA for rgb and grey images in gdal.input - closes #727
2011-03-11 21:28:18 +00:00
Dane Springmeyer
f76d94cec9
fix up postgis error message formatting when no schema is used
2011-03-05 18:01:05 +00:00
Dane Springmeyer
3df75cc422
shape.input: check if .dbf exists and throw up front if not rather than letting shape_io fail
2011-02-28 17:44:56 +00:00
Dane Springmeyer
616aa2ed05
avoid keeping open shape_io shared_ptr when the shapefile does not have an index
2011-02-09 23:41:41 +00:00
Dane Springmeyer
c5833a6db8
remove unmaintained autotools scripts
2011-02-04 22:22:16 +00:00
Dane Springmeyer
4b076272fe
only warn about missing index file in debug mode
2011-01-31 23:43:50 +00:00
Dane Springmeyer
1dd2ef690d
handle colortable for paletted images in gdal plugin - closes #50
2011-01-27 03:11:22 +00:00
Dane Springmeyer
a2e933309a
demo of drawing a line as a second geometry within the feature
2011-01-25 02:07:36 +00:00
Dane Springmeyer
7de23d6c95
formatting code comments
2011-01-13 18:51:20 +00:00
Dane Springmeyer
65e96cf2b7
more cleanup after removal of unneeded cpp file 'shapefile.cpp'
2011-01-05 02:07:12 +00:00
Dane Springmeyer
6f0de6d76d
scons: remove reference to deleted cpp file
2011-01-05 01:25:31 +00:00
Dane Springmeyer
d257b4701c
remove uneeded cpp file
2011-01-04 22:35:06 +00:00
Dane Springmeyer
d1f56f5843
scons: fixup geos plugin install script
2010-12-21 21:41:02 +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
Dane Springmeyer
9700ad4fb2
avoid compiler warning by only adding 'get_overview_meta' in debug mode
2010-12-20 19:17:56 +00:00
Dane Springmeyer
a3be4f54ab
avoid trying to open index for non-indexed shapefile reads for every feature query - good speedup
2010-12-10 01:25:43 +00:00
Robert Coup
408de0c223
Add bbox parameter to GDAL Datasource to allow overriding envelope, with Python bindings. Fixes #680
2010-12-09 21:41:25 +00:00
Lucio Asnaghi
9b3ef53338
- improved error reporting in shape plugin
2010-11-29 09:15:43 +00:00
Dane Springmeyer
33f7966280
formatting
2010-11-24 17:29:11 +00:00
Lucio Asnaghi
1d7acffadb
+ improved and cleaned up occi plugin
2010-11-22 11:40:08 +00:00
Artem Pavlenko
6638423104
+ reset head
2010-11-22 11:25:27 +00:00
Dane Springmeyer
a95d6938ad
avoid compiler errors on os x
2010-11-19 23:03:35 +00:00
Lucio Asnaghi
a5f582f77e
+ shape plugin logging cosmetics
2010-11-18 23:46:01 +00:00
Lucio Asnaghi
2906ba8d0d
+ postgis logging cosmetics
2010-11-18 23:42:33 +00:00
Lucio Asnaghi
ce3e7e5eeb
+ sqlite logging cosmetics
2010-11-18 23:36:21 +00:00
Lucio Asnaghi
406b3b92fa
+ raster plugin logging cosmetics
2010-11-18 23:15:59 +00:00
Lucio Asnaghi
43bf9a4b67
+ place the generated geos plugin in the parent directory like the other plugins
2010-11-18 23:05:45 +00:00
Lucio Asnaghi
79d039721a
+ rasterlite logging cosmetics
2010-11-18 23:03:00 +00:00
Lucio Asnaghi
cda9089ddf
+ ogr logging cosmetics
2010-11-18 22:59:21 +00:00
Lucio Asnaghi
795384596d
+ kismet plugin cosmetics
2010-11-18 22:48:56 +00:00
Lucio Asnaghi
013d48f667
+ logging cosmetics
2010-11-18 22:17:09 +00:00
Lucio Asnaghi
bc43899990
+ use wkb feature of GEOS (avoid converting geometries manually): results are 3%-8% faster code.
...
+ avoid error when calculating the envelope of a point
+ clog debug cosmetics
2010-11-18 22:12:39 +00:00
Lucio Asnaghi
0ecd0676a5
+ occi: fix typo error when specifying metadata table query
...
+ occi: add the <srid> parameter, which when is set togheter with <geometry_field> allows to not query the metadata table at all (saving a huge amount of time when rendering lot of tiles!)
2010-11-18 14:24:19 +00:00
Lucio Asnaghi
91fb08fbff
+ parameter to specify the query columns use when getting back geaometries:
...
useful when you have big tables and you don't want to query long fields (long varchar2, blobs, anydata, clobs) which may cause slowdowns
2010-11-18 14:02:09 +00:00
Lucio Asnaghi
bb547f592b
+ improve occi plugin to determine automaticalle the geometry_field by querying the metadata table ( closes #276 )
...
+ changed the metadata table to use USER_SDO_* instead of ALL_SDO_* which can cause permission problems
2010-11-16 22:32:07 +00:00
Lucio Asnaghi
650986b279
+ improved occi plugin
...
+ ability to import collections and multi-geometries correctly
+ added a parameter to control the usage of the connection pool
+ added more verbosity in debug mode, to report wrong enums
2010-11-16 17:31:13 +00:00
Lucio Asnaghi
03ce43f805
+ make a proper bind (no ogr calls outside)
...
+ implement dane suggestion about using string for json datasource
+ small cosmetics
2010-11-16 17:14:22 +00:00
Lucio Asnaghi
31d170c8a6
+ fixed a compiler warning
2010-11-16 17:12:28 +00:00
Lucio Asnaghi
cfb1d5a23e
+ fixed a problem in occi plugin when determining the table_name
2010-11-15 18:09:29 +00:00
Lucio Asnaghi
4b81b977b4
+ sqlite datasource query fix when using select sub-queries
2010-11-15 11:06:21 +00:00
Lucio Asnaghi
ac801219ba
+ occi: forgot a namespace
2010-11-15 09:30:06 +00:00
Lucio Asnaghi
e0363a6bbe
+ occi plugin: fix table_from_sql namespace
...
+ occi plugin: space cosmetics
2010-11-15 09:25:06 +00:00
Dane Springmeyer
6cda2b7d96
avoid compiler error
2010-11-15 03:17:38 +00:00
Dane Springmeyer
826282a47f
check for the existance of a shape index before trying to open it
2010-11-15 03:16:23 +00:00
Lucio Asnaghi
128a7ddc5b
+ aligned postgis to use the new box2d::from_string
...
+ added some new parameters toallow setting "gid" (geometry id), "field_data" (additional text data with the geometry), "field_name" (name of the additional text data field)
+ added proper usage of extent and coord2d selections in spatial queries
+ cosmetics
2010-11-14 15:02:01 +00:00
Lucio Asnaghi
4d04901c0b
+ cosmetics
2010-11-14 14:58:29 +00:00
Lucio Asnaghi
cffa0a07d6
+ aligned postgis to use the new box2d::from_string
...
+ thrash usage of static string for datasource name
2010-11-14 14:56:35 +00:00
Lucio Asnaghi
0d895b1e59
+ avoid usage of static string where it's not needed
2010-11-14 14:55:21 +00:00
Lucio Asnaghi
68cbb51814
+ fixed a problem in getting GetColorEntry in RGB datasets
...
+ cosmetics
2010-11-14 14:54:28 +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
dfdfe15853
+ avoid usage of static string where it's not needed
2010-11-14 14:49:42 +00:00
Lucio Asnaghi
fc5f234567
+ thrashed unused static string
2010-11-14 14:48:48 +00:00
Lucio Asnaghi
b7414ee1f9
+ aligned kismet to use the new box2d::from_string
2010-11-14 14:46:44 +00:00
Lucio Asnaghi
ddb6cfdcba
+ aligned occi to use the new box2d::from_string
2010-11-14 14:43:49 +00:00
Lucio Asnaghi
f24d329cac
- cosmetics
2010-11-14 14:41:49 +00:00
Dane Springmeyer
f9d229c7dc
postgis: also split extent string on spaces
2010-11-14 08:34:33 +00:00
Dane Springmeyer
592765d39c
osm plugin: make sure to read in data from new file - closes #542
2010-11-13 21:43:38 +00:00
Lucio Asnaghi
2241f9adea
cosmetics
2010-11-13 20:21:21 +00:00
Lucio Asnaghi
9e0c5b0769
cosmetics
2010-11-13 20:20:38 +00:00
Lucio Asnaghi
796740f56b
- killed a couple of debug statements in geos converter
2010-11-12 22:12:58 +00:00
Lucio Asnaghi
d24ed6cdf9
+ fix geos geometry converter bugs
2010-11-12 22:11:13 +00:00
Lucio Asnaghi
bed8bcf84f
- improved geos plugin. first results available
2010-11-12 21:18:53 +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
Dane Springmeyer
385ad05205
create an sql_utils header for all sql-based plugins to be able to leverage, and move the postgis table_from_sql function into it
2010-11-11 16:33:30 +00:00
Lucio Asnaghi
4ce78f4a3f
- fix in build system to allow GEOS to compile properly
2010-11-10 11:48:55 +00:00
Lucio Asnaghi
0066407774
- added extent support for geos plugin
...
- fixed python binding for geos plugin
2010-11-10 11:35:19 +00:00
Lucio Asnaghi
48d31542f9
- added missing GEOS conversion functions
2010-11-10 11:08:29 +00:00
Lucio Asnaghi
f1b8ad4ee7
Initial check in of a GEOS input plugin: This allows constructing
...
geometries directly inside a XML file by specifying a WKT text.
Useful a lot for building legend images for layers or drawing fixed
geometries in the map. An update of the main SConstruct and python
bindings for this will follow. Be careful with this, as it's mainly
alpha code.
2010-11-10 10:46:09 +00:00
Dane Springmeyer
37a300d9fa
allow occi plugin to compile against > 10g
2010-11-08 21:14:48 +00:00
Dane Springmeyer
69ade9ab35
fix compile error when building without memory mapped shapefiles - problem since r2194
2010-11-08 20:38:17 +00:00
Dane Springmeyer
688c950344
get the occi plugin compiling after the late binding patch
2010-11-05 17:37:48 +00:00
Dane Springmeyer
55131af834
fix typo
2010-11-05 17:02:21 +00:00
Dane Springmeyer
feb4d0cb8e
fixup more old references to previous geometry storage impl
2010-11-05 06:20:37 +00:00
Dane Springmeyer
209b0697dc
upgrade a hello world plugin and cairo renderer to fully use new geometry_type
2010-11-03 16:26:30 +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
Dane Springmeyer
ea39e6f69e
add a directory for plugin templates - and add a first "hello world" with basic docs"
2010-10-24 08:04:16 +00:00
Robert Coup
1dce437120
#622 add optional late-binding of datasources
2010-10-24 06:34:18 +00:00
Dane Springmeyer
4286e9f08b
shape: switch back to previous end of file method - closes #647
2010-10-14 19:47:54 +00:00
Dane Springmeyer
f7346b0e72
make sure to seek to the beginning of shapefile when querying points and using indexes - thanks tmcw for uncovering - closes #643
2010-10-06 16:16:58 +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
8e708a8160
gdal: protect from passing wrong number of bands to gdal
2010-09-19 17:52:17 +00:00
Dane Springmeyer
00f473de63
gdal plugin: calculate constant raster properties used in featureset up front at datasource creation (no real speed boost but less repeated code)
2010-09-18 19:19:27 +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
1aa05e052d
shape: throw an error if an attribute name is requested that does not exist and report out which attribute names are available - closes #604
2010-09-14 17:59:50 +00:00
Dane Springmeyer
fbd0e4954c
remove duplicate locks - handled in pool.hpp already (mapnik held up fine this way in the wms benchmarks)
2010-09-14 17:08:18 +00:00
Dane Springmeyer
73fe7fda4a
use boost::iostreams::stream_offset for dbf offset and record_length_ to work around >2 GB issue with filtering features - closes #595 (TODO - look into offset issues in shape indexes - #603 )
2010-09-14 16:21:25 +00:00
Dane Springmeyer
d84ac3ad5b
better error message if shapefile index cannot be read
2010-09-14 15:43:38 +00:00
Dane Springmeyer
4c07bc8447
avoid compiler warning in indexed shape reader
2010-09-14 15:43:02 +00:00
Artem Pavlenko
ad03de5895
+ better .index handling (TODO!)
2010-09-06 19:20:59 +00:00
Dane Springmeyer
89acd2e6e0
pass iterators as const to qi::phrase_parse allowing compile on linux g++ (rhel)
2010-09-06 18:37:02 +00:00
Artem Pavlenko
23ea9e0004
add coomment
2010-09-02 20:21:00 +00:00
Artem Pavlenko
65eba5f894
use boost::spirit to parse int and double from dbf
2010-09-02 20:20:51 +00:00
Artem Pavlenko
7776b8f4ae
+ make shape_io object a shape datasource member and re-use memmapped files
...
(todo : only implemented for indexed shape files atm)
2010-09-02 20:20:42 +00:00
Dane Springmeyer
1cd1593513
fix spelling error in 'initial_size' and ditch lowercasing method which will not work unless applied before the query object is created
2010-08-28 03:09:49 +00:00
Dane Springmeyer
1d7afcec89
make sure the user does not request a layer by index greater than exists in the dataset
2010-08-20 21:59:48 +00:00
Dane Springmeyer
2de597d961
tweak to error formatting of layers available in ogr dataset
2010-08-20 21:24:58 +00:00
Dane Springmeyer
930b2cc7b6
better handling and error reporting around ogr layer names and indexes, renamed ogr plugins index file to 'ogrindex' to avoid collision with shape plugins index (when using common shapefile between each as the indexes appear incompatible)
2010-08-20 21:20:55 +00:00
Dane Springmeyer
c7f136db91
avoid segfault if geometry is so invalid that no reference is returned and we cannot check if it is empty - closes #574
2010-08-20 21:14:14 +00:00
Dane Springmeyer
50147ab509
warn if no index is found for shapefiles - TODO - add an env setting to turn off warnings
2010-08-18 21:02:54 +00:00
Dane Springmeyer
5b50b59fe8
add the ability to control usage of ST_ prefix on AsBinary (as there may be performance impl), force lowercasing attribute names, and toggle forcing 2d geometries
2010-08-18 21:00:09 +00:00
Dane Springmeyer
680760005d
+ formatting
2010-08-18 20:42:00 +00:00
Dane Springmeyer
6cce96dd06
upgrade default projection of epsg:4326 to match exactly what proj4 stores in /usr/local/share/epsg for 4326 (aka WGS84)
2010-08-10 18:18:31 +00:00
Artem Pavlenko
d6acd74ec3
+ don't create stack variable for reclen
2010-07-25 20:12:43 +00:00
Artem Pavlenko
7bef66b448
+ correct null shapes processing
...
(no bounding box, no geometric data)
+ untabify and re-format
2010-07-25 19:55:47 +00:00
Artem Pavlenko
5fd6db7b0f
+ formatting ..
2010-07-25 19:55:40 +00:00
Artem Pavlenko
964f17bc31
+ don't read bounding box for null shapes
2010-07-25 19:55:32 +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
75060190c0
scons: only apply SHAPE_MEMORY_MAPPED_FILE to shapefile driver code
2010-07-14 22:40:10 +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
Artem Pavlenko
4baccf2ee3
+ corrected mistype
2010-07-02 11:52:11 +00:00
Artem Pavlenko
aa0e17afd1
+ check cached connection status before returning.
...
if PQstatus(conn) == CONNECTION_BAD attempt to
create a new one
+ expose "conect_timeout" PG connection parameter
default to 4 sec
+ throw mapnik::datasource exception if connection
is 'bad' in mapnik::features(..)
2010-07-02 11:42:35 +00:00
Artem Pavlenko
9b3809443c
+ fix naming style in mapnik::Map
2010-06-25 15:23:35 +00:00
Artem Pavlenko
2fbc476d19
+ formatting
2010-06-25 15:23:09 +00:00
Dane Springmeyer
4707e1a6f3
+add support for better resampling when using bilinear scaling with gdal plugin (with or without overviews)
2010-06-20 04:06:23 +00:00
Dane Springmeyer
a6da1d95ba
tidy
2010-06-19 15:19:08 +00:00
Dane Springmeyer
7e2a2aab5a
+ability to choose ogr layer by index number
2010-06-19 15:13:47 +00:00
Artem Pavlenko
e7d9db9735
+ remove forward decl of transcoder (using mapnik::transcoder) is
...
sufficient
2010-06-18 15:38:44 +00:00
Artem Pavlenko
b0b6daa6cb
+ fixed: append to the libraries
2010-06-18 15:38:37 +00:00
Lucio Asnaghi
d4a334341e
- fixed OGR input plugin problem when using boost mapped_file (needs linkage to libboost_iostreams.so)
...
- cosmetics
2010-06-17 10:38:23 +00:00
Dane Springmeyer
682f7ef9de
move to full usage of ST_* prefix for postgis functions, which allows support for ST_AsBinary that works with the new postgis 1.5 geography type. NOTE: this drops support for <= postgis 1.2
2010-06-05 23:50:41 +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
48d145d98c
+ TODO: implement colormap
2010-05-27 10:20:33 +00:00
Dane Springmeyer
53876d14a0
avoid potential zero division error (floating point exception)
2010-03-17 22:28:03 +00:00
Dane Springmeyer
b1070d22c8
postgis/oracle: use mapnik::boolean type for 'estimate_extent' rather than std::string, and strip double quotes as the estimated_extent function operates on single quotes - improves upon #393
2010-03-17 22:03:39 +00:00
Artem Pavlenko
f00dbb7496
+ link to mapnik2 lib
2010-03-17 22:01:34 +00:00
Artem Pavlenko
e7bfba10fe
+ enanble installation of mapnik2 side by side with mapnik
2010-03-17 21:03:02 +00:00
Artem Pavlenko
081545eb7e
+ remove unused *.hpp file
2010-03-17 13:55:27 +00:00
Alberto Valverde
c06b966eeb
adapting forward-port from 0.7.1 done in r1703 to trunk's Query interface which returns a (resx,resy) tuple
2010-03-17 10:47:11 +00:00
Marcin Rudowski
d9d5521a81
avoid introducing subpixel shift when upscaling using gdal
2010-03-17 08:34:43 +00:00
Alberto Valverde
6476c3b850
fixed construction of extimated_extent query since it expects the names of the schema, table and geometry_column single-quoted
2010-03-16 18:42:05 +00:00
Artem Pavlenko
bce0dab02a
+ lets postgis return geometry in native byte order
...
(wkb reader can handle both 'NDR' and 'XDR')
2010-03-08 11:55:24 +00:00
Marcin Rudowski
f4f329d3c2
eliminate compiler warnings as in r1659
2010-03-06 09:25:31 +00:00
Dane Springmeyer
b540dab73b
apply slighly modified (env->box2d) mapnik-trunk.mr.raster-position2.diff from mar_rud to close #475
2010-03-03 03:23:53 +00:00
Dane Springmeyer
67a8f33da9
fix minor issues caught in debian packaging relating to executable status and spelling
2010-02-21 17:28:01 +00:00
Dane Springmeyer
07186fc6bb
ensure shapeindex links against boost system if available (boost >=1.35) to avoid potential problems in indirect linking on linux (essentially directly dynamically linking like we previously only did on os x) - closes #517
2010-02-21 01:00:09 +00:00
Dane Springmeyer
badbc8706f
apply modified patch from Mak Kolybabi fixing up postgres schema support in PostGIS plugin - closes #500 - extends #260
2010-02-19 21:04:45 +00:00
Artem Pavlenko
484f24d1b1
+ make logic a bit more verbose
2010-02-10 15:16:52 +00:00
Artem Pavlenko
f4e7a7931f
+ implement x/y resolution
2010-02-03 16:56:42 +00:00
Artem Pavlenko
c11e35fbc0
+ reduce threshold for 'tiled' policy to 512*512 pixels
...
+ reduce tile size to 256 px
+ TODO: expose the above as datasource parameters
2010-02-03 12:20:06 +00:00
Artem Pavlenko
22d8fbe7f0
+ consistent raster bbox calc :
...
x0 = int(minx+0.5)
y0 = int(miny+0.5)
x1 = int(maxx+0.5)
y1 = int(maxy+0.5)
width = x1 - x0
height = y1 - y0
2010-02-03 12:19:57 +00:00
Dane Springmeyer
6e9fa579fb
fix unused variable warning
2010-01-29 23:56:25 +00:00
Dane Springmeyer
8ac189ccf2
fix broken support for pointz as code assumed pointzm - closes #504
2010-01-29 01:59:50 +00:00
Dane Springmeyer
5f8d1713a8
formatting
2010-01-29 01:54:15 +00:00
Dane Springmeyer
ba187a4949
shape plugin: be more explicit about the shapefile name if the file is not found
2010-01-26 22:57:34 +00:00
Artem Pavlenko
f855ba7246
remove debug printing in shapefile driver
2010-01-20 15:26:22 +00:00
Artem Pavlenko
af2440b4e7
+ fixed 'optional' measure in multipointz
2010-01-20 15:26:14 +00:00
Artem Pavlenko
bff83c6ac0
+ read z and m bounds from the header
2010-01-20 15:26:06 +00:00
Artem Pavlenko
239c4045d2
+ implement missing support for :
...
multipoint
multipointm
multipointz
2010-01-20 15:25:58 +00:00
Artem Pavlenko
4732ace54b
+ ident fix
2010-01-20 15:25:50 +00:00
Dane Springmeyer
f87790cd5b
merge a few small 0.7 branch changes back into trunk
2010-01-11 00:36:51 +00:00
Artem Pavlenko
47dc1e197b
+ merge mapnik2 to trunk
2009-12-16 20:02:06 +00:00
Dane Springmeyer
f60fa76242
merge 0.7. branch changes back into trunk
2009-12-15 19:25:35 +00:00
Dane Springmeyer
5e2e6a76ad
apply fixes from David Eastcott originally applied to 0.7 branch
2009-12-13 23:30:36 +00:00
Dane Springmeyer
4dd6259903
add optional 'geometry_table' and 'extent_from_subquery' parameter and 'scale_denominator' substitution ability to PostGIS driver while enhancing error reporting - closes #260,#426,#456, updates CHANGELOG with other recent PostGIS enhancements and fixes
2009-12-11 01:50:55 +00:00
Dane Springmeyer
f543f56524
add missing include
2009-12-07 06:45:27 +00:00
Dane Springmeyer
a82a930a66
explode point geometries if multi* in ogr driver - workaround until we have actual fix for #458
2009-12-06 23:12:56 +00:00
Dane Springmeyer
c1ed612b2d
grok quoted table,schema, and geometry names by unquoting before attempting geometry columns lookup - thanks avar for the report - closes #393
2009-12-05 04:32:38 +00:00
Dane Springmeyer
3d3997f1b2
add proper namespacing - patch from River Tarnell
2009-12-03 17:20:02 +00:00
Dane Springmeyer
71f69feed4
add missing include
2009-11-29 22:16:32 +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
29afe237c8
add postgres int8 type to collected attributes - #384
2009-10-22 21:42:40 +00:00
Dane Springmeyer
5e16e04b28
gdal: ensure scaling is available within raster_symbolizer at necessary scales by avoiding pre-scaling in gdal RasterIO
2009-10-22 16:58:03 +00:00
Artem Pavlenko
2dcf88b392
+ wall-clock timer from auf
...
(see #439 for more details)
2009-10-20 20:32:53 +00:00
Dane Springmeyer
df7bad25f9
append the SHAPE_MEMORY_MAPPED_FILE compiler flag to CXXFLAGS rather than overwriting existing flags (which happens when using the keyword arg, ugh), closes #435 and #436 and fixes up original commit added in r1217
2009-10-14 23:31:18 +00:00
Dane Springmeyer
46dc2d1f99
formatting
2009-10-14 23:01:48 +00:00
Dane Springmeyer
a0411b8d4c
postgis: make sure to close the attribute collection resultset and print the type name of unknown oid attribute values when in debug
2009-10-14 17:42:27 +00:00
Dane Springmeyer
60ca6a5677
postgis: allow for altering the default behavior of keeping open postgresql connections until the whole process ends - when 'persist_connection' = false new connections will be opened and closed for each datasource instance. ( closes #434 )
2009-10-14 04:21:46 +00:00
Dane Springmeyer
eee88806b8
remove testing debug line
2009-10-12 05:27:16 +00:00
Dane Springmeyer
27fbc4549d
change the method for calculating offsets to pass to GDALRasterIO, as the 'start_x, start_y' implementation added in r1321 was leading to large shifts in 1-banded srtm data without overviews - this new approach works with and without overviews and also with 3 band rbg data. Also added more debug output.
2009-10-12 05:25:36 +00:00
Dane Springmeyer
6d3dcdeac6
add a bit more debug printing to gdal plugin and make raster width and height class attributes
2009-10-12 04:09:36 +00:00
Dane Springmeyer
56f0c33465
format raster plugin to only print output in debug mode
2009-10-12 03:58:11 +00:00
Dane Springmeyer
7785461d1f
remove testing debug line from gdal plugin
2009-10-11 16:12:36 +00:00
Dane Springmeyer
e6306010f8
when a SQL query sent to postgres fails, output the whole thing so users know what mapnik tried to send (as the PSQL error hint truncates the sql)
2009-10-02 05:16:15 +00:00
Dane Springmeyer
4367b813a8
cleanup up gdal featureset code, removing old or unneeded debug lines
2009-09-28 16:56:01 +00:00
Dane Springmeyer
c808cf62b9
add support for gdal overviews to the Gdal Plugin (use http://www.gdal.org/gdaladdo.html to build overviews) - modified patch from gdalcolors branch from Alberto Valverde (I removed dependence on color/masking code until that support lands in trunk) - addresses #54
2009-09-27 17:23:09 +00:00
Jon Burgess
6485039a0e
Fix numeric2string to output the correct number of digits following the decimal point. Hopefully this covers all the cases correctly.
2009-09-12 11:31:53 +00:00
Jon Burgess
e8cff82a53
Fix numeric2string() to insert the correct number of 0's when building the string. This problem was reported as: [Mapnik-users] unusual problem with Mapnik output.
2009-09-12 10:49:35 +00:00
Dane Springmeyer
9c3594fb30
postgis: add patch exposing srid parameter and when geometry_field also is provided avoid querying geometry_columns. Also fixed problem of missing srid in the bbox substitution. Thanks rcoup for revised patch - closes #376
2009-08-28 15:57:29 +00:00
Dane Springmeyer
c7f85e70f8
postgis: add a hint if the extent parsing fails
2009-08-27 21:24:00 +00:00
Dane Springmeyer
770d5a727d
shape plugin: only trim the '.shp' extension (restores behavior added in r1046 and later changed in r1170) - closes #413
2009-08-27 05:41:02 +00:00
Dane Springmeyer
9a0bb92acd
Improve handling of BBOX query substitution - closes #415
2009-08-27 03:54:52 +00:00
Dane Springmeyer
72f9c5badc
postgis: throw errors if sql queries fail - closes #363
2009-08-27 03:13:42 +00:00
Dane Springmeyer
434c303e83
postgis: add patch from migurski to allow for the passing of a 'bbox' token enabling optimized placement of the bbox/intersects query for complex subqueries- closes #415
2009-08-22 00:51:35 +00:00
Andreas Volz
213384c7e3
- return is enough if host isn't found. The exit is to much for this problem
...
- also return for other problems with the sockets. If not I get a hit from gdb while writing in a not existing socket...
2009-07-26 20:37:57 +00:00
Dane Springmeyer
d6cf82efb0
+support for BigInt(int8) datatype in postgres, closes #384
2009-07-17 04:30:11 +00:00
Artem Pavlenko
867799a88c
+ don't pass std::ios::modes to memory_mapped_file
2009-07-08 23:54:45 +00:00
Dane Springmeyer
eb6a0afffe
add std::ios::in mode for shape access on linux
2009-07-08 23:02:32 +00:00
Artem Pavlenko
5d193947ae
+ avoid implicit conversion by passing expected types to read_intxx_{ndr,xdr}
...
( msvc compiler generates an error otherwise )
2009-07-08 20:52:22 +00:00
Dane Springmeyer
6c846d77a6
add SCons flag for controlling compile-time use of SHAPE_MEMORY_MAPPED_FILE
2009-07-08 00:53:13 +00:00
Artem Pavlenko
ae96fffee0
+ use MAPNIK_BIG_ENDIAN
...
+ support for reading int16_t
+ allow compiling shape.input with or without memory mapped files support
( define SHAPE_MEMORY_MAPPED_FILE to enable)
2009-07-07 23:56:01 +00:00
Artem Pavlenko
d20a2de459
+ move byte order depended I/O to global.hpp
...
this should fix shape.input PPC issues
2009-07-03 13:29:50 +00:00
Artem Pavlenko
2389386c80
+ make shape_io noncopyable
2009-07-03 13:28:59 +00:00
Artem Pavlenko
ed07268576
+ more verbose output to stderr
2009-07-03 13:28:11 +00:00
Artem Pavlenko
597889261b
+ query WKB in platform native format
2009-06-29 14:31:39 +00:00
Artem Pavlenko
15569af061
+ specify a byte order to ST_AsBinary (patch from ssinger)
2009-06-29 14:21:56 +00:00
Artem Pavlenko
84fcabcec3
+ trim bpchar type
2009-06-25 19:59:33 +00:00
Andreas Volz
fd252e202e
update from autotools
2009-06-09 23:52:57 +00:00
Dane Springmeyer
9bcdda31d2
shape input: before boost 1_36 use convenience.hpp
2009-06-08 08:22:02 +00:00
Dane Springmeyer
bc463c2a75
use BOOST_BIG_ENDIAN instead of WORDS_BIGENDIAN
2009-06-08 07:08:30 +00:00
Dane Springmeyer
e61a8119da
shape input: use more flexible (boost::filesystem) method of stripping ext names
2009-06-08 07:07:10 +00:00
Lucio Asnaghi
3805ee0fab
+ added a "shared" parameter to select if you want to open the dataset in shared mode (causing problems when multiple accesses to the same file)
...
+ introduced some more code for supporting overviews (still commented out as default, need revision)
2009-05-15 10:31:49 +00:00
Dane Springmeyer
106a82cf40
remove unused boost filesystem header
2009-05-12 22:51:15 +00:00
Dane Springmeyer
31d6475655
allow compilation of ogrindex and ogr plugin on mac osx
2009-05-12 04:32:42 +00:00
Lucio Asnaghi
539f1bcf9b
+ added index facility by using a *.index file to OGR layers (10-15% faster than internal OGR spatial filter)
2009-05-11 22:06:48 +00:00
Dane Springmeyer
e4aab13cb7
kismet: avoid compiler errors due to unused variable
2009-05-08 23:38:42 +00:00
Lucio Asnaghi
1f39b05923
+ add GDALDereferenceDataset when used with GDALOpenShared (instead of freeing brutally the dataset)
2009-05-08 21:45:19 +00:00
Lucio Asnaghi
9de066e035
+ make use of GDALOpenShared instead of GDALOpen, which could be better performing when using multiple equal datasource reads (no need to open multiple datasources, and yes it is still thread safe)
2009-05-08 21:15:05 +00:00
Lucio Asnaghi
474dd54900
+ applying fix for ogr (springmeyer) as reported in #336 and #337
2009-05-08 21:12:53 +00:00
Dane Springmeyer
e71d90728d
+ improve error reporting of gdal plugin and avoid boost filesystem check - reverts r1044 and addresses #337
2009-05-08 18:23:58 +00:00
Dane Springmeyer
02cf20e8eb
allow kismet plugin to compile on os x
2009-05-01 02:16:58 +00:00
Lucio Asnaghi
eefd9f0350
+ added SConscript file for the kismet plugin so now should be compilable like any other plugin (should close #293 )
2009-04-28 20:20:41 +00:00
Lucio Asnaghi
979d1da49e
+ osm: surround printed output by #ifdef MAPNIK_DEBUG to eliminate unwanted console characters in release mode ( closes #282 )
2009-04-28 20:07:18 +00:00
Lucio Asnaghi
1fcabec480
+ occi: added row_limit parameter (like any other database input plugin)
...
+ occi: added row_prefetch parameter to control how many rows the driver has to prefetch (default to 100)
2009-04-28 14:06:35 +00:00
Artem Pavlenko
be1d437e8b
trim tokens when parsing extent
2009-04-27 18:39:33 +00:00
Artem Pavlenko
47c3bc515d
+ add 'tiled' policy to avoid loading very large rasters into memory
...
if (width*height > 1024*1024) : load raster in 1024x1024 chunks
else : use single_file_policy
TODO: Expose chunk size as raster_datasource parameter
2009-04-10 12:05:31 +00:00
Dane Springmeyer
544cbb249a
Apply patch from Marcin to handle smooth transitions between raster layers for both gdal and raster plugin - closed #295
2009-04-07 23:06:51 +00:00
Andreas Volz
49cef4cdca
wrong header names -> make dist failed
2009-04-05 07:49:23 +00:00
Dane Springmeyer
5380b52832
fix segfault in ogr plugin by skipping empty geoms - closes #292
2009-04-04 20:55:56 +00:00
Andreas Volz
42d659a19f
compile utils with autotools
2009-04-04 16:33:25 +00:00
Dane Springmeyer
3b26f6b01a
add docstring and factory method for osm plugin - closes #275
2009-04-01 00:43:08 +00:00
Lucio Asnaghi
8c775a6da3
+ added "encoding" datasource parameter to occi plugin
...
+ added factory methods with docstrings for occi plugin (closes #274 )
2009-03-31 07:53:29 +00:00
Dane Springmeyer
a9f353de05
improve up front error checking of shapefile existence with boost, and allow shapefile plugin to accept filename with or without '.shp' extension - closes #199 and #174
2009-03-30 23:51:58 +00:00
Dane Springmeyer
8f610a71d9
add boost filesystem checks (for filename existance) to gdal and raster plugins
2009-03-30 21:56:03 +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
Artem Pavlenko
e9a0f020b4
+ applied patch from numenor
2009-03-29 11:32:22 +00:00
Andreas Volz
5994b51620
changed logging
2009-03-27 21:38:10 +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
845441a1b8
support for different icon types (uncrypted, crypted, WEP)
2009-03-24 20:55:18 +00:00
Andreas Volz
b0069ca4c7
no longer conversation to mercator needed
2009-03-22 23:22:55 +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
Dane Springmeyer
383ef59289
scons: switch to using pg_config and gdal-config for checking and adding libs using reworked config parsing that also applies to xml2-config and freetype-config
2009-02-28 21:18:32 +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
4de010b840
- occi.input: improved determination of layer envelope by querying the spatial index metadata
...
- occi.input: added optional estimate_extent parameter (much like pgsql.input)
- occi.input: added prefetch of 100 rows in spatial queries (must be tunable)
- occi.input: commented a console debug clog output that was flooding my bash
2009-02-23 17:16:09 +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
Nick Whitelegg
1a7b0486b5
improved boundary behaviour (though still needs attention...) for easymapnik
2009-02-22 20:35:18 +00:00
Andreas Volz
01b6d77509
std::string
2009-02-18 22:50:12 +00:00
Andreas Volz
c64269e1e3
support for sqlite3 and ogr
2009-02-18 22:17:00 +00:00
Artem Pavlenko
f6356731e2
+ ident
2009-02-18 16:38:54 +00:00
Nick Whitelegg
95c6e8e9ec
easymapnik: SRTM only if command line option given
2009-02-16 23:54:07 +00:00
Nick Whitelegg
c6c1cc32d7
added initial version of easymapnik: command line tool for generating Mapnik maps from OSM XML data
2009-02-16 23:42:31 +00:00
Nick Whitelegg
4aba853d7a
OSM plugin: dataset_deliverer now re-fetches data if the URL has changed
2009-02-16 23:10:58 +00:00
Artem Pavlenko
f8fec4ab88
+ corrected SQL
2009-02-16 22:06:41 +00:00
Nick Whitelegg
e68d934eff
OSM plugin: Fixed warnings, added URL support with cURL, removed multiple parsing
2009-02-15 13:51:07 +00:00
Dane Springmeyer
ffd02e7c99
+ Add SCons build script for osm plugin
2009-02-10 20:25:33 +00:00
Dane Springmeyer
1ffdb95069
osm plugin: Fix up test xml samples
2009-02-10 20:24:27 +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
Artem Pavlenko
5a3ce5a7ca
+ occi-input-plugin-4.patch (kunitoki)
2009-02-07 11:38:09 +00:00
Dane Springmeyer
5b0c59428e
+ apply PostgisImprovements.diff (rcoup) for record_limit and cursur_size support ( #140 )
2009-02-05 17:41:44 +00:00
Dane Springmeyer
6503dcfc40
+ apply ogr_6th_revision.patch to allow unicode support
2009-02-05 17:32:03 +00:00
Artem Pavlenko
0fbfbd445a
+ ogr_5th_revision.patch (kunitoki rocks!)
2009-02-05 16:47:07 +00:00
Tom Hughes
fb98b98e64
Include boost/algorithm/string.hpp to get access to string algorithms.
2009-02-05 11:41:10 +00:00
Artem Pavlenko
425dea32a4
+ occi-input-plugin-3.patch (kunitoki)
2009-02-05 11:17:27 +00:00
Dane Springmeyer
1fb229d035
+ apply occi-input-plugin-2.patch (kunitoki) ( #212 )
2009-02-03 22:23:33 +00:00
Dane Springmeyer
54334dbbb5
+ scons: work towards more modular lists of which plugins to build, and switch new occi plugin lib names - revised commit based on #213
2009-02-03 21:14:45 +00:00
Artem Pavlenko
60a956f260
+ allow multi-line SQL queries in table parameter ( #173 )
2009-02-03 20:09:26 +00:00
Artem Pavlenko
868d43408b
+ ogr.patch (kunitoki)
2009-02-03 18:30:06 +00:00
Dane Springmeyer
fbe4c41700
+ apply patch for Oracle 10g support from kunitoki - see #212
2009-02-03 17:06:23 +00:00
Dane Springmeyer
4085e1cb16
third ogr patch from kunitoki! (fixes labels and implements feature_at_point)(ogr_4th_revision.patch)
2009-01-29 16:20:30 +00:00
Dane Springmeyer
e9799003e5
+ third revision of patch for ogr plugin with better handling of wkb and multigeometries (kunitoki)
2009-01-29 04:20:34 +00:00
Dane Springmeyer
f414843c4f
+ First implementation of OGR(vector) input plugin. Patch from kunitoki. Thanks! Closes #170
2009-01-28 20:16:31 +00:00
Artem Pavlenko
48a13f8cbc
appled boost_append_osx_patch_v3 from jbronn
2008-12-04 23:20:44 +00:00
Artem Pavlenko
c4b003f568
+ applied postgis_schema patch from dodobas
2008-11-21 13:21:41 +00:00
Artem Pavlenko
f1c1e475d7
+ applied patch from rcoup to allow specify geometry column.
...
(TODO: update load_map to handle geometry_field)
2008-11-19 21:26:20 +00:00
Artem Pavlenko
e28328ba13
+ applied patch to loosen the type checking when reading float strings from a dbf file (jonb)
2008-11-16 22:13:40 +00:00
Artem Pavlenko
df8cfcab03
+ fixed building with boost-1_36
...
+ corrected order of BOOST_TOOLKIT
(create symlinks on OSX + boost-1_35)
2008-10-08 06:30:38 +00:00
Andreas Volz
bd2b9e2ea0
- add new files
...
- optional check for gdal
2008-08-02 20:39:26 +00:00
Tom Hughes
76aaf53b87
Removed forward declaration of mapnik::transcoder as we have already
...
included the definition and the duplicate causes a compiler warning.
2008-07-29 18:06:01 +00:00
Tom Hughes
beaa2c33de
Add parentheses to avoid compiler warnings.
2008-07-25 00:09:26 +00:00
Artem Pavlenko
fe31150a7b
corrected boost libs names logic
2008-06-29 11:40:35 +00:00
Artem Pavlenko
3f9127b5d0
reverting back to 700
2008-06-29 10:58:29 +00:00
Artem Pavlenko
3275cf9ce6
applied font fallbacj patch from Beau Gunderson
2008-06-29 10:40:08 +00:00
Andreas Volz
691d3788f5
improved gdal and postgresql detection
2008-06-10 21:13:50 +00:00
Andreas Volz
e29743d933
- updated autotools build files
...
- build now osm plugin automatic if libxml2 is used
- moved osm/Makefile to osm/Makefile.example because if name collision
-> better move the example to another directory later
- optional CAIRO support
- changed libxml2 switch comment
2008-04-06 18:13:13 +00:00
Nick Whitelegg
49208998c6
now distinguishes between lines and polygons for ways
2008-04-02 21:40:28 +00:00
Dominic Hargreaves
c436461ee8
Fix build with GCC 4.3 ( fixes #76 )
2008-03-24 14:03:05 +00:00
Nick Whitelegg
0dafa5eae3
Fixed for unicode change post 0.5
2008-03-06 21:04:47 +00:00
Nick Whitelegg
b117de1bdb
Now using libxml2
2008-03-02 13:23:50 +00:00
Nick Whitelegg
415c8a6c92
mapnik osm plugin initial commit
2008-03-01 11:49:37 +00:00
Tom Hughes
37eeb870cc
Add support for boolean values in filters, and reading of boolean
...
values from PostGIS data sources.
2008-02-27 18:50:59 +00:00
Tom Hughes
13d32335e0
Check for null values in the PostGIS results and don't add attributes
...
with null values to the feature rather than adding a value based on
decoding a buffer full of undefined data.
2008-02-23 01:25:52 +00:00
Artem Pavlenko
308e315432
added Unicode support based on ICU
2008-02-18 21:40:34 +00:00
Andreas Volz
ba5c156c45
fixed autotools build
2008-02-08 19:41:57 +00:00
Artem Pavlenko
b44762e592
allow multi/single threaded variants
2008-02-04 16:12:13 +00:00
Artem Pavlenko
eaf198f79c
small cleanup
2008-02-04 11:14:34 +00:00
Artem Pavlenko
a8859645b3
use memory mapped files for reading shape files
2008-02-04 11:12:32 +00:00
Artem Pavlenko
c63c2efe42
support for user defined 'extent' parameter (for example : -180,-90,180,90)
2008-01-29 16:59:51 +00:00
Artem Pavlenko
e268660ecc
implmented support for pg numeric type - converted to double at the moment.
2008-01-25 11:39:53 +00:00
Artem Pavlenko
66bc84ff7e
check for empty strings in params
2008-01-24 12:07:53 +00:00
Artem Pavlenko
4529e83562
fixed parameters order in image reader
2008-01-07 10:20:05 +00:00
Artem Pavlenko
37f49e29cc
Applied patches from Martijn van Oosterhout:
...
1. The first allows the user to add a <FileSource
name="foo">/home/bar/baz/</FileSource> to the beginning of the file
and then in any of the symbolisers you can say:
<FooSymboliser base="foo" name="bridge">
It it will refer to the file /home/bar/baz/bridge.
2. The second allows you to create Datasource templates at the top
level, which can be used later in the actual layers like so:
<Map>
<Datasource name="db">
<Paramaeter name="host">/tmp</Parameter>
</Datasource>
<Layer name="lay">
<Datasource base="db">
<Parameter name="table">points</Parameter>
</Datasource>
</Layer>
</Map>
And the host parameter will be used in the layer.
3. The third adds the "base" parameter to the raster and shape input
plugins. All it does is specify a path to prefix to the filename prior
to using it. Together with the above feature it allows things like:
<Map>
<Datasource name="shapes">
<Paramaeter name="base">/home/foo/shapes</Parameter>
</Datasource>
<Layer name="lay">
<Datasource base="shapes">
<Parameter name="file">places</Parameter>
</Datasource>
</Layer>
</Map>
And it will use the shapefile /home/foo/shapes/places
2007-12-17 14:21:04 +00:00
Artem Pavlenko
58f4431df1
support for palette based PNGs, user 'png256' as a format parameter (see updated rundemo.py)
2007-12-10 19:59:17 +00:00
Artem Pavlenko
17e2b12390
1. things to keep win32 built happier
...
2. print color table in gdal.input if present (-DMAPNIK_DEBUG)
2007-11-08 21:15:45 +00:00
Artem Pavlenko
8d51cb421b
1. re-factored placement_finder to be more efficient. 'find_*' methods are templated on PathType.
...
2. PostGIS plug-in - optional 'multiple_geometries' parameter to control how Multi* geometries built.
3. MarkersSymbolizer (work in progress) to render vector shapes (markers) alonh a path with collision detection.
2007-11-02 12:50:15 +00:00
David
b2df387a9d
- merged strict-xml-branch r530:532 to trunk:
...
- libxml2 support
- strict error handling while parsing XML map files
- implemented save_map()
- removed some duplicate defaults
- all symbolizers with icons share a common base class now
2007-09-25 18:47:12 +00:00
Artem Pavlenko
066c8dfa1a
Fixed envelope() method to return borrowed connection
...
NOTE : Always wrap connection into PoolGuard !!!
PoolGuard<shared_ptr<Connection>,shared_ptr<Pool<Connection,ConnectionCreator> > > guard(conn,pool);
2007-09-18 14:00:27 +00:00
Andreas Volz
670862879b
build plugins without .so extension
2007-09-17 20:16:43 +00:00
Artem Pavlenko
8e071f84c7
1. Changed internal geometry representation (explicit support for multi geometries)
...
(FIXME : label_spacing is still, too slow!!)
2. Re-use some agg objects.
3. placement_finder cleanups!
4. Added support for 'building_symbolizer' - extruded polygons
2007-09-16 11:23:51 +00:00
Andreas Volz
d38dedad68
+ added GNU autotools build environment
...
+ raster and gdal input isn't tested. Not working currently...
+ *-input.so plugins created. Change loader in source or link plugin to correct place
+ use pkg-config uninstalled feature
-> define project root to PKG_CONFIG_PATH to use mapnik without installation
+ added various library checks
+ don't install fonts
+ don't use included AGG
-> check for a installed libagg
+ Added Makefile for c++ demo
+ don't build any python wrapper stuff
-> this follows if all other building works
+ added Anjuta file
-> not needed to build anything, but helps much if you use Anjuta
2007-09-14 23:07:16 +00:00
Artem Pavlenko
92b22558fd
use 'limit 0' when gathering metadata, also we don't need getFieldSize at all
2007-09-07 15:50:40 +00:00
Artem Pavlenko
ef6f1060d3
link to fribidi on Darwin
2007-09-07 15:46:51 +00:00
Artem Pavlenko
76572994b5
Applied mapnik-r511.patch from David Siegel:
...
plugins/input/postgis/SConscript:
- added boost_thread-mt to darwin builds
demo/c++/rundemo.cpp:
- setBackground() is now set_background()
bindings/python/SConscript:
- added boost_thread-mt to darwin builds
- changed builder to LoadableModule which builds a so called "bundle"
on darwin and a shared library on all other systems.
- LDMODULEPREFIX = ''
SConstruct:
- freetype-config is now searched in the path.
2007-08-28 10:12:38 +00:00
Artem Pavlenko
d959701d5a
1. added boost::optional<T> to/form Python converter
...
2. make background color optional (Map object)
3. exposed 'blend' method for Image object
2007-08-01 09:59:23 +00:00
Artem Pavlenko
8010d5433f
1. Removed srid from geometry class
...
2. Pass resolution to bbox query
3. Use variant<int,double,string> as parameter value e.g in Python:
ds = Raster(file="/path/to/file",lox = 12312.4,.....)
Added extractor facility to work with mapnik::parameter (C++):
mapnik::parameters params;
params["parameter0"] = 123.456;
params["parameter1"] = "123.456"; // initialize with string extract double later
boost::optional<double> val0 = params.get<double>("parameter0");
if (val0)
{
std::cout << *val0;
}
// with default value. NOTE: there is no 'parameter2' in params
boost::optional<double> val2 = params.get<double>("parameter2",654.321);
std::cout << * val2;
//
4. Added Gdal factory method in __init__.py
ds = Gdal(file="/tmp/file.tiff")
2007-06-12 08:59:54 +00:00
Artem Pavlenko
8880e5ff5f
Restored collecting attributes descriptors
2007-06-05 09:09:04 +00:00
Artem Pavlenko
a6a31f42f6
implelmented optional 'clear' text labels cache at the layer level
2007-05-01 07:53:20 +00:00
Artem Pavlenko
46902bf488
increment feature id
2007-04-30 20:08:49 +00:00
Artem Pavlenko
f9d28e56fa
Added gdal raster input plug-in
2007-04-25 19:15:38 +00:00
Artem Pavlenko
5b91f9a9c5
small correction
2007-04-25 11:26:48 +00:00
Artem Pavlenko
6dc3015ea5
Allow omitting username and dbname in connection string.
2007-04-01 08:29:14 +00:00
Artem Pavlenko
e0d243dcec
1.Added support for building on Darwin (Xcode 2.4.1, gcc4.0.1).
...
Mainly taming gcc4.0.1 (anonymous enum bug)
2.Input plug-ins now have .input extension on all platforms
2007-03-16 10:11:37 +00:00
Artem Pavlenko
6ed05bcf42
and another one :)
2007-03-08 18:19:42 +00:00
Artem Pavlenko
d10a7eeb24
reverting change #457 : we still must read four bytes !
2007-03-08 17:35:01 +00:00
Jean-Francois Doyon
76a820beeb
- Move a variable declaration used only for debugging, to avoid compiler warning.
2007-03-05 01:28:49 +00:00
Artem Pavlenko
0196cb3334
corrected members init order
2007-02-15 17:25:37 +00:00
Artem Pavlenko
73bd1ab83e
fixed missing 'encoding' parameter:
...
>>> from mapnik import *
>>> ds = Shapefile(file='./demo/data/boundaries',encoding='latin1')
>>> pt = ds.envelope().center()
>>> print ds.describe()
>>> for f in ds.features_at_point(pt):
>>> print f.properties['NOM_FR'].unicode()
>>> print f.properties['NOM_FR'].__str__()
2007-02-14 21:55:04 +00:00
Artem Pavlenko
2d256166b4
Store text attributes as USC-2 encoded std::wstring
2007-02-14 19:54:39 +00:00
Artem Pavlenko
1b84f2d454
host = '' , host = None and ommiting host all default to unix-domain socket in /tmp
2007-02-06 15:29:04 +00:00
Artem Pavlenko
e016bd61f8
Added transcoder based on iconv. Internally we use UCS-2 at the moment.
...
* Postgis plug-in determines encoding by querying 'client_encoding' parameter (libpq).
* Shapfiles (dbf!) don't store character encoding information. Users can apply 'encoding' parameter at datasource creation stage (defaults to Latin1 (ISO-8859-1))
* Raster plug-in utf-8
2007-02-06 14:27:21 +00:00
Artem Pavlenko
59f940b090
append namespace to 'transform' to support buiding with STLport.
2007-01-29 12:50:26 +00:00
Artem Pavlenko
c08a4eb221
corrected cut&paste error
2007-01-17 20:05:23 +00:00
Artem Pavlenko
ed5bbe25fe
improved win32 support from Valery Moiseev.
2007-01-17 11:43:11 +00:00
Artem Pavlenko
5549045aaa
use all parameters to calculate connection id
2007-01-16 15:22:49 +00:00
Artem Pavlenko
6aa5401151
Added connect_timeout parameter to postgis connection (set to 4 sec).
2006-12-22 11:57:02 +00:00
Artem Pavlenko
31442b6bac
Added DESTDIR option which is used as an additional prefix for the purposes of
...
installing files. It is useful for binary distributions (eg
RPM etc). Thanks to Dominic Hargreaves!
2006-12-17 12:05:47 +00:00
Artem Pavlenko
f4786fe76a
features at point impl
2006-12-01 11:45:08 +00:00
Artem Pavlenko
c6ee7ce438
trim strings at data source level
2006-12-01 10:37:15 +00:00
Artem Pavlenko
7534217a8f
1.added missing float4 (pg_type OID 700)
...
2.removed printing "..unknown type_oid .."
2006-12-01 09:42:04 +00:00
Artem Pavlenko
4d4e9f5d91
Tiling patch from Toby allows for a selected pixel region within an extent
...
to be rendered. This allows for a large extent (larger than can be
rendered into a single image in memory) to be rendered out as tiles.
Since the full extent is used for the placement calculations text
crossing tile boundaries will be consistent.
This method is a little inefficient when a large number of labels need
placed, an improved method would be to cache these placements between
tiles, but the attached is a start.
c++ users should simple call the render method with a start X and Y
coordinate specified,
for (int TileX = 0;TileX < 5;++TileX)
{
for(int TileY = 0;TileY < 5; ++TileY)
{
int TileSize=250;
int StartX = TileX*TileSize;
int StartY = TileY*TileSize;
Image32 buf(TileSize,TileSize);
agg_renderer<Image32> ren(m,buf,StartX,StartY);
ren.apply();
char name[324];
sprintf(name,"tile_%d_%d.png",TileX,TileY);
ImageUtils::save_to_file(name,"png",buf);
}
}
python users should call render_tile_to_file
for y in range(tile_count_y):
for x in range(tile_count_x):
if not os.path.exists("tiles/%d/%d/" % (map_scale, y)):
os.makedirs("tiles/%d/%d/" % (map_scale, y))
render_tile_to_file(m, x*tile_size, y*tile_size, tile_size, tile_size,
'tiles/%d/%d/%d.png' % (map_scale,y,x), 'png')
2006-12-01 09:37:37 +00:00
Artem Pavlenko
b3b6bbe221
don't calculate extent by default
2006-11-29 12:12:23 +00:00
Artem Pavlenko
eeaf75b459
do not assert on empty dbf files
2006-11-28 22:25:31 +00:00
Artem Pavlenko
943ddf9943
added initial_size ans max_size parameters for setting up db connection pool
...
(default to 1 and 10 respectively)
2006-11-28 00:16:13 +00:00
Artem Pavlenko
f4502df850
1. register singleton destruction with std::atexit
...
2. allow connection pool to grow (up to max)
2006-11-27 21:13:15 +00:00
Artem Pavlenko
f1393cc019
1. hit_test implementation for geometry objects:
...
bool hit_test(double x, double y, double tol);
2. added image_view(unsigned x, unsigned y, unsigned width, unsigned height)
allowing to select region from image data e.g (in Python):
im = Image(2048,2048)
view = im.view(0,0,256,256)
save_to_file(filename,type, view)
3. changed envelope method to return vy value in datasource classes
4. features_at_point impl for shape and postgis plug-ins
2006-11-25 11:02:59 +00:00
Artem Pavlenko
ebdd0f6030
disable clog printing in release mode. Pass -DMAPNIK_DEBUG to enable.
2006-11-19 17:13:33 +00:00
Artem Pavlenko
6c04c5f745
added port parameter support
2006-11-17 21:10:28 +00:00
Artem Pavlenko
e924b597f4
1. patch from Toby that allows repeated labels to be placed on a line
...
geometry (such as roads)
2. restored text labels for point geometry.
3. process 'spacing' attribute in load_map.cpp
2006-11-01 23:17:05 +00:00
Artem Pavlenko
7cae55f73f
* trim leading and trailing whitespace from all strings before
...
rendering them as labels when using the text or shield symbolisers
(blame my horrible datasets)
* correctly recognise the Postgis "text" data type (it was in
postgisfs.cpp just not postgis.cpp) - my initial workaround to the
above was "SELECT trim(from label) AS label ..." which failed
miserably because it returned a text data type.
Thanks to Robert Coup for the patch!
2006-10-19 09:24:26 +00:00
Artem Pavlenko
58f672fc83
treat oid=25 (TEXT) types as string
2006-10-17 21:36:11 +00:00
Artem Pavlenko
c195e1d24d
added yet to be implemented features_at_point
2006-10-16 21:30:58 +00:00
Artem Pavlenko
459f43b39c
1. use more precise coord values in SQL statements.
...
2. added extra parameter 'estimate_extent'. By default, exact extent will be calulated e.g :
select extent(geom) from table_name;
Sometimes it is more practical (faster!) to use estimated extent
select estimated_extent('table_name','geom');
but it is somewhere around 95% accurate.
Usage:
....
params["estimate_extent"]="true";
....
2006-10-09 20:57:04 +00:00
vspader
4b9222f053
Bugfix for PostGIS plugin.
2006-10-09 20:09:46 +00:00
Artem Pavlenko
18ef498140
don't rely on feature id column name.
2006-10-09 09:45:45 +00:00
Artem Pavlenko
d2838011d9
Use <mapnik/*.hpp> includes. Thanks to Vince Spader from 10east.com
2006-10-05 09:00:36 +00:00
Artem Pavlenko
992af4747d
1. move include to mapnik/include
...
2. update demos,bibdibgs etc.
2006-10-04 11:22:18 +00:00
Artem Pavlenko
2f360a6549
1.removed map width/height from query interface
...
2.small cleanups
2006-09-12 14:29:22 +00:00
Artem Pavlenko
31d04c3131
added support for building on x86_64 platform e.g. /usr/lib64 etc.
2006-09-06 09:14:41 +00:00
Artem Pavlenko
26a406706e
wrap C headers with :
...
extern "C"
{
//
}
2006-08-31 21:32:07 +00:00
Artem Pavlenko
d11153ccf8
use fully qualified names
2006-07-24 20:06:09 +00:00
Artem Pavlenko
d0ddc88253
1. move parameters to datasource
...
2. general cleanup
2006-05-23 16:52:10 +00:00
Artem Pavlenko
bf218a46b9
oops! added missing bits
2006-05-19 12:50:40 +00:00
Artem Pavlenko
46fea7cee2
use boost::lexical_cast for conversions
...
( thanks to John Leslie <jleslie@placebase.com> )
2006-05-19 12:26:23 +00:00
Artem Pavlenko
61fd258fd1
changing licence from GPL to LGPL
2006-03-31 10:32:02 +00:00
Artem Pavlenko
f97b552eda
changed from gid to ogc_fid (is it standard?)
2006-03-31 08:54:20 +00:00
Artem Pavlenko
0e53e23ec1
fixed pointz/pointm reading
2006-03-28 10:09:24 +00:00
Artem Pavlenko
d35e9f047e
small cleanup
2006-03-23 21:45:32 +00:00
Artem Pavlenko
ac2a286cde
added __declspec(dllexport) + general cleanup
2006-03-22 15:55:58 +00:00
Artem Pavlenko
fab04e1626
removed verbose output
2006-03-22 14:57:50 +00:00
Artem Pavlenko
fbbf75f032
added explicit flags ios::in|ios::binary for win32 compat
2006-03-22 14:52:32 +00:00
Artem Pavlenko
673bd4bc19
replaced cout and cerr with clog (by default redirected to cerr)
2006-03-19 21:53:47 +00:00
Artem Pavlenko
ce93c69fa3
minor syntax corrections to comply with ansi c++
2006-03-08 23:02:28 +00:00
Artem Pavlenko
aed5516197
1. new feature model - based on boost::property_map concept
...
f = feature(id);
f["name"] = "what is my name?";
boost.put(f,"area",123123.4325);
2. simplified and corrected value class and operators
3. updated input plug-ins to work with new features
4. add text_symbolizer (getting there:)
5. template version of agg_renderer
6. attribute_collector how accepts rules
(to collect attribute names for text labels)
2006-02-10 17:13:02 +00:00
Artem Pavlenko
2d4ea20560
added set_capacity method to geometry classes.
...
(now we can use std::vector<boost::tuple<value_type,value_type,char> >
as an alternative vertex storage).
2006-02-05 12:31:24 +00:00
Artem Pavlenko
d8dc53bcf4
new build system
2006-01-31 23:09:52 +00:00