diff --git a/build.gradle b/build.gradle index 692f9b9..bb608e5 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 @@ -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.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: '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 706fd01..f7f93eb 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1,6 +1,17 @@ LATEST VERSION ----------------------------- +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" +- 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) ----------------------------- - fails to lookup ili24 model if xtf24 transfer file (#239) diff --git a/src/org/interlis2/validator/Validator.java b/src/org/interlis2/validator/Validator.java index d557d57..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).setAllowItfAreaHoles(skipGeometryErrors); + if(skipGeometryErrors) { + ((ItfReader2) ioxReader).setIgnorePolygonBuildingErrors(ItfReader2.POLYGON_BUILDING_ERRORS_OFF); + } ((ItfReader2) ioxReader).setAllowItfAreaHoles(allowItfAreaHoles); ((ItfReader2) ioxReader).setIoxDataPool(pool); } @@ -407,7 +409,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