diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.das.rest.api/pom.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.das.rest.api/pom.xml
new file mode 100644
index 0000000000..5deaf0ae21
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.das.rest.api/pom.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+ org.wso2.carbon.devicemgt-plugins
+ iot-analytics
+ 3.0.3-SNAPSHOT
+ ../pom.xml
+
+
+ 4.0.0
+ org.wso2.carbon.iot.das.rest.api
+ WSO2 Carbon - IoT Server REST API
+ pom
+
+
+
+
+ org.apache.felix
+ maven-scr-plugin
+
+
+ generate-scr-descriptor
+
+ scr
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+
+
+ ${project.artifactId}
+ ${project.artifactId}
+
+
+
+
+
+
+ *
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/gadget-controller.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/gadget-controller.jag
new file mode 100644
index 0000000000..ea1f3c294d
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/gadget-controller.jag
@@ -0,0 +1,42 @@
+<%
+/**
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+(function () {
+
+ response.contentType = 'application/json';
+ var action = request.getParameter("action");
+ var id = request.getParameter("id");
+ var type = request.getParameter("type");
+ var timeFrom = request.getParameter("timeFrom");
+ var timeTo = request.getParameter("timeTo");
+ var log = new Log();
+
+ var providerAPI = require('js/batch-provider-api.js');
+ if (action === 'getSchema') {
+ print(providerAPI.getSchema());
+ return;
+ } else if(action === 'getData'){
+ log.info('FromTime : '+timeFrom+', toTime: '+ timeTo);
+ print(providerAPI.getData(id, type, timeFrom, timeTo));
+ return;
+ }
+}());
+
+
+%>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/js/batch-provider-api.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/js/batch-provider-api.js
new file mode 100644
index 0000000000..ba0a145214
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/js/batch-provider-api.js
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var getConfig, validate, getMode, getSchema, getData, registerCallBackforPush;
+
+(function () {
+
+ var PROVIDERS_LOCATION = '/extensions/providers/';
+
+ var PROVIDER_NAME = 'batch';
+ var TYPE = "type";
+ var TABLE_NAME = "tableName";
+ var HTTPS_TRANSPORT = "https";
+ var CONTENT_TYPE_JSON = "application/json";
+ var AUTHORIZATION_HEADER = "Authorization";
+ var USER_TOKEN = "user";
+ var TENANT_DOMAIN = "domain";
+ var CONST_AT = "@";
+ var USERNAME = "username";
+ var HTTP_USER_NOT_AUTHENTICATED = 403;
+ var JS_MAX_VALUE = "9007199254740992";
+ var JS_MIN_VALUE = "-9007199254740992";
+
+ var tableName = "ORG_WSO2_GEO_FUSEDSPATIALEVENT";
+
+ var typeMap = {
+ "bool": "string",
+ "boolean": "string",
+ "string": "string",
+ "int": "number",
+ "integer": "number",
+ "long": "number",
+ "double": "number",
+ "float": "number",
+ "time": "time"
+ };
+
+ var log = new Log();
+ var carbon = require('carbon');
+ var configs = require('/configs/designer.json');
+ var utils = require('/modules/utils.js');
+ var JSUtils = Packages.org.wso2.carbon.analytics.jsservice.Utils;
+ var AnalyticsCachedJSServiceConnector = Packages.org.wso2.carbon.analytics.jsservice.AnalyticsCachedJSServiceConnector;
+ var AnalyticsCache = Packages.org.wso2.carbon.analytics.jsservice.AnalyticsCachedJSServiceConnector.AnalyticsCache;
+ var cacheTimeoutSeconds = 5;
+ var loggedInUser = null;
+
+ if (configs.cacheTimeoutSeconds) {
+ cacheTimeoutSeconds = parseInt(configs.cacheTimeoutSeconds);
+ }
+ var cacheSizeBytes = 1024 * 1024 * 1024; // 1GB
+ if (configs.cacheSizeBytes) {
+ cacheSizeBytes = parseInt(configs.cacheSizeBytes);
+ }
+ response.contentType = CONTENT_TYPE_JSON;
+
+ var authParam = request.getHeader(AUTHORIZATION_HEADER);
+ if (authParam != null) {
+ credentials = JSUtils.authenticate(authParam);
+ loggedInUser = credentials[0];
+ } else {
+ var token = session.get(USER_TOKEN);
+ if (token != null) {
+ loggedInUser = token[USERNAME] + CONST_AT + token[TENANT_DOMAIN];
+ } else {
+ log.error("user is not authenticated!");
+ response.status = HTTP_USER_NOT_AUTHENTICATED;
+ print('{ "status": "Failed", "message": "User is not authenticated." }');
+ return;
+ }
+ }
+
+ var cache = application.get("AnalyticsWebServiceCache");
+ if (cache == null) {
+ cache = new AnalyticsCache(cacheTimeoutSeconds, cacheSizeBytes);
+ application.put("AnalyticsWebServiceCache", cache);
+ }
+ var connector = new AnalyticsCachedJSServiceConnector(cache);
+
+
+ /**
+ * returns an array of column names & types
+ * @param providerConfig
+ */
+ getSchema = function () {
+ var schema = [];
+ var result = connector.getTableSchema(loggedInUser, tableName).getMessage();
+ result = JSON.parse(result);
+
+ var columns = result.columns;
+ Object.getOwnPropertyNames(columns).forEach(function (name, idx, array) {
+ var type = "ordinal";
+ if (columns[name]['type']) {
+ type = columns[name]['type'];
+ }
+ schema.push({
+ fieldName: name,
+ fieldType: typeMap[type.toLowerCase()]
+ });
+ });
+ // log.info(schema);
+ return schema;
+ };
+
+ /**
+ * returns the actual data
+ * @param providerConfig
+ * @param limit
+ */
+ getData = function (deviceId, deviceType, fromTime, toTime) {
+ var luceneQuery = "timeStamp:[" + fromTime + " TO " + toTime + "]";
+ var limit = 100;
+ var result;
+ //if there's a filter present, we should perform a Lucene search instead of reading the table
+ if (luceneQuery) {
+ luceneQuery = 'id:"' + deviceId + '" AND type:"' + deviceType + '" AND ' + luceneQuery;
+ var filter = {
+ "query": luceneQuery,
+ "start": 0,
+ "count": limit
+ };
+ result = connector.search(loggedInUser, tableName, stringify(filter)).getMessage();
+ } else {
+ var from = JS_MIN_VALUE;
+ var to = JS_MAX_VALUE;
+ result = connector.getRecordsByRange(loggedInUser, tableName, from, to, 0, limit, null).getMessage();
+
+ }
+ result = JSON.parse(result);
+ var data = [];
+ for (var i = 0; i < result.length; i++) {
+ var values = result[i].values;
+ data.push(values);
+ }
+ return data;
+ };
+
+}());
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100755
index 0000000000..a2e6bfc085
Binary files /dev/null and b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
new file mode 100644
index 0000000000..3cbd718df6
Binary files /dev/null and b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png differ
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
new file mode 100644
index 0000000000..f1273672d2
Binary files /dev/null and b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png differ
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_222222_256x240.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000000..5b50fd245b
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_222222_256x240.png
@@ -0,0 +1,1405 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ django-grappelli/ui-icons_222222_256x240.png at grappelli_2_4 · sehmaschine/django-grappelli
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Skip to content
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Permalink
+
+
+
+
+
+
+
+
+
+ 45e3ff2
+
+ Apr 4, 2012
+
+
+
+
+
+ 1
+ contributor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Jump to Line
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ You can't perform that action at this time.
+
+
+
+
+
+
+
+
+
+
+
+
+
You signed in with another tab or window. Reload to refresh your session.
+
You signed out in another tab or window. Reload to refresh your session.
+
+
+
+
+
+
+
+
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_444444_256x240.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_444444_256x240.png
new file mode 100755
index 0000000000..df4e373785
Binary files /dev/null and b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_444444_256x240.png differ
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_555555_256x240.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_555555_256x240.png
new file mode 100755
index 0000000000..bbb422fed1
Binary files /dev/null and b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_555555_256x240.png differ
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_777620_256x240.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_777620_256x240.png
new file mode 100755
index 0000000000..ee49e9e501
Binary files /dev/null and b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_777620_256x240.png differ
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_777777_256x240.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_777777_256x240.png
new file mode 100755
index 0000000000..b01ff3deeb
Binary files /dev/null and b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_777777_256x240.png differ
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_cc0000_256x240.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_cc0000_256x240.png
new file mode 100755
index 0000000000..8920193948
Binary files /dev/null and b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_cc0000_256x240.png differ
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_ffffff_256x240.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_ffffff_256x240.png
new file mode 100755
index 0000000000..1cba4313d3
Binary files /dev/null and b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/ui-icons_ffffff_256x240.png differ
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui-timepicker-addon.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui-timepicker-addon.css
new file mode 100644
index 0000000000..2d9e03143d
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui-timepicker-addon.css
@@ -0,0 +1,27 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+.ui-timepicker-div .ui_tpicker_unit_hide{ display: none; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
+.ui-timepicker-rtl dl dt{ float: right; clear: right; }
+.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }
+
+/* Shortened version style */
+.ui-timepicker-div.ui-timepicker-oneLine { padding-right: 2px; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time,
+.ui-timepicker-div.ui-timepicker-oneLine dt { display: none; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label { display: block; padding-top: 2px; }
+.ui-timepicker-div.ui-timepicker-oneLine dl { text-align: right; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd,
+.ui-timepicker-div.ui-timepicker-oneLine dl dd > div { display:inline-block; margin:0; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before { content:':'; display:inline-block; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before { content:'.'; display:inline-block; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{ display: none; }
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui-timepicker-addon.min.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui-timepicker-addon.min.css
new file mode 100644
index 0000000000..0bf35f74d4
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui-timepicker-addon.min.css
@@ -0,0 +1,5 @@
+/*! jQuery Timepicker Addon - v1.5.3 - 2015-04-19
+* http://trentrichardson.com/examples/timepicker
+* Copyright (c) 2015 Trent Richardson; Licensed MIT */
+
+.ui-timepicker-div .ui-widget-header{margin-bottom:8px}.ui-timepicker-div dl{text-align:left}.ui-timepicker-div dl dt{float:left;clear:left;padding:0 0 0 5px}.ui-timepicker-div dl dd{margin:0 10px 10px 40%}.ui-timepicker-div td{font-size:90%}.ui-tpicker-grid-label{background:0 0;border:0;margin:0;padding:0}.ui-timepicker-div .ui_tpicker_unit_hide{display:none}.ui-timepicker-rtl{direction:rtl}.ui-timepicker-rtl dl{text-align:right;padding:0 5px 0 0}.ui-timepicker-rtl dl dt{float:right;clear:right}.ui-timepicker-rtl dl dd{margin:0 40% 10px 10px}.ui-timepicker-div.ui-timepicker-oneLine{padding-right:2px}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time,.ui-timepicker-div.ui-timepicker-oneLine dt{display:none}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label{display:block;padding-top:2px}.ui-timepicker-div.ui-timepicker-oneLine dl{text-align:right}.ui-timepicker-div.ui-timepicker-oneLine dl dd,.ui-timepicker-div.ui-timepicker-oneLine dl dd>div{display:inline-block;margin:0}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before{content:':';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before{content:'.';display:inline-block}.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{display:none}
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/main.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/main.css
index ad038be284..be331e49b7 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/main.css
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/main.css
@@ -79,3 +79,9 @@
box-shadow: 0 5px 15px rgba(0,0,0,.5);
}
+.ui-dialog .ui-dialog-title {
+ word-break: keep-all !important;
+ word-wrap: normal !important;
+ white-space: normal !important;
+}
+
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/style.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/style.css
index b225f7915b..5e920b8f2c 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/style.css
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/style.css
@@ -17,7 +17,7 @@
*/
/*html, body {*/
- /*height: 100%;*/
+/*height: 100%;*/
/*}*/
#map {
@@ -31,4 +31,4 @@
.leaflet-control-attribution.leaflet-control {
font-size: 8px;
-}
\ No newline at end of file
+}
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
index c6d9c7a6c8..35449da599 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
@@ -102,7 +102,6 @@
-