Add support for PlanPro 1.10

README.md

@@ -1,4 +1,4 @@
-# planpro-importer
+# PlanPro Importer
 
 This is a small library (generated by [generateDS.py](http://www.davekuhlman.org/generateDS.html)) that can import PlanPro files into a [yaramo](https://github.com/simulate-digital-rail/yaramo) topology for further processing.
 
@@ -7,43 +7,46 @@ It supports:
 - Parsing of ppxml files
 - Finder for UUID of infrastructure elements
 
-Current version:
-- Schema version: 1.9.0.1202_2019-02-22
-- Library version: 1.9.0.1202_2019-02-22-v2
+Supported PlanPro versions:
+- PlanPro 1.9.0.1202_2019-02-22 (with `PlanProVersion.PlanPro19`)
+- PlanPro 1.10.0.2147_2022-05-31 (with `PlanProVersion.PlanPro110`)
 
 ## Installation
 
 Just install it with pip:
-```
-pip3 install git+https://github.com/arneboockmeyer/planpro-python-model
+```bash
+pip3 install git+https://github.com/simulate-digital-rail/planpro-importer
 ```
 
 You may need some authentication ([Hint 1](https://cloud.google.com/artifact-registry/docs/python/authentication), [Hint 2](https://pip.pypa.io/en/latest/topics/authentication/)).
 
 ## Usage
 
 Parse a PlanPro file:
-```
-from planpro_importer.reader import PlanProReader
-topology = PlanProReader("filename.ppxml").read_topology_from_plan_pro_file()
+```python
+from planpro_importer import PlanProVersion, import_planpro
+# For PlanPro 1.9
+topology = import_planpro("filename.ppxml", PlanProVersion.PlanPro19)
+# For PlanPro 1.10
+topology = import_planpro("filename.ppxml", PlanProVersion.PlanPro110)
 ```
 
 Further examples can be found in the [demo repository](https://github.com/simulate-digital-rail/demo).
 
 ## Usage UUID finder
 
 Import:
-```
+```python
 import uuidfinder
 ```
 
 Method:
-```
+```python
 uuidfinder.find_infrastructure_element_by_uuid(<Infrastructure Container>, <UUID>)
 ```
 
 Example:
-```
+```python
 import planpromodel
 import uuidfinder
 root_object = planpromodel.parse('PlanProFile.ppxml')
@@ -57,7 +60,9 @@ Use [generateDS.py](http://www.davekuhlman.org/generateDS.html) to generate a mo
 Therefore you need the schema files of the current PlanPro version.
 
 CLI-Command:
-```
+```bash
+generateDS -o model.py PlanPro.xsd 
+# or
 python3 generateDS.py -o planpromodel.py -f --output-directory="." 1.9.0.1202_2019-02-22_Schema/PlanPro.xsd
 ```
 

example/example.py

@@ -0,0 +1,17 @@
+from planpro_importer import PlanProVersion, import_planpro
+
+
+if __name__ == "__main__":
+    # Test 1.9
+    topology = import_planpro("filename.ppxml", PlanProVersion.PlanPro19)
+    print(f"{len(topology.edges)}")
+    print(f"{len(topology.nodes)}")
+    print(f"{len(topology.signals)}")
+    print(f"{len(topology.routes)}")
+
+    # Test 1.10
+    topology = import_planpro("filename.ppxml", PlanProVersion.PlanPro110)
+    print(f"{len(topology.edges)}")
+    print(f"{len(topology.nodes)}")
+    print(f"{len(topology.signals)}")
+    print(f"{len(topology.routes)}")

planpro_importer/__init__.py

@@ -0,0 +1,2 @@
+from .planproversion import PlanProVersion
+from .planproimporter import import_planpro

planpro_importer/planpro110/__init__.py

@@ -0,0 +1 @@
+from .reader110 import PlanProReader110