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

616 commits

Author SHA1 Message Date
kunitoki
2cf56bf767 - copyright fixes in shape plugin 2011-10-23 21:09:59 +02:00
kunitoki
49335bc00e - more coding style fixes in rasterlite plugin 2011-10-23 16:35:02 +02:00
kunitoki
76cadccd6b - modified coding style in raster plugin 2011-10-23 16:31:25 +02:00
kunitoki
8b53f78d1d - aligned coding style in osm plugin 2011-10-22 16:04:05 +02:00
kunitoki
a7b67566b2 - modified coding style in shape plugin 2011-10-22 15:27:28 +02:00
kunitoki
b779e406d0 - aligned coding style in sqlite plugin 2011-10-22 14:50:24 +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
d67de4ab4a - removed a refuse of the past in ogr plugin 2011-10-22 14:29:08 +02:00
kunitoki
41bb8fd38c - removed a refuse of the past in occi plugin 2011-10-22 14:28:41 +02:00
kunitoki
3341b7b7d2 - removed a refuse of the past in kismet plugin 2011-10-22 14:28:07 +02:00
kunitoki
ce5acb94b4 - removed a refuse of the past in gdal plugin 2011-10-22 14:27:21 +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
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
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
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
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
5e25e7cd6c sqlite: use boost::trim for dequoting of std::string 2011-10-21 03:41:20 -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
f9c65b8a91 - avoid using temporary pointer in sqlite blob/text resultsets 2011-10-19 13:25:08 +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
90154e0a1a csv plugin: also detect lat/lon/long field names as likely geometry columns 2011-10-18 19:27:23 -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
3e60fa2d5a - favour speed for already specified keys 2011-10-19 00:44:20 +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
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
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
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
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
517fc59f77 Added Python test for multi-tile raster policy. 2011-10-18 14:34:58 +01:00
Matt Amos
49e872049c Merge branch 'master' into multi-tile-policy 2011-10-18 13:40:35 +01:00
Dane Springmeyer
a6522fde77 Merge branch 'master' of github.com:mapnik/mapnik 2011-10-17 16:42:06 -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