sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1922 commits 112 branches 95 tags 181 MiB
Commit graph

298 commits

Author SHA1 Message Date
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