Skip to content

Commit 44daeb0

Browse files
author
Pablo Guardiola
authored
bump nn dependency version to 110.0.0 (#6095)
1 parent b229a9b commit 44daeb0

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

gradle/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ext {
1313
// version which we should use in this build
1414
def mapboxNavigatorVersion = System.getenv("FORCE_MAPBOX_NAVIGATION_NATIVE_VERSION")
1515
if (mapboxNavigatorVersion == null || mapboxNavigatorVersion == '') {
16-
mapboxNavigatorVersion = '109.0.0'
16+
mapboxNavigatorVersion = '110.0.0'
1717
}
1818
println("Navigation Native version: " + mapboxNavigatorVersion)
1919

libnavigation-base/src/main/java/com/mapbox/navigation/base/trip/model/eh/EHorizonMapper.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import com.mapbox.navigator.RoadObjectProvider
3838
import com.mapbox.navigator.RoadObjectType
3939
import com.mapbox.navigator.RoadSurface
4040
import com.mapbox.navigator.SubgraphEdge
41+
import com.mapbox.navigator.match.openlr.OpenLR
4142
import com.mapbox.navigator.match.openlr.Orientation
4243
import com.mapbox.navigator.match.openlr.SideOfRoad
4344

@@ -373,9 +374,8 @@ internal fun EHorizonGraphPosition.mapToNativeGraphPosition(): GraphPosition {
373374

374375
internal fun SDKMatchableOpenLr.mapToNativeMatchableOpenLr(): MatchableOpenLr {
375376
return MatchableOpenLr(
376-
openLRLocation,
377-
openLRStandard.mapToOpenLRStandard(),
378-
roadObjectId
377+
OpenLR(openLRLocation, openLRStandard.mapToOpenLRStandard()),
378+
roadObjectId,
379379
)
380380
}
381381

libnavigation-base/src/test/java/com/mapbox/navigation/base/trip/model/roadobject/RoadObjectMapperTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class RoadObjectMapperTest {
269269
type = com.mapbox.navigator.RoadObjectType.INCIDENT,
270270
incidentInfo = com.mapbox.navigator.IncidentInfo(
271271
INCIDENT_ID,
272-
com.mapbox.navigator.match.openlr.OpenLR(Standard.TOM_TOM, INCIDENT_OPEN_LR),
272+
com.mapbox.navigator.match.openlr.OpenLR(INCIDENT_OPEN_LR, Standard.TOM_TOM),
273273
com.mapbox.navigator.IncidentType.CONSTRUCTION,
274274
INCIDENT_CREATION_TIME,
275275
INCIDENT_START_TIME,

libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/eh/RoadObjectMatcher.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.mapbox.navigation.base.trip.model.eh.MatchablePoint
1111
import com.mapbox.navigation.base.trip.model.eh.OpenLRStandard
1212
import com.mapbox.navigation.core.MapboxNavigation
1313
import com.mapbox.navigation.navigator.internal.MapboxNativeNavigator
14+
import com.mapbox.navigator.MatchingOptions
1415
import com.mapbox.navigator.RoadObject
1516
import com.mapbox.navigator.RoadObjectMatcherError
1617
import com.mapbox.navigator.RoadObjectMatcherListener
@@ -114,7 +115,7 @@ class RoadObjectMatcher internal constructor(
114115
MatchableOpenLr(roadObjectId, openLRLocation, openLRStandard)
115116
)
116117
),
117-
false
118+
MatchingOptions(false, false),
118119
)
119120
}
120121

@@ -135,7 +136,7 @@ class RoadObjectMatcher internal constructor(
135136
matchableOpenLrs.map {
136137
EHorizonFactory.buildNativeMatchableOpenLr(it)
137138
},
138-
useOnlyPreloadedTiles
139+
MatchingOptions(useOnlyPreloadedTiles, false),
139140
)
140141
}
141142

@@ -163,7 +164,7 @@ class RoadObjectMatcher internal constructor(
163164
MatchableGeometry(roadObjectId, polyline)
164165
)
165166
),
166-
false
167+
MatchingOptions(false, false),
167168
)
168169
}
169170

@@ -189,7 +190,7 @@ class RoadObjectMatcher internal constructor(
189190
matchableGeometries.map {
190191
EHorizonFactory.buildNativeMatchableGeometry(it)
191192
},
192-
useOnlyPreloadedTiles
193+
MatchingOptions(useOnlyPreloadedTiles, false),
193194
)
194195
}
195196

@@ -217,7 +218,7 @@ class RoadObjectMatcher internal constructor(
217218
MatchableGeometry(roadObjectId, polygon)
218219
)
219220
),
220-
false
221+
MatchingOptions(false, false),
221222
)
222223
}
223224

@@ -243,7 +244,7 @@ class RoadObjectMatcher internal constructor(
243244
matchableGeometries.map {
244245
EHorizonFactory.buildNativeMatchableGeometry(it)
245246
},
246-
useOnlyPreloadedTiles
247+
MatchingOptions(useOnlyPreloadedTiles, false),
247248
)
248249
}
249250

@@ -271,7 +272,7 @@ class RoadObjectMatcher internal constructor(
271272
MatchableGeometry(roadObjectId, gantry)
272273
)
273274
),
274-
false
275+
MatchingOptions(false, false),
275276
)
276277
}
277278

@@ -297,7 +298,7 @@ class RoadObjectMatcher internal constructor(
297298
matchableGeometries.map {
298299
EHorizonFactory.buildNativeMatchableGeometry(it)
299300
},
300-
useOnlyPreloadedTiles
301+
MatchingOptions(useOnlyPreloadedTiles, false),
301302
)
302303
}
303304

@@ -323,7 +324,7 @@ class RoadObjectMatcher internal constructor(
323324
MatchablePoint(roadObjectId, point)
324325
)
325326
),
326-
false
327+
MatchingOptions(false, false),
327328
)
328329
}
329330

@@ -347,7 +348,7 @@ class RoadObjectMatcher internal constructor(
347348
matchablePoints.map {
348349
EHorizonFactory.buildNativeMatchablePoint(it)
349350
},
350-
useOnlyPreloadedTiles
351+
MatchingOptions(useOnlyPreloadedTiles, false),
351352
)
352353
}
353354

0 commit comments

Comments
 (0)