From 4b8481df9d2978dc1eb5c06400c25d487592b3b7 Mon Sep 17 00:00:00 2001
From: Tomas Pettersson <tomas.pettersson@smhi.se>
Date: Thu, 30 Nov 2017 12:26:32 +0100
Subject: [PATCH] using seperate observation modules now

---
 Gruntfile.js                       |   2 +-
 bower.json                         |   1 +
 demo/index.html                    |   3 +-
 dist/leaflet-exercise-control.css  | 107 ++++++++
 dist/leaflet-exercise-control.js   | 384 +++++++++++++++++++++++++++++
 src/leaflet-exercise-cards.js      |  16 +-
 src/leaflet-exercise-cards.js.map  |   2 +-
 src/leaflet-exercise-cards.ts      |  19 +-
 src/leaflet-observation-sat.js     |  73 ------
 src/leaflet-observation-sat.js.map |   1 -
 src/leaflet-observation-sat.ts     |  80 ------
 src/leaflet-observation.js         |  93 -------
 tsconfig.json                      |   4 +-
 13 files changed, 525 insertions(+), 260 deletions(-)
 create mode 100644 dist/leaflet-exercise-control.css
 create mode 100644 dist/leaflet-exercise-control.js
 delete mode 100644 src/leaflet-observation-sat.js
 delete mode 100644 src/leaflet-observation-sat.js.map
 delete mode 100644 src/leaflet-observation-sat.ts
 delete mode 100644 src/leaflet-observation.js

diff --git a/Gruntfile.js b/Gruntfile.js
index f2a9a4f..2007593 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -42,7 +42,7 @@ module.exports = function(grunt) {
           overrides : {
 						"leaflet-exercise-control" : {
 							"main" : [
-								"src/leaflet-exercise-cards.js", "src/leaflet-exercise-control.js" ,"src/leaflet-observation.js", "src/leaflet-observation-sat.js", "src/leaflet-exercise-control.css"
+								"src/leaflet-exercise-cards.js", "src/leaflet-exercise-control.js" , "src/leaflet-exercise-control.css"
 							]
 						},
         	  "uikit-stw": {
diff --git a/bower.json b/bower.json
index 04b7b16..0f6ce07 100644
--- a/bower.json
+++ b/bower.json
@@ -25,6 +25,7 @@
     "leaflet-container-control": "https://git.smhi.se/stw/leaflet-container-control.git",
     "leaflet-coordinates-control": "https://git.smhi.se/stw/leaflet-coordinates-control.git",
     "leaflet-forcing-boundary": "https://git.smhi.se/stw/leaflet-forcing-boundary.git",
+    "leaflet-observation": "https://git.smhi.se/stw/leaflet-observation.git",
     "intro.js": "^2.5.0"
   },
   "resolutions": {
diff --git a/demo/index.html b/demo/index.html
index afd705e..7a2877d 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -61,11 +61,10 @@
     <script src="../bower_components/leaflet.draw/dist/leaflet.draw.js"></script>
     <script src="../bower_components/leaflet-coordinates-control/dist/leaflet-coordinates-control.js"></script>
     <script src="../bower_components/leaflet-forcing-boundary/dist/leaflet-forcing-boundary.js"></script>
+    <script src="../bower_components/leaflet-observation/dist/leaflet-observation.js"></script>
     <script src="../bower_components/intro.js/intro.js"></script>
     <script src="../src/leaflet-exercise-cards.js"></script>
     <script src="../src/leaflet-exercise-control.js"></script>
-    <script src="../src/leaflet-observation.js"></script>
-    <script src="../src/leaflet-observation-sat.js"></script>
     <!-- endbower -->
 
     <script>
diff --git a/dist/leaflet-exercise-control.css b/dist/leaflet-exercise-control.css
new file mode 100644
index 0000000..33e9d52
--- /dev/null
+++ b/dist/leaflet-exercise-control.css
@@ -0,0 +1,107 @@
+.exercise-control .chevron-title {
+    border: 1px solid #ddd;
+	border-radius: 0px;
+    padding-top: 7px;	
+    padding-bottom: 7px;	
+    padding-left: 10px;	
+    padding-right: 10px;
+	font-size: 12px;	
+	margin-bottom: 2px;
+}
+
+.exercise-control .uk-button.uk-active {
+    box-shadow: inset 0 0 5px rgba(0,0,0,.05);
+    background-color: #ddd;
+    font-weight: 600;
+}
+
+.exercise-control .irs-from {
+    background-color: #ddd;
+    color: black;
+}
+
+.exercise-control .irs-to {
+    background-color: #ddd;
+    color: black;
+}
+
+.exercise-control .irs-slider.from {
+    display: none;
+}
+
+.exercise-control .irs-slider.to {
+    display: none;
+}
+
+
+.exercise-control .next-enabled {
+    box-shadow: inset 0 0 5px rgba(0,0,0,.05);
+    text-shadow: 0 -1px 0 rgba(0,0,0,.1);
+    background-color: #8cc14c;
+    color: #fff;
+}
+
+.exercise-control .irs-disabled {
+    opacity: 1;
+}
+
+.exercise-control .uk-dropdown-small {
+    min-width: 100px
+}
+.exercise-control .uk-autocomplete {
+    width: 100px
+}
+
+.exercise-control .form-label {
+  display: inline-block;
+  padding-right: 5px;
+}
+
+.exercise-control .badge-neutral {
+    background: lightgray;
+}
+
+.exercise-control .percentage {
+    width: 65px;
+}
+
+.exercise-control .title {
+    padding-left: 5px;
+}
+
+.exercise-control .chevron-icon {
+    float: right;
+    margin-top: 4px;
+	margin-right: 3px;
+}
+
+.exercise-control .select {
+    display: inline-block;
+	margin-left: 3px;
+}
+
+
+.exercise-control .acc-content {
+    padding-top: 0px;
+    padding-bottom: 15px;
+}
+
+.introjs-helperLayer {
+    background-color: rgba(255,255,255,0);
+}
+
+.introjs-prevbutton {
+    display: none;
+}
+
+.exercise-control .legend-text {
+    display: inline-block;
+    position: relative;
+    left: 5px;    
+}
+
+.exercise-control .legend-box {
+    display: inline-block;
+    top: 1px;
+    position: relative;    
+}
diff --git a/dist/leaflet-exercise-control.js b/dist/leaflet-exercise-control.js
new file mode 100644
index 0000000..0da99e5
--- /dev/null
+++ b/dist/leaflet-exercise-control.js
@@ -0,0 +1,384 @@
+/// <reference path="def/uikit.d.ts" />
+/// <reference path="def/leaflet.d.ts" />
+/// <reference path="def/moment.d.ts" />
+/// <reference path="def/leaflet-forcing-boundary.d.ts" />
+/// <reference path="def/reqwest.d.ts" />
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var EXLocation = (function (_super) {
+    __extends(EXLocation, _super);
+    function EXLocation(id, parentDiv, lang, langData, map, forcing, obs, type, initials) {
+        var _this = this;
+        var options = {};
+        options['single'] = true;
+        options['line'] = true;
+        options.polygon = {};
+        options['polygon']['show'] = true;
+        options['polygon']['name'] = 'Area';
+        options['type'] = type;
+        options['initials'] = initials;
+        _this = _super.call(this, id, 'Specify time and location', parentDiv, lang, langData, map, forcing, options) || this;
+        var self = _this;
+        var fieldset = L.DomUtil.create('fieldset', 'uk-margin-top');
+        _this.locationForm.insertBefore(fieldset, _this.locationForm.firstChild);
+        var satCallbackFn = function (latlngs, geojsonfeature, timestamp, id) {
+            self.clear();
+            var geojson = {};
+            geojson["type"] = "FeatureCollection";
+            geojson["features"] = [];
+            geojson["features"].push(geojsonfeature);
+            var observation = {
+                "id": id,
+                "provider": "EMSA",
+                "providerDataRef": null,
+                "providerImgRef": null,
+                "providerType": null,
+                "type": "SAT",
+                "date": moment.utc(timestamp).valueOf()
+            };
+            geojson.features[0].properties["observation"] = [];
+            geojson.features[0].properties["observation"].push(observation);
+            geojson.features[0].properties["simulation"] = {};
+            self.populateCard(geojson);
+            satdetectionHide();
+        };
+        function legendBox(fieldset, color, text, size) {
+            var rowDiv = L.DomUtil.create('div', 'uk-form-row uk-margin-remove', fieldset);
+            var legendBox = L.DomUtil.create('div', 'legend-box', rowDiv);
+            legendBox.style.backgroundColor = color;
+            legendBox.style.width = size;
+            legendBox.style.height = size;
+            legendBox.title = text;
+            var legendText = L.DomUtil.create('div', 'legend-text', rowDiv);
+            legendText.textContent = text;
+        }
+        if (obs && obs.sat) {
+            var obssatRowDiv = L.DomUtil.create('div', 'uk-form-row', fieldset);
+            self.satObs = new Observation.Sat(map, satCallbackFn, 'observation/oo');
+            var satDetectionDiv = L.DomUtil.create('div', '', obssatRowDiv);
+            var satDetectionList = L.DomUtil.create('dl', 'uk-description-list-line', satDetectionDiv);
+            var satDetectionItem = L.DomUtil.create('dt', '', satDetectionList);
+            var satDetectionHeading = L.DomUtil.create('h5', 'uk-width-1-1 chevron-title', satDetectionItem);
+            satDetectionHeading.textContent = "Satellite oil detections";
+            self.satDetectionChevronIcon = L.DomUtil.create('span', 'uk-icon-chevron-down chevron-icon', satDetectionHeading);
+            self.satDetectionContent = L.DomUtil.create('div', 'uk-animation-fade', satDetectionItem);
+            self.satDetectionContent.style.display = 'none';
+            var satdetectionShow = function () {
+                if (self.satDetectionChevronIcon.classList.contains('uk-icon-chevron-down')) {
+                    self.satDetectionChevronIcon.classList.remove('uk-icon-chevron-down');
+                    self.satDetectionChevronIcon.classList.add('uk-icon-chevron-up');
+                    self.satDetectionContent.style.display = "";
+                    self.satObs.show();
+                }
+            };
+            var satdetectionHide = function () {
+                if (self.satDetectionChevronIcon.classList.contains('uk-icon-chevron-up')) {
+                    self.satDetectionChevronIcon.classList.remove('uk-icon-chevron-up');
+                    self.satDetectionChevronIcon.classList.add('uk-icon-chevron-down');
+                    self.satDetectionContent.style.display = 'none';
+                    self.satObs.hide();
+                }
+            };
+            satDetectionHeading.onclick = function (evt) {
+                if (self.satDetectionChevronIcon.classList.contains('uk-icon-chevron-down')) {
+                    satdetectionShow();
+                }
+                else {
+                    satdetectionHide();
+                }
+            };
+            var satDetectionform = L.DomUtil.create('form', 'uk-form uk-form-stacked', self.satDetectionContent);
+            satDetectionform.onsubmit = function (e) {
+                e.preventDefault();
+                e.stopPropagation();
+                return false;
+            };
+            var satDetectionfieldset = L.DomUtil.create('fieldset', '', satDetectionform);
+            var satDetectionRowDiv = L.DomUtil.create('div', 'uk-form-row uk-margin-top', satDetectionfieldset);
+            _super.prototype.addLabelDiv.call(_this, satDetectionRowDiv, "Detection frequency", "See more information <a style='color:#faa732;' href='help/classic/#" + type + "-" + initials + "-satdetection' target='_blank'>here</a>");
+            legendBox(satDetectionfieldset, 'rgb(255, 0, 0)', 'Within 24 hours', '10px');
+            legendBox(satDetectionfieldset, 'rgb(255, 153, 0)', 'Within 48 hours', '10px');
+            legendBox(satDetectionfieldset, 'rgb(255, 255, 0)', 'More than two days ago', '10px');
+            legendBox(satDetectionfieldset, 'rgb(255, 255, 255)', 'Older', '10px');
+        }
+        self.datetimeFormat = 'YYYY-MM-DD HH:mm';
+        self.datetimeTFormat = 'YYYY-MM-DDTHH:mm:ss.000';
+        self.dateFormat = 'YYYY-MM-DD';
+        self.timeFormat = 'HH:mm';
+        var obsdateRowDiv = L.DomUtil.create('div', 'uk-form-row uk-margin-remove', fieldset);
+        _super.prototype.addLabelDiv.call(_this, obsdateRowDiv, "Observation time (UTC)", "See more information <a style='color:#faa732;' href='help/classic/#" + type + "-" + initials + "-time' target='_blank'>here</a>");
+        var obsdateDiv = L.DomUtil.create('div', 'uk-form-controls uk-form-icon uk-width-1-1', obsdateRowDiv);
+        obsdateDiv.id = 'guide' + initials + 'date';
+        var obsdateIcon = L.DomUtil.create('span', 'uk-icon-calendar', obsdateDiv);
+        self.obsDateInput = L.DomUtil.create('input', 'uk-width-1-2', obsdateDiv);
+        self.obsDateInput.type = 'text';
+        self.obsDateInput.placeholder = self.dateFormat;
+        self.obsTimeInput = L.DomUtil.create('input', 'uk-width-1-2', obsdateDiv);
+        self.obsTimeInput.type = 'text';
+        self.obsDateInput.onchange = function () { self.fireChangeFn(self); };
+        self.obsTimeInput.onchange = function () { self.fireChangeFn(self); };
+        UIkit.ready(function () {
+            var startDatePicker = UIkit.datepicker(self.obsDateInput, { format: self.dateFormat });
+            var startTimePicker = UIkit.timepicker(self.obsTimeInput, {});
+            self.defaults();
+        });
+        return _this;
+    }
+    EXLocation.prototype.defaults = function () {
+        _super.prototype.defaults.call(this);
+        var self = this;
+        if (document.body.contains(self.obsDateInput)) {
+            if (self.obsDateInput.value == '') {
+                var initDate = moment.utc();
+                self.obsDateInput.value = initDate.format(self.dateFormat);
+                self.obsTimeInput.value = initDate.startOf('hour').format(self.timeFormat);
+            }
+        }
+    };
+    EXLocation.prototype.populateCard = function (geojson) {
+        var self = this;
+        _super.prototype.populateCard.call(this, geojson);
+        var simulation = geojson.features[0].properties.simulation;
+        var observation = geojson.features[0].properties.observation[0];
+        var datetime = simulation.startDate;
+        if (geojson.features[0].properties.observation.length > 0) {
+            var observation = geojson.features[0].properties.observation[0];
+            datetime = observation.date;
+        }
+        var date = moment.utc(datetime).format(self.dateFormat);
+        self.obsDateInput.value = date;
+        var time = moment.utc(datetime).format(self.timeFormat);
+        self.obsTimeInput.value = time;
+        self.fireChangeFn(this);
+    };
+    EXLocation.prototype.populateData = function (geojson) {
+        _super.prototype.populateData.call(this, geojson);
+        var self = this;
+        var observation = {
+            "id": null,
+            "provider": "USER",
+            "providerDataRef": null,
+            "providerImgRef": null,
+            "providerType": null,
+            "type": "MANUAL",
+            "date": moment.utc(self.obsDateInput.value + ' ' + self.obsTimeInput.value, self.datetimeFormat).valueOf()
+        };
+        geojson.features[0].properties["observation"] = [];
+        geojson.features[0].properties["observation"].push(observation);
+    };
+    return EXLocation;
+}(STWkit.LocationCard));
+var EXAmount = (function (_super) {
+    __extends(EXAmount, _super);
+    function EXAmount(id, parentDiv, lang, map, type, initials) {
+        var _this = this;
+        var amountDiv = L.DomUtil.create('div', 'uk-width-1-1 uk-margin-top', parentDiv);
+        _this = _super.call(this, id, 'Amount', parentDiv, amountDiv) || this;
+        var self = _this;
+        var form = L.DomUtil.create('form', 'uk-form uk-form-stacked', amountDiv);
+        form.setAttribute('novalidate', '');
+        form.onsubmit = function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+            return false;
+        };
+        form.onkeypress = function (e) {
+            var key = e.charCode || e.keyCode || 0;
+            if (key == 13)
+                e.preventDefault();
+        };
+        function addOption(parent, value, txt) {
+            var option = L.DomUtil.create('option', '', parent);
+            option.value = value;
+            option.textContent = txt;
+        }
+        var fieldset = L.DomUtil.create('fieldset', '', form);
+        var amountRowDiv = L.DomUtil.create('div', 'uk-form-row', fieldset);
+        amountRowDiv.id = 'guide' + initials + 'amountvalue';
+        amountRowDiv.guideFn = function () {
+            self.amountInput.value = '10';
+            validate();
+        };
+        _super.prototype.addLabelDiv.call(_this, amountRowDiv, "Amount", "See more information <a style='color:#faa732;' href='help/classic/#" + type + "-" + initials + "-amount' target='_blank'>here</a>");
+        var amountValueDiv = L.DomUtil.create('div', 'uk-width-1-1', amountRowDiv);
+        self.amountInput = L.DomUtil.create('input', 'uk-width-1-4', amountValueDiv);
+        self.amountInput.type = 'number';
+        self.amountInput.step = '10';
+        self.amountInput.min = '0';
+        var amountUnitDiv = L.DomUtil.create('div', 'uk-width-1-2 uk-form-select select', amountValueDiv);
+        amountUnitDiv.setAttribute('data-uk-form-select', '');
+        var selectedAmountUnit = L.DomUtil.create('span', '', amountUnitDiv);
+        self.amountSelect = L.DomUtil.create('select', '', amountUnitDiv);
+        addOption(self.amountSelect, 'm3', 'm³');
+        addOption(self.amountSelect, 'tonnes', 'tonnes');
+        self.amountInput.onchange = function () {
+            validate();
+        };
+        function validate() {
+            var amountValue = parseInt(self.amountInput.value);
+            var amountOk = false;
+            if (amountValue > 0)
+                amountOk = true;
+            if (amountOk) {
+                self.status = true;
+                STWkit.AccordionCard.enableNext(self.nextButton, true);
+                (self.oncallback && self.oncallback());
+            }
+            else {
+                self.clear();
+            }
+        }
+        ;
+        var clearDiv = L.DomUtil.create('div', 'uk-clearfix', amountDiv);
+        var clearButton = L.DomUtil.create('button', 'uk-button uk-margin-top uk-align-left', clearDiv);
+        clearButton.textContent = 'Clear';
+        clearButton.onclick = function () {
+            self.clear();
+        };
+        self.nextButton = L.DomUtil.create('button', 'uk-button uk-margin-top uk-align-right', clearDiv);
+        self.nextButton.id = 'guide' + initials + 'amount';
+        self.nextButton.textContent = 'Next';
+        self.nextButton.guideFn = function () {
+            self.nextButton.click();
+        };
+        STWkit.AccordionCard.enableNext(self.nextButton, false);
+        self.nextButton.onclick = function () {
+            if (!STWkit.AccordionCard.isEnabled(self.nextButton)) {
+                STWkit.AccordionCard.warningMsg('Mandatory fields missing', 'Specify a valid <b>amount</b>.');
+                return;
+            }
+            (self.oncallback && self.oncallback(true));
+        };
+        UIkit.ready(function () {
+            self.defaults();
+        });
+        return _this;
+    }
+    EXAmount.prototype.defaults = function () {
+        var self = this;
+    };
+    EXAmount.prototype.populateCard = function (geojson) {
+        var self = this;
+        var simulation = geojson.features[0].properties.simulation;
+        self.amountInput.value = simulation.amount;
+        var amountevt = document.createEvent('Event');
+        amountevt.initEvent("change", true, true);
+        self.amountInput.dispatchEvent(amountevt);
+        self.amountSelect.value = simulation.amountUnit;
+    };
+    EXAmount.prototype.populateData = function (geojson) {
+        var self = this;
+        geojson.features[0].properties["simulation"]["amount"] = self.amountInput.value;
+        geojson.features[0].properties["simulation"]["amountUnit"] = self.amountSelect.options[self.amountSelect.selectedIndex].value;
+    };
+    EXAmount.prototype.clear = function () {
+        var self = this;
+        _super.prototype.clear.call(this);
+        self.amountInput.value = '';
+        STWkit.AccordionCard.enableNext(self.nextButton, false);
+        self.status = false;
+        (self.oncallback && self.oncallback());
+    };
+    return EXAmount;
+}(STWkit.AccordionCard));
+//# sourceMappingURL=leaflet-exercise-cards.js.map
+/// <reference path="def/uikit.d.ts" />
+/// <reference path="def/leaflet.d.ts" />
+/// <reference path="def/introJs.d.ts" />
+/// <reference path="def/stwkit.d.ts" />
+/// <reference path="def/moment.d.ts" />
+/// <reference path="def/reqwest.d.ts" />
+/// <reference path="leaflet-exercise-cards.ts" />
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var L;
+(function (L) {
+    var Control;
+    (function (Control) {
+        var Exercise = (function (_super) {
+            __extends(Exercise, _super);
+            function Exercise(options) {
+                var _this = _super.call(this, options) || this;
+                _this.type = 'oil';
+                _this.subtype = 'instant';
+                _this.name = 'exercise';
+                _this.initials = 'ex';
+                if (options.obs) {
+                    _this.obs = options.obs;
+                }
+                return _this;
+            }
+            Exercise.prototype.setup = function (map) {
+                var _this = this;
+                var self = this;
+                this.container = L.DomUtil.create('div', self.name + '-control');
+                this.accordionDiv = L.DomUtil.create('div', 'uk-accordion', this.container);
+                var locationid = self.initials + 'locationCard';
+                self.cardMap[locationid] = new EXLocation(locationid, this.accordionDiv, self.lang, self.langData, map, self.forcing, self.obs, self.type, self.initials);
+                self.cardMap[locationid].show();
+                var periodid = self.initials + 'periodCard';
+                var periodoptions = {};
+                periodoptions['type'] = this.type;
+                periodoptions['initials'] = this.initials;
+                self.cardMap[periodid] = new STWkit.PeriodCard(periodid, 'Simulation period', this.accordionDiv, self.lang, map, self.domain, self.forcingmodel, periodoptions);
+                var oiltypeoptions = {};
+                oiltypeoptions['type'] = this.type;
+                oiltypeoptions['initials'] = this.initials;
+                var oiltypeid = self.initials + 'typeCard';
+                self.cardMap[oiltypeid] = new STWkit.OilTypeCard(oiltypeid, 'Type of oil', this.accordionDiv, self.lang, map, oiltypeoptions);
+                this.cardMap[periodid].addChangeFnListener(this.cardMap[oiltypeid]);
+                var amountid = self.initials + 'amountCard';
+                self.cardMap[amountid] = new EXAmount(amountid, this.accordionDiv, self.lang, map, self.type, self.initials);
+                this.cardMap[locationid].addChangeFnListener(this.cardMap[periodid]);
+                _super.prototype.setup.call(this, map);
+                var chain = [];
+                chain[locationid] = periodid;
+                chain[periodid] = oiltypeid;
+                chain[oiltypeid] = amountid;
+                chain[amountid] = '';
+                self.cardMap[locationid].oncallback = function (gonext) {
+                    _super.prototype.callback.call(_this, chain, locationid, gonext);
+                };
+                self.cardMap[periodid].oncallback = function (gonext) {
+                    _super.prototype.callback.call(_this, chain, periodid, gonext);
+                };
+                self.cardMap[oiltypeid].oncallback = function (gonext) {
+                    _super.prototype.callback.call(_this, chain, oiltypeid, gonext);
+                };
+                self.cardMap[amountid].oncallback = function (gonext) {
+                    _super.prototype.callback.call(_this, chain, amountid, gonext);
+                };
+            };
+            Exercise.prototype.ready = function (name) {
+                _super.prototype.ready.call(this, name);
+            };
+            Exercise.prototype.clear = function () {
+                _super.prototype.clear.call(this);
+            };
+            Exercise.prototype.show = function () {
+            };
+            Exercise.prototype.hide = function () {
+                this.clear();
+            };
+            return Exercise;
+        }(STWkit.CardControl));
+        Control.Exercise = Exercise;
+    })(Control = L.Control || (L.Control = {}));
+})(L || (L = {}));
+//# sourceMappingURL=leaflet-exercise-control.js.map
\ No newline at end of file
diff --git a/src/leaflet-exercise-cards.js b/src/leaflet-exercise-cards.js
index 6d4c977..5244f40 100644
--- a/src/leaflet-exercise-cards.js
+++ b/src/leaflet-exercise-cards.js
@@ -3,7 +3,6 @@
 /// <reference path="def/moment.d.ts" />
 /// <reference path="def/leaflet-forcing-boundary.d.ts" />
 /// <reference path="def/reqwest.d.ts" />
-/// <reference path="leaflet-observation-sat.ts" />
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
         ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
@@ -49,6 +48,7 @@ var EXLocation = (function (_super) {
             geojson.features[0].properties["observation"].push(observation);
             geojson.features[0].properties["simulation"] = {};
             self.populateCard(geojson);
+            satdetectionHide();
         };
         function legendBox(fieldset, color, text, size) {
             var rowDiv = L.DomUtil.create('div', 'uk-form-row uk-margin-remove', fieldset);
@@ -71,20 +71,30 @@ var EXLocation = (function (_super) {
             self.satDetectionChevronIcon = L.DomUtil.create('span', 'uk-icon-chevron-down chevron-icon', satDetectionHeading);
             self.satDetectionContent = L.DomUtil.create('div', 'uk-animation-fade', satDetectionItem);
             self.satDetectionContent.style.display = 'none';
-            satDetectionHeading.onclick = function (evt) {
+            var satdetectionShow = function () {
                 if (self.satDetectionChevronIcon.classList.contains('uk-icon-chevron-down')) {
                     self.satDetectionChevronIcon.classList.remove('uk-icon-chevron-down');
                     self.satDetectionChevronIcon.classList.add('uk-icon-chevron-up');
                     self.satDetectionContent.style.display = "";
                     self.satObs.show();
                 }
-                else {
+            };
+            var satdetectionHide = function () {
+                if (self.satDetectionChevronIcon.classList.contains('uk-icon-chevron-up')) {
                     self.satDetectionChevronIcon.classList.remove('uk-icon-chevron-up');
                     self.satDetectionChevronIcon.classList.add('uk-icon-chevron-down');
                     self.satDetectionContent.style.display = 'none';
                     self.satObs.hide();
                 }
             };
+            satDetectionHeading.onclick = function (evt) {
+                if (self.satDetectionChevronIcon.classList.contains('uk-icon-chevron-down')) {
+                    satdetectionShow();
+                }
+                else {
+                    satdetectionHide();
+                }
+            };
             var satDetectionform = L.DomUtil.create('form', 'uk-form uk-form-stacked', self.satDetectionContent);
             satDetectionform.onsubmit = function (e) {
                 e.preventDefault();
diff --git a/src/leaflet-exercise-cards.js.map b/src/leaflet-exercise-cards.js.map
index ec76bde..5561042 100644
--- a/src/leaflet-exercise-cards.js.map
+++ b/src/leaflet-exercise-cards.js.map
@@ -1 +1 @@
-{"version":3,"file":"leaflet-exercise-cards.js","sourceRoot":"","sources":["leaflet-exercise-cards.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"leaflet-exercise-cards.js","sourceRoot":"","sources":["leaflet-exercise-cards.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,yCAAyC;AACzC,wCAAwC;AACxC,0DAA0D;AAC1D,yCAAyC;;;;;;;;;;;AAGzC;IAAyB,8BAAmB;IAOxC,oBAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAG,GAAG,EAAE,IAAI,EAAE,QAAQ;QAA7E,iBAgIC;QA/HG,IAAI,OAAO,GAAO,EAAE,CAAC;QACrB,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;QACzB,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;QACvB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;QACrB,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;QAClC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;QACpC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;QACvB,OAAO,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;QAC/B,QAAA,kBAAM,EAAE,EAAE,2BAA2B,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,SAAC;QAEzF,IAAI,IAAI,GAAG,KAAI,CAAC;QAChB,IAAI,QAAQ,GAAwB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAClF,KAAI,CAAC,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEvE,IAAI,aAAa,GAAG,UAAS,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE;YAC/D,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,IAAI,OAAO,GAAO,EAAE,CAAC;YACrB,OAAO,CAAC,MAAM,CAAC,GAAG,mBAAmB,CAAC;YACtC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;YACzB,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACzC,IAAI,WAAW,GAAG;gBACd,IAAI,EAAE,EAAE;gBACR,UAAU,EAAE,MAAM;gBAClB,iBAAiB,EAAE,IAAI;gBACvB,gBAAgB,EAAE,IAAI;gBACtB,cAAc,EAAE,IAAI;gBACpB,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE;aAC1C,CAAC;YACF,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;YAClD,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC3B,gBAAgB,EAAE,CAAC;QACvB,CAAC,CAAC;QAEF,mBAAmB,QAA6B,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI;YAC/D,IAAI,MAAM,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,8BAA8B,EAAE,QAAQ,CAAC,CAAC;YAC/F,IAAI,SAAS,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YAC9E,SAAS,CAAC,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC;YACxC,SAAS,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;YAC7B,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;YAC9B,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;YACvB,IAAI,UAAU,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;YAChF,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC;QAClC,CAAC;QAED,EAAE,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACjB,IAAI,YAAY,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,EAAC,QAAQ,CAAC,CAAC;YACnF,IAAI,CAAC,MAAM,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;YACxE,IAAI,eAAe,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;YAChF,IAAI,gBAAgB,GAAqB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,0BAA0B,EAAE,eAAe,CAAC,CAAC;YAC7G,IAAI,gBAAgB,GAAqB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,CAAC;YACtF,IAAI,mBAAmB,GAAuB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,4BAA4B,EAAE,gBAAgB,CAAC,CAAC;YACrH,mBAAmB,CAAC,WAAW,GAAG,0BAA0B,CAAC;YAC7D,IAAI,CAAC,uBAAuB,GAAoB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,mCAAmC,EAAE,mBAAmB,CAAC,CAAC;YACnI,IAAI,CAAC,mBAAmB,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,CAAC,CAAC;YAC1G,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;YAChD,IAAI,gBAAgB,GAAG;gBACnB,EAAE,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;oBAC1E,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;oBACtE,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;oBACjE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC;oBAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACvB,CAAC;YACL,CAAC,CAAA;YACD,IAAI,gBAAgB,GAAG;gBACnB,EAAE,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;oBACxE,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;oBACpE,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;oBACnE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;oBAChD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACvB,CAAC;YACL,CAAC,CAAA;YAGD,mBAAmB,CAAC,OAAO,GAAG,UAAU,GAAG;gBACvC,EAAE,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;oBAC1E,gBAAgB,EAAE,CAAC;gBACvB,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,gBAAgB,EAAE,CAAC;gBACvB,CAAC;YACL,CAAC,CAAC;YAEF,IAAI,gBAAgB,GAAoB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACtH,gBAAgB,CAAC,QAAQ,GAAG,UAAU,CAAC;gBACnC,CAAC,CAAC,cAAc,EAAE,CAAC;gBACnB,CAAC,CAAC,eAAe,EAAE,CAAC;gBACpB,MAAM,CAAC,KAAK,CAAC;YACjB,CAAC,CAAC;YAEF,IAAI,oBAAoB,GAAwB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,gBAAgB,CAAC,CAAC;YACnG,IAAI,kBAAkB,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,2BAA2B,EAAE,oBAAoB,CAAC,CAAC;YACpH,iBAAM,WAAW,aAAC,kBAAkB,EAAE,qBAAqB,EAAE,qEAAqE,GAAC,IAAI,GAAC,GAAG,GAAC,QAAQ,GAAC,yCAAyC,CAAC,CAAC;YAChM,SAAS,CAAC,oBAAoB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;YAC7E,SAAS,CAAC,oBAAoB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;YAC/E,SAAS,CAAC,oBAAoB,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,CAAC,CAAC;YACtF,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAE3E,CAAC;QAED,IAAI,CAAC,cAAc,GAAG,kBAAkB,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,yBAAyB,CAAC;QACjD,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;QAC1B,IAAI,aAAa,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,8BAA8B,EAAC,QAAQ,CAAC,CAAC;QACrG,iBAAM,WAAW,aAAC,aAAa,EAAE,wBAAwB,EAAE,qEAAqE,GAAC,IAAI,GAAC,GAAG,GAAC,QAAQ,GAAC,iCAAiC,CAAC,CAAC;QACtL,IAAI,UAAU,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,4CAA4C,EAAE,aAAa,CAAC,CAAC;QACtH,UAAU,CAAC,EAAE,GAAG,OAAO,GAAC,QAAQ,GAAC,MAAM,CAAC;QACxC,IAAI,WAAW,GAAoB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,UAAU,CAAC,CAAC;QAC5F,IAAI,CAAC,YAAY,GAAqB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;QAC5F,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,MAAM,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC;QAChD,IAAI,CAAC,YAAY,GAAqB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;QAC5F,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,MAAM,CAAC;QAEhC,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,cAAa,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA,CAAC,CAAC;QACpE,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,cAAa,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA,CAAC,CAAC;QAGpE,KAAK,CAAC,KAAK,CAAC;YACR,IAAI,eAAe,GAAG,KAAK,CAAC,UAAU,CAAM,IAAI,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YAC5F,IAAI,eAAe,GAAG,KAAK,CAAC,UAAU,CAAM,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAEnE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;;IAEP,CAAC;IAEM,6BAAQ,GAAf;QACI,iBAAM,QAAQ,WAAE,CAAC;QACjB,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC5C,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChC,IAAI,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;gBAC5B,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC3D,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/E,CAAC;QACL,CAAC;IACL,CAAC;IAEM,iCAAY,GAAnB,UAAoB,OAAO;QACvB,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,iBAAM,YAAY,YAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QAC3D,IAAI,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAChE,IAAI,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC;QACpC,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YACxD,IAAI,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAChE,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC;QAChC,CAAC;QACD,IAAI,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxD,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC;QAC/B,IAAI,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxD,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAEM,iCAAY,GAAnB,UAAoB,OAAO;QACvB,iBAAM,YAAY,YAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,WAAW,GAAG;YACd,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,MAAM;YAClB,iBAAiB,EAAE,IAAI;YACvB,gBAAgB,EAAE,IAAI;YACtB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE;SAE7G,CAAC;QACF,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;QACnD,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACpE,CAAC;IACL,iBAAC;AAAD,CAAC,AAtLD,CAAyB,MAAM,CAAC,YAAY,GAsL3C;AAGD;IAAuB,4BAAoB;IAMvC,kBAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ;QAApD,iBAyFC;QAxFG,IAAI,SAAS,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,4BAA4B,EAAE,SAAS,CAAC,CAAC;QACjG,QAAA,kBAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,SAAC;QAC1C,IAAI,IAAI,GAAG,KAAI,CAAC;QAChB,IAAI,IAAI,GAAoB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,yBAAyB,EAAE,SAAS,CAAC,CAAC;QAC3F,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC;YACvB,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,CAAC,CAAC,eAAe,EAAE,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC;QACjB,CAAC,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,UAAS,CAAC;YACxB,IAAI,GAAG,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC;YACvC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC;gBAAC,CAAC,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC,CAAC;QAEF,mBAAmB,MAAM,EAAE,KAAK,EAAE,GAAG;YACjC,IAAI,MAAM,GAAsB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;YACvE,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;YACrB,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC;QAC7B,CAAC;QAGD,IAAI,QAAQ,GAAwB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAC3E,IAAI,YAAY,GAAwB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QACzF,YAAY,CAAC,EAAE,GAAG,OAAO,GAAC,QAAQ,GAAC,aAAa,CAAC;QACjD,YAAY,CAAC,OAAO,GAAG;YACnB,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC;YAC9B,QAAQ,EAAE,CAAC;QACf,CAAC,CAAA;QAED,iBAAM,WAAW,aAAC,YAAY,EAAE,QAAQ,EAAE,qEAAqE,GAAC,IAAI,GAAC,GAAG,GAAC,QAAQ,GAAC,mCAAmC,CAAC,CAAC;QACvK,IAAI,cAAc,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QAC3F,IAAI,CAAC,WAAW,GAAqB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC/F,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,QAAQ,CAAC;QACjC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,CAAC;QAC3B,IAAI,aAAa,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,oCAAoC,EAAE,cAAc,CAAC,CAAC;QAClH,aAAa,CAAC,YAAY,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,kBAAkB,GAAoB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;QACtF,IAAI,CAAC,YAAY,GAAsB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;QACrF,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACzC,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAGjD,IAAI,CAAC,WAAW,CAAC,QAAQ,GAAG;YACxB,QAAQ,EAAE,CAAC;QACf,CAAC,CAAC;QAEF;YACI,IAAI,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,EAAE,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC;gBAAC,QAAQ,GAAG,IAAI,CAAC;YACrC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACX,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;gBACvD,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YAC3C,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC;QACL,CAAC;QAAA,CAAC;QAGF,IAAI,QAAQ,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QACjF,IAAI,WAAW,GAAsB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,uCAAuC,EAAE,QAAQ,CAAC,CAAC;QACnH,WAAW,CAAC,WAAW,GAAG,OAAO,CAAC;QAClC,WAAW,CAAC,OAAO,GAAG;YAClB,IAAI,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC;QACF,IAAI,CAAC,UAAU,GAAsB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,wCAAwC,EAAE,QAAQ,CAAC,CAAC;QACpH,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,OAAO,GAAC,QAAQ,GAAC,QAAQ,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,WAAW,GAAG,MAAM,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG;YACtB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC,CAAA;QACD,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG;YACtB,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBACnD,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,0BAA0B,EACtD,gCAAgC,CAAC,CAAC;gBACtC,MAAM,CAAC;YACX,CAAC;YAED,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC;QAEF,KAAK,CAAC,KAAK,CAAC;YACR,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;;IACP,CAAC;IAEM,2BAAQ,GAAf;QACI,IAAI,IAAI,GAAG,IAAI,CAAC;IACpB,CAAC;IACM,+BAAY,GAAnB,UAAoB,OAAO;QACvB,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QAE3D,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3C,IAAI,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9C,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC;IACpD,CAAC;IAEM,+BAAY,GAAnB,UAAoB,OAAO;QACvB,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAChF,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC;IAClI,CAAC;IAGM,wBAAK,GAAZ;QACI,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,iBAAM,KAAK,WAAE,CAAC;QACd,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,EAAE,CAAC;QAC5B,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC3C,CAAC;IACL,eAAC;AAAD,CAAC,AA9HD,CAAuB,MAAM,CAAC,aAAa,GA8H1C"}
\ No newline at end of file
diff --git a/src/leaflet-exercise-cards.ts b/src/leaflet-exercise-cards.ts
index 2082dd6..1d65707 100644
--- a/src/leaflet-exercise-cards.ts
+++ b/src/leaflet-exercise-cards.ts
@@ -3,7 +3,6 @@
 /// <reference path="def/moment.d.ts" />
 /// <reference path="def/leaflet-forcing-boundary.d.ts" />
 /// <reference path="def/reqwest.d.ts" />
-/// <reference path="leaflet-observation-sat.ts" />
 
 
 class EXLocation extends STWkit.LocationCard {
@@ -47,6 +46,7 @@ class EXLocation extends STWkit.LocationCard {
             geojson.features[0].properties["observation"].push(observation);
             geojson.features[0].properties["simulation"] = {};            
             self.populateCard(geojson);
+            satdetectionHide();
         };
         
         function legendBox(fieldset: HTMLFieldSetElement, color, text, size) {
@@ -71,18 +71,29 @@ class EXLocation extends STWkit.LocationCard {
             self.satDetectionChevronIcon = <HTMLSpanElement>L.DomUtil.create('span', 'uk-icon-chevron-down chevron-icon', satDetectionHeading);
             self.satDetectionContent = <HTMLDivElement>L.DomUtil.create('div', 'uk-animation-fade', satDetectionItem);
             self.satDetectionContent.style.display = 'none';
-            satDetectionHeading.onclick = function (evt) {
+            var satdetectionShow = function() {
                 if (self.satDetectionChevronIcon.classList.contains('uk-icon-chevron-down')) {
                     self.satDetectionChevronIcon.classList.remove('uk-icon-chevron-down');
                     self.satDetectionChevronIcon.classList.add('uk-icon-chevron-up');
                     self.satDetectionContent.style.display = "";
                     self.satObs.show();     
-                } else {
+                }                
+            }
+            var satdetectionHide = function() {
+                if (self.satDetectionChevronIcon.classList.contains('uk-icon-chevron-up')) {
                     self.satDetectionChevronIcon.classList.remove('uk-icon-chevron-up');
                     self.satDetectionChevronIcon.classList.add('uk-icon-chevron-down');
                     self.satDetectionContent.style.display = 'none';
                     self.satObs.hide();     
-                }
+                }                
+            }
+
+
+            satDetectionHeading.onclick = function (evt) {
+                if (self.satDetectionChevronIcon.classList.contains('uk-icon-chevron-down')) 
+                    satdetectionShow();
+                 else 
+                    satdetectionHide();
             };
     
             var satDetectionform = <HTMLFormElement>L.DomUtil.create('form', 'uk-form uk-form-stacked', self.satDetectionContent);
diff --git a/src/leaflet-observation-sat.js b/src/leaflet-observation-sat.js
deleted file mode 100644
index ba8d26c..0000000
--- a/src/leaflet-observation-sat.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/// <reference path="def/leaflet-observation.d.ts" />
-var Observation;
-(function (Observation) {
-    var Sat = (function () {
-        function Sat(map, callbackFn, url) {
-            var self = this;
-            this.map = map;
-            this.containerLayer = new L.LayerGroup();
-            map.addLayer(this.containerLayer);
-            this.zoomLayer = L.observation({ type: 'zoom' });
-            this.zoomLayer.on('click', function (evt) {
-                map.setView(evt.layer.getLatLng(), 12);
-            });
-            var label = '{gml_id}<hr />';
-            label += '<table id="LabelDataTable" display=block width="200" cellpadding="0" cellspacing="0">';
-            label += '<tr><td>Provider:</td><td>{provider}</td></tr><tr><td>Time:</td><td>{timeStampTxt}</td></tr>';
-            label += '</table>';
-            this.polygonLayer = L.observation({ type: 'polygon', label: label });
-            this.polygonLayer.on('click', function (evt) {
-                if (callbackFn && map.getZoom() > 9)
-                    callbackFn(evt.layer.getLatLngs(), evt.layer.toGeoJSON(), evt.layer.observation.properties.timeStamp, evt.layer.observation.properties.gml_id);
-            });
-            map.on('zoomend', function () {
-                if (map.getZoom() > 9 && self.containerLayer.hasLayer(self.zoomLayer)) {
-                    self.containerLayer.removeLayer(self.zoomLayer);
-                }
-                if (map.getZoom() <= 9 && self.containerLayer.hasLayer(self.zoomLayer) == false) {
-                    self.containerLayer.addLayer(self.zoomLayer);
-                }
-            });
-            if (typeof url != 'undefined') {
-                this.pointUrl = url + '/point';
-                this.polygonUrl = url + '/polygon';
-            }
-            ;
-        }
-        Sat.prototype.hide = function () {
-            var self = this;
-            self.zoomLayer.clearLayers();
-            self.polygonLayer.clearLayers();
-        };
-        Sat.prototype.show = function () {
-            var self = this;
-            self.zoomLayer.clearLayers();
-            self.polygonLayer.clearLayers();
-            reqwest({
-                url: self.pointUrl || 'point.geojson',
-                method: 'get',
-                type: 'json',
-                success: function (geojson) {
-                    self.zoomLayer.addLayers(geojson.features);
-                    if (self.map.getZoom() <= 9)
-                        self.containerLayer.addLayer(self.zoomLayer);
-                }
-            });
-            reqwest({
-                url: self.polygonUrl || 'polygon.geojson',
-                method: 'get',
-                type: 'json',
-                success: function (geojson) {
-                    for (var k in geojson.features) {
-                        var timeStamp = geojson.features[k].properties.timeStamp;
-                        geojson.features[k].properties.timeStampTxt = timeStamp.substr(0, 10) + ' ' + timeStamp.substr(11, 5);
-                    }
-                    self.containerLayer.addLayer(self.polygonLayer.addLayers(geojson.features, "Satellite detection - EMSA"));
-                }
-            });
-        };
-        return Sat;
-    }());
-    Observation.Sat = Sat;
-})(Observation || (Observation = {}));
-//# sourceMappingURL=leaflet-observation-sat.js.map
\ No newline at end of file
diff --git a/src/leaflet-observation-sat.js.map b/src/leaflet-observation-sat.js.map
deleted file mode 100644
index 252718e..0000000
--- a/src/leaflet-observation-sat.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"leaflet-observation-sat.js","sourceRoot":"","sources":["leaflet-observation-sat.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/leaflet-observation-sat.ts b/src/leaflet-observation-sat.ts
deleted file mode 100644
index 619905d..0000000
--- a/src/leaflet-observation-sat.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/// <reference path="def/leaflet-observation.d.ts" />
-
-
-module Observation {
-    export class Sat {
-        private map : L.Map;
-        private containerLayer : L.LayerGroup<L.ILayer>;
-        private zoomLayer : L.Observation;        
-        private polygonLayer : L.Observation;
-        private pointUrl : string;
-        private polygonUrl : string;
-        
-        constructor(map: L.Map, callbackFn: Function, url: string) {
-            var self = this;
-            this.map = map;
-            this.containerLayer = new L.LayerGroup();
-            map.addLayer(this.containerLayer);
-            this.zoomLayer = L.observation({type: 'zoom'}); 
-            this.zoomLayer.on('click', function (evt:any) {
-                    map.setView(evt.layer.getLatLng(), 12); 
-            });
-             
-            var label ='{gml_id}<hr />';
-            label += '<table id="LabelDataTable" display=block width="200" cellpadding="0" cellspacing="0">';
-            label += '<tr><td>Provider:</td><td>{provider}</td></tr><tr><td>Time:</td><td>{timeStampTxt}</td></tr>';
-            label += '</table>';             
-            this.polygonLayer = L.observation({type: 'polygon', label: label});
-            this.polygonLayer.on('click', function (evt:any) {
-                    if (callbackFn && map.getZoom() > 9) callbackFn(evt.layer.getLatLngs(), evt.layer.toGeoJSON(), evt.layer.observation.properties.timeStamp,  evt.layer.observation.properties.gml_id);
-                });
-    
-            map.on('zoomend', function () {  
-                if (map.getZoom() > 9 && self.containerLayer.hasLayer(self.zoomLayer)) {
-                    self.containerLayer.removeLayer(self.zoomLayer);
-                }
-                if (map.getZoom() <= 9 && self.containerLayer.hasLayer(self.zoomLayer) == false) {
-                    self.containerLayer.addLayer(self.zoomLayer);
-                }              
-            });        
-            if (typeof url != 'undefined') {
-                this.pointUrl = url+'/point';
-                this.polygonUrl = url+'/polygon';
-            };
-        }
-        public hide() {
-            var self = this;
-            self.zoomLayer.clearLayers();     
-            self.polygonLayer.clearLayers();       
-        }
-        
-        public show() {
-            var self = this;
-            self.zoomLayer.clearLayers();     
-            self.polygonLayer.clearLayers();       
-            reqwest({
-                url: self.pointUrl || 'point.geojson',
-                method: 'get',
-                type: 'json',
-                success: function (geojson) {
-                    self.zoomLayer.addLayers(geojson.features);
-                     if (self.map.getZoom() <= 9) self.containerLayer.addLayer(self.zoomLayer);
-                }
-            });   
-            reqwest({
-                url: self.polygonUrl || 'polygon.geojson',
-                method: 'get',
-                type: 'json',
-                success: function (geojson) {
-                    for (var k in geojson.features) {
-                        var timeStamp:string = geojson.features[k].properties.timeStamp;
-                        geojson.features[k].properties.timeStampTxt = timeStamp.substr(0,10)+' '+timeStamp.substr(11,5);
-                    }
-                    self.containerLayer.addLayer(self.polygonLayer.addLayers(geojson.features, "Satellite detection - EMSA"));
-                }
-            });            
-        }
-    
-    }
-
-}
\ No newline at end of file
diff --git a/src/leaflet-observation.js b/src/leaflet-observation.js
deleted file mode 100644
index 214b006..0000000
--- a/src/leaflet-observation.js
+++ /dev/null
@@ -1,93 +0,0 @@
-L.Observation = L.FeatureGroup.extend({
-	options: {
-		type: 'zoom',
-		label : '<label not set>',
-	},
-
-	initialize: function (options) {
-		L.setOptions(this, options);
-		L.FeatureGroup.prototype.initialize.call(this, null);
-	},
-
-	addLayers: function (observations, provider) {
-		if (observations) {
-			for (var i = 0, len = observations.length; i < len; i++) {
-				this.addLayer(observations[i], provider);
-			}
-		}
-		return this;
-	},
-
-	addLayer: function (observation, provider) {	
-		if (this.options.type == 'zoom') {
-			if (observation.geometry.type == 'Point') {
-				L.FeatureGroup.prototype.addLayer.call(this, this.createZoomMarker(observation));
-			}
-		}
-		if (this.options.type == 'polygon') {
-			if (observation.geometry.type !== 'Point') {
-				L.FeatureGroup.prototype.addLayer.call(this, this.createPolygon(observation, provider));			
-			}
-		}
-	},
-	
-	getStyle: function(observation){
-		var timestamp = observation.properties.timeStamp;
-	
-        var now = new Date();
-        var d = timestamp;
-        var dateObj = new Date(d.substr(0, 4), (parseInt(d.substr(5, 2)) - 1), d.substr(8, 2), d.substr(11, 2), d.substr(14, 2), d.substr(18, 2));
-        var diff = now.getTime() - dateObj.getTime();
-        
-        
-        var oneday = 3600 * 1000 * 24;
-        var yesterday = oneday * 2;
-        var twodaysago = oneday * 3;
-        
-        //If older then 2 weeks, do not display on screen
-        var opacity = 1;
-        if (diff > (oneday*14)) {
-            opacity = 0.8;
-        }
-        
-        var col = '#FFFFFF';
-        //within a day
-        if (diff < oneday) {
-            col = '#FF0000';
-        } else if (diff > oneday && diff <= yesterday) {
-            col = '#FF9900';
-        } else if (diff > yesterday && diff <= twodaysago) {
-            col = '#FFFF00';
-        } 
-        var style = {
-            color: col,
-            radius: 10,
-            weight: 2,
-            opacity: opacity
-        };
-        return style;
-	},
-
-	createZoomMarker: function (observation) {
-		var marker = L.circleMarker([observation.geometry.coordinates[1],observation.geometry.coordinates[0]], this.getStyle(observation));
-		marker.observation = observation;
-		return marker;
-	},
-	createPolygon: function (observation, provider) {
-        var layer = L.GeoJSON.geometryToLayer(observation);
-        if (provider) {
-        	observation.properties.provider = provider;
-        }
-        
-        layer.bindTooltip(L.Util.template(this.options.label, observation.properties), { 'noHide': true });
-        
-		layer.setStyle(this.getStyle(observation));
-        layer.observation = observation;
-        return layer;
-	}
-});
-
-L.observation = function (observations, options) {
-	return new L.Observation(observations, options);
-};
-
diff --git a/tsconfig.json b/tsconfig.json
index 200db5c..6be58e8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,8 +6,8 @@
     },
     "files": [
         "src/leaflet-exercise-control.ts",
-        "src/leaflet-exercise-cards.ts",
-        "src/leaflet-observation-sat.ts"
+        "src/leaflet-exercise-cards.ts"
+
     ],    
     "exclude": [
         "node_modules",
-- 
GitLab