Skip to content

Commit 74b4287

Browse files
committed
chore(ios): build fixes
1 parent ae0fc79 commit 74b4287

File tree

8 files changed

+288
-203
lines changed

8 files changed

+288
-203
lines changed

src/ui-carto/datasources/index.ios.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,25 +91,20 @@ export class GeoJSONVectorTileDataSource extends TileDataSource<NTGeoJSONVectorT
9191
this.getNative().setLayerGeoJSONGeoJSON(layerIndex, JSVariantToNative(geoJSON));
9292
}
9393
setLayerGeoJSONString(layerIndex: number, geoJSON: string | Object) {
94-
//@ts-ignore
95-
this.getNative().setLayerGeoJSONString(layerIndex, typeof geoJSON === 'string' ? geoJSON : JSON.stringify(geoJSON));
94+
this.getNative().setLayerGeoJSONStringGeoJSON(layerIndex, typeof geoJSON === 'string' ? geoJSON : JSON.stringify(geoJSON));
9695
}
9796

9897
addGeoJSONFeature(layerIndex: number, geoJSON: Object) {
99-
//@ts-ignore
100-
this.getNative().addGeoJSONFeature(layerIndex, JSVariantToNative(geoJSON));
98+
this.getNative().addGeoJSONFeatureGeoJSON(layerIndex, JSVariantToNative(geoJSON));
10199
}
102100
addGeoJSONStringFeature(layerIndex: number, geoJSON: string | Object) {
103-
//@ts-ignore
104-
this.getNative().addGeoJSONStringFeature(layerIndex, typeof geoJSON === 'string' ? geoJSON : JSON.stringify(geoJSON));
101+
this.getNative().addGeoJSONStringFeatureGeoJSON(layerIndex, typeof geoJSON === 'string' ? geoJSON : JSON.stringify(geoJSON));
105102
}
106103
updateGeoJSONFeature(layerIndex: number, geoJSON: Object) {
107-
//@ts-ignore
108-
this.getNative().updateGeoJSONFeature(layerIndex, JSVariantToNative(geoJSON));
104+
this.getNative().updateGeoJSONFeatureGeoJSON(layerIndex, JSVariantToNative(geoJSON));
109105
}
110106
updateGeoJSONStringFeature(layerIndex: number, geoJSON: string | Object) {
111-
//@ts-ignore
112-
this.getNative().updateGeoJSONStringFeature(layerIndex, typeof geoJSON === 'string' ? geoJSON : JSON.stringify(geoJSON));
107+
this.getNative().updateGeoJSONStringFeatureGeoJSON(layerIndex, typeof geoJSON === 'string' ? geoJSON : JSON.stringify(geoJSON));
113108
}
114109
}
115110

src/ui-carto/geocoding/service.ios.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import {
55
GeocodingResult as IGeocodingResult,
66
MapBoxOnlineGeocodingServiceOptions,
77
MapBoxOnlineReverseGeocodingServiceOptions,
8+
MultiOSMOfflineGeocodingServiceOptions,
9+
MultiOSMOfflineReverseGeocodingServiceOptions,
810
OSMOfflineGeocodingServiceOptions,
911
OSMOfflineReverseGeocodingServiceOptions,
1012
PackageManagerGeocodingServiceOptions,
@@ -14,9 +16,7 @@ import {
1416
ReverseGeocodingRequest,
1517
ReverseGeocodingServiceOptions,
1618
TomTomOnlineGeocodingServiceOptions,
17-
TomTomOnlineReverseGeocodingServiceOptions,
18-
MultiOSMOfflineGeocodingServiceOptions,
19-
MultiOSMOfflineReverseGeocodingServiceOptions
19+
TomTomOnlineReverseGeocodingServiceOptions
2020
} from './service';
2121
import { BaseGeocodingService } from './service.common';
2222
import { toNativeMapPos } from '../core';
@@ -169,7 +169,7 @@ export class OSMOfflineReverseGeocodingService extends ReverseGeocodingService<N
169169

170170
export class MultiOSMOfflineGeocodingService extends GeocodingService<NTMultiOSMOfflineGeocodingService, MultiOSMOfflineGeocodingServiceOptions> {
171171
createNative(options: MultiOSMOfflineGeocodingServiceOptions) {
172-
return NTMultiOSMOfflineGeocodingService.alloc().init();
172+
return NTMultiOSMOfflineGeocodingService.alloc().init();
173173
}
174174
add(database: string) {
175175
this.getNative().add(database);
@@ -181,12 +181,12 @@ export class MultiOSMOfflineGeocodingService extends GeocodingService<NTMultiOSM
181181

182182
export class MultiOSMOfflineReverseGeocodingService extends ReverseGeocodingService<NTMultiOSMOfflineReverseGeocodingService, MultiOSMOfflineReverseGeocodingServiceOptions> {
183183
createNative(options: MultiOSMOfflineReverseGeocodingServiceOptions) {
184-
return NTMultiOSMOfflineReverseGeocodingService.alloc().init();
184+
return NTMultiOSMOfflineReverseGeocodingService.alloc().init();
185185
}
186186
add(database: string) {
187187
this.getNative().add(database);
188188
}
189189
remove(database: string) {
190190
this.getNative().remove(database);
191191
}
192-
}
192+
}

src/ui-carto/geometry/feature.ios.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ export class VectorTileFeatureCollection extends FeatureCollection<NTVectorTileF
6060
geometry: nResult.getGeometry() as any,
6161
id: nResult.getId(),
6262
layerName: nResult.getLayerName(),
63-
//@ts-ignore
6463
distance: nResult.getDistance()
6564
} as VectorTileFeature;
6665
}

src/ui-carto/routing/index.ios.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,12 @@ abstract class ValhallaRoutingService<
7979
public setConfigurationParameter(param: string, value: any) {
8080
const native = this.getNative();
8181
if (!(native instanceof NTValhallaOnlineRoutingService)) {
82-
//@ts-ignore
8382
native.setConfigurationParameterValue(param, JSVariantToNative(value));
8483
}
8584
}
8685
public getConfigurationParameter(param: string) {
8786
const native = this.getNative();
8887
if (!(native instanceof NTValhallaOnlineRoutingService)) {
89-
//@ts-ignore
9088
return nativeVariantToJS(native.getConfigurationParameter(param));
9189
}
9290
}

src/ui-carto/search/index.ios.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export class VectorTileSearchService extends BaseNative<NTVectorTileSearchServic
4747
for (let index = 0; index < array.length; index++) {
4848
vector.add(array[index]);
4949
}
50-
//@ts-ignore
5150
this.native.setLayers(vector);
5251
}
5352
}

0 commit comments

Comments
 (0)