Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MiraMonVector fixes (2) tests improvements (+10) (#9744)
**Fixes** - Delete of unused function (MMInitHeader) - Use of CPLError() in some explicit return errors **Test improvements** - last_version added in -lco Version - more corrupted files tested - unexisting coordinates or unexpected polygon construction tested datefield added in tests code simplification - multipolygon Z added in tests - multigeometry added in tests - ANSI DBFEncoding test added
- Loading branch information
Showing
52 changed files
with
1,393 additions
and
155 deletions.
There are no files selected for viewing
Binary file added
BIN
+536 Bytes
autotest/ogr/data/miramon/CorruptedFiles/BadCycle/SimplePolFile.arc
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+349 Bytes
autotest/ogr/data/miramon/CorruptedFiles/BadCycle/SimplePolFile.pol
Binary file not shown.
Binary file added
BIN
+511 Bytes
autotest/ogr/data/miramon/CorruptedFiles/BadCycle/SimplePolFileA.dbf
Binary file not shown.
89 changes: 89 additions & 0 deletions
89
autotest/ogr/data/miramon/CorruptedFiles/BadCycle/SimplePolFileA.rel
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
[VERSIO] | ||
VersMetaDades=5 | ||
SubVersMetaDades=0 | ||
Vers=4 | ||
SubVers=3 | ||
|
||
[METADADES] | ||
language=cat | ||
MDIdiom=cat | ||
dateStamp=20230628 16204654+0200 | ||
characterSet=006 | ||
nOrganismes=1 | ||
FileIdentifier=0e09e6cf-0d31-499e-bcf0-bee4d3e9d87a_SimplePolFileA | ||
|
||
[METADADES:ORGANISME_1] | ||
role=009 | ||
IndividualName=Abel Pau | ||
PositionName=T�cnic SIG | ||
OrganisationName=Students and educational institutions | ||
|
||
[IDENTIFICATION] | ||
code=0e09e6cf-0d31-499e-bcf0-bee4d3e9d87a_SimplePolFileA | ||
codeSpace= | ||
DatasetTitle=Simple Pol File [p�xels] | ||
|
||
[SPATIAL_REFERENCE_SYSTEM:HORIZONTAL] | ||
HorizontalSystemDefinition=Local | ||
HorizontalSystemIdentifier=plane | ||
unitats=STB#T_pixels | ||
unitatsY=? | ||
|
||
[EXTENT] | ||
toler_env=0 | ||
MinX=335.3187440533326 | ||
MaxX=1224.163653663228 | ||
MinY=390.371075166458 | ||
MaxY=856.814462416696 | ||
|
||
[OVERVIEW] | ||
CreationDate=20230628 16204653+0200 | ||
|
||
[TAULA_PRINCIPAL] | ||
IdGrafic=ID_GRAFIC | ||
TipusRelacio=RELACIO_1_N_DICC | ||
|
||
[TAULA_PRINCIPAL:ID_GRAFIC] | ||
visible=0 | ||
descriptor=Identificador Gr�fic intern | ||
MostrarUnitats=0 | ||
|
||
[TAULA_PRINCIPAL:N_VERTEXS] | ||
visible=0 | ||
MostrarUnitats=0 | ||
descriptor=Nombre de v�rtexs | ||
|
||
[TAULA_PRINCIPAL:LONG_ARC] | ||
descriptor=Longitud de l'arc | ||
|
||
[TAULA_PRINCIPAL:NODE_INI] | ||
visible=0 | ||
MostrarUnitats=0 | ||
descriptor=Node inicial | ||
|
||
[TAULA_PRINCIPAL:NODE_FI] | ||
visible=0 | ||
MostrarUnitats=0 | ||
descriptor=Node final | ||
|
||
[OVERVIEW:ASPECTES_TECNICS] | ||
Ciclat1=SimplePolFile.pol | ||
|
||
[QUALITY:LINEAGE:PROCESS1] | ||
nOrganismes=1 | ||
history=C:\MiraMon\MM64.exe | ||
date=20230628 16204654+0200 | ||
|
||
[QUALITY:LINEAGE:PROCESS1:ORGANISME_1] | ||
IndividualName=Abel Pau | ||
PositionName=T�cnic SIG | ||
OrganisationName=Students and educational institutions | ||
|
||
[QUALITY:LINEAGE] | ||
processes=1 | ||
|
||
[GEOMETRIA_I_TOPOLOGIA] | ||
NomCampNVertexs=N_VERTEXS | ||
NomCampLongitudArc=LONG_ARC | ||
NomCampNodeIni=NODE_INI | ||
NomCampNodeFi=NODE_FI |
Binary file added
BIN
+261 Bytes
autotest/ogr/data/miramon/CorruptedFiles/BadCycle/SimplePolFileN.dbf
Binary file not shown.
64 changes: 64 additions & 0 deletions
64
autotest/ogr/data/miramon/CorruptedFiles/BadCycle/SimplePolFileN.rel
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
[VERSIO] | ||
VersMetaDades=5 | ||
SubVersMetaDades=0 | ||
Vers=4 | ||
SubVers=3 | ||
|
||
[METADADES] | ||
language=cat | ||
MDIdiom=cat | ||
dateStamp=20230628 16204653+0200 | ||
characterSet=006 | ||
nOrganismes=1 | ||
FileIdentifier=701e2102-a0ba-4cb2-aeb5-bdb329c79868_SimplePolFileN | ||
|
||
[METADADES:ORGANISME_1] | ||
role=009 | ||
IndividualName=Abel Pau | ||
PositionName=T�cnic SIG | ||
OrganisationName=Students and educational institutions | ||
|
||
[IDENTIFICATION] | ||
code=701e2102-a0ba-4cb2-aeb5-bdb329c79868_SimplePolFileN | ||
codeSpace= | ||
DatasetTitle=Simple Pol File [p�xels] | ||
|
||
[EXTENT] | ||
toler_env=0 | ||
|
||
[OVERVIEW] | ||
CreationDate=20230628 16204652+0200 | ||
|
||
[TAULA_PRINCIPAL] | ||
IdGrafic=ID_GRAFIC | ||
TipusRelacio=RELACIO_1_N_DICC | ||
|
||
[TAULA_PRINCIPAL:ID_GRAFIC] | ||
visible=0 | ||
descriptor=Identificador Gr�fic intern | ||
MostrarUnitats=0 | ||
|
||
[TAULA_PRINCIPAL:ARCS_A_NOD] | ||
MostrarUnitats=0 | ||
descriptor=Nombre d'arcs al node | ||
|
||
[TAULA_PRINCIPAL:TIPUS_NODE] | ||
MostrarUnitats=0 | ||
descriptor=Tipus de node | ||
|
||
[QUALITY:LINEAGE:PROCESS1] | ||
nOrganismes=1 | ||
history=C:\MiraMon\MM64.exe | ||
date=20230628 16204653+0200 | ||
|
||
[QUALITY:LINEAGE:PROCESS1:ORGANISME_1] | ||
IndividualName=Abel Pau | ||
PositionName=T�cnic SIG | ||
OrganisationName=Students and educational institutions | ||
|
||
[QUALITY:LINEAGE] | ||
processes=1 | ||
|
||
[GEOMETRIA_I_TOPOLOGIA] | ||
NomCampArcsANode=ARCS_A_NOD | ||
NomCampTipusNode=TIPUS_NODE |
Binary file added
BIN
+729 Bytes
autotest/ogr/data/miramon/CorruptedFiles/BadCycle/SimplePolFileP.dbf
Binary file not shown.
93 changes: 93 additions & 0 deletions
93
autotest/ogr/data/miramon/CorruptedFiles/BadCycle/SimplePolFileP.rel
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
[VERSIO] | ||
VersMetaDades=5 | ||
SubVersMetaDades=0 | ||
Vers=4 | ||
SubVers=3 | ||
|
||
[METADADES] | ||
language=cat | ||
MDIdiom=cat | ||
dateStamp=20230628 16204988+0200 | ||
characterSet=006 | ||
nOrganismes=1 | ||
FileIdentifier=00691677-6d15-40f8-9d62-e8df34876e80_SimplePolFileP | ||
|
||
[METADADES:ORGANISME_1] | ||
role=009 | ||
IndividualName=Abel Pau | ||
PositionName=T�cnic SIG | ||
OrganisationName=Students and educational institutions | ||
|
||
[IDENTIFICATION] | ||
code= | ||
codeSpace= | ||
DatasetTitle=Simple Pol File | ||
|
||
[OVERVIEW:ASPECTES_TECNICS] | ||
ArcSource=NoExistPolFile.arc | ||
|
||
[QUALITY:LINEAGE:PROCESS1] | ||
nOrganismes=1 | ||
history=C:\MiraMon\MM64.exe | ||
date=20230628 16204988+0200 | ||
|
||
[QUALITY:LINEAGE:PROCESS1:ORGANISME_1] | ||
IndividualName=Abel Pau | ||
PositionName=T�cnic SIG | ||
OrganisationName=Students and educational institutions | ||
|
||
[QUALITY:LINEAGE] | ||
processes=1 | ||
|
||
[EXTENT] | ||
toler_env=0 | ||
MinX=335.318744053333 | ||
MaxX=1224.16365366323 | ||
MinY=390.371075166458 | ||
MaxY=856.814462416696 | ||
|
||
[OVERVIEW] | ||
CreationDate=20230628 16204986+0200 | ||
|
||
[TAULA_PRINCIPAL] | ||
IdGrafic=ID_GRAFIC | ||
TipusRelacio=RELACIO_1_N_DICC | ||
|
||
[TAULA_PRINCIPAL:ID_GRAFIC] | ||
descriptor=Identificador Gr�fic intern | ||
visible=0 | ||
TractamentVariable=Ordinal | ||
|
||
[TAULA_PRINCIPAL:N_VERTEXS] | ||
descriptor=Nombre de v�rtexs | ||
visible=0 | ||
MostrarUnitats=0 | ||
|
||
[TAULA_PRINCIPAL:PERIMETRE] | ||
descriptor=Per�metre del pol�gon | ||
|
||
[TAULA_PRINCIPAL:AREA] | ||
descriptor=�rea del pol�gon | ||
|
||
[TAULA_PRINCIPAL:N_ARCS] | ||
descriptor=Nombre d'arcs | ||
visible=0 | ||
MostrarUnitats=0 | ||
|
||
[TAULA_PRINCIPAL:N_POLIG] | ||
descriptor=Nombre de pol�gons elementals | ||
visible=0 | ||
MostrarUnitats=0 | ||
|
||
[GEOMETRIA_I_TOPOLOGIA] | ||
NomCampNVertexs=N_VERTEXS | ||
NomCampPerimetre=PERIMETRE | ||
NomCampArea=AREA | ||
NomCampNArcs=N_ARCS | ||
NomCampNPoligons=N_POLIG | ||
|
||
[TAULA_PRINCIPAL:ATT1] | ||
descriptor=atribute1 | ||
|
||
[TAULA_PRINCIPAL:ATT2] | ||
descriptor=atribute2 |
Binary file added
BIN
+240 Bytes
autotest/ogr/data/miramon/CorruptedFiles/CorruptedCoordinates/CorruptedCoordinates.arc
Binary file not shown.
Binary file added
BIN
+92 Bytes
autotest/ogr/data/miramon/CorruptedFiles/CorruptedCoordinates/CorruptedCoordinates.nod
Binary file not shown.
Binary file added
BIN
+349 Bytes
autotest/ogr/data/miramon/CorruptedFiles/CorruptedCoordinates/CorruptedCoordinates.pol
Binary file not shown.
Binary file added
BIN
+511 Bytes
autotest/ogr/data/miramon/CorruptedFiles/CorruptedCoordinates/CorruptedCoordinatesA.dbf
Binary file not shown.
89 changes: 89 additions & 0 deletions
89
autotest/ogr/data/miramon/CorruptedFiles/CorruptedCoordinates/CorruptedCoordinatesA.rel
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
[VERSIO] | ||
VersMetaDades=5 | ||
SubVersMetaDades=0 | ||
Vers=4 | ||
SubVers=3 | ||
|
||
[METADADES] | ||
language=cat | ||
MDIdiom=cat | ||
dateStamp=20230628 16204654+0200 | ||
characterSet=006 | ||
nOrganismes=1 | ||
FileIdentifier=0e09e6cf-0d31-499e-bcf0-bee4d3e9d87a_CorruptedCoordinatesA | ||
|
||
[METADADES:ORGANISME_1] | ||
role=009 | ||
IndividualName=Abel Pau | ||
PositionName=T�cnic SIG | ||
OrganisationName=Students and educational institutions | ||
|
||
[IDENTIFICATION] | ||
code=0e09e6cf-0d31-499e-bcf0-bee4d3e9d87a_CorruptedCoordinatesA | ||
codeSpace= | ||
DatasetTitle=Corruptes coordinates [p�xels] | ||
|
||
[SPATIAL_REFERENCE_SYSTEM:HORIZONTAL] | ||
HorizontalSystemDefinition=Local | ||
HorizontalSystemIdentifier=plane | ||
unitats=STB#T_pixels | ||
unitatsY=? | ||
|
||
[EXTENT] | ||
toler_env=0 | ||
MinX=335.3187440533326 | ||
MaxX=1224.163653663228 | ||
MinY=390.371075166458 | ||
MaxY=856.814462416696 | ||
|
||
[OVERVIEW] | ||
CreationDate=20230628 16204653+0200 | ||
|
||
[TAULA_PRINCIPAL] | ||
IdGrafic=ID_GRAFIC | ||
TipusRelacio=RELACIO_1_N_DICC | ||
|
||
[TAULA_PRINCIPAL:ID_GRAFIC] | ||
visible=0 | ||
descriptor=Identificador Gr�fic intern | ||
MostrarUnitats=0 | ||
|
||
[TAULA_PRINCIPAL:N_VERTEXS] | ||
visible=0 | ||
MostrarUnitats=0 | ||
descriptor=Nombre de v�rtexs | ||
|
||
[TAULA_PRINCIPAL:LONG_ARC] | ||
descriptor=Longitud de l'arc | ||
|
||
[TAULA_PRINCIPAL:NODE_INI] | ||
visible=0 | ||
MostrarUnitats=0 | ||
descriptor=Node inicial | ||
|
||
[TAULA_PRINCIPAL:NODE_FI] | ||
visible=0 | ||
MostrarUnitats=0 | ||
descriptor=Node final | ||
|
||
[OVERVIEW:ASPECTES_TECNICS] | ||
Ciclat1=CorruptedCoordinates.pol | ||
|
||
[QUALITY:LINEAGE:PROCESS1] | ||
nOrganismes=1 | ||
history=C:\MiraMon\MM64.exe | ||
date=20230628 16204654+0200 | ||
|
||
[QUALITY:LINEAGE:PROCESS1:ORGANISME_1] | ||
IndividualName=Abel Pau | ||
PositionName=T�cnic SIG | ||
OrganisationName=Students and educational institutions | ||
|
||
[QUALITY:LINEAGE] | ||
processes=1 | ||
|
||
[GEOMETRIA_I_TOPOLOGIA] | ||
NomCampNVertexs=N_VERTEXS | ||
NomCampLongitudArc=LONG_ARC | ||
NomCampNodeIni=NODE_INI | ||
NomCampNodeFi=NODE_FI |
Binary file added
BIN
+261 Bytes
autotest/ogr/data/miramon/CorruptedFiles/CorruptedCoordinates/CorruptedCoordinatesN.dbf
Binary file not shown.
Oops, something went wrong.