Enable some more eslint rules from iD rules

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d1527207ff6bd7a7e2a16b1cd3fea3a702d9ecc5..2678ba2824e3ad7edd05560a1a6bdd80324251d8 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -334,7 +334,7 @@ $(document).ready(function () {
     };
 
     function addObject(type, id, center) {
-      map.addObject({type: type, id: parseInt(id)}, function(bounds) {
+      map.addObject({type: type, id: parseInt(id, 10)}, function(bounds) {
         if (!window.location.hash && bounds.isValid() &&
             (center || !map.getBounds().contains(bounds))) {
           OSM.router.withoutMoveListener(function () {

diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js
index fa9e1874d92e86fa26d005b1636fce64f1542c37..060c5c8be909ecf2763f4efdd6c9b04c83794119 100644 (file)
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -10,14 +10,14 @@ OSM.Changeset = function (map) {
   };
 
   page.load = function(path, id) {
-    if(id)
+    if (id)
       currentChangesetId = id;
     initialize();
     addChangeset(currentChangesetId, true);
   };
 
   function addChangeset(id, center) {
-    map.addObject({type: 'changeset', id: parseInt(id)}, function(bounds) {
+    map.addObject({type: 'changeset', id: parseInt(id, 10)}, function(bounds) {
       if (!window.location.hash && bounds.isValid() &&
           (center || !map.getBounds().contains(bounds))) {
         OSM.router.withoutMoveListener(function () {
@@ -32,7 +32,7 @@ OSM.Changeset = function (map) {
 
     $(form).find("input[type=submit]").prop("disabled", true);
 
-    if(include_data) {
+    if (include_data) {
       data = {text: $(form.text).val()};
     } else {
       data = {};

diff --git a/app/assets/javascripts/index/directions/fossgis.js b/app/assets/javascripts/index/directions/fossgis.js
index a1a7624acb4a574f6c2e75e017af4f71aa3608e3..1d6e1f82cb7300a022fcf667935655ee6ffd05b1 100644 (file)
--- a/app/assets/javascripts/index/directions/fossgis.js
+++ b/app/assets/javascripts/index/directions/fossgis.js
@@ -99,7 +99,7 @@ function FOSSGISEngine(id, vehicleType) {
         var template = INSTRUCTION_TEMPLATE[maneuver_id];
 
         // convert lat,lng pairs to LatLng objects
-        var step_geometry = L.PolylineUtil.decode(step.geometry, { precision: 5 }).map(function(a) { return L.latLng(a); }) ;
+        var step_geometry = L.PolylineUtil.decode(step.geometry, { precision: 5 }).map(function(a) { return L.latLng(a); });
         // append step_geometry on line
         Array.prototype.push.apply(line, step_geometry);
 

diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js
index fa2872f456b572a515a17498bc2d2db30d7f0eb0..d796439846db5aa553cb1831f49f2864c991a529 100644 (file)
--- a/app/assets/javascripts/index/new_note.js
+++ b/app/assets/javascripts/index/new_note.js
@@ -121,7 +121,7 @@ OSM.NewNote = function(map) {
     });
 
     newNote = L.marker(markerLatlng, {
-      icon: noteIcons["new"],
+      icon: noteIcons.new,
       opacity: 0.9,
       draggable: true
     });

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index e712a8d1f415719e14746ad6ef279694c5eedc23..e87c6817d8002c7bdc8f4bcafc460a111dc21083 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -87,20 +87,20 @@ L.OSM.Map = L.Map.extend({
 
   getLayersCode: function () {
     var layerConfig = '';
-    for (var i in this._layers) { // TODO: map.eachLayer
-      var layer = this._layers[i];
+    this.eachLayer(function (layer) {
       if (layer.options && layer.options.code) {
         layerConfig += layer.options.code;
       }
-    }
+    });
     return layerConfig;
   },
 
   getMapBaseLayerId: function () {
-    for (var i in this._layers) { // TODO: map.eachLayer
-      var layer = this._layers[i];
-      if (layer.options && layer.options.keyid) return layer.options.keyid;
-    }
+    var baseLayer;
+    this.eachLayer(function (layer) {
+      if (layer.options && layer.options.keyid) baseLayer = layer;
+    });
+    return baseLayer.keyid;
   },
 
   getUrl: function(marker) {

diff --git a/app/assets/javascripts/leaflet.sidebar.js b/app/assets/javascripts/leaflet.sidebar.js
index db9e7aef2505228010751b145e38771e48cc7564..f83add8d5f0ac6413246a7a310f504743212e139 100644 (file)
--- a/app/assets/javascripts/leaflet.sidebar.js
+++ b/app/assets/javascripts/leaflet.sidebar.js
@@ -2,7 +2,7 @@ L.OSM.sidebar = function(selector) {
   var control = {},
     sidebar = $(selector),
     current = $(),
-    currentButton  = $(),
+    currentButton = $(),
     map;
 
   control.addTo = function (_) {

diff --git a/app/assets/javascripts/leaflet.zoom.js b/app/assets/javascripts/leaflet.zoom.js
index 0ef0f64dec5e13b461c0a5aaebb5f69ad76955e6..794bfaf4b4071eda1efdedf1372209a2410e078d 100644 (file)
--- a/app/assets/javascripts/leaflet.zoom.js
+++ b/app/assets/javascripts/leaflet.zoom.js
@@ -9,8 +9,8 @@ L.OSM.Zoom = L.Control.extend({
 
                this._map = map;
 
-               this._zoomInButton  = this._createButton(
-                       '', I18n.t('javascripts.map.zoom.in'),  zoomName + 'in',  container, this._zoomIn,  this);
+               this._zoomInButton = this._createButton(
+                       '', I18n.t('javascripts.map.zoom.in'), zoomName + 'in', container, this._zoomIn, this);
                this._zoomOutButton = this._createButton(
                        '', I18n.t('javascripts.map.zoom.out'), zoomName + 'out', container, this._zoomOut, this);
 

diff --git a/config/eslint.json b/config/eslint.json
index 28ec4d3731acf1703d5ce892e62e01f395ac6783..b37ec641083639263e0d6c1dd3251a2aaf286965 100644 (file)
--- a/config/eslint.json
+++ b/config/eslint.json
@@ -17,14 +17,44 @@
     "updateLinks": "readonly"
   },
   "rules": {
+    "dot-notation": "error",
     "eqeqeq": ["error", "smart"],
+    "keyword-spacing": "error",
     "no-caller": "error",
+    "no-div-regex": "error",
     "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-floating-decimal": "error",
+    "no-implied-eval": "error",
+    "no-iterator": "error",
+    "no-labels": "error",
+    "no-label-var": "error",
+    "no-lone-blocks": "error",
+    "no-loop-func": "error",
+    "no-multi-str": "error",
     "no-new": "error",
+    "no-new-func": "error",
+    "no-new-wrappers": "error",
+    "no-octal-escape": "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": "error",
+    "no-unneeded-ternary": "error",
+    "no-unused-expressions": "off",
     "no-unused-vars": "error",
     "no-use-before-define": ["error", {"functions": false}],
-    "semi": ["error", "always"]
+    "no-void": "error",
+    "no-warning-comments": "warn",
+    "no-with": "error",
+    "radix": ["error", "always"],
+    "semi": ["error", "always"],
+    "semi-spacing": "error",
+    "space-unary-ops": "error",
+    "wrap-regex": "off"
   }
 }