PySimultan 0.6.1__py3-none-any.whl → 0.6.4__py3-none-any.whl

PySimultan2/resources/SIMULTAN.xml

@@ -7787,9 +7787,9 @@
             The parameter's value is supplied by the data model itself. Used, for example, for parameters which store geometric parameters
             </summary>
         </member>
-        <member name="F:SIMULTAN.Data.Components.SimInfoFlow.FromExternal">
+        <member name="F:SIMULTAN.Data.Components.SimInfoFlow.SyncedWithExternal">
             <summary>
-            The parameter receives values from an external application, e.g., from an Excel tool
+            The parameter syncs its values with an external application, e.g., from an Excel tool or from a Simulation
             </summary>
         </member>
         <member name="T:SIMULTAN.Data.Components.SimParameterInstancePropagation">
@@ -9202,6 +9202,15 @@
             <param name="geometry">The geometry for which the vertices should be returned</param>
             <returns>A list of all vertices in hte geometry</returns>
         </member>
+        <member name="M:SIMULTAN.Data.Geometry.BaseGeometryAlgorithms.RemoveGeometryClean(SIMULTAN.Projects.ProjectData,System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.BaseGeometry})">
+            <summary>
+            Cleanly removes the given geometries. Model of the geometries have to be loaded.
+            Removes all given geometry and resulting unreferenced geometry.
+            Also removes all relations that are not autogenerated.
+            </summary>
+            <param name="projectData">The project data containing all the loaded models.</param>
+            <param name="geometries">The geometries to cleanly remove</param>
+        </member>
         <member name="T:SIMULTAN.Data.Geometry.DetectionAlgorithms">
             <summary>
             Provides methods for detecting geometric properties in a model
@@ -9239,11 +9248,11 @@
         </member>
         <member name="M:SIMULTAN.Data.Geometry.DetectionAlgorithms.DetectFacesFromEdges(System.Collections.Generic.List{SIMULTAN.Data.Geometry.Edge},SIMULTAN.Data.Geometry.GeometryModelData)">
             <summary>
-            Detects faces from a set of edges. First removes dangling edges, then tries to find one closed edge loop.
+            Detects faces from a set of edges. First removes dangling edges, then tries to find closed edge loops and creates faces.
             </summary>
-            <param name="edges">List of edges which could define a face</param>
-            <param name="model">The model into which the face should be generated</param>
-            <returns></returns>
+            <param name="edges">List of edges which could define faces</param>
+            <param name="model">The model into which the faces should be generated</param>
+            <returns>A list of added geometry</returns>
         </member>
         <member name="M:SIMULTAN.Data.Geometry.DetectionAlgorithms.SignedAngle(SIMULTAN.Data.SimMath.SimVector,SIMULTAN.Data.SimMath.SimVector)">
             <summary>
@@ -9369,11 +9378,33 @@
             <param name="edges">The edges</param>
             <returns>A bool indicating if the edges form a closed loop. The list contains the ordered edges or null when they don't form a loop.</returns>
         </member>
+        <member name="M:SIMULTAN.Data.Geometry.EdgeAlgorithms.OrderLoop(System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.Edge},SIMULTAN.Data.Geometry.Edge,SIMULTAN.Data.Geometry.GeometricOrientation)">
+            <summary>
+            Tries to order the edges such that they form a closed loop by following the edges.
+            Self intersecting loops will return false.
+            Loop will be ordered starting with the startEdge and moving in the direction of the startVertex.
+            </summary>
+            <param name="edges">The edges</param>
+            <param name="startEdge">Edge to start with</param>
+            <param name="startEdgeOrientation">Orientation of the start edge</param>
+            <returns>A bool indicating if the edges form a closed loop. The list contains the ordered edges or null when they don't form a loop.</returns>
+        </member>
         <member name="M:SIMULTAN.Data.Geometry.EdgeAlgorithms.OrderLoop(System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.PEdge})">
             <summary>
             Tries to order the pedges such that they form a closed loop by following the edges.
+            Self intersecting loops will return false.
+            </summary>
+            <param name="edges">The PEdges</param>
+            <returns>A bool indicating if the edges form a closed loop. The list contains the ordered edges or null when they don't form a loop.</returns>
+        </member>
+        <member name="M:SIMULTAN.Data.Geometry.EdgeAlgorithms.OrderLoop(System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.PEdge},SIMULTAN.Data.Geometry.Edge,SIMULTAN.Data.Geometry.GeometricOrientation)">
+            <summary>
+            Tries to order the pedges such that they form a closed loop by following the edges.
+            Starts with a startEdge and moves in startEdgeOrientation direction
             </summary>
             <param name="edges">The PEdges</param>
+            <param name="startEdge">The first Edge to handle</param>
+            <param name="startEdgeOrientation">The orientation in which the first edge should be handled</param>
             <returns>A bool indicating if the edges form a closed loop. The list contains the ordered edges or null when they don't form a loop.</returns>
         </member>
         <member name="M:SIMULTAN.Data.Geometry.EdgeAlgorithms.OrderedPointLoop(System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.Edge},SIMULTAN.Data.SimMath.SimMatrix3D)">
@@ -10272,6 +10303,23 @@
             <param name="wgsOrigin">The origin of the reference system, given in WGS coordinates (X: Longitude, Y: Latitude, Z: height)</param>
             <returns>The wgsCoordinates convert to a cartesian frame centered around wgsOrigin</returns>
         </member>
+        <member name="M:SIMULTAN.Data.Geometry.GeoReferenceAlgorithms.SignedAngle(SIMULTAN.Data.SimMath.SimVector3D,SIMULTAN.Data.SimMath.SimVector3D,SIMULTAN.Data.SimMath.SimVector3D,System.Double)">
+            <summary>
+            Computes the signed angle (in counter clockwise direction) between two vectors in 3D.
+            </summary>
+            <param name="v1">vector 1</param>
+            <param name="v2">vector 2</param>
+            <param name="n">The normal vector around which the rotation happens.</param>
+            <param name="epsilon">Tolerance for determining if the two vectors point in the same direction (in radians)</param>
+            <returns>Signed angle between two 3D vectors in the range [-pi, pi].</returns>
+        </member>
+        <member name="M:SIMULTAN.Data.Geometry.GeoReferenceAlgorithms.NormalizeWGSCoordinate(SIMULTAN.Data.SimMath.SimPoint3D)">
+            <summary>
+            Wraps around WGS so its in [-180,180];[-90,90] again
+            </summary>
+            <param name="point">The WGS point</param>
+            <returns>The normalized point</returns>
+        </member>
         <member name="T:SIMULTAN.Data.Geometry.LayerAlgorithms">
             <summary>
             Provides methods for working with layers
@@ -10501,6 +10549,17 @@
             <param name="mergeTracker">Tracks changes of component assignments. May be null when no tracking is needed</param>
             <param name="volumeGrid">The grid used to handle volumes</param>
         </member>
+        <member name="M:SIMULTAN.Data.Geometry.ModelCleanupAlgorithms.RemoveZeroAreaTriangles(SIMULTAN.Data.Geometry.GeometryModelData,System.Double,SIMULTAN.Data.Geometry.AABBGrid@,SIMULTAN.Utils.BackgroundWork.IBackgroundAlgorithmInfo)">
+            <summary>
+            Removes all triangles with area smaller than the areaTolerance. Only triangles will be removed, not polygons.
+            Will not merge triangles that are not adjacent to other faces.
+            </summary>
+            <param name="model">The model</param>
+            <param name="areaTolerance">The area tolerance.</param>
+            <param name="faceGrid">The face grid</param>
+            <param name="backgroundInfo">The background info</param>
+            <returns>The number of removed triangles</returns>
+        </member>
         <member name="M:SIMULTAN.Data.Geometry.ModelCleanupAlgorithms.RemoveDegeneratedFaces(SIMULTAN.Data.Geometry.GeometryModelData,System.Double,SIMULTAN.Data.Geometry.AABBGrid@,SIMULTAN.Utils.BackgroundWork.IBackgroundAlgorithmInfo)">
             <summary>
             Removes faces with 0 size
@@ -10599,6 +10658,32 @@
             <param name="backgroundInfo">The background algorithm info for this task</param>
             <returns>The number of subloops removed</returns>
         </member>
+        <member name="M:SIMULTAN.Data.Geometry.ModelCleanupAlgorithms.MergeCoplanarFaces(System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.Face},System.Double,System.Double,System.Boolean,System.Boolean,SIMULTAN.Utils.BackgroundWork.IBackgroundAlgorithmInfo)">
+            <summary>
+            Merges all connected faces that are coplanar (normal angle cosine below coplanarTolerance) and reprojects their vertices to the common plane.
+            </summary>
+            <param name="faces">The faces to check</param>
+            <param name="cleanupTolerance">The cleanup tolerance</param>
+            <param name="coplanarTolerance">The coplanar tolerance</param>
+            <param name="ignoreOppositeNormals">If opposing normals should also count as coplanar</param>
+            <param name="reprojectPoints">If the vertices of the faces should be reprojected to the best fitting plane of the merged face vertices to make them completely planar</param>
+            <param name="backgroundInfo">The background info</param>
+            <returns>The number of merged faces</returns>
+            <exception cref="T:System.ArgumentNullException">If the faces are null</exception>
+            <exception cref="T:System.ArgumentException">If the faces are in multiple models</exception>
+            <exception cref="T:System.Exception">If an error occurred</exception>
+        </member>
+        <member name="M:SIMULTAN.Data.Geometry.ModelCleanupAlgorithms.MergeCollinearEdges(System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.Edge},System.Double,SIMULTAN.Utils.BackgroundWork.IBackgroundAlgorithmInfo)">
+            <summary>
+            Merges all collinear edges that only connect to one other edge.
+            </summary>
+            <param name="edges">The edges to check</param>
+            <param name="cleanupTolerance">The tolerance</param>
+            <param name="backgroundInfo">The background info</param>
+            <returns>The number of merged edges</returns>
+            <exception cref="T:System.ArgumentNullException">If the edges are null</exception>
+            <exception cref="T:System.ArgumentException">If the edges are in multiple models</exception>
+        </member>
         <member name="T:SIMULTAN.Data.Geometry.OffsetSurfaceAlgorithms">
             <summary>
             Methods for working with/converting offset models
@@ -11991,15 +12076,28 @@
             Gets or sets the Face this Loop is associated with
             </summary>
         </member>
-        <member name="M:SIMULTAN.Data.Geometry.EdgeLoop.#ctor(SIMULTAN.Data.Geometry.Layer,System.String,System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.Edge})">
+        <member name="P:SIMULTAN.Data.Geometry.EdgeLoop.BaseEdge">
+            <summary>
+            Base Edge of the Face as defined by the user.
+            Can be used to get a consistent base direction for the Face
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Data.Geometry.EdgeLoop.BaseEdgeOrientation">
+            <summary>
+            Orientation of the <see cref="P:SIMULTAN.Data.Geometry.EdgeLoop.BaseEdge"/>. Defines the starting orientation for ordering the PEdges
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.Data.Geometry.EdgeLoop.#ctor(SIMULTAN.Data.Geometry.Layer,System.String,System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.Edge},SIMULTAN.Data.Geometry.Edge,SIMULTAN.Data.Geometry.GeometricOrientation)">
             <summary>
             Initializes a new instance of the EdgeLoop class
             </summary>
             <param name="layer">The layer this object is placed on</param>
             <param name="nameFormat">The display name</param>
             <param name="edges">A list of edges in this loop</param>
+            <param name="baseEdge">Base edge of the loop. Needs to be part of the edges of this loop</param>
+            <param name="baseEdgeOrientation">Orientation of the baseEdge. Defines the starting orientation for ordering the PEdges</param>
         </member>
-        <member name="M:SIMULTAN.Data.Geometry.EdgeLoop.#ctor(System.UInt64,SIMULTAN.Data.Geometry.Layer,System.String,System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.Edge})">
+        <member name="M:SIMULTAN.Data.Geometry.EdgeLoop.#ctor(System.UInt64,SIMULTAN.Data.Geometry.Layer,System.String,System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.Edge},SIMULTAN.Data.Geometry.Edge,SIMULTAN.Data.Geometry.GeometricOrientation)">
             <summary>
             Initializes a new instance of the EdgeLoop class
             </summary>
@@ -12007,6 +12105,8 @@
             <param name="layer">The layer this object is placed on</param>
             <param name="nameFormat">The display name</param>
             <param name="edges">A list of edges in this loop</param>
+            <param name="baseEdge">Base edge of the loop. Needs to be part of the edges of this loop</param>
+            <param name="baseEdgeOrientation">Orientation of the baseEdge. Defines the starting orientation for ordering the PEdges</param>
         </member>
         <member name="M:SIMULTAN.Data.Geometry.EdgeLoop.MakeConsistent(System.Boolean,System.Boolean)">
             <inheritdoc />
@@ -12037,12 +12137,6 @@
             Stores the orientation of the face. Forward means CCW, Backward means CW
             </summary>
         </member>
-        <member name="P:SIMULTAN.Data.Geometry.Face.BaseEdge">
-            <summary>
-            Base Edge of the Face as defined by the user.
-            Can be used to get a consistent base direction for the Face
-            </summary>
-        </member>
         <member name="P:SIMULTAN.Data.Geometry.Face.Normal">
             <summary>
             Returns the face normal
@@ -12053,18 +12147,17 @@
             Returns all PFaces associated with this Face
             </summary>
         </member>
-        <member name="M:SIMULTAN.Data.Geometry.Face.#ctor(SIMULTAN.Data.Geometry.Layer,System.String,SIMULTAN.Data.Geometry.EdgeLoop,SIMULTAN.Data.Geometry.GeometricOrientation,System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.EdgeLoop},SIMULTAN.Data.Geometry.Edge)">
+        <member name="M:SIMULTAN.Data.Geometry.Face.#ctor(SIMULTAN.Data.Geometry.Layer,System.String,SIMULTAN.Data.Geometry.EdgeLoop,SIMULTAN.Data.Geometry.GeometricOrientation,System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.EdgeLoop})">
             <summary>
             Initializes a new instance of the Face class
             </summary>
             <param name="layer">The layer this object is placed on</param>
             <param name="nameFormat">The display name (this is used as a format string for string.Format. {0} is the Id</param>
             <param name="boundary">The boundary loop</param>
-            <param name="baseEdge">Base edge of the face. Needs to be part of the boundary EdgeLoop</param>
             <param name="orientation">Orientation of the face</param>
             <param name="holes">A list of hole loops</param>
         </member>
-        <member name="M:SIMULTAN.Data.Geometry.Face.#ctor(System.UInt64,SIMULTAN.Data.Geometry.Layer,System.String,SIMULTAN.Data.Geometry.EdgeLoop,SIMULTAN.Data.Geometry.GeometricOrientation,System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.EdgeLoop},SIMULTAN.Data.Geometry.Edge)">
+        <member name="M:SIMULTAN.Data.Geometry.Face.#ctor(System.UInt64,SIMULTAN.Data.Geometry.Layer,System.String,SIMULTAN.Data.Geometry.EdgeLoop,SIMULTAN.Data.Geometry.GeometricOrientation,System.Collections.Generic.IEnumerable{SIMULTAN.Data.Geometry.EdgeLoop})">
             <summary>
             Initializes a new instance of the Face class
             </summary>
@@ -12072,7 +12165,6 @@
             <param name="nameFormat">The display name (this is used as a format string for string.Format. {0} is the Id</param>
             <param name="layer">The layer this object is placed on</param>
             <param name="boundary">The boundary loop</param>
-            <param name="baseEdge">Base edge of the face. Needs to be part of the boundary EdgeLoop</param>
             <param name="orientation">Orientation of the face</param>
             <param name="holes">A list of hole loops</param>
         </member>
@@ -12679,7 +12771,7 @@
         </member>
         <member name="P:SIMULTAN.Data.Geometry.PEdge.Prev">
             <summary>
-            The previouse pedge in the container (might be null)
+            The previous pedge in the container (might be null)
             </summary>
         </member>
         <member name="M:SIMULTAN.Data.Geometry.PEdge.#ctor(SIMULTAN.Data.Geometry.Edge,SIMULTAN.Data.Geometry.GeometricOrientation,SIMULTAN.Data.Geometry.BaseEdgeContainer)">
@@ -13264,6 +13356,11 @@
             <param name="model">The GeometryModel that should be removed</param>
             <returns>True when the GeometryModel is now deleted, False when some other references to the model exist</returns>
         </member>
+        <member name="M:SIMULTAN.Data.Geometry.SimGeometryModelCollection.Clear">
+            <summary>
+            Clears alls loaded geometry models irregardless of reference count. Only call this on project close for cleanup.
+            </summary>
+        </member>
         <member name="M:SIMULTAN.Data.Geometry.SimGeometryModelCollection.GetAllReachableModels(SIMULTAN.Data.Geometry.GeometryModel,System.Collections.Generic.Dictionary{SIMULTAN.Data.Assets.ResourceFileEntry,SIMULTAN.Data.Geometry.GeometryModel})">
             <summary>
             Puts all the models that are linked to the root model (that are reachable from that) into the result.
@@ -13284,6 +13381,14 @@
             </param>
             <returns>True when a model with this file exists, otherwise False</returns>
         </member>
+        <member name="M:SIMULTAN.Data.Geometry.SimGeometryModelCollection.GetReferenceCount(SIMULTAN.Data.Assets.ResourceFileEntry)">
+            <summary>
+            Returns the reference count of the provided file if loaded.
+            Returns -1 if not loaded.
+            </summary>
+            <param name="file">The resource file of the geometry model</param>
+            <returns>The reference count of the model or -1 if not loaded.</returns>
+        </member>
         <member name="M:SIMULTAN.Data.Geometry.SimGeometryModelCollection.TryGetCachedImportedGeometry(System.IO.FileInfo)">
             <summary>
             Tries to get the imported geometry data from the cache.
@@ -22000,16 +22105,6 @@
         <member name="P:SIMULTAN.Data.SitePlanner.SitePlannerManager.CalledFromLocation">
             <inheritdoc/>
         </member>
-        <member name="E:SIMULTAN.Data.SitePlanner.SitePlannerManager.SitePlannerProjectOpened">
-            <summary>
-            Invoked when a SitePlannerProjects is opened.
-            </summary>
-        </member>
-        <member name="E:SIMULTAN.Data.SitePlanner.SitePlannerManager.SitePlannerProjectClosed">
-            <summary>
-            Invoked when a SitePlannerProjects is opened.
-            </summary>
-        </member>
         <member name="P:SIMULTAN.Data.SitePlanner.SitePlannerManager.GeoMaps">
             <summary>
             List of all GeoMaps in the project
@@ -22045,58 +22140,6 @@
             <param name="file">file path of spdxf</param>
             <returns>SitePlannerProject if found or null otherwise</returns>
         </member>
-        <member name="M:SIMULTAN.Data.SitePlanner.SitePlannerManager.OpenSitePlannerProject(SIMULTAN.Data.SitePlanner.SitePlannerProject)">
-            <summary>
-            Marks the project as opened
-            </summary>
-            <param name="proj">SitePlannerProject</param>
-        </member>
-        <member name="M:SIMULTAN.Data.SitePlanner.SitePlannerManager.CloseSitePlannerProject(SIMULTAN.Data.SitePlanner.SitePlannerProject)">
-            <summary>
-            Marks the project as closed
-            </summary>
-            <param name="proj">SitePlannerProject</param>
-        </member>
-        <member name="M:SIMULTAN.Data.SitePlanner.SitePlannerManager.OpenSitePlannerMap(SIMULTAN.Data.SitePlanner.GeoMap)">
-            <summary>
-            Marks the map as opened
-            </summary>
-            <param name="map">SitePlannerMap</param>
-        </member>
-        <member name="M:SIMULTAN.Data.SitePlanner.SitePlannerManager.CloseSitePlannerMap(SIMULTAN.Data.SitePlanner.GeoMap)">
-            <summary>
-            Marks the map as closed
-            </summary>
-            <param name="map">SitePlannerMap</param>
-        </member>
-        <member name="M:SIMULTAN.Data.SitePlanner.SitePlannerManager.IsFileOpen(System.IO.FileInfo)">
-            <summary>
-            Returns whether the given file (SitePlannerProject or SitePlannerMap) is currently opened 
-            </summary>
-            <param name="file">file to check</param>
-            <returns>true, if file is currently opened in a tab</returns>
-        </member>
-        <member name="M:SIMULTAN.Data.SitePlanner.SitePlannerManager.IsFileOpen(SIMULTAN.Data.Assets.ResourceFileEntry)">
-            <summary>
-            Returns whether the given file (SitePlannerProject or SitePlannerMap) is currently opened 
-            </summary>
-            <param name="file">file to check</param>
-            <returns>true, if file is currently opened in a tab</returns>
-        </member>
-        <member name="M:SIMULTAN.Data.SitePlanner.SitePlannerManager.IsSitePlannerFileOpen(System.IO.FileInfo)">
-            <summary>
-            Returns whether the given SitePlannerProject is currently opened 
-            </summary>
-            <param name="file">SitePlannerProject to check</param>
-            <returns>true, if SitePlannerProject is currently opened in a tab</returns>
-        </member>
-        <member name="M:SIMULTAN.Data.SitePlanner.SitePlannerManager.IsMapFileOpen(System.IO.FileInfo)">
-            <summary>
-            Returns whether the given SitePlannerMap is currently opened 
-            </summary>
-            <param name="file">SitePlannerMap to check</param>
-            <returns>true, if SitePlannerMap is currently opened in a tab</returns>
-        </member>
         <member name="M:SIMULTAN.Data.SitePlanner.SitePlannerManager.ClearRecord">
             <summary>
             Clears all information from the manager
@@ -22436,6 +22479,20 @@
         <member name="M:SIMULTAN.Data.Taxonomy.SimTaxonomy.NotifyLocalizationChanged">
             <inheritdoc />
         </member>
+        <member name="M:SIMULTAN.Data.Taxonomy.SimTaxonomy.MergeWith(SIMULTAN.Data.Taxonomy.SimTaxonomy,System.Boolean)">
+            <summary>
+            Merges this taxonomy with another taxonomy. (add or update)
+            All entries get the localization merged with the other taxonomies entries (update or add).
+            Hierarchy will be adjusted to that of the other taxonomy. 
+            Missing entries (that were in original but not in other)
+            will stay at their original locations in the hierarchy.
+            If deleteMissing is set to true, all missing entries in the other taxonomy and missing localizations 
+            will be removed from the original.
+            </summary>
+            <param name="other">The other taxonomy to merge into this.</param>
+            <param name="deleteMissing">If missing entries and localizations should be removed</param>
+            <exception cref="T:System.Exception">If taxonomy was changed while merging and cause and error.</exception>
+        </member>
         <member name="T:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection">
             <summary>
             The main collection for taxonomies of a project
@@ -22523,13 +22580,29 @@
             <returns>If changes had to be made to the existing default taxonomies.</returns>
             <exception cref="T:System.ArgumentNullException">if an argument is null</exception>
         </member>
-        <member name="M:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection.Merge(SIMULTAN.Data.Taxonomy.SimTaxonomyCollection)">
+        <member name="M:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection.Merge(SIMULTAN.Data.Taxonomy.SimTaxonomyCollection,System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)">
             <summary>
             Merges this taxonomy collection with another and returns the taxonomies that already existed.
-            References to taxonomy entries of the existing taxonomies need to be manually reset to the existing ones after import.
+            Merge happen by taxonomy key, if multiple have the same key they will generate conflicts if they are different (unless force is used)
+            Identical taxonomies are ignored, new taxonomies will be added. If two have the same key but different content, they will be merged.
+            References to merged taxonomy entries in other imported data need to be manually reset to the new ids of the entries.
+            All merged taxonomies get removed from the other collection.
             </summary>
             <param name="other">The other taxonomies to merge into this collection.</param>
-            <returns>taxonomies that already existed in this collection.</returns>
+            <param name="conflicts">All conflicting taxonomies, these were not merged yet.</param>
+            <param name="deleteMissing">If missing entries and localizations should be removed in updated taxonomies. Taxonomies themselves are not deleted.</param>
+            <param name="force">If true, always merge the first conflict of a taxonomy (conflicts list will be empty in the end). Otherwise conflicts are only merged if only a single matching pair is found.</param>
+            <returns>taxonomies that already existed in this collection. Key is the imported one, value the existing one.</returns>
+            <exception cref="T:System.ArgumentNullException">if an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection.Import(SIMULTAN.Data.Taxonomy.SimTaxonomyCollection)">
+            <summary>
+            Imports another taxonomy collection into this collection and returns the taxonomies that already existed (duplicates).
+            Identical taxonomies are ignored, all other taxonomies get imported as new taxonomies.
+            References to imported taxonomy entries in other imported data need to be manually reset to the new ids of the entries.
+            </summary>
+            <param name="other">The other taxonomies to import into this collection.</param>
+            <returns>taxonomies that already existed in this collection. Key is the imported one, value the existing one.</returns>
             <exception cref="T:System.ArgumentNullException">if an argument is null</exception>
         </member>
         <member name="M:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection.StartLoading">
@@ -22781,6 +22854,15 @@
         <member name="M:SIMULTAN.Data.Taxonomy.SimTaxonomyEntryOrString.GetHashCode">
             <inheritdoc/>
         </member>
+        <member name="M:SIMULTAN.Data.Taxonomy.SimTaxonomyEntryOrString.Matches(System.String,System.String)">
+            <summary>
+            Returns True when a TaxonomyEntry is present and the keys match.
+            Always returns False when the <see cref="P:SIMULTAN.Data.Taxonomy.SimTaxonomyEntryOrString.Text"/> is used instead of the <see cref="P:SIMULTAN.Data.Taxonomy.SimTaxonomyEntryOrString.TaxonomyEntryReference"/>.
+            </summary>
+            <param name="taxonomyKey">The key of the taxonomy</param>
+            <param name="taxonomyEntryKey">The key of the taxonomy entry</param>
+            <returns>True when a TaxonomyEntry is present and the keys match.</returns>
+        </member>
         <member name="T:SIMULTAN.Data.Taxonomy.SimTaxonomyEntryReference">
             <summary>
             Represents a reference to a <see cref="T:SIMULTAN.Data.Taxonomy.SimTaxonomyEntry"/>.
@@ -23069,7 +23151,7 @@
             <summary>
             Returns the localized entry that best fits the given culture.
             First returns the translation that directly fits the culture.
-            If that is not found it looks up the languages parent languages up to the invariant cultue.
+            If that is not found it looks up the languages parent languages up to the invariant culture.
             If none matches, the first entry is returned.
             If there are no entries, an empty entry with null culture is returned.
             </summary>
@@ -23085,6 +23167,13 @@
             <param name="other">The other localization to compare to.</param>
             <returns>If the this localization has the same translations as the other one.</returns>
         </member>
+        <member name="M:SIMULTAN.Data.Taxonomy.SimTaxonomyLocalization.MergeWith(SIMULTAN.Data.Taxonomy.SimTaxonomyLocalization,System.Boolean)">
+            <summary>
+            Merges this localization with another. Existing entries get replaced, new ones get added.
+            </summary>
+            <param name="others">Other localization to merge into this one.</param>
+            <param name="deleteMissing">If entries that exist in this localization but not in the other one should be deleted.</param>
+        </member>
         <member name="T:SIMULTAN.Data.Users.IAuthenticationService">
             <summary>
             Provides methods to authenticate a user
@@ -28069,6 +28158,12 @@
         <member name="M:SIMULTAN.Serializer.DXF.DXFDataConverter.SIMULTAN#Serializer#DXF#IDXFDataConverter{System#Int32}#FromDXFString(System.String,SIMULTAN.Serializer.DXF.DXFParserInfo)">
             <inheritdoc />
         </member>
+        <member name="M:SIMULTAN.Serializer.DXF.DXFDataConverter.ToDXFString(System.UInt32)">
+            <inheritdoc />
+        </member>
+        <member name="M:SIMULTAN.Serializer.DXF.DXFDataConverter.SIMULTAN#Serializer#DXF#IDXFDataConverter{System#UInt32}#FromDXFString(System.String,SIMULTAN.Serializer.DXF.DXFParserInfo)">
+            <inheritdoc />
+        </member>
         <member name="M:SIMULTAN.Serializer.DXF.DXFDataConverter.ToDXFString(System.Byte)">
             <inheritdoc />
         </member>
@@ -30652,6 +30747,145 @@
             <param name="networks">Networks to export</param>
             <param name="fileToSave">The file to save the .json to</param>
         </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONExporter.ExportTaxonomy(System.Collections.Generic.IEnumerable{SIMULTAN.Data.Taxonomy.SimTaxonomy},System.IO.FileInfo)">
+            <summary>
+            Exports taxonomies to a JSON file
+            </summary>
+            <param name="taxonomies">The taxonomies to export</param>
+            <param name="file">The file to export to</param>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONExporter.ExportTaxonomy(System.Collections.Generic.IEnumerable{SIMULTAN.Data.Taxonomy.SimTaxonomy})">
+            <summary>
+            Exports taxonomies to a JSON string
+            </summary>
+            <param name="taxonomies">The taxonomies to export</param>
+            <returns>The taxonomy JSON</returns>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONExporter.ExportTaxonomy(System.Collections.Generic.IEnumerable{SIMULTAN.Serializer.JSON.SimTaxonomySerializable})">
+            <summary>
+            Exports taxonomies to a JSON string
+            </summary>
+            <param name="taxonomies">The taxonomies to export</param>
+            <returns>The taxonomy JSON</returns>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportTaxonomy(SIMULTAN.Projects.ExtendedProjectData,System.IO.FileInfo,System.ValueTuple{System.Int32,System.Int32}@)">
+            <summary>
+            Imports a taxonomy JSON file into the project
+            </summary>
+            <param name="projectData">The project data</param>
+            <param name="file">The JSON file</param>
+            <param name="statistics">Returns the number of taxonomies imported and the number of taxonomies that were skipped</param>
+            <exception cref="T:System.ArgumentException">If the file does not exist</exception>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportTaxonomy(SIMULTAN.Projects.ExtendedProjectData,System.IO.FileInfo)">
+            <summary>
+            Imports a taxonomy JSON file into the project
+            </summary>
+            <param name="projectData">The project data</param>
+            <param name="file">The JSON file</param>
+            <exception cref="T:System.ArgumentException">If the file does not exist</exception>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportTaxonomy(SIMULTAN.Projects.ExtendedProjectData,System.String,System.ValueTuple{System.Int32,System.Int32}@)">
+            <summary>
+            Imports a taxonomy JSON string into the project
+            </summary>
+            <param name="projectData">The project data</param>
+            <param name="json">The JSON string</param>
+            <param name="statistics">Returns the number of taxonomies imported and the number of taxonomies that were skipped</param>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportTaxonomy(SIMULTAN.Projects.ExtendedProjectData,System.String)">
+            <summary>
+            Imports a taxonomy JSON string into the project
+            </summary>
+            <param name="projectData">The project data</param>
+            <param name="json">The JSON string</param>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportTaxonomy(SIMULTAN.Projects.ExtendedProjectData,System.Collections.Generic.IEnumerable{SIMULTAN.Serializer.JSON.SimTaxonomySerializable},System.ValueTuple{System.Int32,System.Int32}@)">
+            <summary>
+            Imports a taxonomy JSON serializables into the project
+            </summary>
+            <param name="projectData">The project data</param>
+            <param name="jsonTaxonomies">The JSON taxonomies</param>
+            <param name="statistics">Returns the number of taxonomies imported and the number of taxonomies that were skipped</param>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportTaxonomy(SIMULTAN.Projects.ExtendedProjectData,System.Collections.Generic.IEnumerable{SIMULTAN.Serializer.JSON.SimTaxonomySerializable})">
+            <summary>
+            Imports a taxonomy JSON serializables into the project
+            </summary>
+            <param name="projectData">The project data</param>
+            <param name="jsonTaxonomies">The JSON taxonomies</param>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportAndMergeTaxonomy(SIMULTAN.Projects.ExtendedProjectData,System.IO.FileInfo,System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)">
+            <summary>
+            Imports and merges the Taxonomies with the existing ones.
+            For details see <see cref="M:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection.Merge(SIMULTAN.Data.Taxonomy.SimTaxonomyCollection,System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)"/>
+            </summary>
+            <param name="projectData">The project data</param>
+            <param name="file">The file to import</param>
+            <param name="conflicts">Conflicts that may have been detected while merging</param>
+            <param name="deleteMissing">If missing entries should be removed</param>
+            <param name="force">If merging should be forced even if conflicts were detected (uses first match)</param>
+            <exception cref="T:System.ArgumentException">If the file could not be found</exception>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportAndMergeTaxonomy(SIMULTAN.Projects.ExtendedProjectData,System.String,System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)">
+            <summary>
+            Imports and merges the Taxonomies with the existing ones.
+            For details see <see cref="M:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection.Merge(SIMULTAN.Data.Taxonomy.SimTaxonomyCollection,System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)"/>
+            </summary>
+            <param name="projectData">The project data</param>
+            <param name="json">The json to import</param>
+            <param name="conflicts">Conflicts that may have been detected while merging</param>
+            <param name="deleteMissing">If missing entries should be removed</param>
+            <param name="force">If merging should be forced even if conflicts were detected (uses first match)</param>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportAndMergeTaxonomy(SIMULTAN.Projects.ExtendedProjectData,System.Collections.Generic.IEnumerable{SIMULTAN.Serializer.JSON.SimTaxonomySerializable},System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)">
+            <summary>
+            Imports and merges the Taxonomies with the existing ones.
+            For details see <see cref="M:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection.Merge(SIMULTAN.Data.Taxonomy.SimTaxonomyCollection,System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)"/>
+            </summary>
+            <param name="projectData">The project data</param>
+            <param name="jsonTaxonomies">The JSON taxonomies to import</param>
+            <param name="conflicts">Conflicts that may have been detected while merging</param>
+            <param name="deleteMissing">If missing entries should be removed</param>
+            <param name="force">If merging should be forced even if conflicts were detected (uses first match)</param>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportAndMergeTaxonomy(SIMULTAN.Data.Taxonomy.SimTaxonomy,System.Collections.Generic.IEnumerable{SIMULTAN.Serializer.JSON.SimTaxonomySerializable},System.Boolean)">
+            <summary>
+            Imports and merges the Taxonomies with the target taxonomy.
+            For details see <see cref="M:SIMULTAN.Data.Taxonomy.SimTaxonomy.MergeWith(SIMULTAN.Data.Taxonomy.SimTaxonomy,System.Boolean)"/>
+            </summary>
+            <param name="targetTaxonomy">The taxonomy to merge into</param>
+            <param name="jsonTaxonomies">The JSON taxonomies to import</param>
+            <param name="deleteMissing">If missing entries should be removed</param>
+            <exception cref="T:System.ArgumentNullException">If an argument is null</exception>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportAndMergeTaxonomy(SIMULTAN.Data.Taxonomy.SimTaxonomy,System.String,System.Boolean)">
+            <summary>
+            Imports and merges the Taxonomies with the target taxonomy.
+            For details see <see cref="M:SIMULTAN.Data.Taxonomy.SimTaxonomy.MergeWith(SIMULTAN.Data.Taxonomy.SimTaxonomy,System.Boolean)"/>
+            </summary>
+            <param name="targetTaxonomy">The taxonomy to merge into</param>
+            <param name="json">The JSON to import</param>
+            <param name="deleteMissing">If missing entries should be removed</param>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.JSONImporter.ImportAndMergeTaxonomy(SIMULTAN.Data.Taxonomy.SimTaxonomy,System.IO.FileInfo,System.Boolean)">
+            <summary>
+            Imports and merges the Taxonomies with the target taxonomy.
+            For details see <see cref="M:SIMULTAN.Data.Taxonomy.SimTaxonomy.MergeWith(SIMULTAN.Data.Taxonomy.SimTaxonomy,System.Boolean)"/>
+            </summary>
+            <param name="targetTaxonomy">The taxonomy to merge into</param>
+            <param name="file">The file to import</param>
+            <param name="deleteMissing">If missing entries should be removed</param>
+        </member>
         <member name="T:SIMULTAN.Serializer.JSON.ProjectSerializable">
             <summary>
             Serializable class for the <see cref="T:SIMULTAN.Projects.ProjectData"/>
@@ -31305,6 +31539,152 @@
             </summary>
             <param name="reference">The taxonomy entry reference to serialize</param>
         </member>
+        <member name="T:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable">
+            <summary>
+            JSON import/export model of the <see cref="T:SIMULTAN.Data.Taxonomy.SimTaxonomyEntry"/>
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable.Key">
+            <summary>
+            The key of the taxonomy entry
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable.Name">
+            <summary>
+            The invariant culture name of the taxonomy entry
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable.Description">
+            <summary>
+            The invariant culture description of the taxonomy entry
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable.Localization">
+            <summary>
+            The localizations of the taxonomy entry
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable.Children">
+            <summary>
+            The children of the taxonomy entry
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable.#ctor">
+            <summary>
+            Creates an empty <see cref="T:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable"/>
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable.#ctor(SIMULTAN.Data.Taxonomy.SimTaxonomyEntry)">
+            <summary>
+            Creates a new <see cref="T:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable"/> from the given <see cref="T:SIMULTAN.Data.Taxonomy.SimTaxonomyEntry"/>.
+            Name and Description will be set to the invariant culture or the first localization if not found.
+            Localization will be null if only invariant culture is used.
+            Children will be null if the are none.
+            </summary>
+            <param name="entry">The entry to convert</param>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.SimTaxonomyEntrySerializable.ToSimTaxonomyEntry(System.Boolean)">
+            <summary>
+            Converts this into a <see cref="T:SIMULTAN.Data.Taxonomy.SimTaxonomyEntry"/>
+            </summary>
+            <param name="supportsInvariantCulture">If the taxonomy supports the invariant culture. 
+            If false and localization is not null, the name and description will be ignored and only the localizations will be converted.</param>
+            <returns>The converted entry</returns>
+        </member>
+        <member name="T:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable">
+            <summary>
+            JSON import/export model of the <see cref="T:SIMULTAN.Data.Taxonomy.SimTaxonomyLocalizationEntry"/>
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable.CultureCode">
+            <summary>
+            The culture code of the entry. <see cref="P:System.Globalization.CultureInfo.Name"/>
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable.Name">
+            <summary>
+            The name of the entry
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable.Description">
+            <summary>
+            The description of the entry
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable.#ctor">
+            <summary>
+            Creates a new <see cref="T:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable"/>
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable.#ctor(System.String,System.String,System.String)">
+            <summary>
+            Creates a new <see cref="T:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable"/>
+            </summary>
+            <param name="cultureCode">The culture code</param>
+            <param name="name">The name</param>
+            <param name="description">The description</param>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable.#ctor(SIMULTAN.Data.Taxonomy.SimTaxonomyLocalizationEntry)">
+            <summary>
+            Creates a new <see cref="T:SIMULTAN.Serializer.JSON.SimTaxonomyLocalizationSerializable"/> from an <see cref="T:SIMULTAN.Data.Taxonomy.SimTaxonomyLocalizationEntry"/>
+            </summary>
+            <param name="entry">The entry</param>
+        </member>
+        <member name="T:SIMULTAN.Serializer.JSON.SimTaxonomySerializable">
+            <summary>
+            JSON import/export model of the <see cref="T:SIMULTAN.Data.Taxonomy.SimTaxonomy"/>
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomySerializable.Key">
+            <summary>
+            The key of the taxonomy
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomySerializable.Name">
+            <summary>
+            The invariant culture name of the taxonomy
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomySerializable.Description">
+            <summary>
+            The invariant culture description of the taxonomy
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomySerializable.SupportedLanguages">
+            <summary>
+            List of supported language culture codes. If null, only InvariantCulture is supported.
+            If this does not contain the InvariantCulture, Name and Description are from one of the localizations.
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomySerializable.Localization">
+            <summary>
+            The localizations of the taxonomy. If null, only InvariantCulture is used.
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Serializer.JSON.SimTaxonomySerializable.Children">
+            <summary>
+            The children of the taxonomy
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.SimTaxonomySerializable.#ctor">
+            <summary>
+            Creates an empty <see cref="T:SIMULTAN.Serializer.JSON.SimTaxonomySerializable"/>
+            Needed for JSON serialization
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.SimTaxonomySerializable.#ctor(SIMULTAN.Data.Taxonomy.SimTaxonomy)">
+            <summary>
+            Converts the <see cref="T:SIMULTAN.Data.Taxonomy.SimTaxonomy"/> to its equivalent JSON model <see cref="T:SIMULTAN.Serializer.JSON.SimTaxonomySerializable"/>
+            </summary>
+            <param name="taxonomy">The taxonomy</param>
+            <returns>The JSON model of the taxonomy</returns>
+        </member>
+        <member name="M:SIMULTAN.Serializer.JSON.SimTaxonomySerializable.ToSimTaxonomy">
+            <summary>
+            Converts the <see cref="T:SIMULTAN.Serializer.JSON.SimTaxonomySerializable"/> to its equivalent SIMULTAN model <see cref="T:SIMULTAN.Data.Taxonomy.SimTaxonomy"/>
+            </summary>
+            <returns>The SIMULTAN model of the taxonomy</returns>
+        </member>
         <member name="T:SIMULTAN.Serializer.JSON.SimVector3DSerializable">
             <summary>
             Serializable representation of a <see cref="T:SIMULTAN.Data.SimMath.SimVector3D"/>
@@ -31595,6 +31975,28 @@
             Provides saving and opening functionality for the project contents.
             </summary>
         </member>
+        <member name="M:SIMULTAN.Serializer.Projects.ProjectIO.ImportTaxonomyAnMergeFile(System.IO.FileInfo,SIMULTAN.Projects.ExtendedProjectData,System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)">
+            <summary>
+            Imports and merges taxonomies from a txdf file.
+            For details on merging see <see cref="M:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection.Merge(SIMULTAN.Data.Taxonomy.SimTaxonomyCollection,System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)"/>
+            </summary>
+            <param name="file">The file to import</param>
+            <param name="projectData">The project data to import to</param>
+            <param name="conflicts">Conflicts generated while importing</param>
+            <param name="deleteMissing">If missing entries in the import should be deleted</param>
+            <param name="force">If merging should be forced, even if conflicts were detected. Uses the first match.</param>
+        </member>
+        <member name="M:SIMULTAN.Serializer.Projects.ProjectIO.ImportTaxonomyAnMergeFile(System.IO.FileInfo,SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Projects.ExtendedProjectData,System.Boolean)">
+            <summary>
+            Imports and merges with a single taxonomy form a txdf file.
+            For details on merging see <see cref="M:SIMULTAN.Data.Taxonomy.SimTaxonomyCollection.Merge(SIMULTAN.Data.Taxonomy.SimTaxonomyCollection,System.Collections.Generic.List{System.ValueTuple{SIMULTAN.Data.Taxonomy.SimTaxonomy,SIMULTAN.Data.Taxonomy.SimTaxonomy}}@,System.Boolean,System.Boolean)"/>
+            </summary>
+            <param name="file">The file to import</param>
+            <param name="projectData">The project data to import to</param>
+            <param name="targetTaxonomy">The target taxonomy</param>
+            <param name="deleteMissing">If missing entries in the import should be deleted</param>
+            <returns>True if the merge was successful.</returns>
+        </member>
         <member name="M:SIMULTAN.Serializer.Projects.ProjectIO.ImportTaxonomyFile(System.IO.FileInfo,SIMULTAN.Projects.ExtendedProjectData)">
             <summary>
             Imports a taxonomy file into the project data.
@@ -33218,7 +33620,7 @@
             <summary>
             Fetches the data of a whole tile. Data is in a row by row format.
             </summary>
-            <param name="pointInTile">A point somewhere inside of the tile you want to fetch.</param>
+            <param name="pointInTile">A point somewhere inside of the tile you want to fetch in Webmercator coordinates (easting, northing)/[long, lat].</param>
             <param name="zoomLevel">The zoom level at which the tile should be fetched.</param>
             <returns>The data of the tile in a row-by-row format, the width and the height.</returns>
         </member>
@@ -33281,6 +33683,11 @@
             </summary>
             <returns>The localized display name of this Provider implementation.</returns>
         </member>
+        <member name="M:SIMULTAN.Utils.ElevationProvider.IElevationProvider.ClearCache">
+            <summary>
+            Clears the cache if one is used.
+            </summary>
+        </member>
         <member name="T:SIMULTAN.Utils.Files.DirectoryOperations">
             <summary>
             Contains methods for querying and manipulating directories.
@@ -34207,6 +34614,14 @@
             Writes a linebreak to the stream
             </summary>
         </member>
+        <member name="T:SIMULTAN.Utils.SystemTimerFactory">
+            <summary>
+            Implementation of the <see cref="T:SIMULTAN.Utils.IDispatcherTimerFactory"/>
+            </summary>
+        </member>
+        <member name="M:SIMULTAN.Utils.SystemTimerFactory.Create">
+            <inheritdoc />
+        </member>
         <member name="T:SIMULTAN.Utils.TaxonomyUtils">
             <summary>
             Utils for taxonomies
@@ -34419,6 +34834,26 @@
         <member name="M:SIMULTAN.Utils.UndoRedo.PropertyUndoItem.Undo">
             <inheritdoc/>
         </member>
+        <member name="T:SIMULTAN.Utils.UnsyncedSynchronizationContext">
+            <summary>
+            Provides a default (OS independent) implementation of the <see cref="T:System.ComponentModel.ISynchronizeInvoke"/> interface that doesn't perform any synchronization.
+            This is mainly needed when working with user interfaces that need to run code asynchronously and need to be reimplemented for the respective
+            UI system.
+            This default implementation doesn't perform any synchronization and runs the code immediately.
+            </summary>
+        </member>
+        <member name="P:SIMULTAN.Utils.UnsyncedSynchronizationContext.InvokeRequired">
+            <inheritdoc />
+        </member>
+        <member name="M:SIMULTAN.Utils.UnsyncedSynchronizationContext.BeginInvoke(System.Delegate,System.Object[])">
+            <inheritdoc />
+        </member>
+        <member name="M:SIMULTAN.Utils.UnsyncedSynchronizationContext.EndInvoke(System.IAsyncResult)">
+            <inheritdoc />
+        </member>
+        <member name="M:SIMULTAN.Utils.UnsyncedSynchronizationContext.Invoke(System.Delegate,System.Object[])">
+            <inheritdoc />
+        </member>
         <member name="T:System.Text.RegularExpressions.Generated.DirectorySeperatorRegex_0">
             <summary>Custom <see cref="T:System.Text.RegularExpressions.Regex"/>-derived type for the DirectorySeperatorRegex method.</summary>
         </member>