Merge remote-tracking branch 'origin/alpimaps' into alpimaps

Author: farfromrefug

.gitignore

@@ -1,7 +1,7 @@
 # NativeScript
 hooks/
 node_modules/
-/platforms/
+platforms
 
 # NativeScript Template
 *.js.map
@@ -43,8 +43,10 @@ packages/**/*.d.ts
 bin
 build
 Pods
-!packages/platforms
+!packages/*/platforms
 /packages/**/*.aar
+/packages/**/*.framework
+/packages/**/*.xcframework
 /demo-snippets/**/*.aar
 *.xcuserdatad
 /packages/README.md

.yarnrc.yml

@@ -1,5 +1,7 @@
+compressionLevel: mixed
+
 nmHoistingLimits: workspaces
 
 nodeLinker: node-modules
 
-yarnPath: tools/.yarn/releases/yarn-3.6.4.cjs
+yarnPath: tools/.yarn/releases/yarn-4.0.1.cjs

demo-snippets/package.json

@@ -3,7 +3,7 @@
     "private": true,
     "version": "0.0.1",
     "dependencies": {
-        "@nativescript-community/ui-carto": "file:../packages/ui-carto",
+        "@nativescript-community/ui-carto": "*",
         "vue-property-decorator": "9.1.2"
     }
 }

demo-snippets/svelte/BasicRaster.svelte

@@ -4,7 +4,7 @@
     import { RasterTileLayer } from '@nativescript-community/ui-carto/layers/raster';
     import { VectorLayer } from '@nativescript-community/ui-carto/layers/vector';
     import { CartoMap } from '@nativescript-community/ui-carto/ui';
-import { PanningMode } from '@nativescript-community/ui-carto/ui/index.android';
+import { PanningMode } from '@nativescript-community/ui-carto/ui';
     import { setShowDebug, setShowError, setShowInfo, setShowWarn } from '@nativescript-community/ui-carto/utils';
     import { Line, LineEndType, LineJointType, LineStyleBuilder } from '@nativescript-community/ui-carto/vectorelements/line';
     import { Marker, MarkerStyleBuilder } from '@nativescript-community/ui-carto/vectorelements/marker';
@@ -14,8 +14,13 @@ import { PanningMode } from '@nativescript-community/ui-carto/ui/index.android';
     let cartoMap: CartoMap;
     let rasterLayer: RasterTileLayer;
 
+    function logEvent(e) {
+        console.log(e.eventName, Object.keys(e))
+    }
+
     function onMainMapReady(e) {
         cartoMap = e.object as CartoMap;
+        console.log('onMainMapReady');
         const options = cartoMap.getOptions();
         options.setWatermarkScale(0);
         options.setRestrictedPanning(true);
@@ -112,6 +117,6 @@ import { PanningMode } from '@nativescript-community/ui-carto/ui/index.android';
         <navigationButton text="Go back" on:tap={() => goBack()} />
     </actionBar>
     <gridLayout class="page">
-        <cartomap zoom="10" on:mapReady={onMainMapReady} />
+        <cartomap zoom="10" on:mapReady={onMainMapReady} on:mapMove={logEvent} on:mapStable={logEvent} on:mapIdle={logEvent} on:mapClicked={logEvent} on:mapInteraction={logEvent}/>
     </gridLayout>
 </page>

demo-svelte

@@ -1,43 +1,32 @@
 {
     "version": "1.8.11",
+    "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
     "packages": [
         "packages/*"
     ],
     "npmClient": "yarn",
     "useWorkspaces": true,
     "command": {
         "publish": {
-            "conventionalCommits": true,
-            "conventionalBlacklist": [
-                "chore"
-            ],
-            "changelogPreset": "angular",
-            "createRelease": "github",
-            "commitHooks": false,
-            "private": false,
-            "ignoreChanges": [
-                "*.md",
-                "docs/**"
-            ]
-        },
-        "version": {
-            "conventionalCommits": true,
-            "conventionalBlacklist": [
-                "chore"
-            ],
-            "changelogPreset": "angular",
-            "createRelease": "github",
-            "commitHooks": false,
-            "private": false,
-            "ignoreChanges": [
-                "*.md",
-                "docs/**"
-            ]
-        },
-        "bootstrap": {
-            "npmClientArgs": [
-                "--no-package-lock"
+            "cleanupTempFiles": true,
+            "removePackageFields": [
+                "devDependencies",
+                "scripts"
             ]
         }
-    }
+    },
+    "npmClientArgs": [
+        "--no-package-lock"
+    ],
+    "commitHooks": false,
+    "createRelease": "github",
+    "conventionalCommits": true,
+    "private": false,
+    "message": "chore(release): publish new version %v",
+    "changelogPreset": "conventional-changelog-conventionalcommits",
+    "ignoreChanges": [
+        "**/__fixtures__/**",
+        "**/__tests__/**",
+        "**/*.md"
+    ]
 }

demo-vue

@@ -22,7 +22,7 @@
         "demo.vue.ios": "cd ./demo-vue && ns run ios --no-hmr --env.watchNodeModules",
         "demo.vue.clean": "cd ./demo-vue && ns clean",
         "postinstall": "npm run setup",
-        "publish": "npm run setup && npm run clean && npm run build.all && npm run readme && npm run doc && npm run commit_readme_doc_changes ; lerna publish",
+        "publish": "npm run setup && npm run clean && npm run build.all && npm run readme && npm run doc && npm run commit_readme_doc_changes && lerna publish",
         "readme": "lerna run readme && node ./tools/readme.js",
         "setup": "npm run submodules && ts-patch install",
         "start": "./node_modules/.bin/ntl -A -s 15 -o",
@@ -31,7 +31,7 @@
         "update": "node ./tools/update.js",
         "fullclean": "npm run clean && rimraf 'packages/**/node_modules' 'demo-*/hooks' 'demo-*/node_modules' 'package-lock.json' 'pnpm-lock.yaml' 'node_modules'",
         "doc": "node tools/builddoc.mjs",
-        "commit_readme_doc_changes": "git add docs/** *.md ; git commit -m \"readme/doc\""
+        "commit_readme_doc_changes": "git add docs/** *.md ; git commit -m \"readme/doc\" ; echo \"commit readme doc done\""
     },
     "commitlint": {
         "extends": [
@@ -62,11 +62,6 @@
     },
     "workspaces": [
         "packages/*",
-        "demo-vue",
-        "demo-vue3",
-        "demo-ng",
-        "demo-svelte",
-        "demo-react",
-        "demo-snippets"
+        "demo*"
     ]
 }

lerna.json

@@ -45,7 +45,7 @@ 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 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() {
@@ -62,28 +62,29 @@ public void run() {
                         mainHandler.post(new Runnable() {
                             @Override
                             public void run() {
-                                callback.onRoutingResult(e, null);
+                                callback.onRoutingResult(e, null, null);
                             }
                         });
                     } else {
-                        callback.onRoutingResult(e, null);
+                        callback.onRoutingResult(e, null, null);
                     }
                     return;
                 }
 
                 final RoutingResult fRa = result;
+                final String fStrResult = stringify ? stringifyRoutingResult(result) : null;
                 if (AKMapView.RUN_ON_MAIN_THREAD) {
                     if (mainHandler == null) {
                         mainHandler = new Handler(android.os.Looper.getMainLooper());
                     }
                     mainHandler.post(new Runnable() {
                         @Override
                         public void run() {
-                            callback.onRoutingResult(null, fRa);
+                            callback.onRoutingResult(null, fRa, fStrResult);
                         }
                     });
                 } else {
-                    callback.onRoutingResult(null, fRa);
+                    callback.onRoutingResult(null, fRa, fStrResult);
                 }
 
             }

package.json

@@ -3,5 +3,5 @@
 import com.carto.routing.RoutingResult;
 
 public interface RoutingServiceRouteCallback {
-    void onRoutingResult(Exception e, RoutingResult result);
+    void onRoutingResult(Exception e, RoutingResult result, String strResult);
 }