edfca686 by Michael B. Mathews

Updated CG build issues

1 parent 2e0d1961
......@@ -13,7 +13,7 @@
<!-- Include all known definitions -->
<import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" />
<import ref="https://xid.location.studio/Tensor/V1.0.0/ApiBase.xid.xml" />
<import ref="http://xid.location.studio/GeoSpatial/V1.0/Location.xid.xml" local="Location.xid.xml" />
<import ref="https://xid.location.studio/GeoSpatial/V1.0/Location.xid.xml" local="Location.xid.xml" />
<namespace name="GeoSpatial">
<using namespace="Tensor"/>
......@@ -35,7 +35,7 @@
<struct name="Event">
<comment>Structure contains information about an event occurring at the specified event producer (uriProducer).</comment>
<struct name="SpeedInfo" packed="true">
<struct name="SpeedInfo" pack="true">
<comment>Structure contains speed information of the object.</comment>
<elem name="horizontal" type="float32" multiplicity="1" ord ="1">
<tag name="unit" value="meters/sec"/>
......
......@@ -8,7 +8,7 @@
<title>GeoFence Definition</title>
<!-- Include all known definitions -->
<import ref="http://xid.location.studio/Tensor/V1.0.0/GeoObject.xid.xml" local="GeoObject.xid.xml" />
<import ref="https://xid.location.studio/Tensor/V1.0.0/GeoObject.xid.xml" local="GeoObject.xid.xml" />
<namespace name="GeoSpatial">
<using namespace="Tensor"/>
......
......@@ -9,10 +9,10 @@
<comment>This file defines commonly used structures and enumerations used throughout the GeoTracker system.</comment>
<!-- Include all known definitions -->
<import ref="http://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" />
<import ref="http://xid.location.studio/GeoSpatial/V1.0/SpatialDefs.xid.xml" local="SpatialDefs.xid.xml" />
<import ref="http://xid.location.studio/GeoSpatial/V1.0/Address.xid.xml" local="Address.xid.xml" />
<import ref="http://xid.location.studio/GeoSpatial/V1.0/Shape.xid.xml" local="Shape.xid.xml" />
<import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" />
<import ref="https://xid.location.studio/GeoSpatial/V1.0/SpatialDefs.xid.xml" local="SpatialDefs.xid.xml" />
<import ref="https://xid.location.studio/GeoSpatial/V1.0/Address.xid.xml" local="Address.xid.xml" />
<import ref="https://xid.location.studio/GeoSpatial/V1.0/Shape.xid.xml" local="Shape.xid.xml" />
<namespace name="GeoSpatial">
......
......@@ -8,10 +8,10 @@
<title>GeoSpatial Location Definition </title>
<!-- Include all known definitions -->
<import ref="http://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" />
<import ref="http://xid.location.studio/GeoSpatial/V1.0/SpatialDefs.xid.xml" local="SpatialDefs.xid.xml" />
<import ref="http://xid.location.studio/GeoSpatial/V1.0/Address.xid.xml" local="Address.xid.xml" />
<import ref="http://xid.location.studio/GeoSpatial/V1.0/Shape.xid.xml" local="Shape.xid.xml" />
<import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" />
<import ref="https://xid.location.studio/GeoSpatial/V1.0/SpatialDefs.xid.xml" local="SpatialDefs.xid.xml" />
<import ref="https://xid.location.studio/GeoSpatial/V1.0/Address.xid.xml" local="Address.xid.xml" />
<import ref="https://xid.location.studio/GeoSpatial/V1.0/Shape.xid.xml" local="Shape.xid.xml" />
<namespace name="GeoSpatial">
<using namespace="Tensor"/>
......
......@@ -29,6 +29,14 @@
<literal name="LocalXYZ" value="3" />
</enum>
<enum name="ObjectType" type="Tensor.int8" default="Object">
<comment>Enumeration defines the supported Object types.</comment>
<literal name="Object" value="0"></literal>
<literal name="GeoObject" value="1"></literal>
<literal name="Location" value="2"></literal>
<literal name="EventInfo" value="3"></literal>
<literal name="Producer" value="4"></literal>
</enum>
<!--
*************************************
......@@ -85,19 +93,6 @@
</elem>
</struct>
*************************************
* Enumerations
*************************************
-->
<enum name="ObjectType" type="Tensor.int8" default="Object">
<comment>Enumeration defines the supported Object types.</comment>
<literal name="Object" value="0"></literal>
<literal name="GeoObject" value="1"></literal>
<literal name="Location" value="2"></literal>
<literal name="EventInfo" value="3"></literal>
<literal name="Producer" value="4"></literal>
</enum>
<!--
*************************************
* Object Definition.
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!