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

285 commits

Author SHA1 Message Date
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
e7bfba10fe + enanble installation of mapnik2 side by side with mapnik 2010-03-17 21:03:02 +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
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
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
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
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
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
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
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
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
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
48a13f8cbc appled boost_append_osx_patch_v3 from jbronn 2008-12-04 23:20:44 +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
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
Dominic Hargreaves
c436461ee8 Fix build with GCC 4.3 (fixes #76) 2008-03-24 14:03:05 +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
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
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
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
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
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
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
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
ed5bbe25fe improved win32 support from Valery Moiseev. 2007-01-17 11:43:11 +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
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
Artem Pavlenko
f1393cc019 1. hit_test implementation for geometry objects: 
bool hit_test(double x, double y, double tol);
       
2. added image_view(unsigned x, unsigned y, unsigned width, unsigned height)
   allowing to select region from image data e.g (in Python):

    im = Image(2048,2048)
    view = im.view(0,0,256,256)
    save_to_file(filename,type, view)
    
3. changed envelope method to return vy value in datasource classes

4. features_at_point impl for shape and postgis plug-ins
 2006-11-25 11:02:59 +00:00
Artem Pavlenko
ebdd0f6030 disable clog printing in release mode. Pass -DMAPNIK_DEBUG to enable. 2006-11-19 17:13:33 +00:00
Artem Pavlenko
c195e1d24d added yet to be implemented features_at_point 2006-10-16 21:30:58 +00:00
Artem Pavlenko
992af4747d 1. move include to mapnik/include 
2. update demos,bibdibgs etc.
 2006-10-04 11:22:18 +00:00
Artem Pavlenko
2f360a6549 1.removed map width/height from query interface 
2.small cleanups
 2006-09-12 14:29:22 +00:00
Artem Pavlenko
31d04c3131 added support for building on x86_64 platform e.g. /usr/lib64 etc. 2006-09-06 09:14:41 +00:00
Artem Pavlenko
d11153ccf8 use fully qualified names 2006-07-24 20:06:09 +00:00
Artem Pavlenko
d0ddc88253 1. move parameters to datasource 
2. general cleanup
 2006-05-23 16:52:10 +00:00
Artem Pavlenko
bf218a46b9 oops! added missing bits 2006-05-19 12:50:40 +00:00
Artem Pavlenko
46fea7cee2 use boost::lexical_cast for conversions 
( thanks to John Leslie <jleslie@placebase.com> )
 2006-05-19 12:26:23 +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
d35e9f047e small cleanup 2006-03-23 21:45:32 +00:00
Artem Pavlenko
ac2a286cde added __declspec(dllexport) + general cleanup 2006-03-22 15:55:58 +00:00
Artem Pavlenko
fab04e1626 removed verbose output 2006-03-22 14:57:50 +00:00
Artem Pavlenko
fbbf75f032 added explicit flags ios::in|ios::binary for win32 compat 2006-03-22 14:52:32 +00:00
Artem Pavlenko
673bd4bc19 replaced cout and cerr with clog (by default redirected to cerr) 2006-03-19 21:53:47 +00:00
Artem Pavlenko
ce93c69fa3 minor syntax corrections to comply with ansi c++ 2006-03-08 23:02:28 +00:00
Artem Pavlenko
aed5516197 1. new feature model - based on boost::property_map concept 
f = feature(id);
       f["name"] = "what is my name?";
       boost.put(f,"area",123123.4325);
       
2. simplified and corrected value class and operators
3. updated input plug-ins to work with new features
4. add text_symbolizer (getting there:)
5. template version of agg_renderer 
6. attribute_collector how accepts rules 
	(to collect attribute names for text labels)
 2006-02-10 17:13:02 +00:00
Artem Pavlenko
2d4ea20560 added set_capacity method to geometry classes. 
(now we can use std::vector<boost::tuple<value_type,value_type,char> > 
as an alternative vertex storage).
 2006-02-05 12:31:24 +00:00
Artem Pavlenko
d8dc53bcf4 new build system 2006-01-31 23:09:52 +00:00