diff --git a/dist/_tests/demos/reacttst.jsx b/dist/_tests/demos/reacttst.jsx
deleted file mode 100644
index 35eeb99bbda478e2780004025fa0712b277a532f..0000000000000000000000000000000000000000
--- a/dist/_tests/demos/reacttst.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Created by gavorhes on 9/22/2016.
- */
-"use strict";
-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 __());
- };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var reactAndRedux_1 = require("../../reactComponents/reactAndRedux");
-var Demo = (function (_super) {
- __extends(Demo, _super);
- function Demo() {
- return _super !== null && _super.apply(this, arguments) || this;
- }
- Demo.prototype.render = function () {
- return <div>
-
-
- </div>;
- };
- return Demo;
-}(reactAndRedux_1.React.Component));
-reactAndRedux_1.ReactDom.render(<Demo />, document.getElementById("example"));
-//# sourceMappingURL=reacttst.jsx.map
\ No newline at end of file
diff --git a/dist/_tests/demos/reacttst.jsx.map b/dist/_tests/demos/reacttst.jsx.map
deleted file mode 100644
index b22296d9d2ba952b0609f209f4c3b60b85dfedf7..0000000000000000000000000000000000000000
--- a/dist/_tests/demos/reacttst.jsx.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"reacttst.jsx","sourceRoot":"","sources":["../../../src/_tests/demos/reacttst.tsx"],"names":[],"mappings":"AAAA;;GAEG;;;;;;;;;;;;;AAEH,qEAAgF;AAGhF;IAAmB,wBAA2B;IAA9C;;IAUA,CAAC;IAPG,qBAAM,GAAN;QACI,MAAM,CAAC,CAAC,GAAG,CAGX;;;QAAA,EAAE,GAAG,CAAC,CAAA;IACV,CAAC;IAEL,WAAC;AAAD,CAAC,AAVD,CAAmB,qBAAK,CAAC,SAAS,GAUjC;AAED,wBAAQ,CAAC,MAAM,CACX,CAAC,IAAI,GAAE,EACP,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CACrC,CAAC","sourcesContent":["/**\r\n * Created by gavorhes on 9/22/2016.\r\n */\r\n\r\nimport {React, ReactDom as reactDom} from '../../reactComponents/reactAndRedux';\r\n\r\n\r\nclass Demo extends React.Component<null, null> {\r\n\r\n\r\n render() {\r\n return <div>\r\n\r\n\r\n </div>\r\n }\r\n\r\n}\r\n\r\nreactDom.render(\r\n <Demo/>,\r\n document.getElementById(\"example\")\r\n);\r\n\r\n\r\n"]}
\ No newline at end of file
diff --git a/dist/olHelpers/geocode.js b/dist/olHelpers/geocode.js
index d014969d0bfb335606436f134910aed7cb9fadb0..de844d9f12fe6d75072a9f031f41b36701d5cc1f 100644
--- a/dist/olHelpers/geocode.js
+++ b/dist/olHelpers/geocode.js
@@ -60,6 +60,7 @@ var Geocode = (function () {
}, 'json');
});
$(this.theInput).keyup(function (evt) {
+ _this.theButton.focus();
_this.theButton.disabled = _this.theInput.value.length == 0;
$theInput.removeClass(invalidClass);
_this.theInput.title = '';
diff --git a/dist/olHelpers/geocode.js.map b/dist/olHelpers/geocode.js.map
index 21ca48475bb1adcc2e6647ababcad5161ff7c6da..c9d9d0dd4f5b00f080365b6719d704261311012a 100644
--- a/dist/olHelpers/geocode.js.map
+++ b/dist/olHelpers/geocode.js.map
@@ -1 +1 @@
-{"version":3,"file":"geocode.js","sourceRoot":"","sources":["../../src/olHelpers/geocode.ts"],"names":[],"mappings":"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","sourcesContent":["import $ = require('jquery')\r\nimport {makeGuid} from '../util/makeGuid';\r\nimport ol = require('custom-ol');\r\nimport {proj3857, proj4326} from './projections';\r\n\r\n\r\nlet invalidClass = 'geocoder-invalid';\r\nlet geocoderLoadingClass = 'geocoder-loading';\r\n\r\n// let testAddress = '65 7th Street, Prairie du Sac, WI';\r\n\r\n\r\nexport class Geocode {\r\n private theButton: HTMLButtonElement;\r\n private theInput: HTMLInputElement;\r\n private map: ol.Map;\r\n private indicationLayer;\r\n\r\n constructor(mapDiv: HTMLDivElement, map: ol.Map) {\r\n let inputGuid = makeGuid();\r\n let buttonGuid = makeGuid();\r\n\r\n this.map = map;\r\n this.indicationLayer = new ol.layer.Vector({\r\n source: new ol.source.Vector(),\r\n style: new ol.style.Style({\r\n image: new ol.style.Circle({\r\n radius: 12,\r\n fill: new ol.style.Fill({color: 'rgba(255,0,0,0.5)'}),\r\n stroke: new ol.style.Stroke({color: 'red', width: 1})\r\n })\r\n })\r\n });\r\n this.map.addLayer(this.indicationLayer);\r\n\r\n $(mapDiv).append('<div class=\"geocoder-el\">' +\r\n `<input type=\"text\" id=\"${inputGuid}\">` +\r\n `<button id=\"${buttonGuid}\">Search</button>` +\r\n '</div>');\r\n\r\n this.theButton = document.getElementById(buttonGuid) as HTMLButtonElement;\r\n this.theInput = document.getElementById(inputGuid) as HTMLInputElement;\r\n\r\n this.reset();\r\n\r\n let $theButton = $(this.theButton);\r\n let $theInput = $(this.theInput);\r\n\r\n $theButton.click((evt) => {\r\n\r\n evt.preventDefault();\r\n\r\n $theButton.addClass(geocoderLoadingClass);\r\n this.theButton.disabled = true;\r\n this.indicationLayer.getSource().clear();\r\n\r\n $.get(\r\n `https://geocode.xyz/${this.theInput.value}?geoit=json`,\r\n {},\r\n (d) => {\r\n let lat = parseFloat(d['latt']);\r\n let lon = parseFloat(d['longt']);\r\n\r\n if ((lat == 0 && lon == 0) || d['error']) {\r\n $theInput.addClass(invalidClass);\r\n this.theInput.title = 'Specified Location Invalid';\r\n this.theButton.title = 'Specified Location Invalid';\r\n\r\n } else {\r\n let v = this.map.getView();\r\n let p = new ol.geom.Point([lon, lat]);\r\n let feat = new ol.Feature(p);\r\n this.indicationLayer.getSource().addFeature(feat);\r\n p.transform(proj4326, proj3857);\r\n\r\n v.setCenter(p.getCoordinates());\r\n v.setZoom(13);\r\n }\r\n\r\n $theButton.removeClass(geocoderLoadingClass);\r\n this.theButton.disabled = false;\r\n },\r\n 'json');\r\n });\r\n\r\n $(this.theInput).keyup((evt) => {\r\n this.theButton.disabled = this.theInput.value.length == 0;\r\n $theInput.removeClass(invalidClass);\r\n this.theInput.title = '';\r\n this.theButton.title = '';\r\n\r\n if (!this.theButton.disabled && evt.keyCode == 13) {\r\n evt.preventDefault();\r\n $theButton.click();\r\n }\r\n })\r\n\r\n }\r\n\r\n private reset() {\r\n this.theButton.disabled = true;\r\n this.theInput.value = '';\r\n }\r\n\r\n\r\n// https://geocode.xyz/65%2075h%20street%20prairie%20du%20sac%20wi?geoit=json\r\n\r\n// error\r\n// geocoder-invalid\r\n\r\n}\r\n\r\n\r\n\r\n"]}
\ No newline at end of file
+{"version":3,"file":"geocode.js","sourceRoot":"","sources":["../../src/olHelpers/geocode.ts"],"names":[],"mappings":"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","sourcesContent":["import $ = require('jquery')\r\nimport {makeGuid} from '../util/makeGuid';\r\nimport ol = require('custom-ol');\r\nimport {proj3857, proj4326} from './projections';\r\n\r\n\r\nlet invalidClass = 'geocoder-invalid';\r\nlet geocoderLoadingClass = 'geocoder-loading';\r\n\r\n// let testAddress = '65 7th Street, Prairie du Sac, WI';\r\n\r\n\r\nexport class Geocode {\r\n private theButton: HTMLButtonElement;\r\n private theInput: HTMLInputElement;\r\n private map: ol.Map;\r\n private indicationLayer;\r\n\r\n constructor(mapDiv: HTMLDivElement, map: ol.Map) {\r\n let inputGuid = makeGuid();\r\n let buttonGuid = makeGuid();\r\n\r\n this.map = map;\r\n this.indicationLayer = new ol.layer.Vector({\r\n source: new ol.source.Vector(),\r\n style: new ol.style.Style({\r\n image: new ol.style.Circle({\r\n radius: 12,\r\n fill: new ol.style.Fill({color: 'rgba(255,0,0,0.5)'}),\r\n stroke: new ol.style.Stroke({color: 'red', width: 1})\r\n })\r\n })\r\n });\r\n this.map.addLayer(this.indicationLayer);\r\n\r\n $(mapDiv).append('<div class=\"geocoder-el\">' +\r\n `<input type=\"text\" id=\"${inputGuid}\">` +\r\n `<button id=\"${buttonGuid}\">Search</button>` +\r\n '</div>');\r\n\r\n this.theButton = document.getElementById(buttonGuid) as HTMLButtonElement;\r\n this.theInput = document.getElementById(inputGuid) as HTMLInputElement;\r\n\r\n this.reset();\r\n\r\n let $theButton = $(this.theButton);\r\n let $theInput = $(this.theInput);\r\n\r\n $theButton.click((evt) => {\r\n\r\n evt.preventDefault();\r\n\r\n $theButton.addClass(geocoderLoadingClass);\r\n this.theButton.disabled = true;\r\n this.indicationLayer.getSource().clear();\r\n\r\n $.get(\r\n `https://geocode.xyz/${this.theInput.value}?geoit=json`,\r\n {},\r\n (d) => {\r\n let lat = parseFloat(d['latt']);\r\n let lon = parseFloat(d['longt']);\r\n\r\n if ((lat == 0 && lon == 0) || d['error']) {\r\n $theInput.addClass(invalidClass);\r\n this.theInput.title = 'Specified Location Invalid';\r\n this.theButton.title = 'Specified Location Invalid';\r\n\r\n } else {\r\n let v = this.map.getView();\r\n let p = new ol.geom.Point([lon, lat]);\r\n let feat = new ol.Feature(p);\r\n this.indicationLayer.getSource().addFeature(feat);\r\n p.transform(proj4326, proj3857);\r\n\r\n v.setCenter(p.getCoordinates());\r\n v.setZoom(13);\r\n }\r\n\r\n $theButton.removeClass(geocoderLoadingClass);\r\n this.theButton.disabled = false;\r\n },\r\n 'json');\r\n });\r\n\r\n $(this.theInput).keyup((evt) => {\r\n this.theButton.focus();\r\n this.theButton.disabled = this.theInput.value.length == 0;\r\n $theInput.removeClass(invalidClass);\r\n this.theInput.title = '';\r\n this.theButton.title = '';\r\n\r\n if (!this.theButton.disabled && evt.keyCode == 13) {\r\n evt.preventDefault();\r\n $theButton.click();\r\n }\r\n })\r\n\r\n }\r\n\r\n private reset() {\r\n this.theButton.disabled = true;\r\n this.theInput.value = '';\r\n }\r\n\r\n\r\n// https://geocode.xyz/65%2075h%20street%20prairie%20du%20sac%20wi?geoit=json\r\n\r\n// error\r\n// geocoder-invalid\r\n\r\n}\r\n\r\n\r\n\r\n"]}
\ No newline at end of file
diff --git a/dist/reactComponents/DatePick.d.ts b/dist/reactComponents/DatePick.d.ts
index f8472ddef2e83b63c2026a9ee92555353ae58c7d..669404a6f3975d9403a655cf44e51629605028a5 100644
--- a/dist/reactComponents/DatePick.d.ts
+++ b/dist/reactComponents/DatePick.d.ts
@@ -8,7 +8,7 @@ export interface iDatePick {
label: string;
id?: string;
initialDate?: Date;
- change: (val: string) => any;
+ change: (val: Date) => any;
val?: Date;
}
/**
diff --git a/dist/reactComponents/DatePick.jsx b/dist/reactComponents/DatePick.jsx
deleted file mode 100644
index b69790598ba3f8d0f8a1dfe3877f3cbfece159f6..0000000000000000000000000000000000000000
--- a/dist/reactComponents/DatePick.jsx
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Created by glenn on 6/14/2017.
- */
-"use strict";
-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 __());
- };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var reactAndRedux_1 = require("./reactAndRedux");
-var $ = require("jquery");
-require("jquery-ui");
-var makeGuid_1 = require("../util/makeGuid");
-var dateFormat_1 = require("./helpers/dateFormat");
-/**
- * params label, id, initialDate, change callback with value as string
- */
-var DatePick = (function (_super) {
- __extends(DatePick, _super);
- function DatePick(props, context) {
- var _this = _super.call(this, props, context) || this;
- _this.elId = _this.props.id || makeGuid_1.default();
- return _this;
- }
- DatePick.prototype.componentDidMount = function () {
- var _this = this;
- var $el = $('#' + (this.elId));
- $el.datepicker({
- onSelect: function () {
- _this.props.change($el.val());
- }
- });
- };
- DatePick.prototype.render = function () {
- var params = {
- id: this.elId,
- type: 'text',
- style: { margin: "0 10px 0 5px", width: '73px', textAlign: 'center' },
- readOnly: true
- };
- if (this.props.val) {
- params['value'] = this.props.val;
- }
- else {
- params['defaultValue'] = dateFormat_1.dateToString(this.props.initialDate || new Date());
- }
- return <span className="date-pick">
- <label htmlFor={this.elId}>{this.props.label}</label>
- <input id={this.elId} type="text" style={{ margin: "0 10px 0 5px", width: '73px', textAlign: 'center' }} defaultValue={dateFormat_1.dateToString(this.props.initialDate || new Date())} readOnly={true}/>
- <input {...params}/>
- </span>;
- };
- return DatePick;
-}(reactAndRedux_1.React.Component));
-exports.DatePick = DatePick;
-exports.default = DatePick;
-//# sourceMappingURL=DatePick.jsx.map
\ No newline at end of file
diff --git a/dist/reactComponents/DatePick.jsx.map b/dist/reactComponents/DatePick.jsx.map
deleted file mode 100644
index 263f45643823dce87b2130cb369129178637920d..0000000000000000000000000000000000000000
--- a/dist/reactComponents/DatePick.jsx.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"DatePick.jsx","sourceRoot":"","sources":["../../src/reactComponents/DatePick.tsx"],"names":[],"mappings":"AAAA;;GAEG;;;;;;;;;;;;;AAGH,iDAAsC;AACtC,0BAA6B;AAC7B,qBAAmB;AACnB,6CAAwC;AAExC,mDAAkD;AAWlD;;GAEG;AACH;IAA8B,4BAAgC;IAG1D,kBAAY,KAAgB,EAAE,OAAe;QAA7C,YACI,kBAAM,KAAK,EAAE,OAAO,CAAC,SAExB;QADG,KAAI,CAAC,IAAI,GAAG,KAAI,CAAC,KAAK,CAAC,EAAE,IAAI,kBAAQ,EAAE,CAAC;;IAC5C,CAAC;IAED,oCAAiB,GAAjB;QAAA,iBAUC;QATG,IAAI,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/B,GAAG,CAAC,UAAU,CACV;YACI,QAAQ,EAAE;gBACN,KAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YACjC,CAAC;SACJ,CACJ,CAAC;IACN,CAAC;IAED,yBAAM,GAAN;QACI,IAAI,MAAM,GAAG;YACT,EAAE,EAAE,IAAI,CAAC,IAAI;YACb,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,EAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAC;YACnE,QAAQ,EAAE,IAAI;SACjB,CAAC;QAEF,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA,CAAC;YAChB,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QACrC,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,CAAC,cAAc,CAAC,GAAG,yBAAY,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;QAChF,CAAC;QAGD,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAC9B;YAAA,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,CACpD;YAAA,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAC1B,KAAK,CAAC,CAAC,EAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAC,CAAC,CACpE,YAAY,CAAC,CAAC,yBAAY,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,CACjE,QAAQ,CAAC,CAAC,IAAI,CAAC,EAEtB;YAAA,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,EACtB;QAAA,EAAE,IAAI,CAAC,CAAA;IACX,CAAC;IACL,eAAC;AAAD,CAAC,AA7CD,CAA8B,qBAAK,CAAC,SAAS,GA6C5C;AA7CY,4BAAQ;AA+CrB,kBAAe,QAAQ,CAAC","sourcesContent":["/**\r\n * Created by glenn on 6/14/2017.\r\n */\r\n\r\n\r\nimport {React} from './reactAndRedux';\r\nimport $ = require('jquery');\r\nimport 'jquery-ui';\r\nimport makeGuid from '../util/makeGuid';\r\n\r\nimport {dateToString} from './helpers/dateFormat';\r\n\r\nexport interface iDatePick{\r\n label: string;\r\n id?: string;\r\n initialDate?: Date;\r\n change: (val: string) => any;\r\n val?: Date\r\n\r\n}\r\n\r\n/**\r\n * params label, id, initialDate, change callback with value as string\r\n */\r\nexport class DatePick extends React.Component<iDatePick, null> {\r\n private elId: string;\r\n\r\n constructor(props: iDatePick, context: Object){\r\n super(props, context);\r\n this.elId = this.props.id || makeGuid();\r\n }\r\n\r\n componentDidMount() {\r\n let $el = $('#' + (this.elId));\r\n\r\n $el.datepicker(\r\n {\r\n onSelect: () => {\r\n this.props.change($el.val());\r\n }\r\n }\r\n );\r\n }\r\n\r\n render() {\r\n let params = {\r\n id: this.elId,\r\n type: 'text',\r\n style: {margin: \"0 10px 0 5px\", width: '73px', textAlign: 'center'},\r\n readOnly: true\r\n };\r\n\r\n if (this.props.val){\r\n params['value'] = this.props.val;\r\n } else {\r\n params['defaultValue'] = dateToString(this.props.initialDate || new Date());\r\n }\r\n\r\n\r\n return <span className=\"date-pick\">\r\n <label htmlFor={this.elId}>{this.props.label}</label>\r\n <input id={this.elId} type=\"text\"\r\n style={{margin: \"0 10px 0 5px\", width: '73px', textAlign: 'center'}}\r\n defaultValue={dateToString(this.props.initialDate || new Date())}\r\n readOnly={true}\r\n />\r\n <input {...params}/>\r\n </span>\r\n }\r\n}\r\n\r\nexport default DatePick;"]}
\ No newline at end of file
diff --git a/dist/reactComponents/DateRange.d.ts b/dist/reactComponents/DateRange.d.ts
index 73851f173809e78d9750d2a4b63043fb3a5f3557..a2ff14e410517690e2359706850bd8a3cae62af0 100644
--- a/dist/reactComponents/DateRange.d.ts
+++ b/dist/reactComponents/DateRange.d.ts
@@ -6,11 +6,13 @@ import { React } from './reactAndRedux';
import 'jquery-ui';
export interface iDateRange {
maxRange: number;
- callback: (start: string | Date, end: string | Date) => any;
+ callback: (start: Date, end: Date) => any;
minRange?: number;
- maxDate?: string | Date;
- minDate?: string | Date;
- initialEnd?: string | Date;
+ maxDate?: Date;
+ minDate?: Date;
+ initialEnd?: Date;
+ start?: Date;
+ end?: Date;
}
export declare class DateRange extends React.Component<iDateRange, null> {
startId: string;
@@ -25,8 +27,8 @@ export declare class DateRange extends React.Component<iDateRange, null> {
constructor(props: iDateRange, context: Object);
setNumDays(): void;
componentDidMount(): void;
- readonly needReset: boolean;
- setStart(s: string): void;
- setEnd(s: string): void;
+ private readonly needReset;
+ private setStart(s);
+ private setEnd(s);
render(): JSX.Element;
}
diff --git a/dist/reactComponents/DateRange.jsx b/dist/reactComponents/DateRange.jsx
deleted file mode 100644
index bd1610a0b6d50ea9a67099a95b49a0947a3fa8f3..0000000000000000000000000000000000000000
--- a/dist/reactComponents/DateRange.jsx
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Created by glenn on 6/12/2017.
- */
-"use strict";
-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 __());
- };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var reactAndRedux_1 = require("./reactAndRedux");
-require("jquery-ui");
-var makeGuid_1 = require("../util/makeGuid");
-var fixDate = require("./helpers/dateFormat");
-var DatePick_1 = require("./DatePick");
-function stringToDate(dte) {
- if (dte.getTime) {
- return dte;
- }
- else {
- return new Date(dte);
- }
-}
-var DateRange = (function (_super) {
- __extends(DateRange, _super);
- function DateRange(props, context) {
- var _this = _super.call(this, props, context) || this;
- _this.startId = makeGuid_1.default();
- _this.endId = makeGuid_1.default();
- _this.maxRange = Math.round(_this.props.maxRange) - 1;
- _this.minRange = typeof _this.props['minRange'] == 'number' ? Math.round(_this.props['minRange']) : 1;
- if (_this.minRange > _this.maxRange) {
- throw "DateRange component: Max range must be greater than min range";
- }
- if (_this.props.initialEnd) {
- _this.end = stringToDate(_this.props.initialEnd);
- }
- else {
- _this.end = new Date();
- }
- _this.end.setHours(0, 0, 0);
- _this.start = new Date(_this.end);
- _this.start.setDate(_this.start.getDate() - _this.maxRange);
- _this.setNumDays();
- return _this;
- }
- DateRange.prototype.setNumDays = function () {
- this.numDays = Math.round((this.end.getTime() - this.start.getTime()) / (1000 * 60 * 60 * 24)) + 1;
- };
- DateRange.prototype.componentDidMount = function () {
- this.startInput = document.getElementById(this.startId);
- this.endInput = document.getElementById(this.endId);
- this.props.callback(this.start, this.end);
- };
- Object.defineProperty(DateRange.prototype, "needReset", {
- get: function () {
- return this.numDays > this.maxRange || this.numDays < this.minRange;
- },
- enumerable: true,
- configurable: true
- });
- DateRange.prototype.setStart = function (s) {
- this.start = fixDate.stringToDate(s);
- this.setNumDays();
- if (this.needReset) {
- this.end = new Date(this.start);
- if (this.numDays > this.maxRange) {
- this.end.setDate(this.end.getDate() + this.maxRange);
- }
- else {
- this.end.setDate(this.end.getDate() + this.minRange - 1);
- }
- this.endInput.value = fixDate.dateToString(this.end);
- this.setNumDays();
- }
- this.props.callback(this.start, this.end);
- };
- DateRange.prototype.setEnd = function (s) {
- this.end = fixDate.stringToDate(s);
- this.setNumDays();
- if (this.needReset) {
- this.start = new Date(this.end);
- if (this.numDays > this.maxRange) {
- this.start.setDate(this.start.getDate() - this.maxRange);
- }
- else {
- this.start.setDate(this.start.getDate() - this.minRange + 1);
- }
- this.startInput.value = fixDate.dateToString(this.start);
- this.setNumDays();
- }
- this.props.callback(this.start, this.end);
- };
- DateRange.prototype.render = function () {
- var _this = this;
- return <div className="date-range">
- <DatePick_1.default id={this.startId} label="Start" initialDate={this.start} change={function (s) { _this.setStart(s); }}/>
- <DatePick_1.default id={this.endId} label="End" initialDate={this.end} change={function (s) { _this.setEnd(s); }}/>
- </div>;
- };
- return DateRange;
-}(reactAndRedux_1.React.Component));
-exports.DateRange = DateRange;
-//# sourceMappingURL=DateRange.jsx.map
\ No newline at end of file
diff --git a/dist/reactComponents/DateRange.jsx.map b/dist/reactComponents/DateRange.jsx.map
deleted file mode 100644
index d2bb9304b8b4d7a1ac10b28fc73dbf6777cbb7b3..0000000000000000000000000000000000000000
--- a/dist/reactComponents/DateRange.jsx.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"DateRange.jsx","sourceRoot":"","sources":["../../src/reactComponents/DateRange.tsx"],"names":[],"mappings":"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","sourcesContent":["/**\r\n * Created by glenn on 6/12/2017.\r\n */\r\n\r\nimport {React} from './reactAndRedux';\r\nimport $ = require('jquery');\r\nimport 'jquery-ui';\r\nimport makeGuid from '../util/makeGuid';\r\nimport * as fixDate from './helpers/dateFormat';\r\nimport DatePick from './DatePick';\r\n\r\nfunction stringToDate(dte: string|Date){\r\n if ((dte as Date).getTime){\r\n return dte as Date;\r\n } else {\r\n return new Date(dte);\r\n }\r\n}\r\n\r\nexport interface iDateRange{\r\n maxRange: number;\r\n callback: (start: string|Date, end: string|Date) => any;\r\n minRange?: number;\r\n maxDate?: string|Date;\r\n minDate?: string|Date;\r\n initialEnd?: string|Date;\r\n}\r\n\r\n\r\nexport class DateRange extends React.Component<iDateRange, null> {\r\n startId = makeGuid();\r\n endId = makeGuid();\r\n startInput: HTMLInputElement;\r\n endInput: HTMLInputElement;\r\n start: Date;\r\n end: Date;\r\n maxRange: number;\r\n minRange: number;\r\n numDays: number;\r\n\r\n constructor(props: iDateRange, context: Object) {\r\n super(props, context);\r\n\r\n this.maxRange = Math.round(this.props.maxRange) - 1;\r\n this.minRange = typeof this.props['minRange'] == 'number' ? Math.round(this.props['minRange']) : 1;\r\n\r\n if (this.minRange > this.maxRange) {\r\n throw \"DateRange component: Max range must be greater than min range\";\r\n }\r\n\r\n if (this.props.initialEnd){\r\n this.end = stringToDate(this.props.initialEnd)\r\n } else {\r\n this.end = new Date();\r\n }\r\n\r\n this.end.setHours(0, 0, 0);\r\n this.start = new Date(this.end);\r\n this.start.setDate(this.start.getDate() - this.maxRange);\r\n this.setNumDays();\r\n }\r\n\r\n setNumDays() {\r\n this.numDays = Math.round((this.end.getTime() - this.start.getTime()) / (1000 * 60 * 60 * 24)) + 1;\r\n }\r\n\r\n\r\n componentDidMount() {\r\n this.startInput = document.getElementById(this.startId) as HTMLInputElement;\r\n this.endInput = document.getElementById(this.endId) as HTMLInputElement;\r\n this.props.callback(this.start, this.end);\r\n }\r\n\r\n get needReset(): boolean {\r\n return this.numDays > this.maxRange || this.numDays < this.minRange;\r\n }\r\n\r\n setStart(s: string) {\r\n this.start = fixDate.stringToDate(s);\r\n this.setNumDays();\r\n\r\n if (this.needReset) {\r\n this.end = new Date(this.start);\r\n\r\n if (this.numDays > this.maxRange) {\r\n this.end.setDate(this.end.getDate() + this.maxRange);\r\n } else {\r\n this.end.setDate(this.end.getDate() + this.minRange - 1);\r\n }\r\n\r\n this.endInput.value = fixDate.dateToString(this.end);\r\n this.setNumDays();\r\n }\r\n this.props.callback(this.start, this.end);\r\n }\r\n\r\n setEnd(s: string) {\r\n this.end = fixDate.stringToDate(s);\r\n this.setNumDays();\r\n\r\n if (this.needReset) {\r\n this.start = new Date(this.end);\r\n\r\n if (this.numDays > this.maxRange) {\r\n this.start.setDate(this.start.getDate() - this.maxRange);\r\n } else {\r\n this.start.setDate(this.start.getDate() - this.minRange + 1);\r\n }\r\n\r\n this.startInput.value = fixDate.dateToString(this.start);\r\n this.setNumDays();\r\n }\r\n this.props.callback(this.start, this.end);\r\n }\r\n\r\n render() {\r\n return <div className=\"date-range\">\r\n <DatePick id={this.startId} label=\"Start\" initialDate={this.start} change={(s) => {this.setStart(s)}}/>\r\n <DatePick id={this.endId} label=\"End\" initialDate={this.end} change={(s) => {this.setEnd(s)}}/>\r\n </div>;\r\n }\r\n}\r\n"]}
\ No newline at end of file
diff --git a/dist/reactComponents/Radio.jsx b/dist/reactComponents/Radio.jsx
deleted file mode 100644
index 733a62007d3d13f1cce265f129d25f440994e916..0000000000000000000000000000000000000000
--- a/dist/reactComponents/Radio.jsx
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Created by glenn on 6/12/2017.
- */
-"use strict";
-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 __());
- };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var reactAndRedux_1 = require("./reactAndRedux");
-require("jquery-ui");
-var makeGuid_1 = require("../util/makeGuid");
-var RadioItem = (function (_super) {
- __extends(RadioItem, _super);
- function RadioItem(props, context) {
- var _this = _super.call(this, props, context) || this;
- _this.guid = makeGuid_1.default();
- return _this;
- }
- RadioItem.prototype.render = function () {
- var _this = this;
- var style = {};
- if (this.props.inline) {
- style = {
- display: 'inline-block',
- padding: '0 5px'
- };
- }
- var props = {
- id: this.guid,
- type: "radio",
- name: this.props.groupId,
- value: typeof this.props.index == 'undefined' ? this.props.text : this.props.index.toFixed(),
- onChange: function (evt) {
- _this.props.change(evt.target.value);
- evt.target.checked = true;
- },
- checked: this.props.checked,
- defaultChecked: this.props.checked
- };
- if (this.props.connected) {
- delete props.defaultChecked;
- }
- else {
- delete props.checked;
- }
- return <li style={style}>
- <input {...props}/>
- <label htmlFor={this.guid}>{this.props.text}</label>
- </li>;
- };
- return RadioItem;
-}(reactAndRedux_1.React.Component));
-var RadioBase = (function (_super) {
- __extends(RadioBase, _super);
- function RadioBase(props, context) {
- var _this = _super.call(this, props, context) || this;
- _this.inline = _this.props.inline || false;
- _this.groupId = _this.props.title.toLowerCase().replace(/ /g, '');
- return _this;
- }
- RadioBase.prototype.render = function () {
- var _this = this;
- var arr = [];
- for (var i = 0; i < this.props.items.length; i++) {
- var itemProps = {
- groupId: this.groupId,
- text: this.props.items[i],
- inline: this.props.inline,
- change: function (s) { return (_this.props.callback(s)); },
- key: this.props.items[i],
- connected: this.props.connected || false,
- checked: false,
- index: i
- };
- if (typeof this.props.selectedValueOrIndex == 'number') {
- itemProps.checked = i == this.props.selectedValueOrIndex;
- }
- else {
- itemProps.checked = this.props.items[i] == this.props.selectedValueOrIndex;
- delete itemProps.index;
- }
- arr.push(<RadioItem {...itemProps}/>);
- }
- var classes = ['radio-list'];
- if (this.props.classes) {
- classes = classes.concat(this.props.classes);
- }
- return <div className={classes.join(' ')}>
- <h4>{this.props.title}</h4>
- <ul style={{ listStyle: 'none' }}>
- {arr}
- </ul>
- </div>;
- };
- return RadioBase;
-}(reactAndRedux_1.React.Component));
-var Radio = (function (_super) {
- __extends(Radio, _super);
- function Radio() {
- return _super !== null && _super.apply(this, arguments) || this;
- }
- Radio.prototype.render = function () {
- return <RadioBase title={this.props.title} items={this.props.items} callback={this.props.callback} inline={this.props.inline} selectedValueOrIndex={this.props.defaultValue} connected={false} classes={this.props.classes}/>;
- };
- return Radio;
-}(reactAndRedux_1.React.Component));
-exports.Radio = Radio;
-var RadioConnected = (function (_super) {
- __extends(RadioConnected, _super);
- function RadioConnected() {
- return _super !== null && _super.apply(this, arguments) || this;
- }
- RadioConnected.prototype.render = function () {
- return <RadioBase title={this.props.title} items={this.props.items} callback={this.props.callback} inline={this.props.inline} selectedValueOrIndex={this.props.selectedIndex} connected={true} classes={this.props.classes}/>;
- };
- return RadioConnected;
-}(reactAndRedux_1.React.Component));
-exports.RadioConnected = RadioConnected;
-//# sourceMappingURL=Radio.jsx.map
\ No newline at end of file
diff --git a/dist/reactComponents/Radio.jsx.map b/dist/reactComponents/Radio.jsx.map
deleted file mode 100644
index 6fa1290d9ad4bf1bc82c8afd061678e98b58aba9..0000000000000000000000000000000000000000
--- a/dist/reactComponents/Radio.jsx.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"Radio.jsx","sourceRoot":"","sources":["../../src/reactComponents/Radio.tsx"],"names":[],"mappings":"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","sourcesContent":["/**\r\n * Created by glenn on 6/12/2017.\r\n */\r\n\r\n\r\nimport {React} from './reactAndRedux';\r\nimport $ = require('jquery');\r\nimport 'jquery-ui';\r\nimport makeGuid from '../util/makeGuid';\r\nimport {ChangeEvent} from \"react\";\r\n\r\nexport interface iRadioItem{\r\n groupId: string;\r\n text: string;\r\n checked: boolean;\r\n inline: boolean;\r\n change: (s: string) => any;\r\n connected?: boolean;\r\n index?: number\r\n}\r\n\r\nclass RadioItem extends React.Component<iRadioItem, null> {\r\n guid: string;\r\n\r\n constructor(props: iRadioItem, context: Object){\r\n super(props, context);\r\n this.guid = makeGuid()\r\n }\r\n\r\n\r\n render() {\r\n let style = {};\r\n if (this.props.inline) {\r\n style = {\r\n display: 'inline-block',\r\n padding: '0 5px'\r\n };\r\n }\r\n\r\n let props = {\r\n id: this.guid,\r\n type: \"radio\",\r\n name: this.props.groupId,\r\n value: typeof this.props.index == 'undefined' ? this.props.text : this.props.index.toFixed(),\r\n onChange: (evt: ChangeEvent<HTMLInputElement>) => {\r\n this.props.change(evt.target.value);\r\n evt.target.checked = true;\r\n },\r\n checked: this.props.checked,\r\n defaultChecked: this.props.checked\r\n };\r\n\r\n if (this.props.connected) {\r\n delete props.defaultChecked;\r\n } else {\r\n delete props.checked\r\n }\r\n\r\n return <li style={style}>\r\n <input {...props}/>\r\n <label htmlFor={this.guid}>{this.props.text}</label>\r\n </li>;\r\n }\r\n}\r\n\r\ninterface iRadioBase {\r\n title: string;\r\n items: string[];\r\n callback: (val: string) => any;\r\n inline?: boolean;\r\n selectedValueOrIndex: string|number;\r\n connected: boolean;\r\n classes?: string[]\r\n}\r\n\r\nclass RadioBase extends React.Component<iRadioBase, null> {\r\n inline: boolean;\r\n groupId: string;\r\n\r\n constructor(props: iRadioBase, context: Object) {\r\n super(props, context);\r\n this.inline = this.props.inline || false;\r\n this.groupId = this.props.title.toLowerCase().replace(/ /g, '');\r\n }\r\n\r\n render() {\r\n\r\n let arr = [];\r\n\r\n for (let i = 0; i < this.props.items.length; i++) {\r\n\r\n let itemProps = {\r\n groupId: this.groupId,\r\n text: this.props.items[i],\r\n inline: this.props.inline,\r\n change: (s: string) => (this.props.callback(s)),\r\n key: this.props.items[i],\r\n connected: this.props.connected || false,\r\n checked: false,\r\n index: i\r\n };\r\n\r\n if (typeof this.props.selectedValueOrIndex == 'number'){\r\n itemProps.checked = i == this.props.selectedValueOrIndex;\r\n } else {\r\n itemProps.checked = this.props.items[i] == this.props.selectedValueOrIndex;\r\n delete itemProps.index\r\n }\r\n\r\n arr.push(<RadioItem {...itemProps}/>)\r\n }\r\n\r\n let classes = ['radio-list'];\r\n\r\n if (this.props.classes){\r\n classes = classes.concat(this.props.classes);\r\n }\r\n\r\n return <div className={classes.join(' ')}>\r\n <h4>{this.props.title}</h4>\r\n <ul style={{listStyle: 'none'}}>\r\n {arr}\r\n </ul>\r\n </div>\r\n }\r\n}\r\n\r\n\r\nexport class Radio extends React.Component<{\r\n title: string, items: string[], callback: (val: string) => any, inline?: boolean,\r\n defaultValue: string, classes?: string[] }, null> {\r\n\r\n render() {\r\n\r\n return <RadioBase\r\n title={this.props.title}\r\n items={this.props.items}\r\n callback={this.props.callback}\r\n inline={this.props.inline}\r\n selectedValueOrIndex={this.props.defaultValue}\r\n connected={false}\r\n classes={this.props.classes}\r\n />\r\n }\r\n}\r\n\r\nexport class RadioConnected extends React.Component<{\r\n title: string, items: string[], callback: (val: string) => any, inline?: boolean,\r\n selectedIndex: number, classes?: string[] }, null> {\r\n\r\n render() {\r\n return <RadioBase\r\n title={this.props.title}\r\n items={this.props.items}\r\n callback={this.props.callback}\r\n inline={this.props.inline}\r\n selectedValueOrIndex={this.props.selectedIndex}\r\n connected={true}\r\n classes={this.props.classes}\r\n />\r\n }\r\n}"]}
\ No newline at end of file
diff --git a/dist/reactComponents/SelectArea.jsx b/dist/reactComponents/SelectArea.jsx
deleted file mode 100644
index e5668ec51b8f9e03ae1ba39b41be8b30c4e80f81..0000000000000000000000000000000000000000
--- a/dist/reactComponents/SelectArea.jsx
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Created by glenn on 6/12/2017.
- */
-"use strict";
-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 __());
- };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var reactAndRedux_1 = require("./reactAndRedux");
-var ol = require("custom-ol");
-var LayerBaseVectorGeoJson_1 = require("../layers/LayerBaseVectorGeoJson");
-var projections_1 = require("../olHelpers/projections");
-var makeGuid_1 = require("../util/makeGuid");
-var get_map_1 = require("./helpers/get_map");
-var SelectArea = (function (_super) {
- __extends(SelectArea, _super);
- function SelectArea(props, context) {
- var _this = _super.call(this, props, context) || this;
- _this.selectId = makeGuid_1.default();
- _this.cancelId = makeGuid_1.default();
- _this.callback = _this.props.callback;
- _this.areaOverlay = new LayerBaseVectorGeoJson_1.default('', {
- style: new ol.style.Style({
- fill: new ol.style.Fill({
- color: 'rgba(255, 0, 237, 0.1)'
- }),
- stroke: new ol.style.Stroke({
- color: 'rgb(255, 0, 237)',
- width: 2
- })
- }),
- transform: { dataProjection: projections_1.proj4326, featureProjection: projections_1.proj3857 }
- });
- _this.draw = new ol.interaction.Draw({
- source: _this.areaOverlay.source,
- type: 'Polygon'
- });
- _this.draw.on('drawend', function (evt) {
- _this.selectButton.style.display = '';
- _this.cancelButton.style.display = 'none';
- var geom = evt.feature.getGeometry();
- var geomClone = geom.clone();
- geomClone.transform('EPSG:3857', 'EPSG:4326');
- setTimeout(function () {
- _this.map.removeInteraction(_this.draw);
- }, 100);
- var outCoords = [];
- var ccc = geomClone.getCoordinates()[0];
- for (var _i = 0, ccc_1 = ccc; _i < ccc_1.length; _i++) {
- var cc = ccc_1[_i];
- outCoords.push([Math.round(cc[0] * 1000000) / 1000000, Math.round(cc[1] * 1000000) / 1000000]);
- }
- _this.callback(outCoords);
- });
- return _this;
- }
- SelectArea.prototype.componentDidMount = function () {
- var _this = this;
- this.selectButton = document.getElementById(this.selectId);
- this.cancelButton = document.getElementById(this.cancelId);
- get_map_1.default(this.props.map, this.areaOverlay.olLayer).then(function (m) { _this.map = m; });
- };
- SelectArea.prototype.setArea = function () {
- if (!this.map) {
- return;
- }
- this.selectButton.style.display = 'none';
- this.cancelButton.style.display = '';
- this.areaOverlay.source.clear();
- this.map.addInteraction(this.draw);
- this.callback(null);
- };
- SelectArea.prototype.cancel = function () {
- if (!this.map) {
- return;
- }
- this.selectButton.style.display = '';
- this.cancelButton.style.display = 'none';
- this.areaOverlay.source.clear();
- this.map.removeInteraction(this.draw);
- this.callback(null);
- };
- SelectArea.prototype.render = function () {
- var _this = this;
- return <div style={{ margin: '10px' }}>
- <button id={this.selectId} onClick={function () {
- _this.setArea();
- }}>Select Area
- </button>
- <button id={this.cancelId} onClick={function () {
- _this.cancel();
- }} style={{ display: 'none' }}>Cancel
- </button>
- </div>;
- };
- return SelectArea;
-}(reactAndRedux_1.React.Component));
-exports.SelectArea = SelectArea;
-//# sourceMappingURL=SelectArea.jsx.map
\ No newline at end of file
diff --git a/dist/reactComponents/SelectArea.jsx.map b/dist/reactComponents/SelectArea.jsx.map
deleted file mode 100644
index 728631ad7771dd93ce9a385ebe49cb4856090118..0000000000000000000000000000000000000000
--- a/dist/reactComponents/SelectArea.jsx.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"SelectArea.jsx","sourceRoot":"","sources":["../../src/reactComponents/SelectArea.tsx"],"names":[],"mappings":"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","sourcesContent":["/**\r\n * Created by glenn on 6/12/2017.\r\n */\r\n\r\nimport {React} from './reactAndRedux';\r\nimport ol = require('custom-ol');\r\nimport LayerBaseVectorGeoJson from '../layers/LayerBaseVectorGeoJson';\r\nimport {proj4326, proj3857} from '../olHelpers/projections'\r\nimport makeGuid from '../util/makeGuid';\r\nimport getMap from './helpers/get_map';\r\n\r\nexport interface iSelectArea{\r\n map: ol.Map | (() => ol.Map);\r\n callback: (coords: Array<number[]>) => any\r\n}\r\n\r\nexport class SelectArea extends React.Component<iSelectArea, null> {\r\n map: ol.Map;\r\n callback: (coords: Array<number[]>) => any;\r\n areaOverlay: LayerBaseVectorGeoJson;\r\n draw: ol.interaction.Draw;\r\n selectId: string;\r\n cancelId: string;\r\n selectButton: HTMLButtonElement;\r\n cancelButton: HTMLButtonElement;\r\n\r\n\r\n constructor(props: iSelectArea, context: Object) {\r\n super(props, context);\r\n\r\n this.selectId = makeGuid();\r\n this.cancelId = makeGuid();\r\n\r\n this.callback = this.props.callback;\r\n\r\n this.areaOverlay = new LayerBaseVectorGeoJson('',\r\n {\r\n style: new ol.style.Style({\r\n fill: new ol.style.Fill({\r\n color: 'rgba(255, 0, 237, 0.1)'\r\n }),\r\n stroke: new ol.style.Stroke({\r\n color: 'rgb(255, 0, 237)',\r\n width: 2\r\n })\r\n }),\r\n transform: {dataProjection: proj4326, featureProjection: proj3857}\r\n });\r\n\r\n this.draw = new ol.interaction.Draw({\r\n source: this.areaOverlay.source,\r\n type: 'Polygon'\r\n });\r\n\r\n this.draw.on('drawend', (evt: {feature: {getGeometry: () => ol.geom.Polygon}}) => {\r\n this.selectButton.style.display = '';\r\n this.cancelButton.style.display = 'none';\r\n\r\n let geom = evt.feature.getGeometry();\r\n let geomClone = geom.clone();\r\n\r\n geomClone.transform('EPSG:3857', 'EPSG:4326');\r\n\r\n setTimeout(() => {\r\n this.map.removeInteraction(this.draw);\r\n }, 100);\r\n\r\n let outCoords = [];\r\n let ccc = geomClone.getCoordinates()[0];\r\n\r\n for (let cc of ccc) {\r\n outCoords.push([Math.round(cc[0] * 1000000) / 1000000, Math.round(cc[1] * 1000000) / 1000000]);\r\n }\r\n\r\n this.callback(outCoords);\r\n });\r\n }\r\n\r\n\r\n componentDidMount() {\r\n this.selectButton = document.getElementById(this.selectId) as HTMLButtonElement;\r\n this.cancelButton = document.getElementById(this.cancelId) as HTMLButtonElement;\r\n getMap(this.props.map, this.areaOverlay.olLayer).then((m) => {this.map = m})\r\n }\r\n\r\n\r\n setArea() {\r\n if (!this.map) {\r\n return;\r\n }\r\n\r\n this.selectButton.style.display = 'none';\r\n this.cancelButton.style.display = '';\r\n\r\n this.areaOverlay.source.clear();\r\n this.map.addInteraction(this.draw);\r\n this.callback(null);\r\n }\r\n\r\n cancel() {\r\n if (!this.map) {\r\n return;\r\n }\r\n this.selectButton.style.display = '';\r\n this.cancelButton.style.display = 'none';\r\n\r\n this.areaOverlay.source.clear();\r\n this.map.removeInteraction(this.draw);\r\n\r\n this.callback(null);\r\n }\r\n\r\n render() {\r\n return <div style={{margin: '10px'}}>\r\n <button id={this.selectId} onClick={() => {\r\n this.setArea()\r\n }}>Select Area\r\n </button>\r\n <button id={this.cancelId} onClick={() => {\r\n this.cancel()\r\n }} style={{display: 'none'}}>Cancel\r\n </button>\r\n </div>\r\n }\r\n}\r\n"]}
\ No newline at end of file
diff --git a/dist/reactComponents/Slider.jsx b/dist/reactComponents/Slider.jsx
deleted file mode 100644
index ae7f80888969a31b80827ba251230b0c1460e273..0000000000000000000000000000000000000000
--- a/dist/reactComponents/Slider.jsx
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Created by glenn on 7/6/2017.
- */
-"use strict";
-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 __());
- };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-var reactAndRedux_1 = require("./reactAndRedux");
-var makeGuid_1 = require("../util/makeGuid");
-var get_browser_1 = require("../util/get_browser");
-var Slider = (function (_super) {
- __extends(Slider, _super);
- function Slider(props, context) {
- var _this = _super.call(this, props, context) || this;
- _this.uid = makeGuid_1.default();
- _this.startUid = makeGuid_1.default();
- _this.stopUid = makeGuid_1.default();
- _this.intervalUid = makeGuid_1.default();
- _this.previousUid = makeGuid_1.default();
- _this.nextUid = makeGuid_1.default();
- _this.running = false;
- return _this;
- }
- Slider.prototype.componentDidMount = function () {
- var _this = this;
- this.el = document.getElementById(this.uid);
- this.minVal = parseFloat(this.el.min);
- this.maxVal = parseFloat(this.el.max);
- this.step = parseFloat(this.el.step);
- this.startButton = document.getElementById(this.startUid);
- this.stopButton = document.getElementById(this.stopUid);
- if (this.props.animate) {
- this.stopButton.style.display = 'none';
- }
- this.previousButton = document.getElementById(this.previousUid);
- this.nextButton = document.getElementById(this.nextUid);
- this.intervalSelect = document.getElementById(this.intervalUid);
- if (get_browser_1.get_browser().name.toUpperCase().indexOf('IE') > -1) {
- this.el.onchange = function (e) {
- _this.props.change(parseFloat(e.target['value']));
- };
- }
- };
- Slider.prototype.updateRunning = function () {
- this.el.disabled = this.running;
- this.startButton.style.display = this.running ? 'none' : '';
- this.stopButton.style.display = this.running ? '' : 'none';
- this.nextButton.disabled = this.running;
- this.previousButton.disabled = this.running;
- };
- Slider.prototype.startAnimate = function () {
- var _this = this;
- this.running = true;
- this.updateRunning();
- this.interval = setInterval(function () {
- var val = parseFloat(_this.el.value);
- val += _this.step;
- if (val > _this.maxVal) {
- val = _this.minVal;
- }
- _this.el.value = val.toString();
- _this.props.change(val);
- }, parseInt(this.intervalSelect.value));
- };
- Slider.prototype.stopAnimate = function () {
- clearInterval(this.interval);
- this.running = false;
- this.updateRunning();
- };
- Slider.prototype.restartAnimate = function () {
- if (this.running) {
- this.stopAnimate();
- this.startAnimate();
- }
- };
- Slider.prototype.increment = function (v) {
- var val = parseFloat(this.el.value);
- val = v > 0 ? val + this.step : val - this.step;
- this.el.value = val.toString();
- this.props.change(val);
- };
- Slider.prototype.render = function () {
- var _this = this;
- var attrs = {
- id: this.uid,
- min: 0,
- type: 'range',
- onChange: function (evt) {
- _this.props.change(parseFloat(evt.target.value));
- },
- style: { width: '100%', padding: '4px 0' },
- max: "100",
- step: '0.1',
- value: this.props.value ? this.props.value.toString() : '0',
- defaultValue: "0"
- };
- if (this.props.steps) {
- attrs.max = this.props.steps.toString();
- attrs.step = '1';
- }
- if (this.props.value) {
- delete attrs.defaultValue;
- }
- else {
- delete attrs.value;
- }
- var start = null;
- var stop = null;
- var previous = null;
- var next = null;
- var intervalSelect = null;
- var interval = "200";
- if (this.props.defaultAnimationInterval) {
- interval = this.props.defaultAnimationInterval.toFixed();
- }
- if (this.props.animate) {
- previous = <button id={this.previousUid} className="react-slider-previous" onClick={function () {
- _this.increment(-1);
- }} title="Previous"/>;
- next = <button id={this.nextUid} className="react-slider-next" onClick={function () {
- _this.increment(1);
- }} title="Next"/>;
- start = <button id={this.startUid} className="react-slider-start" onClick={function () {
- _this.startAnimate();
- }} title="Start"/>;
- stop = <button id={this.stopUid} className="react-slider-stop" onClick={function () {
- _this.stopAnimate();
- }} title="Stop"/>;
- intervalSelect = <span>
-
- <label style={{ fontWeight: 'bold', marginRight: '3px' }}>Interval (s)</label>
- <select defaultValue={interval} id={this.intervalUid} onChange={function () {
- _this.restartAnimate();
- }}>
- <option value="100">0.1</option>
- <option value="200">0.2</option>
- <option value="300">0.3</option>
- <option value="400">0.4</option>
- <option value="500">0.5</option>
- <option value="600">0.6</option>
- <option value="700">0.7</option>
- <option value="800">0.8</option>
- <option value="900">0.9</option>
- <option value="1000">1.0</option>
- </select>
- </span>;
- }
- return <div className="react-slider">
- <input {...attrs}/>
- <div className="react-slider-controls" style={{ textAlign: 'center' }}>
- {previous}{start}{stop}{next}{intervalSelect}
- </div>
- </div>;
- };
- return Slider;
-}(reactAndRedux_1.React.Component));
-exports.Slider = Slider;
-//# sourceMappingURL=Slider.jsx.map
\ No newline at end of file
diff --git a/dist/reactComponents/Slider.jsx.map b/dist/reactComponents/Slider.jsx.map
deleted file mode 100644
index 8987aed960750e52b681e621609b08abf92bcbf3..0000000000000000000000000000000000000000
--- a/dist/reactComponents/Slider.jsx.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"Slider.jsx","sourceRoot":"","sources":["../../src/reactComponents/Slider.tsx"],"names":[],"mappings":"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","sourcesContent":["/**\r\n * Created by glenn on 7/6/2017.\r\n */\r\n\r\nimport {React} from './reactAndRedux';\r\nimport makeGuid from '../util/makeGuid';\r\nimport {ChangeEvent} from \"react\";\r\nimport {get_browser} from '../util/get_browser';\r\n\r\nexport interface iSlider {\r\n change: (d: number) => any;\r\n steps?: number;\r\n animate?: boolean;\r\n defaultAnimationInterval?: number;\r\n value?: number;\r\n}\r\n\r\nexport class Slider extends React.Component<iSlider, null> {\r\n private uid: string;\r\n private startUid: string;\r\n private stopUid: string;\r\n private previousUid: string;\r\n private nextUid: string;\r\n private intervalUid: string;\r\n private el: HTMLInputElement;\r\n private previousButton: HTMLButtonElement;\r\n private nextButton: HTMLButtonElement;\r\n private startButton: HTMLButtonElement;\r\n private stopButton: HTMLButtonElement;\r\n private intervalSelect: HTMLSelectElement;\r\n private interval: number;\r\n private running: boolean;\r\n private minVal: number;\r\n private maxVal: number;\r\n private step: number;\r\n\r\n constructor(props: iSlider, context: Object) {\r\n super(props, context);\r\n this.uid = makeGuid();\r\n this.startUid = makeGuid();\r\n this.stopUid = makeGuid();\r\n this.intervalUid = makeGuid();\r\n this.previousUid = makeGuid();\r\n this.nextUid = makeGuid();\r\n this.running = false;\r\n }\r\n\r\n componentDidMount() {\r\n this.el = document.getElementById(this.uid) as HTMLInputElement;\r\n this.minVal = parseFloat(this.el.min);\r\n this.maxVal = parseFloat(this.el.max);\r\n this.step = parseFloat(this.el.step);\r\n this.startButton = document.getElementById(this.startUid) as HTMLButtonElement;\r\n this.stopButton = document.getElementById(this.stopUid) as HTMLButtonElement;\r\n if (this.props.animate){\r\n this.stopButton.style.display = 'none';\r\n }\r\n this.previousButton = document.getElementById(this.previousUid) as HTMLButtonElement;\r\n this.nextButton = document.getElementById(this.nextUid) as HTMLButtonElement;\r\n this.intervalSelect = document.getElementById(this.intervalUid) as HTMLSelectElement;\r\n\r\n if (get_browser().name.toUpperCase().indexOf('IE') > -1) {\r\n this.el.onchange = (e) => {\r\n this.props.change(parseFloat(e.target['value']))\r\n }\r\n }\r\n }\r\n\r\n updateRunning() {\r\n this.el.disabled = this.running;\r\n\r\n this.startButton.style.display = this.running ? 'none' : '';\r\n this.stopButton.style.display = this.running ? '' : 'none';\r\n\r\n this.nextButton.disabled = this.running;\r\n this.previousButton.disabled = this.running;\r\n }\r\n\r\n startAnimate() {\r\n this.running = true;\r\n this.updateRunning();\r\n this.interval = setInterval(() => {\r\n let val = parseFloat(this.el.value);\r\n val += this.step;\r\n if (val > this.maxVal) {\r\n val = this.minVal\r\n }\r\n\r\n this.el.value = val.toString();\r\n this.props.change(val);\r\n }, parseInt(this.intervalSelect.value));\r\n }\r\n\r\n stopAnimate() {\r\n clearInterval(this.interval);\r\n this.running = false;\r\n this.updateRunning();\r\n }\r\n\r\n restartAnimate() {\r\n if (this.running) {\r\n this.stopAnimate();\r\n this.startAnimate();\r\n }\r\n }\r\n\r\n increment(v: number) {\r\n let val = parseFloat(this.el.value);\r\n val = v > 0 ? val + this.step : val - this.step;\r\n this.el.value = val.toString();\r\n this.props.change(val);\r\n }\r\n\r\n render() {\r\n let attrs = {\r\n id: this.uid,\r\n min: 0,\r\n type: 'range',\r\n onChange: (evt: ChangeEvent<HTMLInputElement>) => {\r\n this.props.change(parseFloat(evt.target.value))\r\n },\r\n style: {width: '100%', padding: '4px 0'},\r\n max: \"100\",\r\n step: '0.1',\r\n value: this.props.value ? this.props.value.toString() : '0',\r\n defaultValue: \"0\"\r\n };\r\n\r\n if (this.props.steps) {\r\n attrs.max = this.props.steps.toString();\r\n attrs.step = '1';\r\n }\r\n\r\n if (this.props.value) {\r\n delete attrs.defaultValue;\r\n } else {\r\n delete attrs.value;\r\n }\r\n\r\n\r\n let start = null;\r\n let stop = null;\r\n let previous = null;\r\n let next = null;\r\n let intervalSelect = null;\r\n\r\n let interval = \"200\";\r\n\r\n if (this.props.defaultAnimationInterval){\r\n interval = this.props.defaultAnimationInterval.toFixed();\r\n }\r\n\r\n if (this.props.animate) {\r\n previous = <button id={this.previousUid} className=\"react-slider-previous\" onClick={() => {\r\n this.increment(-1)\r\n }} title=\"Previous\"/>;\r\n\r\n next = <button id={this.nextUid} className=\"react-slider-next\" onClick={() => {\r\n this.increment(1)\r\n }} title=\"Next\"/>;\r\n\r\n start = <button id={this.startUid} className=\"react-slider-start\" onClick={() => {\r\n this.startAnimate()\r\n }} title=\"Start\"/>;\r\n\r\n stop = <button id={this.stopUid} className=\"react-slider-stop\" onClick={() => {\r\n this.stopAnimate()\r\n }} title=\"Stop\"/>;\r\n\r\n intervalSelect = <span>\r\n\r\n <label style={{fontWeight: 'bold', marginRight: '3px'}}>Interval (s)</label>\r\n <select defaultValue={interval} id={this.intervalUid} onChange={() => {\r\n this.restartAnimate()\r\n }}>\r\n <option value=\"100\">0.1</option>\r\n <option value=\"200\">0.2</option>\r\n <option value=\"300\">0.3</option>\r\n <option value=\"400\">0.4</option>\r\n <option value=\"500\">0.5</option>\r\n <option value=\"600\">0.6</option>\r\n <option value=\"700\">0.7</option>\r\n <option value=\"800\">0.8</option>\r\n <option value=\"900\">0.9</option>\r\n <option value=\"1000\">1.0</option>\r\n </select>\r\n </span>;\r\n }\r\n\r\n return <div className=\"react-slider\">\r\n <input {...attrs}/>\r\n <div className=\"react-slider-controls\" style={{textAlign: 'center'}}>\r\n {previous}{start}{stop}{next}{intervalSelect}\r\n </div>\r\n </div>\r\n }\r\n\r\n}"]}
\ No newline at end of file
diff --git a/src/_tests/demos/reacttst.tsx b/src/_tests/demos/reacttst.tsx
index d9b6b1fa2a568797f2b58284123ffb12b05ceeff..550e5efd8669a513952c23e42c45613e60967086 100644
--- a/src/_tests/demos/reacttst.tsx
+++ b/src/_tests/demos/reacttst.tsx
@@ -33,13 +33,13 @@ class Demo extends React.Component<null, null> {
}
reactDom.render(
- <Provider store={s.store}>
+ <Provider store={s.theStore}>
<Demo/>
</Provider>,
document.getElementById("example")
);
-s.store.subscribe(() => {
+s.theStore.subscribe(() => {
console.log(s.getState());
});
diff --git a/src/_tests/demos/reacttst_store.ts b/src/_tests/demos/reacttst_store.ts
index e9a09e25c1498edf3d60daad3f97f363eeaefd8b..f0bd2b100bc343a6b248f69910a150d922f5c237 100644
--- a/src/_tests/demos/reacttst_store.ts
+++ b/src/_tests/demos/reacttst_store.ts
@@ -1,6 +1,5 @@
-import {createStore, combineReducers} from '../../reactComponents/reactAndRedux';
import * as actions from './reacttst_actions';
-
+import Redux = require('redux');
function oneDate(state = new Date(), action: {type: string, d: Date}) {
@@ -28,8 +27,8 @@ function twoDates(state = {start: now, end: before}, action: {type: string, star
-export const store = createStore(
- combineReducers({oneDate, twoDates})
+export const theStore = Redux.createStore(
+ Redux.combineReducers({oneDate, twoDates})
);
@@ -41,9 +40,9 @@ export interface iState {
export function getState(): iState{
- return store.getState() as iState;
+ return theStore.getState() as iState;
}
-export default store;
+export default theStore;
diff --git a/src/olHelpers/geocode.ts b/src/olHelpers/geocode.ts
index e3e04a6e830f9f026499fd1bc120531e9fbefd83..013a9461873dad3168884c866db5c05d2b13e75c 100644
--- a/src/olHelpers/geocode.ts
+++ b/src/olHelpers/geocode.ts
@@ -84,6 +84,7 @@ export class Geocode {
});
$(this.theInput).keyup((evt) => {
+ this.theButton.focus();
this.theButton.disabled = this.theInput.value.length == 0;
$theInput.removeClass(invalidClass);
this.theInput.title = '';