Skip to content

Commit 3ae0fd7

Browse files
akhenryakhenry
authored
Merge pull request nasa#1388 from nasa/open1386
[Config] Fixes for example/msl
2 parents 4f24c46 + df7d59b commit 3ae0fd7

File tree

1 file changed

+71
-66
lines changed

1 file changed

+71
-66
lines changed

‎example/msl/bundle.js

Lines changed: 71 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -37,74 +37,79 @@ define([
3737
legacyRegistry.register("example/msl", {
3838
"name" : "Mars Science Laboratory Data Adapter",
3939
"extensions" : {
40-
"types": [
41-
{
42-
"name":"Mars Science Laboratory",
43-
"key": "msl.curiosity",
44-
"cssclass": "icon-object"
45-
},
46-
{
47-
"name": "Instrument",
48-
"key": "msl.instrument",
49-
"cssclass": "icon-object",
50-
"model": {"composition": []}
51-
},
52-
{
53-
"name": "Measurement",
54-
"key": "msl.measurement",
55-
"cssclass": "icon-telemetry",
56-
"model": {"telemetry": {}},
57-
"telemetry": {
58-
"source": "rems.source",
59-
"domains": [
60-
{
61-
"name": "Time",
62-
"key": "utc",
63-
"format": "utc"
64-
}
65-
]
40+
"types": [
41+
{
42+
"name":"Mars Science Laboratory",
43+
"key": "msl.curiosity",
44+
"cssclass": "icon-object"
45+
},
46+
{
47+
"name": "Instrument",
48+
"key": "msl.instrument",
49+
"cssclass": "icon-object",
50+
"model": {"composition": []}
51+
},
52+
{
53+
"name": "Measurement",
54+
"key": "msl.measurement",
55+
"cssclass": "icon-telemetry",
56+
"model": {"telemetry": {}},
57+
"telemetry": {
58+
"source": "rems.source",
59+
"domains": [
60+
{
61+
"name": "Time",
62+
"key": "utc",
63+
"format": "utc"
64+
}
65+
]
66+
}
6667
}
67-
}
68-
],
69-
"constants": [
70-
{
71-
"key": "REMS_WS_URL",
72-
"value": "/proxyUrl?url=http://cab.inta-csic.es/rems/wp-content/plugins/marsweather-widget/api.php"
73-
}
74-
],
75-
"roots": [
76-
{
77-
"id": "msl:curiosity",
78-
"priority" : "preferred",
79-
"model": {
80-
"type": "msl.curiosity",
81-
"name": "Mars Science Laboratory",
82-
"composition": ["msl_tlm:rems"]
68+
],
69+
"constants": [
70+
{
71+
"key": "REMS_WS_URL",
72+
"value": "/proxyUrl?url=http://cab.inta-csic.es/rems/wp-content/plugins/marsweather-widget/api.php"
8373
}
84-
}
85-
],
86-
"services": [
87-
{
88-
"key":"rems.adapter",
89-
"implementation": RemsTelemetryServerAdapter,
90-
"depends": ["$q", "$http", "$log", "REMS_WS_URL"]
91-
}
92-
],
93-
"components": [
94-
{
95-
"provides": "modelService",
96-
"type": "provider",
97-
"implementation": RemsTelemetryModelProvider,
98-
"depends": ["rems.adapter"]
99-
},
100-
{
101-
"provides": "telemetryService",
102-
"type": "provider",
103-
"implementation": RemsTelemetryProvider,
104-
"depends": ["rems.adapter", "$q"]
105-
}
106-
]
107-
}
74+
],
75+
"roots": [
76+
{
77+
"id": "msl:curiosity"
78+
}
79+
],
80+
"models": [
81+
{
82+
"id": "msl:curiosity",
83+
"priority": "preferred",
84+
"model": {
85+
"type": "msl.curiosity",
86+
"name": "Mars Science Laboratory",
87+
"composition": ["msl_tlm:rems"]
88+
}
89+
}
90+
],
91+
"services": [
92+
{
93+
"key":"rems.adapter",
94+
"implementation": RemsTelemetryServerAdapter,
95+
"depends": ["$q", "$http", "$log", "REMS_WS_URL"]
96+
}
97+
],
98+
"components": [
99+
{
100+
"provides": "modelService",
101+
"type": "provider",
102+
"implementation": RemsTelemetryModelProvider,
103+
"depends": ["rems.adapter"]
104+
},
105+
{
106+
"provides": "telemetryService",
107+
"type": "provider",
108+
"implementation": RemsTelemetryProvider,
109+
"depends": ["rems.adapter", "$q"]
110+
}
111+
]
112+
}
108113
});
109114
});
110115

0 commit comments

Comments
 (0)