sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add support for windows unicode paths in rapidxml loader

Browse source 
Conflicts:
	src/rapidxml_loader.cpp
This commit is contained in:
Dane Springmeyer 2014-08-25 14:50:58 -07:00
parent 70f71790fe
commit 8e996e10ab
7 changed files with 149 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rapidxml_loader.cpp
View file

@ -26,6 +26,8 @@
// mapnik
#include <mapnik/config_error.hpp>
#include <mapnik/utils.hpp>
#include <mapnik/util/fs.hpp>
#include <mapnik/xml_loader.hpp>
#include <boost/property_tree/detail/xml_parser_read_rapidxml.hpp>
#include <mapnik/xml_node.hpp>
@ -54,8 +56,16 @@ public:
void load(std::string const& filename, xml_node &node)
{
if (!mapnik::util::exists(filename))
{
throw config_error(std::string("Could not load map file: File does not exist"), 0, filename);
}
filename_ = filename;
#ifdef _WINDOWS
std::basic_ifstream<char> stream(mapnik::utf8_to_utf16(filename));
#else
std::basic_ifstream<char> stream(filename.c_str());
#endif
if (!stream)
{
throw config_error("Could not load map file", 0, filename);

74
tests/visual_tests/grids/functional-expressions-256-256-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,74 @@
{
"keys": [
"",
"1",
"2"
],
"data": {},
"grid": [
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" !! ",
" ## ##! ",
" #### ### #### ",
" #################### ",
" ################### ",
" ################## !!",
" #################### !!! ",
" ##################### !!! ",
" ###################### !!! ",
" ###################### !!! ",
" ###################### !!! ",
" ###################### !!! ",
" ###################### !!! ",
" ###################### !!! ",
" ################################!! ",
" #############################!! ",
" # ################### !!! # ",
" ################# !!! ",
" # !!############## !!! ",
" ###! ####### !!! ",
" #!## ######### !!! ",
" !!### ##########!! ",
" !! ############## ",
" !! ############# ",
" !! ####!#### ",
" !! ####!#### ",
" !! ######### ",
" !! ############### ",
" !! ################### ",
" !! ##################### ",
" !! !##################### ",
" !! !!##################### ",
" !! !!! ################# ",
" !! !!! ########### ",
" !! !!! ",
" !! !!! ",
" !! !!! ",
" !! !!! ",
" !! !!! ",
" !! !!! ",
" !! !!! ",
"!! !!! ",
"! !!! ",
"!!! ",
"!! ",
" ",
" ",
" ",
" "
]
}

BIN
tests/visual_tests/images/functional-expressions-256-256-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
tests/visual_tests/images/functional-expressions-256-256-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
tests/visual_tests/images/functional-expressions-256-256-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
tests/visual_tests/images/functional-expressions-256-256-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.7 KiB

65
tests/visual_tests/styles/functional-expressions.xml Normal file
View file

@ -0,0 +1,65 @@
<Map background-color="#eee" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<Style name="frame" filter-mode="first">
<Rule>
<Filter>[mapnik::geometry_type]=linestring</Filter>
<LineSymbolizer
stroke="[color]"
stroke-width="[width]"
offset="abs([offset]*2.0)"/>
<LineSymbolizer
stroke="[color]"
stroke-width="[width]"
offset="-[offset]*2.0"
geometry-transform="rotate(360-(tan(-180)*10))"/>
</Rule>
<Rule>
<Filter>[mapnik::geometry_type]=point</Filter>
<MarkersSymbolizer
file="../../../[base-path]/[filetype]/[filename].[filetype]"
width="exp([width])"
/>
</Rule>
</Style>
<Layer name="frame" srs="+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs">
<StyleName>frame</StyleName>
<Datasource>
<Parameter name="type">ogr</Parameter>
<Parameter name="layer_by_index">0</Parameter>
<Parameter name="inline"><![CDATA[
{
"type" : "FeatureCollection",
"features" : [
{
"properties" : {
"width":"5",
"color" : "red",
"offset": 10
},
"geometry" : {
"coordinates" : [[-10,-10],[10,10]],
"type" : "LineString"
},
"type" : "Feature",
},
{
"geometry" : {
"coordinates" : [ 0,0 ],
"type" : "Point"
},
"properties" : {
"base-path":"./tests/data",
"filetype":"svg",
"filename":"octocat",
"width":"5",
"color" : "#ace"
},
"type" : "Feature",
}
]
}
]]></Parameter>
</Datasource>
</Layer>
</Map>