Merge branch 'master' into 'cherry-pick-7698d9d7'

# Conflicts: # src/de/tud/kom/p2psim/impl/analyzer/metric/output/MetricOutputDAO.java # src/de/tud/kom/p2psim/impl/util/db/dao/DAO.java

Merge branch 'master' into 'cherry-pick-7698d9d7'
# Conflicts: # src/de/tud/kom/p2psim/impl/analyzer/metric/output/MetricOutputDAO.java # src/de/tud/kom/p2psim/impl/util/db/dao/DAO.java
eff5d429 · Julian Zobel · 1c7f20ec · 37020b44 · eff5d429 · eff5d429
Commit eff5d429 authored Apr 29, 2022 by Julian Zobel 🦄
--- a/src/de/tud/kom/p2psim/impl/util/db/dao/metric/MeasurementDAO.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/dao/metric/MeasurementDAO.java
--- a/src/de/tud/kom/p2psim/impl/util/db/dao/metric/MetricDAO.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/dao/metric/MetricDAO.java
--- a/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementStatisticMsgType.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementStatisticMsgType.java
--- a/src/de/tud/kom/p2psim/impl/util/db/metric/Metric.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/metric/Metric.java
--- a/src/de/tud/kom/p2psim/impl/util/db/relational/RelationalDB.java
+++ b/src/de/tud/kom/p2psim/impl/util/db/relational/RelationalDB.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/AbstractMap.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/AbstractMap.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/MapChangeListener.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/MapChangeListener.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/MapLoader.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/MapLoader.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/FuzzyWaypointCache.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/FuzzyWaypointCache.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMMap.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMMap.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMNode.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMNode.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMObstacle.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMObstacle.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMReader.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMReader.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/UTM.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/UTM.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/UTMConversion.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/osm/UTMConversion.java
--- a/src/de/tud/kom/p2psim/impl/util/geo/maps/svg/SVGMap.java
+++ b/src/de/tud/kom/p2psim/impl/util/geo/maps/svg/SVGMap.java
--- a/src/de/tud/kom/p2psim/impl/util/guirunner/impl/RunnerController.java
+++ b/src/de/tud/kom/p2psim/impl/util/guirunner/impl/RunnerController.java
--- a/src/de/tud/kom/p2psim/impl/util/guirunner/impl/XMLConfigFile.java
+++ b/src/de/tud/kom/p2psim/impl/util/guirunner/impl/XMLConfigFile.java
--- a/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java
+++ b/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java
--- a/src/de/tud/kom/p2psim/impl/util/positioning/GeoSpherePosition.java
+++ b/src/de/tud/kom/p2psim/impl/util/positioning/GeoSpherePosition.java