From 81c7ea543ac04a9ae5a1605fded5e82d7e2f5907 Mon Sep 17 00:00:00 2001 From: Lennon Scariano Date: Mon, 5 Jan 2026 18:31:56 -0500 Subject: [PATCH] backwards compatibility with older version --- .../main/java/org/vast/swe/SWEConstants.java | 170 +++++++++--------- .../impl/sensor/AbstractSensorDriver.java | 7 + 2 files changed, 93 insertions(+), 84 deletions(-) diff --git a/lib-ogc/swe-common-core/src/main/java/org/vast/swe/SWEConstants.java b/lib-ogc/swe-common-core/src/main/java/org/vast/swe/SWEConstants.java index 8c4780fa4c..237e95f536 100644 --- a/lib-ogc/swe-common-core/src/main/java/org/vast/swe/SWEConstants.java +++ b/lib-ogc/swe-common-core/src/main/java/org/vast/swe/SWEConstants.java @@ -1,31 +1,31 @@ -/***************************** BEGIN LICENSE BLOCK *************************** - - The contents of this file are subject to the Mozilla Public License Version - 1.1 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/MPL-1.1.html - - Software distributed under the License is distributed on an "AS IS" basis, - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - for the specific language governing rights and limitations under the License. - - The Original Code is the "OGC Service Framework". - - The Initial Developer of the Original Code is Spotimage S.A. - Portions created by the Initial Developer are Copyright (C) 2007 - the Initial Developer. All Rights Reserved. - - Contributor(s): - Alexandre Robin - -******************************* END LICENSE BLOCK ***************************/ -package org.vast.swe; - -/** - *

- * Constants defined by SWE Common standard and other commonly used URIs - *

- * +/***************************** BEGIN LICENSE BLOCK *************************** + + The contents of this file are subject to the Mozilla Public License Version + 1.1 (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/MPL-1.1.html + + Software distributed under the License is distributed on an "AS IS" basis, + WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + for the specific language governing rights and limitations under the License. + + The Original Code is the "OGC Service Framework". + + The Initial Developer of the Original Code is Spotimage S.A. + Portions created by the Initial Developer are Copyright (C) 2007 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Alexandre Robin + +******************************* END LICENSE BLOCK ***************************/ +package org.vast.swe; + +/** + *

+ * Constants defined by SWE Common standard and other commonly used URIs + *

+ * * @author Alex Robin * @since Mar 5, 2008 */ @@ -33,7 +33,7 @@ public class SWEConstants { public static final String URN_PREFIX = "urn:"; public static final String HTTP_PREFIX = "http://"; - public static final String OGC_DEF_URI = "http://www.opengis.net/def/"; + public static final String OGC_DEF_URI = "http://www.opengis.net/def/"; public static final String SML_ONTOLOGY_ROOT = "http://sensorml.com/ont/"; // nil values @@ -55,15 +55,15 @@ public class SWEConstants public static final String OGC_CRS_URI = OGC_DEF_URI + "crs/"; public static final String OGC_CS_URI = OGC_DEF_URI + "cs/"; public static final String EPSG_URI_PREFIX = OGC_CRS_URI + "EPSG/0/"; - public static final String REF_FRAME_4326 = EPSG_URI_PREFIX + 4326; - public static final String REF_FRAME_4979 = EPSG_URI_PREFIX + 4979; - public static final String REF_FRAME_CRS84 = OGC_CRS_URI + "OGC/1.3/CRS84"; - public static final String REF_FRAME_CRS84h = OGC_CRS_URI + "OGC/0/CRS84h"; - public static final String REF_FRAME_WGS84_ECEF = EPSG_URI_PREFIX + 4978; - public static final String REF_FRAME_WGS84_2D = REF_FRAME_4326; - public static final String REF_FRAME_WGS84_HAE = REF_FRAME_4979; - public static final String REF_FRAME_WGS84_MSL = EPSG_URI_PREFIX + 9705; - public static final String VERTICAL_CRS_MSL_HEIGHT = EPSG_URI_PREFIX + 5714; + public static final String REF_FRAME_4326 = EPSG_URI_PREFIX + 4326; + public static final String REF_FRAME_4979 = EPSG_URI_PREFIX + 4979; + public static final String REF_FRAME_CRS84 = OGC_CRS_URI + "OGC/1.3/CRS84"; + public static final String REF_FRAME_CRS84h = OGC_CRS_URI + "OGC/0/CRS84h"; + public static final String REF_FRAME_WGS84_ECEF = EPSG_URI_PREFIX + 4978; + public static final String REF_FRAME_WGS84_2D = REF_FRAME_4326; + public static final String REF_FRAME_WGS84_HAE = REF_FRAME_4979; + public static final String REF_FRAME_WGS84_MSL = EPSG_URI_PREFIX + 9705; + public static final String VERTICAL_CRS_MSL_HEIGHT = EPSG_URI_PREFIX + 5714; public static final String VERTICAL_CRS_MSL_DEPTH = EPSG_URI_PREFIX + 5715; public static final String REF_FRAME_ECI_GCRF = OGC_CRS_URI + "OGC/0/ECI_GCRF"; public static final String REF_FRAME_ECI_J2000 = OGC_CRS_URI + "OGC/0/ECI_J2000"; @@ -96,7 +96,7 @@ public class SWEConstants public static final String DEF_PLATFORM_TYPE = OGC_PROP_URI + "PlatformType"; // SWE property/observable definition URIs - public static final String CF_URI_PREFIX = "http://mmisw.org/ont/cf/parameter/"; + public static final String CF_URI_PREFIX = "http://mmisw.org/ont/cf/parameter/"; public static final String DBPEDIA_URI_PREFIX = "http://dbpedia.org/resource/"; public static final String QUDT_URI_PREFIX = "http://qudt.org/vocab/quantitykind/"; public static final String SWE_PROP_URI_PREFIX = SML_ONTOLOGY_ROOT + "swe/property/"; @@ -105,57 +105,59 @@ public class SWEConstants public static final String DEF_DN = SWE_PROP_URI_PREFIX + "DN"; public static final String DEF_FLAG = SWE_PROP_URI_PREFIX + "Flag"; public static final String DEF_STATUS_CODE = SWE_PROP_URI_PREFIX + "SystemStatus"; - public static final String DEF_COUNT = SWE_PROP_URI_PREFIX + "Counter"; - - // SWE procedure/system definition URIs - public static final String SOSA_URI_PREFIX = "http://www.w3.org/ns/sosa/"; - public static final String SSN_URI_PREFIX = "http://www.w3.org/ns/ssn/"; - public static final String OMS_URI_PREFIX = "http://www.w3.org/ns/sosa/oms/"; - - public static final String DEF_SYSTEM = SOSA_URI_PREFIX + "System"; - public static final String DEF_PLATFORM = SOSA_URI_PREFIX + "Platform"; - public static final String DEF_SENSOR = SOSA_URI_PREFIX + "Sensor"; - public static final String DEF_ACTUATOR = SOSA_URI_PREFIX + "Actuator"; - public static final String DEF_SAMPLER = SOSA_URI_PREFIX + "Sampler"; - public static final String DEF_DEPLOYMENT = SOSA_URI_PREFIX + "Deployment"; - - public static final String DEF_PROCEDURE = SOSA_URI_PREFIX + "Procedure"; - public static final String DEF_OBS_PROCEDURE = SOSA_URI_PREFIX + "ObservingProcedure"; - public static final String DEF_ACT_PROCEDURE = SOSA_URI_PREFIX + "ActuatingProcedure"; - public static final String DEF_SAM_PROCEDURE = SOSA_URI_PREFIX + "SamplingProcedure"; - - public static final String DEF_OBSERVER = OMS_URI_PREFIX + "Observer"; - public static final String DEF_HOST = OMS_URI_PREFIX + "Host"; - public static final String DEF_PREP_PROCEDURE = OMS_URI_PREFIX + "PreparationProcedure"; - - @Deprecated public static final String DEF_DEPLOYMENT_SSN = SSN_URI_PREFIX + "Deployment"; - @Deprecated public static final String DEF_SYSTEM_SSN = SSN_URI_PREFIX + "System"; - - public static final String DEF_ASSET_TYPE = "cs:AssetType"; - public static final String ASSET_TYPE_EQUIPMENT = "Equipment"; - public static final String ASSET_TYPE_HUMAN = "Human"; - public static final String ASSET_TYPE_LIVING_THING = "LivingThing"; - public static final String ASSET_TYPE_SIMULATION = "Simulation"; - public static final String ASSET_TYPE_PROCESS = "Process"; - public static final String ASSET_TYPE_GROUP = "Group"; - public static final String ASSET_TYPE_OTHER = "Other"; - - public static final String SWE_SYS_URI_PREFIX = SML_ONTOLOGY_ROOT + "swe/system/"; - public static final String DEF_EQUIPMENT = SWE_SYS_URI_PREFIX + "Equipment"; - public static final String DEF_HUMAN = SWE_SYS_URI_PREFIX + "Human"; - public static final String DEF_LIVING_THING = SWE_SYS_URI_PREFIX + "LivingThing"; - public static final String DEF_SIMULATION = SWE_SYS_URI_PREFIX + "Simulation"; - public static final String DEF_PROCESS = SWE_SYS_URI_PREFIX + "Process"; - public static final String DEF_SYSTEM_GROUP = SWE_SYS_URI_PREFIX + "Group"; + public static final String DEF_COUNT = SWE_PROP_URI_PREFIX + "Counter"; + + // SWE procedure/system definition URIs + public static final String SOSA_URI_PREFIX = "http://www.w3.org/ns/sosa/"; + public static final String SSN_URI_PREFIX = "http://www.w3.org/ns/ssn/"; + public static final String OMS_URI_PREFIX = "http://www.w3.org/ns/sosa/oms/"; + + public static final String DEF_SYSTEM = SOSA_URI_PREFIX + "System"; + public static final String DEF_PLATFORM = SOSA_URI_PREFIX + "Platform"; + public static final String DEF_SENSOR = SOSA_URI_PREFIX + "Sensor"; + public static final String DEF_ACTUATOR = SOSA_URI_PREFIX + "Actuator"; + public static final String DEF_SAMPLER = SOSA_URI_PREFIX + "Sampler"; + public static final String DEF_DEPLOYMENT = SOSA_URI_PREFIX + "Deployment"; + + public static final String DEF_PROCEDURE = SOSA_URI_PREFIX + "Procedure"; + public static final String DEF_OBS_PROCEDURE = SOSA_URI_PREFIX + "ObservingProcedure"; + public static final String DEF_ACT_PROCEDURE = SOSA_URI_PREFIX + "ActuatingProcedure"; + public static final String DEF_SAM_PROCEDURE = SOSA_URI_PREFIX + "SamplingProcedure"; + + public static final String DEF_OBSERVER = OMS_URI_PREFIX + "Observer"; + public static final String DEF_HOST = OMS_URI_PREFIX + "Host"; + public static final String DEF_PREP_PROCEDURE = OMS_URI_PREFIX + "PreparationProcedure"; + + @Deprecated public static final String DEF_DEPLOYMENT_SSN = SSN_URI_PREFIX + "Deployment"; + @Deprecated public static final String DEF_SYSTEM_SSN = SSN_URI_PREFIX + "System"; + + public static final String DEF_ASSET_TYPE = "cs:AssetType"; + public static final String ASSET_TYPE_EQUIPMENT = "Equipment"; + public static final String ASSET_TYPE_HUMAN = "Human"; + public static final String ASSET_TYPE_LIVING_THING = "LivingThing"; + public static final String ASSET_TYPE_SIMULATION = "Simulation"; + public static final String ASSET_TYPE_PROCESS = "Process"; + public static final String ASSET_TYPE_GROUP = "Group"; + public static final String ASSET_TYPE_OTHER = "Other"; + + public static final String SWE_SYS_URI_PREFIX = SML_ONTOLOGY_ROOT + "swe/system/"; + public static final String DEF_EQUIPMENT = SWE_SYS_URI_PREFIX + "Equipment"; + public static final String DEF_HUMAN = SWE_SYS_URI_PREFIX + "Human"; + public static final String DEF_LIVING_THING = SWE_SYS_URI_PREFIX + "LivingThing"; + public static final String DEF_SIMULATION = SWE_SYS_URI_PREFIX + "Simulation"; + public static final String DEF_PROCESS = SWE_SYS_URI_PREFIX + "Process"; + public static final String DEF_SYSTEM_GROUP = SWE_SYS_URI_PREFIX + "Group"; public static final String DEF_SYSTEM_OTHER = SWE_SYS_URI_PREFIX + "Other"; // Special units - public static final String QUDT_UOM_PREFIX = "http://qudt.org/vocab/unit/"; - public static final String SWE_UOM_URI_PREFIX = SML_ONTOLOGY_ROOT + "swe/uom/"; + public static final String QUDT_UOM_PREFIX = "http://qudt.org/vocab/unit/"; + public static final String SWE_UOM_URI_PREFIX = SML_ONTOLOGY_ROOT + "swe/uom/"; public static final String UOM_ANY = SWE_UOM_URI_PREFIX + "Any"; - public static final String UOM_UNITLESS = QUDT_UOM_PREFIX + "UNITLESS"; + public static final String UOM_UNITLESS = QUDT_UOM_PREFIX + "UNITLESS"; public static final String UOM_UNITLESS_CODE = "1"; + @Deprecated + public static final String DEF_SENSOR_NETWORK = SWE_SYS_URI_PREFIX + "SensorNetwork"; private SWEConstants() { diff --git a/sensorhub-core/src/main/java/org/sensorhub/impl/sensor/AbstractSensorDriver.java b/sensorhub-core/src/main/java/org/sensorhub/impl/sensor/AbstractSensorDriver.java index ee1d6211af..9da950fc98 100644 --- a/sensorhub-core/src/main/java/org/sensorhub/impl/sensor/AbstractSensorDriver.java +++ b/sensorhub-core/src/main/java/org/sensorhub/impl/sensor/AbstractSensorDriver.java @@ -333,6 +333,13 @@ public Map getCommandInputs() } } + protected void clearFois() + { + synchronized(foiMap) + { + foiMap.clear(); + } + } @Override public boolean isEnabled()