Merge pull request #60426 from qgis/backport-60420-to-release-3_40

[Backport release-3_40] [sensorthings] Offer MultiDatastreams as valid expansion targets
qgis · Feb 5, 2025 · b962090 · b962090
2 parents 7c78e08 + 47c6631
commit b962090
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/core/providers/sensorthings/qgssensorthingsutils.cpp b/src/core/providers/sensorthings/qgssensorthingsutils.cpp
@@ -863,7 +863,8 @@ QList<Qgis::SensorThingsEntity> QgsSensorThingsUtils::expandableTargets( Qgis::S
       return
       {
         Qgis::SensorThingsEntity::HistoricalLocation,
-        Qgis::SensorThingsEntity::Datastream
+        Qgis::SensorThingsEntity::Datastream,
+        Qgis::SensorThingsEntity::MultiDatastream,
       };
 
     case Qgis::SensorThingsEntity::Location:
@@ -891,19 +892,22 @@ QList<Qgis::SensorThingsEntity> QgsSensorThingsUtils::expandableTargets( Qgis::S
     case Qgis::SensorThingsEntity::Sensor:
       return
       {
-        Qgis::SensorThingsEntity::Datastream
+        Qgis::SensorThingsEntity::Datastream,
+        Qgis::SensorThingsEntity::MultiDatastream,
       };
 
     case Qgis::SensorThingsEntity::ObservedProperty:
       return
       {
-        Qgis::SensorThingsEntity::Datastream
+        Qgis::SensorThingsEntity::Datastream,
+        Qgis::SensorThingsEntity::MultiDatastream
       };
 
     case Qgis::SensorThingsEntity::Observation:
       return
       {
-        Qgis::SensorThingsEntity::Datastream
+        Qgis::SensorThingsEntity::Datastream,
+        Qgis::SensorThingsEntity::MultiDatastream
       };
 
     case Qgis::SensorThingsEntity::FeatureOfInterest:

diff --git a/tests/src/python/test_provider_sensorthings.py b/tests/src/python/test_provider_sensorthings.py
@@ -636,6 +636,7 @@ def test_expandable_targets(self):
             [
                 Qgis.SensorThingsEntity.HistoricalLocation,
                 Qgis.SensorThingsEntity.Datastream,
+                Qgis.SensorThingsEntity.MultiDatastream,
             ],
         )
-Original file line number
+Diff line change
@@ Expand Up / @@ -636,6 +636,7 @@ def test_expandable_targets(self): @@
                 [
                     Qgis.SensorThingsEntity.HistoricalLocation,
                     Qgis.SensorThingsEntity.Datastream,
+                    Qgis.SensorThingsEntity.MultiDatastream,
                 ],
             )
@@ Expand Down @@