proximiio-js-library 1.8.3 → 1.8.6

package/lib/components/map/main.js

@@ -332,12 +332,15 @@ var Map = /** @class */ (function () {
                         return [4 /*yield*/, this.onPlaceSelect(this.state.place, this.defaultOptions.zoomIntoPlace)];
                     case 5:
                         _c.sent();
-                        if (this.defaultOptions.initPolygons) {
-                            this.initPolygons();
+                        if (this.defaultOptions.useRasterTiles) {
+                            this.initRasterTiles();
                         }
                         if (this.defaultOptions.isKiosk) {
                             this.initKiosk();
                         }
+                        if (this.defaultOptions.initPolygons) {
+                            this.initPolygons();
+                        }
                         if (this.defaultOptions.useGpsLocation) {
                             this.initGeoLocation();
                         }
@@ -350,9 +353,6 @@ var Map = /** @class */ (function () {
                         if (this.defaultOptions.animatedRoute) {
                             this.initAnimatedRoute();
                         }
-                        if (this.defaultOptions.useRasterTiles) {
-                            this.initRasterTiles();
-                        }
                         this.initPersonsMap();
                         this.map.on('click', 'proximiio-pois-icons', function (ev) {
                             _this.onShopClick(ev);
@@ -364,6 +364,7 @@ var Map = /** @class */ (function () {
                         if (this.defaultOptions.handleUrlParams) {
                             this.initUrlParams();
                         }
+                        this.map.setStyle(this.state.style);
                         _c.label = 6;
                     case 6: return [2 /*return*/];
                 }
@@ -394,7 +395,6 @@ var Map = /** @class */ (function () {
                     },
                     filter: ['all', ['==', ['to-number', ['get', 'level']], this.state.floor.level]],
                 });
-                this.map.setStyle(this.state.style);
                 this.centerOnPoi(this.startPoint);
             }
         }
@@ -466,7 +466,6 @@ var Map = /** @class */ (function () {
                 },
                 filter: ['all', ['==', ['to-number', ['get', 'level']], this.state.floor.level]],
             });
-            this.map.setStyle(this.state.style);
         }
     };
     Map.prototype.initAnimatedRoute = function () {
@@ -490,7 +489,6 @@ var Map = /** @class */ (function () {
                 },
                 filter: ['all', ['==', ['to-number', ['get', 'level']], this.state.floor.level]],
             });
-            this.map.setStyle(this.state.style);
         }
     };
     Map.prototype.initRasterTiles = function () {
@@ -511,10 +509,9 @@ var Map = /** @class */ (function () {
                 source: 'raster-tiles',
                 minzoom: this.defaultOptions.rasterTilesOptions.minZoom ? this.defaultOptions.rasterTilesOptions.minZoom : 15,
                 maxzoom: this.defaultOptions.rasterTilesOptions.maxZoom ? this.defaultOptions.rasterTilesOptions.maxZoom : 22,
-            }, this.defaultOptions.rasterTilesOptions.maxZoom
+            }, this.defaultOptions.rasterTilesOptions.beforeLayer
                 ? this.defaultOptions.rasterTilesOptions.beforeLayer
                 : 'proximiio-shop');
-            this.map.setStyle(this.state.style);
         }
     };
     Map.prototype.initPolygons = function () {
@@ -526,7 +523,6 @@ var Map = /** @class */ (function () {
             this.state.style.addLayer(custom_layers_1.PolygonIconsLayer.json);
             custom_layers_1.PolygonTitlesLayer.setFilterLevel(this.state.floor.level);
             this.state.style.addLayer(custom_layers_1.PolygonTitlesLayer.json);
-            this.map.setStyle(this.state.style);
             this.map.on('click', 'shop-custom', function (e) {
                 _this.onShopClick(e);
             });
@@ -1058,44 +1054,41 @@ var Map = /** @class */ (function () {
         this.activePolygonsAmenity = amenityId;
     };
     Map.prototype.handlePoiVisibility = function () {
-        var _this = this;
         // proximiio-pois-icons, proximiio-pois-labels, 'pois-icons', 'pois-labels'
         var layers = ['proximiio-pois-icons', 'proximiio-pois-labels', 'pois-icons', 'pois-labels'];
         if (this.defaultOptions.initPolygons) {
             layers.push('poi-custom-icons', 'shop-labels');
         }
-        layers.forEach(function (layer) {
-            if (_this.map.getLayer(layer)) {
-                setTimeout(function () {
-                    var l = _this.map.getLayer(layer);
-                    var filters = __spreadArray([], l.filter);
-                    var visibilityFilter = filters.findIndex(function (f) { return f[1][1] === 'visibility'; });
-                    if (visibilityFilter !== -1) {
-                        // toggle pois visibility based on visibility param
-                        if (filters[visibilityFilter][0] === '!=') {
-                            // show all pois, the visibility params is not considered
-                            filters[visibilityFilter] = [
-                                'match',
-                                ['get', 'visibility'],
-                                ['visible', 'hidden', 'undefined'],
-                                true,
-                                false,
-                            ];
-                        }
-                        else {
-                            // hide pois with hidden visibility
-                            filters[visibilityFilter] = ['!=', ['get', 'visibility'], 'hidden'];
-                        }
-                    }
-                    else {
-                        // add visibility filter
-                        filters.push(['!=', ['get', 'visibility'], 'hidden']);
-                    }
-                    _this.state.style.getLayer(layer).filter = filters;
-                    _this.map.setFilter(layer, filters);
-                });
-            }
-        });
+        /*layers.forEach((layer) => {
+          if (this.map.getLayer(layer)) {
+            setTimeout(() => {
+              const l = this.map.getLayer(layer) as any;
+              const filters = [...l.filter];
+              const visibilityFilter = filters.findIndex((f) => f[1][1] === 'visibility');
+              if (visibilityFilter !== -1) {
+                // toggle pois visibility based on visibility param
+                if (filters[visibilityFilter][0] === '!=') {
+                  // show all pois, the visibility params is not considered
+                  filters[visibilityFilter] = [
+                    'match',
+                    ['get', 'visibility'],
+                    ['visible', 'hidden', 'undefined'],
+                    true,
+                    false,
+                  ];
+                } else {
+                  // hide pois with hidden visibility
+                  filters[visibilityFilter] = ['!=', ['get', 'visibility'], 'hidden'];
+                }
+              } else {
+                // add visibility filter
+                filters.push(['!=', ['get', 'visibility'], 'hidden']);
+              }
+              this.state.style.getLayer(layer).filter = filters;
+              this.map.setFilter(layer, filters);
+            });
+          }
+        });*/
         this.state.style.notify('filter-change');
     };
     Map.prototype.onToggleHiddenPois = function () {
@@ -1147,7 +1140,6 @@ var Map = /** @class */ (function () {
             type: 'FeatureCollection',
             features: personsCollection,
         };
-        this.map.setStyle(this.state.style);
         this.onPersonUpdateListener.next(this.state.persons);
     };
     Map.prototype.prepareStyle = function (style) {
@@ -1534,8 +1526,11 @@ var Map = /** @class */ (function () {
         var _this = this;
         if (this.routingSource.lines && this.routingSource.route) {
             var currentRouteIndex = this.routingSource.lines.findIndex(function (route) { return +route.properties.level === _this.state.floor.level; });
-            var currentRoute = this.routingSource.lines[currentRouteIndex];
-            var nextRouteIndex = way === 'up' ? currentRouteIndex + 1 : currentRouteIndex - 1;
+            var currentRoute_1 = this.routingSource.lines[currentRouteIndex];
+            var nextRouteIndex = this.routingSource.lines.findIndex(function (route) {
+                return +route.properties.level ===
+                    (way === 'up' ? currentRoute_1.properties.level + 1 : currentRoute_1.properties.level - 1);
+            });
             var nextRoute = this.routingSource.lines[nextRouteIndex];
             // return currentRouteIndex !== -1 && nextRoute ? +nextRoute.properties.level : way === 'up' ? this.state.floor.level + 1 : this.state.floor.level - 1;
             return nextRoute &&

package/lib/components/map/routing.js

@@ -43,12 +43,13 @@ var Routing = /** @class */ (function () {
         }
     };
     Routing.prototype.route = function (start, finish) {
-        var points = this.wayfinding.runAStar(start, finish).map(function (i) {
-            return new feature_1.default(i);
-        });
+        var points = this.wayfinding.runAStar(start, finish);
         if (!points) {
             return null;
         }
+        points = points.map(function (i) {
+            return new feature_1.default(i);
+        });
         var pathPoints = {};
         var pathPartIndex = 0;
         points.forEach(function (p, index) {

package/lib/components/map/sources/routing_source.js

@@ -79,13 +79,13 @@ var RoutingSource = /** @class */ (function (_super) {
                 if (start && finish) {
                     this.notify('loading-start');
                     route = this.routing.route(start, finish);
-                    paths = route.paths;
+                    paths = route === null || route === void 0 ? void 0 : route.paths;
                     // @ts-ignore
-                    this.route = route.paths;
+                    this.route = route === null || route === void 0 ? void 0 : route.paths;
                     // @ts-ignore
-                    this.points = route.points;
-                    this.levelPaths = route.levelPaths;
-                    this.levelPoints = route.levelPoints;
+                    this.points = route === null || route === void 0 ? void 0 : route.points;
+                    this.levelPaths = route === null || route === void 0 ? void 0 : route.levelPaths;
+                    this.levelPoints = route === null || route === void 0 ? void 0 : route.levelPoints;
                     if (paths) {
                         lines = [];
                         for (_i = 0, _a = Object.entries(paths); _i < _a.length; _i++) {

package/lib/models/style.d.ts

@@ -29,7 +29,7 @@ export default class StyleModel {
     getUniversalLayers(source: string): any[];
     getSyntheticLayers(): any[];
     usesPrefixes(): boolean;
-    addLayer(layer: any): void;
+    addLayer(layer: any, beforeLayer: string): void;
     getLayer(id: string): any;
     getLayerIndex(id: string): number;
     getLayers(sourceId: string): BaseLayer[];

package/lib/models/style.js

@@ -235,8 +235,13 @@ var StyleModel = /** @class */ (function () {
     StyleModel.prototype.usesPrefixes = function () {
         return typeof this.layers.find(function (layer) { return layer.id === 'proximiio-paths'; }) !== 'undefined';
     };
-    StyleModel.prototype.addLayer = function (layer) {
-        this.layers.push(layer);
+    StyleModel.prototype.addLayer = function (layer, beforeLayer) {
+        if (beforeLayer) {
+            this.layers.splice(this.getLayerIndex(beforeLayer) + 1, 0, layer);
+        }
+        else {
+            this.layers.push(layer);
+        }
     };
     StyleModel.prototype.getLayer = function (id) {
         return this.layers.find(function (layer) { return layer.id === id; });