Skip to content

xid / specs

Go to a project
Toggle navigation
Toggle navigation pinning
60c622ec by Pavan Sabbineni
Options

ILP-425: Updates to slam api and added initial XIDData.prop

1 parent 377d2c64
Expand all
Inline Side-by-side
Showing 9 changed files with 209 additions and 30 deletions
ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml
......@@ -8,7 +8,7 @@
<title>SLAM Common Definitions</title>
<comment>This file defines commonly used structures and enumerations used throughout the SLAM system.</comment>
<!-- Include all known definitions -->
<!-- Include used definitions -->
<import ref="https://xid.location.studio/HPE/V1.2/HpeCore.xid.xml" local="HpeCore.xid.xml" />
<namespace name="SLAM">
......
ILP/SLAM/V1.0.0_alpha/ProbeApi.xid.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<specification xmlns="https://xid.location.studio/schema/V1.0.0/XtensibleInterfaceDefinition.xsd"
xmlns:xid="https://xid.location.studio/schema/V1.0.0/XtensibleInterfaceDefinition.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://xid.location.studio/schema/V1.0.0/XtensibleInterfaceDefinition.xsd https://xid.location.studio/schema/V1.0.0/XtensibleInterfaceDefinition.xsd"
identity="ProbeApi.xid.xml">
<title>SLAM Probe API Specifications</title>
<comment>
This file defines the SLAM Probe API. The probe API is used to load one or more probe data records from a single device.
</comment>
<!-- Include used definitions -->
<import ref="https://xid.location.studio/HPE/V1.2/HpeGnss.xid.xml" local="HpeGnss.xid.xml" />
<import ref="https://xid.location.studio/HPE/V1.2/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
<import ref="https://xid.location.studio/HPE/V1.2/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
<import ref="https://xid.location.studio/Tensor/V1.0.0/ApiBase.xid.xml" local="SLAM/ApiBase.xid.xml" />
<import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" />
<namespace name="SLAM">
<using namespace="HPE"/>
<using namespace="Tensor"/>
<enum name="DeviceClass" type="Tensor.int8" default="undefined">
<comment>
Device class enumeration specifies the class or primary use of the device.
This allows probe data recorded to be analyzed by classes of devices.
</comment>
<literal name ="undefined" value="0"/>
<literal name ="mobileSmartphone" value="1"/>
<literal name ="mobilePad" value="2"/>
<literal name ="mobileTablet" value="3"/>
<literal name ="mobileOther" value="4"/>
<literal name ="iotTag" value="5"/>
<literal name ="iotComm" value="6"/>
<literal name ="iotStatic" value="7"/>
<literal name ="iotOther" value="8"/>
<literal name ="autoTrack" value="9"/>
<literal name ="autoNav" value="10"/>
<literal name ="autoOther" value="11"/>
</enum>
<struct name="ProbeRecord">
<comment>
A record capturing RF and otherinformation at a specified location. Probe records are captured
as part of probe data collected by probe devices.
</comment>
<elem name="state" multiplicity="1" type="StateInfo">
<comment>
Required device position and other state information. At least one of
observations or state is required, otherwise there is insufficient data to process.
</comment>
</elem>
<elem name="floor" multiplicity="1" type ="int8" default="0">
<comment>The floor number of this scan</comment>
</elem>
<elem name="obsset" multiplicity="1" type="ObservationSet" >
<comment>
Set of observation data containing the probe measurements.
</comment>
</elem>
<elem name="name" multiplicity ="0..1" type="string">
<comment>Optional Name of this probe location.</comment>
</elem>
<elem name="description" multiplicity ="0..1" type="string">
<comment>Optional human readable description.</comment>
</elem>
<elem name="address" multiplicity ="0..1" type="AddressInfo" >
<comment>Optional address information.</comment>
</elem>
<elem name="contact" multiplicity ="0..1" type="ContactInfo" >
<comment>
Optional contact information. These are for probes locations typically associated with
a business or public entity that has associated contact information.
</comment>
</elem>
<elem name="data" multiplicity ="0..1" type="Tensor.json">
<comment>Optional other information describing this probe location in json format.</comment>
</elem>
</struct>
<struct name ="ProbeSourceInfo">
<comment>
Structure contains information about the probe data source.
</comment>
<elem name="classDevice" multiplicity="1" type="DeviceClass" >
<comment>Required field specifies the class of device used to collect the probe data.</comment>
</elem>
<elem name="modelDevice" multiplicity ="1" type="Tensor.string">
<comment>String defining a device</comment>
</elem>
<elem name="mfgDevice" multiplicity ="1" type="Tensor.string">
<comment>Optional device manufacturer information.</comment>
</elem>
<elem name="osNameVer" multiplicity ="1" type="Tensor.uri">
<comment>Operating system name use the format [os: e.g. windows, android, iphone, custom]/[version: information]/[language]/[etc].</comment>
</elem>
<elem name="appNameVer" multiplicity ="1" type="Tensor.string">
<comment>Specifies the application/library name with version information with the following format.[app name]/[ver].</comment>
</elem>
<elem name="idUser" multiplicity ="0..1" type="Tensor.string">
<comment>Optional user identifier.</comment>
</elem>
<elem name="keySource" multiplicity="0..1" type="Tensor.string">
<comment>Optional source key identifier, provides public key value to assist in authentication of probe information.</comment>
</elem>
</struct>
<!--
*******************************************************
Probe Submission API
*******************************************************
-->
<interface name="Probe">
<comment>Interface for submitting RF probe data.</comment>
<operation name="Submit">
<comment>
Interaction submits probe data and outputs responds with operation result.
</comment>
<input name="input" type="Tensor.InputBase" sid="0x1032">
<elem name="captureDate" type="datetime" multiplicity="1">
<comment>General date and time probe data was captured.</comment>
</elem>
<elem name="encoding" multiplicity="0..1" type="EncodingFormat" default="0" >
<comment>
Probe data and source information encoding format. Probe records may be passed to the service in
an encoding format different than that outer wire format. This can protect sensitive data.
By default wire protocol native format is assumed.
</comment>
</elem>
<elem name="sourceInfo" type="ProbeSourceInfo" multiplicity="0..1" encoding ="encoding">
<comment>
Optional source information. If not provided, probe data will ultimately have a low veracity score. If at all possible
probe data should have source information. The system correlates source data with other known sources to calculate veracity.
</comment>
</elem>
<elem name="probes" multiplicity ="0..*" type="ProbeRecord" encoding ="encoding">
<comment>Zero or more probe records encoded in the specified format.</comment>
</elem>
</input>
</operation>
</interface>
</namespace>
</specification>
ILP/SLAM/V1.0.0_alpha/README.md 0 → 100644
# SLAM XIDs #
SLAM XIDs do not encode their ordinals (i.e. tags and offets). XIDData.prop is required to maintain backward compatibility.
## Generate / Verify XIDData.prop ##
~~~sh
$ java -Xnoclassgc -jar $XIDSDK/bin/xidcg.jar \
-v \
-prop https://xid.location.studio/Tensor/V1.0.0/XIDData.prop \
-prop https://xid.location.studio/HPE/V1.2/XIDData.prop \
-prop https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/XIDData.prop \
https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml \
https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/ReferenceData.xid.xml \
https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml \
https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/SurveyApi.xid.xml \
https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/ProbeApi.xid.xml \
https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileManagementApi.xid.xml \
https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileServiceApi.xid.xml
OR
$ java -Xnoclassgc -jar $XIDSDK/bin/xidcg.jar \
-v \
-prop ../../Tensor/V1.0.0/XIDData.prop \
-prop ../../HPE/V1.2/XIDData.prop \
-prop XIDData.prop \
CommonDefs.xid.xml \
ReferenceData.xid.xml \
TileDefinitions.xid.xml \
SurveyApi.xid.xml \
ProbeApi.xid.xml \
TileManagementApi.xid.xml \
TileServiceApi.xid.xml
~~~
If xidcg reports:
~~~
Generating: xidout/meta/XID/XIDData.prop
~~~
Then something has changed and XIDData.prop needs to get updated.
ILP/SLAM/V1.0.0_alpha/ReferenceData.xid.xml
......@@ -21,25 +21,22 @@
<using namespace="HPE.WiFi"/>
<using namespace="HPE.Cellular"/>
<enum name="RefPointValidStatus" type="Tensor.int8" default="Unknown">
<comment>Reference Validity status.</comment>
<literal name="Unknown" value="0"/>
<literal name="valid" value="1"/>
<literal name="quarantined" value ="2"/>
<literal name="invalid" value="3"/>
</enum>
<enum name="RefPointSyncStatus" type="Tensor.int8" default ="sync_required">
<comment>synchronization status of the reference point</comment>
<literal name="sync_required" value="0"/>
<literal name="in_sync" value="1"/>
</enum>
<enum name="RefPointUpdateStatus" type="Tensor.int8" default ="updated">
<comment>update status of the reference point</comment>
<literal name="updated" value="0"/>
<literal name="update_required" value="1"/>
</enum>
<enum name="RefPointUseStatus" type="Tensor.int8" default ="unknown">
<comment>use status of the reference point</comment>
<literal name="unknown" value="0"/>
<literal name="outdated" value="1"/>
<literal name="valid" value="2"/>
<literal name="quarantined" value="3"/>
<literal name="invalid" value="4"/>
<literal name="deprecated" value="5"/>
<literal name="discardable" value="6"/>
</enum>
<enum name="RefPointType" type="Tensor.int8" default="undefined">
<comment>Specifies the format of the Reference data.</comment>
......@@ -51,16 +48,6 @@
<literal name="GenericRF" value="5"/>
</enum>
<!--
<type name="HashKey" size="16">
<comment>16 byte UUID</comment>
<lang name="c" type="UUID" include="Tensor/CXMF/uuid.h"/>
<lang name="cpp" type="::Tensor::Types::UUID" include="Tensor/Types/uuid.h"/>
<lang name="java" type="XidUuid" include="com.comtechtel.tensor.xid.XidUuid"/>
<lang name="node" type="XidUuid"/>
</type>
-->
<struct name="RefPoint" >
<comment>defines the base structure of a reference point</comment>
<elem name="type" type="RefPointType" multiplicity="1" rttd="true">
......@@ -79,7 +66,7 @@
<comment>The veracity of the reference point, 1= 100% trusted and validated, 0% not trusted at all.</comment>
</elem>
<elem name="validStatus" multiplicity="1" type="RefPointValidStatus">
<elem name="usestatus" multiplicity="1" type="RefPointUseStatus">
<comment>status of the reference point</comment>
</elem>
<elem name="validbegin" type="datetime" multiplicity="1">
......@@ -129,7 +116,7 @@
<elem name="ssid" type="Tensor.string" multiplicity="1">
<comment>ssid of the access point</comment>
</elem>
<elem name ="macaddr" type="mac48" multiplicity="1">
<elem name ="macaddr" type="Tensor.string" multiplicity="1">
<comment>the mac address of the access point</comment>
</elem>
......
ILP/SLAM/V1.0.0_alpha/SurveyApi.xid.xml
......@@ -15,6 +15,7 @@
<import ref="https://xid.location.studio/HPE/V1.2/HpeGnss.xid.xml" local="HpeGnss.xid.xml" />
<import ref="https://xid.location.studio/HPE/V1.2/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
<import ref="https://xid.location.studio/HPE/V1.2/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
<import ref="https://xid.location.studio/Tensor/V1.0.0/ApiBase.xid.xml" local="piBase.xid.xml" />
<import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" />
<namespace name="SLAM">
......
ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml
......@@ -9,8 +9,7 @@
<comment>This file defines the SLAM tile definitions and related data types.</comment>
<!-- Include all known definitions -->
<import ref="https://xid.location.studio/HPE/V1.2/HpeCore.xid.xml" local="HpeCore.xid.xml" />
<import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml" local="SLAM/Commondefs.xid.xml" />
<import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml" local="SLAM/CommonDefs.xid.xml" />
<namespace name="SLAM">
......@@ -297,7 +296,7 @@
<comment>Identifies the floor number</comment>
</elem>
<elem name="validStatus" type="RefPointValidStatus" multiplicity="1" >
<elem name="useStatus" type="RefPointUseStatus" multiplicity="1" >
<comment>Identifies the status of the validity</comment>
</elem>
......
ILP/SLAM/V1.0.0_alpha/TileManagementApi.xid.xml
......@@ -9,7 +9,7 @@
<comment>This file defines the SLAM tile management API.</comment>
<!-- Include all known definitions -->
<import ref="https://xid.location.studio/Tensor/V1.0.0/ApiBase.xid.xml" local="ApiBase.xid.xml" />
<import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/ReferenceData.xid.xml" local="SLAM/ReferenceData.xid.xml" />
<import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" />
......
ILP/SLAM/V1.0.0_alpha/TileServiceApi.xid.xml
......@@ -12,6 +12,7 @@
<import ref="https://xid.location.studio/HPE/V1.2/HpeGnss.xid.xml" local="HpeGnss.xid.xml" />
<import ref="https://xid.location.studio/HPE/V1.2/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
<import ref="https://xid.location.studio/HPE/V1.2/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
<import ref="https://xid.location.studio/Tensor/V1.0.0/ApiBase.xid.xml" local="ApiBase.xid.xml" />
<import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" />
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!