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

242 commits

Author SHA1 Message Date
Dane Springmeyer
c19ede5070 remove last references to boost_iostreams dependency 2011-05-10 15:57:45 +00:00
Dane Springmeyer
1070b293ad tabs -> spaces 2011-05-04 15:53:36 +00:00
Dane Springmeyer
78fe0364b9 remove iostreams linkage, no longer used 2011-05-02 16:48:41 +00:00
Dane Springmeyer
9da2d701a5 further template the svg_renderer based on pixfmt 2011-04-26 17:38:18 +00:00
Artem Pavlenko
d1903cb463 + don't link to boost::iostreams 2011-04-07 15:34:33 +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
Tom Hughes
c9472e650c Link svg2png against libagg directly as some recent distributions 
like Fedora 14 don't allow the linker to resolve symbols indirectly
anymore.
 2011-04-05 22:09:43 +00:00
Dane Springmeyer
d2a455a0fb pgsql2sqlite: leverage common functions in sql_utils, vaccuum db when finished 2011-04-04 03:51:29 +00:00
Dane Springmeyer
a73bb9d2cd pgsql2sqlite: better error output, limit 'table' param to flag option rather than positional arg so the two do not conflict 2011-04-04 03:48:39 +00:00
Dane Springmeyer
649e4498c1 handle return of system call 2011-04-01 23:55:19 +00:00
Jon Burgess
80557f7b16 Fix setting of minimum-version if map already has minimum_version. Before this fix the value would be overwritten by the underscore2dash(root) step. 2011-03-15 22:49:08 +00:00
Dane Springmeyer
a5284bada6 add missing DEFINES to mapnik-config cflags that C++ programs need that compile against mapnik headers including expressions 2011-03-04 22:05:29 +00:00
Dane Springmeyer
6ff45e91fe add handling of markers_symbolizer to upgrade_map_xml.py script 2011-02-15 18:41:20 +00:00
Dane Springmeyer
5876abcc30 handle potential xinclude nesting 2011-02-09 23:36:09 +00:00
Dane Springmeyer
af8e859d66 simplify the svg2png command line tool 2011-02-09 06:50:27 +00:00
Dane Springmeyer
93214f83a7 update mapnik2 upgrade script to help with handling r2582 2011-02-05 03:21:02 +00:00
Dane Springmeyer
c5833a6db8 remove unmaintained autotools scripts 2011-02-04 22:22:16 +00:00
Dane Springmeyer
50532801f3 change min_distance and min_padding to minimum_distance and minimum_padding to match python and mimimum_version 2011-02-02 04:20:53 +00:00
Dane Springmeyer
ec0270ad05 enable rendering a list of svg like $ svg2png *svg 2011-01-26 09:14:57 +00:00
Dane Springmeyer
7686af3b7b no need for fancy transforms 2011-01-26 01:27:16 +00:00
Robert Coup
ed306d7cbe #654 add svg2png utility 2011-01-26 01:19:01 +00:00
Dane Springmeyer
b4d092722d fixup return types for mapnik-config and add test of basic returns 2011-01-05 20:52:08 +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
0bc3c1bf33 do not use DESTDIR when reporting install values in mapnik-config 2010-12-22 06:58:21 +00:00
Dane Springmeyer
20349d42f6 touchup and actuall install the 'howfast.py' little performance testing script 2010-12-16 16:32:06 +00:00
Dane Springmeyer
d11a180bb8 add draft xml dtd for validating xml stylesheets - thx manelclos - #684 2010-12-13 17:53:25 +00:00
Dane Springmeyer
798c1d3aba set the minimum_version of mapnik to 0.7.2 for the upgrade script so that we don't break styles that will likely be compatible with 0.7.2 - thanks ebrelsford for reporting this issue 2010-12-02 00:33:25 +00:00
Dane Springmeyer
b24dd5df91 scons: make sure to only create install targets if actually installing - needed to prevent installing during uninstall action if not previously installed 2010-11-29 20:21:02 +00:00
Dane Springmeyer
d927e89bd0 add very basic script for timing rendering of single map given iterations and bbox 2010-11-24 02:03:09 +00:00
Dane Springmeyer
4060f80841 expose the SVN_REVISION in mapnik-config 2010-11-17 19:43:03 +00:00
Dane Springmeyer
a17c91c647 append input/ dir 2010-11-16 23:59:03 +00:00
Dane Springmeyer
704596ff97 fix input_plugins variable 2010-11-16 23:57:16 +00:00
Dane Springmeyer
4068eca05c typo 2010-11-16 23:53:06 +00:00
Dane Springmeyer
86e2fb3f31 actually catch the SYSTEM_FONTS variable this time 2010-11-16 23:50:51 +00:00
Dane Springmeyer
8045d32608 mapnik-config: correctly honor any customization of the fonts path such as passing SYSTEM_FONTS 2010-11-16 23:22:51 +00:00
Dane Springmeyer
46fe1e3e7c fix argument name of mapnik-config so that we can query input-plugins 2010-11-15 22:14:43 +00:00
Lucio Asnaghi
e53b490167 - added verbose option to shapeindex 2010-11-10 11:55:22 +00:00
Dane Springmeyer
61940db92f tweak the upgrade logic so that we don't loose existing attributes - allows upgrading a partially compliant xml 2010-11-08 19:54:28 +00:00
Dane Springmeyer
16ee468c78 set the minimum_version when upgrading 2010-11-08 19:12:29 +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
9ec12e731e make sure not to let the user overwrite their style when upgrading 2010-10-22 00:23:02 +00:00
Dane Springmeyer
6ebb182c11 actually add fix for #621 2010-09-26 11:52:06 +00:00
Dane Springmeyer
3549fea396 enable upgrading xml for attribute changes (e.g text_convert -> text_transform) 2010-09-18 19:33:13 +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
3f2f9fb4e5 avoid serializing xml to a string but rather write directly from tree (tree.tostring() is buggy with everything except lxml) 2010-08-26 21:44:43 +00:00
Dane Springmeyer
b4e989a85a only support reading xinclude if we are using lxml 2010-08-26 20:45:08 +00:00
Dane Springmeyer
594b019879 refactor upgrade_map_xml.py script to avoid custom dependency on lxml.objectify 2010-08-26 20:42:50 +00:00
Dane Springmeyer
410981c9fb add indenting support to upgrade_map_xml.py and add wally's alternative that is able to do the black magic needed to maintain entities 2010-08-20 22:20:45 +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
Hermann Kraus
d3bb11456f Last Summer of Code changes: Support metawriter in upgrade_map_xml.py, fix attribute collector. 2010-08-16 19:14:21 +00:00
Dane Springmeyer
6da5983e94 add xinclude support for libxml2 based parser - thanks oldtopos - closes #567 2010-08-10 06:01:16 +00:00
Dane Springmeyer
26e4fedfde be careful with output streams 2010-07-22 01:16:48 +00:00
Dane Springmeyer
9800e38764 fixup install location of mapnik2.pc for pkg-config 2010-07-21 01:54:50 +00:00
Dane Springmeyer
3e06e21189 fix cppflag construction 2010-07-19 23:01:52 +00:00
Artem Pavlenko
91a109120b + align attribute names with W3C standards 
rename 'bgcolor' to 'background-color'
+ update upgrade_map_xml.py
 2010-07-19 12:01:34 +00:00
Dane Springmeyer
42891914ab scons: add uninstall actions for mapnik-config scripts added in r2039) 2010-07-18 21:40:24 +00:00
Dane Springmeyer
31c60dc066 add mapnik-config script and pkg-config file - #175 2010-07-18 21:34:08 +00:00
Dane Springmeyer
a4872eb522 add tweak to uninstall target missed in r2036 2010-07-18 20:40:15 +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
200e9096e9 strip the file extention of '.shp', if provided, as the shapefile driver does not expect the ext. This allows a directory of shapefiles to be indexed like: 2010-07-16 23:28:53 +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
Carlos López
ccacc471d1 Added a second parameter to indicate the name of the file the updated xml will be written to. 2010-06-29 08:59:50 +00:00
Artem Pavlenko
4388ff5fbc + Building/Raster symbolizers support 2010-06-02 12:53:13 +00:00
Artem Pavlenko
0f597b2809 + Add basic format functions and script. 
Usage:
      cd $mapnik_source/utils/format_source_files
      ./format_source_files.sh
  (TODO: just a starting point to remove tabs,
  needs some more work)
 2010-06-02 11:03:39 +00:00
Artem Pavlenko
246731874b + apply 'mapnik-format' to *.cpp *.hpp 2010-06-02 11:03:30 +00:00
Dane Springmeyer
25c936c1e6 more demo/utilities working with mapnik2 2010-05-07 19:46:05 +00:00
Dane Springmeyer
15c7ab6233 add ability install XML upgrade script 2010-04-28 05:35:26 +00:00
Artem Pavlenko
d51111e6e5 + check expression needs converting 
+ convert PolygonSymbolizer to use attributes
 2010-04-09 18:47:04 +00:00
Artem Pavlenko
c51bac877e + add map_xml upgrade script (mapnik->mapnik2) 2010-04-09 18:46:56 +00:00
Artem Pavlenko
1acc288349 + better data types mapping 2010-04-09 18:46:17 +00:00
Artem Pavlenko
75dc292eb9 + link to mapnik2 
+ add newline at the end of file
 2010-03-24 10:30:15 +00:00
Dane Springmeyer
e77ff7bd11 directly link boost_system to ogrindex if available 2010-02-21 03:07:47 +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
c30ceb1be4 improve shapeindex support for pointz 2010-01-30 01:02:04 +00:00
Artem Pavlenko
c8ca617832 + removed Jamroot 2010-01-20 10:05:56 +00:00
Artem Pavlenko
47dc1e197b + merge mapnik2 to trunk 2009-12-16 20:02:06 +00:00
Lucio Asnaghi
9ad5b5bfd2 - make quadtree.hpp compile in newer gcc ( closing #418 ) 2009-12-04 14:25:51 +00:00
Dane Springmeyer
291a78209a link to boost system on solaris - modified patch from River Tarnell 2009-12-03 17:06:25 +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
Artem Pavlenko
7c30a5cc6f + bail out if num_fields is 0 2009-07-08 20:49:28 +00:00
Dane Springmeyer
d8dece232a patch from pmani to make usage of map_factory clearer in ogcserver.conf 2009-06-23 01:14:49 +00:00
Andreas Volz
fd252e202e update from autotools 2009-06-09 23:52:57 +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
ebe9cc1bfe + fixed version for ogrindex 2009-05-11 22:21:19 +00:00
Lucio Asnaghi
2d5a1810da + added ogrindex utility (needs some scons wizard to add it to main SConstruct) 2009-05-11 22:19:02 +00:00
Dane Springmeyer
618fa0d2c0 restore compilation to shapeindex on mac os x after r1113 2009-04-29 00:06:10 +00:00
Lucio Asnaghi
58132598f9 + shapeindex: gracefully exit when a shape file doesn't exists (closing #321) 2009-04-28 19:54:34 +00:00
Andreas Volz
42d659a19f compile utils with autotools 2009-04-04 16:33:25 +00:00
Dane Springmeyer
57a18dc6ca ogcserver: quick update of docs for 0.6.0 release - closes #266 2009-03-31 22:23:18 +00:00
Dane Springmeyer
689cfa45d5 A start at updating the ogcserver docs, clarifying dependencies and adding more detail to installation section - TODO: add docs for load_map() 2009-03-28 01:51:59 +00:00
Artem Pavlenko
058a70583d + add support 'schema' 
+ more postgresql types
 2009-03-11 23:40:44 +00:00
Artem Pavlenko
d60a918fb8 + accept empty bboxes for point geom 2009-03-04 22:27:22 +00:00
Dane Springmeyer
4012ce0dd4 revert accidental change to pgsql2sqlite Jamroot 2009-03-03 19:48:53 +00:00
Dane Springmeyer
7418806450 scons: explicitly link against libmapnik for command line programs to be built 2009-03-03 19:44:36 +00:00
Dane Springmeyer
d365924997 Update the sample ogcserver config based on patch from tmcw 2009-03-03 19:29:51 +00:00
Dane Springmeyer
2ac636dc31 scons: add build script for pgsql2sqlite 2009-03-01 07:07:47 +00:00
Artem Pavlenko
6a84586489 +cleanup unused source 2009-02-26 15:35:48 +00:00
Artem Pavlenko
e2304d7999 corrected sql syntax 2009-02-26 15:35:07 +00:00
Artem Pavlenko
9b4b249555 + create table if not exists 
+ use OGC_FID instead of PK_UID
 2009-02-23 23:44:42 +00:00
Artem Pavlenko
42d0fe1c8c + small cleanup 2009-02-22 22:36:50 +00:00
Artem Pavlenko
db1e445370 + remove -simplify,s option as it can be specified in input query e.g 
"select simplify(the_geom,300) as the_geom from world"
+ fixed table_from_sql to handle multiple table_names
 2009-02-22 22:34:31 +00:00
Artem Pavlenko
4868eb805e + change (table,t) option to specify output table 
+ add support for SQL select statement (query,q) 
+ if output table is not specified, use table name extracted from input query
 2009-02-22 21:36:34 +00:00
Artem Pavlenko
0794df76b9 + support for binding blobs 2009-02-21 11:22:17 +00:00
Artem Pavlenko
b236012474 + impl output directly to sqlite 2009-02-21 00:23:41 +00:00
Artem Pavlenko
34b8d62909 + more changes ... 2009-02-20 23:04:30 +00:00
Artem Pavlenko
0e2a4cddc5 + add direct sqlite3 support (work in progress..) 2009-02-20 15:58:33 +00:00
Artem Pavlenko
0bcf0004be + discard empty geometries from output 2009-02-20 12:28:21 +00:00
Artem Pavlenko
7b63111a67 + add --simplify=<tolerance> option 2009-02-20 11:12:56 +00:00
Artem Pavlenko
13b7321751 + Utilty to convert postgresql/postgis tables into format suitable for sqlite3 (r*tree index) 
+ Initial import
 2009-02-20 10:43:15 +00:00
Artem Pavlenko
48a13f8cbc appled boost_append_osx_patch_v3 from jbronn 2008-12-04 23:20:44 +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
Artem Pavlenko
24c605e807 added missing std namespace 2008-02-20 09:57:37 +00:00
Artem Pavlenko
a478089bd9 patch from Martijn van Oosterhout 2008-02-20 09:34:48 +00:00
Artem Pavlenko
a8859645b3 use memory mapped files for reading shape files 2008-02-04 11:12:32 +00:00
Artem Pavlenko
57cb2edef1 collect number of unique styles 2008-02-01 15:38:33 +00:00
Artem Pavlenko
4485d71ab2 python script to print stats about map definition file 2008-02-01 15:27:13 +00:00
Artem Pavlenko
3c5b7f02f3 applied freebsd patch from Beau Gunderson 2008-01-28 14:51:10 +00:00
svn
b98faab018 respect 'THREADING' flag 2007-09-01 09:50:06 +00:00
Artem Pavlenko
d78ccbaed0 small fix 2007-08-01 08:52:18 +00:00
Artem Pavlenko
15e73b98f4 small formatting 2007-06-05 09:10:40 +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
Jean-Francois Doyon
3edbb1f284 - Fix a couple of namespace issues. 2007-02-08 00:36:14 +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
ebdd0f6030 disable clog printing in release mode. Pass -DMAPNIK_DEBUG to enable. 2006-11-19 17:13:33 +00:00
Jean-Francois Doyon
51906ed2f8 - Change default ogcserver.conf to reflect new projection support. 2006-11-01 02:04:01 +00:00
Artem Pavlenko
110016fe78 1. refactored proj stuff into separate files 
2. added is_geographic property
3. added basic support for text_symbolizer in load_map
 2006-10-17 17:26:35 +00:00
Artem Pavlenko
992af4747d 1. move include to mapnik/include 
2. update demos,bibdibgs etc.
 2006-10-04 11:22:18 +00:00
Jean-Francois Doyon
1c8aca919f - Added support for complete service metadata 
- refactored some code for optimization
- cusomtized the config parser
 2006-07-22 18:54:53 +00:00
Artem Pavlenko
4a5a1580c4 fixed 2006-05-12 16:35:36 +00:00
Artem Pavlenko
62019e0849 small cleanup 2006-04-22 19:37:59 +00:00
Jean-Francois Doyon
b8ac9b1984 OK, final fixes to the WMS stuff, cleaned up documentation, and so on. 
Things should be good to go for a first try by the wider community!
 2006-04-14 03:45:46 +00:00
Jean-Francois Doyon
af55c99fa4 - Improve WMS compliance 
- Remove unused code
- Rework layer and style bulding
- minor doc changes
 2006-04-13 02:39:49 +00:00
Jean-Francois Doyon
39d14bdb5f Documentation for the ogcserver. 2006-04-11 03:00:39 +00:00
Jean-Francois Doyon
378d4a4e1d A CGI/FastCGI compatible ogcserver executable written in python, 
as well as a sample config file.
 2006-04-11 00:33:24 +00:00
Jean-Francois Doyon
603c0c0fa3 - Add the CGI executable, and a sample configuration file 
- Various code optimizations:
  - Remove unnecessary imports
  - Better share/re-use objects
  - Move more work to initialization, to optimize for FastCGI
 2006-04-10 06:19:27 +00:00
Artem Pavlenko
61fd258fd1 changing licence from GPL to LGPL 2006-03-31 10:32:02 +00:00
Artem Pavlenko
0e53e23ec1 fixed pointz/pointm reading 2006-03-28 10:09:24 +00:00
Artem Pavlenko
8986108775 added set_datasource method (TODO!!!) 
fixed pointz in shapeindex
 2006-03-28 08:29:36 +00:00
Artem Pavlenko
58675f6bf1 replaced cerr and cout with clog ( redirected to cerr by default) 2006-03-19 21:54:40 +00:00
Jean-Francois Doyon
9f9e4c1d8e Reworked the way the tail end of the boost libs (i.e. -gcc-mt) is handled. 
This will eventually help with mroe platforms, and to link with debug libraries.
 2006-02-06 01:08:32 +00:00
Artem Pavlenko
d8dc53bcf4 new build system 2006-01-31 23:09:52 +00:00