community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issues in the full history view in geo fence.

Browse Source
This commit is contained in:
sinthuja 2016-12-15 16:12:02 +05:30
parent 8d800feaca
commit 3d504afa35
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/gadget-controller.jag
View File

@ -25,14 +25,12 @@
var type = request.getParameter("type"); var type = request.getParameter("type");
var timeFrom = request.getParameter("timeFrom"); var timeFrom = request.getParameter("timeFrom");
var timeTo = request.getParameter("timeTo"); var timeTo = request.getParameter("timeTo");
var log = new Log();
var providerAPI = require('js/batch-provider-api.js'); var providerAPI = require('js/batch-provider-api.js');
if (action === 'getSchema') { if (action === 'getSchema') {
print(providerAPI.getSchema()); print(providerAPI.getSchema());
return; return;
} else if(action === 'getData'){ } else if(action === 'getData'){
log.info('FromTime : '+timeFrom+', toTime: '+ timeTo);
print(providerAPI.getData(id, type, timeFrom, timeTo)); print(providerAPI.getData(id, type, timeFrom, timeTo));
return; return;
} }

4
components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
View File

@ -82,7 +82,7 @@ function initializeMap() {
map = L.map("map", { map = L.map("map", {
zoom: 14, zoom: 14,
center: [51.548525, 0.111749], center: [6.927078, 79.861243],
layers: [defaultOSM, defaultTFL], layers: [defaultOSM, defaultTFL],
zoomControl: false, zoomControl: false,
attributionControl: false, attributionControl: false,
@ -120,8 +120,6 @@ function initializeMap() {
} }
}); });
} }
/* Attribution control */ /* Attribution control */

12
components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
View File

@ -166,13 +166,16 @@ function angleToHeading(angle) {
SpatialObject.prototype.removeFromMap = function () { SpatialObject.prototype.removeFromMap = function () {
this.removePath(); this.removePath();
this.marker.closePopup(); this.marker.closePopup();
map.removeLayer(this.marker);
}; };
function clearMap() { function clearMap() {
for (var i=0; i< currentSpatialObjects.length; i++ ){ for (var spacialObject in currentSpatialObjects) {
console.log("removed - " + currentSpatialObjects[i]); console.log(spacialObject);
currentSpatialObjects[i].removeFromMap(); currentSpatialObjects[spacialObject].removePath();
currentSpatialObjects[spacialObject].removeFromMap();
} }
currentSpatialObjects = {};
} }
SpatialObject.prototype.createLineStringFeature = function (state, information, coordinates) { SpatialObject.prototype.createLineStringFeature = function (state, information, coordinates) {
@ -702,7 +705,7 @@ function intializeWebsocketUrls() {
ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance
.CEP_ON_ALERT_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION .CEP_ON_ALERT_WEB_SOCKET_OUTPUT_ADAPTOR_NAME + ApplicationOptions.constance.PATH_SEPARATOR + ApplicationOptions.constance.VERSION
+ "?deviceId=" + deviceId + "&deviceType=" + deviceType; + "?deviceId=" + deviceId + "&deviceType=" + deviceType;
document.cookie = "websocket-token=f98d6142-e988-3c7f-a8c9-7e6d74da7113; path=/"; document.cookie = "websocket-token=619e6170-10e8-31f0-904b-b7770d53e545; path=/";
$("#proximity_alert").hide(); $("#proximity_alert").hide();
initializeWebSocket(); initializeWebSocket();
initializeOnAlertWebSocket(); initializeOnAlertWebSocket();
@ -720,7 +723,6 @@ function intializeWebsocketUrls() {
} }
intializeWebsocketUrls(); intializeWebsocketUrls();