Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ subprojects {
}
}
}

version = oshCoreVersion
ext.pom = {} // pom data that subprojects can append to

Expand Down Expand Up @@ -328,29 +328,30 @@ subprojects {
repositories {
//mavenLocal()
maven {
name = "GitHubPackages"
url = "https://maven.pkg.github.com/opensensorhub/osh-addons"
name = "Nexus"
url = System.getenv("NEXUS_REPO_URL")
allowInsecureProtocol=true
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
username = System.getenv("NEXUS_ACTOR")
password = System.getenv("NEXUS_TOKEN")
}
}
}
}

p.tasks.named("generateMetadataFileForMavenJavaPublication") {
project.tasks.named("generateMetadataFileForMavenJavaPublication") {
doFirst {
if (System.getenv("GITHUB_ACTOR") == null) {
throw new Exception("Environment variable GITHUB_ACTOR not set. Please set to your github username.")
if (System.getenv("NEXUS_ACTOR") == null) {
throw new Exception("Environment variable NEXUS_ACTOR not set. Please set to your github username.")
}

if (System.getenv("GITHUB_TOKEN") == null) {
throw new Exception("Environment variable GITHUB_TOKEN not set. Please generate and set to your personal access token: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens")
if (System.getenv("NEXUS_TOKEN") == null) {
throw new Exception("Environment variable NEXUS_TOKEN not set. Please generate and set to your personal access token: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens")
}
}
}

p.tasks.named("publishMavenJavaPublicationToGitHubPackagesRepository") {
project.tasks.named("publishMavenJavaPublicationToNexusRepository") {
onlyIf {
//
MavenArtifactRepository repo = repository as MavenArtifactRepository;
Expand Down
2 changes: 1 addition & 1 deletion processing/sensorhub-process-ffmpeg/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'FFMPEG processing modules'
ext.details = 'FFMPEG based modules for video processing'
version = '0.1'
version = '0.1.1'


dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* Extend this class for any process module with video input/output.
*/
public abstract class FFmpegProcess extends AbstractProcessModule<FFmpegProcessConfig> {
final String ID_PREFIX = "urn:osh:process:ffmpeg:" + this.getClass().getSimpleName().toLowerCase() + ":";
final String ID_PREFIX = "urn:osh:process:georobotix:ffmpeg:" + this.getClass().getSimpleName().toLowerCase() + ":";
SimpleProcessImpl process;
IModule<?> sensorModule;
protected IProcessExec executable;
Expand Down
2 changes: 1 addition & 1 deletion processing/sensorhub-process-helpers/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'Process Helper Classes'
ext.details = 'Collection of SensorML process helpers and templates'
version = '1.0.0'
version = '1.0.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Developer are Copyright (C) 2025 the Initial Developer. All Rights Reserved.
import net.opengis.swe.v20.AbstractSWEIdentifiable;
import net.opengis.swe.v20.DataComponent;
import net.opengis.swe.v20.DataRecord;
import org.slf4j.Logger;
import org.vast.process.ExecutableProcessImpl;
import org.vast.process.ProcessException;
import org.vast.sensorML.*;
Expand Down Expand Up @@ -69,8 +68,8 @@ public ProcessChainBuilder createProcessChain() {
}

public class ProcessChainBuilder {
ReferenceImpl controlType = new ReferenceImpl("urn:osh:process:datasink:commandstream");
ReferenceImpl sourceType = new ReferenceImpl("urn:osh:process:datasource:stream");
ReferenceImpl controlType = new ReferenceImpl("urn:osh:process:georobotix:datasink:commandstream");
ReferenceImpl sourceType = new ReferenceImpl("urn:osh:process:georobotix:datasource:stream");
ProcessHelper helper;
AggregateProcessImpl aggregateProcess;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'Universal Controller Processing'
ext.details = 'Take controller input to process command outputs'
version = '1.0.0'
version = '1.0.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
package org.sensorhub.impl.process.universalcontroller.helpers;

import net.opengis.gml.v32.impl.ReferenceImpl;
import net.opengis.sensorml.v20.AbstractProcess;
import net.opengis.sensorml.v20.IOPropertyList;
import net.opengis.sensorml.v20.SimpleProcess;
import net.opengis.sensorml.v20.impl.SettingsImpl;
import net.opengis.swe.v20.AbstractSWEIdentifiable;
import net.opengis.swe.v20.DataComponent;
import net.opengis.swe.v20.DataRecord;
import org.vast.process.ExecutableProcessImpl;
import org.vast.process.IProcessExec;
import org.vast.process.ProcessException;
import org.vast.sensorML.*;
import org.vast.xml.XMLWriterException;

import java.io.OutputStream;
import java.util.ArrayList;

public class ProcessHelper extends SMLUtils {
AggregateProcessImpl aggregateProcess;
Expand All @@ -24,8 +20,8 @@ public class ProcessHelper extends SMLUtils {
public ProcessHelper() {
super(V2_0);

controlType = new ReferenceImpl("urn:osh:process:datasink:commandstream");
sourceType = new ReferenceImpl("urn:osh:process:datasource:stream");
controlType = new ReferenceImpl("urn:osh:process:georobotix:datasink:commandstream");
sourceType = new ReferenceImpl("urn:osh:process:georobotix:datasource:stream");

aggregateProcess = new AggregateProcessImpl();
}
Expand Down
2 changes: 1 addition & 1 deletion processing/sensorhub-process-utils/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'Common Utility Functions'
ext.details = 'Basic processing blocks for control flow and array handling'
version = '1.0.0'
version = '1.0.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

public class AutoWiringComponent extends AbstractDataComponentImpl
{
public static final String AUTO_WIRING_URI = "urn:osh:process:wiring:auto";
public static final String AUTO_WIRING_URI = "urn:osh:process:georobotix:wiring:auto";


public void replaceWithComponent(ExecutableProcessImpl process, DataComponent comp)
Expand Down
2 changes: 1 addition & 1 deletion sensors/aviation/sensorhub-driver-fltaware/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'Flight Aware Adaptor'
ext.details = 'Flight Aware flight plans and real-time position provider'
version = '0.8.1'
version = '0.8.2'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ public class FlightAwareDriver extends AbstractSensorModule<FlightAwareConfig>
GMLFactory gmlFac = new GMLFactory(true);

// Dynamically created FOIs
static final String SENSOR_UID_PREFIX = "urn:osh:sensor:aviation:";
static final String FLIGHT_UID_PREFIX = "urn:osh:aviation:flight:";
static final String SENSOR_UID_PREFIX = "urn:osh:sensor:georobotix:aviation:";
static final String FLIGHT_UID_PREFIX = "urn:osh:sensor:georobotix:aviation:flight:";

IFlightObjectFilter flightFilter;
IFlightRouteDecoder flightRouteDecoder;
Expand Down
2 changes: 1 addition & 1 deletion sensors/aviation/sensorhub-driver-misb-uas/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'MISB UAS Sensors'
ext.details = "Driver for UAS system providing video and telemetry based on MISB ST 0601 / STANAG 4609"
version = '2.2.0'
version = '2.2.1'

// To build in entire java cv platform of projects use
// implementation('org.bytedeco:javacv-platform:1.5.2')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ protected void shutdownExecutor() {
* Creates the strings that uniquely identify this sensor in OpenSensorHub.
*/
protected void generateIds() {
generateUniqueID("urn:osh:sensor:uas:", config.serialNumber);
generateUniqueID("urn:osh:sensor:georobotix:uas:", config.serialNumber);
generateXmlID("MISB_UAS_", config.serialNumber);
}

Expand Down Expand Up @@ -380,7 +380,7 @@ protected void createFois() {
addFoi(uasFoi);

imagedFoi = new MovingFeature();
imagedFoi.setUniqueIdentifier("urn:osh:foi:imagedArea:" + config.serialNumber);
imagedFoi.setUniqueIdentifier("urn:osh:foi:georobotix:imagedArea:" + config.serialNumber);
imagedFoi.setName("UAS " + config.serialNumber + " Imaged Area");
imagedFoi.setDescription("Area viewed by imaging sensor on-board platform " + config.serialNumber);
addFoi(imagedFoi);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
public class AeroHelper extends GeoPosHelper
{
// SWE definition URIs
public static final String AERO_DEF_URI_PREFIX = "urn:osh:def:aero:";
public static final String AERO_RECORD_URI_PREFIX = "urn:osh:def:aero:record:";
public static final String AERO_DEF_URI_PREFIX = "urn:osh:def:georobotix:aero:";
public static final String AERO_RECORD_URI_PREFIX = "urn:osh:def:georobotix:aero:record:";

public static final String ICAO_CODESPACE = AERO_DEF_URI_PREFIX + "ICAO";
public static final String DEF_TAIL_NUMBER = AERO_DEF_URI_PREFIX + "TailNumber";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
public class AeroUtils
{
// System URIs
public static final String AERO_SYSTEM_URI_PREFIX = "urn:osh:system:aero:";
public static final String AERO_SYSTEM_URI_PREFIX = "urn:osh:system:georobotix:aero:";
public static final String AERO_FOI_REGISTRY_UID = AERO_SYSTEM_URI_PREFIX + "foiregistry";

// FOI URIs
public static final String AERO_FOI_URI_PREFIX = "urn:osh:foi:aero:";
public static final String AERO_FOI_URI_PREFIX = "urn:osh:foi:georobotix:aero:";
public static final String FOI_TAIL_UID_PREFIX = AERO_FOI_URI_PREFIX + "ac:";
public static final String FOI_FLIGHT_UID_PREFIX = AERO_FOI_URI_PREFIX + "flt:";
public static final String FOI_AIRPORT_UID_PREFIX = AERO_FOI_URI_PREFIX + "apt:";
Expand Down
2 changes: 1 addition & 1 deletion sensors/avl/sensorhub-driver-avl-911/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'AVL 911 Sensor'
ext.details = "Driver for Automatic Vehicle Location providing location and status based on Intergraph's 911 system"
version = '1.0.0'
version = '1.0.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/
public class AVLDriver extends AbstractSensorModule<AVLConfig>
{
static final String UID_PREFIX = "urn:osh:sensor:avl:";
static final String UID_PREFIX = "urn:osh:sensor:georobotix:avl:";

ICommProvider<?> commProvider;
AVLOutput dataInterface;
Expand Down
2 changes: 1 addition & 1 deletion sensors/cbrne/sensorhub-driver-gamma/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'Gamma Sensor'
ext.details = 'Driver for gamma sensor model 2070 by Health Physics Instruments'
version = '0.1-SNAPSHOT'
version = '0.1.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected void doInit() throws SensorHubException


// add unique ID based on serial number
this.uniqueID = "urn:gamma:" + config.modelNumber + ":" + config.serialNumber;
this.uniqueID = "urn:osh:sensor:georobotix:gamma:" + config.modelNumber + ":" + config.serialNumber;
this.xmlID = "GAMMA_" + config.modelNumber + "_" + config.serialNumber.toUpperCase();

// create data interfaces
Expand Down
2 changes: 1 addition & 1 deletion sensors/health/sensorhub-driver-angelsensor/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'Angel Sensor'
ext.details = 'Driver for Angel Sensor BLE wrist band'
version = '0.1-SNAPSHOT'
version = '0.1.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ protected void doInit() throws SensorHubException
super.doInit();

// generate IDs
generateUniqueID("urn:osh:angelsensor:", config.btAddress);
generateUniqueID("urn:osh:sensor:georobotix:angelsensor:", config.btAddress);
generateXmlID("ANGEL_SENSOR_", config.btAddress);

// create output interfaces
Expand Down
2 changes: 1 addition & 1 deletion sensors/hydro/sensorhub-driver-intellisense/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'Intellisense Flood Sensor Driver'
ext.details = 'Driver for pulling measurements from Intellisense Flood Sensor API and publishing in SWE format'
version = '0.1.0'
version = '0.1.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
public class IntellisenseSensor extends AbstractSensorModule<IntellisenseConfig>
{
// static final Logger log = LoggerFactory.getLogger(IntellisenseSensor.class);
static final String SENSOR_UID_PREFIX = "urn:osh:sensor:intellisense:";
static final String SENSOR_UID_PREFIX = "urn:osh:sensor:georobotix:intellisense:";
static final String DEVICE_UID_PREFIX = SENSOR_UID_PREFIX + "station:";

IntellisenseOutput output;
Expand Down
2 changes: 1 addition & 1 deletion sensors/hydro/sensorhub-driver-usgswater/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'USGS Water Data Driver'
ext.details = 'Connector to retrieve live observations from USGS water stations'
version = '0.1.0'
version = '0.1.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class USGSWaterDriver extends AbstractSensorModule <USGSWaterConfig> impl
{
static final Logger log = LoggerFactory.getLogger(USGSWaterDriver.class);
static final String BASE_URL = "https://waterservices.usgs.gov/nwis/iv?sites=";
static final String UID_PREFIX = "urn:usgs:water:";
static final String UID_PREFIX = "urn:osh:sensor:georobotix:usgs:water:";

final int urlChunkSize = 100;
Timer timer;
Expand Down Expand Up @@ -127,7 +127,7 @@ protected void doInit() throws SensorHubException

loadQualCodes();
// generate identifiers
this.uniqueID = "urn:usgs:water:live";
this.uniqueID = "urn:osh:sensor:georobotix:usgs:water:live";
this.xmlID = "USGS_WATER_DATA_NETWORK";

if (config.exposeFilter.parameters.contains(ObsParam.WATER_TEMP))
Expand Down
2 changes: 1 addition & 1 deletion sensors/hydro/sensorhub-storage-ndbc/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'NDBC Buoy Data Archive'
ext.details = 'Connector to retrieve historical observations from NDBC datasets'
version = '0.1.0'
version = '0.1.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
public class NDBCArchive extends AbstractModule<NDBCConfig> implements IObsStorageModule<NDBCConfig>, IMultiSourceStorage<IObsStorage>
{
static final String BASE_NDBC_URL = "https://sdf.ndbc.noaa.gov";
static final String IOOS_UID_PREFIX = "urn:ioos:";
static final String IOOS_UID_PREFIX = "urn:osh:sensor:georobotix:ioos:";

Map<String, RecordStore> dataStores = new LinkedHashMap<>();
Map<String, AbstractFeature> fois = new LinkedHashMap<>();
Expand Down
2 changes: 1 addition & 1 deletion sensors/hydro/sensorhub-storage-usgswater/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'USGS Water Data Archive'
ext.details = 'Connector to retrieve historical observations from USGS water datasets'
version = '0.1.0'
version = '0.1.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
public class USGSWaterDataArchive extends AbstractModule<USGSWaterDataConfig> implements IObsSystemDatabaseModule<USGSWaterDataConfig>
{
static final String BASE_USGS_URL = "https://waterservices.usgs.gov/nwis/";
static final String UID_PREFIX = "urn:usgs:water:";
static final String UID_PREFIX = "urn:osh:sensor:georobotix:usgs:water:";

ISystemDescStore procStore;
IFoiStore foiStore;
Expand Down
2 changes: 1 addition & 1 deletion sensors/others/sensorhub-driver-f20/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'F20 Driver'
ext.details = "Driver for F20 attachable sensors"
version = '1.0.0'
version = '1.0.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void doInit() throws SensorHubException {
super.doInit();

// Generate identifiers
generateUniqueID("urn:osh:driver:f20:", config.serialNumber);
generateUniqueID("urn:osh:sensor:georobotix:f20:", config.serialNumber);
generateXmlID("F20", config.serialNumber);

// Create and initialize output
Expand Down
2 changes: 1 addition & 1 deletion sensors/others/sensorhub-driver-intelipod/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'Intelipod Sensor'
ext.details = 'Driver for Intelipod sensors built by Venti'
version = '1.0.0'
version = '1.0.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ protected void doInit() throws SensorHubException
}

// generate identifiers: use serial number from config or first characters of local ID
generateUniqueID("urn:osh:intelipod:", config.serialNumber);
generateUniqueID("urn:osh:sensor:georobotix:intelipod:", config.serialNumber);
generateXmlID("INTELIPOD_", config.serialNumber);

intelipodOut.init();
Expand Down
2 changes: 1 addition & 1 deletion sensors/others/sensorhub-driver-isa/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
description = 'ISA Sensor Driver'
ext.details = 'Driver for sensors compatible with the Integrated Sensor Architecture (ISA) developed by the US Army'
version = '0.1-SNAPSHOT'
version = '0.1.1'

dependencies {
implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
Expand Down
Loading
Loading