From f3eaac15c7e1352e3ce39e9426a7dbf76a6cfcd1 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Sun, 16 Jul 2017 18:53:05 +0530
Subject: [PATCH 1/2] Fixes https://github.com/wso2/product-iots/issues/1096

---
 .../app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs       | 4 ++--
 .../public/assets/html_templates/modal/exit_alert.html        | 2 +-
 .../public/assets/html_templates/modal/stationery_alert.html  | 2 +-
 .../public/assets/html_templates/modal/traffic_point.html     | 2 +-
 .../public/assets/html_templates/modal/within_alert.html      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
index 0c22014c8e..9ee2e75c89 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
@@ -710,9 +710,9 @@
                     createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/stationery_alert.html',
                                           'Add Stationary Alert', 'glyphicon glyphicon-link', geoToolsMenu);
                     createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/within_alert.html',
-                                          'Add Geo Fence Enter Alert', 'glyphicon glyphicon-log-in', geoToolsMenu);
+                                          'Add Geofence Alert', 'glyphicon glyphicon-log-in', geoToolsMenu);
                     createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/exit_alert.html',
-                                          'Add Geo Fence Exit Alert', 'glyphicon glyphicon-log-out', geoToolsMenu);
+                                          'Add Geofence Exit Alert', 'glyphicon glyphicon-log-out', geoToolsMenu);
                 {{/if}}
             }
         });
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html
index 8a9c9ea78c..76fd548934 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html
@@ -24,7 +24,7 @@
                     </thead>
                     <tbody>
                     <div class="alert alert-info fence-not-exist" role="alert">
-                        <strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again.
+                        <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
                     </div>
 
                     </tbody>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
index 37b617e58d..fce178aa2a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
@@ -56,7 +56,7 @@
                     </thead>
                     <tbody>
                     <div class="alert alert-info fence-not-exist" role="alert">
-                        <strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again.
+                        <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
                     </div>
                     </tbody>
                 </table>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html
index af1a9421c4..cf35da242c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html
@@ -75,7 +75,7 @@
                 else{
                 %>
                 <div class="alert alert-danger" role="alert">
-                      <strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again.
+                      <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
                 </div>
                 <%
                 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html
index 6055a12452..91e5210bc9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html
@@ -24,7 +24,7 @@
                     </thead>
                     <tbody>
                     <div class="alert alert-info fence-not-exist" role="alert">
-                        <strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again.
+                        <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
                     </div>
 
                     </tbody>

From c31461d278d22b919e5aa7db14d2961848eab524 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Sun, 16 Jul 2017 19:01:06 +0530
Subject: [PATCH 2/2] Fixes https://github.com/wso2/product-iots/issues/1096

---
 .../cdmf.unit.geo-dashboard/geo-dashboard.hbs | 34 +++++++++++++++++++
 .../html_templates/modal/exit_alert.html      |  4 +--
 .../modal/stationery_alert.html               |  2 +-
 .../html_templates/modal/traffic_point.html   |  2 +-
 .../html_templates/modal/within_alert.html    |  2 +-
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
index 9ee2e75c89..5df6319bd3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
@@ -478,6 +478,40 @@
             </div>
         </div>
     </div>
+    <div class="modal" id="editExitGeoJSON" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button class="close" type="button" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h4 class="modal-title">
+                    </h4>
+                    <div class="col-lg-5 col-md-6 col-centered">
+                        <h4>
+                            Adding GeoJson
+                            <br>
+                        </h4>
+                    </div>
+                </div>
+                <div class="modal-body">
+                    <div class="col-lg-8 col-md-8 col-centered">
+                        <div>
+                            <label for="importGeoJsonFile">Import GeoJson</label>
+                            <input id="importGeoJsonFile" type="file">
+                            <hr />
+                            <label for="enterGeoJson">Enter GeoJson</label>
+                            <textarea id="enterGeoJson" class="form-control" rows="10"></textarea>
+                        </div>
+                        <div class="pull-right">
+                            <button id="updateGeoJson" class="btn btn-primary" onclick="importGeoJson()">Import</button>
+                            <button type="button" class="btn btn-default" onclick="closeAll()">Cancel</button>
+                            <br />
+                            <br />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div style="display: none">
         <div id="markerPopup" class="popover top">
             <div class="arrow"></div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html
index 76fd548934..801fd95393 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html
@@ -24,7 +24,7 @@
                     </thead>
                     <tbody>
                     <div class="alert alert-info fence-not-exist" role="alert">
-                        <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
+                        <strong>Oh snap!</strong> Can't find any geofence area, please draw a new area or try again.
                     </div>
 
                     </tbody>
@@ -35,7 +35,7 @@
                         onclick="openTools('Exit')">Draw area
                 </button>
                 <button style="background-color: #f4f4f4;" type="button" class="btn  btn-default"
-                        onclick="$('#editExitinGeoJSON').modal('toggle')">Enter area
+                        onclick="$('#editExitGeoJSON').modal('toggle')">Enter area
                 </button>
                 <br/>
                 <br/>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
index fce178aa2a..8275e657b8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
@@ -56,7 +56,7 @@
                     </thead>
                     <tbody>
                     <div class="alert alert-info fence-not-exist" role="alert">
-                        <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
+                        <strong>Oh snap!</strong> Can't find any geofence area, please draw a new area or try again.
                     </div>
                     </tbody>
                 </table>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html
index cf35da242c..d2e4da395c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html
@@ -75,7 +75,7 @@
                 else{
                 %>
                 <div class="alert alert-danger" role="alert">
-                      <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
+                      <strong>Oh snap!</strong> Can't find any geofence area, please draw a new area or try again.
                 </div>
                 <%
                 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html
index 91e5210bc9..2be91f5a1d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html
@@ -24,7 +24,7 @@
                     </thead>
                     <tbody>
                     <div class="alert alert-info fence-not-exist" role="alert">
-                        <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
+                        <strong>Oh snap!</strong> Can't find any geofence area, please draw a new area or try again.
                     </div>
 
                     </tbody>