Fix linting errors

3 files changed, 58 insertions, 59 deletions

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index f0f3dca44..3e3c33bba 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -2,7 +2,7 @@ var fixmystreet = fixmystreet || {};
 
 (function() {
 
-    fixmystreet.maps = fixmystreet.maps || {}
+    fixmystreet.maps = fixmystreet.maps || {};
 
     $.extend(fixmystreet.maps, {
       // This function might be passed either an OpenLayers.LonLat (so has
@@ -70,12 +70,8 @@ var fixmystreet = fixmystreet || {};
 
       markers_list: function(pins, transform) {
         var markers = [];
-        var size = fixmystreet.maps.marker_size_for_zoom(
-            fixmystreet.map.getZoom() + fixmystreet.zoomOffset
-        );
-        var selected_size = fixmystreet.maps.selected_marker_size_for_zoom(
-            fixmystreet.map.getZoom() + fixmystreet.zoomOffset
-        );
+        var size = fixmystreet.maps.marker_size();
+        var selected_size = fixmystreet.maps.selected_marker_size();
         for (var i=0; i<pins.length; i++) {
             var pin = pins[i];
             var loc = new OpenLayers.Geometry.Point(pin[1], pin[0]);
@@ -101,12 +97,8 @@ var fixmystreet = fixmystreet || {};
       },
 
       markers_resize: function() {
-        var size = fixmystreet.maps.marker_size_for_zoom(
-            fixmystreet.map.getZoom() + fixmystreet.zoomOffset
-        );
-        var selected_size = fixmystreet.maps.selected_marker_size_for_zoom(
-            fixmystreet.map.getZoom() + fixmystreet.zoomOffset
-        );
+        var size = fixmystreet.maps.marker_size();
+        var selected_size = fixmystreet.maps.selected_marker_size();
         for (var i = 0; i < fixmystreet.markers.features.length; i++) {
             if (fixmystreet.markers.features[i].attributes.id == window.selected_problem_id) {
                 fixmystreet.markers.features[i].attributes.size = selected_size;
@@ -121,7 +113,8 @@ var fixmystreet = fixmystreet || {};
         return fixmystreet.markers.getFeaturesByAttribute('id', problem_id)[0];
       },
 
-      marker_size_for_zoom: function(zoom) {
+      marker_size: function() {
+        var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset;
         if (zoom >= 15) {
             return window.selected_problem_id ? 'small' : 'normal';
         } else if (zoom >= 13) {
@@ -131,7 +124,8 @@ var fixmystreet = fixmystreet || {};
         }
       },
 
-      selected_marker_size_for_zoom: function(zoom) {
+      selected_marker_size: function() {
+        var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset;
         if (zoom >= 15) {
             return 'big';
         } else if (zoom >= 13) {
@@ -213,7 +207,9 @@ var fixmystreet = fixmystreet || {};
             this._drag.activate();
         },
         deactivate: function() {
-            this._drag && this._drag.deactivate();
+            if (this._drag) {
+              this._drag.deactivate();
+            }
         }
     };
 
@@ -312,7 +308,7 @@ var fixmystreet = fixmystreet || {};
         var filter_categories = replace_query_parameter(qs, 'filter_categories', 'filter_category');
         var filter_statuses = replace_query_parameter(qs, 'statuses', 'status');
         var sort_key = replace_query_parameter(qs, 'sort', 'sort');
-        delete qs['p'];
+        delete qs.p;
         var new_url;
         if ($.isEmptyObject(qs)) {
             new_url = location.href.replace(location.search, "");
@@ -367,6 +363,37 @@ var fixmystreet = fixmystreet || {};
             ]);
             var loaded = 0;
             var new_geometry = new OpenLayers.Geometry.Polygon(lr);
+            var style_area = function() {
+                loaded++;
+                var style = this.styleMap.styles['default'];
+                if ( fixmystreet.area_format ) {
+                    style.defaultStyle = fixmystreet.area_format;
+                } else {
+                    $.extend(style.defaultStyle, { fillColor: 'black', strokeColor: 'black' });
+                }
+                var geometry = this.features[0].geometry;
+                if (geometry.CLASS_NAME == 'OpenLayers.Geometry.Collection') {
+                    $.each(geometry.components, function(i, polygon) {
+                        new_geometry.addComponents(polygon.components);
+                        extent.extend(polygon.getBounds());
+                    });
+                } else if (geometry.CLASS_NAME == 'OpenLayers.Geometry.Polygon') {
+                    new_geometry.addComponents(geometry.components);
+                    extent.extend(this.getDataExtent());
+                }
+                if (loaded == fixmystreet.area.length) {
+                    var f = this.features[0].clone();
+                    f.geometry = new_geometry;
+                    this.removeAllFeatures();
+                    this.addFeatures([f]);
+                    var qs = parse_query_string();
+                    if (!qs.bbox) {
+                        zoomToBounds(extent);
+                    }
+                } else {
+                    fixmystreet.map.removeLayer(this);
+                }
+            };
             for (var i=0; i<fixmystreet.area.length; i++) {
                 var area = new OpenLayers.Layer.Vector("KML", {
                     renderers: ['SVGBig', 'VML', 'Canvas'],
@@ -377,37 +404,7 @@ var fixmystreet = fixmystreet || {};
                     })
                 });
                 fixmystreet.map.addLayer(area);
-                area.events.register('loadend', area, function(a,b,c) {
-                    loaded++;
-                    var style = this.styleMap.styles['default'];
-                    if ( fixmystreet.area_format ) {
-                        style.defaultStyle = fixmystreet.area_format;
-                    } else {
-                        $.extend(style.defaultStyle, { fillColor: 'black', strokeColor: 'black' });
-                    }
-                    var geometry = this.features[0].geometry;
-                    if (geometry.CLASS_NAME == 'OpenLayers.Geometry.Collection') {
-                        $.each(geometry.components, function(i, polygon) {
-                            new_geometry.addComponents(polygon.components)
-                            extent.extend(polygon.getBounds());
-                        });
-                    } else if (geometry.CLASS_NAME == 'OpenLayers.Geometry.Polygon') {
-                        new_geometry.addComponents(geometry.components);
-                        extent.extend(this.getDataExtent());
-                    }
-                    if (loaded == fixmystreet.area.length) {
-                        var f = this.features[0].clone();
-                        f.geometry = new_geometry;
-                        this.removeAllFeatures();
-                        this.addFeatures([f]);
-                        var qs = parse_query_string();
-                        if (!qs.bbox) {
-                            zoomToBounds(extent);
-                        }
-                    } else {
-                        fixmystreet.map.removeLayer(this);
-                    }
-                });
+                area.events.register('loadend', area, style_area);
             }
         }
 
@@ -544,7 +541,7 @@ var fixmystreet = fixmystreet || {};
             fixmystreet.select_feature.activate();
             fixmystreet.map.events.register( 'zoomend', null, fixmystreet.maps.markers_resize );
             fixmystreet.map.events.register( 'zoomend', null, function() {
-              fixmystreet.run(fixmystreet.maps.show_shortlist_control)
+              fixmystreet.run(fixmystreet.maps.show_shortlist_control);
             });
 
             // Set up the event handlers to populate the filters and react to them changing
@@ -687,7 +684,7 @@ var fixmystreet = fixmystreet || {};
             var timeout;
             $('.item-list--reports').on('mouseenter', '.item-list--reports__item', function(){
                 var href = $('a', this).attr('href');
-                var id = parseInt(href.replace(/^.*[/]([0-9]+)$/, '$1'));
+                var id = parseInt(href.replace(/^.*[\/]([0-9]+)$/, '$1'),10);
                 clearTimeout(timeout);
                 fixmystreet.maps.markers_highlight(id);
             }).on('mouseleave', '.item-list--reports__item', function(){
@@ -936,7 +933,7 @@ OpenLayers.Control.DragFeatureFMS = OpenLayers.Class(OpenLayers.Control.DragFeat
             return false;
         }
     }
-})
+});
 
 OpenLayers.Renderer.SVGBig = OpenLayers.Class(OpenLayers.Renderer.SVG, {
     MAX_PIXEL: 15E7,
diff --git a/web/js/map-wmts-bristol.js b/web/js/map-wmts-bristol.js
index 70cd1b66b..4a48da27f 100644
--- a/web/js/map-wmts-bristol.js
+++ b/web/js/map-wmts-bristol.js
@@ -1,4 +1,4 @@
-/* 
+/*
  * Maps for FMS using Bristol City Council's WMTS tile server
  */
 
@@ -102,7 +102,7 @@ fixmystreet.maps.matrix_ids = [
     }
 ];
 
-/* 
+/*
  * maps.config() is called on dom ready in map-OpenLayers.js
  * to setup the way the map should operate.
  */
@@ -125,11 +125,12 @@ fixmystreet.maps.config = function() {
     if ( fixmystreet.page == 'report' ) {
         fixmystreet.controls.push( new OpenLayers.Control.PermalinkFMS('key-tool-problems-nearby', '/around') );
     }
-    
+
     this.setup_wmts_base_map();
 };
 
-fixmystreet.maps.marker_size_for_zoom = function(zoom) {
+fixmystreet.maps.marker_size = function() {
+    var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset;
     if (zoom >= 7) {
         return 'normal';
     } else if (zoom >= 4) {
diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js
index 18a858064..6bc1c5e14 100644
--- a/web/js/map-wmts-zurich.js
+++ b/web/js/map-wmts-zurich.js
@@ -1,5 +1,5 @@
-/* 
- * Maps for FMZ using Zurich council's WMTS tile server 
+/*
+ * Maps for FMZ using Zurich council's WMTS tile server
  */
 
 // From 'fullExtent' from http://www.gis.stadt-zuerich.ch/maps/rest/services/tiled95/LuftbildHybrid/MapServer?f=pjson
@@ -140,7 +140,7 @@ fixmystreet.maps.matrix_ids = [
 
 })();
 
-/* 
+/*
  * maps.config() is called on dom ready in map-OpenLayers.js
  * to setup the way the map should operate.
  */
@@ -165,7 +165,8 @@ fixmystreet.maps.config = function() {
     fixmystreet.area_format = { fillColor: 'none', strokeWidth: 4, strokeColor: 'black' };
 };
 
-fixmystreet.maps.marker_size_for_zoom = function(zoom) {
+fixmystreet.maps.marker_size = function() {
+    var zoom = fixmystreet.map.getZoom() + fixmystreet.zoomOffset;
     if (zoom >= 6) {
         return 'normal';
     } else if (zoom >= 3) {