From 21c5399c45efbb5d221a7344e8806573626ae42c Mon Sep 17 00:00:00 2001 From: Kt00s <41231355+Kt00s@users.noreply.github.com> Date: Fri, 27 Sep 2024 11:01:13 +0100 Subject: [PATCH] build: version 4.8.0 (#300) * feat: update sdk * feat: tsc build and ts update --- README.md | 3 - RNYamap.podspec | 2 +- android/build.gradle | 4 +- .../main/java/ru/vvdev/yamap/RNYamapModule.kt | 2 +- .../java/ru/vvdev/yamap/view/YamapView.kt | 7 +- build/components/ClusteredYamap.d.ts | 3 +- build/components/ClusteredYamap.js.map | 2 +- build/components/Yamap.d.ts | 3 +- build/components/Yamap.js.map | 2 +- build/interfaces.d.ts | 1 - build/interfaces.js.map | 2 +- ios/View/RNYMView.m | 6 +- package.json | 4 +- src/components/ClusteredYamap.tsx | 2 - src/components/Yamap.tsx | 2 - src/interfaces.ts | 2 - yarn.lock | 93 ++++++++++++++----- 17 files changed, 90 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 30169e2f..6287231d 100644 --- a/README.md +++ b/README.md @@ -147,8 +147,6 @@ type MasstransitVehicles = 'bus' | 'trolleybus' | 'tramway' | 'minibus' | 'subur type Vehicles = MasstransitVehicles | 'walk' | 'car'; -type MapType = 'none' | 'raster' | 'vector'; - interface DrivingInfo { time: string; @@ -259,7 +257,6 @@ type YandexLogoPadding = { | maxFps | number | 60 | Максимальная частота обновления карты | | logoPosition | YandexLogoPosition | {} | Позиция логотипа Яндекса на карте | | logoPadding | YandexLogoPadding | {} | Отступ логотипа Яндекса на карте | -| mapType | string | 'vector' | Тип карты | | mapStyle | string | {} | Стили карты согласно [документации](https://yandex.ru/dev/maps/mapkit/doc/dg/concepts/style.html) | #### Доступные методы для компонента **MapView**: diff --git a/RNYamap.podspec b/RNYamap.podspec index 2013b822..571f8d24 100644 --- a/RNYamap.podspec +++ b/RNYamap.podspec @@ -14,5 +14,5 @@ Pod::Spec.new do |s| # s.requires_arc = true s.dependency "React" - s.dependency "YandexMapsMobile", "4.6.1-full" + s.dependency "YandexMapsMobile", "4.8.0-full" end diff --git a/android/build.gradle b/android/build.gradle index 08e8ac70..d9de2954 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -13,7 +13,7 @@ android { defaultConfig { compileSdkVersion 34 - minSdkVersion 23 + minSdkVersion 26 targetSdkVersion 34 versionCode 1 versionName "1.1" @@ -33,6 +33,6 @@ repositories { dependencies { implementation 'com.google.android.gms:play-services-location:+' implementation 'com.facebook.react:react-native:+' - implementation 'com.yandex.android:maps.mobile:4.6.1-full' + implementation 'com.yandex.android:maps.mobile:4.8.0-full' implementation 'androidx.core:core-ktx:1.13.1' } diff --git a/android/src/main/java/ru/vvdev/yamap/RNYamapModule.kt b/android/src/main/java/ru/vvdev/yamap/RNYamapModule.kt index 7757001e..6b0ac4aa 100644 --- a/android/src/main/java/ru/vvdev/yamap/RNYamapModule.kt +++ b/android/src/main/java/ru/vvdev/yamap/RNYamapModule.kt @@ -55,7 +55,7 @@ class RNYamapModule internal constructor(context: ReactApplicationContext?) : @ReactMethod fun setLocale(locale: String?, successCb: Callback, errorCb: Callback?) { UiThreadUtil.runOnUiThread(Thread { - I18nManagerFactory.setLocale(locale) + MapKitFactory.setLocale(locale) successCb.invoke() }) } diff --git a/android/src/main/java/ru/vvdev/yamap/view/YamapView.kt b/android/src/main/java/ru/vvdev/yamap/view/YamapView.kt index 48037816..9e5a4295 100644 --- a/android/src/main/java/ru/vvdev/yamap/view/YamapView.kt +++ b/android/src/main/java/ru/vvdev/yamap/view/YamapView.kt @@ -55,7 +55,9 @@ import com.yandex.mapkit.traffic.TrafficLevel import com.yandex.mapkit.traffic.TrafficListener import com.yandex.mapkit.transport.TransportFactory import com.yandex.mapkit.transport.masstransit.FilterVehicleTypes +import com.yandex.mapkit.transport.masstransit.FitnessOptions import com.yandex.mapkit.transport.masstransit.Route +import com.yandex.mapkit.transport.masstransit.RouteOptions import com.yandex.mapkit.transport.masstransit.Section import com.yandex.mapkit.transport.masstransit.Session import com.yandex.mapkit.transport.masstransit.TimeOptions @@ -82,6 +84,7 @@ open class YamapView(context: Context?) : MapView(context), UserLocationObjectLi private var userLocationIconScale = 1f private var userLocationBitmap: Bitmap? = null private val routeMng = RouteManager() + private var routeOptions: RouteOptions = RouteOptions(FitnessOptions(false)) private val masstransitRouter = TransportFactory.getInstance().createMasstransitRouter() private val drivingRouter: DrivingRouter private val pedestrianRouter = TransportFactory.getInstance().createPedestrianRouter() @@ -338,11 +341,11 @@ open class YamapView(context: Context?) : MapView(context), UserLocationObjectLi } } if (vehicles.size == 0) { - pedestrianRouter.requestRoutes(_points, TimeOptions(), true, listener) + pedestrianRouter.requestRoutes(_points, TimeOptions(), routeOptions, listener) return } val transitOptions = TransitOptions(FilterVehicleTypes.NONE.value, TimeOptions()) - masstransitRouter.requestRoutes(_points, transitOptions, true, listener) + masstransitRouter.requestRoutes(_points, transitOptions, routeOptions, listener) } fun fitAllMarkers() { diff --git a/build/components/ClusteredYamap.d.ts b/build/components/ClusteredYamap.d.ts index e98fda15..00a7cd8c 100644 --- a/build/components/ClusteredYamap.d.ts +++ b/build/components/ClusteredYamap.d.ts @@ -1,6 +1,6 @@ import React from 'react'; import { ViewProps, ImageSourcePropType, NativeSyntheticEvent, ListRenderItemInfo } from 'react-native'; -import { MapType, Animation, Point, DrivingInfo, MasstransitInfo, RoutesFoundEvent, Vehicles, CameraPosition, VisibleRegion, ScreenPoint, MapLoaded, InitialRegion, YandexLogoPosition, YandexLogoPadding } from '../interfaces'; +import { Animation, Point, DrivingInfo, MasstransitInfo, RoutesFoundEvent, Vehicles, CameraPosition, VisibleRegion, ScreenPoint, MapLoaded, InitialRegion, YandexLogoPosition, YandexLogoPadding } from '../interfaces'; export interface ClusteredYaMapProps extends ViewProps { userLocationIcon?: ImageSourcePropType; userLocationIconScale?: number; @@ -16,7 +16,6 @@ export interface ClusteredYaMapProps extends ViewProps { showUserPosition?: boolean; nightMode?: boolean; mapStyle?: string; - mapType?: MapType; onCameraPositionChange?: (event: NativeSyntheticEvent) => void; onCameraPositionChangeEnd?: (event: NativeSyntheticEvent) => void; onMapPress?: (event: NativeSyntheticEvent) => void; diff --git a/build/components/ClusteredYamap.js.map b/build/components/ClusteredYamap.js.map index c01786ca..60807ee5 100644 --- a/build/components/ClusteredYamap.js.map +++ b/build/components/ClusteredYamap.js.map @@ -1 +1 @@ -{"version":3,"file":"ClusteredYamap.js","sourceRoot":"","sources":["../../src/components/ClusteredYamap.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ClusteredYamap.js","sourceRoot":"","sources":["../../src/components/ClusteredYamap.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/components/Yamap.d.ts b/build/components/Yamap.d.ts index 4a76634c..40b38838 100644 --- a/build/components/Yamap.d.ts +++ b/build/components/Yamap.d.ts @@ -1,13 +1,12 @@ import React from 'react'; import { ViewProps, ImageSourcePropType, NativeSyntheticEvent } from 'react-native'; -import { Point, ScreenPoint, DrivingInfo, MasstransitInfo, RoutesFoundEvent, Vehicles, CameraPosition, VisibleRegion, InitialRegion, MapType, Animation, MapLoaded, YandexLogoPosition, YandexLogoPadding } from '../interfaces'; +import { Point, ScreenPoint, DrivingInfo, MasstransitInfo, RoutesFoundEvent, Vehicles, CameraPosition, VisibleRegion, InitialRegion, Animation, MapLoaded, YandexLogoPosition, YandexLogoPadding } from '../interfaces'; export interface YaMapProps extends ViewProps { userLocationIcon?: ImageSourcePropType; userLocationIconScale?: number; showUserPosition?: boolean; nightMode?: boolean; mapStyle?: string; - mapType?: MapType; onCameraPositionChange?: (event: NativeSyntheticEvent) => void; onCameraPositionChangeEnd?: (event: NativeSyntheticEvent) => void; onMapPress?: (event: NativeSyntheticEvent) => void; diff --git a/build/components/Yamap.js.map b/build/components/Yamap.js.map index 05ba9e74..ecd223d5 100644 --- a/build/components/Yamap.js.map +++ b/build/components/Yamap.js.map @@ -1 +1 @@ -{"version":3,"file":"Yamap.js","sourceRoot":"","sources":["../../src/components/Yamap.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Yamap.js","sourceRoot":"","sources":["../../src/components/Yamap.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/interfaces.d.ts b/build/interfaces.d.ts index 05e9cf16..2361d8b5 100644 --- a/build/interfaces.d.ts +++ b/build/interfaces.d.ts @@ -30,7 +30,6 @@ export interface InitialRegion { } export type MasstransitVehicles = 'bus' | 'trolleybus' | 'tramway' | 'minibus' | 'suburban' | 'underground' | 'ferry' | 'cable' | 'funicular'; export type Vehicles = MasstransitVehicles | 'walk' | 'car'; -export type MapType = 'none' | 'raster' | 'vector'; export interface DrivingInfo { time: string; timeWithTraffic: string; diff --git a/build/interfaces.js.map b/build/interfaces.js.map index 59015f05..da20fd6f 100644 --- a/build/interfaces.js.map +++ b/build/interfaces.js.map @@ -1 +1 @@ -{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AA2FA,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,6CAAM,CAAA;IACN,6CAAM,CAAA;AACR,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB"} \ No newline at end of file +{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AAyFA,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,6CAAM,CAAA;IACN,6CAAM,CAAA;AACR,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB"} \ No newline at end of file diff --git a/ios/View/RNYMView.m b/ios/View/RNYMView.m index 5f80353b..5c2ba065 100644 --- a/ios/View/RNYMView.m +++ b/ios/View/RNYMView.m @@ -32,6 +32,7 @@ @implementation RNYMView { YMKPedestrianRouter *pedestrianRouter; YMKTransitOptions *transitOptions; YMKMasstransitSessionRouteHandler routeHandler; + YMKRouteOptions *routeOptions; NSMutableArray *_reactSubviews; NSMutableArray *routes; NSMutableArray *currentRouteInfo; @@ -62,6 +63,7 @@ - (instancetype)init { drivingRouter = [[YMKDirectionsFactory instance] createDrivingRouterWithType:YMKDrivingRouterTypeOnline]; pedestrianRouter = [[YMKTransportFactory instance] createPedestrianRouter]; transitOptions = [YMKTransitOptions transitOptionsWithAvoid:YMKFilterVehicleTypesNone timeOptions:[[YMKTimeOptions alloc] init]]; acceptVehicleTypes = [[NSMutableArray alloc] init]; + routeOptions = [YMKRouteOptions routeOptionsWithFitnessOptions:[YMKFitnessOptions fitnessOptionsWithAvoidSteep:false]]; routes = [[NSMutableArray alloc] init]; currentRouteInfo = [[NSMutableArray alloc] init]; lastKnownRoutePoints = [[NSMutableArray alloc] init]; @@ -290,12 +292,12 @@ - (void)findRoutes:(NSArray *)_points vehicles:(NSArray extends ViewProps { showUserPosition?: boolean; nightMode?: boolean; mapStyle?: string; - mapType?: MapType; onCameraPositionChange?: (event: NativeSyntheticEvent) => void; onCameraPositionChangeEnd?: (event: NativeSyntheticEvent) => void; onMapPress?: (event: NativeSyntheticEvent) => void; diff --git a/src/components/Yamap.tsx b/src/components/Yamap.tsx index bdd12f98..b32c8903 100644 --- a/src/components/Yamap.tsx +++ b/src/components/Yamap.tsx @@ -22,7 +22,6 @@ import { CameraPosition, VisibleRegion, InitialRegion, - MapType, Animation, MapLoaded, YandexLogoPosition, @@ -38,7 +37,6 @@ export interface YaMapProps extends ViewProps { showUserPosition?: boolean; nightMode?: boolean; mapStyle?: string; - mapType?: MapType; onCameraPositionChange?: (event: NativeSyntheticEvent) => void; onCameraPositionChangeEnd?: (event: NativeSyntheticEvent) => void; onMapPress?: (event: NativeSyntheticEvent) => void; diff --git a/src/interfaces.ts b/src/interfaces.ts index cf6a96c0..735442b0 100644 --- a/src/interfaces.ts +++ b/src/interfaces.ts @@ -37,8 +37,6 @@ export type MasstransitVehicles = 'bus' | 'trolleybus' | 'tramway' | 'minibus' | export type Vehicles = MasstransitVehicles | 'walk' | 'car'; -export type MapType = 'none' | 'raster' | 'vector'; - export interface DrivingInfo { time: string; timeWithTraffic: string; diff --git a/yarn.lock b/yarn.lock index c0f90d48..5ed160c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,36 +5,83 @@ __metadata: version: 6 cacheKey: 8 +"@react-native/virtualized-lists@npm:^0.72.4": + version: 0.72.8 + resolution: "@react-native/virtualized-lists@npm:0.72.8" + dependencies: + invariant: ^2.2.4 + nullthrows: ^1.1.1 + peerDependencies: + react-native: "*" + checksum: ad9628a04e72420326fd5ef09c746ad9cd6cff745b73850c7297429e3c42927043d1310896a72aa94497dc6b7f1abc2be1081b465734f7673f0e7d36aaae5e53 + languageName: node + linkType: hard + "@types/prop-types@npm:*": - version: 15.7.3 - resolution: "@types/prop-types@npm:15.7.3" - checksum: 41831d53c44c9eeafdaf9762bcb4553c13a3bbf990745ed9065a1cc3581b80633113b53fd49b202bf51731b258da5d0a9aa09c9035d5af7f78b0f6bc273f1325 + version: 15.7.13 + resolution: "@types/prop-types@npm:15.7.13" + checksum: 8935cad87c683c665d09a055919d617fe951cb3b2d5c00544e3a913f861a2bd8d2145b51c9aa6d2457d19f3107ab40784c40205e757232f6a80cc8b1c815513c languageName: node linkType: hard "@types/react-native@npm:*": - version: 0.62.11 - resolution: "@types/react-native@npm:0.62.11" + version: 0.72.8 + resolution: "@types/react-native@npm:0.72.8" dependencies: + "@react-native/virtualized-lists": ^0.72.4 "@types/react": "*" - checksum: 782244e498e18baf5b83840d2d926ebd9e9a0cf2b8daf03c43fcb3745a9e9df6887a556e777140c311693f319c2ad71a28571ee47d8a13ee830434246b1b0c22 + checksum: a9fdf0a11ed42f800eb646d038702d3652d0732aa017ecd8203fb2aee77a782fa7ef388433e5cfcb6ab658a1642e1286698fecedcbc379547e4aeefa681ed685 languageName: node linkType: hard "@types/react@npm:*": - version: 16.9.35 - resolution: "@types/react@npm:16.9.35" + version: 18.3.9 + resolution: "@types/react@npm:18.3.9" dependencies: "@types/prop-types": "*" - csstype: ^2.2.0 - checksum: 74c605999ac3e16b2560fdb477c53a3110e02696732902440075d6b8be193c9134bc29a339675e52df3903c9f9441b8281d9ff0ffa024399e6297d30afba8837 + csstype: ^3.0.2 + checksum: ac8c7cf6f9c5c2ecef790f3db6f98c672fdec0884f4e4730777fd18823207231cdd1d2e4673f473ef17a096c73c87bff309e83b026fb2602ba068371f0dc54fe + languageName: node + linkType: hard + +"csstype@npm:^3.0.2": + version: 3.1.3 + resolution: "csstype@npm:3.1.3" + checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7 + languageName: node + linkType: hard + +"invariant@npm:^2.2.4": + version: 2.2.4 + resolution: "invariant@npm:2.2.4" + dependencies: + loose-envify: ^1.0.0 + checksum: cc3182d793aad82a8d1f0af697b462939cb46066ec48bbf1707c150ad5fad6406137e91a262022c269702e01621f35ef60269f6c0d7fd178487959809acdfb14 + languageName: node + linkType: hard + +"js-tokens@npm:^3.0.0 || ^4.0.0": + version: 4.0.0 + resolution: "js-tokens@npm:4.0.0" + checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78 + languageName: node + linkType: hard + +"loose-envify@npm:^1.0.0": + version: 1.4.0 + resolution: "loose-envify@npm:1.4.0" + dependencies: + js-tokens: ^3.0.0 || ^4.0.0 + bin: + loose-envify: cli.js + checksum: 6517e24e0cad87ec9888f500c5b5947032cdfe6ef65e1c1936a0c48a524b81e65542c9c3edc91c97d5bddc806ee2a985dbc79be89215d613b1de5db6d1cfe6f4 languageName: node linkType: hard -"csstype@npm:^2.2.0": - version: 2.6.10 - resolution: "csstype@npm:2.6.10" - checksum: c2803b8f0b1c6fe935101435e72360afebf4f77044dea22af2e9574c61a51f2ba58c3c211d61b72013964a0ac1a84533e70dc62e6ef4934d391c0a6ca32311eb +"nullthrows@npm:^1.1.1": + version: 1.1.1 + resolution: "nullthrows@npm:1.1.1" + checksum: 10806b92121253eb1b08ecf707d92480f5331ba8ae5b23fa3eb0548ad24196eb797ed47606153006568a5733ea9e528a3579f21421f7828e09e7756f4bdd386f languageName: node linkType: hard @@ -44,29 +91,29 @@ __metadata: dependencies: "@types/react": "*" "@types/react-native": "*" - typescript: ^3.8.3 + typescript: ^4.9.5 peerDependencies: react: "*" react-native: "*" languageName: unknown linkType: soft -"typescript@npm:^3.8.3": - version: 3.9.3 - resolution: "typescript@npm:3.9.3" +"typescript@npm:^4.9.5": + version: 4.9.5 + resolution: "typescript@npm:4.9.5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 8545da47e0d19aeabcce4a3eca41cc1b88cb136088e58eba1c00e425722dcb137b29cab9ebf8b53dd3be49e74cfb3372259255061c05dd46b9f6cc2f764be83c + checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db languageName: node linkType: hard -"typescript@patch:typescript@^3.8.3#~builtin": - version: 3.9.3 - resolution: "typescript@patch:typescript@npm%3A3.9.3#~builtin::version=3.9.3&hash=3bd3d3" +"typescript@patch:typescript@^4.9.5#~builtin": + version: 4.9.5 + resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=289587" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 63a402035e2c94a5f3a2358fb42bcbd8b133e2798256c7f91db1b9c6d94cba791adec36ddf983d97df64c22ccb265c27ae2477c7aaab7a12a017f932aa07645f + checksum: 1f8f3b6aaea19f0f67cba79057674ba580438a7db55057eb89cc06950483c5d632115c14077f6663ea76fd09fce3c190e6414bb98582ec80aa5a4eaf345d5b68 languageName: node linkType: hard