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

don't fail on null shapes (record length : 8 bytes)

Browse source
This commit is contained in:
artemp 2015-11-11 16:21:03 +00:00
parent 4d6a735f53
commit 2602b1faff
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
utils/shapefile/shapefile_reader.py
View file

@ -29,16 +29,24 @@ def test_record(_type, record) :
test_polygon(record) test_polygon(record)
def test_pointz(record): def test_pointz(record):
_type, = struct.unpack("<i", record[0:4])
if _type == 0:
print "NULL shape"
return
if len(record) != 36 : if len(record) != 36 :
print>>sys.stderr,"BAD SHAPE FILE: expected 36 bytes got",len(record) print>>sys.stderr,"BAD SHAPE FILE: expected 36 bytes got",len(record)
sys.exit(1) sys.exit(1)
_type,x,y,z,m = struct.unpack("<idddd",record) x,y,z,m = struct.unpack("<dddd",record[4:36])
if _type != 11: if _type != 11:
print>>sys.stderr,"BAD SHAPE FILE: expected PointZ or NullShape got",_type print>>sys.stderr,"BAD SHAPE FILE: expected PointZ or NullShape got",_type
sys.exit(1) sys.exit(1)
def test_polygon(record): def test_polygon(record):
_type, x0, y0, x1, y0, num_parts, num_points = struct.unpack("<iddddii", record[0:44]) _type, = struct.unpack("<i", record[0:4])
if _type == 0:
print "NULL shape"
return
x0, y0, x1, y0, num_parts, num_points = struct.unpack("<ddddii", record[4:44])
if _type != 5: if _type != 5:
print>>sys.stderr, "BAD SHAPE FILE: expected Polygon or NullShape got", _type print>>sys.stderr, "BAD SHAPE FILE: expected Polygon or NullShape got", _type
sys.exit(1) sys.exit(1)
@ -85,7 +93,7 @@ if __name__ == "__main__" :
record = struct.Struct(">II") record = struct.Struct(">II")
calc_total_size = 50 calc_total_size = 50
count = 0 count = 0
while shx.tell() < shx_file_length * 2 : while shx.tell() <= shx_file_length * 2 - 4 * 2 :
offset,shx_content_length = record.unpack_from(shx.read(8)) offset,shx_content_length = record.unpack_from(shx.read(8))
shp.seek(offset*2, os.SEEK_SET) shp.seek(offset*2, os.SEEK_SET)
record_number,content_length = record_header.unpack_from(shp.read(8)) record_number,content_length = record_header.unpack_from(shp.read(8))