Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
Front-end app
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IPos-public
Front-end app
Commits
ef7468a6
Commit
ef7468a6
authored
3 years ago
by
Oleksandr Husak
Browse files
Options
Downloads
Patches
Plain Diff
agent properties in the popup
parent
35080dd3
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+35
-29
35 additions, 29 deletions
README.md
src/app/components/map/map.component.ts
+18
-6
18 additions, 6 deletions
src/app/components/map/map.component.ts
src/app/model/base-model.ts
+7
-2
7 additions, 2 deletions
src/app/model/base-model.ts
with
60 additions
and
37 deletions
README.md
+
35
−
29
View file @
ef7468a6
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
-
Public MQTT broker and client from
[
hivemq
](
https://www.hivemq.com/public-mqtt-broker/
)
. MQTT client with a standart settings.
-
Public MQTT broker and client from
[
hivemq
](
https://www.hivemq.com/public-mqtt-broker/
)
. MQTT client with a standart settings.
-
`ipos/client/position`
: relative position of an agent to a curent root point
-
`ipos/client/position`
: relative position of an agent to a curent root point
-
`ipos/client/root`
: update a root point. Default is
`{"latitude": 51.02545, "longitude": 13.72295}`
.
-
`ipos/client/root`
: update a root point. Default is
`{"latitude": 51.02545, "longitude": 13.72295}`
.
-
`ipos/client/extracted`
extracted attributes. Related with VDA5050
-
Messages description:
[
SimpleSceneIntegration Interface
](
https://md.inf.tu-dresden.de/IPos_IFSimpleSceneIntegration
)
.
-
Messages description:
[
SimpleSceneIntegration Interface
](
https://md.inf.tu-dresden.de/IPos_IFSimpleSceneIntegration
)
.
### Online app
### Online app
...
@@ -40,9 +41,9 @@ Connection settings
...
@@ -40,9 +41,9 @@ Connection settings
"position": {
"position": {
"refSystemId": "ROOT",
"refSystemId": "ROOT",
"point": {
"point": {
"x":
3
,
"x":
28
,
"y": 2,
"y":
-1
2,
"z":
3
"z":
20
},
},
"accuracy": 1
"accuracy": 1
},
},
...
@@ -52,6 +53,11 @@ Connection settings
...
@@ -52,6 +53,11 @@ Connection settings
"z": 1,
"z": 1,
"w": 1.5
"w": 1.5
},
},
"extractedAttributes": {
"batteryChargeLevel": 70,
"loadedItems": [23, 1, 25, 17],
"errors": [2, 1, 6]
},
"lastPosUpdate": "2021-09-14T09:41:20+00:00",
"lastPosUpdate": "2021-09-14T09:41:20+00:00",
"zoneDescriptors": [
"zoneDescriptors": [
{
{
...
...
This diff is collapsed.
Click to expand it.
src/app/components/map/map.component.ts
+
18
−
6
View file @
ef7468a6
...
@@ -66,10 +66,22 @@ export class MapComponent implements OnInit {
...
@@ -66,10 +66,22 @@ export class MapComponent implements OnInit {
// --- Info
// --- Info
let
pos
=
desc
[
"
position
"
]
let
pos
=
desc
[
"
position
"
]
this
.
agentsInfo
[
key
]
=
desc
this
.
agentsInfo
[
key
]
=
desc
this
.
addMarker
(
key
,
pos
)
var
props
=
undefined
if
(
desc
.
extractedAttributes
)
{
props
=
`<p> \
<h3>
${
key
}
</h3>
<strong>Charge</strong>:
${
desc
.
extractedAttributes
.
batteryChargeLevel
}
% <br>\
<strong>Items</strong>:
${
desc
.
extractedAttributes
.
loadedItems
}
\
</p>`
}
else
{
props
=
`<p><h3>
${
key
}
</h3></p>`
}
this
.
addMarker
(
key
,
pos
,
props
)
}
}
addMarker
(
key
:
string
,
pos
:
Position
)
{
addMarker
(
key
:
string
,
pos
:
Position
,
popup
:
string
)
{
let
point
=
pos
.
point
let
point
=
pos
.
point
if
(
'
x
'
in
point
)
{
if
(
'
x
'
in
point
)
{
...
@@ -94,7 +106,7 @@ export class MapComponent implements OnInit {
...
@@ -94,7 +106,7 @@ export class MapComponent implements OnInit {
shadowUrl
:
'
assets/marker-shadow.png
'
,
shadowUrl
:
'
assets/marker-shadow.png
'
,
className
:
'
true-position-marker
'
className
:
'
true-position-marker
'
})
})
}).
bindPopup
(
key
).
openPopup
();
}).
bindPopup
(
popup
).
openPopup
();
marker
.
addTo
(
this
.
markOverlays
[
key
])
marker
.
addTo
(
this
.
markOverlays
[
key
])
// --- Accuracy
// --- Accuracy
...
...
This diff is collapsed.
Click to expand it.
src/app/model/base-model.ts
+
7
−
2
View file @
ef7468a6
...
@@ -13,6 +13,7 @@ export interface Object {
...
@@ -13,6 +13,7 @@ export interface Object {
orientation
?:
Orientation
orientation
?:
Orientation
lastPosUpdate
:
string
lastPosUpdate
:
string
zoneDescriptors
:
ZoneDesc
[]
zoneDescriptors
:
ZoneDesc
[]
extractedAttributes
?:
ExtAttribute
}
}
export
interface
Position
{
export
interface
Position
{
...
@@ -62,6 +63,10 @@ enum SensorType {
...
@@ -62,6 +63,10 @@ enum SensorType {
"
Bluetooth
"
,
"
Bluetooth
"
,
"
WiFi
"
"
WiFi
"
}
}
interface
ExtAttribute
{
batteryChargeLevel
:
number
loadedItems
:
number
[]
errors
:
number
[]
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment