@wemap/osm 3.1.9 → 3.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +2 -0
- package/package.json +5 -4
- package/src/network/OsmRouter.js +38 -35
package/index.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import OsmModel from './src/model/OsmModel';
|
|
1
2
|
import OsmNetwork from './src/network/OsmNetwork';
|
|
2
3
|
import OsmParser from './src/model/OsmParser';
|
|
3
4
|
import OsmRouter from './src/network/OsmRouter';
|
|
4
5
|
import OsrmUtils from './src/osrm/OsrmUtils';
|
|
5
6
|
|
|
6
7
|
export {
|
|
8
|
+
OsmModel,
|
|
7
9
|
OsmNetwork,
|
|
8
10
|
OsmParser,
|
|
9
11
|
OsmRouter,
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"directory": "packages/osm"
|
|
12
12
|
},
|
|
13
13
|
"name": "@wemap/osm",
|
|
14
|
-
"version": "3.1.
|
|
14
|
+
"version": "3.1.11",
|
|
15
15
|
"bugs": {
|
|
16
16
|
"url": "https://github.com/wemap/wemap-modules-js/issues"
|
|
17
17
|
},
|
|
@@ -26,11 +26,12 @@
|
|
|
26
26
|
],
|
|
27
27
|
"license": "ISC",
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@wemap/geo": "^3.1.
|
|
30
|
-
"@wemap/graph": "^3.1.
|
|
29
|
+
"@wemap/geo": "^3.1.11",
|
|
30
|
+
"@wemap/graph": "^3.1.11",
|
|
31
31
|
"@wemap/logger": "^3.0.0",
|
|
32
|
+
"@wemap/maths": "^3.1.11",
|
|
32
33
|
"lodash.isnumber": "^3.0.3",
|
|
33
34
|
"sax": "^1.2.4"
|
|
34
35
|
},
|
|
35
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "1e72b637bcc6e4d378bdb7c93870228636bdcb35"
|
|
36
37
|
}
|
package/src/network/OsmRouter.js
CHANGED
|
@@ -10,45 +10,48 @@ class OsmRouter extends GraphRouter {
|
|
|
10
10
|
|
|
11
11
|
const options = Object.assign({}, DEFAULT_OPTIONS, _options);
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
const edgeWeightFn = edge => {
|
|
23
|
-
if (edge.data.tags.highway === 'elevator') {
|
|
24
|
-
return 30;
|
|
25
|
-
}
|
|
26
|
-
return Utils.getDurationFromLength(edge.length);
|
|
27
|
-
};
|
|
28
|
-
|
|
29
|
-
const acceptOneWayFn = (edge, reversed) => {
|
|
30
|
-
const {
|
|
31
|
-
oneway, highway, conveying
|
|
32
|
-
} = edge.data.tags;
|
|
33
|
-
if (reversed && (oneway === 'yes' || oneway === 'true' || oneway === '1')) {
|
|
34
|
-
return false;
|
|
35
|
-
}
|
|
36
|
-
if (conveying && highway) {
|
|
37
|
-
if (conveying === 'forward' && reversed) {
|
|
38
|
-
return false;
|
|
39
|
-
} if (conveying === 'backward' && !reversed) {
|
|
40
|
-
return false;
|
|
41
|
-
} if (conveying === 'yes' && reversed) {
|
|
42
|
-
return false;
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
return true;
|
|
46
|
-
};
|
|
13
|
+
return super.getShortestPath(
|
|
14
|
+
start, end,
|
|
15
|
+
options.useStairs ? null : OsmRouter.edgeSelectionFilter,
|
|
16
|
+
OsmRouter.edgeWeightFn,
|
|
17
|
+
OsmRouter.acceptOneWayFn
|
|
18
|
+
);
|
|
19
|
+
}
|
|
47
20
|
|
|
21
|
+
static edgeSelectionFilter = edge => {
|
|
48
22
|
|
|
49
|
-
return
|
|
23
|
+
return !edge.data || !edge.data.tags
|
|
24
|
+
|| (
|
|
25
|
+
edge.data.tags.stairs !== 'yes'
|
|
26
|
+
&& edge.data.tags.highway !== 'steps'
|
|
27
|
+
);
|
|
50
28
|
}
|
|
51
29
|
|
|
30
|
+
static edgeWeightFn = edge => {
|
|
31
|
+
if (edge.data.tags.highway === 'elevator') {
|
|
32
|
+
return 30;
|
|
33
|
+
}
|
|
34
|
+
return Utils.getDurationFromLength(edge.length);
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
static acceptOneWayFn = (edge, reversed) => {
|
|
38
|
+
const {
|
|
39
|
+
oneway, highway, conveying
|
|
40
|
+
} = edge.data.tags;
|
|
41
|
+
if (reversed && (oneway === 'yes' || oneway === 'true' || oneway === '1')) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
if (conveying && highway) {
|
|
45
|
+
if (conveying === 'forward' && reversed) {
|
|
46
|
+
return false;
|
|
47
|
+
} if (conveying === 'backward' && !reversed) {
|
|
48
|
+
return false;
|
|
49
|
+
} if (conveying === 'yes' && reversed) {
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return true;
|
|
54
|
+
};
|
|
52
55
|
}
|
|
53
56
|
|
|
54
57
|
export default OsmRouter;
|