@wemap/osm 0.3.0 → 0.3.2

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "bugs": {
         "url": "https://github.com/wemap/wemap-utils-js/issues"
     },
@@ -26,10 +26,11 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^0.4.0",
+        "@wemap/geo": "^1.0.0",
+        "@wemap/graph": "^1.0.0",
         "@wemap/logger": "^0.1.6",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "08d7d843add321d899aef07f9e2ec7739270dc70"
+    "gitHead": "d35763b4eee98530713a4eab666c81baf89875cf"
 }

package/src/network/OsmNetwork.js

@@ -1,6 +1,7 @@
+import { Level } from '@wemap/geo';
 import {
-    Edge, Node, Network, Level
-} from '@wemap/geo';
+    Edge, Node, Network
+} from '@wemap/graph';
 import Logger from '@wemap/logger';
 
 

package/src/network/OsmRouter.js

@@ -1,6 +1,6 @@
 import {
     GraphRouter, Utils
-} from '@wemap/geo';
+} from '@wemap/graph';
 
 const DEFAULT_OPTIONS = { useStairs: true };
 
@@ -27,12 +27,22 @@ class OsmRouter extends GraphRouter {
         };
 
         const acceptOneWayFn = (edge, reversed) => {
-            if (!reversed) {
-                return true;
-            }
             if (edge.data && edge.data.tags) {
-                const { oneway } = edge.data.tags;
-                return oneway !== 'yes' && oneway !== 'true' && oneway !== '1';
+                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;
         };

package/src/network/OsmRouter.spec.js

@@ -4,8 +4,9 @@ import fs from 'fs';
 import path from 'path';
 
 import {
-    Node, WGS84, Level
+    Level, WGS84
 } from '@wemap/geo';
+import { Node } from '@wemap/graph';
 
 import OsmParser from '../model/OsmParser';
 import OsmRouter from './OsmRouter';
@@ -13,7 +14,7 @@ import OsmNetwork from './OsmNetwork';
 
 import {
     itineraryStart, itineraryEnd
-} from '../../../geo/tests/CommonTest';
+} from '../../../graph/tests/CommonTest';
 
 const verifyNodesOrder = (nodes, names) => {
     expect(nodes.length).equals(names.length);

package/src/osrm/OsrmUtils.js

@@ -1,7 +1,10 @@
 /* eslint-disable max-statements */
 import {
-    WGS84, Itinerary, Node, Edge, Level
+    Level, WGS84
 } from '@wemap/geo';
+import {
+    Edge, Node, Itinerary
+} from '@wemap/graph';
 import {
     rad2deg, Utils as MathUtils
 } from '@wemap/maths';

package/src/osrm/OsrmUtils.spec.js

@@ -12,7 +12,7 @@ import OsrmUtils from './OsrmUtils';
 
 import {
     itineraryStart, itineraryEnd
-} from '../../../geo/tests/CommonTest';
+} from '../../../graph/tests/CommonTest';
 
 describe('OsrmUtils', () => {