testing

src/def/stwkit.d.ts

@@ -8,5 +8,7 @@ declare namespace STWkit{
 	export var deleteParam: any;
 	export var getSearchUrl: any;
 	export var getParamValue: any;
+	export var LocationCard: any;
+	export var PeriodCard: any;
 	
 }
\ No newline at end of file

src/leaflet-itracer-cards.js

@@ -16,7 +16,28 @@ var __extends = (this && this.__extends) || (function () {
 var ITLocation = (function (_super) {
     __extends(ITLocation, _super);
     function ITLocation(id, parentDiv, lang, langData, map, forcing) {
-        return _super.call(this, id, 'Specify location', parentDiv, lang, langData, map, forcing) || this;
+        var _this = this;
+        var options = {};
+        var initials = 'it';
+        options['singlebutton'] = true;
+        options['multiplebutton'] = false;
+        options['linebutton'] = true;
+        options['areabutton'] = true;
+        options['afterDiv'] = true;
+        options['initials'] = initials;
+        _this = _super.call(this, id, 'Specify location', parentDiv, lang, langData, map, forcing, options) || this;
+        var fieldset = L.DomUtil.create('fieldset', 'uk-margin-top', _this.locationForm);
+        var depthRowDiv = L.DomUtil.create('div', 'uk-form-row', fieldset);
+        _super.prototype.addLabelDiv.call(_this, depthRowDiv, "Outlet at depth (m)", "See more information <a style='color:#faa732;' href='help/classic/#" + initials + "-depth' target='_blank'>here</a>");
+        var depthDiv = L.DomUtil.create('div', ' uk-width-1-1', depthRowDiv);
+        _this.depthInput = L.DomUtil.create('input', 'uk-width-1-4', depthDiv);
+        _this.depthInput.type = 'number';
+        _this.depthInput.value = '0';
+        _this.depthInput.min = '0';
+        _this.depthInput.onchange = function () {
+            //validate();
+        };
+        return _this;
     }
     ITLocation.prototype.show = function () {
         _super.prototype.show.call(this);
@@ -35,4 +56,149 @@ var ITLocation = (function (_super) {
     };
     return ITLocation;
 }(STWkit.LocationCard));
+var ITAmount = (function (_super) {
+    __extends(ITAmount, _super);
+    function ITAmount(id, title, parentDiv, lang, map) {
+        var _this = this;
+        var amountDiv = L.DomUtil.create('div', 'uk-width-1-1 uk-margin-top', parentDiv);
+        _this = _super.call(this, id, title, parentDiv, amountDiv) || this;
+        var self = _this;
+        var form = L.DomUtil.create('form', 'uk-form uk-form-stacked', amountDiv);
+        form.onsubmit = function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+            return false;
+        };
+        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 = 'guideos8';
+        amountRowDiv.guideFn = function () {
+            self.amountInput.value = '100';
+        };
+        _super.prototype.addLabelDiv.call(_this, amountRowDiv, "Total amount/rate", "See more information <a style='color:#faa732;' href='help/classic/#oil-os-totalamount' 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 = '100';
+        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');
+        addOption(self.amountSelect, 'm3/hour', 'm³ / hour');
+        addOption(self.amountSelect, 'tonnes/hour', 'tonnes / hour');
+        addOption(self.amountSelect, 'm3/day', 'm³ / day');
+        addOption(self.amountSelect, 'tonnes/day', 'tonnes / day');
+        var durationRowDiv = L.DomUtil.create('div', 'uk-form-row', fieldset);
+        durationRowDiv.id = 'guideos9';
+        durationRowDiv.guideFn = function () {
+            self.durationInput.value = '6';
+            validate();
+        };
+        _super.prototype.addLabelDiv.call(_this, durationRowDiv, "Duration", "See more information <a style='color:#faa732;' href='help/classic/#oil-os-amount-duration' target='_blank'>here</a>");
+        var durationDiv = L.DomUtil.create('div', '', durationRowDiv);
+        durationDiv.id = 'guideos7';
+        self.durationInput = L.DomUtil.create('input', 'uk-width-1-4', durationDiv);
+        self.durationInput.type = 'number';
+        self.durationInput.step = '1';
+        self.durationInput.min = '0';
+        var durationUnitDiv = L.DomUtil.create('div', 'uk-width-1-2 uk-form-select select', durationDiv);
+        durationUnitDiv.setAttribute('data-uk-form-select', '');
+        var selectedDurationUnit = L.DomUtil.create('span', '', durationUnitDiv);
+        self.durationSelect = L.DomUtil.create('select', '', durationUnitDiv);
+        addOption(self.durationSelect, 'hours', 'hours');
+        addOption(self.durationSelect, 'days', 'days');
+        self.amountInput.onchange = function () {
+            validate();
+        };
+        self.durationInput.onchange = function () {
+            validate();
+        };
+        function validate() {
+            var amountValue = parseInt(self.amountInput.value);
+            var amountOk = false;
+            if (amountValue < 0)
+                self.amountInput.value = "0";
+            if (amountValue > 0)
+                amountOk = true;
+            var durationValue = parseInt(self.durationInput.value);
+            var durationOk = false;
+            if (durationValue < 0)
+                self.durationInput.value = "0";
+            if (durationValue > 0)
+                durationOk = true;
+            if (amountOk && durationOk) {
+                self.status = true;
+                STWkit.AccordionCard.enableNext(self.nextButton, true);
+                (self.oncallback && self.oncallback());
+            }
+        }
+        ;
+        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 = 'guideos10';
+        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> and <b>duration</b>.');
+                return;
+            }
+            (self.oncallback && self.oncallback(true));
+        };
+        UIkit.ready(function () {
+            self.defaults();
+        });
+        return _this;
+    }
+    ITAmount.prototype.defaults = function () {
+        var self = this;
+    };
+    ITAmount.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;
+        self.durationInput.value = simulation.duration;
+        var durationevt = document.createEvent('Event');
+        durationevt.initEvent("change", true, true);
+        self.durationInput.dispatchEvent(durationevt);
+        self.durationSelect.value = simulation.durationUnit;
+    };
+    ITAmount.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;
+        geojson.features[0].properties["simulation"]["duration"] = self.durationInput.value;
+        geojson.features[0].properties["simulation"]["durationUnit"] = self.durationSelect.options[self.durationSelect.selectedIndex].value;
+    };
+    ITAmount.prototype.clear = function () {
+        var self = this;
+        _super.prototype.clear.call(this);
+        self.amountInput.value = '';
+        self.durationInput.value = '';
+        STWkit.AccordionCard.enableNext(self.nextButton, false);
+        self.status = false;
+        (self.oncallback && self.oncallback());
+    };
+    return ITAmount;
+}(STWkit.AccordionCard));
 //# sourceMappingURL=leaflet-itracer-cards.js.map
\ No newline at end of file

src/leaflet-itracer-cards.js.map

-{"version":3,"file":"leaflet-itracer-cards.js","sourceRoot":"","sources":["leaflet-itracer-cards.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,yCAAyC;AACzC,wCAAwC;AACxC,0DAA0D;AAC1D,yCAAyC;;;;;;;;;;;AAGzC;IAAyB,8BAAmB;IAExC,oBAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO;eACnD,kBAAM,EAAE,EAAE,kBAAkB,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC;IAC1E,CAAC;IAEM,yBAAI,GAAX;QACI,iBAAM,IAAI,WAAE,CAAC;IACjB,CAAC;IAEM,yBAAI,GAAX;QACI,iBAAM,IAAI,WAAE,CAAC;IACjB,CAAC;IAEM,iCAAY,GAAnB,UAAoB,OAAO;QACvB,iBAAM,YAAY,YAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAGM,iCAAY,GAAnB,UAAoB,OAAO;QACvB,iBAAM,YAAY,YAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAEM,0BAAK,GAAZ;QACI,iBAAM,KAAK,WAAE,CAAC;IAClB,CAAC;IAGL,iBAAC;AAAD,CAAC,AA5BD,CAAyB,MAAM,CAAC,YAAY,GA4B3C"}
\ No newline at end of file
+{"version":3,"file":"leaflet-itracer-cards.js","sourceRoot":"","sources":["leaflet-itracer-cards.ts"],"names":[],"mappings":"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"}
\ No newline at end of file

src/leaflet-itracer-cards.ts

@@ -7,8 +7,35 @@
 
 class ITLocation extends STWkit.LocationCard {
 
+    private locationDiv: HTMLDivElement;
+    private locationForm: HTMLFormElement;
+    public depthInput: HTMLInputElement;    
+
     constructor(id, parentDiv, lang, langData, map, forcing) {
-        super(id, 'Specify location', parentDiv, lang, langData, map, forcing);
+        var options:any = {};
+        var initials = 'it';
+        options['singlebutton'] = true;
+        options['multiplebutton'] = false;
+        options['linebutton'] = true;
+        options['areabutton'] = true;
+        options['afterDiv'] = true;
+        options['initials'] = initials;
+        super(id, 'Specify location', parentDiv, lang, langData, map, forcing, options);
+
+        var fieldset = <HTMLFieldSetElement>L.DomUtil.create('fieldset', 'uk-margin-top', this.locationForm);
+        var depthRowDiv = <HTMLDivElement>L.DomUtil.create('div', 'uk-form-row', fieldset);
+        super.addLabelDiv(depthRowDiv, "Outlet at depth (m)", "See more information <a style='color:#faa732;' href='help/classic/#"+initials+"-depth' target='_blank'>here</a>");
+        var depthDiv = <HTMLDivElement>L.DomUtil.create('div', ' uk-width-1-1', depthRowDiv);
+        this.depthInput = <HTMLInputElement>L.DomUtil.create('input', 'uk-width-1-4', depthDiv);
+        this.depthInput.type = 'number';
+        this.depthInput.value = '0';
+        this.depthInput.min = '0';
+
+        this.depthInput.onchange = function () {
+            //validate();
+        };
+
+
     }
 
     public show() {
@@ -35,3 +62,166 @@ class ITLocation extends STWkit.LocationCard {
 
 }
 
+class ITAmount extends STWkit.AccordionCard {
+    public oncallback: Function;
+    public amountInput: HTMLInputElement;
+    public durationInput: HTMLInputElement;
+    public amountSelect: HTMLSelectElement;
+    public durationSelect: HTMLSelectElement;
+    public nextButton: any;
+
+    constructor(id, title, parentDiv, lang, map) {
+        var amountDiv = <HTMLDivElement>L.DomUtil.create('div', 'uk-width-1-1 uk-margin-top', parentDiv);
+        super(id, title, parentDiv, amountDiv);
+        var self = this;
+        var form = <HTMLFormElement>L.DomUtil.create('form', 'uk-form uk-form-stacked', amountDiv);
+        form.onsubmit = function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+            return false;
+        };
+
+        function addOption(parent, value, txt) {
+            var option = <HTMLOptionElement>L.DomUtil.create('option', '', parent);
+            option.value = value;
+            option.textContent = txt;
+        }
+
+
+        var fieldset = <HTMLFieldSetElement>L.DomUtil.create('fieldset', '', form);
+        var amountRowDiv: any = <HTMLDivElement>L.DomUtil.create('div', 'uk-form-row', fieldset);
+        amountRowDiv.id = 'guideos8';
+        amountRowDiv.guideFn = function () {
+            self.amountInput.value = '100';
+        }
+
+        super.addLabelDiv(amountRowDiv, "Total amount/rate", "See more information <a style='color:#faa732;' href='help/classic/#oil-os-totalamount' target='_blank'>here</a>");
+        var amountValueDiv = <HTMLDivElement>L.DomUtil.create('div', 'uk-width-1-1', amountRowDiv);
+        self.amountInput = <HTMLInputElement>L.DomUtil.create('input', 'uk-width-1-4', amountValueDiv);
+        self.amountInput.type = 'number';
+        self.amountInput.step = '100';
+        self.amountInput.min = '0';
+        var amountUnitDiv = <HTMLDivElement>L.DomUtil.create('div', 'uk-width-1-2 uk-form-select select', amountValueDiv);
+        amountUnitDiv.setAttribute('data-uk-form-select', '');
+        var selectedAmountUnit = <HTMLSpanElement>L.DomUtil.create('span', '', amountUnitDiv);
+        self.amountSelect = <HTMLSelectElement>L.DomUtil.create('select', '', amountUnitDiv);
+        addOption(self.amountSelect, 'm3', 'm³');
+        addOption(self.amountSelect, 'tonnes', 'tonnes');
+        addOption(self.amountSelect, 'm3/hour', 'm³ / hour');
+        addOption(self.amountSelect, 'tonnes/hour', 'tonnes / hour');
+        addOption(self.amountSelect, 'm3/day', 'm³ / day');
+        addOption(self.amountSelect, 'tonnes/day', 'tonnes / day');
+
+        var durationRowDiv: any = <HTMLDivElement>L.DomUtil.create('div', 'uk-form-row', fieldset);
+        durationRowDiv.id = 'guideos9';
+        durationRowDiv.guideFn = function () {
+            self.durationInput.value = '6';
+            validate();
+        }
+
+        super.addLabelDiv(durationRowDiv, "Duration", "See more information <a style='color:#faa732;' href='help/classic/#oil-os-amount-duration' target='_blank'>here</a>");
+        var durationDiv = <HTMLDivElement>L.DomUtil.create('div', '', durationRowDiv);
+        durationDiv.id = 'guideos7';
+        self.durationInput = <HTMLInputElement>L.DomUtil.create('input', 'uk-width-1-4', durationDiv);
+        self.durationInput.type = 'number';
+        self.durationInput.step = '1';
+        self.durationInput.min = '0';
+        var durationUnitDiv = <HTMLDivElement>L.DomUtil.create('div', 'uk-width-1-2 uk-form-select select', durationDiv);
+        durationUnitDiv.setAttribute('data-uk-form-select', '');
+        var selectedDurationUnit = <HTMLSpanElement>L.DomUtil.create('span', '', durationUnitDiv);
+        self.durationSelect = <HTMLSelectElement>L.DomUtil.create('select', '', durationUnitDiv);
+        addOption(self.durationSelect, 'hours', 'hours');
+        addOption(self.durationSelect, 'days', 'days');
+
+        self.amountInput.onchange = function () {
+            validate();
+        };
+        self.durationInput.onchange = function () {
+            validate();
+        };
+
+        function validate() {
+            var amountValue = parseInt(self.amountInput.value);
+            var amountOk = false;
+            if (amountValue < 0) self.amountInput.value = "0";
+            if (amountValue > 0) amountOk = true;
+            var durationValue = parseInt(self.durationInput.value);
+            var durationOk = false;
+            if (durationValue < 0) self.durationInput.value = "0";
+            if (durationValue > 0) durationOk = true;
+            if (amountOk && durationOk) {
+                self.status = true;
+                STWkit.AccordionCard.enableNext(self.nextButton, true);
+                (self.oncallback && self.oncallback());
+            }
+        };
+
+
+        var clearDiv = <HTMLDivElement>L.DomUtil.create('div', 'uk-clearfix', amountDiv);
+        var clearButton = <HTMLButtonElement>L.DomUtil.create('button', 'uk-button uk-margin-top uk-align-left', clearDiv);
+        clearButton.textContent = 'Clear';
+        clearButton.onclick = function () {
+            self.clear();
+        };
+        self.nextButton = <HTMLButtonElement>L.DomUtil.create('button', 'uk-button uk-margin-top uk-align-right', clearDiv);
+        self.nextButton.id = 'guideos10';
+        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> and <b>duration</b>.');
+                return;
+            }
+
+            (self.oncallback && self.oncallback(true));
+        };
+
+        UIkit.ready(function () {
+            self.defaults();
+        });
+
+    }
+
+    public defaults() {
+        var self = this;
+    }
+    public populateCard(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;
+
+        self.durationInput.value = simulation.duration;
+        var durationevt = document.createEvent('Event');
+        durationevt.initEvent("change", true, true);
+        self.durationInput.dispatchEvent(durationevt);
+        self.durationSelect.value = simulation.durationUnit;
+    }
+
+    public populateData(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;
+        geojson.features[0].properties["simulation"]["duration"] = self.durationInput.value;
+        geojson.features[0].properties["simulation"]["durationUnit"] = self.durationSelect.options[self.durationSelect.selectedIndex].value;
+    }
+
+
+    public clear() {
+        var self = this;
+        super.clear();
+        self.amountInput.value = '';
+        self.durationInput.value = '';
+        STWkit.AccordionCard.enableNext(self.nextButton, false);
+        self.status = false;
+        (self.oncallback && self.oncallback());
+    }
+}

src/leaflet-itracer-control.js

@@ -23,7 +23,7 @@ var L;
             __extends(InstantTracer, _super);
             function InstantTracer(options) {
                 var _this = _super.call(this, options) || this;
-                _this.type = 'object';
+                _this.type = 'point';
                 _this.subtype = 'instant';
                 _this.name = 'itracer';
                 _this.initials = 'it';
@@ -32,37 +32,29 @@ var L;
             InstantTracer.prototype.setup = function (map) {
                 var _this = this;
                 var self = this;
-                this.container = L.DomUtil.create('div', +self.name + '-control');
+                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 ITLocation(locationid, this.accordionDiv, self.lang, self.langData, map, self.forcing);
                 self.cardMap[locationid].show();
+                var periodid = self.initials + 'periodCard';
+                self.cardMap[periodid] = new STWkit.PeriodCard(periodid, 'Simulation period', this.accordionDiv, self.lang, map, self.domain, self.forcingmodel);
+                var amountid = self.initials + 'amountCard';
+                self.cardMap[amountid] = new ITAmount(amountid, 'Amount', this.accordionDiv, self.lang, map);
                 _super.prototype.setup.call(this, map);
-                // var periodid = 'itperiodCard';
-                // super.cardMap[periodid] = new OOPeriod(periodid, accordionDiv, super.lang, self.map, super.domain, self.forcingmodel);
-                // var oiltypeid = 'itoiltypeCard';
-                // super.cardMap[oiltypeid] = new OOType(oiltypeid, accordionDiv, super.lang, self.map);
-                // var amountid = 'itamountCard';
-                // super.cardMap[amountid] = new OOAmount(amountid, accordionDiv, super.lang, self.map);
-                // super.cardMap[periodid].addChangeFnListener(super.cardMap[oiltypeid]);
-                // super.cardMap[locationid].addChangeFnListener(super.cardMap[amountid]);
                 var chain = [];
-                // chain[locationid] = periodid;
-                // chain[periodid] = oiltypeid;
-                // chain[oiltypeid] = amountid;
-                // chain[amountid] = '';
+                chain[locationid] = periodid;
+                chain[periodid] = amountid;
+                chain[amountid] = '';
                 self.cardMap[locationid].oncallback = function (gonext) {
                     _super.prototype.callback.call(_this, chain, locationid, gonext);
                 };
-                // super.cardMap[periodid].oncallback = function (gonext) {
-                //     callback(periodid, gonext);
-                // };
-                // super.cardMap[oiltypeid].oncallback = function (gonext) {
-                //     callback(oiltypeid, gonext);
-                // };
-                // super.cardMap[amountid].oncallback = function (gonext) {
-                //     callback(amountid, gonext);
-                // };
+                self.cardMap[periodid].oncallback = function (gonext) {
+                    _super.prototype.callback.call(_this, chain, periodid, gonext);
+                };
+                self.cardMap[amountid].oncallback = function (gonext) {
+                    _super.prototype.callback.call(_this, chain, amountid, gonext);
+                };
             };
             InstantTracer.prototype.ready = function (name) {
                 _super.prototype.ready.call(this, name);

src/leaflet-itracer-control.js.map

-{"version":3,"file":"leaflet-itracer-control.js","sourceRoot":"","sources":["leaflet-itracer-control.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,yCAAyC;AACzC,yCAAyC;AACzC,wCAAwC;AACxC,wCAAwC;AACxC,yCAAyC;AACzC,iDAAiD;;;;;;;;;;;AAIjD,IAAO,CAAC,CA0EP;AA1ED,WAAO,CAAC;IAAC,IAAA,OAAO,CA0Ef;IA1EQ,WAAA,OAAO;QACZ;YAAmC,iCAAkB;YAcjD,uBAAY,OAAO;gBAAnB,YACI,kBAAM,OAAO,CAAC,SAKjB;gBAJG,KAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;gBACrB,KAAI,CAAC,OAAO,GAAG,SAAS,CAAC;gBACzB,KAAI,CAAC,IAAI,GAAG,SAAS,CAAC;gBACtB,KAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;;YACzB,CAAC;YAEO,6BAAK,GAAb,UAAc,GAAG;gBAAjB,iBAmCC;gBAlCG,IAAI,IAAI,GAAG,IAAI,CAAC;gBAChB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,IAAI,GAAC,UAAU,CAAC,CAAC;gBAChE,IAAI,CAAC,YAAY,GAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC5F,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,GAAC,cAAc,CAAC;gBAE9C,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACtH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;gBAChC,iBAAM,KAAK,YAAC,GAAG,CAAC,CAAC;gBACjB,iCAAiC;gBACjC,yHAAyH;gBACzH,mCAAmC;gBACnC,wFAAwF;gBACxF,iCAAiC;gBACjC,wFAAwF;gBACxF,yEAAyE;gBACzE,0EAA0E;gBAC1E,IAAI,KAAK,GAAG,EAAE,CAAC;gBACf,gCAAgC;gBAChC,+BAA+B;gBAC/B,+BAA+B;gBAC/B,wBAAwB;gBACxB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,UAAU,GAAG,UAAC,MAAM;oBACzC,iBAAM,QAAQ,aAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;gBAC9C,CAAC,CAAC;gBACF,2DAA2D;gBAC3D,kCAAkC;gBAClC,KAAK;gBACL,4DAA4D;gBAC5D,mCAAmC;gBACnC,KAAK;gBACL,2DAA2D;gBAC3D,kCAAkC;gBAClC,KAAK;YAET,CAAC;YAEM,6BAAK,GAAZ,UAAa,IAAI;gBACb,iBAAM,KAAK,YAAC,IAAI,CAAC,CAAC;YACtB,CAAC;YAEO,6BAAK,GAAb;gBACI,iBAAM,KAAK,WAAE,CAAC;YAClB,CAAC;YACO,4BAAI,GAAZ;YACA,CAAC;YACO,4BAAI,GAAZ;gBACI,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC;YAEL,oBAAC;QAAD,CAAC,AAxED,CAAmC,MAAM,CAAC,WAAW,GAwEpD;QAxEY,qBAAa,gBAwEzB,CAAA;IACL,CAAC,EA1EQ,OAAO,GAAP,SAAO,KAAP,SAAO,QA0Ef;AAAD,CAAC,EA1EM,CAAC,KAAD,CAAC,QA0EP"}
\ No newline at end of file
+{"version":3,"file":"leaflet-itracer-control.js","sourceRoot":"","sources":["leaflet-itracer-control.ts"],"names":[],"mappings":"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"}
\ No newline at end of file

src/leaflet-itracer-control.ts

@@ -18,6 +18,7 @@ module L.Control {
         private lang: string;
         private langData: any;
         private cardMap: any;
+        private domain: string;        
         private type: string;
         private subtype: string;                
         private name: string;
@@ -25,46 +26,38 @@ module L.Control {
 
         constructor(options) {
             super(options);
-            this.type = 'object';
+            this.type = 'point';
             this.subtype = 'instant';
             this.name = 'itracer';
             this.initials = 'it';
+            
         }
 
         private setup(map) {
             var self = this;
-            this.container = L.DomUtil.create('div', +self.name+'-control');
+            this.container = L.DomUtil.create('div', self.name+'-control');
             this.accordionDiv = <HTMLDivElement>L.DomUtil.create('div', 'uk-accordion', this.container);
             var locationid = self.initials+'locationCard';
-            
             self.cardMap[locationid] = new ITLocation(locationid, this.accordionDiv, self.lang, self.langData, map, self.forcing);
             self.cardMap[locationid].show();
+            var periodid = self.initials+'periodCard';
+            self.cardMap[periodid] = new STWkit.PeriodCard(periodid, 'Simulation period', this.accordionDiv, self.lang, map, self.domain, self.forcingmodel);
+            var amountid = self.initials+'amountCard';
+            self.cardMap[amountid] = new ITAmount(amountid, 'Amount', this.accordionDiv, self.lang, map);
             super.setup(map);
-            // var periodid = 'itperiodCard';
-            // super.cardMap[periodid] = new OOPeriod(periodid, accordionDiv, super.lang, self.map, super.domain, self.forcingmodel);
-            // var oiltypeid = 'itoiltypeCard';
-            // super.cardMap[oiltypeid] = new OOType(oiltypeid, accordionDiv, super.lang, self.map);
-            // var amountid = 'itamountCard';
-            // super.cardMap[amountid] = new OOAmount(amountid, accordionDiv, super.lang, self.map);
-            // super.cardMap[periodid].addChangeFnListener(super.cardMap[oiltypeid]);
-            // super.cardMap[locationid].addChangeFnListener(super.cardMap[amountid]);
             var chain = [];
-            // chain[locationid] = periodid;
-            // chain[periodid] = oiltypeid;
-            // chain[oiltypeid] = amountid;
-            // chain[amountid] = '';
+            chain[locationid] = periodid;
+            chain[periodid] = amountid;
+            chain[amountid] = '';
             self.cardMap[locationid].oncallback = (gonext) => {
                 super.callback(chain, locationid, gonext);
             };
-            // super.cardMap[periodid].oncallback = function (gonext) {
-            //     callback(periodid, gonext);
-            // };
-            // super.cardMap[oiltypeid].oncallback = function (gonext) {
-            //     callback(oiltypeid, gonext);
-            // };
-            // super.cardMap[amountid].oncallback = function (gonext) {
-            //     callback(amountid, gonext);
-            // };
+            self.cardMap[periodid].oncallback = (gonext) => {
+                super.callback(chain, periodid, gonext);
+            };
+            self.cardMap[amountid].oncallback = (gonext) => {
+                super.callback(chain, amountid, gonext);
+            };
 
         }