artemp
|
553e767169
|
+ remove const modifiers
|
2012-07-24 09:44:14 +01:00 |
|
Dane Springmeyer
|
29deca8db8
|
shave off 4 seconds from xml_node.cpp compile time (16 -> 12) by moving transform grammar to cpp - refs #1267
|
2012-07-23 18:12:10 -07:00 |
|
Dane Springmeyer
|
348dfff0c7
|
move feature_grammar to cpp file reducing compile time mem usage for feature_collection_parser.cpp - refs #1267
|
2012-07-23 17:03:06 -07:00 |
|
Dane Springmeyer
|
8f803b9897
|
reduce build time of xml_tree by half and memory usage by 1/3 - refs #1267
|
2012-07-23 16:15:27 -07:00 |
|
Dane Springmeyer
|
9c5dbc20c5
|
properly skip empty geometries - refs #1333 and #1305 an #1132
+ remove redundant ar.size() > 0 check
+ use std::auto_ptr<geometry_type> to avoid memory leaks and
improve exception safety.
|
2012-07-23 10:39:34 +01:00 |
|
Dane Springmeyer
|
e36081a5c0
|
change geometry_utils::from_wkb to return a bool that signifies if at least one wkb path was parsed - refs #1333 and #1305
|
2012-07-20 15:09:01 -07:00 |
|
Dane Springmeyer
|
a968150f6b
|
fix compile after geometry util namespacing
|
2012-07-20 11:18:33 -07:00 |
|
artemp
|
fd209b2958
|
+ put labeling routines into its owm 'label' namespace
|
2012-07-20 17:32:38 +01:00 |
|
artemp
|
516f7c75b1
|
+ expose geometry type in expression grammar to allow following
filter expressions : [mapnik::geometry_type] = Polygon (#546)
|
2012-07-20 12:28:25 +01:00 |
|
artemp
|
8e2774fe84
|
+ remove debug output
|
2012-07-19 16:59:33 +01:00 |
|
artemp
|
ab0722efce
|
+ AGG: refactor process_markers_symbolizer to use vertex_converters
|
2012-07-19 16:37:54 +01:00 |
|
artemp
|
7b10400be9
|
+ update rendering code to work with new labeling methods
+ rename num_points() to size()
+ rename get_vertex() to vertex()
|
2012-07-19 16:36:44 +01:00 |
|
artemp
|
710b7eb04b
|
+ instantiate all vertex_converters permutations
+ pass parameter by const reference
|
2012-07-19 16:26:10 +01:00 |
|
artemp
|
c0ecb7e980
|
+ use member variable in ctor
|
2012-07-19 16:24:29 +01:00 |
|
Dane Springmeyer
|
b7630a3eb8
|
default to fully opaque default marker svg - fixes #1326
|
2012-07-18 14:07:52 -07:00 |
|
artemp
|
560aca20fa
|
Merge remote-tracking branch 'origin/master'
|
2012-07-17 17:11:59 +01:00 |
|
artemp
|
195b8ad887
|
+ affine transform for raster markers - #1279
|
2012-07-17 17:10:24 +01:00 |
|
Dane Springmeyer
|
6d95076954
|
sync grid renderer with agg for text/shields/point - refs #1309
|
2012-07-16 11:51:14 -07:00 |
|
Dane Springmeyer
|
89668e7b26
|
map bilinear8 to bilinear for now (TODO - add bilinear8 to AGG)
|
2012-07-16 09:42:01 -07:00 |
|
Dane Springmeyer
|
8fcf10be12
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-07-15 20:39:21 -07:00 |
|
Dane Springmeyer
|
e9c5ab3d94
|
sync polygon rendering between agg and grid backends
|
2012-07-13 16:42:23 -07:00 |
|
artemp
|
0eddc2b5a0
|
+ apply scale_factor
|
2012-07-13 11:17:35 +01:00 |
|
artemp
|
1e6be7abc3
|
+ add accessor methods
|
2012-07-13 10:25:12 +01:00 |
|
Dane Springmeyer
|
bc8d6568f5
|
sync line rendering between grid and agg - refs #1309
|
2012-07-12 19:34:39 -07:00 |
|
Dane Springmeyer
|
214b24ed12
|
finish updating marker tests - closes #1304
|
2012-07-12 19:21:04 -07:00 |
|
Dane Springmeyer
|
fad8eff676
|
fix scaling of markers when render time resolution != 1
|
2012-07-12 19:01:59 -07:00 |
|
Dane Springmeyer
|
2fe306e34f
|
fix marker clamping and sync with agg renderer- refs #1309
|
2012-07-12 18:41:03 -07:00 |
|
artemp
|
461f5cfe08
|
+ use separate stroke-opacity and fill-opacity
|
2012-07-12 15:38:25 +01:00 |
|
artemp
|
279bfe7f0f
|
+ remove unused mutating methods
+ cleanup&style
|
2012-07-12 10:21:57 +01:00 |
|
artemp
|
c7960a2093
|
+ support clipping on/off in text_symbolizer_helper,
shield_symbolizer_helper and process_markers_symbolizer
TODO: revisit implementation to avoid code duplication
|
2012-07-11 14:47:39 +01:00 |
|
artemp
|
8cf9a5a082
|
+ more const correctness
|
2012-07-11 10:32:08 +01:00 |
|
artemp
|
35ab93667f
|
+ enforce const
+ pass arguments by const ref
|
2012-07-11 10:13:38 +01:00 |
|
Dane Springmeyer
|
3e895ac6b7
|
implement built in support for ellipse and arrow markers, make markers_symbolizer default to POINT placement and ellipse drawing, add back compatibility for deprecated marker-type property - refs #1285 and #1304
|
2012-07-10 22:38:53 -07:00 |
|
Dane Springmeyer
|
75d2d5bdca
|
remove duplicate variable
|
2012-07-10 22:34:46 -07:00 |
|
Dane Springmeyer
|
e67463661c
|
sync grid markers_symbolizer rendering with agg
|
2012-07-10 22:32:19 -07:00 |
|
Dane Springmeyer
|
bcc8da4dea
|
agg markers_symbolizer rendering: only create objects if actually rendering
|
2012-07-10 22:31:51 -07:00 |
|
Dane Springmeyer
|
3efab11bdb
|
start carrying through the geometry clipping extent in the grid renderer
|
2012-07-10 18:39:06 -07:00 |
|
Dane Springmeyer
|
c58cbe0341
|
remove reference to arrow.cpp
|
2012-07-10 18:12:06 -07:00 |
|
Dane Springmeyer
|
310ed4a05d
|
remove references to now unused mapnik::arrow
|
2012-07-10 18:11:43 -07:00 |
|
Dane Springmeyer
|
afa9dc3c7c
|
move svg marker modifiers to hpp file for re-use in other renderers
|
2012-07-10 18:09:19 -07:00 |
|
Dane Springmeyer
|
4f507e2fa3
|
expose the ability to parse an svg from an in-memory string
|
2012-07-10 08:59:35 -07:00 |
|
artemp
|
216768fbc0
|
+ output image-filters and direct-image-filters
|
2012-07-10 12:52:18 +01:00 |
|
Dane Springmeyer
|
79ef09d1a3
|
create grid feature context with correct sorting - closes #1306
|
2012-07-09 18:40:41 -07:00 |
|
Dane Springmeyer
|
cbf821c762
|
move key grid functions to cpp file
|
2012-07-09 17:32:36 -07:00 |
|
artemp
|
f656efaa49
|
+ apply dynamic width and/or height
+ make 'width/height' pair and 'transform' mutually exlusive
|
2012-07-09 10:22:19 +01:00 |
|
artemp
|
58bd55b075
|
+ allow independent width and height
+ better namings
|
2012-07-09 10:21:12 +01:00 |
|
artemp
|
20d935ea1e
|
+ remove explicit keyword
+ make width and height 'optional' - default init (0)
+ change members order
|
2012-07-09 10:18:41 +01:00 |
|
Dane Springmeyer
|
3823890b40
|
rollback 34c3128b0c, move 'scaling' to proper enum, and move image_scaling functions to new cpp/hpp
|
2012-07-06 16:45:58 -07:00 |
|
Dane Springmeyer
|
3ddd38116c
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-07-06 11:54:04 -07:00 |
|
Dane Springmeyer
|
b5dc59cabc
|
remove serialization of get_mode, no longer needed
|
2012-07-06 11:53:54 -07:00 |
|
artemp
|
ee7f72dcce
|
+ fix compilation issue
|
2012-07-06 14:03:44 +01:00 |
|
Dane Springmeyer
|
c44b92193f
|
serialize all properties shared by all symbolizers
|
2012-07-05 17:23:48 -07:00 |
|
Dane Springmeyer
|
9beceae298
|
shuffle base parsing for shields so it is clearer the call is being made
|
2012-07-05 17:10:00 -07:00 |
|
Dane Springmeyer
|
2f45de8fea
|
serialize comp-op in save_map - refs #1292
|
2012-07-05 17:06:41 -07:00 |
|
Dane Springmeyer
|
0de815ba03
|
remove raster mode serialization and a few std::clog references in save_map and load_map
|
2012-07-05 16:07:38 -07:00 |
|
Dane Springmeyer
|
9dd69d091b
|
merge with master
|
2012-07-05 15:40:16 -07:00 |
|
Dane Springmeyer
|
d8c719f05e
|
finish exposing scale_factor to cairo_renderer
|
2012-07-05 14:54:58 -07:00 |
|
Dane Springmeyer
|
f7383b81fb
|
properly pass the scale_factor to the cairo_renderer_base
|
2012-07-05 11:12:46 -07:00 |
|
artemp
|
59c1f9ac21
|
+ inherit stroke, stroke-width and fill if provided in markers_symbolizer
|
2012-07-05 17:17:35 +01:00 |
|
artemp
|
9d756165e0
|
+ update to work with optional stroke (markers)
|
2012-07-05 17:16:11 +01:00 |
|
artemp
|
847f284a97
|
+ make stroke and fill optional
+ return expression_ptr by const ref
+ change init order
|
2012-07-05 17:11:52 +01:00 |
|
Dane Springmeyer
|
c677b4f47c
|
ensure the bounds used for avoid-edges and minimum-padding is non-buffered - refs #1283
|
2012-07-04 18:34:04 -07:00 |
|
Hermann Kraus
|
6af5fd7151
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-07-04 21:00:59 +02:00 |
|
Hermann Kraus
|
82d7a63ef6
|
Replace remaining parse_expression() calls.
Closes #1168.
|
2012-07-04 20:59:36 +02:00 |
|
Hermann Kraus
|
dd9276b1ef
|
Reuse expression grammar for TextSymbolizer.
Refs #1168.
|
2012-07-04 20:55:03 +02:00 |
|
Hermann Kraus
|
7a967d7047
|
Correctly perform get_text() on <xmltext> nodes.
|
2012-07-04 20:51:34 +02:00 |
|
artemp
|
9b14a7206a
|
remove arrow/ellipse ad-hoc markers - see #1285
|
2012-07-04 14:50:11 +01:00 |
|
artemp
|
6bc3f06afd
|
+ remove arrow/ellipse
|
2012-07-04 14:22:44 +01:00 |
|
artemp
|
ab4e717813
|
+ fix stock markers transformations
FIXME : use markers cache to load and store stock markers
|
2012-07-04 11:56:52 +01:00 |
|
artemp
|
8ab8f7c420
|
+ add missing miterlimit (grid,cairo)
|
2012-07-04 10:07:37 +01:00 |
|
Dane Springmeyer
|
7d9b4ce0da
|
settle upon 'geometry-transform' naming - refs #1276
|
2012-07-03 18:34:11 -07:00 |
|
Dane Springmeyer
|
e4ff79d8d8
|
re-implement f866ab1f80 and da53af5c98 (re-closing #1277) since somehow these commits dissapeared from master
|
2012-07-03 18:04:35 -07:00 |
|
Dane Springmeyer
|
e93c5604a6
|
use detector extent for shields that is also sensitive to buffer_size - refs #1283
|
2012-07-03 13:32:27 -07:00 |
|
artemp
|
290bf735da
|
+ use BOOST_FOREACH
|
2012-07-03 13:38:07 +01:00 |
|
artemp
|
4b9346ab5f
|
+ better name for boolean member to avoid clashing with object name.
|
2012-07-03 12:45:07 +01:00 |
|
artemp
|
a6784270bb
|
+ pass args by const ref
|
2012-07-03 11:16:10 +01:00 |
|
artemp
|
134dc5bbf1
|
Merge branch 'master' into transform-rename
Conflicts:
src/load_map.cpp
|
2012-07-02 15:37:13 +01:00 |
|
artemp
|
7d2c695849
|
+ remove unused font_manager_
|
2012-07-02 13:28:40 +01:00 |
|
Dane Springmeyer
|
757816a1b8
|
respect scale_factor in affine transform used for collision detector in point_symbolizer - refs #1274
|
2012-06-29 17:25:34 -07:00 |
|
Dane Springmeyer
|
9888ff0d50
|
remove geometry type tests for postgis that are not longer valid with postgis 2.0
|
2012-06-29 16:52:54 -07:00 |
|
Dane Springmeyer
|
8412fdbbe6
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-06-29 16:36:55 -07:00 |
|
Dane Springmeyer
|
da53af5c98
|
avoid passing empty file attributes into the renderer - closes #1277
|
2012-06-29 16:36:43 -07:00 |
|
Hermann Kraus
|
512a9af53f
|
Fix font scaling.
Refs #1273.
|
2012-06-30 01:28:56 +02:00 |
|
Dane Springmeyer
|
f866ab1f80
|
no need to catch image_reader_exception any more during load map because all errors are now at runtime due to path expressions
|
2012-06-29 16:21:52 -07:00 |
|
Dane Springmeyer
|
5c9186017b
|
rename 'image-transform' to just 'transform' (for backward compatibility) and call transforms applied to geometries 'view-transform'
|
2012-06-29 15:59:56 -07:00 |
|
Dane Springmeyer
|
7f531498c6
|
pass scale_factor to text_renderer in order to scale up halo_radius - refs #1273 and refs #695
|
2012-06-29 13:05:28 -07:00 |
|
Dane Springmeyer
|
ef893b5b5f
|
comment on why we use center for justify_alignment
|
2012-06-29 11:43:37 -07:00 |
|
artemp
|
caa50402dc
|
+ apply scale_factor to raster markers (bilinear)
|
2012-06-29 12:31:41 +01:00 |
|
artemp
|
34c3128b0c
|
+ use Map::scale_factor_
|
2012-06-29 12:30:36 +01:00 |
|
artemp
|
bf60dd9299
|
+ don't call 'set_character_sizes' - alredy set in processed_text.cpp:L77
|
2012-06-29 10:36:10 +01:00 |
|
Dane Springmeyer
|
67e9b0d616
|
move marker width/height to expressions - closes #1102 and replaces #1255
|
2012-06-28 19:54:25 -07:00 |
|
Artem Pavlenko
|
5519648989
|
+ inflate extent to match agg renderer
|
2012-06-28 11:58:54 +01:00 |
|
Artem Pavlenko
|
bfa7052e84
|
+ markers: fix stock arrow's transformations
|
2012-06-27 13:46:52 +01:00 |
|
Artem Pavlenko
|
eb686c6582
|
+ cairo : sync building_symbolizer output with agg
|
2012-06-26 17:15:11 +01:00 |
|
Artem Pavlenko
|
cec9b5798e
|
Revert "cleaner approach to a compile time magic alpha number for grid buffers"
(doesn't link : clang version 3.2 (trunk 158601))
This reverts commit 98753db9fd.
|
2012-06-26 16:53:07 +01:00 |
|
Artem Pavlenko
|
f8a7d06034
|
Merge remote-tracking branch 'origin/master'
|
2012-06-26 15:02:28 +01:00 |
|
Artem Pavlenko
|
5bc9f73506
|
+ markers_symbolizer: support affine geometry transformations
+ fix markers bounding box calc
+ fix spacing logic to use transformed marker width
|
2012-06-26 15:00:42 +01:00 |
|
Dane Springmeyer
|
98753db9fd
|
cleaner approach to a compile time magic alpha number for grid buffers
|
2012-06-25 17:57:52 -07:00 |
|
Dane Springmeyer
|
18cf6b1bdd
|
remove unneeded header
|
2012-06-25 17:28:01 -07:00 |
|
Artem Pavlenko
|
20255966c3
|
+ text_symbolizer: add largest-bbox-only boolean property
default:true
|
2012-06-25 15:00:53 +01:00 |
|