@evergis/react 3.1.103 → 3.1.104
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +2 -23
- package/dist/index.js.map +1 -1
- package/dist/react.esm.js +2 -23
- package/dist/react.esm.js.map +1 -1
- package/package.json +4 -4
package/dist/react.esm.js
CHANGED
|
@@ -11484,29 +11484,8 @@ const VectorLayer = ({ layer, tileUrl, visible, beforeId, getLayerTempStyle, fil
|
|
|
11484
11484
|
getLayerTempStyle,
|
|
11485
11485
|
]);
|
|
11486
11486
|
const renderClientStyle = useCallback(() => {
|
|
11487
|
-
// Счётчик для генерации уникальных ID при дубликатах типов без явного id
|
|
11488
|
-
const typeCounters = {};
|
|
11489
11487
|
return clientStyle.items.map((mockItem, index) => {
|
|
11490
11488
|
const [prefix, suffix] = getClientStyleItemPrefixSuffix(geometryType, mockItem.type);
|
|
11491
|
-
// Считаем вхождения типа для автогенерации ID дубликатов
|
|
11492
|
-
const typeKey = `${mockItem.type}${suffix}`;
|
|
11493
|
-
const typeIndex = typeCounters[typeKey] ?? 0;
|
|
11494
|
-
typeCounters[typeKey] = typeIndex + 1;
|
|
11495
|
-
// Генерация ID:
|
|
11496
|
-
// 1. Если указан явный id → layer.name-{id}
|
|
11497
|
-
// 2. Если первый слой типа → стандартный ID (layer.name или layer.name-suffix)
|
|
11498
|
-
// 3. Если дубликат типа без id → layer.name-suffix-{index}
|
|
11499
|
-
let layerId;
|
|
11500
|
-
if (mockItem.id) {
|
|
11501
|
-
layerId = `${layer.name}-${mockItem.id}`;
|
|
11502
|
-
}
|
|
11503
|
-
else if (typeIndex === 0) {
|
|
11504
|
-
layerId = suffix ? `${layer.name}${suffix}` : layer.name;
|
|
11505
|
-
}
|
|
11506
|
-
else {
|
|
11507
|
-
layerId = `${layer.name}${suffix || `-${mockItem.type}`}-${typeIndex + 1}`;
|
|
11508
|
-
}
|
|
11509
|
-
const layerKey = `${prefix}${layer.name}-${index}`;
|
|
11510
11489
|
const isExtrusionItem = mockItem.type === "fill-extrusion";
|
|
11511
11490
|
const isPolygonPart = clientStyle.items.some(item => item.type === "fill-extrusion") &&
|
|
11512
11491
|
(mockItem.type === "fill" || mockItem.type === "line");
|
|
@@ -11528,14 +11507,14 @@ const VectorLayer = ({ layer, tileUrl, visible, beforeId, getLayerTempStyle, fil
|
|
|
11528
11507
|
(isPolygonPart && (!hasExtrusion || (currentSettings?.fill?.showBottomSurface ?? true))))
|
|
11529
11508
|
? "visible"
|
|
11530
11509
|
: "none";
|
|
11531
|
-
return (jsx(Layer$1, { id:
|
|
11510
|
+
return (jsx(Layer$1, { id: `${layer.name}${suffix}`, type: mockItem.type, "source-layer": "default", beforeId: beforeId, ...(mockItem.filter && { filter: mockItem.filter }), minzoom: mockItem.minzoom ?? clientStyle?.minzoom ?? 0, maxzoom: mockItem.maxzoom ?? clientStyle?.maxzoom ?? 23, layout: {
|
|
11532
11511
|
...mockItem.layout,
|
|
11533
11512
|
...getLayerTempStyle?.(layer.name, mockItem.type)?.layout,
|
|
11534
11513
|
visibility,
|
|
11535
11514
|
}, paint: {
|
|
11536
11515
|
...mockItem.paint,
|
|
11537
11516
|
...getLayerTempStyle?.(layer.name, mockItem.type)?.paint,
|
|
11538
|
-
} },
|
|
11517
|
+
} }, `${prefix}${layer.name}-${index}`));
|
|
11539
11518
|
});
|
|
11540
11519
|
}, [
|
|
11541
11520
|
beforeId,
|