Skip to content

xid / specs

Go to a project
Toggle navigation
Toggle navigation pinning
9866895f by Skip Hines
Options

ILP-53 : Update SLAM defs to use ApiBase

1 parent e8da1e91
Inline Side-by-side
Showing 6 changed files with 29 additions and 47 deletions
ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
9 <comment>This file defines commonly used structures and enumerations used throughout the SLAM system.</comment> 9 <comment>This file defines commonly used structures and enumerations used throughout the SLAM system.</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/HPE/V1.2/HpeCore.xid.xml" local="HpeCore.xid.xml" />
13 <import ref="https://xid.location.studio/HPE/V1.1.1/HpeCore.xid.xml" local="HpeCore.xid.xml" />
14 13
15 <namespace name="SLAM"> 14 <namespace name="SLAM">
16 15
......
ILP/SLAM/V1.0.0_alpha/ReferenceData.xid.xml
...@@ -9,11 +9,9 @@ ...@@ -9,11 +9,9 @@
9 <comment>This file defines the SLAM tile refeence definitions and related data types.</comment> 9 <comment>This file defines the SLAM tile refeence definitions and related data 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/HPE/V1.2/HpeGnss.xid.xml" local="HpeGnss.xid.xml" />
13 <import ref="https://xid.location.studio/HPE/V1.1.1/HpeCore.xid.xml" local="HpeCore.xid.xml" /> 13 <import ref="https://xid.location.studio/HPE/V1.2/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
14 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeGnss.xid.xml" local="HpeGnss.xid.xml" /> 14 <import ref="https://xid.location.studio/HPE/V1.2/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
15 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
16 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
17 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml" local="SLAM/Commondefs.xid.xml" /> 15 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml" local="SLAM/Commondefs.xid.xml" />
18 16
19 <namespace name="SLAM"> 17 <namespace name="SLAM">
...@@ -120,7 +118,7 @@ ...@@ -120,7 +118,7 @@
120 <elem name="ssid" type="HPE.WiFi.SSID" multiplicity="1"> 118 <elem name="ssid" type="HPE.WiFi.SSID" multiplicity="1">
121 <comment>ssid of the access point</comment> 119 <comment>ssid of the access point</comment>
122 </elem> 120 </elem>
123 <elem name ="macaddr" type="MacAddress48" multiplicity="1"> 121 <elem name ="macaddr" type="mac48" multiplicity="1">
124 <comment>the mac address of the access point</comment> 122 <comment>the mac address of the access point</comment>
125 </elem> 123 </elem>
126 124
...@@ -131,7 +129,7 @@ ...@@ -131,7 +129,7 @@
131 <elem name="ssid" type="Tensor.string" multiplicity="1"> 129 <elem name="ssid" type="Tensor.string" multiplicity="1">
132 <comment>ssid of the access point</comment> 130 <comment>ssid of the access point</comment>
133 </elem> 131 </elem>
134 <elem name ="macaddr" type="Tensor.string" multiplicity="1"> 132 <elem name ="macaddr" type="mac48" multiplicity="1">
135 <comment>the mac address of the access point</comment> 133 <comment>the mac address of the access point</comment>
136 </elem> 134 </elem>
137 135
......
ILP/SLAM/V1.0.0_alpha/SurveyApi.xid.xml
...@@ -12,13 +12,9 @@ ...@@ -12,13 +12,9 @@
12 </comment> 12 </comment>
13 13
14 <!-- Include all known definitions --> 14 <!-- Include all known definitions -->
15 <import ref="https://xid.location.studio/Tensor/V1.0.0/Definitions.xid.xml" local="Definitions.xid.xml" /> 15 <import ref="https://xid.location.studio/HPE/V1.2/HpeGnss.xid.xml" local="HpeGnss.xid.xml" />
16 <import ref="https://xid.location.studio/HPE/V1.1.1/HpeCore.xid.xml" local="HpeCore.xid.xml" /> 16 <import ref="https://xid.location.studio/HPE/V1.2/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
17 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeGnss.xid.xml" local="HpeGnss.xid.xml" /> 17 <import ref="https://xid.location.studio/HPE/V1.2/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
18 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
19 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
20 <import ref="https://xid.location.studio/ILP/V1.1.1/ApiBase.xid.xml" local="SLAM/ApiBase.xid.xml" />
21 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml" local="SLAM/Commondefs.xid.xml" />
22 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" /> 18 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" />
23 19
24 <namespace name="SLAM"> 20 <namespace name="SLAM">
...@@ -37,10 +33,10 @@ ...@@ -37,10 +33,10 @@
37 <comment> 33 <comment>
38 Interaction submits survey data and outputs submission result and UUID. 34 Interaction submits survey data and outputs submission result and UUID.
39 </comment> 35 </comment>
40 <input name="input" type="ILP.InputBase" sid="0x1030"> 36 <input name="input" type="Tensor.InputBase" sid="0x1030">
41 <elem name="survey" multiplicity="1" type="SurveyData"></elem> 37 <elem name="survey" multiplicity="1" type="SurveyData"></elem>
42 </input> 38 </input>
43 <output name="output" type="ILP.OutputBase" sid="0x1031"> 39 <output name="output" type="Tensor.OutputBase" sid="0x1031">
44 <comment>Survey submission output returns status and UUID of the submitted survey.</comment> 40 <comment>Survey submission output returns status and UUID of the submitted survey.</comment>
45 <elem name="id" multiplicity="1" type="Tensor.UUID"/> 41 <elem name="id" multiplicity="1" type="Tensor.UUID"/>
46 </output> 42 </output>
...@@ -48,7 +44,7 @@ ...@@ -48,7 +44,7 @@
48 44
49 <operation name="Download"> 45 <operation name="Download">
50 <comment>Downloads survey data given id.</comment> 46 <comment>Downloads survey data given id.</comment>
51 <input name="input" type="ILP.InputBase" sid="0x1032"> 47 <input name="input" type="Tensor.InputBase" sid="0x1032">
52 <elem name="id" multiplicity="1" type="Tensor.UUID"> 48 <elem name="id" multiplicity="1" type="Tensor.UUID">
53 <comment>UUID of Survey set.</comment> 49 <comment>UUID of Survey set.</comment>
54 </elem> 50 </elem>
...@@ -56,7 +52,7 @@ ...@@ -56,7 +52,7 @@
56 <comment>Survey part id of interest. Default value is -1, which will return </comment> 52 <comment>Survey part id of interest. Default value is -1, which will return </comment>
57 </elem> 53 </elem>
58 </input> 54 </input>
59 <output name="output" type="ILP.OutputBase" sid="0x1033"> 55 <output name="output" type="Tensor.OutputBase" sid="0x1033">
60 <comment>Survey download output data structure contains a zero or more surveys.</comment> 56 <comment>Survey download output data structure contains a zero or more surveys.</comment>
61 <elem name="surveys" multiplicity="0..*" type="SurveyData"></elem> 57 <elem name="surveys" multiplicity="0..*" type="SurveyData"></elem>
62 </output> 58 </output>
......
ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
9 <comment>This file defines the SLAM tile definitions and related data types.</comment> 9 <comment>This file defines the SLAM tile definitions and related data 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/HPE/V1.2/HpeCore.xid.xml" local="HpeCore.xid.xml" />
13 <import ref="https://xid.location.studio/HPE/V1.1.1/HpeCore.xid.xml" local="HpeCore.xid.xml" />
14 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml" local="SLAM/Commondefs.xid.xml" /> 13 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml" local="SLAM/Commondefs.xid.xml" />
15 14
16 <namespace name="SLAM"> 15 <namespace name="SLAM">
......
ILP/SLAM/V1.0.0_alpha/TileManagementApi.xid.xml
...@@ -9,13 +9,7 @@ ...@@ -9,13 +9,7 @@
9 <comment>This file defines the SLAM tile management API.</comment> 9 <comment>This file defines the SLAM tile management API.</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
13 <import ref="https://xid.location.studio/HPE/V1.1.1/HpeCore.xid.xml" local="HpeCore.xid.xml" />
14 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeGnss.xid.xml" local="HpeGnss.xid.xml" />
15 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
16 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
17 <import ref="https://xid.location.studio/ILP/V1.1.1/ApiBase.xid.xml" local="SLAM/ApiBase.xid.xml" />
18 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml" local="SLAM/Commondefs.xid.xml" />
19 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/ReferenceData.xid.xml" local="SLAM/ReferenceData.xid.xml" /> 13 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/ReferenceData.xid.xml" local="SLAM/ReferenceData.xid.xml" />
20 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" /> 14 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" />
21 15
...@@ -35,7 +29,7 @@ ...@@ -35,7 +29,7 @@
35 <comment> 29 <comment>
36 Interaction to delete a tile. 30 Interaction to delete a tile.
37 </comment> 31 </comment>
38 <input name="input" type="ILP.InputBase" sid="0x101b"> 32 <input name="input" type="Tensor.InputBase" sid="0x101b">
39 <comment>defines the input data for DeleteTile operation</comment> 33 <comment>defines the input data for DeleteTile operation</comment>
40 <elem name="tileid" type="Tensor.UUID" multiplicity="1" > 34 <elem name="tileid" type="Tensor.UUID" multiplicity="1" >
41 <comment>element specifies UUID of the the tile</comment> 35 <comment>element specifies UUID of the the tile</comment>
...@@ -46,7 +40,7 @@ ...@@ -46,7 +40,7 @@
46 <operation name="UploadTile"> 40 <operation name="UploadTile">
47 41
48 <comment>interation to upload a tile</comment> 42 <comment>interation to upload a tile</comment>
49 <input name="input" type="ILP.InputBase" sid="0x102b"> 43 <input name="input" type="Tensor.InputBase" sid="0x102b">
50 <comment>defines the input data structure for UploadTile operation</comment> 44 <comment>defines the input data structure for UploadTile operation</comment>
51 <elem name="tile" type="Tile" multiplicity="1"> 45 <elem name="tile" type="Tile" multiplicity="1">
52 <comment>the tile structure</comment> 46 <comment>the tile structure</comment>
...@@ -57,7 +51,7 @@ ...@@ -57,7 +51,7 @@
57 <operation name="UpdateTile"> 51 <operation name="UpdateTile">
58 52
59 <comment>interation to update a tile</comment> 53 <comment>interation to update a tile</comment>
60 <input name="input" type="ILP.InputBase" sid="0x103b"> 54 <input name="input" type="Tensor.InputBase" sid="0x103b">
61 <comment>defines the input data structure for UpdateTile operation</comment> 55 <comment>defines the input data structure for UpdateTile operation</comment>
62 <elem name="tile" type="Tile" multiplicity="1"> 56 <elem name="tile" type="Tile" multiplicity="1">
63 <comment>the tile structure</comment> 57 <comment>the tile structure</comment>
......
ILP/SLAM/V1.0.0_alpha/TileServiceApi.xid.xml
...@@ -9,13 +9,9 @@ ...@@ -9,13 +9,9 @@
9 <comment>This file defines the SLAM tile services API.</comment> 9 <comment>This file defines the SLAM tile services API.</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/HPE/V1.2/HpeGnss.xid.xml" local="HpeGnss.xid.xml" />
13 <import ref="https://xid.location.studio/HPE/V1.1.1/HpeCore.xid.xml" local="HpeCore.xid.xml" /> 13 <import ref="https://xid.location.studio/HPE/V1.2/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
14 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeGnss.xid.xml" local="HpeGnss.xid.xml" /> 14 <import ref="https://xid.location.studio/HPE/V1.2/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
15 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeCellular.xid.xml" local="HpeCellular.xid.xml" />
16 <import ref="https://xid.location.studio/HPE/CommonDefs/V1.1.1/HpeWiFi.xid.xml" local="HpeWiFi.xid.xml" />
17 <import ref="https://xid.location.studio/ILP/V1.1.1/ApiBase.xid.xml" local="SLAM/ApiBase.xid.xml" />
18 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/CommonDefs.xid.xml" local="SLAM/Commondefs.xid.xml" />
19 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" /> 15 <import ref="https://xid.location.studio/ILP/SLAM/V1.0.0_alpha/TileDefinitions.xid.xml" local="SLAM/TileDefinitions.xid.xml" />
20 16
21 17
...@@ -29,14 +25,14 @@ ...@@ -29,14 +25,14 @@
29 <!-- DownloadTile operation--> 25 <!-- DownloadTile operation-->
30 <operation name="DownloadTile"> 26 <operation name="DownloadTile">
31 <comment>Interaction download a tile</comment> 27 <comment>Interaction download a tile</comment>
32 <input name="input" type="ILP.InputBase" sid="0x101a"> 28 <input name="input" type="Tensor.InputBase" sid="0x101a">
33 <comment>defines the input data structure for DownloadTile operation </comment> 29 <comment>defines the input data structure for DownloadTile operation </comment>
34 <elem name="tileid" type="Tensor.UUID" multiplicity="1" > 30 <elem name="tileid" type="Tensor.UUID" multiplicity="1" >
35 <comment>element specifies UUID of the the tile</comment> 31 <comment>element specifies UUID of the the tile</comment>
36 </elem> 32 </elem>
37 </input> 33 </input>
38 34
39 <output name="output" type="ILP.OutputBase" sid="0x102a"> 35 <output name="output" type="Tensor.OutputBase" sid="0x102a">
40 <comment>defines the output data for DownloadTile operation</comment> 36 <comment>defines the output data for DownloadTile operation</comment>
41 <elem name="tile" type="Tile" multiplicity="0..1" > 37 <elem name="tile" type="Tile" multiplicity="0..1" >
42 <comment>element defines the downloaded tile</comment> 38 <comment>element defines the downloaded tile</comment>
...@@ -48,7 +44,7 @@ ...@@ -48,7 +44,7 @@
48 <!-- FindTilesByBoundingbox operation --> 44 <!-- FindTilesByBoundingbox operation -->
49 <operation name="FindTilesByBoundingbox"> 45 <operation name="FindTilesByBoundingbox">
50 <comment>find tiles</comment> 46 <comment>find tiles</comment>
51 <input name="input" type="ILP.InputBase" sid="0x103a"> 47 <input name="input" type="Tensor.InputBase" sid="0x103a">
52 <comment>defines the input data for FindTilesByBoundingbox operation </comment> 48 <comment>defines the input data for FindTilesByBoundingbox operation </comment>
53 <elem name="bounding" type="BoundingBox" multiplicity="1"> 49 <elem name="bounding" type="BoundingBox" multiplicity="1">
54 <comment>the bounding box that intersect with tiles</comment> 50 <comment>the bounding box that intersect with tiles</comment>
...@@ -58,7 +54,7 @@ ...@@ -58,7 +54,7 @@
58 </elem> 54 </elem>
59 </input> 55 </input>
60 56
61 <output name="output" type="ILP.OutputBase" sid="0x104a"> 57 <output name="output" type="Tensor.OutputBase" sid="0x104a">
62 <comment>defines the output data for FindTilesByBoundingbox operation</comment> 58 <comment>defines the output data for FindTilesByBoundingbox operation</comment>
63 <elem name="tiles" type="TileSet" multiplicity="0..1"> 59 <elem name="tiles" type="TileSet" multiplicity="0..1">
64 <comment>a set of tiles as the result of the FindTilesByPos operation</comment> 60 <comment>a set of tiles as the result of the FindTilesByPos operation</comment>
...@@ -69,7 +65,7 @@ ...@@ -69,7 +65,7 @@
69 <!-- FindTilesByRefId operation --> 65 <!-- FindTilesByRefId operation -->
70 <operation name="FindTilesByRefId"> 66 <operation name="FindTilesByRefId">
71 <comment>find tiles</comment> 67 <comment>find tiles</comment>
72 <input name="input" type="ILP.InputBase" sid="0x103a"> 68 <input name="input" type="Tensor.InputBase" sid="0x103a">
73 <comment>defines the input data for FindTilesByRefId operation </comment> 69 <comment>defines the input data for FindTilesByRefId operation </comment>
74 <elem name="refids" type="Tensor.string" multiplicity="1..*"> 70 <elem name="refids" type="Tensor.string" multiplicity="1..*">
75 <comment>the bounding box that intersect with tiles</comment> 71 <comment>the bounding box that intersect with tiles</comment>
...@@ -82,7 +78,7 @@ ...@@ -82,7 +78,7 @@
82 </elem> 78 </elem>
83 </input> 79 </input>
84 80
85 <output name="output" type="ILP.OutputBase" sid="0x104a"> 81 <output name="output" type="Tensor.OutputBase" sid="0x104a">
86 <comment>defines the output data for FindTilesByRefId operation</comment> 82 <comment>defines the output data for FindTilesByRefId operation</comment>
87 <elem name="tiles" type="TileSet" multiplicity="0..1"> 83 <elem name="tiles" type="TileSet" multiplicity="0..1">
88 <comment>a set of tiles as the result of the FindTilesByPos operation</comment> 84 <comment>a set of tiles as the result of the FindTilesByPos operation</comment>
...@@ -93,14 +89,14 @@ ...@@ -93,14 +89,14 @@
93 <!-- EstimatePosition operation --> 89 <!-- EstimatePosition operation -->
94 <operation name="EstimatePosition"> 90 <operation name="EstimatePosition">
95 <comment> estimate posiion from a set of Wifi rssi observations</comment> 91 <comment> estimate posiion from a set of Wifi rssi observations</comment>
96 <input name="input" type="ILP.InputBase" sid="0x106a"> 92 <input name="input" type="Tensor.InputBase" sid="0x106a">
97 <comment>input for EstimatePosition operation</comment> 93 <comment>input for EstimatePosition operation</comment>
98 <elem name="observations" type="ObservationSet" multiplicity="1"> 94 <elem name="observations" type="ObservationSet" multiplicity="1">
99 <comment>a set of observed rssi values</comment> 95 <comment>a set of observed rssi values</comment>
100 </elem> 96 </elem>
101 </input> 97 </input>
102 98
103 <output name="output" type="ILP.OutputBase" sid="0x107a"> 99 <output name="output" type="Tensor.OutputBase" sid="0x107a">
104 <comment>output for EstimatePosition operation</comment> 100 <comment>output for EstimatePosition operation</comment>
105 <elem name="pos" type="Shape" multiplicity="0..*" polymorphic="true"> 101 <elem name="pos" type="Shape" multiplicity="0..*" polymorphic="true">
106 <comment>approximate position of the tile</comment> 102 <comment>approximate position of the tile</comment>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!