Merge branch 'develop' into redasterisk

Author: noone0212

app/app.js

@@ -138,6 +138,7 @@ angular.module('app',
         // Load leaflet plugins here too
         require('imports-loader?L=leaflet!leaflet.markercluster');
         require('imports-loader?L=leaflet!leaflet.locatecontrol/src/L.Control.Locate');
+        require('imports-loader?L=leaflet!leaflet-easybutton');
         return L;
     })
     .factory('moment', function () {

app/common/services/maps.js

@@ -39,13 +39,13 @@ function Maps(ConfigEndpoint, L, _, CONST) {
         pointToLayer: pointToLayer,
         getConfig: getConfig,
         getLayer: getLayer,
-        pointIcon: pointIcon
+        pointIcon: pointIcon,
+        defaultConfig: defaultConfig
     };
 
     function createMap(element) {
         return getLeafletConfig().then(function (config) {
             var map = L.map(element, config);
-
             map.attributionControl.setPrefix(false);
             map.zoomControl.setPosition('bottomleft');
             map.setMaxBounds([[-90,-360],[90,360]]);
@@ -58,6 +58,25 @@ function Maps(ConfigEndpoint, L, _, CONST) {
 
             // Add a layer control
             // L.control.layers(getBaseLayersForControl(), {}).addTo(map);
+            var iconicSprite = require('ushahidi-platform-pattern-library/assets/img/iconic-sprite.svg');
+            var resetButton  = L.easyButton({
+                id: 'reset-button',
+                position: 'bottomleft',
+                type: 'replace',
+                leafletClasses: true,
+                states:[{
+                    // specify different icons and responses for your button
+                    stateName: 'reset-button',
+                    onClick: function() {
+                        var defaultview = defaultValues(config);
+                        map.setView([defaultview.lat, defaultview.lon], defaultview.zoom);
+                    },
+                    title: 'Reset to default view',
+                    icon: '<svg class="iconic" style="fill:black;"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="' + iconicSprite + '#home"></use></svg>'
+                }]
+            });
+
+            resetButton.addTo(map);
 
             return map;
         });
@@ -112,9 +131,9 @@ function Maps(ConfigEndpoint, L, _, CONST) {
 
     function defaultConfig() {
         return {
-            scrollWheelZoom: false,
+            scrollWheelZoom: true,
             center: [-1.2833, 36.8167], // Default to centered on Nairobi
-            zoom: 8,
+            zoom: 3,
             layers: [L.tileLayer(layers.baselayers.streets.url, layers.baselayers.streets.layerOptions)]
         };
     }
@@ -124,7 +143,6 @@ function Maps(ConfigEndpoint, L, _, CONST) {
             icon: pointIcon(feature.properties['marker-color'])
         });
     }
-
     // Icon configuration
     function pointIcon(color, size, className) {
         // Test string to make sure that it does not contain injection
@@ -140,4 +158,14 @@ function Maps(ConfigEndpoint, L, _, CONST) {
             popupAnchor: [0, 0 - size[1]]
         });
     }
+
+    // default view is centered on nairobi
+    function defaultValues(config) {
+        return {
+            lat: config.center[0],
+            lon: config.center[1],
+            zoom: config.zoom
+        }
+    }
+
 }

app/index.html

@@ -14,7 +14,7 @@
         <meta name="apple-itunes-app" content="app-id={{appStoreId}}, app-argument={{currentFullUrl}}>">
 
         <link rel="manifest" href="/manifest.json">
-
+        
         <base href="/">
     </head>
     <!-- TODO: set layouts per view directive -->

app/main/posts/common/post-actions.directive.js

@@ -41,6 +41,7 @@ function PostActionsDirective(
             $scope.statuses = PostActionsService.getStatuses();
         }
 
+        // Called when a single data item is deleted.
         function deletePost() {
             PostActionsService.delete($scope.post).then(function () {
                 $rootScope.$broadcast('event:edit:post:status:data:mode:saveSuccess', {post: $scope.post, deleted: true});
@@ -52,7 +53,6 @@ function PostActionsDirective(
                     // only map needs to reload
                     $state.reload();
                 }
-
             });
         }
 

app/main/posts/detail/map.html

@@ -1,3 +1,4 @@
+
 <div class="postcard-field" ng-style="{'visibility': hideMap ? 'hidden' : 'visible'}" ng-hide="emptyGeoJSON">
     <h2 class="form-label" translate>post.location</h2>
     <div id="post-map" class="map"></div>

app/main/posts/modify/post-editor.html

@@ -102,23 +102,6 @@ <h1 class="mode-context-title"><bdi>{{post.form.name}}</bdi></h1>
                   </div>
             </div>
           </div> -->
-          <div class="form-sheet" ng-if="post.id">
-              <div class="form-sheet-summary">
-                  <h3 class="form-sheet-title" translate="post.delete_post">Delete this post</h3>
-              </div>
-
-              <div class="form-field">
-                  <p translate="post.delete_post_desc"><strong>If you delete this post</strong>, all of its comments and messages will also be deleted. Proceed with caution.</p>
-
-                  <button class="button-destructive" ng-click="deletePost(post)">
-                      <svg class="iconic">
-                          <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#trash"></use>
-                      </svg>
-                      <span class="button-label" translate="post.delete_post">Delete post</span>
-                  </button>
-              </div>
-          </div>
-
           <ush-logo></ush-logo>
       </div> <!-- END main column -->
 

app/main/posts/views/post-view-data.directive.js

@@ -181,7 +181,7 @@ function PostViewDataController(
         );
 
         $scope.$on('event:edit:leave:form:complete', function () {
-            // Bercause there is no state management
+            // Because there is no state management
             // We copy the next Post to be the current Post
             // if the previous Post exited correctly
             // Ideally Post Card would become a service more akin
@@ -255,9 +255,11 @@ function PostViewDataController(
     function removePostFromList(postObj) {
         $scope.posts.forEach((post, index) => {
             // args.post is the post being updated/saved and sent from the broadcast
+            // since a single post is being deleted here, reduce count of totalitems by 1.
             if (post.id === postObj.id) {
                 let nextInLine = $scope.posts[index + 1];
                 $scope.posts.splice(index, 1);
+                $scope.totalItems = $scope.totalItems - 1;
                 if ($scope.posts.length) {
                     groupPosts($scope.posts);
                     if ($scope.selectedPost.post) {
@@ -329,7 +331,6 @@ function PostViewDataController(
         PostEndpoint.query(postQuery).$promise.then(function (postsResponse) {
             //Clear posts
             clearPosts ? resetPosts() : null;
-
             // If we're loading posts for the first time and we have a selected post (post detail view)
             // check to see that the selected post isn't in the list
             // and then deselect it and select the first item
@@ -360,6 +361,7 @@ function PostViewDataController(
         });
     }
 
+    // this function is called when multiple data items are deleted
     function deletePosts() {
         Notify.confirmDelete('notify.post.bulk_destroy_confirm', { count: $scope.selectedPosts.length }).then(function () {
             // ask server to delete selected posts

app/settings/site/map.directive.js

@@ -32,6 +32,7 @@ function (
             $scope.updateMapPreviewLayer = updateMapPreviewLayer;
             $scope.current_precision =  9;
             $scope.locationPrecisionEnabled = false;
+            $scope.handleClick = handleClick;
 
             activate();
 

package.json

@@ -64,7 +64,7 @@
     "karma-coverage": "^2.0.1",
     "karma-firefox-launcher": "^1.2.0",
     "karma-fixture": "^0.2.6",
-    "karma-jasmine": "^2.0.1",
+    "karma-jasmine": "^3.1.1",
     "karma-json-fixtures-preprocessor": "0.0.6",
     "karma-notify-reporter": "^1.2.0",
     "karma-phantomjs-launcher": "^1.0.4",
@@ -85,7 +85,7 @@
     "sass-loader": "^8.0.0",
     "style-loader": "^1.1.2",
     "supports-color": "^3.1.2",
-    "svg-url-loader": "^3.0.3",
+    "svg-url-loader": "^4.0.0",
     "transifex": "^1.6.6",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "url-loader": "^3.0.0",
@@ -112,8 +112,9 @@
     "angular-ui-bootstrap": "^2.5.0",
     "checklist-model": "~0.11.0",
     "d3": "^3.5.17",
-    "leaflet": "~1.0.1",
-    "leaflet.locatecontrol": "^0.62.0",
+    "leaflet.locatecontrol": "^0.70.0",
+    "leaflet": "^1.6.0",
+    "leaflet-easybutton": "^2.4.0",
     "leaflet.markercluster": "1.0.5",
     "libphonenumber-js": "^1.0.24",
     "moment": "2.19.3",

sass/overrides/_leaflet.scss

@@ -65,3 +65,13 @@ input.leaflet-control-layers-selector {
 .leaflet-map-pane svg.iconic {
     position: initial;
 }
+
+//  Override styles for reset button
+#reset-button {
+    background-color: white;
+    height: 30px;
+    width: 27px;
+    padding: 8px 8px;
+    margin-right: 0px;
+    margin-bottom: 0px;
+}