Merge branch 'glarrain-patch-1'
This commit is contained in:
commit
ea7808d6e0
1 changed files with 2 additions and 2 deletions
|
@ -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));
|
||||||
|
|
Loading…
Reference in a new issue