@wemap/geo 11.5.0 → 11.7.0

package/package.json

@@ -13,7 +13,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "11.5.0",
+    "version": "11.7.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -45,5 +45,5 @@
         },
         "./tests/*": "./tests/*"
     },
-    "gitHead": "e3b51be235497315bfc799f70e01f08e0cadbcb4"
+    "gitHead": "e06f16f4114b6e8da0c0f6bbda65c1ad1a3f45ce"
 }

package/src/graph/GeoGraph.ts

@@ -3,7 +3,7 @@ import { Graph } from '@wemap/utils';
 import BoundingBox from '../coordinates/BoundingBox.js';
 import Coordinates from '../coordinates/Coordinates.js';
 import Level from '../coordinates/Level.js';
-import { Level_t, GeoGraphJson } from '../types.js';
+import { Level_t, GeoGraphJson, GeoGraphEdgeExtras } from '../types.js';
 
 import GeoGraphEdge from './GeoGraphEdge.js';
 import GeoGraphVertex from './GeoGraphVertex.js';
@@ -50,13 +50,21 @@ class GeoGraph<VertexData = unknown, EdgeData = unknown> extends Graph<VertexDat
 
 
     toCompressedJson(): GeoGraphJson {
+
+        const createEdgeExtras = (edge: GeoGraphEdge) => {
+            const extras: GeoGraphEdgeExtras = {};
+            if (edge.isOneway) { extras.oneway = true }
+            return extras;
+        }
+
         return {
             vertices: this.vertices.map(vertex => vertex.toJson()),
             edges: this.edges.map(edge => {
                 const vertex1Idx = this.vertices.indexOf(edge.vertex1);
                 const vertex2Idx = this.vertices.indexOf(edge.vertex2);
-                if (edge.isOneway) {
-                    return [vertex1Idx, vertex2Idx, edge.level, true];
+                const edgeExtras = createEdgeExtras(edge);
+                if (Object.keys(edgeExtras).length > 0) {
+                    return [vertex1Idx, vertex2Idx, edge.level, edgeExtras];
                 }
                 if (edge.level !== null) {
                     return [vertex1Idx, vertex2Idx, edge.level];
@@ -79,8 +87,9 @@ class GeoGraph<VertexData = unknown, EdgeData = unknown> extends Graph<VertexDat
                 geograph.vertices[jsonEdge[1]],
                 { level: jsonEdge.length > 2 ? jsonEdge[2] : null }
             );
-            if (jsonEdge.length > 3 && jsonEdge[3]) {
-                edge.isOneway = true;
+            const extras: GeoGraphEdgeExtras = jsonEdge.length > 3 ? jsonEdge[3]! : {}
+            if (typeof extras.oneway !== 'undefined') { 
+                edge.isOneway = extras.oneway; 
             }
             return edge;
         });

package/src/types.ts

@@ -38,13 +38,14 @@ export type UserPositionJson = CoordinatesJson & {
 };
 
 export type GraphVertexJson = CoordinatesCompressedJson;
+export type GeoGraphEdgeExtras = { oneway?: boolean }
 
 export type GeoGraphJson = {
     vertices: GraphVertexJson[],
     edges: (
         [number, number] |
-        [number, number, number | [number, number]] |
-        [number, number, Level_t, true]
+        [number, number, Level_t] |
+        [number, number, Level_t, GeoGraphEdgeExtras]
     )[]
 };