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

631 commits

Author SHA1 Message Date
Artem Pavlenko
484dce8943 + impl transform parameter (follow SVG spec) in point_symbolizer 2010-06-01 15:27:19 +00:00
Artem Pavlenko
b5362aa71a + tidy 2010-06-01 13:31:29 +00:00
Artem Pavlenko
9beb12b56b + split agg_renderer impl into different 
translation units
+ add SVG support in point_symbolizer
 2010-06-01 13:31:18 +00:00
Artem Pavlenko
12b74bc1cc + split agg_renderer implementation into diff 
translation units
 2010-06-01 13:31:08 +00:00
Dane Springmeyer
33145b18ae fix default initializations in markers_symbolizer 2010-05-30 16:09:39 +00:00
Dane Springmeyer
89f6b32b76 apply patch from Herm from #553 adding support for markers_symbolizer to Cairo renderer, new placement finder, and fill/spacing/overlap options - works nicely with new svg support being tested against markers_symbolizer 2010-05-30 03:16:51 +00:00
Dane Springmeyer
c9a4433666 make sure to return marker from cache, as noticed by Herm and mentioned in #553 2010-05-30 03:09:22 +00:00
Artem Pavlenko
f1986d1b85 + remove expat deps 
+ correct includes
 2010-05-28 16:34:58 +00:00
Artem Pavlenko
83c0f1ca59 + remove agg_svg_parser 2010-05-28 16:34:45 +00:00
Artem Pavlenko
a15e86e528 + add libxml2 based svg parser implementation 2010-05-28 16:34:34 +00:00
Artem Pavlenko
6a5ea3f1a1 + SVG markers rendering 2010-05-27 14:21:31 +00:00
Artem Pavlenko
bb0ae08280 + marker_cache impl 2010-05-27 11:41:02 +00:00
Artem Pavlenko
823b7ba0fc + SVG markers initial import 2010-05-27 11:19:09 +00:00
Artem Pavlenko
4584b05ff0 + small correction 2010-05-27 11:18:53 +00:00
Artem Pavlenko
e6e165f1e0 + use path-like geometries 2010-05-27 10:20:41 +00:00
Artem Pavlenko
cbf1356e4d + parse 'orientation' parameter 2010-05-27 10:20:10 +00:00
Artem Pavlenko
2085b3bc08 + apply orientation from text_symbolizer 
+ fix building symbolizer
 2010-05-27 10:20:03 +00:00
Artem Pavlenko
258a62616e + implement rotated text logic in placement finder 2010-05-27 10:19:47 +00:00
Artem Pavlenko
77c31e8643 + add orientation parameter 
orientation="<expr>" e.g
  orientation="10+35" -> rotate by 45 degrees anti-clockwise
  (TODO: consider using standard SVG transform!)
 2010-05-27 10:19:39 +00:00
Alberto Valverde
38e1570b8b added a max_value attribute to color_band to handle the case of the last band more gracefully 2010-05-06 07:21:11 +00:00
Dane Springmeyer
a688c36fdb serialize the experimental MarkersSymbolizer and avoid serializing defaults of GlyphSymbolizer unless requested 2010-04-15 21:42:28 +00:00
Dane Springmeyer
63ab05c112 ensure proper setting of allow_overlap and opacity when contructing a point_symbolizer without an image file 2010-04-15 06:09:21 +00:00
Artem Pavlenko
c20f16358c + save PolygobSymbolizer properties as attributes 2010-04-09 18:47:27 +00:00
Artem Pavlenko
23aac57a1f + use attributes instead of CssParameter 2010-04-09 18:47:19 +00:00
Artem Pavlenko
f776f8cd1e + add dash_offset 2010-04-09 18:46:41 +00:00
Artem Pavlenko
ca20f80ea8 + use attributes for LineSymbolizer properties 2010-04-09 18:46:33 +00:00
Artem Pavlenko
5fcc311764 + add stroke-dashoffset property 
+ replace <CssParameter name='xxx'>yyy</CssParameter>
   element with 'xxx'=yyy attribute
 2010-04-09 18:46:25 +00:00
Artem Pavlenko
5890f17df3 + directly ctor default mapnik::color to avoid css color parsing 2010-03-24 18:02:10 +00:00
Artem Pavlenko
1a2b320252 + sanitize header inclusion a bit 2010-03-24 18:01:53 +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
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
2e04c5422a fixed serialization of expressions in glyph_symbolizer 2010-03-19 11:20:16 +00:00
Alberto Valverde
2d601f1bd7 fixed color's to_string method since alpha seems to no longer be parsed as a double. serializing a color to xml and deserializing it back did not work before 2010-03-19 11:20:00 +00:00
Alberto Valverde
aea5dd563a XML de/serialization for glyph_symbolizer. Some issues remain regarding unicode expr 2010-03-19 11:19:43 +00:00
Alberto Valverde
1e2ffb22b7 cairo rendering for the glyph_symbolizer. Small refactoring in cairo_context::add_text to pass the paramaters which were picked up from the text_symbolizer param (size, fill, halo_radius and halo_fill) explicitly. This allows the glyph_symbolizer to piggy back on that functionality without specilizing add_text() for the glyph_symbolizer (which would have involved heavy amounts of copy+paste or a more elaborate refactoring strategy. Please ping me if this was not a good idea 2010-03-19 09:33:57 +00:00
Alberto Valverde
e91c41e494 removed unneeded parenthesis 2010-03-19 09:33:41 +00:00
Alberto Valverde
f5409000f3 cosmetic changes and comments 2010-03-19 09:33:25 +00:00
Alberto Valverde
d098c98c5e pre-eliminary GlyphSymbolizer implementation. TODO: XML de/serializing. more tests. remove workaround mentioned in test 2010-03-18 20:05:08 +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
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
Dane Springmeyer
d7256295ae port r1680/r1683/r1690 from 0.7.1-dev branch to trunk 2010-03-12 18:23:06 +00:00
Alberto Valverde
e9748abc5f xml de/serialization support for RasterColorizer 2010-03-12 14:49:50 +00:00
Alberto Valverde
807881c47a XML deserialization support for a raster_symbolizer with a colorizer 2010-03-12 14:49:34 +00:00
Alberto Valverde
2f1d60b666 pre-eliminary raster coloring support 2010-03-12 13:34:13 +00:00
Dane Springmeyer
6b76b3b9e8 properly serialize the map_buffer when saving map 2010-03-11 23:21:22 +00:00
Dane Springmeyer
3a44dd3258 + use rint(v) instead of int(round(v)) + add rint implementation - msvc hasn't got one + minor cleanups 2010-03-11 23:19:12 +00:00
Artem Pavlenko
c3a0b1a72f + revert to a024c947499994e1e8aaaff2b8ea73a8eec489dd 2010-03-08 11:55:15 +00:00
Dane Springmeyer
b8511eca65 restore default behavior of PointSymbolizer when used without an image, by defaulting to 4x4 black pixel - TODO - expose colors, shapes, and size for this in the future 2010-03-03 03:26:12 +00:00
Dane Springmeyer
b540dab73b apply slighly modified (env->box2d) mapnik-trunk.mr.raster-position2.diff from mar_rud to close #475 2010-03-03 03:23:53 +00:00
Dane Springmeyer
dd36810321 print warning if images are not found 2010-03-02 03:31:50 +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
e03c997024 assume byteorder arrives in native arch (from postgis), and therefore ensure byteswapping for wkb on big endian systems - closes #515 - TODO check breakage in other plugins as per #516 - thanks Brad Simpson for the report and fix 2010-02-19 07:50:47 +00:00
Dane Springmeyer
2cd0b55e88 enforce default gamma function - improves upon #428, closes #512 2010-02-09 17:28:17 +00:00
Dane Springmeyer
c3ea59c3c8 don't pass expression_ptr as const 2010-02-03 18:36:01 +00:00
Artem Pavlenko
05f5473924 + correct image bonding box calculation 
+ check for zero sized images
 2010-02-03 12:19:49 +00:00
Dane Springmeyer
ede29a1aff image 'type' is not longer needed or used so don't attempt to parse from XML 2010-02-01 21:32:09 +00:00
Dane Springmeyer
1af24f1eb8 Serialize FontSet instead of font_set as that is what the loader expects 2010-02-01 21:31:14 +00:00
Dane Springmeyer
c950e38a46 reenamble python access to TextSymbolizer 'name' expression 2010-01-30 03:08:03 +00:00
Dane Springmeyer
d599067a14 restore pretty printing of xml output (indent=4) now that we are using the new boost ptree which changed its defaults 2010-01-30 02:05:01 +00:00
Dane Springmeyer
aef4d350be repair serialization of XML filters and Text/ShieldSymbolizer 'name' attribute, which are how properly converted from expressions into strings 2010-01-30 00:47:06 +00:00
Dane Springmeyer
b1660b2152 fix formatting 2010-01-30 00:44:35 +00:00
Dane Springmeyer
da8ddb09ab gah, use the version header that actually exists for older versions of icu 2010-01-29 19:40:26 +00:00
Dane Springmeyer
05654f18bc quick fix to allow compiling without unicode regex support to enable builds against ICU <4.2 2010-01-29 19:22:15 +00:00
Dane Springmeyer
9b69f65ea9 add backwards compatibility support to the expressions parser so that the TextSymbolizer and ShieldSymbolizer 'name' parameter (and others in the future) syntax is understood as pre-0.8.0 syntax, while printing a deprecation warning - should allow older stylesheets to be used with Mapnik 0.8.0 - addresses #501 2010-01-26 23:03:42 +00:00
Dane Springmeyer
52d08e7d1a restore reading of paths relative to xml as default=true, print xml filename when errors are encountered, and remove unneeded check for pointsymbolizer file type which is now automatically handled in parse_path() 2010-01-26 22:54:03 +00:00
Dane Springmeyer
0fbd46a045 report the map/xml name when an error is encountered when loading a map 2010-01-25 19:10:01 +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
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
e5673e239b increment ABI versions 2010-01-11 18:53:50 +00:00
Dane Springmeyer
f87790cd5b merge a few small 0.7 branch changes back into trunk 2010-01-11 00:36:51 +00:00
Dane Springmeyer
6abbfca492 fix default values for vertical_alignment in the TextSymbolizer and ShieldSymbolizer - closes #468 2010-01-07 02:21:07 +00:00
Dane Springmeyer
9750e6cd24 fix memory leak in load_map when using libxml2 by freeing the libxml tree as per http://xmlsoft.org/xmlmem.html - closes #473 - thanks mishok13 for the detailed report and testing 2010-01-01 22:41:43 +00:00
Artem Pavlenko
47dc1e197b + merge mapnik2 to trunk 2009-12-16 20:02:06 +00:00
Dane Springmeyer
5e2e6a76ad apply fixes from David Eastcott originally applied to 0.7 branch 2009-12-13 23:30:36 +00:00
Dane Springmeyer
bd0a1ee08f cherry pick one more changeset from mapnik2 into trunk 2009-12-07 06:43:02 +00:00
Dane Springmeyer
c01d1d0c69 integrate a few changes from mapnik2 branch - making sure to pass strings by const ref + formatting 2009-12-07 04:15:17 +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
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
0e18aa63cd add feature to Map node to allow for throwing a friendly error if the map styles use features not supported by the installed mapnik version - thanks Ldp for the review - closes #395 2009-12-05 03:58:48 +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
75d67f4b43 only serialize non-default values for layers as well as styles 2009-11-16 00:04:47 +00:00
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
d2f3e669b0 * correct operator= implementation 2009-11-08 10:35:36 +00:00
Dane Springmeyer
4df684c50e PointSymbolizer serialization was missing 'opacity' and 'allow_overlap' 2009-11-06 20:56:34 +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
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
d9d15bb081 avoid segfault when pickling a TextSymbolizer using wrap_character by removing const declaration 2009-09-25 20:29:03 +00:00
Dane Springmeyer
767afe3f76 scons: pull exact libagg name out of env['LIBS'], since on debian we are actually needing to link to 'libagg_pic' 2009-08-28 15:44:06 +00:00
Dane Springmeyer
0519584644 scons: make sure to still link to libagg even if internal lib is not used - need because before r1196 we were not filtering out libs 2009-08-27 23:18:09 +00:00
Dane Springmeyer
5c184a5075 load_map: improve formatting of error message within layer 2009-08-27 04:48:32 +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
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
8850d19bfc in load_map, fix type declaration for dx,dy as double 2009-07-24 07:24:36 +00:00
Dane Springmeyer
286ad12c47 add method to save a map to a string (closes #396) 2009-07-24 06:15:58 +00:00
Dane Springmeyer
e0c9e5c826 add missing serialization of building symbolizer height, be explicit of double in polygon_symbolizer 2009-07-24 06:10:42 +00:00
Artem Pavlenko
85ecc33d7f + applied patch from Jochen Topf : 
* text_convert="none|toupper|tolower"
 Convert all text to upper/lower case before rendering. "none" doesn't do
 anything with the text and is the default. Works for labels along lines
 or at points.

* line_spacing="<number>"
 Add this many pixels space between two lines in text labels that have
 been broken into several lines. Default is 0. Doesn't do anything for
 labels along lines.

* character_spacing="<number>"
 Add this many pixels space between two characters in a text. Default is 0.
 Currently only works for text labels on point geometries. This should
 also be implemented for labels along lines, but I'll leave that for
 another day.

* wrap_character="<character>"
 Instead of breaking text into lines on spaces, use this character. This
 is useful, when you want to make sure that labels are broken at the right
 spot. Note that you'll probably want to make wrap_width small so that
 your lines are actually broken, otherwise you'll see the wrap_character
 in the output. Default is ' ' (space). Doesn't do anything for labels
 along lines.
 2009-07-20 15:30:19 +00:00
Artem Pavlenko
cba404058e + formatting 2009-07-13 22:36:16 +00:00
Dane Springmeyer
817720e1c5 increment ABI version numbers 2009-07-09 01:16:52 +00:00
Dane Springmeyer
f8559c07b6 remove unneeded header 2009-07-08 23:01:36 +00:00
Artem Pavlenko
6e993fb388 + added <iostream> header 2009-07-08 21:26:40 +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
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
Dane Springmeyer
e26e46788a better formatting of error when plugin lib can't be loaded 2009-07-07 23:44:12 +00:00
Artem Pavlenko
a6075c97b5 + fixed read_coord method 2009-07-07 19:00:55 +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
8d820d4761 + use boost::scoped_ptr 2009-07-03 09:25:18 +00:00
Dane Springmeyer
1ce6266738 more robust cairo lib addition - addresses #371 2009-06-30 22:12:11 +00:00
Dane Springmeyer
40adc2c03f limit linking to libmapnik by selectively specifying libraries - closes #371 2009-06-30 21:58:05 +00:00
Artem Pavlenko
186236cba6 + replace 'long long' with int64_t 2009-06-29 14:15:31 +00:00
Artem Pavlenko
71786bff63 + applied patch 'avoid_edges' from albertov, thanks! 2009-06-25 20:06:01 +00:00
Dane Springmeyer
eed058f034 fix scope issue in previous commit 2009-06-22 07:19:02 +00:00
Dane Springmeyer
14ef2b36f0 expose list of registered plugins as a 'plugin_names()' method of DatasourceCache similar to the FontEngine.face_names() - closes #246 2009-06-22 06:59:56 +00:00
Dane Springmeyer
7eb01c0be4 +make cairo compilation conditional on CFLAG (as well as Scons) like bindings/python/python_cairo.cpp 2009-06-08 19:43:49 +00:00
Dane Springmeyer
bc463c2a75 use BOOST_BIG_ENDIAN instead of WORDS_BIGENDIAN 2009-06-08 07:08:30 +00:00
Dane Springmeyer
e7aff375db std namespacing 2009-06-03 05:26:46 +00:00
Dane Springmeyer
07597bc594 fix interpretation of SheildSymbolizer displacement values as doubles in load_map.cpp- closes #353 2009-06-01 02:13:32 +00:00
Dane Springmeyer
8d6c5dac6b fix interpretation of TextSymbolizer displacement values as doubles in load_map.cpp- closes #353 2009-06-01 02:11: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
7d9ac2a094 add missing include 2009-05-19 22:59:56 +00:00
Dane Springmeyer
fd98a4a49a shuffle guess_type to image_utils for logical re-use 2009-05-19 22:43:54 +00:00
Dane Springmeyer
13fa57e61f expose setting of symbolizer_with_image filename 2009-05-14 22:54:36 +00:00
Dane Springmeyer
6c8a5f805a xml: make sure to explicitly declare the default relative_paths option as true - thanks Ldp 2009-05-06 23:42:28 +00:00
Dane Springmeyer
404a43f5f0 +ensure relative paths to symbols and datasources in xml are based on working directory of xml file, added 'paths_from_xml' parameter that is true by default but can be made false to maintain previous behavior - closes #326 (has no effect on load_map_from_string) 2009-05-01 01:59:01 +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
Lucio Asnaghi
158989fc56 + fix text_symbolizer support for vertical_alignment in save_map() (closes #328) 2009-04-28 21:23:43 +00:00
Dane Springmeyer
4226f293b2 Add ABI info to os x dylib - closes #322 2009-04-26 04:28:00 +00:00
Dane Springmeyer
3dd616007d Add FULL_LIB_PATH option for OS X to link in the full path to libmapnik.dylib in the library itself 2009-04-26 03:33:29 +00:00
Dane Springmeyer
b46996ff8b catch error and raise UserWarning if an input plugin cannot be found during load_map() - closes #302 2009-04-13 23:22:00 +00:00
Artem Pavlenko
d100cb7587 + this change was needed to avoid raster tiles alignment problems 
TODO: Review raster handling pipeline to ensure correct alignments across all sources.
 2009-04-10 12:07:13 +00:00
Dane Springmeyer
544cbb249a Apply patch from Marcin to handle smooth transitions between raster layers for both gdal and raster plugin - closed #295 2009-04-07 23:06:51 +00:00
Dane Springmeyer
4276ae24fe allow customization of JPEG output image quality using syntax similar to png256, but using 0-100 as suffix, e.g. render_to_file(m,'image.jpeg','jpeg80') - closes #198 - patch from Dennis Luxen 2009-04-07 15:48:51 +00:00
Andreas Volz
42d659a19f compile utils with autotools 2009-04-04 16:33:25 +00:00
Artem Pavlenko
4a3a9128ec + move compositing modes implementation out of Image class 2009-03-31 10:08:33 +00:00
Artem Pavlenko
0b20e2a768 + removed specializations for text renderer 2009-03-31 09:23:23 +00:00
Dane Springmeyer
5d976513b8 scons: remove print statement of PREFIX introduced in r1043 2009-03-30 23:32:36 +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
Artem Pavlenko
2eec236fc2 + applied "hill shading" patch from Marcin Rudowski 
a) Raster opacity
   b) Raster merging modes (TODO:add more modes, consider agg impl)
   c) Raster scaling algos: fast,bilinear,bilinear8
      (TODO: add alpha support in bilinear8) 
   d) improvements to png256

   *Great work, thanks!*
 2009-03-29 11:05:20 +00:00
Artem Pavlenko
ae568d3223 make text_symbolizer behave like shield_symbolizer 2009-03-29 09:46:02 +00:00
Artem Pavlenko
e598348e56 + only allow LINE_PLACEMENT for geometries with more than one point 2009-03-29 09:37:51 +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
Artem Pavlenko
570fe611f4 + qualify 'value' to avoid names clashing 
+ use _enumeration helper wrapper
 2009-03-21 12:39:06 +00:00
Artem Pavlenko
fb186a5269 disable libtiff warning handler 2009-03-15 23:32:36 +00:00
Lucio Asnaghi
556095af04 - sqlite.input: added row_offset and row_limit to parameters 
- sqlite.input: added wkb_format parameter for selecting WKB format (generic/spatialite)
- sqlite.input: commented check of the spatial index
- wkb.hpp: removed wkqSQLite in favour of wkbSpatiaLite
 2009-02-23 15:00:25 +00:00
Andreas Volz
3c1b67ccd4 missed color class 2009-02-18 22:54:51 +00:00
Andreas Volz
1dc3aae33e profiling 2009-02-18 22:25:02 +00:00
Artem Pavlenko
56b15031d0 + support load_map_string for all xml parsers 2009-02-18 00:33:26 +00:00
Artem Pavlenko
97a40d7e7e + fix msvc-9.0 compiler warnings 2009-02-17 23:19:28 +00:00
Dane Springmeyer
b90f620901 + inherit libmapnik ABI version from environment (now calculated in SConstruct) 2009-02-17 20:32:46 +00:00
Jon Burgess
5a216d01b5 Read spacing parameter on ShieldSymbolizer from XML 2009-02-16 21:45:32 +00:00
Jon Burgess
d1b365098f Includes png.h early to avoid ordering issues with setjmp.h. Fixes #231 2009-02-15 11:56:54 +00:00
Lucio Asnaghi
2c81706eb5 Following #223: 
+ improvements to the wkb converter
+ improved sqlite index usage
+ added more parameters to sqlite datasource
 2009-02-10 19:09:16 +00:00
Artem Pavlenko
7d2f492ef2 + sqlite-input-plugin.patch (kunitoki) 
+ wkb-sqlite.patch (kunitoki)
+ very preliminary spatial index support (idx_<tablename>_<geometry_field>)
 2009-02-09 19:43:57 +00:00
Jon Burgess
79c350678a The final line_to is not required in the WKB reader since the last and first points of the polygon geometry will be the same 2009-02-07 23:43:53 +00:00
Jon Burgess
d11654895b Utilise color alpha information when rendering. Multiplies the color alpha with the rendering opacity. Fixes 221. 2009-02-07 14:09:23 +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
e27a71cc39 + mapnik_text_overlap.patch (Marcin Rudowski) 2009-02-02 23:37:16 +00:00
Artem Pavlenko
866f5f98eb + implement buffered_extent method on Map object 2009-02-02 23:07:18 +00:00
Artem Pavlenko
fbb102b975 + changed operator* and operator/ behaviour as per #206 2009-02-01 12:15:30 +00:00
Artem Pavlenko
f657a2dfe4 + Alpha background patch for Cairo (Berteun) 2009-01-29 15:27:27 +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
Artem Pavlenko
6f98c95c1f + mapnik-fix-cairo-polygon-patterns.patch (jonb) 2009-01-24 18:02:33 +00:00
Artem Pavlenko
78f10770ec mapnik-polygon-symbolizer-wants-fill-opacity.patch (jonb) 
The save_map & load_map disagree about the name of the CSS parameter
 for the opacity in PolygonSymbolizer. Make them consistent changing
 save_map to output fill-opacity.
 2009-01-21 15:41:44 +00:00
Artem Pavlenko
6c0977099d + mapnik-use-rgba-in-color-to-string.patch (jonb) 
Make color::to_string() generate appropriate rgb() or rgba() strings
depending on alpha() value. It also changes the alpha range to be
0.0-1.0, not 0-255.
 2009-01-21 15:37:55 +00:00
Artem Pavlenko
5b5eb9d2ee + support building with < 1.34 (e.g. 1.33.1) boost libraries 2009-01-19 22:53:05 +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
97ad49c067 + mapnik-load-map-checks.patch (jonb) 
This patch adds more reporting of unknown elements during parsing. This
  helps catch some typos etc. It also consistently skips <xmlcomment>'s
  which used to cause errors when used in some places.
 2009-01-17 23:53:04 +00:00
Artem Pavlenko
bf598cf487 + mapnik-check-fonts-during-load-map.patch from jonb 
This patch adds some extra exceptions for missing fontsets.
  Without this checking, you only notice the error at rendering time when
  it first needs to render a missing font.

  It also cleans up the font exception messages which were displaying the
  font name twice.

  Some minor questions:
  * Should I wrap the fontset exceptions with if(strict_)?
  * Should strict default to true?
 2009-01-17 20:52:24 +00:00
Artem Pavlenko
387ff213ef + mapnik-serialize-fontset.patch from jonb 
This adds the fontset support into save_xml
 - Adds fontset_name into the text attributes
 - Adds the fontset definitions
 - glue to read fontsets from map
 2009-01-17 20:18:41 +00:00
Artem Pavlenko
cad0a839b6 + mapnik-load-map-from-string.patch (jonb) 2009-01-15 23:51:07 +00:00
Artem Pavlenko
32d21d7c80 + use fully qualified names from stl 2009-01-15 23:12:56 +00:00
Artem Pavlenko
e3658a7a1a + applied mapnik-image32-from-cairo.patch (jonb) 2009-01-15 22:51:12 +00:00
Artem Pavlenko
fe20652629 + removed unused parameter from has_point_placement 2009-01-14 12:34:56 +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
Artem Pavlenko
54f4d3bc51 + corrected init order 2009-01-13 01:35:27 +00:00
Artem Pavlenko
a11cc119e4 + applied intersection patch from randomjunk - #127 2009-01-13 00:35:45 +00:00
Dane Springmeyer
a97bbb52af Avoid serialization of maxzoom if value is infinity (default) 2009-01-11 20:09:32 +00:00
Dane Springmeyer
68e784dfdd + add load_map() and save_map() support for reading and writing of abstract, title, minzoom, maxzoom, and queryable attributes 2009-01-11 18:55:29 +00:00
Artem Pavlenko
8c81b688a2 + don't link to iconv on OSX 2008-12-07 16:27:06 +00:00
Artem Pavlenko
65ea5bca98 + applied mapnik-skip-projection-if-equal.patch (jonb) 2008-12-07 16:23:57 +00:00
Artem Pavlenko
7cbb0ab35a + added support for 'min_distance' for 'POINT' label placement. 2008-11-21 12:48:19 +00:00
Artem Pavlenko
6062f42bbe + applied patch avoid_extent from rcoup 2008-11-19 21:50:12 +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
Tom Hughes
9408a41a5c Add opacity support to the point symbolizer - taken from r743 which 
added the same support to the agg renderer.
 2008-10-31 00:51:41 +00:00
Tom Hughes
9d6a7f1075 Port shield placement enhancements from r741 and r745 from the agg 
renderer to the cairo renderer. Should close #136.
 2008-10-31 00:39:22 +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
11100cf30e + apply has_dimensions for line_placement only 2008-09-21 10:42:51 +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
3b85ebad9b make shield_symbolizer to work with point geometries (TODO!!) 2008-09-15 08:48:21 +00:00
Dominic Hargreaves
2d6bdf0a4d Add missing #include to fix GNU/kFreeBSD build 2008-08-09 22:16:58 +00:00
Andreas Volz
bd2b9e2ea0 - add new files 
- optional check for gdal
 2008-08-02 20:39:26 +00:00
Tom Hughes
7d173be190 Add support for font sets on shield sumbolizers. 2008-07-29 23:21:39 +00:00
Tom Hughes
6472af9289 Add an INTERNAL_LIBAGG build option that can be used to make mapnik 
build against the system libagg instead of mapnik's copy.
 2008-07-29 18:35:27 +00:00
Tom Hughes
dd9435f50c Fix compiler warnings. 2008-07-29 18:06:15 +00:00
Tom Hughes
791874a859 Improve alignment of wrapped text. 
Patch from Jon Burgess <jburgess777@googlemail.com>.
 2008-07-27 11:12:32 +00:00
Tom Hughes
7e137e3ad7 Remove unused variable. 
Patch from Jon Burgess <jburgess777@googlemail.com>.
 2008-07-27 11:08:02 +00:00
Tom Hughes
5432c8a7d0 Make sure we set the height of the string if it doesn't contain 
any spaces where we could break the line.

Patch from Jon Burgess <jburgess777@googlemail.com>.
 2008-07-27 11:07:12 +00:00
Tom Hughes
779a0e67b2 Make the cairo renderer build again, with font fallback support now. 2008-07-25 23:26:02 +00:00
Tom Hughes
026e4e71e7 Refactor some of the font set stuff so that the cairo renderer can be 
made to work again.
 2008-07-25 00:23:33 +00:00
Tom Hughes
dc34115e21 Commit missing font_set.cpp file. Closes #100. 2008-07-24 22:57:40 +00:00
Artem Pavlenko
48d7d639f9 added missing avoid_edges parameter 2008-06-30 16:05:25 +00:00
Artem Pavlenko
376cdeb453 applied aspect ratio patch from Frederik Ramm 2008-06-29 10:59:28 +00:00
Artem Pavlenko
1b47afde07 applied font fallback patch from Beau Gunderson 2008-06-29 10:58:48 +00:00
Artem Pavlenko
3f9127b5d0 reverting back to 700 2008-06-29 10:58:29 +00:00
Artem Pavlenko
c7cbfa5c82 reverting back to 700 2008-06-29 10:56:29 +00:00
Artem Pavlenko
3275cf9ce6 applied font fallbacj patch from Beau Gunderson 2008-06-29 10:40:08 +00:00
Andreas Volz
81ce983d5f link against boost and version bump 2008-06-12 20:35:52 +00:00
Tom Hughes
25c831378f Don't clip coordinates to 16 bits if we're using cairo 1.6 as it is no 
longer limited to 16 bit coordinates.
 2008-04-20 11:30:10 +00:00
Tom Hughes
0e6237270e Remove unused ifdefs. 2008-04-20 10:45:59 +00:00
Tom Hughes
889f36b8df Enable clipping for cairo 1.6.0 and later. 2008-04-19 23:22:03 +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
a27bde741e Don't try and render text if the attribute containing the text does 
not exist for the feature. Closes #89.
 2008-04-11 23:11:35 +00:00
Andreas Volz
e29743d933 - updated autotools build files 
- build now osm plugin automatic if libxml2 is used
- moved osm/Makefile to osm/Makefile.example because if name collision
  -> better move the example to another directory later
- optional CAIRO support
- changed libxml2 switch comment
 2008-04-06 18:13:13 +00:00
Artem Pavlenko
ab29b03833 reverting r681 2008-04-06 09:23:17 +00:00
Dominic Hargreaves
e128d51534 Patch to disallow placement if segment_length=0 from jonb (fixes #86) 2008-03-29 20:02:16 +00:00
Artem Pavlenko
7bcba5f1be applied http://snecker.fedorapeople.org/mapnik/devel/gcc43-warnings.patch from Christopher Brown 2008-03-26 09:56:17 +00:00
Artem Pavlenko
bb9290be8a fixed line_pattern_symbolizer transformations 2008-03-17 22:04:22 +00:00
Tom Hughes
2f67c036fe Make cairo components conditional on the relevant libaries etc existing. 2008-03-12 19:14:51 +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
cb905b533a restored templated version 2008-02-26 08:48:47 +00:00
Tom Hughes
02962156c5 Add support for rendering to a cairo surface. 2008-02-23 00:17:53 +00:00
Artem Pavlenko
f3a3ce04db convert to degrees if projection is geographic 2008-02-20 12:44:34 +00:00
Artem Pavlenko
b54aa9091b removed unneeded headers 2008-02-19 11:27:06 +00:00
Artem Pavlenko
308e315432 added Unicode support based on ICU 2008-02-18 21:40:34 +00:00
Artem Pavlenko
1ea7bffd4c pass parameter by reference 
store reference to wstring in text_path
 2008-02-12 20:05:04 +00:00
Artem Pavlenko
01f4984804 don't fail if file can not be open 2008-02-12 20:03:04 +00:00
Andreas Volz
ba5c156c45 fixed autotools build 2008-02-08 19:41:57 +00:00
Dave
a3652c6e66 Return old label_position_tolerance=0 behaviour. 
- Place within 1/2 of spacing rather than 1/3.
 2008-02-06 20:38:54 +00:00
Artem Pavlenko
1b03c81e84 hide implementation details 2008-02-05 13:58:47 +00:00
Artem Pavlenko
b44762e592 allow multi/single threaded variants 2008-02-04 16:12:13 +00:00
Artem Pavlenko
f4949ffca5 patch from TomH adds a global mutex to protect all access to the 
proj4 library and ensure that only one thread can be inside a call to
the library at a time.
 2008-02-04 11:54:07 +00:00
Dave
6b2285f237 Fix placing 1 character line labels. 2008-01-28 21:41:53 +00:00
Artem Pavlenko
3c5b7f02f3 applied freebsd patch from Beau Gunderson 2008-01-28 14:51:10 +00:00
Artem Pavlenko
a9348db058 part of previous commit 2008-01-25 14:42:13 +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
Dave
5bbe90b85f Remove find_placements, build_path_follow, build_path_horizontal. 
Add new find_point_placements to cover the gap left.
Change shield symbolizer to use find_point_placements.
Results are the same as before, but with much less duplicate code.
 2008-01-24 01:16:14 +00:00
Dave
f11a62b849 throw an exception rather than exit the program when an unknown font is specified. 
It would be better if this was done when contructing the text_symbolizer, but this will do.
 2008-01-23 21:56:04 +00:00
Dave
a73687aeee Woops, remove debug output. 2008-01-23 21:39:49 +00:00
Dave
1d556b54fd Make line placement retry if it places >= 50% of the characters upside down. 2008-01-23 21:38:48 +00:00
Dave
671c215ae6 Make specifying an invalid font a fatal error. ticket #31 2008-01-23 20:31:50 +00:00
Artem Pavlenko
f802250e0f refactored image i/o , see ticket #15 for more details. 2008-01-23 11:34:59 +00:00
Dave
918bd1ef6b Improved character placement code. 
Slightly changes the result of max_char_angle_delta as now character angles aren't strict against the line angles.
Example screenshots on mailing list! :)
 2008-01-23 04:18:17 +00:00