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

524 commits

Author SHA1 Message Date
Dane Springmeyer
0cd1a5fbc6 maintain python24 compatibility 2010-04-07 18:44:52 +00:00
Alberto Valverde
f35b9bc7d0 Implemented a python wrapper for Symbolizers.__getitem__ so the explicit symbolizer subclass is returned (via Symbolizer.symbol). Added a symbol() method to every symbolizer. This fixes an introspection test (only 3 Todos, 5 errors and 1 failure to go) and Updated the mapnik2.__all__ list 2010-03-22 11:22:07 +00:00
Alberto Valverde
c79865586b added an angle_mode attribute to GlyphSymbolizer to define the way the angle expression should be interpreted: as an azimuth or as a trigonometric angle 2010-03-22 11:21:17 +00:00
Alberto Valverde
18b811d19d implemented a mechanism in mapnik2._injector to be able to override c++ methods (at the python layer only). Used it to implement a friendlier constructor for Feature and a add_geometry() method that accepts shapely.geometry.Geometrys, and wkb/wkt strings 2010-03-19 18:14:46 +00:00
Alberto Valverde
a613dc6397 Created python binding to memory_datasource which can be added Features built programaticcaly. See tests for sample use until docs are done. #528 is almost closed. 2010-03-19 16:16:15 +00:00
Alberto Valverde
17b61d16c4 More progress on #528: Made setting Feature properties with values of type unicode or str possible. I've modified the UnicodeString_from_python_str from_python_converter so it can also convert python unicode objects (not just encocded strs). It was originally commented out so but it seems to work fine on my tests. Is there anything I0ve overlooked? (Artem?) 2010-03-19 13:42:58 +00:00
Alberto Valverde
a4d742283b Implementead Feature instantiation from Python and an add_geometry method which accepst a wkb string 2010-03-19 13:42:25 +00:00
Alberto Valverde
31c3d20e43 modified the old arrow_symbolizer interface on glyph_symbolizer and documented it 2010-03-18 20:04:51 +00:00
Alberto Valverde
fc3a1beeef initial skeleton of glyph_symbolizer (coarsely ported from arrow_symbolizer). Mapnik compiles but symbolizer does nothing useful yet and is going to be heavily modified to make use of expressions to be general enough to be usable for purposes other than rendering arrows representing vector direction/intensity 2010-03-18 20:04:35 +00:00
Artem Pavlenko
dbf89845e6 + add using mapnik::color 2010-03-17 21:03:18 +00:00
Artem Pavlenko
e7bfba10fe + enanble installation of mapnik2 side by side with mapnik 2010-03-17 21:03:02 +00:00
Artem Pavlenko
83b20c3036 Revert "re factor expression grammar/parser stuff" 
This reverts commit c58b8c4f71813a2490cf135573009c92be1a90c4.
 2010-03-15 21:08:56 +00:00
Artem Pavlenko
0f8deb5e73 re factor expression grammar/parser stuff 2010-03-15 21:08:46 +00:00
Alberto Valverde
2f1d60b666 pre-eliminary raster coloring support 2010-03-12 13:34:13 +00:00
Alberto Valverde
e8a4929a5a added a proxy to the deprecated Feature.properties interface in the python bindings 2010-03-11 19:59:40 +00:00
Artem Pavlenko
bbfdc4fab8 + use mapnik2 for python module name 
+ update rundemo.py
 2010-03-08 11:54:44 +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
c3ea59c3c8 don't pass expression_ptr as const 2010-02-03 18:36:01 +00:00
Artem Pavlenko
f4e7a7931f + implement x/y resolution 2010-02-03 16:56:42 +00:00
Dane Springmeyer
c950e38a46 reenamble python access to TextSymbolizer 'name' expression 2010-01-30 03:08:03 +00:00
Dane Springmeyer
c7947b37c3 comment out new unicode stuff in mapnik_feature due to #505 2010-01-30 00:53:29 +00:00
Artem Pavlenko
0aa7c5ff57 + corrected win32 dll name 2010-01-20 10:04:32 +00:00
Dane Springmeyer
da72bfbecd fix typos in __init__.__doc__ of lib names on windows 2010-01-19 19:56:09 +00:00
Dane Springmeyer
6115a1590d add 'gamma' attribute to PolygonSymbolizer, along with tests against simplified world borders shapefile - setting gamma to .5-.7 can remove gaps in processed_p.shp depending on background color - closes #428 2010-01-13 00:31:45 +00:00
Dane Springmeyer
a80f352d58 sync trunk with r1537, adding new TextSymbolizer options in python - TODO - add reflect ShieldSymbolizer options 2010-01-11 18:59:14 +00:00
Dane Springmeyer
067fdb884d sync trunk with new cairo support added previously to 0.7 branch in r1531 2010-01-11 18:55:30 +00:00
Dane Springmeyer
644843230d add missing PostGIS options in python docstrings 2010-01-11 00:22:56 +00:00
Artem Pavlenko
1a4b9f6b0a + use ctypes instead of dl (deprecated in python3) module 2009-12-21 13:44:30 +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
fe3ffe6c2d rename map.save_map_string to map.save_map_to_string 2009-12-06 22:33:47 +00:00
Dane Springmeyer
561d937f2a translate a C++ config error into a python RuntimeError - fixes #442 2009-12-06 22:22:56 +00:00
Dane Springmeyer
d0b4db9ba3 add support for relative paths for entities when using libxml2 and loading xml from string - thanks dodobas for the initial patch 2009-12-06 22:18:45 +00:00
Dane Springmeyer
a247dd2922 avoid clobbering the prefix variable 2009-12-05 03:51:29 +00:00
Dane Springmeyer
3c9655b721 improve reliability of default python linking on os x - closes #380 2009-12-05 03:07:58 +00:00
Dane Springmeyer
51569ce9fc document shared opening option in docstrings - closes #375 2009-12-04 23:32:25 +00:00
Dane Springmeyer
c570f1c424 add missing options (srid, persist_connection) to PostGIS docstring 2009-11-28 23:26:57 +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
782e0449e8 update python api docs and toch up formatting of __init__.py 2009-11-08 17:02:17 +00:00
Artem Pavlenko
a78e51ec56 + avoid duplicate code 2009-10-19 15:16:16 +00:00
Artem Pavlenko
fb30c36143 + patch from Dane Springmeyer improves pickling support 
for mapnik.Map object ( needs some more work!!)
 2009-10-19 14:22:11 +00:00
Dane Springmeyer
fdf7ca3a66 add docstrings to enum's in mapnik_stroke - patch from podolsir 2009-09-27 17:10:26 +00:00
Dane Springmeyer
ad47ad321d avoid namespace pollution by defining __all__ in __init__.py - nice patch from podolsir 2009-09-27 17:07:41 +00:00
Dane Springmeyer
8fd907f8fc remove self argument in python docstring for boost <1.35 compatibility allowing the removal of boost version checking - addresses #29 2009-09-27 01:31:30 +00:00
Dane Springmeyer
10dff4b8cf mapnik_coord_env_projection.patch from podolsir which adds docstrings to mapnik_envelope.cpp, mapnik_coord.cpp, and mapnik_projection.cpp as well as the __init__.py - addresses #29 2009-09-26 17:15:22 +00:00
Dane Springmeyer
d9d15bb081 avoid segfault when pickling a TextSymbolizer using wrap_character by removing const declaration 2009-09-25 20:29:03 +00:00
Dane Springmeyer
a414832338 fix boost version available with docs support 2009-09-25 17:59:57 +00:00
Dane Springmeyer
ef1e210269 improve boost::python docstrings for map, color, and stroke, adding currently unused patch against enumeration from podolsir 2009-09-25 17:50:37 +00:00
Dane Springmeyer
23ab337f5c use the 'arg' class instead of the deprecated 'args' for boost::python docs http://www.boost.org/doc/libs/1_40_0/libs/python/doc/v2/args.html 2009-09-25 17:38:38 +00:00
Dane Springmeyer
016659f22a add missing boost version include to enable new docstrings 2009-09-25 17:16:54 +00:00
Dane Springmeyer
a50bfa3811 fix typos in docstrings 2009-09-25 04:21:14 +00:00
Dane Springmeyer
ca32939e35 formatting 2009-09-25 03:31:28 +00:00
Dane Springmeyer
6abc56ef08 Add docstrings to mapnik_color.cpp - modified patch from podolsir - thanks - addresses #29 2009-09-25 03:27:29 +00:00
Dane Springmeyer
72debc046c remove fontset from pickling for now, and properly set wrap_char from string 2009-08-27 23:39:18 +00:00
Dane Springmeyer
5b9ddbaecd add pickling support for point_symbolizer and expose the filename property (patch from mishok13 - thanks) - closes #114, addresses #345 2009-08-27 21:11:17 +00:00
Dane Springmeyer
e897b832a4 +reflect new text symbolizer options added in r1254 - closes #391 2009-08-17 22:54:50 +00:00
Dane Springmeyer
16f4efc07b python: add better handling of cairo/pycairo support, refactor rundemo.py, add basic tests for cairo surfaces (closes #392) 2009-07-28 06:27:10 +00:00
Dane Springmeyer
e7dd9094a5 revert unintended file changes from r1275 2009-07-26 01:15:44 +00:00
Dane Springmeyer
45266074c8 scons: fix typo, and ensure all temp output is writeable 2009-07-26 01:08:51 +00:00
Dane Springmeyer
123182d0af scons: make sure to link to cairo if present but even if pycairo is not 2009-07-24 07:20:27 +00:00
Dane Springmeyer
7e6ff2a651 reflect save_map_string method in python (#396) 2009-07-24 06:25:09 +00:00
Dane Springmeyer
8db8c27446 apply patch from mishok13 improving handling of conversion of boost python type definitions to python types definitions (closes ##397) 2009-07-23 18:20:10 +00:00
Dane Springmeyer
476838d259 apply patch from mishok13 to improve font and plugin registration code from #398, but does not close #398 because auto-registration is maintained for now 2009-07-23 17:54:33 +00:00
Dane Springmeyer
9ce6792eda add a function to query for the svn revision of the mapnik python bindings 2009-07-17 20:51:39 +00:00
Artem Pavlenko
c83000eb60 + use UnicodeString->utf8->PyUnicode conversion 2009-07-13 22:20:25 +00:00
Artem Pavlenko
9872a3be7c + fixed UnicodeString to Py_Unicode conversion (needs testing) 2009-07-13 21:39:39 +00:00
Dane Springmeyer
32b77c2e88 typo fix 2009-07-07 23:42:29 +00:00
Artem Pavlenko
7ebe50d9de + Cleaner builds - don't import everything from ENV! 
+ Add FRAMEWORK_SEARCH_PATH option for Max OS X
 2009-06-29 14:04:44 +00:00
Dane Springmeyer
e10b471a90 +reflect 'plugin_names()' method in python 2009-06-22 07:04:07 +00:00
Dane Springmeyer
e7457a139a +add pickle support to text_symbolizer, improve support for stroke, and add tests for stroke and text pickling via python - see: #345 2009-05-26 01:50:58 +00:00
Dane Springmeyer
dadd64519b +add pickle support for proj_transform and view/coord_transform - see #345 2009-05-24 06:31:32 +00:00
Dane Springmeyer
92ca0a8ac9 +expose parameters as python list and dict, and add pickle support by taking advantage of boost visitation - needs further review - see #345 2009-05-24 06:12:32 +00:00
Dane Springmeyer
5aa1fda60e +add partial pickle support for strokes - see #345 2009-05-24 06:08:21 +00:00
Dane Springmeyer
e7e0dd9045 +add pickle support to line_symbolizer - see #345 2009-05-24 06:03:23 +00:00
Dane Springmeyer
def1c709ce +add pickle support to projection class - see #345 2009-05-24 06:02:33 +00:00
Dane Springmeyer
8b854a1bb2 +add pickle support for shield_symbolizer - see #345 2009-05-24 05:55:35 +00:00
Dane Springmeyer
1218b4c034 +add pickle support for polygon_symbolizer - see #345 2009-05-24 05:52:54 +00:00
Dane Springmeyer
91876c9863 +add support for pickling a mapnik query - see #345 2009-05-24 05:49:03 +00:00
Dane Springmeyer
bd1407b7c5 +add pickle support for pattern symbolizers - see #345 2009-05-24 05:45:07 +00:00
Dane Springmeyer
ff36980723 +add pickle support for raster_symbolizer - see #345 2009-05-24 05:34:18 +00:00
Dane Springmeyer
7fcc462a8f apply patch from mishok13 to allow proper checking for pycairo support compiled into mapnik - closes #284 2009-05-24 04:25:51 +00:00
Dane Springmeyer
b2570bd866 apply patch from mishok13 from #wherecamp to expose dash array list in python along with a small test case - closes #317 2009-05-24 04:14:35 +00:00
Dane Springmeyer
80a5bdf6e3 revert pickling support on datsources since they can't be created directly from python - we now dump and load in the layer object via params as of r1149 - see #345 2009-05-20 00:26:44 +00:00
Dane Springmeyer
6825541057 fix pickling for styles since they have state and no initial args 2009-05-20 00:21:29 +00:00
Dane Springmeyer
424980d92b via a layer object pickle datasource params rather than the datasource object itself - see #345 2009-05-20 00:18:46 +00:00
Dane Springmeyer
9a2894dc3c +copy/pickle support for Coord objects - see #345 2009-05-20 00:08:18 +00:00
Dane Springmeyer
9b02e6ced4 + reflect raster symbolizer options in python (may need to eventually switch to ENUMS) 2009-05-13 20:28:51 +00:00
Dane Springmeyer
904f1d6899 add python wrapper and docstring for kismet plugin - closes #293 2009-05-04 21:40:48 +00:00
Dane Springmeyer
4e1e6c6c1d ogcserver: upgrade GetFeatureInfo based on changes in r1121 2009-05-01 02:27:56 +00:00
Dane Springmeyer
196b01c16c + make interface to datasource attributes, featuresets, and features more pythonicby adding feature.envelope() method returning combined extent of geometries, ds.fields() method returning list of names, and featureset.features() which returns list of all features in featurset - now accessible via datasource.all_features()- closes #283, #280, #171 2009-05-01 01:21:29 +00:00
Lucio Asnaghi
eaa49ca028 + applying patch proposed by dane that add explicit_defaults selection when saving maps (closes #327) 2009-04-28 21:44:34 +00:00
Dane Springmeyer
57f995b0cc ogcserver: apply fix for dynamic script name in mod_server (from tmcw, closes #277) 2009-04-20 15:32:22 +00:00
Dane Springmeyer
4429958816 minor formatting to render_to_file docstring 2009-04-12 21:36:45 +00:00
Dane Springmeyer
48dea30184 slight formatting fixes to docstrings in layer class 2009-04-12 20:57:08 +00:00
Artem Pavlenko
8d963e4270 + use separate x/y scales - important for raster 2009-04-10 12:00:51 +00:00
Dane Springmeyer
82c6e87578 Support xml lib fallback and GetFeatureInfo on all layers - closes #303 and #304 2009-04-09 18:40:39 +00:00
Dane Springmeyer
c9a9fcf287 named docstring arguments only supported in boost python >= 1.35 2009-04-08 22:25:38 +00:00
Dane Springmeyer
000dcab3c9 Maintain support for boost version before 1.34 when writing argument signatures and add docstring for buffered_envelope 2009-04-08 20:11:45 +00:00
Dane Springmeyer
512029bfa4 update docstrings based on jpeg quality controls (#198) 2009-04-08 00:27:36 +00:00
Dane Springmeyer
72c2f903ca We should actually use 'self' as the term for first argument/instance 2009-04-07 23:26:33 +00:00
Dane Springmeyer
47822d578e Add argument aliases to __init__ method for easier/more understandable introspection - addresses #29 2009-04-07 23:17:57 +00:00
Andreas Volz
39bdab7762 forget to escape path 2009-04-05 21:02:12 +00:00
Andreas Volz
d134de3008 new added file 2009-04-04 12:24:45 +00:00
Dane Springmeyer
3b26f6b01a add docstring and factory method for osm plugin - closes #275 2009-04-01 00:43:08 +00:00
Artem Pavlenko
6268f4fb80 + oops, fixed 2009-04-01 00:11:14 +00:00
Artem Pavlenko
ce45f8dec3 + fix UChar to wchar_t conversion 2009-03-31 22:59:34 +00:00
Dane Springmeyer
c8340e7161 ogcserver: use PATH_INFO to contruct the request 'onlineresource' since SCRIPT_NAME will be emtpy in a WSGI app - fixes #243 for the WSGI wrapper 2009-03-31 17:18:41 +00:00
Dane Springmeyer
a7d8e7b240 fix axis ordering for epsg codes >=4000 and <5000 - based on patch from crschmidt (thanks) - closes #241 2009-03-31 17:09:36 +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
Artem Pavlenko
10f55a678b + add support for vertical_alignment (text_symbolizer) 
valid values are : top, middle, bottom
  default to middle which can now center multi-line text
 2009-03-30 20:47:26 +00:00
Dane Springmeyer
db7b0edd58 revise handling of featureset returned from GetFeatureInfo 'query_map_point' - closes #271: Todo GetFeatureInfo support still depends on addressing #272 2009-03-30 14:59:42 +00:00
Dane Springmeyer
aaf6fca823 add docstring for Datasource wrapper 2009-03-30 05:10:00 +00:00
Dane Springmeyer
7540ef409a add docstrings to top of file and factory methods in __init__.py and harmonize indentation to 4 spaces 2009-03-30 04:37:28 +00:00
Dane Springmeyer
c9b4d71b1a add docstrings to main boost python functions 2009-03-30 04:32:23 +00:00
Dane Springmeyer
a87acb13d5 ogcserver: add module level docstrings for remaining ogcserver files 2009-03-30 04:25:01 +00:00
Dane Springmeyer
a40bcc2571 ogcserver: in relation to load_XML() rename and break apart methods for copying layer and style objects and avoid attempting to register a style > 1 time if found in aggregate styles of a layer 2009-03-30 04:24:01 +00:00
Dane Springmeyer
358f087057 fix scale_denominator to be a method (not property) and shuffle alphabetically 2009-03-30 04:17:03 +00:00
Dane Springmeyer
2f04dc753c scons: normalize paths written to 'paths.py' to avoid double '//' 2009-03-30 04:15:11 +00:00
Dane Springmeyer
df7a5b8429 scons: add module docstring to 'paths.py' 2009-03-29 19:05:42 +00:00
Artem Pavlenko
2c878b52cf + reflect CoordTransform in Python (TODO: rename to ViewTransform in core lib) 2009-03-29 10:26:44 +00:00
Andreas Volz
e04a9cddda - added paths.py.in -> a template to generate paths.py with automake 
- added ax_boost_program_options.m4 to detect boost library needed to utils
- print out at configure script end the build configuration
 2009-03-27 00:17:52 +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
7bb3354f61 - compile python binding c++ code 
- check for python
 2009-03-25 20:16:48 +00:00
Artem Pavlenko
570fe611f4 + qualify 'value' to avoid names clashing 
+ use _enumeration helper wrapper
 2009-03-21 12:39:06 +00:00
Artem Pavlenko
24174d68e9 + reflect aspect_fix_mode in Python 2009-03-21 11:22:10 +00:00
Artem Pavlenko
9970766461 formatting 2009-03-15 23:33:46 +00:00
Dane Springmeyer
40ef82f225 ogcserver: Fix syntax errors accidentally introduced in r986 - patch from rcoup (closes #256) 2009-03-09 00:15:03 +00:00
Dane Springmeyer
4fb1eb6c0e Add missing include 2009-03-05 04:44:34 +00:00
Dane Springmeyer
37837db4c1 move the boost::python namespace back to original location 2009-03-05 03:47:15 +00:00
Dane Springmeyer
ea2e39b81b ogcserver: Add content-length to cgi, wsgi, and mod-python handlers and max_age to wsgi and mod_python - thanks tmcw, closes #251 2009-03-03 17:08:19 +00:00
Dane Springmeyer
44aa40a610 ogcserver: remove unused import 2009-03-03 17:04:58 +00:00
Dane Springmeyer
9f40e90def scons: move all configure options to 'scons configure' stage, using pickling to maintain configure options across builds 2009-02-26 23:35:09 +00:00
Dane Springmeyer
46df10d7d0 scons: add boolean option to avoid linking to Framework Python on darwin (closes #248) 2009-02-25 01:02:43 +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
Dane Springmeyer
918db0bfb8 + add string representation for Projection object in python 2009-02-22 18:22:31 +00:00
Dane Springmeyer
42be8116e1 scons: add a SYSTEM_FONTS variable to avoid installation of bundled dejavu fonts and instead point Python bindings at given value - also print SCONS_LOCAL_CONFIG values for user during configure 2009-02-20 19:31:08 +00:00
Dane Springmeyer
a8b6b0022b ogcserver: use the ordered layering from r938 and a layer named __all__ to signal a request all layers (addresses #226) 2009-02-19 18:20:14 +00:00
Dane Springmeyer
06e073c7ba ogcserver: apply patch from crschmidt to support correct layer ordering in GetCaps response (closes #226) 2009-02-19 18:02:17 +00:00
Dane Springmeyer
292056da77 remove unneeded include added in r921 2009-02-17 05:45:59 +00:00
Dane Springmeyer
98ada350ea + add pickling support for styles and rules - TODO expose symbolizer object in general(#190) and for pickling 2009-02-17 05:23:10 +00:00
Dane Springmeyer
3e51c02513 + add pickling interface to layers and datasources (closes #205) - TODO support parameters 2009-02-16 01:53:34 +00:00
Dane Springmeyer
dbdbfa4333 ogcserver: r909 added the wrong modserer.py file, reverting to correct one. 2009-02-15 23:13:17 +00:00
Dane Springmeyer
f85c0c8b68 + add modified mod_python ogcserver wrapper patch for 'modserver.py' from tmcw (closes #101) 2009-02-15 23:02:45 +00:00
Dane Springmeyer
7bc810b6b8 ogcserver: Add html exception to allowedexceptions 2009-02-15 22:51:00 +00:00
Dane Springmeyer
65bb344440 ogcserver: don't set the background color unless the get param exists 2009-02-15 22:43:03 +00:00
Dane Springmeyer
771e76f637 + add style pickling support to mapnik::Map, fix tabs, and only un-pickle background color if exists (closes 233) 2009-02-15 19:53:48 +00:00
Artem Pavlenko
98267e2959 + MAPNIK_VERSION (defined in mapnik/version.hpp) 
+ expose version in Python :
  mapnik.mapnik_version()
  mapnik.mapnik_version_string()
+ add SQLite plug-in in Python bindings
 2009-02-12 16:44:04 +00:00
Dane Springmeyer
be2c27ff86 OGCServer: add support for load_map() within WMSFactory (thanks xcacou,theosys,and tmcw for early patches) (closes #129) 2009-02-12 02:12:26 +00:00
Dane Springmeyer
577ee5ee22 + implement a layer copy method, provide a 'default' layername that will return a map with all layers rendered, and clean up PIL imports 2009-02-12 01:45:33 +00:00
Dane Springmeyer
e24b6f3654 Improve usability of ogcserver debug mode by printing to new html response when in debug mode or when the QUERY_STRING is empty, signaling testing 2009-02-12 01:28:57 +00:00
Dane Springmeyer
da9640c39d convert to unix line endings 2009-02-12 01:17:30 +00:00
Dane Springmeyer
75d5e1c9e1 Convert to unix line endings 2009-02-12 01:11:18 +00:00
Tom Hughes
220bb3e99a Revert the patch to add a show_page flag to the cairo renderer and 
replace it with support for rendering to a cairo context rather than
a cairo surface.

When rendering to a surface a show_page is done, when rendering to a
context it is not so that multiple renders can be done, possibly with
modified scaling and/or translation.
 2009-02-06 00:46:29 +00:00
Dane Springmeyer
51293f64ba + apply show_page.patch (thanks Berteun) (closes #201) 2009-02-05 18:09:14 +00:00
Artem Pavlenko
a45e93b79a + more property goodness on the TextSymbolizer from Python (springmeyer) 2009-02-05 11:54:07 +00:00
Artem Pavlenko
c3ff9c842d + scons_python_usability_improvements2 (springmeyer) 2009-02-03 23:00:03 +00:00
Artem Pavlenko
ffef15e22e + reflect buffered_envelope method 
+  fix view_transform to return ctrans (TODO)
 2009-02-02 23:39:20 +00:00
Dane Springmeyer
f5127d6ee4 Remove reference to CAIRO_HAS_IMAGE_SURFACE macro since this is not supported until cairo 1.8 release 2009-01-28 21:11:10 +00:00
Dane Springmeyer
f414843c4f + First implementation of OGR(vector) input plugin. Patch from kunitoki. Thanks! Closes #170 2009-01-28 20:16:31 +00:00
Artem Pavlenko
e7014c2b7e + SCons_usabilty_improvements2.patch (springmeyer) 
(see #186 ticket for details)
 2009-01-26 22:58:55 +00:00
Dane Springmeyer
2d47f24a7e + added ability to transform Envelopes in addition to Coords in new python ProjTransform, closes #117 2009-01-25 19:02:07 +00:00
Artem Pavlenko
8b298729bf + mapnik-centralise-image-tostring-functions.patch (jonb) 
(moves Image.tostring() to core c++ code)
 2009-01-19 22:51:55 +00:00
Artem Pavlenko
7d6a21dfeb + mapnik-fix-threaded-python-exceptions.patch from jonb 2009-01-17 20:45:53 +00:00
Artem Pavlenko
391ae4c4be + mapnik-image-from-cairo-in-python.patch from jonb 
adds a method to the python bindings to create an Image from a
    Cairo.ImageSurface().
 2009-01-17 20:34:58 +00:00
Artem Pavlenko
cad0a839b6 + mapnik-load-map-from-string.patch (jonb) 2009-01-15 23:51:07 +00:00
Artem Pavlenko
a07767ef3d + (c++) renamed mapnik::Color to mapnik::color 
+ (c++) added mapnik::color ctor from named colours (TODO: consider not to export color_factory) 
+ (Python) fixed pickling
+ (Python) added to_hex_string method
 2009-01-14 12:10:24 +00:00
Dane Springmeyer
689b1eb018 Made Scale Denominator available as a property of the Map 2009-01-14 06:12:55 +00:00
Dane Springmeyer
f0d58a99f3 + expose map resize and remove_all methods as well as view_transform property in python 2009-01-14 04:52:04 +00:00
Artem Pavlenko
fd194e2ba6 + reflect mapnik::proj_transform in Python (#117) 2009-01-13 15:49:26 +00:00
Artem Pavlenko
9a75034a88 + applied python_point_datasource.patch from lwu 2009-01-13 00:56:09 +00:00
Artem Pavlenko
14fa35fb18 + enable multiple python threads with Cairo rennderer patch from jonb 2009-01-10 23:30:33 +00:00
Artem Pavlenko
bb284d0cfc + enable multiple python threads patch from jonb 2009-01-10 17:57:59 +00:00
Artem Pavlenko
d8226945d4 + improved pkg-config logic 2009-01-10 12:08:55 +00:00
Dane Springmeyer
a3e81dd344 + more complete docstrings for the boost::python Layer class 2008-12-04 23:33:18 +00:00
Artem Pavlenko
48a13f8cbc appled boost_append_osx_patch_v3 from jbronn 2008-12-04 23:20:44 +00:00
Artem Pavlenko
190f8e5cb9 + return boost::optional in find_style (c++) 
+ return feature_type_style by value, raise KeyError otherwise (Python)
 2008-11-18 21:15:46 +00:00
Dane Springmeyer
2c83877108 Added python docstrings to mapnik Map class 2008-11-17 23:44:50 +00:00
Dane Springmeyer
86dcb79808 Minor spelling change to use more common spatial term 2008-11-17 01:32:45 +00:00
Artem Pavlenko
bf1ea518c0 + Exposed the proj forward and inverse as methods on the actual geometry (springmeyer) 2008-11-16 22:36:21 +00:00
Artem Pavlenko
d4032c217e Exposed the proj forward and inverse as methods on the actual geometry (springmeyer) 2008-11-16 22:30:44 +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
Artem Pavlenko
20f3a9460d + expose buffer_size parameter (default 0) 
influences envelope used by placement detector 
  ( i.e. 'avoid_edges' parameter)
 2008-09-21 10:14:38 +00:00
Artem Pavlenko
565da55742 + point symbolizer opacity patch from Brian (openstreetmap@brian.quinion.co.uk) 2008-09-19 08:27:32 +00:00
Artem Pavlenko
1947a1293e removed multiple bases for now 2008-09-17 20:10:04 +00:00
Artem Pavlenko
beec0d6a03 use text_symbolizer,symbolizer_with_image as bases 2008-09-15 08:46:18 +00:00
Tom Hughes
72e21fa080 Make the python bindings for image views actually only return data 
from the view and not the whole image.
 2008-07-30 12:47:37 +00:00
Tom Hughes
e8935c4cf8 Fix brain fade - python cairo bindings should work again now. 2008-07-30 07:37:48 +00:00
Tom Hughes
018852148c Don't try and include cairo support in the python bindings if we 
haven't built mapnik itself with cairo support.
 2008-07-29 08:01:57 +00:00
Dave
b228feaa49 Fix the OGCServer (would always throw invalid image format errors) 2008-07-25 01:06:09 +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
Tom Hughes
4483d59797 Revert previous fix for #89 and add a new improved fix that enhances the 
value class to have a proper null type and do comparisions SQL style so
that null is neither equal nor not equal to other things.
 2008-04-12 15:22:27 +00:00
Tom Hughes
b0b61293b1 Link the python extension explicitly with the cairo libraries on Darwin. 2008-03-12 21:46:54 +00:00
Tom Hughes
2f67c036fe Make cairo components conditional on the relevant libaries etc existing. 2008-03-12 19:14:51 +00:00
Tom Hughes
06006d2f24 Add cairo support to the python bindings - needs Pycairo installed. 2008-03-12 00:37:53 +00:00
Artem Pavlenko
e1ea0a72db use range based 'parse' method 
transcode strings in filter expressions (default to utf8 input)
  -- we can use map definition *.xml to define encoding
  -- and in case of Python from
    # -*- coding: utf-8 -*-
  
utf8 encoded filters are working now.
 2008-02-26 11:43:49 +00:00
Artem Pavlenko
1625c760db implemented Image open method : 
im = Image.open("map.png")
 2008-02-19 11:28:20 +00:00
Artem Pavlenko
308e315432 added Unicode support based on ICU 2008-02-18 21:40:34 +00:00
Artem Pavlenko
84bd1fda6c don't prepend temp DESTDIT prefix to mapnik_pluigins_dir 2008-02-07 11:51:41 +00:00
Artem Pavlenko
2b832f5bc8 setjmp png patch from JonB 2008-02-07 10:14:14 +00:00
Artem Pavlenko
ecaf40475e fixed 2008-02-04 16:13:04 +00:00
Artem Pavlenko
af1c576593 add displacement method to set dx,dy 
add allow_overlap property
 2008-01-29 11:22:32 +00:00
Artem Pavlenko
3c5b7f02f3 applied freebsd patch from Beau Gunderson 2008-01-28 14:51:10 +00:00
Artem Pavlenko
651cdbe968 added support for saving images into Python String object 
(NOTE: some methods have different signitures now- API changed)
 2008-01-25 14:40:48 +00:00
Artem Pavlenko
78a0e6725b prepend DESTDIR to plugins path 
replace multiple directory separators
 2008-01-24 14:44:04 +00:00
Artem Pavlenko
0f49956a56 reflect 'allow_overlap' property in Python bindings 
(patch from rcoup)
 2008-01-07 10:23:02 +00:00
Artem Pavlenko
58f4431df1 support for palette based PNGs, user 'png256' as a format parameter (see updated rundemo.py) 2007-12-10 19:59:17 +00:00
Artem Pavlenko
4586586448 added convinence overloads for 'save_to_file' and 'render_to_file' 
Example:
	>>> from mapnik import *
	>>> im = Image(200,200)
	>> save_to_file('test.png',im) # Guess image type from file extension
	>> save_to_file('test.png,'jpeg',im) # Explicitly save as JPEG
 2007-12-06 12:14:29 +00:00
Artem Pavlenko
0e9c542d11 1.Added 'face_names' method which returns list of face names: 
>>> from mapnik import *
>>> for name in FontEngine.instance().face_names():
... 	print name
...
DejaVu Sans Bold
DejaVu Sans Bold Oblique

....

2. std::vector<std::string> is reflected as mapnik_.Names object

TODO: test if there are more then one face in the file
 2007-11-08 11:06:05 +00:00
Artem Pavlenko
a29f2b83c7 fixed enum wrappers issue (patch from John Leslie) 2007-11-05 09:28:26 +00:00
Artem Pavlenko
8d51cb421b 1. re-factored placement_finder to be more efficient. 'find_*' methods are templated on PathType. 
2. PostGIS plug-in - optional 'multiple_geometries' parameter to control how Multi* geometries built. 
3. MarkersSymbolizer (work in progress) to render vector shapes (markers) alonh a path with collision detection.
 2007-11-02 12:50:15 +00:00
Artem Pavlenko
b79b3a89ec Added 'intersect' method returning intersection envelope. 2007-10-21 09:51:03 +00:00
David
2cf8278f1d Generic python binding for mapnik::enumeration 2007-10-19 22:17:16 +00:00
David
1c5bbea587 workaround for enumeration python binding issue:: 
allow implicit conversion from long
 2007-10-14 13:39:11 +00:00
David
b2df387a9d - merged strict-xml-branch r530:532 to trunk: 
- libxml2 support
    - strict error handling while parsing XML map files
    - implemented save_map()
    - removed some duplicate defaults
    - all symbolizers with icons share a common base class now
 2007-09-25 18:47:12 +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
Artem Pavlenko
76572994b5 Applied mapnik-r511.patch from David Siegel: 
plugins/input/postgis/SConscript:
- added boost_thread-mt to darwin builds

demo/c++/rundemo.cpp:
- setBackground() is now set_background()

bindings/python/SConscript:
- added boost_thread-mt to darwin builds
- changed builder to LoadableModule which builds a so called "bundle"
   on darwin and a shared library on all other systems.
- LDMODULEPREFIX = '' 

SConstruct:
- freetype-config is now searched in the path.
 2007-08-28 10:12:38 +00:00
Artem Pavlenko
7411a5d2f7 applied patch from JonB - use platform dependend lib prefix when installing bindings (e.g. lib64 on x86_64) 2007-08-13 09:18:07 +00:00
Artem Pavlenko
99d04bbf08 removed set_alpha 2007-08-09 20:23:09 +00:00
Artem Pavlenko
d959701d5a 1. added boost::optional<T> to/form Python converter 
2. make background color optional (Map object)
3. exposed 'blend' method for Image object
 2007-08-01 09:59:23 +00:00
vspader
9fe4a94c98 Added minimum_distance property to text symbolizers. This prevents the same label from appearing within N pixels (across features). 
Shield symbolizer is now a subclass of text symbolizer.
Some small improvements to text rendering.
Fixed up placement finder for horizontal placement.
Cleaned up placement finder.
 2007-07-02 13:39:08 +00:00
Artem Pavlenko
cc3b5bece1 applied patch from jonb - glob for all *.ttf 2007-06-20 20:20:16 +00:00
Artem Pavlenko
ab149257ad added save_to_file method that works with Image object. 2007-06-12 19:30:58 +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
e8d5172a64 added convertions : 
std::pair<std::string,mapnik::value>  to Python tuple
mapnik::value -> PyObject
 2007-06-05 09:12:30 +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
8b74a301fb Be explicit about threading model 
Added THREADING enum options (defaults to 'multi')
 2007-03-22 10:54:44 +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
2bc9ef83cc - Improve exception handling and error displaying in the ogc server. 2007-03-13 01:17:03 +00:00
Jean-Francois Doyon
737fcdd516 - Add WSGI handler 
- Add a performance improvement that should make maps a little faster
 2007-03-05 03:20:35 +00:00
Jean-Francois Doyon
2513da8f79 - Add first draft of getfeatureinfo support with text/plain and text/xml support. 
- ignore a SCons file
- Add 'encoding' statement to the demo.
 2007-02-20 00:22: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
bf2859cee2 replaced Bistream Vera with DejaVu 2007-02-12 15:25:59 +00:00
Artem Pavlenko
fe313cdcd9 fixed property name 2007-02-05 11:53:00 +00:00
Artem Pavlenko
5b05ffe1a4 made text_placement a property. 2007-01-29 22:29:06 +00:00
Jean-Francois Doyon
836488a7c8 - Add support for text/plain GetFeatureInfo! 2007-01-25 01:50:11 +00:00
Artem Pavlenko
85f4bfc697 added queryable property and visible method to Layer (Python) 2007-01-09 11:23:19 +00:00
Artem Pavlenko
995980433e reflect feature's properties in Python 
(see wiki for more info and usage)
 2006-12-31 11:44:34 +00:00
Artem Pavlenko
b5cf9da686 1.added more accessors 
2.in tiff_reader check for valid file prior opening.
 2006-12-20 00:22:45 +00:00
Artem Pavlenko
659a012000 reflected Layer 'active' property in Python ( Thanks, Luiz Fernando Vital!) 2006-12-17 12:08: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
7d62c229d0 applied from patch from Krzysztof Godlewski : 
reflects scale_denominator(..) into Python
 2006-12-07 15:20:33 +00:00
Artem Pavlenko
05424a5f12 added query_point method that accepts lat,lon coordinates : 
>>> for f in m.query_point([ layer.name for layer in m.layers ].index('world'),51,0):
...     print f
...

feature (
  f_code:FA001
  fac_id:193
  id:3147
  na2:UK
  na3:E
  nam:ENGLAND
  tile_id:10
)

>>>
 2006-12-06 21:21:17 +00:00
Artem Pavlenko
af44541598 implemented query_map_point method on map object: 
fs = m.query_map_point(x,y)  # Map (screen) coordinates
   for feature in fs:
       print feature

TODO: provide interface to feature in Python, at the moment only __str__ implemented which dumps attributes
 2006-12-06 20:26:59 +00:00
Artem Pavlenko
258b91fad2 made width and height read-write 2006-12-05 16:32:53 +00:00
Artem Pavlenko
a4c81560fd added method 'render' with old signiture 
render(...)
    C++ signature:
    render(mapnik::Map, mapnik::Image32 {lvalue}) -> void*
 2006-12-05 15:43:52 +00:00
Artem Pavlenko
913b273f40 applied missing part from mapnik_tile patch 2006-12-04 20:12:58 +00:00
Artem Pavlenko
68bbcac872 Reflect featureset and feature classes in Python. Featureset follows Python iterator protocol e.g: 
ds = Shapefile(file="/../..")
    for f in ds.features_at_point(Coord(-2,51)):
        print f
TODO: 
    1.access to Feature properties
    2.feature_at_point to accept screen coordinates
    3.apply hit_test for geometries.
 2006-12-01 10:08:13 +00:00
Artem Pavlenko
4d4e9f5d91 Tiling patch from Toby allows for a selected pixel region within an extent 
to be rendered. This allows for a large extent (larger than can be
rendered into a single image in memory) to be rendered out as tiles.
Since the full extent is used for the placement calculations text
crossing tile boundaries will be consistent.

This method is a little inefficient when a large number of labels need
placed, an improved method would be to cache these placements between
tiles, but the attached is a start.

c++ users should simple call the render method with a start X and Y
coordinate specified, 

for (int TileX = 0;TileX < 5;++TileX)
{
	for(int TileY = 0;TileY < 5; ++TileY)
	{
		int TileSize=250;
		int StartX = TileX*TileSize;
		int StartY = TileY*TileSize;
		
		Image32 buf(TileSize,TileSize);
		agg_renderer<Image32> ren(m,buf,StartX,StartY);
		
		ren.apply();
		char name[324];
		sprintf(name,"tile_%d_%d.png",TileX,TileY);
		ImageUtils::save_to_file(name,"png",buf);
	}
}

python users should call render_tile_to_file

for y in range(tile_count_y):
	for x in range(tile_count_x):
		if not os.path.exists("tiles/%d/%d/" % (map_scale, y)):
			os.makedirs("tiles/%d/%d/" % (map_scale, y))
		render_tile_to_file(m, x*tile_size, y*tile_size, tile_size, tile_size,
'tiles/%d/%d/%d.png' % (map_scale,y,x), 'png')
 2006-12-01 09:37:37 +00:00