From 675e4ea2775b4f2826a8338a22655823ea5698ae Mon Sep 17 00:00:00 2001 From: claeis Date: Fri, 1 May 2020 11:52:46 +0200 Subject: [PATCH 1/7] start 1.11.7 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 692f9b9..1fe9149 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ allprojects { targetCompatibility = "1.6" } -version '1.11.6'+System.getProperty('release','-SNAPSHOT') +version '1.11.7'+System.getProperty('release','-SNAPSHOT') configurations { deployerJars From b3ffdadf9131298afc656483af2bea9c0b21eaa4 Mon Sep 17 00:00:00 2001 From: claeis Date: Wed, 3 Jun 2020 09:20:13 +0200 Subject: [PATCH 2/7] log --modeldir value as modeldir (#256) --- build.gradle | 4 ++-- docs/CHANGELOG.txt | 2 ++ src/org/interlis2/validator/Validator.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1fe9149..a66fd2b 100644 --- a/build.gradle +++ b/build.gradle @@ -23,8 +23,8 @@ configurations { dependencies { compile group: 'ch.ehi', name: 'ehibasics', version: '1.3.0' compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.0' - compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.1.1" - compile group: 'ch.interlis', name: 'ili2c-core', version: "5.1.1" + compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.1.2+" + compile group: 'ch.interlis', name: 'ili2c-core', version: "5.1.2+" testCompile group: 'junit', name: 'junit', version: '4.12' deployerJars "org.apache.maven.wagon:wagon-ftp:3.3.3" deployerJars "org.apache.maven.wagon:wagon-ssh:3.3.3" diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 706fd01..4b80197 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,5 +1,7 @@ LATEST VERSION ----------------------------- +- ili2c-5.1.2-SNAPSHOT +- log --modeldir value as modeldir (#256) ilivalidator 1.11.6 (2020-05-01) ----------------------------- diff --git a/src/org/interlis2/validator/Validator.java b/src/org/interlis2/validator/Validator.java index d557d57..b5f8b57 100644 --- a/src/org/interlis2/validator/Validator.java +++ b/src/org/interlis2/validator/Validator.java @@ -407,7 +407,7 @@ public static TransferDescription compileIli(String iliVersion,List mode ilidirs=Validator.SETTING_DEFAULT_ILIDIRS; } - EhiLogger.logState("ilidirs <"+ilidirs+">"); + EhiLogger.logState("modeldir <"+ilidirs+">"); String modeldirs[]=ilidirs.split(";"); HashSet ilifiledirs=new HashSet(); for(int modeli=0;modeli Date: Thu, 23 Jul 2020 11:09:25 +0200 Subject: [PATCH 3/7] Overlaying AREA not detected (#263) --- build.gradle | 2 +- docs/CHANGELOG.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a66fd2b..e89b497 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ configurations { dependencies { compile group: 'ch.ehi', name: 'ehibasics', version: '1.3.0' - compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.0' + compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.1+' compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.1.2+" compile group: 'ch.interlis', name: 'ili2c-core', version: "5.1.2+" testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 4b80197..3e0bc28 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -2,6 +2,7 @@ LATEST VERSION ----------------------------- - ili2c-5.1.2-SNAPSHOT - log --modeldir value as modeldir (#256) +- Overlaying AREA not detected (#263) ilivalidator 1.11.6 (2020-05-01) ----------------------------- From a6e9eb53bc567f6ca2219d804824c6992b8f13e1 Mon Sep 17 00:00:00 2001 From: claeis Date: Fri, 24 Jul 2020 16:57:08 +0200 Subject: [PATCH 4/7] ignore polygon building errors if defaultGeometryTypeValidation="off" --- docs/CHANGELOG.txt | 1 + src/org/interlis2/validator/Validator.java | 2 +- test/data/defaultGeometryTypeValidationOff.toml | 2 ++ test/src/org/interlis2/validator/ValidatorTest.java | 7 +++++++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 test/data/defaultGeometryTypeValidationOff.toml diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 3e0bc28..c1004e9 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -3,6 +3,7 @@ LATEST VERSION - ili2c-5.1.2-SNAPSHOT - log --modeldir value as modeldir (#256) - Overlaying AREA not detected (#263) +- ignore polygon building errors if defaultGeometryTypeValidation="off" ilivalidator 1.11.6 (2020-05-01) ----------------------------- diff --git a/src/org/interlis2/validator/Validator.java b/src/org/interlis2/validator/Validator.java index b5f8b57..3a9bccd 100644 --- a/src/org/interlis2/validator/Validator.java +++ b/src/org/interlis2/validator/Validator.java @@ -353,7 +353,7 @@ protected IoxReader createReader(String filename, TransferDescription td,LogEven ioxReader=new ItfReader(new java.io.File(filename)); } if(ioxReader instanceof ItfReader2){ - ((ItfReader2) ioxReader).setAllowItfAreaHoles(skipGeometryErrors); + ((ItfReader2) ioxReader).setIgnorePolygonBuildingErrors(skipGeometryErrors); ((ItfReader2) ioxReader).setAllowItfAreaHoles(allowItfAreaHoles); ((ItfReader2) ioxReader).setIoxDataPool(pool); } diff --git a/test/data/defaultGeometryTypeValidationOff.toml b/test/data/defaultGeometryTypeValidationOff.toml new file mode 100644 index 0000000..d55012a --- /dev/null +++ b/test/data/defaultGeometryTypeValidationOff.toml @@ -0,0 +1,2 @@ +["PARAMETER"] +defaultGeometryTypeValidation="off" diff --git a/test/src/org/interlis2/validator/ValidatorTest.java b/test/src/org/interlis2/validator/ValidatorTest.java index 5b2b51c..8f68533 100644 --- a/test/src/org/interlis2/validator/ValidatorTest.java +++ b/test/src/org/interlis2/validator/ValidatorTest.java @@ -77,6 +77,13 @@ public void itfAreaOpenFail() { boolean ret=Validator.runValidation("test/data/Beispiel1d.itf", null); assertFalse(ret); } + @Test + public void itfWithValidationConfig_DefaultGeometryTypeValidationOff_Ok() { + Settings settings=new Settings(); + settings.setValue(Validator.SETTING_CONFIGFILE, "test/data/defaultGeometryTypeValidationOff.toml"); + boolean ret=Validator.runValidation("test/data/Beispiel1d.itf", settings); + assertTrue(ret); + } @Test public void xtfOk() { boolean ret=Validator.runValidation("test/data/Beispiel2a.xtf", null); From a2b980ee540fb81faf38210f552430aa366640c9 Mon Sep 17 00:00:00 2001 From: claeis Date: Mon, 24 Aug 2020 15:20:21 +0200 Subject: [PATCH 5/7] fix type --- docs/CHANGELOG.txt | 4 ++++ src/org/interlis2/validator/Validator.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index c1004e9..1c0491b 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,9 +1,13 @@ LATEST VERSION ----------------------------- - ili2c-5.1.2-SNAPSHOT +- iox-ili-1.21.1-SNAPSHOT - log --modeldir value as modeldir (#256) - Overlaying AREA not detected (#263) - ignore polygon building errors if defaultGeometryTypeValidation="off" +- improve error messages in INI-file parsing (271) +- wrongly reports duplicate TIDs (266) + ilivalidator 1.11.6 (2020-05-01) ----------------------------- diff --git a/src/org/interlis2/validator/Validator.java b/src/org/interlis2/validator/Validator.java index 3a9bccd..468a492 100644 --- a/src/org/interlis2/validator/Validator.java +++ b/src/org/interlis2/validator/Validator.java @@ -353,7 +353,9 @@ protected IoxReader createReader(String filename, TransferDescription td,LogEven ioxReader=new ItfReader(new java.io.File(filename)); } if(ioxReader instanceof ItfReader2){ - ((ItfReader2) ioxReader).setIgnorePolygonBuildingErrors(skipGeometryErrors); + if(skipGeometryErrors) { + ((ItfReader2) ioxReader).setIgnorePolygonBuildingErrors(ItfReader2.POLYGON_BUILDING_ERRORS_OFF); + } ((ItfReader2) ioxReader).setAllowItfAreaHoles(allowItfAreaHoles); ((ItfReader2) ioxReader).setIoxDataPool(pool); } From 4ed7020fa66e912958573ec5f3841efd80b9f96a Mon Sep 17 00:00:00 2001 From: claeis Date: Fri, 25 Sep 2020 15:59:45 +0200 Subject: [PATCH 6/7] Attempting to disable geometry validation with no success (#272) --- build.gradle | 2 +- docs/CHANGELOG.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index e89b497..ca7e37b 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ configurations { dependencies { compile group: 'ch.ehi', name: 'ehibasics', version: '1.3.0' - compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.1+' + compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.2+' compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.1.2+" compile group: 'ch.interlis', name: 'ili2c-core', version: "5.1.2+" testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 1c0491b..0893516 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,13 +1,13 @@ LATEST VERSION ----------------------------- - ili2c-5.1.2-SNAPSHOT -- iox-ili-1.21.1-SNAPSHOT +- iox-ili-1.21.2-SNAPSHOT - log --modeldir value as modeldir (#256) - Overlaying AREA not detected (#263) - ignore polygon building errors if defaultGeometryTypeValidation="off" -- improve error messages in INI-file parsing (271) -- wrongly reports duplicate TIDs (266) - +- improve error messages in INI-file parsing (#271) +- wrongly reports duplicate TIDs (#266) +- Attempting to disable geometry validation with no success (#272) ilivalidator 1.11.6 (2020-05-01) ----------------------------- From 1e193c718767e93636c6c73d554dd80a5a90e87b Mon Sep 17 00:00:00 2001 From: claeis Date: Tue, 29 Sep 2020 08:44:58 +0200 Subject: [PATCH 7/7] prep 1.11.7 --- build.gradle | 6 +++--- docs/CHANGELOG.txt | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ca7e37b..bb608e5 100644 --- a/build.gradle +++ b/build.gradle @@ -22,9 +22,9 @@ configurations { dependencies { compile group: 'ch.ehi', name: 'ehibasics', version: '1.3.0' - compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.2+' - compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.1.2+" - compile group: 'ch.interlis', name: 'ili2c-core', version: "5.1.2+" + compile group: 'ch.interlis', name: 'iox-ili', version: '1.21.2' + compile group: 'ch.interlis', name: 'ili2c-tool', version: "5.1.3" + compile group: 'ch.interlis', name: 'ili2c-core', version: "5.1.3" testCompile group: 'junit', name: 'junit', version: '4.12' deployerJars "org.apache.maven.wagon:wagon-ftp:3.3.3" deployerJars "org.apache.maven.wagon:wagon-ssh:3.3.3" diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 0893516..f7f93eb 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,7 +1,10 @@ LATEST VERSION ----------------------------- -- ili2c-5.1.2-SNAPSHOT -- iox-ili-1.21.2-SNAPSHOT + +ilivalidator 1.11.7 (2020-09-29) +----------------------------- +- ili2c-5.1.3 +- iox-ili-1.21.2 - log --modeldir value as modeldir (#256) - Overlaying AREA not detected (#263) - ignore polygon building errors if defaultGeometryTypeValidation="off"