Skip to content
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.

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

[WIP, not for merge] Miramon vector driver #12

Closed
wants to merge 385 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
385 commits
Select commit Hold shift + click to select a range
28f4d3f
unsigned long -> uint32_t (windows vs linux)
AbelPau Mar 8, 2024
2763737
Merge branch 'OSGeo:master' into master
AbelPau Mar 8, 2024
a809c6b
Ogr MiraMon Vector test
AbelPau Mar 10, 2024
4294f85
Merge branch 'OSGeo:master' into master
AbelPau Mar 10, 2024
5e507e3
Merge branch 'OSGeo:master' into master
AbelPau Mar 10, 2024
8c790bc
Some permisions?
AbelPau Mar 10, 2024
a8f3e7d
Simplifyng tests
AbelPau Mar 10, 2024
d5c2da0
Simplyfing tests
AbelPau Mar 10, 2024
c9ff0bc
Merge branch 'master' of https://github.com/AbelPau/gdal
AbelPau Mar 11, 2024
0def639
Adding MiraMonVector driver
AbelPau Mar 11, 2024
f5ee348
formatting file
AbelPau Mar 11, 2024
b2646b9
Merge branch 'OSGeo:master' into master
AbelPau Mar 11, 2024
3ec4655
Merge from base
AbelPau Mar 11, 2024
10715f3
Variable 'osPath' is assigned a value that is never used
AbelPau Mar 11, 2024
ec7fc9e
Merge branch 'OSGeo:master' into master
AbelPau Mar 12, 2024
3f03aad
Merge remote-tracking branch 'upstream/master' into MiraMon-Vector-dr…
AbelPau Mar 12, 2024
75a2a2c
Solving INI file issues
AbelPau Mar 12, 2024
1f20e88
\r as CR (for unicode)
AbelPau Mar 13, 2024
01ea3f5
Merge branch 'OSGeo:master' into master
AbelPau Mar 14, 2024
0b82fb0
Merge branch 'OSGeo:master' into master
AbelPau Mar 14, 2024
fa6f9e0
Merge remote-tracking branch 'upstream/master' into MiraMon-Vector-dr…
AbelPau Mar 14, 2024
eab4b00
Memory and other corrections
AbelPau Mar 14, 2024
02f7176
Merge branch 'OSGeo:master' into master
AbelPau Mar 14, 2024
790cee4
Merge remote-tracking branch 'upstream/master' into MiraMon-Vector-dr…
AbelPau Mar 14, 2024
f62c941
Checking that the folder where to write exists
AbelPau Mar 14, 2024
6a3816d
Merge remote-tracking branch 'upstream/master' into MiraMon-Vector-dr…
AbelPau Mar 14, 2024
7c5bc46
ASAN leaks
AbelPau Mar 14, 2024
a47d395
Merge remote-tracking branch 'upstream/master' into MiraMon-Vector-dr…
AbelPau Mar 16, 2024
6b92426
MIGRATION FROM GDAL 3.8 to GDAL 3.9
AbelPau Mar 16, 2024
3d44c19
Merge branch 'OSGeo:master' into master
AbelPau Mar 16, 2024
5d32961
Extraqualification error
AbelPau Mar 16, 2024
17d3956
C99 adjustments
AbelPau Mar 18, 2024
0bdac8e
Improving tests
AbelPau Mar 18, 2024
7df0945
More tests 3d
AbelPau Mar 18, 2024
9f0af91
Merge branch 'MiraMon-Vector-driver'
AbelPau Mar 19, 2024
c4a32db
More tests & some needs on no GDAL_COMPILATION
AbelPau Mar 19, 2024
092be05
#include "cpl_port.h" // For GUInt64
AbelPau Mar 19, 2024
5d8ff64
"cpl_port.h" on it's place
AbelPau Mar 19, 2024
c66fe2e
Merge branch 'OSGeo:master' into master
AbelPau Mar 19, 2024
b1227e6
Merge branch 'master' into MiraMon-Vector-driver
AbelPau Mar 19, 2024
660b34e
Clang stuff
AbelPau Mar 19, 2024
180acd7
Merge branch 'OSGeo:master' into master
AbelPau Mar 20, 2024
2a94bbc
Merge branch 'master' into MiraMon-Vector-driver
AbelPau Mar 20, 2024
b1c6e24
Memory error solved
AbelPau Mar 20, 2024
135caac
Merge pull request #9 from AbelPau/MiraMon-Vector-driver
AbelPau Mar 20, 2024
f4d6e8c
Corrections to pass test_ogrsf for PNT, ARC and POL
AbelPau Mar 20, 2024
335218c
Modifying tests according to universal polygon accepted + FALSE condi…
AbelPau Mar 20, 2024
8f409b9
Language adjustments (part 1)
AbelPau Mar 20, 2024
e6e0d22
Adjustment(android)
AbelPau Mar 20, 2024
b572362
A leak and a big id
AbelPau Mar 21, 2024
e46dfb9
Merge branch 'OSGeo:master' into master
AbelPau Mar 21, 2024
d0c08c9
Merge branch 'master' into MiraMon-Vector-driver
AbelPau Mar 21, 2024
e148867
Merge branch 'master' into MiraMon-Vector-driver
AbelPau Mar 21, 2024
e9f257f
Tests of reading part finished
AbelPau Mar 21, 2024
80a693a
test_ogr_miramon_test_ogrsf: slightly more idiomatic
rouault Mar 21, 2024
c297abd
Skip MiraMon tests when driver not available
rouault Mar 21, 2024
ca936a9
Merge pull request #11 from rouault/miramon_improvements
AbelPau Mar 21, 2024
cfc1143
Solving some of #10 pull request issues
AbelPau Mar 21, 2024
ac1ffd5
Solving some of #10 pull request issues (part 2)
AbelPau Mar 21, 2024
893eacc
Update ogr/ogrsf_frmts/miramon/mm_wrlayr.c
AbelPau Mar 21, 2024
27ccd2f
PR #10 solved
AbelPau Mar 22, 2024
ced4b16
Fix build issue
rouault Mar 22, 2024
31b52c8
Fix and simplify writing&reading of 64-bit nRecord field
rouault Mar 22, 2024
cba95e9
Silence compiler warning in non-debug mode
rouault Mar 22, 2024
1ea635f
Update ogr/ogrsf_frmts/miramon/mm_gdal_functions.c
AbelPau Mar 22, 2024
3de2f1c
Fix warnings in DEBUG mode about 'suggest braces around empty body in…
rouault Mar 22, 2024
6b983f9
Merge pull request #13 from rouault/fix_build_and_shift
AbelPau Mar 22, 2024
73c4f5e
Some of PQ #12 issues
AbelPau Mar 22, 2024
c15c550
Add another set of missing curly brace
rouault Mar 22, 2024
8f923dc
Avoiding one local_message
AbelPau Mar 22, 2024
515f588
Rename ushort to two_bytes
AbelPau Mar 22, 2024
e156cb1
Clarifying scary methods
AbelPau Mar 22, 2024
d7e638d
Reading correctly 2+2bytes = 4bytes variables
AbelPau Mar 22, 2024
18940f9
Protecting from offset_fals = 0 when things go wrong
AbelPau Mar 22, 2024
5627ed3
Some protections
AbelPau Mar 22, 2024
83f4106
Some more details
AbelPau Mar 22, 2024
6abde55
Some more adjustments of overflows and other
AbelPau Mar 22, 2024
4e7f10e
Fix compiler warnings
rouault Mar 22, 2024
8e7741c
Merge branch 'MiraMon-Vector-driver' of github.com:AbelPau/gdal into …
rouault Mar 22, 2024
f462449
Fix compiler warnings
rouault Mar 22, 2024
737e349
Avoid double fclose() attempt on pfDataBase in case of error in MM_Re…
rouault Mar 22, 2024
0016b19
Implements OGRMiraMonLayer::GetDataset()
rouault Mar 27, 2024
04c2102
Add a Miramon fuzzer
rouault Mar 27, 2024
43e4e8c
MMReturnValueFromSectionINIFile(): simplify it and make it robust aga…
rouault Mar 28, 2024
dbd9902
MMInitLayerByType(): fix memory leaks in error code paths
rouault Mar 28, 2024
558644b
Use non-fatal allocation routines
rouault Mar 28, 2024
38f6261
MM_ReadExtendedDBFHeaderFromFile(): fix memleak when retrying reinten…
rouault Mar 28, 2024
b66006e
GetFeature(): avoid memory leak
rouault Mar 28, 2024
e7155aa
OGRMiraMonLayer::GetFeature(): avoid crash when pMultRecordIndex is null
rouault Mar 28, 2024
008b164
MMCheckSize_t: limit max allocation in fuzzing mode
rouault Mar 28, 2024
ce6621d
More robust MMResize implementation
rouault Mar 28, 2024
737aab1
MMGetGeoFeatureFromVector(): avoid nullptr dereference of hMiraMonLay…
rouault Mar 28, 2024
0958d6c
Add call to MMCheckSize_t() in MMResize functions
rouault Mar 28, 2024
cd16558
GetFeature(): check MMResizeStringToOperateIfNeeded() return code
rouault Mar 28, 2024
03e2857
MM_GetArcHeights(): avoid integer overflow
rouault Mar 28, 2024
0b3e767
MM_ReadExtendedDBFHeaderFromFile(): fix memory leak when retrying rei…
rouault Mar 28, 2024
cf7fedb
OGRMiraMonLayer(): avoid nullptr dereference on fuzzed dataset
rouault Mar 28, 2024
9ec874c
Avoid potential double free when call MMResize functions multiple tim…
rouault Mar 28, 2024
92b4114
MM_CreateAllFields(): limit max allocation to 1 GB in fuzzing mode
rouault Mar 28, 2024
2bf42b6
MM_GetArcHeights(): avoid integer overflow
rouault Mar 28, 2024
b110933
MMGetMultiPolygonCoordinates(): fix leak in error code paths
rouault Mar 28, 2024
45a34bf
MMGetMultiPolygonCoordinates(): avoid crash with crash-aa8f3db246c392…
rouault Mar 29, 2024
d1ffa0e
Avoid read outside of array on crash-65b106da79389b2cadb5936299d195db…
rouault Mar 31, 2024
02235b8
MMReadZSection(): fix crash triggered by crash-11124b90b7d685a6294e47…
rouault Mar 31, 2024
00ff18a
MMCreateExtendedDBFIndex(): fix validation of nNumberOfRecords. Avoid…
rouault Mar 31, 2024
cf543c5
Merge branch 'master' of https://github.com/OSGeo/gdal
AbelPau Apr 2, 2024
48cad49
Avoid using local_message due to it's not thread safe.
AbelPau Apr 2, 2024
77aa371
Making two reallocs safer
AbelPau Apr 2, 2024
e2c2464
Avoiding the use of #pragma warning(disable : 4127)
AbelPau Apr 2, 2024
5d4a550
Clarify the code deleting the use of check if the pointer is null bef…
AbelPau Apr 2, 2024
8c57bdb
Avoiding the use of #pragma warning(disable : 4127) again twice
AbelPau Apr 2, 2024
90c5ea7
Clarifying some code
AbelPau Apr 2, 2024
e6580dc
MMReadAHArcSection(): avoid crash on crash-dbc4ae4dd8b00b5bbb115139aa…
rouault Apr 2, 2024
795f17a
Fix 'suggest braces around empty body in an 'if' statement [-Werror=e…
rouault Apr 2, 2024
241525c
Some details and removing .bak
AbelPau Apr 2, 2024
97c97af
Merge branch 'MiraMon-Vector-driver' of https://github.com/AbelPau/gd…
AbelPau Apr 2, 2024
66b02bb
Using +256 instead of negative numbers in defines
AbelPau Apr 2, 2024
a049e98
Correction on writting the number of records in MM_UpdateEntireHeader()
AbelPau Apr 2, 2024
2d76f64
Limiting the number of fields
AbelPau Apr 2, 2024
66a5930
Changes in a comment
AbelPau Apr 2, 2024
e50654b
snprintf = strcpy + strcat (but secure)
AbelPau Apr 2, 2024
31394cb
Using fclose_and_nullify to simplifiy code
AbelPau Apr 2, 2024
3025cbe
Eliminating an introduced error: hMMFeature->pCoord can be NULL cause…
AbelPau Apr 2, 2024
69c3334
1Mb buffer instead of 100Mb buffer
AbelPau Apr 2, 2024
e94e8f4
Avoiding potential memory leak (here and other I've done before)
AbelPau Apr 2, 2024
27c390e
Using CPLReadLine2L().
AbelPau Apr 2, 2024
84cc8d7
Error assigning the lenght of a char *
AbelPau Apr 3, 2024
95926f5
Merge branch 'master' into MiraMon-Vector-driver
AbelPau Apr 3, 2024
06d3395
Casts and #pragma warning(disable: 4310) to avoid warings.
AbelPau Apr 3, 2024
7b79272
Avoiding the use of à. á etc with tricks.
AbelPau Apr 3, 2024
9653159
A big change in MMGetNFieldValue() and other minor changes.
AbelPau Apr 3, 2024
f428d57
Reverting use of à, á,... , use of currentTime and avoiding to check …
AbelPau Apr 3, 2024
6714468
MIssing Corrections to MMGetNFieldValue()
AbelPau Apr 3, 2024
69cd1ec
delete MMGetNFieldValue() and take a better way
AbelPau Apr 3, 2024
e117d15
Simplifying code in MMAddFeatureRecordToMMDB()
AbelPau Apr 3, 2024
1e77380
Avoiding enter a functions in rare conditions
AbelPau Apr 3, 2024
0df9159
Checking hMMFeature
AbelPau Apr 3, 2024
3802153
returning the correct value
AbelPau Apr 3, 2024
e36fd21
using nullptr and improving a comment
AbelPau Apr 3, 2024
cb291e4
missing "d"
AbelPau Apr 3, 2024
a5f27dc
/*ok*/ in a printf and format not used
AbelPau Apr 3, 2024
953cc18
fuzzers/build_seed_corpus.sh: fix shellcheck warning
rouault Apr 3, 2024
1bf85dd
Solving introduced error. Sorry!
AbelPau Apr 3, 2024
8fe079a
Merge branch 'MiraMon-Vector-driver' of https://github.com/AbelPau/gd…
AbelPau Apr 3, 2024
35a7ad7
Solving several Even comments
AbelPau Apr 3, 2024
2efc80a
Fix memory leaks with 'valgrind --leak-check=full ogr2ogr out.pol aut…
rouault Apr 3, 2024
f17fae9
Make sure that MMCloseXXXX() functions do all the cleanup
rouault Apr 3, 2024
408a1dd
autotest: Avoid random failure on test_gdal_proximity.py and test_gda…
rouault Apr 4, 2024
f1a6d72
Several suggestions adopted
AbelPau Apr 4, 2024
e40916d
Correcting a null acces with m_poSRS.
AbelPau Apr 4, 2024
d785dc2
Merge branch 'master' of https://github.com/OSGeo/gdal
AbelPau Apr 4, 2024
ae725f0
Merge branch 'master' into MiraMon-Vector-driver
AbelPau Apr 4, 2024
4419aee
Checking if indexs of the polygon or arcs are in the correct range.
AbelPau Apr 4, 2024
48b02d1
Avoiding casts in clamp
AbelPau Apr 4, 2024
7af68e0
autotest: Avoid random failure on test_gdal_proximity.py with ASAN
rouault Apr 4, 2024
2bd8c58
Avoid recoding twice
AbelPau Apr 4, 2024
b4d0a69
Avoiding nullptr acces
AbelPau Apr 4, 2024
35b5a71
Using an else better
AbelPau Apr 4, 2024
d23b041
Allow null feature if zero elements & >= instead of >
AbelPau Apr 4, 2024
44bc389
unnecessay if()
AbelPau Apr 4, 2024
fd89bff
Making the default language the one is filled
AbelPau Apr 4, 2024
4e5541d
Solving some issues from coverity scan defects
AbelPau Apr 4, 2024
49623c0
free_function to avoid memory leaks
AbelPau Apr 4, 2024
8e976f6
\0 after strncpy()
AbelPau Apr 4, 2024
9679657
changing names and init inline
AbelPau Apr 4, 2024
d6525fe
naming convention + solving an error + OGRMiraMonDriverIdentify() ins…
AbelPau Apr 4, 2024
137ca9c
Merge branch 'master' into MiraMon-Vector-driver
rouault Apr 4, 2024
d010cc4
Solving all Coverity Scan issues from MiraMon directories
AbelPau Apr 4, 2024
97482b4
Using CPLStrlcpy instead of MM_strnzcpy of strncpy
AbelPau Apr 5, 2024
626466f
Merge branch 'master' into MiraMon-Vector-driver
rouault Apr 5, 2024
b6c09b4
Using MM_MULTIRECORD_LAST instead of -1 (and similars) + delete vsist…
AbelPau Apr 5, 2024
f6c778f
Avoiding to get Universal Polygon (feature 0)
AbelPau Apr 5, 2024
a129137
Changes in the tests to understand that the MiraMon universal polygon…
AbelPau Apr 5, 2024
ea93517
Merge branch 'master' into MiraMon-Vector-driver
rouault Apr 5, 2024
9a3fee7
Solving an error with testing polygons
AbelPau Apr 5, 2024
d47a2ae
Seting FID correctly
AbelPau Apr 5, 2024
5b4a314
OGRMiraMonLayer::GetFeature(): fix remaining wrong use of binary oper…
rouault Apr 6, 2024
f255844
More robust use of MMCheckSize_t()
rouault Apr 6, 2024
1962dc2
MMInitZSectionLayer(): prevent integer overflow
rouault Apr 6, 2024
75ce95a
Fix "negation of -2147483648 cannot be represented in type 'GInt32' (…
rouault Apr 6, 2024
ad35e57
MMReadPHPolygonSection(): prevent integer overflow
rouault Apr 6, 2024
aca56cf
MMReadZSection(): avoid integer overflows
rouault Apr 6, 2024
949d323
ossfuzz: crash in MMReadBlockFromBuffer() SOLVED
AbelPau Apr 7, 2024
b635a10
MMReadZSection(): avoid unsigned integer overflows
rouault Apr 7, 2024
4d5cbe9
ogr_miramon_vector.py: add minimum testing of writing side, with a fe…
rouault Apr 7, 2024
05f7193
Fix of # FIXME: fails on assert f.GetField("LONG_ARC")
AbelPau Apr 7, 2024
2588611
Last Even comments taken in account
AbelPau Apr 8, 2024
9ab244d
Solving writing Z coordinates (FIXME's in https://github.com/AbelPau/…
AbelPau Apr 8, 2024
8db6be8
Solving writing Z coordinates FIXME 2nd part.
AbelPau Apr 8, 2024
4f1cd7d
Solved error in more than 2 rings bad construction (in polygons)
AbelPau Apr 8, 2024
f6f9efc
Buffer from 2.5 mb to 1 mb + memset's to resize functions (necessary…
AbelPau Apr 8, 2024
a412e21
Elimination of OpenMemoryRatio and CreationMemoryRatio
AbelPau Apr 9, 2024
469ea47
Making some information visible if layer opened with MIraMon SIG
AbelPau Apr 9, 2024
c4c5b0a
Last Even comments
AbelPau Apr 9, 2024
106815e
Garbage delete
AbelPau Apr 9, 2024
61a93ad
Adding tests to write and check the version 2.0 of the format
AbelPau Apr 10, 2024
f24d40e
writing using -lco CreationLanguage=CAT (SPA and ENG) added
AbelPau Apr 10, 2024
2c83c5e
writing using open_options=["OpenLanguage=" + Language] added.
AbelPau Apr 10, 2024
88647fc
Adjustments to get the default language from a multilingual MiraMon m…
AbelPau Apr 10, 2024
407e5f0
Added a test for arcs. Not necessary for polygons.
AbelPau Apr 10, 2024
6094829
Solving Fixture not found
AbelPau Apr 10, 2024
bee18c5
Improvements on some width fields. A error -> warning.
AbelPau Apr 11, 2024
763df71
Improvements on some width fields. Part 2
AbelPau Apr 11, 2024
fe9b1c0
A binary field (not suported in MiraMon) is "translated" as a 1 byte …
AbelPau Apr 12, 2024
8e05049
Some errors verifying field's width and initialization with ' ' inst…
AbelPau Apr 12, 2024
6dbc058
Solving some pointer errors and deleting a not needed parameter
AbelPau Apr 12, 2024
1982375
Adjustments in the number of decimals to print in a MiraMon DBF for p…
AbelPau Apr 12, 2024
21958ec
OFTRealList forgotten
AbelPau Apr 12, 2024
93c4e76
Adding an explanation about a decision
AbelPau Apr 12, 2024
0f2a39b
n_decimals not used anymore
AbelPau Apr 12, 2024
7274485
n_decimals not used anymore (c)
AbelPau Apr 12, 2024
41f23bf
Not using n_decimals, finally
AbelPau Apr 12, 2024
3585115
Make tests independent from number of used decimals in the DBF values
AbelPau Apr 12, 2024
f45b3d5
ogr_miramon_vector.py: use more idiomatic pytest.approx
rouault Apr 14, 2024
4b398b9
ogr_miramon_vector.py: re-enable disabled checks
rouault Apr 14, 2024
c54aed3
Returning error when trying to Create a Field into a layer with alrea…
AbelPau Apr 15, 2024
946f6cd
Bad comparation solved
AbelPau Apr 15, 2024
a47579f
fix typos raised by scripts/fix_typos.sh
rouault Apr 15, 2024
f964451
ogr_miramon_vector.py: more idiomatic pytest usage, and fix Version=V2.0
rouault Apr 15, 2024
b5b93a2
Tune driver XML strings
rouault Apr 15, 2024
fc9268d
Use EQUAL()
rouault Apr 15, 2024
9e09552
Correction in OLCCreateField TestCapability()
AbelPau Apr 15, 2024
a00858a
Clarification about reserved fields in documentation
AbelPau Apr 15, 2024
6bac218
Do not display units if they are unknown.
AbelPau Apr 15, 2024
58e9820
Deleting unnecessary variable and adding "m" units for a field named …
AbelPau Apr 15, 2024
682e399
Correcting an incongruency
AbelPau Apr 15, 2024
076f74f
Explaining better the exception
AbelPau Apr 15, 2024
02b1d26
Explaning what "MostrarUnitats=0" means
AbelPau Apr 15, 2024
010e83f
First approach to write the precision on some real fields
AbelPau Apr 15, 2024
93d0d05
Some adjustments for specific fields.
AbelPau Apr 15, 2024
8104837
Elimination of unused define + writing the configured number of decimals
AbelPau Apr 15, 2024
55bb1f1
Avoiding a crash reading a Triangle feature
AbelPau Apr 16, 2024
39bd996
Attempt to deduce the appropriate number of decimals for reserved fields
AbelPau Apr 16, 2024
d9628f4
Adpatation of SprintfDoubleSignifFigures() to print some reals
AbelPau Apr 16, 2024
9db9169
Merge branch 'master' of https://github.com/OSGeo/gdal
AbelPau Apr 16, 2024
1bd6985
Merge branch 'master' into MiraMon-Vector-driver
AbelPau Apr 16, 2024
ac6a58f
Elimination of an unuseful variable dValue. All is formated in pDinValue
AbelPau Apr 16, 2024
80156f2
Some improvements to SprintfDoubleSignifFigures() & FillWithZerosBefo…
AbelPau Apr 16, 2024
a272472
Some forgoten conversions in last commit
AbelPau Apr 16, 2024
c6e530a
A
AbelPau Apr 16, 2024
ca208e7
Explanations and some improvements.
AbelPau Apr 16, 2024
e458f53
a printf is detected as error in a comment :O
AbelPau Apr 16, 2024
edd6813
Comparison with '0' found.
AbelPau Apr 16, 2024
0d0e48e
Some translations to make teh code clearer
AbelPau Apr 16, 2024
86f2cdf
Solving an error about formating as double a string value + add "m" a…
AbelPau Apr 17, 2024
f80afc8
Deleting FillWithZerosBeforeLoadingDoubleIntoMemory() and its use. Ad…
AbelPau Apr 17, 2024
f399a7e
Merge branch 'master' of https://github.com/OSGeo/gdal
AbelPau Apr 17, 2024
507012c
Merge branch 'master' into MiraMon-Vector-driver
AbelPau Apr 17, 2024
306655c
Solving some errors in DBF's results
AbelPau Apr 17, 2024
aef5884
Fixing a format problem with strings due to a bad decision
AbelPau Apr 17, 2024
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,4 @@ gdal/share
# CMake files (CMakeSettings.json is generated by Visual Studio)
/build
CMakeSettings.json
out/
out/
Binary file not shown.
Binary file not shown.
Binary file not shown.
161 changes: 161 additions & 0 deletions autotest/ogr/data/miramon/Arcs/3dArcs/linies_3d_WGS84A.rel
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
[VERSIO]
Vers=4
SubVers=3
VersMetaDades=5
SubVersMetaDades=0

[TAULA_PRINCIPAL]
IdGrafic=ID_GRAFIC
TipusRelacio=RELACIO_1_N_DICC

[TAULA_PRINCIPAL:ID_GRAFIC]
visible=0
MostrarUnitats=0
descriptor=Identificador Gràfic intern

[TAULA_PRINCIPAL:N_VERTEXS]
visible=0
MostrarUnitats=0
descriptor=Nombre de vèrtexs

[TAULA_PRINCIPAL:LONG_ARC]
visible=0
descriptor=Longitud de l'arc (projecció)

[TAULA_PRINCIPAL:LONG_ARCE]
unitats=m
descriptor=Longitud de l'arc (el·lipsoide)

[TAULA_PRINCIPAL:NODE_INI]
visible=0
MostrarUnitats=0
descriptor=Node inicial

[TAULA_PRINCIPAL:NODE_FI]
visible=0
MostrarUnitats=0
descriptor=Node final

[METADADES]
language=cat
MDIdiom=cat
dateStamp=20240311 09500830
characterSet=006
nOrganismes=2
FileIdentifier=linies_3d_29042

[METADADES:ORGANISME_1]
role=009
OrganisationName=CREAF
IndividualName=Abel Pau
PositionName=Tècnic en SIG

[IDENTIFICATION]
code=linies_3d_29042
codeSpace=
DatasetTitle=Linies

[SPATIAL_REFERENCE_SYSTEM:HORIZONTAL]
HorizontalSystemIdentifier=lat/long-WGS84

[EXTENT]
MinX=1.28287097369422
MaxX=1.98292118178235
MinY=41.1902658152019
MaxY=41.6776900669325
toler_env=0

[OVERVIEW]
CreationDate=20240311 09500477

[OVERVIEW:ASPECTES_TECNICS]
comment1=Nombre d'arcs: 6
comment2=El fitxer era anteriorment en la projecció UTM-31N-ETRS89

[METADADES:ORGANISME_2]
role=009
OrganisationName=Students and educational institutions

[QUALITY:LINEAGE:PROCESS1]
nOrganismes=1
history=C:\MiraMon\MM64.exe
date=20230912 16505195+0200

[QUALITY:LINEAGE:PROCESS1:ORGANISME_1]
OrganisationName=Students and educational institutions

[QUALITY:LINEAGE:PROCESS2]
nOrganismes=1
history=Vec3D.exe 1 C:\Mapes\ColleccionsPreferides\Catalunya-ETRS89\Altimetria30m\MDE30m_ICC_Aster_mar0.img D:\dades\GDAL_V\KML\multi\+\linies.arc D:\dades\GDAL_V\KML\multi\+\linies_3d.arc 0
purpose=Incorpora la 3a dimensió en capes vectorials
date=20231031 13263780+0100

[QUALITY:LINEAGE:PROCESS2:ORGANISME_1]
OrganisationName=Students and educational institutions

[QUALITY:LINEAGE:PROCESS3]
nOrganismes=1
history=CanviPrj_64.exe D:\dades\GDAL_V\KML\multi\+\linies_3d.arc D:\dades\GDAL_V\KML\multi\+\linies_3d_WGS84.arc lat/long-WGS84
purpose=Permet fer la transformació per a vectors estructurats de punts (PNT), d'arcs (ARC) i polígons (POL). Per a transformar fitxers de nodes (NOD) cal transformar el fitxer d'arcs associat.
date=20231113 11502174+0100
NomFitxer=C:\miramon\CanviPrj_64.exe

[QUALITY:LINEAGE:PROCESS3:ORGANISME_1]
OrganisationName=Students and educational institutions

[QUALITY:LINEAGE:PROCESS3:SOFTWARE_REFERENCE]
Titol=
Edition=
CollectiveTitle=
ISBN=
ISSN=

[QUALITY:LINEAGE:PROCESS3:INOUT1]
identifier=Param1
TypeValues=S
ResultUnits=
source=1

[QUALITY:LINEAGE:SOURCE1]
NomFitxer=linies_3d.arc
processes=4,5

[QUALITY:LINEAGE:PROCESS4]
nOrganismes=1
history=C:\MiraMon\MM64.exe
date=20230912 16505195+0200

[QUALITY:LINEAGE:PROCESS4:ORGANISME_1]
OrganisationName=Students and educational institutions

[QUALITY:LINEAGE:PROCESS5]
nOrganismes=1
history=Vec3D.exe 1 C:\Mapes\ColleccionsPreferides\Catalunya-ETRS89\Altimetria30m\MDE30m_ICC_Aster_mar0.img D:\dades\GDAL_V\KML\multi\+\linies.arc D:\dades\GDAL_V\KML\multi\+\linies_3d.arc 0
purpose=Incorpora la 3a dimensió en capes vectorials
date=20231031 13263780+0100

[QUALITY:LINEAGE:PROCESS5:ORGANISME_1]
OrganisationName=Students and educational institutions

[QUALITY:LINEAGE:PROCESS3:INOUT2]
identifier=Param2
sentit=1
TypeValues=S
ResultUnits=
source=<Parent>

[QUALITY:LINEAGE:PROCESS3:INOUT3]
identifier=Param3
TypeValues=C
ResultValue=lat/long-WGS84
ResultUnits=

[QUALITY:LINEAGE]
processes=1,2,3

[GEOMETRIA_I_TOPOLOGIA]
NomCampNVertexs=N_VERTEXS
NomCampLongitudArc=LONG_ARC
NomCampLongitudArcEllipsoidal=LONG_ARCE
NomCampNodeIni=NODE_INI
NomCampNodeFi=NODE_FI
Binary file not shown.
83 changes: 83 additions & 0 deletions autotest/ogr/data/miramon/Arcs/3dArcs/linies_3d_WGS84N.rel
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
[VERSIO]
Vers=4
SubVers=3
VersMetaDades=5
SubVersMetaDades=0

[TAULA_PRINCIPAL]
IdGrafic=ID_GRAFIC
TipusRelacio=RELACIO_1_N_DICC

[TAULA_PRINCIPAL:ID_GRAFIC]
visible=0
MostrarUnitats=0
descriptor=Identificador Gràfic intern

[TAULA_PRINCIPAL:ARCS_A_NOD]
MostrarUnitats=0
descriptor=Nombre d'arcs al node

[TAULA_PRINCIPAL:TIPUS_NODE]
MostrarUnitats=0
descriptor=Tipus de node

[METADADES]
language=cat
MDIdiom=cat
dateStamp=20240311 09500993
characterSet=006
nOrganismes=2
FileIdentifier=linies_3d_29042

[METADADES:ORGANISME_1]
role=009
OrganisationName=CREAF
IndividualName=Abel Pau
PositionName=Tècnic en SIG

[IDENTIFICATION]
code=linies_3d_29042
codeSpace=
DatasetTitle=Linies

[OVERVIEW:ASPECTES_TECNICS]
comment1=Nombre d'arcs: 6
comment2=El fitxer era anteriorment en la projecció UTM-31N-ETRS89

[EXTENT]
MinX=1.28287097369422
MaxX=1.98292118178235
MinY=41.1902658152019
MaxY=41.6776900669325
toler_env=0

[OVERVIEW]
CreationDate=20240311 09500616

[METADADES:ORGANISME_2]
role=009
OrganisationName=Students and educational institutions

[QUALITY:LINEAGE:PROCESS1]
nOrganismes=1
history=C:\MiraMon\MM64.exe
date=20230912 16505195+0200

[QUALITY:LINEAGE:PROCESS1:ORGANISME_1]
OrganisationName=Students and educational institutions

[QUALITY:LINEAGE:PROCESS2]
nOrganismes=1
history=Vec3D.exe 1 C:\Mapes\ColleccionsPreferides\Catalunya-ETRS89\Altimetria30m\MDE30m_ICC_Aster_mar0.img D:\dades\GDAL_V\KML\multi\+\linies.arc D:\dades\GDAL_V\KML\multi\+\linies_3d.arc 0
purpose=Incorpora la 3a dimensió en capes vectorials
date=20231031 13263780+0100

[QUALITY:LINEAGE:PROCESS2:ORGANISME_1]
OrganisationName=Students and educational institutions

[QUALITY:LINEAGE]
processes=1,2

[GEOMETRIA_I_TOPOLOGIA]
NomCampArcsANode=ARCS_A_NOD
NomCampTipusNode=TIPUS_NODE
Binary file not shown.
Binary file not shown.
Binary file not shown.
41 changes: 41 additions & 0 deletions autotest/ogr/data/miramon/Arcs/EmptyArcs/Empty_ARCA.rel
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[VERSIO]
VersMetaDades=5
SubVersMetaDades=0
Vers=4
SubVers=3

[SPATIAL_REFERENCE_SYSTEM:HORIZONTAL]
HorizontalSystemIdentifier=UTM-31N-ETRS89

[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

[GEOMETRIA_I_TOPOLOGIA]
NomCampNVertexs=N_VERTEXS
NomCampLongitudArc=LONG_ARC
NomCampNodeIni=NODE_INI
NomCampNodeFi=NODE_FI
Binary file not shown.
26 changes: 26 additions & 0 deletions autotest/ogr/data/miramon/Arcs/EmptyArcs/Empty_ARCN.rel
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[VERSIO]
VersMetaDades=5
SubVersMetaDades=0
Vers=4
SubVers=3

[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

[GEOMETRIA_I_TOPOLOGIA]
NomCampArcsANode=ARCS_A_NOD
NomCampTipusNode=TIPUS_NODE
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading