Commit graph

1326 commits

Author SHA1 Message Date
Dane Springmeyer
b89f468eaf add support for using CDATA with libxml2 parser. New tests for filters work nicely - TODO add datasource tests for CDATA in sql 'table' param 2009-11-11 23:37:57 +00:00
Artem Pavlenko
6e48eb3504 Revert "+ add templated operator==" -- not
a good idea at all :). TODO!

This reverts commit da976bb51f8e47e93ab1c42e41501db30c149b8b.
2009-11-11 11:11:18 +00:00
Artem Pavlenko
71b28a0914 + add templated operator== 2009-11-11 10:56:21 +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
d2f3e669b0 * correct operator= implementation 2009-11-08 10:35:36 +00:00
Artem Pavlenko
9f51cfdede + apply mapnik formatting
+ change order of template specialization (tidy)
2009-11-08 10:35:29 +00:00
Dane Springmeyer
4df684c50e PointSymbolizer serialization was missing 'opacity' and 'allow_overlap' 2009-11-06 20:56:34 +00:00
Dane Springmeyer
d1f1f6971b avoid loss of true black on BIG_ENDIAN 2009-11-02 23:55:16 +00:00
Dane Springmeyer
c29c8b459e add BIG_ENDIAN support to graphics rectangle methods 2009-11-02 22:48:39 +00:00
Dane Springmeyer
878143960e support BIG_ENDIAN and jpeg output 2009-11-02 20:55:26 +00:00
Dane Springmeyer
f8248faf4d support BIG_ENDIAN and png256 2009-11-02 20:54:35 +00:00
Dane Springmeyer
1b4443e800 add support for BIG_ENDIAN to 'blendPixel2', to support propertly colored text labels 2009-11-02 19:57:02 +00:00
Dane Springmeyer
8e5d4368bb add missing header so that MAPNIK_BIG_ENDIAN is propertly defined 2009-11-02 19:18:52 +00:00
Dane Springmeyer
29afe237c8 add postgres int8 type to collected attributes - #384 2009-10-22 21:42:40 +00:00
Dane Springmeyer
5e16e04b28 gdal: ensure scaling is available within raster_symbolizer at necessary scales by avoiding pre-scaling in gdal RasterIO 2009-10-22 16:58:03 +00:00
Dane Springmeyer
786242eb9d update changelog 2009-10-21 21:26:26 +00:00
Dane Springmeyer
34f2214396 apply alternative method of comparing map and layer bounds to support PointDatasource (patch from phispi, test from JRohrer), closes #402 2009-10-21 21:24:44 +00:00
Dane Springmeyer
6720a031cf add David Eastcott (r1341) and Aubrey Holland (r1346) to authors for recent patch contributions 2009-10-20 23:22:44 +00:00
Artem Pavlenko
2dcf88b392 + wall-clock timer from auf
(see #439 for more details)
2009-10-20 20:32:53 +00:00
Dane Springmeyer
d51a76c5e8 add a test (currently fails) to test object introspection down to symbolizer level once objects have been placed in the map 2009-10-19 23:46:38 +00:00
Artem Pavlenko
a78e51ec56 + avoid duplicate code 2009-10-19 15:16:16 +00:00
Artem Pavlenko
7b1ce33477 + propser svn:ignore recursively 2009-10-19 14:57:11 +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
Artem Pavlenko
a3a5859466 Patch from David Eastcott :
1.  Modified Text Symbolizer

  a) corrected line fragment centering (for 2nd and subsequent lines, when line breaks occur).

  b) adjusted vertical alignment calculation so that:
      i)      middle -> has the center of the text line(s) at the point origin
      ii)     bottom -> has the text line(s) below the point origin
      iii)    top -> has the text line(s) above the point origin

  c) added new text_symbolizer attribute: 'wrap_before', value range: true/false, default == false

     allows line breaks at first wrap_char before wrap_width as an alternative to the original
     which was to create the line break at the first wrap_char after wrap_width

  d) added new text_symbolizer attribute: 'horizontal_alignment', value range: left/middle/right, default == middle
      i)      left -> has all text line(s) to left of the point origin
      ii)     middle -> has all text line(s) centered on the the point origin
      iii)    right -> has all text line(s) to the right of the point origin

      NOTE:   dx, dy position adjustments are applied after alignments and before Justify.

  e) added new text_symbolizer attribute: 'justify_alignment', value range: left/middle/right, default == middle
      i)      left -> after alignments, has all text line(s) are left justified (left to right reading)
      ii)     middle -> after alignments, has all text line(s) center justified
      iii)    right -> after alignments, has all text line(s) right justified (right to left reading)

  f) added new text_symbolizer attribute:  'opacity', value range: 0.0 thru 1.0; 1.0 == fully opaque

  g) modified positioning to compensate for both line_spacing and character_spacing, to ensure proper
     centering of the text envelope.  Also ensure that centering occurs correctly even if no wrapping
     occurs.  Line spacing is uniform and consistent and compensates for errors between text_size and
     the actual size (ci.height is inconsistent, depending on case and character); fixes issue with
     multi-line text where some lines have a slight gap and others are compressed together.


2.  Modified shield_symbolizer

  a) added the attributes:
      i)      allow_overlap
      ii)     vertical_alignment
      iii)    horizontal_alignment
      iv)     justify_alignment
      v)      wrap_width
      vi)     wrap_character
      vii)    wrap_before
      viii)   text_convert
      ix)     line_spacing
      x)      character_spacing
      xi)     opacity

  b)  added new shield_symbolizer attribute: 'unlock_image', value range: true/false, default == false
      i)  false == image and text placement behaviour same as before
      ii) true == image placement independant of text, image is always centered at geometry point, text placed per attributes,
                  dx/dy only affect text.

      Allows user to create point markers with text, but both the text and image rendering collision detection are done
      as a pair (they come and go together - solves problem if using point_symbolizer and text_symbolizers where one or the
      other are omitted due to overlaps, but not both)

  c)  extended choices for the attribute 'placement' to include vertex; effect is limited to the shield_symbolizer

      Allows an attempted placement at every vertex available, gives additional shield placement volume when using line geometry

  d)  ensured that the text placement was not updating the detector unless a shield image was actually placed.

  e)  added new shield_symbolizer attribute: 'no_text', value range: true/false, default = false

      When set true, the text for the feature is ignored ('space' subsituted) so that pure graphic symbols can be used
      and no text is rendered over top of them.
2009-10-19 13:52:53 +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
a0411b8d4c postgis: make sure to close the attribute collection resultset and print the type name of unknown oid attribute values when in debug 2009-10-14 17:42:27 +00:00
Dane Springmeyer
60ca6a5677 postgis: allow for altering the default behavior of keeping open postgresql connections until the whole process ends - when 'persist_connection' = false new connections will be opened and closed for each datasource instance. (closes #434) 2009-10-14 04:21:46 +00:00
Dane Springmeyer
eee88806b8 remove testing debug line 2009-10-12 05:27:16 +00:00
Dane Springmeyer
27fbc4549d change the method for calculating offsets to pass to GDALRasterIO, as the 'start_x, start_y' implementation added in r1321 was leading to large shifts in 1-banded srtm data without overviews - this new approach works with and without overviews and also with 3 band rbg data. Also added more debug output. 2009-10-12 05:25:36 +00:00
Dane Springmeyer
6d3dcdeac6 add a bit more debug printing to gdal plugin and make raster width and height class attributes 2009-10-12 04:09:36 +00:00
Dane Springmeyer
56f0c33465 format raster plugin to only print output in debug mode 2009-10-12 03:58:11 +00:00
Dane Springmeyer
7785461d1f remove testing debug line from gdal plugin 2009-10-11 16:12:36 +00:00
Dane Springmeyer
e6306010f8 when a SQL query sent to postgres fails, output the whole thing so users know what mapnik tried to send (as the PSQL error hint truncates the sql) 2009-10-02 05:16:15 +00:00
Dane Springmeyer
2a880432d3 fix typo 2009-09-30 19:42:52 +00:00
Dane Springmeyer
ce5bfdaf5b set proper mime type 2009-09-30 19:00:43 +00:00
Dane Springmeyer
9305023369 add unifont from unifoundry.com (for ease of use for OSM styles/fonset), and upgrade dejavu fonts to 2.30 2009-09-30 18:59:05 +00:00
Dane Springmeyer
fdb64c27d8 add dave to committers list for his label work 2009-09-30 18:43:48 +00:00
Dane Springmeyer
ba9376626a add a filter parsing alias of '!=' for '<>' - closes #427 2009-09-29 23:40:40 +00:00
Dane Springmeyer
5fccc3ae62 improve formatting of error message during xml loading if document is not well formed 2009-09-28 17:35:50 +00:00
Dane Springmeyer
4367b813a8 cleanup up gdal featureset code, removing old or unneeded debug lines 2009-09-28 16:56:01 +00:00
Dane Springmeyer
a4245a9b4a clear out test_api folder when test python api docs are rebuilt 2009-09-27 17:46:18 +00:00
Dane Springmeyer
baaf45e298 enable fuller PointSymbolizer test now that #114 is closes 2009-09-27 17:45:52 +00:00
Dane Springmeyer
c808cf62b9 add support for gdal overviews to the Gdal Plugin (use http://www.gdal.org/gdaladdo.html to build overviews) - modified patch from gdalcolors branch from Alberto Valverde (I removed dependence on color/masking code until that support lands in trunk) - addresses #54 2009-09-27 17:23:09 +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
f637ed6cf8 fix typo in rundemo.py found by szotsak - closes #419 2009-09-27 02:55:31 +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
78fd5dc89a avoid deprecation warnings with boost 1_40 related to location of property_map.hpp 2009-09-25 22:08:52 +00:00