Merge pull request github#18 from warerebel/github#7-Use-LFRC

github#7 use lfrc

Author: warerebel

Changelog

@@ -6,4 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased] - 2022-05-17
 ### Added
-- Initial module to decode openLR route
+- Initial module to decode openLR route
+
+## [0.5.0] - 2022-08-30
+### Added
+- Restrict navigation to lowest frc in the LRP points
+
+### Removed
+- Removed OS open roads specific workarounds, no support provided for OS open roads

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "openlr_decoder",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "A general purpose road network OpenLR decoding solution",
   "keywords": [
     "openlr",

package.json

@@ -1,15 +1,13 @@
 import {formOfWay} from "./nodes";
 
-const OS_OPEN_ROADS = process.env["OS_OPEN_ROADS"] || false;
-
 // eslint-disable-next-line complexity
 export function checkFow(currentLinkFow: formOfWay, LRPFow: number){
     switch(LRPFow){
     case 0: return true;
     case 1: return currentLinkFow === formOfWay.DualCarriageway || currentLinkFow === formOfWay.Motorway;
     case 2: return currentLinkFow === formOfWay.DualCarriageway || currentLinkFow === formOfWay.Motorway;
     case 3: return currentLinkFow === formOfWay.SingleCarriageway;
-    case 4: return OS_OPEN_ROADS ? currentLinkFow === formOfWay.Roundabout || formOfWay.SingleCarriageway : currentLinkFow === formOfWay.Roundabout;
+    case 4: return currentLinkFow === formOfWay.Roundabout;
     case 5: return currentLinkFow === formOfWay.TrafficSquare;
     case 6: return currentLinkFow === formOfWay.SlipRoad;
     case 7: return currentLinkFow === formOfWay.Other;

src/checkLinkProperties.ts

@@ -1,18 +1,18 @@
 import Graph from "node-dijkstra";
 import type {node, linkLookup, nodeChildLink, graphInput} from "./nodes";
 
-export function buildLinkLookups(nodeCollection: Array<node>) {
+export function buildLinkLookups(nodeCollection: Array<node>, lfrc: number) {
     const linkLookup = {};
     const graphInput = {};
-    nodeCollection.map(node => checkForEndpoints(node, linkLookup, graphInput));
+    nodeCollection.map(node => checkForEndpoints(node, linkLookup, graphInput, lfrc));
     return {links: linkLookup as linkLookup, graphInput: graphInput as graphInput};
 }
 
-function checkForEndpoints(node: node, linkLookup: linkLookup, graphInput: graphInput){
+function checkForEndpoints(node: node, linkLookup: linkLookup, graphInput: graphInput, lfrc: number){
     if(node.startLinks)
-        node.startLinks.map(link => addLinkToGraph(link, linkLookup, graphInput));
+        node.startLinks.map(link => link.frc <= lfrc ? addLinkToGraph(link, linkLookup, graphInput): null);
     else
-        node.endLinks.map(link => addLinkToGraph(link, linkLookup, graphInput));
+        node.endLinks.map(link => link.frc <= lfrc ? addLinkToGraph(link, linkLookup, graphInput): null);
 }
 
 export function getGraph(input: graphInput){

src/graph.ts

@@ -44,7 +44,8 @@ async function getWinningNodes(decodedOpenLR: LRPObject, collectionName: string,
 async function buildGraph(decodedOpenLR: LRPObject, collectionName: string) {
     const collection = Mongo.getCollection(collectionName);
     const nodesForGraph = await getNodesForGraph(decodedOpenLR, collection);
-    const lookups = buildLinkLookups(nodesForGraph as unknown as node[]);
+    const lfrc = decodedOpenLR.properties._points.properties.reduce((pre, lrp) => lrp.properties._lfrcnp > pre ? lrp.properties._lfrcnp: pre, 0);
+    const lookups = buildLinkLookups(nodesForGraph as unknown as node[], lfrc);
     const graph = getGraph(lookups.graphInput);
     return { graph: graph, linklookup: lookups.links };
 }

src/openLRDecode.ts

@@ -30,7 +30,7 @@ describe("graph", function(){
 
         it("returns graph lookup and link lookup", function(){
             const nodeInput: node[] = nodesCollection as node[];
-            const result = buildLinkLookups(nodeInput);
+            const result = buildLinkLookups(nodeInput, 7);
             assert.deepStrictEqual(result.links, linkLookup);
             assert.deepStrictEqual(result.graphInput, graphInput);
         });
@@ -41,7 +41,7 @@ describe("graph", function(){
 
         it("Creates a navigable map object", function(){
             const nodeInput: node[] = nodesCollection as node[];
-            const lookup = buildLinkLookups(nodeInput);
+            const lookup = buildLinkLookups(nodeInput, 7);
             const graph = getGraph(lookup.graphInput);
             const path = graph.path("{E699D3DD-19C5-4705-BF19-C296FD2D429E}0", "{D61C07C8-5839-4EA1-A0A6-723A224B8BFA}0",{cost: true});
             assert.deepStrictEqual(path, {cost: 32, path: ["{E699D3DD-19C5-4705-BF19-C296FD2D429E}0", "{D61C07C8-5839-4EA1-A0A6-723A224B8BFA}0"]});