Skip to content

MITAB .mif reader: accepts linestring and multilinestring of 1 point (even zero) #13798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rouault wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MITAB .mif reader: accepts linestring and multilinestring of 1 point (even zero) #13798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions autotest/ogr/ogr_mitab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3078,3 +3078,61 @@ def test_ogr_mitab_creation_illegal_layer_name(tmp_vsimem):
ds = ogr.GetDriverByName("MapInfo File").CreateDataSource(tmp_vsimem / "out")
with pytest.raises(Exception, match="Illegal character"):
ds.CreateLayer("illegal/with/slash")


###############################################################################


@gdaltest.enable_exceptions()
def test_ogr_mitab_mif_linestring_one_point(tmp_vsimem):

with gdal.GetDriverByName("MapInfo File").CreateVector(
tmp_vsimem / "out.mif"
) as ds:
lyr = ds.CreateLayer("out")
lyr.CreateField(ogr.FieldDefn("ID", ogr.OFTInteger))
f = ogr.Feature(lyr.GetLayerDefn())
f.SetGeometry(ogr.CreateGeometryFromWkt("LINESTRING (1 2)"))
lyr.CreateFeature(f)

with gdal.VSIFile(tmp_vsimem / "out.mif", "rb") as f:
data = f.read()

assert (
data
== b'Version 300\nCharset "Neutral"\nDelimiter ","\nColumns 1\n ID Integer\nData\n\nPline 1\n1 2\n Pen (1,2,0)\n'
)

with ogr.Open(tmp_vsimem / "out.mif") as ds:
lyr = ds.GetLayer(0)
f = lyr.GetNextFeature()
assert f.GetGeometryRef().ExportToWkt() == "LINESTRING (1 2)"


###############################################################################


@gdaltest.enable_exceptions()
def test_ogr_mitab_mif_multilinestring_one_point(tmp_vsimem):

with gdal.GetDriverByName("MapInfo File").CreateVector(
tmp_vsimem / "out.mif"
) as ds:
lyr = ds.CreateLayer("out")
lyr.CreateField(ogr.FieldDefn("ID", ogr.OFTInteger))
f = ogr.Feature(lyr.GetLayerDefn())
f.SetGeometry(ogr.CreateGeometryFromWkt("MULTILINESTRING ((1 2))"))
lyr.CreateFeature(f)

with gdal.VSIFile(tmp_vsimem / "out.mif", "rb") as f:
data = f.read()

assert (
data
== b'Version 300\nCharset "Neutral"\nDelimiter ","\nColumns 1\n ID Integer\nData\n\nPLINE MULTIPLE 1\n 1\n1 2\n Pen (1,2,0)\n'
)

with ogr.Open(tmp_vsimem / "out.mif") as ds:
lyr = ds.GetLayer(0)
f = lyr.GetNextFeature()
assert f.GetGeometryRef().ExportToWkt() == "MULTILINESTRING ((1 2))"
4 changes: 2 additions & 2 deletions ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ int TABPolyline::ReadGeometryFromMIFFile(MIDDATAFile *fp)
}
nNumPoints = atoi(pszLine);
}
if (nNumPoints < 2)
if (nNumPoints < 0)
{
CPLError(CE_Failure, CPLE_FileIO,
"Invalid number of vertices (%d) in PLINE "
Expand Down Expand Up @@ -771,7 +771,7 @@ int TABPolyline::ReadGeometryFromMIFFile(MIDDATAFile *fp)
}
else
{
if (nNumPoints < 2)
if (nNumPoints < 0)
{
CPLError(CE_Failure, CPLE_FileIO,
"Invalid number of vertices (%d) in PLINE "
Expand Down
Loading