Enable a few more eslint checks

app/assets/javascripts/index.js

@@ -32,6 +32,8 @@ $(document).ready(function () {
   });
 
   OSM.loadSidebarContent = function (path, callback) {
+    var content_path = path;
+
     map.setSidebarOverlaid(false);
 
     clearTimeout(loaderTimeout);
@@ -42,17 +44,17 @@ $(document).ready(function () {
 
     // IE<10 doesn't respect Vary: X-Requested-With header, so
     // prevent caching the XHR response as a full-page URL.
-    if (path.indexOf("?") >= 0) {
+    if (content_path.indexOf("?") >= 0) {
-      path += "&xhr=1";
+      content_path += "&xhr=1";
     } else {
-      path += "?xhr=1";
+      content_path += "?xhr=1";
     }
 
     $("#sidebar_content")
       .empty();
 
     $.ajax({
-      url: path,
+      url: content_path,
       dataType: "html",
       complete: function (xhr) {
         clearTimeout(loaderTimeout);

app/assets/javascripts/index/directions.js

@@ -31,9 +31,9 @@ OSM.Directions = function (map) {
   var engines = OSM.Directions.engines;
 
   engines.sort(function (a, b) {
-    a = I18n.t("javascripts.directions.engines." + a.id);
+    var localised_a = I18n.t("javascripts.directions.engines." + a.id),
-    b = I18n.t("javascripts.directions.engines." + b.id);
+        localised_b = I18n.t("javascripts.directions.engines." + b.id);
-    return a.localeCompare(b);
+    return localised_a.localeCompare(localised_b);
   });
 
   var select = $("select.routing_engines");

app/assets/javascripts/index/notes.js

@@ -39,7 +39,8 @@ OSM.initializeNotes = function (map) {
     }
   });
 
-  function updateMarker(marker, feature) {
+  function updateMarker(old_marker, feature) {
+    var marker = old_marker;
     if (marker) {
       marker.setIcon(noteIcons[feature.properties.status]);
     } else {

app/assets/javascripts/index/query.js

@@ -153,7 +153,7 @@ OSM.Query = function (map) {
       }), featureStyle);
     } else if (feature.type === "relation" && feature.members) {
       geometry = L.featureGroup(feature.members.map(featureGeometry).filter(function (geometry) {
-        return geometry !== undefined;
+        return typeof geometry !== "undefined";
       }));
     }
 

app/assets/javascripts/leaflet.map.js

@@ -71,11 +71,11 @@ L.OSM.Map = L.Map.extend({
   },
 
   updateLayers: function (layerParam) {
-    layerParam = layerParam || "M";
+    var layers = layerParam || "M",
-    var layersAdded = "";
+        layersAdded = "";
 
     for (var i = this.baseLayers.length - 1; i >= 0; i--) {
-      if (layerParam.indexOf(this.baseLayers[i].options.code) >= 0) {
+      if (layers.indexOf(this.baseLayers[i].options.code) >= 0) {
         this.addLayer(this.baseLayers[i]);
         layersAdded = layersAdded + this.baseLayers[i].options.code;
       } else if (i === 0 && layersAdded === "") {
@@ -152,15 +152,17 @@ L.OSM.Map = L.Map.extend({
 
     // Called to interlace the bits in x and y, making a Morton code.
     function interlace(x, y) {
-      x = (x | (x << 8)) & 0x00ff00ff;
+      var interlaced_x = x,
-      x = (x | (x << 4)) & 0x0f0f0f0f;
+          interlaced_y = y;
-      x = (x | (x << 2)) & 0x33333333;
+      interlaced_x = (interlaced_x | (interlaced_x << 8)) & 0x00ff00ff;
-      x = (x | (x << 1)) & 0x55555555;
+      interlaced_x = (interlaced_x | (interlaced_x << 4)) & 0x0f0f0f0f;
-      y = (y | (y << 8)) & 0x00ff00ff;
+      interlaced_x = (interlaced_x | (interlaced_x << 2)) & 0x33333333;
-      y = (y | (y << 4)) & 0x0f0f0f0f;
+      interlaced_x = (interlaced_x | (interlaced_x << 1)) & 0x55555555;
-      y = (y | (y << 2)) & 0x33333333;
+      interlaced_y = (interlaced_y | (interlaced_y << 8)) & 0x00ff00ff;
-      y = (y | (y << 1)) & 0x55555555;
+      interlaced_y = (interlaced_y | (interlaced_y << 4)) & 0x0f0f0f0f;
-      return (x << 1) | y;
+      interlaced_y = (interlaced_y | (interlaced_y << 2)) & 0x33333333;
+      interlaced_y = (interlaced_y | (interlaced_y << 1)) & 0x55555555;
+      return (interlaced_x << 1) | interlaced_y;
     }
 
     var params = {};

config/eslint.json

@@ -29,6 +29,7 @@
     "comma-style": "error",
     "computed-property-spacing": "error",
     "curly": ["error", "multi-line", "consistent"],
+    "dot-location": ["error", "property"],
     "dot-notation": "error",
     "eol-last": "error",
     "eqeqeq": ["error", "smart"],
@@ -45,7 +46,9 @@
     "no-alert": "warn",
     "no-array-constructor": "error",
     "no-caller": "error",
+    "no-console": "warn",
     "no-div-regex": "error",
+    "no-eq-null": "error",
     "no-eval": "error",
     "no-extend-native": "error",
     "no-extra-bind": "error",
@@ -54,6 +57,7 @@
     "no-implicit-coercion": "warn",
     "no-implicit-globals": "warn",
     "no-implied-eval": "error",
+    "no-invalid-this": "error",
     "no-iterator": "error",
     "no-labels": "error",
     "no-label-var": "error",
@@ -62,6 +66,7 @@
     "no-loop-func": "error",
     "no-mixed-operators": "error",
     "no-multiple-empty-lines": "error",
+    "no-multi-spaces": "error",
     "no-multi-str": "error",
     "no-negated-condition": "error",
     "no-nested-ternary": "error",
@@ -70,14 +75,16 @@
     "no-new-object": "error",
     "no-new-wrappers": "error",
     "no-octal-escape": "error",
+    "no-param-reassign": "error",
     "no-process-env": "error",
     "no-proto": "error",
     "no-script-url": "error",
     "no-self-compare": "error",
     "no-sequences": "error",
-    "no-shadow-restricted-names": "error",
     "no-throw-literal": "error",
     "no-trailing-spaces": "error",
+    "no-undef-init": "error",
+    "no-undefined": "error",
     "no-unmodified-loop-condition": "error",
     "no-unneeded-ternary": "error",
     "no-unused-expressions": "off",
@@ -89,7 +96,6 @@
     "no-void": "error",
     "no-warning-comments": "warn",
     "no-whitespace-before-property": "error",
-    "no-with": "error",
     "object-curly-newline": ["error", { "consistent": true }],
     "object-curly-spacing": ["error", "always"],
     "object-property-newline": ["error", { "allowAllPropertiesOnSameLine": true }],