Merge branch 'master' into 2024-12-11-fix-ara-bauwerk-export-2nd-attempt

QGEP · Dec 20, 2024 · 91d551e · 91d551e
2 parents 1e42ed4 + 53ed91e
commit 91d551e
Show file tree

Hide file tree

Showing 69 changed files with 794 additions and 280 deletions.
diff --git a/qgepqwat2ili/__init__.py b/qgepqwat2ili/__init__.py
@@ -198,37 +198,44 @@ def main(args):
             SCHEMA = config.ABWASSER_SCHEMA
             ILI_MODEL = config.ABWASSER_ILI_MODEL
             ILI_MODEL_NAME = config.ABWASSER_ILI_MODEL_NAME
-            ILI_EXPORT_MODEL_NAME = None
+            ILI_EXPORT_MODEL_NAME = config.ABWASSER_ILI_MODEL_NAME
 
         if args.direction == "export":
+            basket_enabled = True
+            if args.export_sia405 or args.export_dss:
+                basket_enabled = False
+
             utils.ili2db.create_ili_schema(
                 SCHEMA,
                 ILI_MODEL,
                 make_log_path(log_path, "ilicreate"),
                 recreate_schema=args.recreate_schema,
-                create_basket_col=False,
+                create_basket_col=basket_enabled,
             )
-            # add model dependency
+
             if args.export_sia405:
                 # SIA405_ABWASSER_2015_LV95
                 qgep_export_sia405(
                     selection=args.selection.split(",") if args.selection else None,
                     labels_file=args.labels_file,
                     orientation=args.labels_orientation,
+                    basket_enabled=basket_enabled,
                 )
             elif args.export_dss:
                 # DSS_2015_LV95 expor5t
                 qgep_export_dss(
                     selection=args.selection.split(",") if args.selection else None,
                     labels_file=args.labels_file,
                     orientation=args.labels_orientation,
+                    basket_enabled=basket_enabled,
                 )
             else:
                 # VSA_KEK_2019_LV95 export
                 qgep_export_kek(
                     selection=args.selection.split(",") if args.selection else None,
                     labels_file=args.labels_file,
                     orientation=args.labels_orientation,
+                    basket_enabled=basket_enabled,
                 )
 
             utils.ili2db.export_xtf_data(
@@ -281,7 +288,7 @@ def main(args):
                     ILI_MODEL,
                     make_log_path(log_path, "ilicreate"),
                     recreate_schema=args.recreate_schema,
-                    create_basket_col=False,
+                    create_basket_col=True,
                 )
                 utils.ili2db.import_xtf_data(
                     SCHEMA, args.path, make_log_path(log_path, "iliimport")
@@ -317,7 +324,7 @@ def main(args):
                     ABWASSER_DSS_ILI_MODEL,
                     make_log_path(log_path, "ilicreate"),
                     recreate_schema=args.recreate_schema,
-                    create_basket_col=True,
+                    create_basket_col=False,
                 )
                 utils.ili2db.import_xtf_data(
                     ABWASSER_DSS_SCHEMA, args.path, make_log_path(log_path, "iliimport")

diff --git a/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/docs/README.txt b/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/docs/README.txt
diff --git a/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/ili2pg-4.6.1.jar b/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/ili2pg-4.6.1.jar
diff --git a/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/ili2c-core-5.2.3.jar b/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/ili2c-core-5.2.3.jar
diff --git a/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/ili2c-tool-5.2.3.jar b/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/ili2c-tool-5.2.3.jar
diff --git a/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/ili2db-4.6.1.jar b/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/ili2db-4.6.1.jar
diff --git a/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/iox-ili-1.21.8.jar b/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/iox-ili-1.21.8.jar
diff --git a/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/postgresql-42.2.18.jre6.jar b/qgepqwat2ili/bin/ili2pg-4.6.1-bindist/libs/postgresql-42.2.18.jre6.jar
diff --git a/...n/ili2pg-4.6.1-bindist/docs/CHANGELOG.txt → ...t2ili/bin/ili2pg-5.2.0/docs/CHANGELOG.txt b/...n/ili2pg-4.6.1-bindist/docs/CHANGELOG.txt → ...t2ili/bin/ili2pg-5.2.0/docs/CHANGELOG.txt
@@ -11,8 +11,134 @@ ideas/open issues/questions
 - einfache Liste mit den neu erzeugten Vertexpunkte (aufgrund der Overlap-Bereinigung)
 - Schalter f�r das "disablen" der Overlaps-Bereinigung. Bei vorhandenen gueltigen Overlaps erfolgen: a) Import mit NULL als Polygon, ohne Fehlermeldung, b) Import mit NULL als Polygon, mit Warning, c) kein Import, Fehlermeldung
 
-LATEST
+ili2db 5.2.0 (2024-11-03)
 ---------------------------
+- fixed "no dburl given" but dburl is not mentioned in the documentation (#539)
+- readme.txt in ili2gpkg-download (#531)
+- new function --exportMetaConfig (#516)
+- new function --createNlsTab (#350)
+- fix BOOLEAN with --createEnumTabs (#543)
+- support CHBase V2 Localisation smart mapping (#547)
+- new meta-attrs ili2db.ili.lang, ili2db.ili.translationOf
+- function --deleteData does not work with --createFk (#548)
+- fix filtering import of baskets from different models (#546)
+- ili2c-5.6.0
+- iox-ili-1.23.2
+
+ili2db 5.1.1 (2024-08-26)
+---------------------------
+- fix --gpkgMultiGeomPerTable needed on export/import/validate (#542)
+- Add --plugins option (#235)
+- ili2c-5.5.4
+- iox-ili-1.23.1
+
+ili2db 5.1.0 (2023-12-06)
+---------------------------
+- JSON-Mapping of Bag of Structure (#477)
+- Unique constraints are not generated (#493)
+- ILI2.4: Resolve generic domain from context or transfer (#472)
+- ILI2.4: Eindeutigkeitsbedingungen auf den einzelnen Transfer (#518)
+- ili2pg: if dbhost is not provided, ili2pg ignores dbport (#494)
+- ili2c-5.4.0
+- iox-ili-1.22.0
+
+ili2db 5.0.1 (2023-09-25)
+---------------------------
+- ili2c-5.3.3
+
+ili2db 5.0.0 (2023-09-09)
+---------------------------
+- ili2pg: fix support of SCRAM authentification in PostgreSQL (#448)
+- ili2gpkg: Update sqlite lib (Apple M1) (#421)
+- remove ToXtfRecordConverter.isMsAccess (#303)
+- remove option --structWithGenericRef (#497)
+- JRE 1.8
+- org.postgresql:postgresql:42.6.0
+- org.xerial:sqlite-jdbc:3.43.0.0
+
+ili2db 4.11.1 (2023-08-22)
+---------------------------
+- ili2gpkg: new option --gpkgMultiGeomPerTable to create multi geom col tables (#511)
+- Failed to query extended many-to-many associations (smart2) (#521)
+- ehisqlgen-1.16.0
+
+ili2db 4.11.0 (2023-04-24)
+---------------------------
+- fix references with mixed case INTERLIS.UUIDOID (#507)
+- fix issues with duplicate coordinates (#510)
+- fix validate fails if external connection is used (#514)
+- fix delete empty dataset (#513)
+- fix additionalModel in the --validConfig on validation not found (#509)
+- Provide metaConfig info in the database (#508)
+- ili2h2gis: fix bigint schema import
+- iox-ili-1.21.18
+
+ili2db 4.10.1 (2023-02-28)
+---------------------------
+- fix Bug --delete Flag im mehrsprachigen DMAV01 Modell (#504)
+- iox-ili-1.21.17
+
+ili2db 4.10.0 (2022-12-30)
+------------------------------
+- ili24: LIST/BAG mit primitiven Typen (nicht nur mit Strukturen) (#471) 
+- support --option NULL (#500)
+- implement --metaConfig (#392)
+- support ilidata:basketId as import file argument (#480)
+- create mandatory reference check with --coalesceCatalogueRef (#481)
+- iox-ili-1.21.15
+- ili2c-5.3.2
+
+ili2db 4.9.1 (2022-11-02)
+------------------------------
+- remove Swing reference from Main (#496) 
+- fix error when using --update function (#450)
+- iox-ili-1.21.13
+- ili2c-5.3.0
+
+ili2db 4.9.0 (2022-08-24)
+------------------------------
+- new option --verbose
+- new option --logtime
+- new meta info about ili attr type ch.ehi.ili2db.typeKind (#469)
+- fix bigint import (#464)
+- fix enum itfCode on ili-import (#478) 
+- support ALL OF enum-domain (#476)
+- new option --createMandatoryChecks to create DB constraint for Reference attributes (#475)
+- fix JRE 1.6 compatibility
+- iox-ili-1.21.12
+- ili2c-5.2.8
+- ehisqlgen-1.15.0
+
+ili2db 4.8.0 (2022-04-29)
+------------------------------
+- API: added Ili2db.getDatasets()
+- API: make AbstractMain.getDbUrlConverter() public
+- rename option --importBatchSize to set JDBC batchSize (#458)
+- rename option --exportFetchSize to set JDBC fetchSize (#458)
+- use batchSize to INSERT/UPDATE xtf/itf-data (#458) 
+- new option --disableBoundaryRecoding to fix imported geometry (#437)
+- save --nameLanguage to t_ili2db_settings
+- use translated enum model element name for dispName in enum tables (#460)
+- export: fix ALL OF missing translations of values German to French (#439) 
+- iox-ili-1.21.10
+- ili2c-5.2.6
+
+ili2db 4.7.0 (2021-12-28)
+------------------------------
+- create metainfo about possible classes in a topic (#216)
+- create metainfo about BID domain (#440)
+- set length of description field in ENUM tables to 'unlimited' (#429)
+- import polygons from XTF as boundary lines (#269)
+- check that --createBasketCol is used (if required) (#130)
+- add used TransferDescription to Settings as ch.ehi.ili2db.model
+- API: add getCustomMappingStrategy() 
+- ili24: implement MULTISURFACE/MULTIAREA (#410)
+- ili24: implement MULTIPOLYLINE (#409)
+- ili2gpkg: create spatial index (#391) 
+- mysql:mysql-connector-java:5.1.49
+- iox-ili-1.21.9
+- ehisqlgen-1.14.1
+- ili2c-5.2.5
 
 ili2db 4.6.1 (2021-11-10)
 ------------------------------

diff --git a/.../ili2pg-4.6.1-bindist/docs/LICENSE.apache → ...2ili/bin/ili2pg-5.2.0/docs/LICENSE.apache b/.../ili2pg-4.6.1-bindist/docs/LICENSE.apache → ...2ili/bin/ili2pg-5.2.0/docs/LICENSE.apache
diff --git a/...in/ili2pg-4.6.1-bindist/docs/LICENSE.lgpl → ...at2ili/bin/ili2pg-5.2.0/docs/LICENSE.lgpl b/...in/ili2pg-4.6.1-bindist/docs/LICENSE.lgpl → ...at2ili/bin/ili2pg-5.2.0/docs/LICENSE.lgpl
diff --git a/qgepqwat2ili/bin/ili2pg-5.2.0/docs/README.txt b/qgepqwat2ili/bin/ili2pg-5.2.0/docs/README.txt
@@ -0,0 +1,34 @@
+ili2db - imports/exports interlis transfer files to a sql db
+
+Features
+Translates INTERLIS 1+2 data model definitions to a SQL schema.
+Loads INTERLIS 1+2 data into a SQL database.
+Extracts INTERLIS 1+2 data from a SQL database.
+
+License
+ili2db is licensed under the LGPL (Lesser GNU Public License).
+
+Status
+ili2db is in stable state.
+
+System Requirements
+For the current version of ili2db, you will need a JRE (Java Runtime Environment) installed on your system, version 1.8 or later.
+The JRE (Java Runtime Environment) can be downloaded for free from the Website <http://www.java.com/>.
+
+Download ili2db
+<https://downloads.interlis.ch/>
+
+Installing ili2db
+To install ili2db, choose a directory and extract the distribution file there.
+
+Running ili2db
+ili2db can be started with
+
+PostGIS: 
+java -jar ili2pg.jar --schemaimport --dbdatabase mogis --dbusr julia --dbpwd romeo path/to/dm01av.ili
+
+GeoPackage: 
+java -jar ili2gpkg.jar --schemaimport --dbfile mogis.gpkg path/to/dm01av.ili
+
+Documentation
+User documentation <https://docs.interlis.ch/>