Merge branch 'patch-1' of https://github.com/glarrain/mapnik into glarrain-patch-1

This commit is contained in:
artemp 2016-06-02 16:06:53 +02:00
commit 86d8b6ef5f

View file

@ -230,7 +230,7 @@ int main ( int, char** )
parameters p; parameters p;
p["type"]="shape"; p["type"]="shape";
p["file"]="demo/data/boundaries"; p["file"]="demo/data/boundaries";
p["encoding"]="latin1"; p["encoding"]="utf8";
layer lyr("Provinces"); layer lyr("Provinces");
lyr.set_datasource(datasource_cache::instance().create(p)); lyr.set_datasource(datasource_cache::instance().create(p));
@ -295,7 +295,7 @@ int main ( int, char** )
parameters p; parameters p;
p["type"]="shape"; p["type"]="shape";
p["file"]="demo/data/popplaces"; p["file"]="demo/data/popplaces";
p["encoding"] = "latin1"; p["encoding"] = "utf8";
layer lyr("Populated Places"); layer lyr("Populated Places");
lyr.set_srs(srs_lcc); lyr.set_srs(srs_lcc);
lyr.set_datasource(datasource_cache::instance().create(p)); lyr.set_datasource(datasource_cache::instance().create(p));