Permalink
Browse files

Merge branch 'master' of git://github.com/mapnik/node-mapnik

  • Loading branch information...
Dane Springmeyer
Dane Springmeyer committed Jan 18, 2013
2 parents 63ae3f2 + d1e81d8 commit acacdca6c120ce8251b7e22b1e76698a1ba56d4d
View
@@ -25,6 +25,7 @@ install: all
mapnik.node:
@node-waf build -j $(NPROCS)
+ @make test
clean:
@node-waf clean distclean
View
@@ -56,7 +56,7 @@
'/opt/boost-48/include',
'/usr/local/Cellar/icu4c/4.8.1.1/include',
'/usr/X11/include/freetype2',
- '/usr/X11/include',
+ '/usr/X11/include'
],
'defines': [
#'HAVE_CAIRO',
@@ -82,19 +82,18 @@
],
'include_dirs': [
'c:\\mapnik-2.0\\include',
+ 'c:\\mapnik-2.0\\include\\mapnik\\agg',
'<@(deps_root_win)\\freetype',
'<@(deps_root_win)\\freetype\\include',
'<@(deps_root_win)\\cairo', # for actual cairo_version.h
'<@(deps_root_win)\\cairo\\src',
- '<@(deps_root_win)\\cairomm',
- '<@(deps_root_win)\\libsigc++',
'<@(deps_root_win)\\boost-49-vc100\\include\\boost-1_49',
'<@(node_root_win)\\deps\\v8\\include',
'<@(node_root_win)\\src',
'<@(node_root_win)\\deps\\uv\\include',
'<@(deps_root_win)\\proj\\src',
'<@(deps_root_win)\\icu\\include',
- '<@(deps_root_win)\\mapnik-packaging\\windows\\ltdl',
+ '<@(deps_root_win)\\mapnik-packaging\\windows\\ltdl'
],
'msvs_settings': {
'VCLinkerTool': {
@@ -0,0 +1,2 @@
+x,y
+0,0
Binary file not shown.
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,3 @@
+x,y,bigint
+0,0,2147483648
+0,0,9223372036854775807
View
Binary file not shown.
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
View
Binary file not shown.
View
Binary file not shown.
@@ -0,0 +1,36 @@
+var mapnik = require('mapnik');
+var assert = require('assert');
+var fs = require('fs');
+var existsSync = require('fs').existsSync || require('path').existsSync;
+
+describe('Handling unicode paths, filenames, and data', function(){
+
+ it('open csv from folder with unicode', function(){
+ var filepath = './test/data/Clément/foo.csv';
+ assert.ok(existsSync(filepath));
+ var ds = new mapnik.Datasource({type:'csv',file:filepath});
+ assert.ok(ds);
+ });
+
+ it('open shape from folder with unicode', function(){
+ var filepath = './test/data/Clément/long_lat.shp';
+ assert.ok(existsSync(filepath));
+ var ds = new mapnik.Datasource({type:'shape',file:filepath});
+ assert.ok(ds);
+ });
+
+ it('open csv file with unicode name', function(){
+ var filepath = './test/data/你好_points.csv';
+ assert.ok(existsSync(filepath));
+ var ds = new mapnik.Datasource({type:'csv',file:filepath});
+ assert.ok(ds);
+ });
+
+ it('open shape file with unicode name', function(){
+ var filepath = './test/data/你好_points.shp';
+ assert.ok(existsSync(filepath));
+ var ds = new mapnik.Datasource({type:'shape',file:filepath});
+ assert.ok(ds);
+ });
+
+});

0 comments on commit acacdca

Please sign in to comment.