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