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

134 commits

Author SHA1 Message Date
artemp
e19fdad3a6 implement vertex interface in vertex_adapter and make mapnik::geometry_type immutable 2015-02-06 16:45:51 +01:00
artemp
5361d21beb move mapnik::noncopyable to mapnik::util::noncopyable where it belongs 2015-01-07 13:11:09 +01:00
artemp
18554ec0b1 remove static_visitor usage and rely on automatic result type deduction 
(NOTE: expression_evaluator requires  ```using result_type = T1;``` )

Conflicts:
	src/image.cpp
 2015-01-07 11:39:06 +01:00
artemp
333965b588 update copyright year 2014-11-20 15:25:50 +01:00
Dane Springmeyer
38cb85a7df avoid a few more boost warnings 2014-10-27 10:30:36 -07:00
Dane Springmeyer
4c07585312 fix #2464 2014-09-30 21:16:29 -07:00
artemp
9f8b88ae4d we do need <iostrea> in non-debug 2014-08-12 20:08:52 +01:00
artemp
fb2dd283c0 fix DEBUG=yes compilation 2014-08-12 19:10:32 +01:00
artemp
95cea92a4a convert all boost::variant to util::variant 
apart from topojson (TODO)
 2014-08-12 13:40:45 +01:00
artemp
fe215a684e c++11 style : replace (almost) all typedef with type alias's 2014-07-07 18:23:15 +01:00
Dane Springmeyer
d0b357cab7 scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging 2014-06-09 13:55:56 -07:00
artemp
99bbb10290 c++11 : use int types from <cstdint> 2014-05-06 18:06:47 +01:00
artemp
eb3da7d32d c++11 : use nullptr instead of NULL 2013-11-27 15:54:16 +00:00
Dane Springmeyer
08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	bindings/python/mapnik_building_symbolizer.cpp
	bindings/python/mapnik_debug_symbolizer.cpp
	bindings/python/mapnik_line_pattern_symbolizer.cpp
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_markers_symbolizer.cpp
	bindings/python/mapnik_point_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
	bindings/python/mapnik_python.cpp
	bindings/python/mapnik_raster_symbolizer.cpp
	bindings/python/mapnik_shield_symbolizer.cpp
	bindings/python/mapnik_symbolizer.cpp
 2013-11-07 09:21:05 -08:00
Dane Springmeyer
d0619bc402 update copyright year for scons build files 2013-11-05 16:54:13 -08:00
Dane Springmeyer
710d558218 scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
Dane Springmeyer
153c7cce60 fix compile of pgsql2sqlite 2013-09-23 11:37:16 -07:00
artemp
0eada70845 + use const std::unique_ptr< []> instead of boost::scoped_array 2013-09-20 15:01:58 +01:00
artemp
62af2e6765 + replace <boost/shared_ptr.hpp> with <memory> 2013-09-20 14:13:23 +01:00
artemp
b315eb2167 + use std::shared_ptr and std::make_shared 2013-09-20 14:01:27 +01:00
Dane Springmeyer
4f01eb05b1 scons: correctly propagate DEFINES across builds 2013-07-23 20:03:00 -04:00
Dane Springmeyer
75f3eaed67 scons: more linux static linking fixes 2013-07-14 15:26:24 -04:00
Dane Springmeyer
4bc28d547b handle lacking return value handling caught by coverity 2013-07-04 14:31:46 -04:00
Dane Springmeyer
e2c7283522 Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443 2013-03-13 19:49:59 -07:00
Dane Springmeyer
0e8d224ecb remove uneeded usage of boost::lexical_cast - refs #1687 2013-01-11 11:11:20 -08:00
Dane Springmeyer
94ff584190 finish complete removal of any trace of cairomm/libsigc++ - amends f25d4d9279 and closes #1681 2013-01-09 12:49:39 -08:00
Dane Springmeyer
d44b4f5749 copy numeric2string function to pgsql2sqlite code (no need to keep in sql_utils.hpp) and fix compile 2013-01-09 11:06:22 -08:00
Dane Springmeyer
bb27156df0 use internal noncopyable class to speed up compile times slightly 2012-12-16 18:19:52 -08:00
Dane Springmeyer
ac418a7d4e remote the last references 2012-08-27 16:43:40 -07:00
Dane Springmeyer
d9fa1cb0c2 remove old $ cruft 2012-08-24 13:49:28 -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
artemp
4b4cfdd462 + link to boost_system if boost_version >= 1.50 2012-07-02 18:10:48 +01:00
artemp
e69c44e3d3 + use ST_xxx 2012-07-02 17:59:47 +01:00
Dane Springmeyer
f8c58c22c6 scons: fixup pgsql2pqlite build by ensuring CXXFLAGS are passed 2012-04-23 12:48:30 -07:00
Dane Springmeyer
3fa794c6ac whitespace fixes 2012-02-01 17:37:58 -08:00
Artem Pavlenko
b89f5cbbbc update pdsql2sqlite to new feature_impl 2012-01-23 08:40:16 +00:00
Dane Springmeyer
3ede1b13db fixup static linking for pgsql2sqlite build 2011-12-21 12:58:10 -08:00
Artem Pavlenko
377ff553bb cleanup unused code 2011-12-08 19:46:07 +00:00
Artem Pavlenko
11b44c20cd update to_wkb params 2011-12-08 18:16:15 +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
a6608814d0 scons: get linking correct to sqlite dependecies if linking is static 2011-11-15 12:07:46 -08:00
Dane Springmeyer
4654312d00 code formatting 2011-11-13 19:54:32 -08:00
Dane Springmeyer
cccacb3f2c fix compile of pgsql2sqlite 2011-11-13 15:02:29 -08:00
Artem Pavlenko
c1929716a0 + don't link to LIBMAPNIK_LIBS 2011-09-13 11:54:27 +00:00
Artem Pavlenko
5476e8410b + amend input plug-ins to use new wkb interface 2011-09-13 11:54:20 +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
6cb31bd109 scons: better propagation of libmapnik build flags to command line utilities and mapnik-config - also remove conditional flags on specific cairo rendering .cpp files as this was not working right - closes #837 2011-08-29 21:12:22 +00:00
Dane Springmeyer
3e67c1d694 scons: centralize install path info 2011-08-12 21:31:28 +00:00
Dane Springmeyer
9ae28abe50 scons: copy to avoid duplicate libs 2011-08-12 19:58:49 +00:00
Dane Springmeyer
af62ad9c27 scons: collect and propogate the libs used to link libmapnik 2011-08-11 21:11:11 +00:00
Dane Springmeyer
c5f587c29c remove unecessary linking to boost_thread 2011-05-13 03:12:38 +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
c5833a6db8 remove unmaintained autotools scripts 2011-02-04 22:22:16 +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
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
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
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
246731874b + apply 'mapnik-format' to *.cpp *.hpp 2010-06-02 11:03:30 +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
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
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
Andreas Volz
42d659a19f compile utils with autotools 2009-04-04 16:33:25 +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
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