Merge branch 'alpimaps' of github.com:farfromrefug/nativescript-carto into alpimaps

Author: farfromrefug

packages/ui-carto/platforms/android/java/com/akylas/carto/additions/AKRoutingServiceAdditions.java

@@ -45,14 +45,18 @@ enum RoutingAction {
     static final String TAG = "AKRoutingServiceAdditions";
     static Handler mainHandler = null;
 
-    public static void calculateRoute (final RoutingService service, final RoutingRequest request, final String profile, final Boolean stringify,  final RoutingServiceRouteCallback callback) {
+    public static void calculateRoute (final RoutingService service, final RoutingRequest request, final String profile, final boolean stringify,  final RoutingServiceRouteCallback callback) {
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
                 RoutingResult result = null;
+                String strResult = null;
                 try {
                     service.setProfile(profile);
                     result = service.calculateRoute(request);
+                    if (stringify) {
+                        strResult = stringifyRoutingResult(result);
+                    }
                 } catch (final Exception e) {
                     e.printStackTrace();
                     if (AKMapView.RUN_ON_MAIN_THREAD) {
@@ -72,7 +76,7 @@ public void run() {
                 }
 
                 final RoutingResult fRa = result;
-                final String fStrResult = stringify ? stringifyRoutingResult(result) : null;
+                final String fStrResult = strResult;
                 if (AKMapView.RUN_ON_MAIN_THREAD) {
                     if (mainHandler == null) {
                         mainHandler = new Handler(android.os.Looper.getMainLooper());

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

@@ -4,16 +4,16 @@ import { MapPos, toNativeMapPos } from '../core';
 import { FeatureCollection, VectorTileFeatureCollection } from '../geometry/feature';
 import { MapBoxElevationDataDecoderOptions, TerrariumElevationDataDecoderOptions } from '.';
 
-export class MapBoxElevationDataDecoder extends BaseNative<com.carto.rastertiles.MapBoxElevationDataDecoder, MapBoxElevationDataDecoderOptions> {
+export class MapBoxElevationDataDecoder extends BaseNative<NTMapBoxElevationDataDecoder, MapBoxElevationDataDecoderOptions> {
     createNative(options: MapBoxElevationDataDecoderOptions) {
-        return new NTMapBoxElevationDataDecoder();
+        return NTMapBoxElevationDataDecoder.new();
     }
     public getElevation(pos: MapPos) {}
 }
 
-export class TerrariumElevationDataDecoder extends BaseNative<com.carto.rastertiles.TerrariumElevationDataDecoder, TerrariumElevationDataDecoderOptions> {
+export class TerrariumElevationDataDecoder extends BaseNative<NTTerrariumElevationDataDecoder, TerrariumElevationDataDecoderOptions> {
     createNative(options: TerrariumElevationDataDecoderOptions) {
-        return  NTTerrariumElevationDataDecoder.alloc.init();
+        return NTTerrariumElevationDataDecoder.new();
     }
     public getElevation(pos: MapPos) {}
 }

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

@@ -34,9 +34,10 @@ export class VectorTileSearchService extends BaseNative<AKVectorTileSearchServic
             nRequest.setGeometry(geometryFromArgs(options.geometry));
         }
         if (callback) {
-            this.getNative().findFeaturesCallback(nRequest, (r)=>new VectorTileFeatureCollection(r))
+            this.getNative().findFeaturesCallback(nRequest, (r) => new VectorTileFeatureCollection(r));
+            return null;
         } else {
-            return  new VectorTileFeatureCollection(this.getNative().findFeatures(nRequest));
+            return new VectorTileFeatureCollection(this.getNative().findFeatures(nRequest));
         }
     }
     set layers(value: string | string[]) {
@@ -75,9 +76,10 @@ export class FeatureCollectionSearchService extends BaseNative<AKFeatureCollecti
             }
         }
         if (callback) {
-            this.getNative().findFeaturesCallback(nRequest, (r)=>new FeatureCollection(r))
+            this.getNative().findFeaturesCallback(nRequest, (r) => new FeatureCollection(r));
+            return null;
         } else {
-            return  new FeatureCollection(this.getNative().findFeatures(nRequest));
+            return new FeatureCollection(this.getNative().findFeatures(nRequest));
         }
     }
 }

src/ui-carto/ui/index.android.ts

@@ -33,8 +33,6 @@ import { MapOptions } from '.';
 import { EPSG4326 } from '../projections/epsg4326';
 export { MapClickedEvent, MapIdleEvent, MapMovedEvent, MapReadyEvent, MapStableEvent, setLicenseKeyRegistered };
 
-export const time = global.__time || Date.now;
-
 export const RenderProjectionMode = {
     get RENDER_PROJECTION_MODE_PLANAR() {
         return com.carto.components.RenderProjectionMode.RENDER_PROJECTION_MODE_PLANAR;
@@ -300,11 +298,15 @@ export class CartoMap<T = DefaultLatLonKeys> extends CartoViewBase {
         if (this.mapView) {
             const native: com.carto.layers.TileLayer = layer.getNative();
             if (!!native) {
-                const layers = this.mapView.getLayers();
-                if (index !== undefined && index < layers.count()) {
-                    layers.insert(index, native);
-                } else {
-                    layers.add(native);
+                try {
+                    const layers = this.mapView.getLayers();
+                    if (index !== undefined && index < layers.count()) {
+                        layers.insert(index, native);
+                    } else {
+                        layers.add(native);
+                    }
+                } catch (error) {
+                    console.error(error)
                 }
             }
         }

src/ui-carto/ui/index.common.ts

@@ -165,6 +165,11 @@ export abstract class CartoViewBase extends ContentView {
         }
     }
 
+    disposeNativeView() {
+        this.mapReady = false;
+        super.disposeNativeView();
+    }
+
     [focusPosProperty.setNative](value: MapPos) {
         if (!this.nativeViewProtected || !this.nativeProjection) {
             return;

src/ui-carto/vectorelements/line.ios.ts

@@ -99,7 +99,7 @@ export class Line extends BaseLineVectorElement<NTLine, LineOptions> {
         if (styleBuilder instanceof NTLineStyle) {
             style = styleBuilder;
         } else if (styleBuilder instanceof LineStyleBuilder) {
-            style = styleBuilder.buildStyle();
+            style = (styleBuilder as LineStyleBuilder).buildStyle();
         } else if (styleBuilder.hasOwnProperty) {
             style = new LineStyleBuilder(styleBuilder).buildStyle();
         }

src/ui-carto/vectortiles/index.android.ts

@@ -38,7 +38,6 @@ export class MBVectorTileDecoder extends BaseVectorTileDecoder<com.carto.vectort
                 return new com.carto.vectortiles.MBVectorTileDecoder(new com.carto.styles.CartoCSSStyleSet(options.cartoCss));
             }
         } else if (pack) {
-            console.log('new com.carto.styles.CompiledStyleSet', pack, options.style, options);
             const vectorTileStyleSet = new com.carto.styles.CompiledStyleSet(pack, options.style);
             const result = new com.carto.vectortiles.MBVectorTileDecoder(vectorTileStyleSet);
             return result;