Merge branch 'development' of https://github.com/TNOCS/csWeb into dev…

…elopment
TNOCS · Oct 29, 2015 · 4aac1e9 · 4aac1e9
2 parents 0f1c0d0 + faea2a2
commit 4aac1e9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/csComp/directives/Widgets/SimState/SimState.tpl.html b/csComp/directives/Widgets/SimState/SimState.tpl.html
@@ -1,4 +1,4 @@
-<div style="margin-top: 20px; height: 400px" class="kanbanColumn-column">
+<div style="margin-top: 20px; height: 400px; margin-left: 8px; width: 275px;" class="kanbanColumn-column">
     <div class="card-list-scroll-container">
         <div class="card-list-container">
             <ul class="card-list">

diff --git a/csComp/services/map/renderers/leafletRenderer.ts b/csComp/services/map/renderers/leafletRenderer.ts
@@ -237,8 +237,10 @@ module csComp.Services {
                     }
                 }
             }
-            if (feature.layer.isDynamic) {
-                if (this.canDrag(feature)) { marker.dragging.enable(); } else {
+            if (feature.layer.isDynamic && marker.dragging) {
+                if (this.canDrag(feature)) {
+                    marker.dragging.enable();
+                } else {
                     marker.dragging.disable();
                 };
             }

diff --git a/csServerComp/ServerComponents/api/MqttAPI.ts b/csServerComp/ServerComponents/api/MqttAPI.ts
@@ -67,7 +67,7 @@ export class MqttAPI extends BaseConnector.BaseConnector {
             if (topic === this.layerPrefix) {
                 var layer = this.extractLayer(message);
                 if (layer && layer.id) {
-                    Winston.info('mqtt: received definition for layer ' + layer.id);
+                    Winston.info(`mqtt: received definition for layer ${layer.id} on topic ${topic}`);
                     Winston.info(`Definition: ${JSON.stringify(layer, null, 2)}`)
                     this.manager.addUpdateLayer(layer, <ApiMeta>{ source: this.id }, () => { });
                 }
@@ -83,7 +83,7 @@ export class MqttAPI extends BaseConnector.BaseConnector {
                     try {
                         var layer = this.extractLayer(message);
                         if (layer) {
-                            Winston.info(`mqtt: update layer ${layerId}`);
+                            Winston.info(`mqtt: update layer ${layerId} on topic ${topic}`);
                             this.manager.addUpdateLayer(layer, <ApiMeta>{ source: this.id }, () => { });
                         }
                     } catch (e) {
@@ -94,7 +94,7 @@ export class MqttAPI extends BaseConnector.BaseConnector {
                         var featureId = ids[1];
                         var feature = <Feature>JSON.parse(message);
                         if (feature) {
-                            Winston.info(`mqtt: update feature ${featureId} for layer ${layerId}.`);
+                            Winston.info(`mqtt: update feature ${featureId} for layer ${layerId} on topic ${topic}.`);
                             this.manager.updateFeature(layerId, feature, <ApiMeta>{ source: this.id }, () => { });
                         }
                     } catch (e) {