@wemap/osm 3.1.9 → 3.1.10

package/index.js

@@ -1,9 +1,11 @@
+import OsmModel from './src/model/OsmModel';
 import OsmNetwork from './src/network/OsmNetwork';
 import OsmParser from './src/model/OsmParser';
 import OsmRouter from './src/network/OsmRouter';
 import OsrmUtils from './src/osrm/OsrmUtils';
 
 export {
+    OsmModel,
     OsmNetwork,
     OsmParser,
     OsmRouter,

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "3.1.9",
+    "version": "3.1.10",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -27,10 +27,10 @@
     "license": "ISC",
     "dependencies": {
         "@wemap/geo": "^3.1.9",
-        "@wemap/graph": "^3.1.9",
+        "@wemap/graph": "^3.1.10",
         "@wemap/logger": "^3.0.0",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "c77e55703ee07d8928caa4667fc89405797f6324"
+    "gitHead": "2bba01343dd4507adc51cff378450d5369d124ea"
 }

package/src/network/OsmRouter.js

@@ -10,45 +10,48 @@ class OsmRouter extends GraphRouter {
 
         const options = Object.assign({}, DEFAULT_OPTIONS, _options);
 
-        const edgeSelectionFilter = edge => {
-
-            return options.useStairs || !edge.data || !edge.data.tags
-                || (
-                    edge.data.tags.stairs !== 'yes'
-                    && edge.data.tags.highway !== 'steps'
-                );
-        };
-
-        const edgeWeightFn = edge => {
-            if (edge.data.tags.highway === 'elevator') {
-                return 30;
-            }
-            return Utils.getDurationFromLength(edge.length);
-        };
-
-        const acceptOneWayFn = (edge, reversed) => {
-            const {
-                oneway, highway, conveying
-            } = edge.data.tags;
-            if (reversed && (oneway === 'yes' || oneway === 'true' || oneway === '1')) {
-                return false;
-            }
-            if (conveying && highway) {
-                if (conveying === 'forward' && reversed) {
-                    return false;
-                } if (conveying === 'backward' && !reversed) {
-                    return false;
-                } if (conveying === 'yes' && reversed) {
-                    return false;
-                }
-            }
-            return true;
-        };
+        return super.getShortestPath(
+            start, end,
+            options.useStairs ? null : OsmRouter.edgeSelectionFilter,
+            OsmRouter.edgeWeightFn,
+            OsmRouter.acceptOneWayFn
+        );
+    }
 
+    static edgeSelectionFilter = edge => {
 
-        return super.getShortestPath(start, end, edgeSelectionFilter, edgeWeightFn, acceptOneWayFn);
+        return !edge.data || !edge.data.tags
+            || (
+                edge.data.tags.stairs !== 'yes'
+                && edge.data.tags.highway !== 'steps'
+            );
     }
 
+    static edgeWeightFn = edge => {
+        if (edge.data.tags.highway === 'elevator') {
+            return 30;
+        }
+        return Utils.getDurationFromLength(edge.length);
+    };
+
+    static acceptOneWayFn = (edge, reversed) => {
+        const {
+            oneway, highway, conveying
+        } = edge.data.tags;
+        if (reversed && (oneway === 'yes' || oneway === 'true' || oneway === '1')) {
+            return false;
+        }
+        if (conveying && highway) {
+            if (conveying === 'forward' && reversed) {
+                return false;
+            } if (conveying === 'backward' && !reversed) {
+                return false;
+            } if (conveying === 'yes' && reversed) {
+                return false;
+            }
+        }
+        return true;
+    };
 }
 
 export default OsmRouter;