Fix for a few errors when loading nogos with weight

* Nogo weight was not set when loading nogos with a default weight value. * The URL would show up "NaN" values upon reloading the web interface after having loaded some nogos. Fix nrenner#174.
Phyks · May 9, 2019 · faaca27 · faaca27
1 parent 5f89287
commit faaca27
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/js/index.js b/js/index.js
@@ -415,8 +415,8 @@
 
                 var geoJSON = L.geoJson(turf.featureCollection(cleanedGeoJSONFeatures), {
                     onEachFeature: function (feature, layer) {
-                        if (!feature.properties.nogoWeight) {
-                            feature.properties.nogoWeight = nogoWeight;
+                        if (!feature.properties.nogoWeight && nogoWeight != -1) {
+                            layer.options.nogoWeight = feature.properties.nogoWeight || nogoWeight;
                         }
                     }
                 });

diff --git a/js/router/BRouter.js b/js/router/BRouter.js
@@ -234,7 +234,7 @@ L.BRouter = L.Class.extend({
             s += this._formatLatLng(circle.getLatLng());
             s += L.BRouter.NUMBER_SEPARATOR;
             s += Math.round(circle.getRadius());
-            if (circle.options.nogoWeight) {
+            if (circle.options.nogoWeight != null) {
                 s += L.BRouter.NUMBER_SEPARATOR;
                 s += circle.options.nogoWeight;
             }
@@ -282,7 +282,7 @@ L.BRouter = L.Class.extend({
                 }
                 s += this._formatLatLng(vertices[j]);
             }
-            if (polyline.options.nogoWeight) {
+            if (polyline.options.nogoWeight != null) {
                 s += L.BRouter.NUMBER_SEPARATOR;
                 s += polyline.options.nogoWeight;
             }
@@ -333,7 +333,7 @@ L.BRouter = L.Class.extend({
                 }
                 s += this._formatLatLng(vertices[j]);
             }
-            if (polygon.options.nogoWeight) {
+            if (polygon.options.nogoWeight != null) {
                 s += L.BRouter.NUMBER_SEPARATOR;
                 s += polygon.options.nogoWeight;
             }
@@ -376,9 +376,9 @@ L.BRouter = L.Class.extend({
     // formats L.LatLng object as lng,lat string
     _formatLatLng: function(latLng) {
         var s = '';
-        s += L.Util.formatNum(latLng.lng, L.BRouter.PRECISION);
+        s += L.Util.formatNum(latLng.lng || latLng[1], L.BRouter.PRECISION);
         s += L.BRouter.NUMBER_SEPARATOR;
-        s += L.Util.formatNum(latLng.lat, L.BRouter.PRECISION);
+        s += L.Util.formatNum(latLng.lat || latLng[0], L.BRouter.PRECISION);
         return s;
     }
 });