Skip to content

Commit

Permalink
Merge branch 'feature/09-emikat-api' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@p-a-s-c-a-l
p-a-s-c-a-l committed Mar 6, 2019
2 parents e20403a + a9d37eb commit eff791b
Show file tree
Hide file tree
Showing 15 changed files with 716 additions and 55 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ app/bower_components
target
.checkDependencies
test-results.xml
private/
private/
/app/scripts/.local.js
5 changes: 4 additions & 1 deletion app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
<!-- build:css() -->
<link rel="stylesheet" href="styles/indicatorCriteriaTableDirective.css">
<!-- endbuild -->

<!-- Local Test File, comment in production -->
<script src="scripts/.local.js" type="text/javascript"></script>

<!-- seamless.js -->
<script src="bower_components/seamless.js/build/seamless.child.min.js" type="text/javascript"></script>
Expand Down Expand Up @@ -515,7 +518,7 @@ <h3 class="panel-title ng-binding">
<script src="scripts/controllers/drupalContextProviderDirectiveController.js"></script>
<script src="scripts/directives/drupalBasedAnalysisContextProvider.js" type="text/javascript"></script>
<!-- endbuild -->

<!-- demo only -->
<script>
angular.module('eu.myclimateservice.csis.scenario-analysis.demoApp').config(
Expand Down
0 samples/claritiyCriteriaFunction.json → app/samples/claritiyCriteriaFunction.json
View file
File renamed without changes.
0 samples/clarityHWIndicatorSets.json → app/samples/clarityHWIndicatorSets.json
View file
File renamed without changes.
0 ...les/clarityHWIndicatorSetsAggregated.json → ...les/clarityHWIndicatorSetsAggregated.json
View file
File renamed without changes.
263 changes: 263 additions & 0 deletions app/samples/emikatScenarioData.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,263 @@
{
"name": "TAB Impact Results for Impact Assessment Drupal Table",
"description": null,
"columnnames": [
"HAZARD_EVENT_ID",
"HAZEVENT_NAME",
"IMPACTCASE_ID",
"EARTYPE_ID",
"NAME",
"QUANTITYUNIT",
"VULNERABILITYCLASS_ID",
"VULCLASS_NAME",
"EXPOSEDQUANTITY",
"DAMAGELEVEL1QUANTITY",
"DAMAGELEVEL2QUANTITY",
"DAMAGELEVEL3QUANTITY",
"DAMAGELEVEL4QUANTITY",
"DAMAGELEVEL5QUANTITY",
"SZM_SZENARIO_REF"
],
"rows": [
{
"rownum": 0,
"values": [
3,
"Heat wave 32°, 6 days",
1,
1,
"people",
"number of people",
26,
"Age 15-65",
337355.6662325851,
236277.49887164417,
87214.87361277906,
12877.203135764006,
950.6682674434248,
35.75970062065402,
2846
]
},
{
"rownum": 1,
"values": [
1,
"Heat wave 28°, 6 days",
1,
1,
"people",
"number of people",
25,
"Age<14",
139574.36679340914,
78366.54057476184,
47947.42392707267,
11734.435739422286,
1435.9410855705933,
90.0254665817489,
2846
]
},
{
"rownum": 2,
"values": [
2,
"Heat wave 30°, 6 days",
1,
1,
"people",
"number of people",
25,
"Age<14",
114271.6565188171,
64159.8784423072,
39255.28507728316,
9607.16097850651,
1175.6268022655902,
73.70521845463703,
2846
]
},
{
"rownum": 3,
"values": [
2,
"Heat wave 30°, 6 days",
1,
1,
"people",
"number of people",
26,
"Age 15-65",
430805.76740318455,
301728.1741796098,
111374.06101790829,
16444.286947546956,
1214.010652542174,
45.665411344737564,
2846
]
},
{
"rownum": 4,
"values": [
3,
"Heat wave 32°, 6 days",
1,
1,
"people",
"number of people",
25,
"Age<14",
90475.87692282363,
50799.309664103945,
31080.816095789913,
7606.578400532551,
930.8158217820096,
58.35694061522125,
2846
]
},
{
"rownum": 5,
"values": [
4,
"Haet wave 34°, 6 days",
1,
1,
"people",
"number of people",
26,
"Age 15-65",
245296.10211014666,
171800.72929200664,
63415.17479802567,
9363.197513646408,
691.2444157463933,
26.001386823675546,
2846
]
},
{
"rownum": 6,
"values": [
4,
"Haet wave 34°, 6 days",
1,
1,
"people",
"number of people",
21,
"Age>65",
46532.0355980936,
19389.015125049238,
18550.414779500396,
7099.253075094346,
1358.4562472507446,
134.94290323447143,
2846
]
},
{
"rownum": 7,
"values": [
1,
"Heat wave 28°, 6 days",
1,
1,
"people",
"number of people",
26,
"Age 15-65",
525366.538832429,
367956.74183399545,
135820.3844516537,
20053.766153772645,
1480.4829064297849,
55.688853116237475,
2846
]
},
{
"rownum": 8,
"values": [
2,
"Heat wave 30°, 6 days",
1,
1,
"people",
"number of people",
21,
"Age>65",
85802.17894101325,
35752.13772332034,
34205.8108544454,
13090.581034493567,
2504.9088120039405,
248.8263189289384,
2846
]
},
{
"rownum": 9,
"values": [
3,
"Heat wave 32°, 6 days",
1,
1,
"people",
"number of people",
21,
"Age>65",
64833.71786210868,
27014.978392501303,
25846.54512919038,
9891.485833068335,
1892.7555592664007,
188.01778180011516,
2846
]
},
{
"rownum": 10,
"values": [
4,
"Haet wave 34°, 6 days",
1,
1,
"people",
"number of people",
25,
"Age<14",
66266.00651339456,
37206.24214506262,
22764.096153520382,
5571.181965600621,
681.7446750098032,
42.74157420113949,
2846
]
},
{
"rownum": 11,
"values": [
1,
"Heat wave 28°, 6 days",
1,
1,
"people",
"number of people",
21,
"Age>65",
103864.23160243589,
43278.251888334584,
41406.41070639549,
15846.254222888836,
3032.212377401513,
301.20627164706406,
2846
]
}
]
}
32 changes: 32 additions & 0 deletions app/samples/populationDamageClasses.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[
{
"key": "D1",
"displayName": "Fatigue, discomfort",
"iconResource": "flower_16.png",
"unit": "Persons"
},
{
"key": "D2",
"displayName": "Heat cramps, heat exhaustion",
"iconResource": "flower_16.png",
"unit": "Persons"
},
{
"key": "D3",
"displayName": "Heat cramps, heatstroke",
"iconResource": "flower_homeless_16.png",
"unit": "Persons"
},
{
"key": "D4",
"displayName": "Heatstroke, sunstroke",
"iconResource": "flower_injured_16.png",
"unit": "Persons"
},
{
"key": "D5",
"displayName": "Death",
"iconResource": "flower_dead_16.png",
"unit": "Persons"
}
]
0 samples/sampleCriteriaFunction_1.json → app/samples/sampleCriteriaFunction_1.json
View file
File renamed without changes.
0 samples/sampleDecisionStrategy_1.json → app/samples/sampleDecisionStrategy_1.json
View file
File renamed without changes.
0 samples/sampleIndicatorSet_1.json → app/samples/sampleIndicatorSet_1.json
View file
File renamed without changes.
0 samples/sampleIndicatorSet_2.json → app/samples/sampleIndicatorSet_2.json
View file
File renamed without changes.
0 samples/sampleIndicatorSet_3.json → app/samples/sampleIndicatorSet_3.json
View file
File renamed without changes.
Loading

0 comments on commit eff791b

Please sign in to comment.