@dartcom/ui-kit 10.2.16 → 10.2.18

package/dist/components/layers/leaflet/layers/link/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../src/components/layers/leaflet/layers/link/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,WAAW,CAAC;AA2BnB,eAAO,MAAM,aAAa,GAAI,QAAQ,kBAAkB,yBAqKvD,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../src/components/layers/leaflet/layers/link/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,WAAW,CAAC;AAsInB,eAAO,MAAM,aAAa,GAAI,QAAQ,kBAAkB,yBA0JvD,CAAC"}

package/dist/components/layers/leaflet/leaflet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leaflet.d.ts","sourceRoot":"","sources":["../../../../src/components/layers/leaflet/leaflet.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,kBAAkB,EAAsB,MAAM,OAAO,CAAC;AAE/D,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B,CAAC;AAEF,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAgB7C,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"leaflet.d.ts","sourceRoot":"","sources":["../../../../src/components/layers/leaflet/leaflet.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,kBAAkB,EAAsB,MAAM,OAAO,CAAC;AAE/D,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B,CAAC;AAEF,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAc7C,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/components/layers/leaflet/lib/hooks/useGetLeafletLayer.d.ts

@@ -1,8 +1,10 @@
 import { Nullable } from '../../../../../lib/types';
 import { SourceLayerEventHandlers, TangramCustomLayer, TangramEventConfig, TangramLeafletLayer, TangramScene, TangramSourceConfig, TangramSourceNames } from '../types';
-export declare const useGetLeafletLayer: ({ eventHandlers, }: {
+type UseGetLeafletLayerProps = {
     eventHandlers?: SourceLayerEventHandlers;
-}) => {
+    defaultLayers?: TangramCustomLayer[];
+};
+export declare const useGetLeafletLayer: ({ eventHandlers, defaultLayers, }: UseGetLeafletLayerProps) => {
     layer: Nullable<TangramLeafletLayer>;
     scene: TangramScene | null;
     config: Nullable<TangramEventConfig>;
@@ -25,4 +27,5 @@ export declare const useGetLeafletLayer: ({ eventHandlers, }: {
     getLayers: () => string[];
     removeLayers: () => void;
 };
+export {};
 //# sourceMappingURL=useGetLeafletLayer.d.ts.map

package/dist/components/layers/leaflet/lib/hooks/useGetLeafletLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGetLeafletLayer.d.ts","sourceRoot":"","sources":["../../../../../../src/components/layers/leaflet/lib/hooks/useGetLeafletLayer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMvC,OAAO,EAEL,wBAAwB,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAKlB,eAAO,MAAM,kBAAkB,GAAI,oBAEhC;IACD,aAAa,CAAC,EAAE,wBAAwB,CAAC;CAC1C;;;;4BAyGgB,kBAAkB;4BA0BlB,mBAAmB,CAAC,MAAM,CAAC;+BAa1B,mBAAmB,CAAC,MAAM,CAAC,UAC/B,mBAAmB,CAAC,KAAK,CAAC;+BAWvB,kBAAkB;sBASvB,kBAAkB;yBAyClB,kBAAkB;gCAaR;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;gCAWzC,kBAAkB;gDAgBL;QAAE,KAAK,EAAE,kBAAkB,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE;;;;CAqHvE,CAAC"}
+{"version":3,"file":"useGetLeafletLayer.d.ts","sourceRoot":"","sources":["../../../../../../src/components/layers/leaflet/lib/hooks/useGetLeafletLayer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMvC,OAAO,EAEL,wBAAwB,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAKlB,KAAK,uBAAuB,GAAG;IAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,aAAa,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,mCAGhC,uBAAuB;;;;4BAyGT,kBAAkB;4BA0BlB,mBAAmB,CAAC,MAAM,CAAC;+BAa1B,mBAAmB,CAAC,MAAM,CAAC,UAC/B,mBAAmB,CAAC,KAAK,CAAC;+BAWvB,kBAAkB;sBASvB,kBAAkB;yBAyClB,kBAAkB;gCAaR;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;gCAWzC,kBAAkB;gDAgBL;QAAE,KAAK,EAAE,kBAAkB,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE;;;;CA2HvE,CAAC"}

package/dist/configs/global/global.d.ts

@@ -1,22 +1,21 @@
-import { ApiService } from '../../services/api';
+import { ApiConfig, ApiService } from '../../services/api';
 import { BackendError, ResponseData } from './types';
 export interface ConfigOptions {
-    apiKey: string;
-    backendUrl: string;
+    private_key: string;
     onCheck?: (data: ResponseData) => void;
     onError?: (error: BackendError) => void;
+    apiConfig: ApiConfig;
 }
 export declare class GlobalConfig {
     private readonly configOptions;
-    private _apiService;
-    get apiService(): ApiService;
+    private readonly _private_key;
+    private readonly _apiService;
     private static _instance;
     static get instance(): GlobalConfig;
     static initialize(options: ConfigOptions): void;
     static deactivate(): void;
     constructor(configOptions: ConfigOptions);
-    private _apiKey;
-    get apiKey(): string;
+    get apiService(): ApiService;
     private _isValidApiKey;
     get isValidApiKey(): boolean;
     private _getCheckKeyData;

package/dist/configs/global/global.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../../src/configs/global/global.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAoB,MAAM,gBAAgB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAErD,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;CACzC;AAED,qBAAa,YAAY;IAyBX,OAAO,CAAC,QAAQ,CAAC,aAAa;IAxB1C,OAAO,CAAC,WAAW,CAAa;IAChC,IAAW,UAAU,eAEpB;IAED,OAAO,CAAC,MAAM,CAAC,SAAS,CAAgC;IACxD,WAAkB,QAAQ,iBAQzB;WACa,UAAU,CAAC,OAAO,EAAE,aAAa;WAKjC,UAAU;gBAIK,aAAa,EAAE,aAAa;IAezD,OAAO,CAAC,OAAO,CAAM;IACrB,IAAW,MAAM,WAEhB;IAED,OAAO,CAAC,cAAc,CAAS;IAC/B,IAAW,aAAa,YAEvB;YAEa,gBAAgB;CAgC/B"}
+{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../../src/configs/global/global.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAErD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IAExC,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,qBAAa,YAAY;IAuBX,OAAO,CAAC,QAAQ,CAAC,aAAa;IAtB1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IAEzC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAgC;IACxD,WAAkB,QAAQ,iBAQzB;WACa,UAAU,CAAC,OAAO,EAAE,aAAa;WAKjC,UAAU;gBAIK,aAAa,EAAE,aAAa;IAoBzD,IAAW,UAAU,eAEpB;IAED,OAAO,CAAC,cAAc,CAAS;IAC/B,IAAW,aAAa,YAEvB;YAEa,gBAAgB;CAgC/B"}

package/dist/index.cjs

@@ -7492,10 +7492,13 @@ const DartcomMobxProvider = ({ children, }) => {
 };
 
 class ApiService {
+    config;
     client;
-    constructor(baseURL) {
+    constructor(config) {
+        this.config = config;
         this.client = axios.create({
-            baseURL,
+            baseURL: config?.baseURL,
+            withCredentials: config?.withCredentials,
             timeout: 10000,
             headers: {
                 'Content-Type': 'application/json',
@@ -7507,6 +7510,12 @@ class ApiService {
         // Interceptor для запросов
         this.client.interceptors.request.use((config) => {
             rootStore.authStore.isUnauthorized = false;
+            const headers = this.config?.getHeaders?.();
+            if (headers) {
+                Object.entries(headers).forEach(([key, value]) => {
+                    config.headers[key] = value;
+                });
+            }
             return config;
         }, (error) => {
             showSnackbar({
@@ -7549,17 +7558,10 @@ class ApiService {
     }
 }
 
-const createApiService = (baseURL) => {
-    const apiService = new ApiService(baseURL);
-    return apiService;
-};
-
 class GlobalConfig {
     configOptions;
+    _private_key;
     _apiService;
-    get apiService() {
-        return this._apiService;
-    }
     static _instance = null;
     static get instance() {
         if (!GlobalConfig._instance) {
@@ -7577,8 +7579,10 @@ class GlobalConfig {
     }
     constructor(configOptions) {
         this.configOptions = configOptions;
-        this._apiKey = configOptions.apiKey;
-        this._apiService = createApiService(configOptions.backendUrl);
+        const { private_key, apiConfig } = configOptions;
+        this._private_key = private_key;
+        const apiService = new ApiService(apiConfig);
+        this._apiService = apiService;
         this._getCheckKeyData().then((data) => {
             if (data) {
                 const { valid } = data;
@@ -7587,21 +7591,20 @@ class GlobalConfig {
             }
         });
     }
-    _apiKey = '';
-    get apiKey() {
-        return this._apiKey;
+    get apiService() {
+        return this._apiService;
     }
     _isValidApiKey = false;
     get isValidApiKey() {
         return this._isValidApiKey;
     }
     async _getCheckKeyData() {
-        const checkKeyData = await this._apiService
+        const checkKeyData = await this.apiService
             .get({
             url: 'check_tile_token',
             config: {
                 params: {
-                    tile_token: this._apiKey,
+                    tile_token: this._private_key,
                 },
             },
         })
@@ -25661,11 +25664,87 @@ const functionalClassAccessId32Config = {
     },
 };
 
-const getFilter = (zLvl) => {
+const getFilters = ({ source, zLvl, functionClass, }) => {
+    switch (source) {
+        case exports.TangramSourceNames.MSK: {
+            return {
+                base: {
+                    default: `function() {
+            const { functional_class, z_lvl = '0.0', tollway } = feature;
+
+            const isFilter = $zoom <= ${generalizationZoom} && z_lvl === '${zLvl}' && +functional_class === ${functionClass} && tollway === false;
+
+            return isFilter;
+          }`,
+                    tollway: `function() {
+            const { functional_class, z_lvl = '0.0', tollway } = feature;
+
+            const isFilter = $zoom <= ${generalizationZoom} && z_lvl === '${zLvl}' && +functional_class === ${functionClass} && tollway === true;
+
+            return isFilter;
+          }`,
+                },
+                border: {
+                    default: `function() {
+            const { functional_class, z_lvl = '0.0', tollway } = feature;
+
+            const isFilter = $zoom <= ${generalizationZoom} && tollway === false && z_lvl === '${zLvl}' && +functional_class === ${functionClass} && !global.links.getIsConstruction(feature) && !global.links.getIsFunctionalClass(feature);
+
+            return isFilter;
+          }`,
+                    tollway: `function() {
+            const { functional_class, z_lvl = '0.0', tollway } = feature;
+
+            const isFilter = $zoom <= ${generalizationZoom} && tollway === true && z_lvl === '${zLvl}' && +functional_class === ${functionClass} && !global.links.getIsConstruction(feature) && !global.links.getIsFunctionalClass(feature);
+
+            return isFilter;
+          }`,
+                },
+            };
+        }
+        default: {
+            return {
+                base: {
+                    default: `function() {
+            const { functional_class, z_lvl = '0.0', tollway } = feature;
+
+            const isFilter = z_lvl === '${zLvl}' && +functional_class === ${functionClass} && tollway === false;
+
+            return isFilter;
+          }`,
+                    tollway: `function() {
+            const { functional_class, z_lvl = '0.0', tollway } = feature;
+
+            const isFilter = z_lvl === '${zLvl}' && +functional_class === ${functionClass} && tollway === true;
+
+            return isFilter;
+          }`,
+                },
+                border: {
+                    default: `function() {
+            const { functional_class, z_lvl = '0.0', tollway } = feature;
+
+            const isFilter = tollway === false && z_lvl === '${zLvl}' && +functional_class === ${functionClass} && !global.links.getIsConstruction(feature) && !global.links.getIsFunctionalClass(feature);
+
+            return isFilter;
+          }`,
+                    tollway: `function() {
+            const { functional_class, z_lvl = '0.0', tollway } = feature;
+
+            const isFilter = tollway === true && z_lvl === '${zLvl}' && +functional_class === ${functionClass} && !global.links.getIsConstruction(feature) && !global.links.getIsFunctionalClass(feature);
+
+            return isFilter;
+          }`,
+                },
+            };
+        }
+    }
+};
+const getGeneralizationFilter = ({ zLvl, functionClass, }) => {
     const filter = `function() {
-    const { z_lvl = '0.0' } = feature;
+    const { functional_class, z_lvl = '0.0', tollway } = feature;
 
-    const isFilter = z_lvl === '${zLvl}' && $zoom <= ${generalizationZoom};
+    const isFilter = $zoom > ${generalizationZoom} && z_lvl === '${zLvl}' && +functional_class === ${functionClass};
 
     return isFilter;
   }`;
@@ -25686,110 +25765,98 @@ const getLinkLayers = (source) => {
     zLvlOrders.forEach((zLvl) => {
         const baseLayers = [];
         const borderLayers = [];
-        switch (zLvl) {
-            case '0.0': {
-                functionInterval.forEach((functionClasses) => {
-                    const classBaseLayers = [];
-                    const classBorderLayers = [];
-                    functionClasses.forEach((functionClass) => {
-                        const baseLayer = {
-                            id: getUniqueKey(),
-                            data,
-                            filter: `function() {
-                const { functional_class, z_lvl = '0.0' } = feature;
-
-                const isFilter = z_lvl === '${zLvl}' && +functional_class === ${functionClass} && $zoom <= ${generalizationZoom};
-
-                return isFilter;
-              }`,
-                            draw: baseLayerDraw,
-                            sublayers: {
-                                construction: {
-                                    ...constructionConfig,
-                                },
-                                functionalClassAccessId32: {
-                                    ...functionalClassAccessId32Config,
-                                },
-                                lowMobility: {
-                                    ...lowMobilityConfig,
-                                },
-                            },
-                        };
-                        const generalizationLayer = {
-                            id: getUniqueKey(),
-                            data,
-                            filter: `function() {
-                const { functional_class, z_lvl = '0.0' } = feature;
-
-                const isFilter = z_lvl === '${zLvl}' && +functional_class === ${functionClass} && $zoom > ${generalizationZoom};
-
-                return isFilter;
-              }`,
-                            draw: generalizationBaseLayerDraw,
-                            sublayers: {
-                                functionalClassAccessId32: {
-                                    ...functionalClassAccessId32Config,
-                                },
-                            },
-                        };
-                        const borderLayer = {
-                            id: getUniqueKey(),
-                            data,
-                            filter: `function() {
-                const { functional_class, z_lvl = '0.0' } = feature;
-
-                const isFilter = z_lvl === '${zLvl}' && +functional_class === ${functionClass} && !global.links.getIsConstruction(feature) && !global.links.getIsFunctionalClass(feature) && $zoom <= ${generalizationZoom};
-
-
-                return isFilter;
-              }`,
-                            draw: borderLayerDraw,
-                            sublayers: {
-                                lowMobility: {
-                                    ...lowMobilityConfig,
-                                },
-                            },
-                        };
-                        classBaseLayers.push(generalizationLayer);
-                        classBaseLayers.push(baseLayer);
-                        classBorderLayers.push(borderLayer);
-                    });
-                    baseLayers.push(...classBaseLayers);
-                    borderLayers.push(...classBorderLayers);
+        functionInterval.forEach((functionClasses) => {
+            const classBaseLayers = [];
+            const classBorderLayers = [];
+            functionClasses.forEach((functionClass) => {
+                const filters = getFilters({
+                    source,
+                    zLvl,
+                    functionClass,
                 });
-                break;
-            }
-            default: {
-                const filter = getFilter(zLvl);
-                const baseLayer = {
+                const generalizationFilter = getGeneralizationFilter({
+                    zLvl,
+                    functionClass,
+                });
+                const defaultBaseLayer = {
+                    id: getUniqueKey(),
+                    data,
+                    filter: filters.base.default,
+                    draw: baseLayerDraw,
+                    sublayers: {
+                        construction: {
+                            ...constructionConfig,
+                        },
+                        functionalClassAccessId32: {
+                            ...functionalClassAccessId32Config,
+                        },
+                        lowMobility: {
+                            ...lowMobilityConfig,
+                        },
+                    },
+                };
+                const toolBaseLayer = {
                     id: getUniqueKey(),
                     data,
-                    filter,
+                    filter: filters.base.tollway,
                     draw: baseLayerDraw,
+                    sublayers: {
+                        construction: {
+                            ...constructionConfig,
+                        },
+                        functionalClassAccessId32: {
+                            ...functionalClassAccessId32Config,
+                        },
+                        lowMobility: {
+                            ...lowMobilityConfig,
+                        },
+                    },
                 };
                 const generalizationLayer = {
                     id: getUniqueKey(),
                     data,
-                    filter: `function() {
-            const { z_lvl = '0.0' } = feature;
-
-            const isFilter = z_lvl === '${zLvl}' && $zoom > ${generalizationZoom};
-
-            return isFilter;
-          }`,
+                    filter: generalizationFilter,
                     draw: generalizationBaseLayerDraw,
+                    sublayers: {
+                        functionalClassAccessId32: {
+                            ...functionalClassAccessId32Config,
+                        },
+                    },
                 };
-                const borderLayer = {
+                const defaultBorderLayer = {
                     id: getUniqueKey(),
                     data,
-                    filter,
+                    filter: filters.border.default,
                     draw: borderLayerDraw,
+                    sublayers: {
+                        lowMobility: {
+                            ...lowMobilityConfig,
+                        },
+                    },
                 };
-                baseLayers.push(baseLayer);
-                borderLayers.push(borderLayer);
-                baseLayers.push(generalizationLayer);
-            }
-        }
+                const toolBorderLayer = {
+                    id: getUniqueKey(),
+                    data,
+                    filter: filters.border.tollway,
+                    draw: borderLayerDraw,
+                    sublayers: {
+                        lowMobility: {
+                            ...lowMobilityConfig,
+                        },
+                    },
+                };
+                switch (source) {
+                    case exports.TangramSourceNames.MSK: {
+                        classBaseLayers.push(generalizationLayer);
+                        break;
+                    }
+                }
+                classBaseLayers.push(defaultBaseLayer, toolBaseLayer);
+                classBorderLayers.push(defaultBorderLayer, toolBorderLayer);
+            });
+            baseLayers.push(...classBaseLayers);
+            borderLayers.push(...classBorderLayers);
+        });
         layers.push(...borderLayers, ...baseLayers);
     });
     return layers;
@@ -28800,7 +28867,7 @@ const getLayerModalsNames = (layer) => {
     return layerModalsNames;
 };
 
-const useGetLeafletLayer = ({ eventHandlers, }) => {
+const useGetLeafletLayer = ({ eventHandlers, defaultLayers, }) => {
     const [layer, setLayer] = React__namespace.useState(null);
     const [config, setConfig] = React__namespace.useState(null);
     const scene = React__namespace.useMemo(() => {
@@ -29038,6 +29105,11 @@ const useGetLeafletLayer = ({ eventHandlers, }) => {
         });
         Object.values(exports.TangramSourceNames).forEach(addSource);
     }, [addStyle, addSource]);
+    React__namespace.useEffect(() => {
+        if (defaultLayers) {
+            defaultLayers.map(addLayer);
+        }
+    }, [defaultLayers, addLayer]);
     return {
         layer,
         scene,
@@ -29071,16 +29143,15 @@ function useMap() {
 }
 
 const LeafletLayer = ({ layers }) => {
-    const { layer, addLayer } = useGetLeafletLayer({});
+    const { layer } = useGetLeafletLayer({
+        defaultLayers: layers,
+    });
     const map = useMap();
     React__namespace.useEffect(() => {
         if (layer) {
             map.addLayer(layer);
         }
     }, [layer]);
-    React__namespace.useEffect(() => {
-        layers.map(addLayer);
-    }, [addLayer, layers]);
     return null;
 };
 
@@ -31769,7 +31840,6 @@ exports.authStore = authStore;
 exports.cameraConfig = cameraConfig;
 exports.catIds = catIds;
 exports.copyInformation = copyInformation;
-exports.createApiService = createApiService;
 exports.dateRequiredSchema = dateRequiredSchema;
 exports.dateSchema = dateSchema;
 exports.encodeString = encodeString;