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

Merge branch 'master' of github.com:mapnik/mapnik

Browse source
This commit is contained in:
Dane Springmeyer 2012-12-05 18:40:44 -08:00
commit fe6dd9a9d9
3 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -29,14 +29,7 @@ uninstall:
python scons/scons.py --config=cache --implicit-cache --max-drift=1 uninstall
test:
@echo "*** Running visual tests..."
@python tests/visual_tests/test.py -q || true
@echo "*** Running C++ tests..."
@for FILE in tests/cpp_tests/*-bin; do \
$${FILE}; \
done
@echo "*** Running python tests..."
@python tests/run_tests.py -q
./run_tests
test-local:
@echo "*** Boostrapping local test environment..."

19
run_tests Executable file
View file

@ -0,0 +1,19 @@
#!/bin/sh
failures=0
echo "*** Running visual tests..."
python tests/visual_tests/test.py -q
failures=$((failures+$?))
echo "*** Running C++ tests..."
for FILE in tests/cpp_tests/*-bin; do
${FILE};
failures=$((failures+$?))
done
echo "*** Running python tests..."
python tests/run_tests.py -q
failures=$((failures+$?))
exit $failures

22
utils/shapefile/shapefile_reader.py
View file

@ -26,8 +26,8 @@ if __name__ == "__main__" :
_,_,_,_,_,_,shp_file_length = header[0].unpack_from(shp.read(28))
_,_,lox,loy,hix,hiy,_,_,_,_ = header[1].unpack_from(shp.read(72))
print "SHX FILE_LENGTH=",shx_file_length
print "SHP FILE_LENGTH=",shp_file_length
print "SHX FILE_LENGTH=",shx_file_length,"bytes"
print "SHP FILE_LENGTH=",shp_file_length,"bytes"
print "BBOX(",lox,loy,hix,hiy,")"
record_header = struct.Struct(">II")
@ -35,17 +35,21 @@ if __name__ == "__main__" :
calc_total_size = 50
count = 0
while shx.tell() < shx_file_length * 2 :
offset,len = record.unpack_from(shx.read(8))
offset,shx_content_length = record.unpack_from(shx.read(8))
shp.seek(offset*2, os.SEEK_SET)
record_number,content_length = record_header.unpack_from(shp.read(8))
print (2*offset),record_number,content_length
#print (2*offset),record_number,content_length
if shx_content_length <> content_length:
print "BAD SHAPE FILE: content_lenght mismatch in SHP and SHX",shx_content_length,content_length
sys.exit(1)
calc_total_size +=(4 + content_length)
count+=1
print "SHAPES COUNT=",count
if shp_file_length-calc_total_size <> 0 :
print "BAD SHAPE FILE"
print "extra ", 2*(shp_file_length-calc_total_size)," bytes"
delta = shp_file_length-calc_total_size
if delta > 0 :
print "BAD SHAPE FILE: extra ", 2*delta,"bytes"
elif delta < 0:
print "BAD SHAPE FILE: missing ", 2*delta,"bytes"
else:
print "GOOD!"
print "SHAPE FILE LOOKS GOOD!"