Commit graph

6783 commits

Author SHA1 Message Date
Hermann Kraus
daf30ca0d1 Update metawriter_factory.hpp 2012-03-07 15:26:13 +01:00
Hermann Kraus
9a05dc1828 Add XML functions. 2012-03-07 03:57:31 +01:00
Hermann Kraus
f214675c69 Modify all other files for new XML structure. 2012-03-07 02:23:16 +01:00
Hermann Kraus
7d3fd0755d Complete XML changes in load_map.cpp 2012-03-07 01:35:37 +01:00
Hermann Kraus
7a052f81f7 Update more functions. 2012-03-06 18:17:23 +01:00
Hermann Kraus
ac50834d92 Convert parse_map_include to xml_node. 2012-03-06 15:47:08 +01:00
Hermann Kraus
191d0f907a Convert first function to new XML structure. 2012-03-06 15:18:11 +01:00
Dane Springmeyer
1c6da3893e minor formatting 2012-03-05 18:00:45 -08:00
Dane Springmeyer
df54f710bc minor formatting 2012-03-05 18:00:15 -08:00
Dane Springmeyer
3c594efec8 fix spelling 2012-03-05 17:59:07 -08:00
Dane Springmeyer
b9f2af6f87 fix typo 2012-03-05 15:48:04 -08:00
Dane Springmeyer
943f92fffc initialize another member in text_properties 2012-03-05 14:54:30 -08:00
Dane Springmeyer
2287668562 initialize members of char_info - refs #1114 2012-03-05 14:51:14 -08:00
Dane Springmeyer
3dafe6080d rework text_path ctor to ensure members are properly initialized - refs #1114 2012-03-05 14:15:01 -08:00
Dane Springmeyer
f3c4f9eec7 initialize members of text_symbolizer_properties and char_properties - refs #1114 2012-03-05 13:48:35 -08:00
Dane Springmeyer
e9c043a42a ensure members are initialized (refs #1114) 2012-03-05 13:32:02 -08:00
Dane Springmeyer
90fb50b158 initialize sx,sy in ctrans (refs #1114) and avoid possible divide by zero condition (refs #1110) 2012-03-05 13:29:20 -08:00
Dane Springmeyer
87da7c2e3e ptree_helpers: ensure proper return type upon exception (TODO: needs larger cleanup) 2012-03-05 12:34:10 -08:00
Dane Springmeyer
f81108d5b3 formatting 2012-03-05 12:09:22 -08:00
Dane Springmeyer
7dfc6d9ccd pass doubles by value in find_line_circle_intersection 2012-03-05 11:50:20 -08:00
Dane Springmeyer
7a9c5ac0ed add note about generally passing built in types by value - for most compilers this should be faster 2012-03-05 11:48:34 -08:00
Dane Springmeyer
84c9ee653a no need to pass orientation as const& to test_placement, which unlike get_placement_offset to does not change the value 2012-03-05 11:36:48 -08:00
Dane Springmeyer
50a417fc83 formatting 2012-03-05 11:31:58 -08:00
Dane Springmeyer
f90b410ece formatting to use const& as per 6462af3 2012-03-05 11:10:04 -08:00
Dane Springmeyer
6462af3a02 add to c++ style docs note about const& convention 2012-03-05 11:09:34 -08:00
Dane Springmeyer
232256e136 load_map_string: do not pass optional arg by const& and better error if string is empty 2012-03-05 10:44:20 -08:00
Hermann Kraus
481271cb76 Add new XML data structure and modify XML parser to work with this structure. 2012-03-05 16:49:54 +01:00
Dane Springmeyer
ab4c9da7ad fixup ogr plugin error string output 2012-03-04 22:28:02 -08:00
Hermann Kraus
ad86e9aebc Reenable text meta writers. 2012-03-04 23:25:13 +01:00
Hermann Kraus
5578bdb6f9 Remove has_dimensions and dimensions from text_placement_info.
This functionality is better provided by placement_finder.additional_boxes.
2012-03-04 16:38:40 +01:00
Hermann Kraus
46272d836b Move more variables from text_placements_info to placement_finder.
Refs #1048.
2012-03-04 13:32:10 +01:00
Hermann Kraus
4638b28c36 Store pointer to char_info in text_path instead of pointer to char_properties. 2012-03-04 03:53:39 +01:00
Hermann Kraus
b5e1ebfac8 New reference images. 2012-03-04 02:06:03 +01:00
Hermann Kraus
0eece15f62 New tests. 2012-03-04 02:04:43 +01:00
Hermann Kraus
b4eddaab24 Move variables from text_placements_info to placement_finder.
Reuse placement_finder objects.
Pass feature to placement_finder.
Refs #1048.
2012-03-04 01:49:01 +01:00
Hermann Kraus
36918e4a8b Remove warning. Empty expressions might exist in real applications without being an error. 2012-03-03 17:41:43 +01:00
Hermann Kraus
586cdff6e8 Add new test. 2012-03-03 16:32:31 +01:00
Hermann Kraus
0ef573c197 Avoid accidential uploading of test file to OSM server. 2012-03-03 16:31:49 +01:00
Hermann Kraus
f8c784b0a6 Correctly center text. 2012-03-03 13:53:08 +01:00
Hermann Kraus
c47eb3642a Reformat test and extend to verify text is centered correctly. 2012-03-03 13:53:08 +01:00
Dane Springmeyer
7163806cda c++ style 2012-03-02 18:51:19 -08:00
Dane Springmeyer
e622c9548d Merge branch 'master' of github.com:mapnik/mapnik 2012-03-02 18:47:11 -08:00
Hermann Kraus
2bf9d9dbdf Fix handling of empty XML nodes.
Closes #1106.
2012-03-03 01:12:23 +01:00
Dane Springmeyer
ca3bd722c1 Merge branch 'master' of github.com:mapnik/mapnik 2012-03-02 10:01:11 -08:00
Hermann Kraus
cc547385e6 Avoid adding the same text to detector twice. 2012-03-02 12:39:38 +01:00
Artem Pavlenko
c25e8c7d94 Merge remote-tracking branch 'origin/master' 2012-03-02 09:34:57 +00:00
Hermann Kraus
1fcfbaac52 Add test for TextSymbolizer line placement. 2012-03-02 01:45:44 +01:00
Hermann Kraus
69824314ed Simplify OSM plugin. 2012-03-02 01:01:13 +01:00
Hermann Kraus
9eec4eb1be Fix OSM plugin. 2012-03-02 00:51:44 +01:00
Artem Pavlenko
726724b3c7 pass by ref
move conversions impl into .cpp
2012-03-01 18:36:13 +00:00