@wemap/geo 11.3.1 → 11.5.0

package/dist/index.js

@@ -1388,19 +1388,19 @@ const _GeoGraphProjectionHandler = class {
   get maxDistance() {
     return this._maxDistance;
   }
-  _shouldProjectOnEdgeAndNodes(edge, location, useBearing, useMultiLevelSegments, acceptEdgeFn) {
+  _shouldProjectOnEdgeAndVertices(edge, location, useBearing, useMultiLevelSegments, acceptEdgeFn) {
     if (!acceptEdgeFn(edge)) {
       return [false, false, false];
     }
     let checkEdge = Level.intersect(location.level, edge.level);
-    let checkNode1 = Level.intersect(location.level, edge.vertex1.coords.level);
-    let checkNode2 = Level.intersect(location.level, edge.vertex2.coords.level);
-    checkNode1 = checkNode1 || edge.vertex1.io && location.level === null;
-    checkNode2 = checkNode2 || edge.vertex2.io && location.level === null;
+    let checkVertex1 = Level.intersect(location.level, edge.vertex1.coords.level);
+    let checkVertex2 = Level.intersect(location.level, edge.vertex2.coords.level);
+    checkVertex1 = checkVertex1 || edge.vertex1.io && location.level === null;
+    checkVertex2 = checkVertex2 || edge.vertex2.io && location.level === null;
     if (!useMultiLevelSegments) {
       checkEdge = checkEdge && !Level.isRange(edge.level);
-      checkNode1 = checkNode1 && !Level.isRange(edge.vertex1.coords.level);
-      checkNode2 = checkNode2 && !Level.isRange(edge.vertex2.coords.level);
+      checkVertex1 = checkVertex1 && !Level.isRange(edge.vertex1.coords.level);
+      checkVertex2 = checkVertex2 && !Level.isRange(edge.vertex2.coords.level);
     }
     if (useBearing) {
       if (checkEdge) {
@@ -1409,18 +1409,18 @@ const _GeoGraphProjectionHandler = class {
           checkEdge = false;
         }
       }
-      checkNode1 = false;
-      checkNode2 = false;
+      checkVertex1 = false;
+      checkVertex2 = false;
     }
-    return [checkEdge, checkNode1, checkNode2];
+    return [checkEdge, checkVertex1, checkVertex2];
   }
   static _assignLatLngLevel(fromCoordinates, toCoordinates) {
     toCoordinates.lat = fromCoordinates.lat;
     toCoordinates.lng = fromCoordinates.lng;
     toCoordinates.level = Level.clone(fromCoordinates.level);
   }
-  static _handleLevelsWithIONodes(projection, location, projectionNode) {
-    if (location.level === null && projectionNode.io) {
+  static _handleLevelsWithIOVertices(projection, location, projectionVertex) {
+    if (location.level === null && projectionVertex.io) {
       projection.level = null;
     }
   }
@@ -1438,33 +1438,33 @@ const _GeoGraphProjectionHandler = class {
       return distanceOfNewProjection < distanceFromNearestElement && (!useDistance || distanceOfNewProjection <= this._maxDistance);
     };
     for (const edge of this.graph.edges) {
-      const [checkEdge, checkNode1, checkNode2] = this._shouldProjectOnEdgeAndNodes(
+      const [checkEdge, checkVertex1, checkVertex2] = this._shouldProjectOnEdgeAndVertices(
         edge,
         location,
         useBearing,
         useMultiLevelSegments,
         acceptEdgeFn
       );
-      if (checkNode1) {
-        const distNode1 = location.distanceTo(edge.vertex1.coords);
-        if (isProjectionBetter(distNode1) || distNode1 <= EPS_MM) {
-          distanceFromNearestElement = distNode1;
+      if (checkVertex1) {
+        const distVertex1 = location.distanceTo(edge.vertex1.coords);
+        if (isProjectionBetter(distVertex1) || distVertex1 <= EPS_MM) {
+          distanceFromNearestElement = distVertex1;
           nearestElement = edge.vertex1;
           _GeoGraphProjectionHandler._assignLatLngLevel(edge.vertex1.coords, projection);
-          _GeoGraphProjectionHandler._handleLevelsWithIONodes(projection, location, edge.vertex1);
-          if (distNode1 <= EPS_MM) {
+          _GeoGraphProjectionHandler._handleLevelsWithIOVertices(projection, location, edge.vertex1);
+          if (distVertex1 <= EPS_MM) {
             break;
           }
         }
       }
-      if (checkNode2) {
-        const distNode2 = location.distanceTo(edge.vertex2.coords);
-        if (isProjectionBetter(distNode2) || distNode2 <= EPS_MM) {
-          distanceFromNearestElement = distNode2;
+      if (checkVertex2) {
+        const distVertex2 = location.distanceTo(edge.vertex2.coords);
+        if (isProjectionBetter(distVertex2) || distVertex2 <= EPS_MM) {
+          distanceFromNearestElement = distVertex2;
           nearestElement = edge.vertex2;
           _GeoGraphProjectionHandler._assignLatLngLevel(edge.vertex2.coords, projection);
-          _GeoGraphProjectionHandler._handleLevelsWithIONodes(projection, location, edge.vertex2);
-          if (distNode2 <= EPS_MM) {
+          _GeoGraphProjectionHandler._handleLevelsWithIOVertices(projection, location, edge.vertex2);
+          if (distVertex2 <= EPS_MM) {
             break;
           }
         }
@@ -1543,13 +1543,13 @@ class NoRouteFoundError extends Error {
   }
   get startStr() {
     if (this.start instanceof GeoGraphVertex) {
-      return `GraphNode ${this.start.coords.toString()}`;
+      return `GeoGraphVertex ${this.start.coords.toString()}`;
     }
     return this.start.toString();
   }
   get endStr() {
     if (this.end instanceof GeoGraphVertex) {
-      return `GraphNode ${this.end.coords.toString()}`;
+      return `GeoGraphVertex ${this.end.coords.toString()}`;
     }
     return this.end.toString();
   }