edfca686 by Michael B. Mathews

Updated CG build issues

1 parent 2e0d1961
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <!-- Include all known definitions --> 13 <!-- Include all known definitions -->
14 <import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" /> 14 <import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" />
15 <import ref="https://xid.location.studio/Tensor/V1.0.0/ApiBase.xid.xml" /> 15 <import ref="https://xid.location.studio/Tensor/V1.0.0/ApiBase.xid.xml" />
16 <import ref="http://xid.location.studio/GeoSpatial/V1.0/Location.xid.xml" local="Location.xid.xml" /> 16 <import ref="https://xid.location.studio/GeoSpatial/V1.0/Location.xid.xml" local="Location.xid.xml" />
17 17
18 <namespace name="GeoSpatial"> 18 <namespace name="GeoSpatial">
19 <using namespace="Tensor"/> 19 <using namespace="Tensor"/>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 <struct name="Event"> 35 <struct name="Event">
36 <comment>Structure contains information about an event occurring at the specified event producer (uriProducer).</comment> 36 <comment>Structure contains information about an event occurring at the specified event producer (uriProducer).</comment>
37 37
38 <struct name="SpeedInfo" packed="true"> 38 <struct name="SpeedInfo" pack="true">
39 <comment>Structure contains speed information of the object.</comment> 39 <comment>Structure contains speed information of the object.</comment>
40 <elem name="horizontal" type="float32" multiplicity="1" ord ="1"> 40 <elem name="horizontal" type="float32" multiplicity="1" ord ="1">
41 <tag name="unit" value="meters/sec"/> 41 <tag name="unit" value="meters/sec"/>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <title>GeoFence Definition</title> 8 <title>GeoFence Definition</title>
9 9
10 <!-- Include all known definitions --> 10 <!-- Include all known definitions -->
11 <import ref="http://xid.location.studio/Tensor/V1.0.0/GeoObject.xid.xml" local="GeoObject.xid.xml" /> 11 <import ref="https://xid.location.studio/Tensor/V1.0.0/GeoObject.xid.xml" local="GeoObject.xid.xml" />
12 12
13 <namespace name="GeoSpatial"> 13 <namespace name="GeoSpatial">
14 <using namespace="Tensor"/> 14 <using namespace="Tensor"/>
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
9 <comment>This file defines commonly used structures and enumerations used throughout the GeoTracker system.</comment> 9 <comment>This file defines commonly used structures and enumerations used throughout the GeoTracker system.</comment>
10 10
11 <!-- Include all known definitions --> 11 <!-- Include all known definitions -->
12 <import ref="http://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" /> 12 <import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" />
13 <import ref="http://xid.location.studio/GeoSpatial/V1.0/SpatialDefs.xid.xml" local="SpatialDefs.xid.xml" /> 13 <import ref="https://xid.location.studio/GeoSpatial/V1.0/SpatialDefs.xid.xml" local="SpatialDefs.xid.xml" />
14 <import ref="http://xid.location.studio/GeoSpatial/V1.0/Address.xid.xml" local="Address.xid.xml" /> 14 <import ref="https://xid.location.studio/GeoSpatial/V1.0/Address.xid.xml" local="Address.xid.xml" />
15 <import ref="http://xid.location.studio/GeoSpatial/V1.0/Shape.xid.xml" local="Shape.xid.xml" /> 15 <import ref="https://xid.location.studio/GeoSpatial/V1.0/Shape.xid.xml" local="Shape.xid.xml" />
16 16
17 17
18 <namespace name="GeoSpatial"> 18 <namespace name="GeoSpatial">
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
8 <title>GeoSpatial Location Definition </title> 8 <title>GeoSpatial Location Definition </title>
9 9
10 <!-- Include all known definitions --> 10 <!-- Include all known definitions -->
11 <import ref="http://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" /> 11 <import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" />
12 <import ref="http://xid.location.studio/GeoSpatial/V1.0/SpatialDefs.xid.xml" local="SpatialDefs.xid.xml" /> 12 <import ref="https://xid.location.studio/GeoSpatial/V1.0/SpatialDefs.xid.xml" local="SpatialDefs.xid.xml" />
13 <import ref="http://xid.location.studio/GeoSpatial/V1.0/Address.xid.xml" local="Address.xid.xml" /> 13 <import ref="https://xid.location.studio/GeoSpatial/V1.0/Address.xid.xml" local="Address.xid.xml" />
14 <import ref="http://xid.location.studio/GeoSpatial/V1.0/Shape.xid.xml" local="Shape.xid.xml" /> 14 <import ref="https://xid.location.studio/GeoSpatial/V1.0/Shape.xid.xml" local="Shape.xid.xml" />
15 15
16 <namespace name="GeoSpatial"> 16 <namespace name="GeoSpatial">
17 <using namespace="Tensor"/> 17 <using namespace="Tensor"/>
......
...@@ -5,16 +5,16 @@ ...@@ -5,16 +5,16 @@
5 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 5 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6 xsi:schemaLocation="https://xid.location.studio/schema/V1.0.0/XtensibleInterfaceDefinition.xsd XtensibleInterfaceDefinition.xsd" 6 xsi:schemaLocation="https://xid.location.studio/schema/V1.0.0/XtensibleInterfaceDefinition.xsd XtensibleInterfaceDefinition.xsd"
7 identity="SpatialDefs.xid.xml"> 7 identity="SpatialDefs.xid.xml">
8 <title>GEO Spatial Definitions</title> 8 <title>GEO Spatial Definitions</title>
9 <comment>Definition defines common geo-spatial types..</comment> 9 <comment>Definition defines common geo-spatial types..</comment>
10 10
11 <!-- Include all known definitions --> 11 <!-- Include all known definitions -->
12 <import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" /> 12 <import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" />
13 13
14 14
15 <namespace name="GeoSpatial"> 15 <namespace name="GeoSpatial">
16 <using namespace="Tensor"/> 16 <using namespace="Tensor"/>
17 17
18 <!-- 18 <!--
19 ************************************* 19 *************************************
20 * Enumerations 20 * Enumerations
...@@ -29,6 +29,14 @@ ...@@ -29,6 +29,14 @@
29 <literal name="LocalXYZ" value="3" /> 29 <literal name="LocalXYZ" value="3" />
30 </enum> 30 </enum>
31 31
32 <enum name="ObjectType" type="Tensor.int8" default="Object">
33 <comment>Enumeration defines the supported Object types.</comment>
34 <literal name="Object" value="0"></literal>
35 <literal name="GeoObject" value="1"></literal>
36 <literal name="Location" value="2"></literal>
37 <literal name="EventInfo" value="3"></literal>
38 <literal name="Producer" value="4"></literal>
39 </enum>
32 40
33 <!-- 41 <!--
34 ************************************* 42 *************************************
...@@ -85,19 +93,6 @@ ...@@ -85,19 +93,6 @@
85 </elem> 93 </elem>
86 </struct> 94 </struct>
87 95
88 *************************************
89 * Enumerations
90 *************************************
91 -->
92 <enum name="ObjectType" type="Tensor.int8" default="Object">
93 <comment>Enumeration defines the supported Object types.</comment>
94 <literal name="Object" value="0"></literal>
95 <literal name="GeoObject" value="1"></literal>
96 <literal name="Location" value="2"></literal>
97 <literal name="EventInfo" value="3"></literal>
98 <literal name="Producer" value="4"></literal>
99 </enum>
100
101 <!-- 96 <!--
102 ************************************* 97 *************************************
103 * Object Definition. 98 * Object Definition.
...@@ -114,7 +109,7 @@ ...@@ -114,7 +109,7 @@
114 <elem name="uuid" type="Tensor.UUID" multiplicity="1" ord="2"> 109 <elem name="uuid" type="Tensor.UUID" multiplicity="1" ord="2">
115 <comment>Unique identifier for this object.</comment> 110 <comment>Unique identifier for this object.</comment>
116 </elem> 111 </elem>
117 112
118 <elem name="uriExternal" type="Tensor.Uri" multiplicity="0..1" ord="3"> 113 <elem name="uriExternal" type="Tensor.Uri" multiplicity="0..1" ord="3">
119 <comment>Optional external identifier for this object.</comment> 114 <comment>Optional external identifier for this object.</comment>
120 </elem> 115 </elem>
...@@ -134,7 +129,7 @@ ...@@ -134,7 +129,7 @@
134 <elem name="data" type="Tensor.JSON" multiplicity="0..1" ord="7"> 129 <elem name="data" type="Tensor.JSON" multiplicity="0..1" ord="7">
135 <comment>Optional JSON data associated with this object.</comment> 130 <comment>Optional JSON data associated with this object.</comment>
136 </elem> 131 </elem>
137 </struct> 132 </struct>
138 133
139 </namespace> 134 </namespace>
140 </specification> 135 </specification>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!