proximiio-js-library 1.11.21 → 1.11.23

package/lib/common.d.ts

@@ -6,3 +6,4 @@ export declare const getImageFromBase64: (encoded: string) => Promise<HTMLImageE
 export declare const getBase64FromImage: (file: File) => Promise<string>;
 export declare const uuidv4: () => any;
 export declare const getNestedObjectValue: (nestedObject: any, dynamicKey: any) => any;
+export declare const removeNonNumeric: (uuid: string) => string;

package/lib/common.js

@@ -1,7 +1,6 @@
 import Axios from 'axios';
 export const axios = Axios.create({
     baseURL: 'https://api.proximi.fi',
-    timeout: 60000,
 });
 export const camelToKebab = (input) => input.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
 export const kebabToCamel = (input) => input.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
@@ -58,3 +57,37 @@ export const getNestedObjectValue = (nestedObject, dynamicKey) => {
     // Get the value of the remaining keys in the nested object.
     return getNestedObjectValue(value, remainingKeys);
 };
+// Function to remove non-numeric characters
+export const removeNonNumeric = (uuid) => {
+    // Remove hyphens from the UUID
+    uuid = uuid.replace(/[^0-9.]/g, '');
+    // Initialize the result string
+    let result = '';
+    // Variable to track whether we are capturing the first or last number
+    let captureFirst = true;
+    // Index for capturing the first number
+    let firstIndex = 0;
+    // Index for capturing the last number
+    let lastIndex = uuid.length - 1;
+    // Loop until we have enough digits or run out of digits in the UUID
+    while (result.length < 10 && firstIndex <= lastIndex) {
+        // If we're capturing the first number
+        if (captureFirst) {
+            // Add the first numerical digit to the result
+            result += uuid[firstIndex];
+            // Move to the next digit for the next iteration
+            firstIndex++;
+        }
+        else {
+            // Add the last numerical digit to the result
+            result += uuid[lastIndex];
+            // Move to the previous digit for the next iteration
+            lastIndex--;
+        }
+        // Toggle between capturing first and last numbers
+        captureFirst = !captureFirst;
+    }
+    // Truncate the result to fit within 10 bytes
+    result = result.slice(0, 10);
+    return result;
+};

package/lib/components/map/main.js

@@ -635,7 +635,7 @@ export class Map {
                 });
                 const levelChangers = features.features.filter((f) => f.properties.type === 'elevator' || f.properties.type === 'escalator' || f.properties.type === 'staircase');
                 this.state = Object.assign(Object.assign({}, this.state), { features, allFeatures: new FeatureCollection(features), levelChangers: new FeatureCollection({ features: levelChangers }) });
-                this.geojsonSource.fetch(this.state.features);
+                // this.geojsonSource.fetch(this.state.features);
                 this.onFeaturesChange();
             }
         });
@@ -2220,7 +2220,10 @@ export class Map {
             this.defaultOptions.kioskSettings.showLabel &&
             this.map.getLayer('my-location-layer')) {
             this.map.setLayoutProperty('my-location-layer', 'text-field', translations[this.defaultOptions.language].YOU_ARE_HERE);
+            const styleLayer = this.state.style.layers.find((layer) => layer.id === 'my-location-layer');
+            styleLayer.layout['text-field'] = translations[this.defaultOptions.language].YOU_ARE_HERE;
         }
+        this.state.style.setSource('main', this.geojsonSource);
     }
     getClosestFeature(amenityId, fromFeature) {
         let sameLevelfeatures = this.state.allFeatures.features.filter((i) => i.properties.amenity === amenityId &&

package/lib/controllers/geo.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { axios, getNestedObjectValue } from '../common';
+import { axios, getNestedObjectValue, removeNonNumeric } from '../common';
 import Feature, { FeatureCollection } from '../models/feature';
 import { AmenityModel } from '../models/amenity';
 import { globalState } from '../components/map/main';
@@ -119,7 +119,7 @@ export const getFeatures = ({ initPolygons, polygonFeatureTypes, autoLabelLines,
                         connectedPolygon.properties._dynamic.poi_id = feature.properties.id;
                         connectedPolygon.properties._dynamic.amenity = feature.properties.amenity;
                         // id have to be changed to numeric type so feature state will work
-                        connectedPolygon.id = JSON.stringify(key);
+                        connectedPolygon.id = removeNonNumeric(connectedPolygon.id);
                         // check if feature is inside a polygon
                         labelLineFeatures.forEach((line) => {
                             var _a, _b;
@@ -131,7 +131,7 @@ export const getFeatures = ({ initPolygons, polygonFeatureTypes, autoLabelLines,
                         });
                         if (connectedLabelLine) {
                             // id have to be changed to numeric type so feature state will work
-                            connectedLabelLine.id = JSON.stringify(key + 9999 + index);
+                            connectedLabelLine.id = removeNonNumeric(connectedLabelLine.id);
                             feature.properties._dynamic.label_id = connectedLabelLine.id;
                             connectedPolygon.properties._dynamic.label_id = connectedLabelLine.id;
                             connectedLabelLine.properties._dynamic = connectedLabelLine.properties._dynamic
@@ -162,8 +162,8 @@ export const getFeatures = ({ initPolygons, polygonFeatureTypes, autoLabelLines,
                                         coordinates: parsedLabelLine,
                                         type: 'LineString',
                                     };
-                                    labelLineFeature.properties.id = JSON.stringify(key + 9999 + index);
-                                    labelLineFeature.id = JSON.stringify(key + 9999 + index);
+                                    labelLineFeature.properties.id = `${removeNonNumeric(connectedPolygon.id)}9999`;
+                                    labelLineFeature.id = `${removeNonNumeric(connectedPolygon.id)}9999`;
                                     labelLineFeature.properties.type = `${featureType}-label`;
                                     labelLineFeature.properties._dynamic.type = `${featureType}-label`;
                                     labelLineFeature.properties._dynamic.length = Math.ceil(length(labelLineFeature) * 1000);
@@ -221,8 +221,8 @@ export const getFeatures = ({ initPolygons, polygonFeatureTypes, autoLabelLines,
                                     console.error('No longest border found.');
                                 }
                                 // labelBorder.properties = { ...labelBorder.properties, ...feature.properties };
-                                labelBorder.properties.id = JSON.stringify(key + 9999 + index);
-                                labelBorder.id = JSON.stringify(key + 9999 + index);
+                                labelBorder.properties.id = `${removeNonNumeric(connectedPolygon.id)}9999`;
+                                labelBorder.id = `${removeNonNumeric(connectedPolygon.id)}9999`;
                                 labelBorder.properties.type = `${featureType}-label`;
                                 labelBorder.properties._dynamic.type = `${featureType}-label`;
                                 connectedPolygon.properties._dynamic.label_id = labelBorder.properties.id;