@wemap/providers 11.0.0-alpha.1 → 11.0.0-alpha.12

package/index.ts

@@ -7,9 +7,9 @@ export { default as MapMatchingHandler } from './src/mapmatching/MapMatchingHand
 export { default as PositionSmoother } from './src/smoothers/PositionSmoother.js';
 export { default as AttitudeSmoother } from './src/smoothers/AttitudeSmoother.js';
 
-export { default as VpsMetadata } from './src/providers/vision/vps/VpsMetadata.js';
-export { default as VpsRequest } from './src/providers/vision/vps/VpsRequest.js';
-export { default as VpsResponse } from './src/providers/vision/vps/VpsResponse.js';
+export { default as VpsMetadata, type VpsMetadataJson } from './src/providers/vision/vps/VpsMetadata.js';
+export { default as VpsRequest, type VpsRequestJson } from './src/providers/vision/vps/VpsRequest.js';
+export { default as VpsResponse, type VpsResponseJson } from './src/providers/vision/vps/VpsResponse.js';
 
 export { default as ProvidersLoggerOld } from './src/events/ProvidersLoggerOld.js';
 

package/package.json

@@ -1,53 +1,58 @@
 {
-  "author": "Wemap",
-  "bugs": {
-    "url": "https://github.com/wemap/wemap-modules-js/issues"
-  },
-  "contributors": [
-    "Thibaud Michel <thibaud@getwemap.com>",
-    "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
-  ],
-  "dependencies": {
-    "@wemap/camera": "^11.0.0-alpha.1",
-    "@wemap/geo": "^11.0.0-alpha.0",
-    "@wemap/geomagnetism": "^0.1.2",
-    "@wemap/logger": "^11.0.0-alpha.0",
-    "@wemap/map": "^11.0.0-alpha.0",
-    "@wemap/maths": "^11.0.0-alpha.0",
-    "@wemap/osm": "^11.0.0-alpha.0",
-    "@wemap/routers": "^11.0.0-alpha.1",
-    "@wemap/utils": "^11.0.0-alpha.0"
-  },
-  "description": "A package using different geoloc systems",
-  "devDependencies": {
-    "map-gl-geolocation": "^0.3.0",
-    "mapbox-gl": "^1.11.1"
-  },
-  "homepage": "https://github.com/wemap/wemap-modules-js#readme",
-  "keywords": [
-    "wemap",
-    "providers",
-    "positioning",
-    "pdr",
-    "wifi",
-    "gnss",
-    "mapmatching",
-    "step-detection"
-  ],
-  "scripts": {
-    "dev": "vite build --watch",
-    "build": "vite build"
-  },
-  "license": "ISC",
-  "module": "dist/index.js",
-  "browser": "dist/index.umd.js",
-  "types": "index.ts",
-  "name": "@wemap/providers",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/wemap/wemap-modules-js.git"
-  },
-  "type": "module",
-  "version": "11.0.0-alpha.1",
-  "gitHead": "507c2f1bf75e56b63cce3a488186eac9e8d70d6e"
+    "author": "Wemap",
+    "contributors": [
+        "Thibaud Michel <thibaud@getwemap.com>",
+        "Guillaume Pannetier <guillaume.pannetier@getwemap.com>"
+    ],
+    "description": "A package using different geoloc systems",
+    "main": "dist/index.js",
+    "types": "index.ts",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/wemap/wemap-modules-js.git"
+    },
+    "name": "@wemap/providers",
+    "version": "11.0.0-alpha.12",
+    "bugs": {
+        "url": "https://github.com/wemap/wemap-modules-js/issues"
+    },
+    "homepage": "https://github.com/wemap/wemap-modules-js#readme",
+    "scripts": {
+        "dev": "vite build --watch",
+        "build": "vite build"
+    },
+    "dependencies": {
+        "@wemap/camera": "^11.0.0-alpha.12",
+        "@wemap/geo": "^11.0.0-alpha.12",
+        "@wemap/geomagnetism": "^0.1.2",
+        "@wemap/logger": "^11.0.0-alpha.4",
+        "@wemap/map": "^11.0.0-alpha.12",
+        "@wemap/maths": "^11.0.0-alpha.12",
+        "@wemap/osm": "^11.0.0-alpha.12",
+        "@wemap/routers": "^11.0.0-alpha.12",
+        "@wemap/utils": "^11.0.0-alpha.4"
+    },
+    "devDependencies": {
+        "map-gl-geolocation": "^0.3.0",
+        "mapbox-gl": "^1.11.1"
+    },
+    "keywords": [
+        "wemap",
+        "providers",
+        "positioning",
+        "pdr",
+        "wifi",
+        "gnss",
+        "mapmatching",
+        "step-detection"
+    ],
+    "license": "ISC",
+    "type": "module",
+    "exports": {
+        ".": {
+            "import": "./dist/index.mjs",
+            "require": "./dist/index.js"
+        }
+    },
+    "gitHead": "42a1aece349e6db3151938ebc9b3d85daf9bb90d"
 }

package/src/events/Types.ts

@@ -1,7 +1,6 @@
 import { Attitude, UserPosition } from "@wemap/geo";
 import { Vector16_t, Vector3_t } from "@wemap/maths";
 
-
 export type Acceleration = Readonly<{ readonly timestamp: number; readonly values: Vector3_t; }>
 export type AngularRate = Readonly<{ readonly timestamp: number; readonly values: Vector3_t; }>
 export type HighRotation = Readonly<{ readonly timestamp: number; }>

package/src/mapmatching/MapMatchingHandler.spec.ts

@@ -2,8 +2,9 @@ import chai from 'chai';
 import { Coordinates, GraphNode, Network } from '@wemap/geo';
 import { deg2rad } from '@wemap/maths';
 import { Itinerary } from '@wemap/routers';
-import MMH from './MapMatchingHandler.js';
+import { OsmNetwork } from '@wemap/osm';
 
+import MMH from './MapMatchingHandler.js';
 
 const { expect } = chai;
 
@@ -61,7 +62,7 @@ describe('MapMatchingHandler', () => {
     it('_hasTurnInCircle - network', () => {
 
         // p1 has turns
-        const network = Network.fromCoordinates<null>([[p0, p4, p1], [p1, p2], [p3, p1]]);
+        const network = OsmNetwork.fromCoordinates([[p0, p4, p1], [p1, p2], [p3, p1]]);
         MMH.network = network;
 
         expect(MMH._nodeHasTurn(network.getNodeByCoords(p1) as GraphNode)).is.true;
@@ -90,7 +91,7 @@ describe('MapMatchingHandler', () => {
     it('_hasTurnInCircle - multi-levels', () => {
 
         // level 1 is a straight line
-        let network = Network.fromCoordinates<null>([
+        let network = OsmNetwork.fromCoordinates([
             [p0, p4, p1], [p1, p2], [p3, p1],
             [p10, p11, p13]
         ]);
@@ -111,7 +112,7 @@ describe('MapMatchingHandler', () => {
 
         // Changing level
         // straight line
-        network = Network.fromCoordinates([
+        network = OsmNetwork.fromCoordinates([
             [p0, p4, p11], [p11, p13]
         ]);
         MMH.network = network;
@@ -122,7 +123,7 @@ describe('MapMatchingHandler', () => {
 
         // Changing level
         // turn in p11
-        network = Network.fromCoordinates([
+        network = OsmNetwork.fromCoordinates([
             [p0, p4, p11], [p11, p12], [p11, p13]
         ]);
         MMH.network = network;

package/src/mapmatching/MapMatchingHandler.ts

@@ -1,10 +1,9 @@
-/* eslint-disable max-statements */
 import {
     AbsoluteHeading, GraphEdge, Level, MapMatching,
     GraphProjection, UserPosition, Coordinates, GraphNode, Network
 } from '@wemap/geo';
 import { deg2rad, diffAngle, diffAngleLines } from '@wemap/maths';
-import { OsmElement } from '@wemap/osm';
+import { OsmGraphProjection, OsmMapMatching, OsmNetwork, OsmNode, OsmWay } from '@wemap/osm';
 import { Itinerary, ItineraryInfoManager } from '@wemap/routers';
 import { TimeUtils } from '@wemap/utils';
 
@@ -19,8 +18,14 @@ import StraightLineProvider from '../providers/steps/StraightLineProvider.js';
 import ProvidersOptions from '../ProvidersOptions.js';
 import { AbsolutePosition } from '../events/Types.js';
 
-type MapMatchingEvent<T> = { network?: Network<T | null>, itinerary?: Itinerary | null };
-class MapMatchingHandler<T> extends Provider<MapMatchingEvent<T>> {
+type N = OsmNode | null;
+type E = OsmNode | OsmWay | null;
+type NullableOsmNetwork = Network<N, E>;
+type NullableOsmMapMatching = MapMatching<N, E>;
+type NullableOsmGraphProjection = GraphProjection<N, E>;
+
+type MapMatchingEvent = { network?: NullableOsmNetwork, itinerary?: Itinerary | null };
+class MapMatchingHandler extends Provider<MapMatchingEvent> {
 
     static DEFAULT_MM_MAX_ANGLE = deg2rad(30); // radians
     static DEFAULT_MM_MAX_DIST = 30; // meters
@@ -44,14 +49,14 @@ class MapMatchingHandler<T> extends Provider<MapMatchingEvent<T>> {
     _lastProjectionsWindowSize = MapMatchingHandler.DEFAULT_LAST_PROJECTIONS_WINDOW_SIZE;
     _lastProjectionsEdgeAngleThreshold = MapMatchingHandler.DEFAULT_LAST_PROJECTIONS_EDGE_ANGLE_THRESHOLD;
 
-    _mapMatching: MapMatching<T | null>;
+    _mapMatching: NullableOsmMapMatching;
     _internalProvidersStarted = false;
     _straightLineProviderId?: number;
     _turnProviderId?: number;
     _stepProviderId?: number;
-    _projectionsWithAbsAndWithoutRelAttitudeInARow: GraphProjection<T | null>[] = [];
+    _projectionsWithAbsAndWithoutRelAttitudeInARow: NullableOsmGraphProjection[] = [];
     _countStepsFromLastMatching = 0;
-    _lastProjections: GraphProjection<T | null>[] = [];
+    _lastProjections: NullableOsmGraphProjection[] = [];
 
     _itineraryInfoManager: ItineraryInfoManager | null = null;
 
@@ -136,7 +141,7 @@ class MapMatchingHandler<T> extends Provider<MapMatchingEvent<T>> {
 
     set itinerary(itinerary: Itinerary | null) {
 
-        this._mapMatching.network = itinerary ? itinerary.toNetwork<T>() : null;
+        this._mapMatching.network = itinerary ? itinerary.toNetwork<N, E>() : null;
         this._itineraryInfoManager = new ItineraryInfoManager(itinerary);
         this.notify({ ...(itinerary && { itinerary })});
 
@@ -347,7 +352,7 @@ class MapMatchingHandler<T> extends Provider<MapMatchingEvent<T>> {
 
     }
 
-    _detectWrongBigJump(projection: GraphProjection<T | null, UserPosition>) {
+    _detectWrongBigJump(projection: GraphProjection<N, E, UserPosition>) {
 
         if (this._itineraryInfoManager && AbsolutePositionProvider.lastEvent) {
             const infoPrevious = this._itineraryInfoManager.getInfo(AbsolutePositionProvider.lastEvent);
@@ -408,7 +413,7 @@ class MapMatchingHandler<T> extends Provider<MapMatchingEvent<T>> {
         ).some(this._nodeHasTurn);
     }
 
-    tryOrientationMatching(projection: GraphProjection<unknown, UserPosition>) {
+    tryOrientationMatching(projection: GraphProjection<N, E, UserPosition>) {
 
         if (!this._useOrientationMatching) {
             return;
@@ -540,4 +545,4 @@ class MapMatchingHandler<T> extends Provider<MapMatchingEvent<T>> {
     }
 }
 
-export default new MapMatchingHandler<OsmElement>();
+export default new MapMatchingHandler();

package/src/providers/position/absolute/AbsolutePositionProvider.ts

@@ -1,4 +1,4 @@
-import { Level, GeoRelativePosition } from '@wemap/geo';
+import { Level, GeoRelativePosition, UserPosition } from '@wemap/geo';
 import { TimeUtils } from '@wemap/utils';
 
 import Provider from '../../Provider.js';
@@ -232,7 +232,7 @@ class AbsolutePositionProvider extends Provider<AbsolutePosition> {
 
         let newPositionEvent: AbsolutePosition;
 
-        if (data instanceof AbsolutePosition) {
+        if (data instanceof UserPosition) {
 
             if (data.time === null) {
                 throw Error('the time of the position is not defined');

package/src/providers/position/absolute/GnssWifiProvider.ts

@@ -25,6 +25,10 @@ class GnssWifiProvider extends Provider<AbsolutePosition> {
         maximumAge: 0
     };
 
+    static DEFAULT_DISCARD_POSITIONS_ABOVE = 50;
+
+    discardPositionsAbove = GnssWifiProvider.DEFAULT_DISCARD_POSITIONS_ABOVE;
+
     geoLocationId?: number;
 
     getName = () => 'GnssWifi';
@@ -77,6 +81,12 @@ class GnssWifiProvider extends Provider<AbsolutePosition> {
             coords.accuracy,
             bearing);
 
+        if (typeof this.discardPositionsAbove === 'number'
+            && coords.accuracy > this.discardPositionsAbove
+        ) {
+            return;
+        }
+
         this.notify(position);
 
     };