@dartcom/ui-kit 10.2.31 → 10.2.32

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.
@@ -1 +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,EAAE,MAAM,OAAO,CAAC;AAK3C,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B,CAAC;AAEF,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAuC7C,CAAC;AAEF,eAAe,YAAY,CAAC"}
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,EAAE,MAAM,OAAO,CAAC;AAK3C,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B,CAAC;AAEF,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA0C7C,CAAC;AAEF,eAAe,YAAY,CAAC"}
@@ -3,19 +3,29 @@ import { ConfigSource, SourceLayerEventHandlers, TangramCustomLayer, TangramEven
3
3
  type UseGetLeafletLayerProps = {
4
4
  eventHandlers?: SourceLayerEventHandlers;
5
5
  defaultLayers?: TangramCustomLayer[];
6
- onCreate: (props: {
6
+ onCreate?: (props: {
7
7
  layer: TangramLeafletLayer;
8
8
  }) => void;
9
- onDelete: (props: {
9
+ onDestroy?: (props: {
10
+ layer: TangramLeafletLayer;
11
+ }) => void;
12
+ onAdd?: (props: {
13
+ layer: TangramLeafletLayer;
14
+ }) => void;
15
+ onLoad?: (props: {
16
+ layer: TangramLeafletLayer;
17
+ }) => void;
18
+ onRemove?: (props: {
10
19
  layer: TangramLeafletLayer;
11
20
  }) => void;
12
21
  };
13
22
  export declare class TangramLayer {
14
23
  private readonly props;
15
24
  constructor(props: UseGetLeafletLayerProps);
25
+ private _initLayer;
16
26
  private _createLayer;
17
27
  private _addHandlers;
18
- removeLayer(): void;
28
+ destroy(): void;
19
29
  private _init;
20
30
  private _layer;
21
31
  get layer(): Nullable<TangramLeafletLayer>;
@@ -1 +1 @@
1
- {"version":3,"file":"tangram-layer.d.ts","sourceRoot":"","sources":["../../../../../src/components/layers/leaflet/services/tangram-layer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EACL,YAAY,EAGZ,wBAAwB,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,QAAQ,CAAC;AAKhB,KAAK,uBAAuB,GAAG;IAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,aAAa,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAErC,QAAQ,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,mBAAmB,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,mBAAmB,CAAA;KAAE,KAAK,IAAI,CAAC;CAC3D,CAAC;AAEF,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,uBAAuB;IA0B3D,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,YAAY;IA0Cb,WAAW;IAUlB,OAAO,CAAC,KAAK;IAoDb,OAAO,CAAC,MAAM,CAAuC;IACrD,IAAW,KAAK,kCAEf;IACD,OAAO,KAAK,KAAK,QAEhB;IAED,OAAO,CAAC,OAAO,CAAsC;IACrD,IAAW,MAAM,iCAEhB;IACD,OAAO,KAAK,MAAM,QAEjB;IAED,OAAO,CAAC,QAAQ,CAAS;IACzB,IAAW,OAAO,YAEjB;IACD,OAAO,KAAK,OAAO,QAElB;IAED,IAAW,KAAK,qCAMf;IAEM,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAQzD,SAAS,CAAC,UAAU,EAAE,kBAAkB;IAaxC,YAAY,CAAC,UAAU,EAAE,kBAAkB;IAO3C,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC,MAAM,CAAC;IASjD,YAAY,CACjB,UAAU,EAAE,mBAAmB,CAAC,MAAM,CAAC,EACvC,MAAM,EAAE,mBAAmB,CAAC,KAAK,CAAC;IAQ7B,YAAY,CAAC,UAAU,EAAE,kBAAkB;IAM3C,QAAQ,CAAC,KAAK,EAAE,kBAAkB;IAsClC,YAAY;IASZ,WAAW,CAAC,KAAK,EAAE,kBAAkB;IASrC,SAAS;IAUT,kBAAkB,CAAC,KAAK,EAAE,kBAAkB;IAa5C,qBAAqB,CAAC,EAC3B,KAAK,EACL,OAAO,GACR,EAAE;QACD,KAAK,EAAE,kBAAkB,CAAC;QAC1B,OAAO,EAAE,OAAO,CAAC;KAClB;CASF"}
1
+ {"version":3,"file":"tangram-layer.d.ts","sourceRoot":"","sources":["../../../../../src/components/layers/leaflet/services/tangram-layer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EACL,YAAY,EAGZ,wBAAwB,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,QAAQ,CAAC;AAKhB,KAAK,uBAAuB,GAAG;IAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,aAAa,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAErC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,mBAAmB,CAAA;KAAE,KAAK,IAAI,CAAC;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,mBAAmB,CAAA;KAAE,KAAK,IAAI,CAAC;IAC5D,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,mBAAmB,CAAA;KAAE,KAAK,IAAI,CAAC;IACxD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,mBAAmB,CAAA;KAAE,KAAK,IAAI,CAAC;IACzD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,mBAAmB,CAAA;KAAE,KAAK,IAAI,CAAC;CAC5D,CAAC;AAEF,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,uBAAuB;IAI3D,OAAO,CAAC,UAAU;IA0BlB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,YAAY;IA0Db,OAAO;IAcd,OAAO,CAAC,KAAK;IAoDb,OAAO,CAAC,MAAM,CAAuC;IACrD,IAAW,KAAK,kCAEf;IACD,OAAO,KAAK,KAAK,QAEhB;IAED,OAAO,CAAC,OAAO,CAAsC;IACrD,IAAW,MAAM,iCAEhB;IACD,OAAO,KAAK,MAAM,QAEjB;IAED,OAAO,CAAC,QAAQ,CAAS;IACzB,IAAW,OAAO,YAEjB;IACD,OAAO,KAAK,OAAO,QAElB;IAED,IAAW,KAAK,qCAMf;IAEM,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAQzD,SAAS,CAAC,UAAU,EAAE,kBAAkB;IAaxC,YAAY,CAAC,UAAU,EAAE,kBAAkB;IAO3C,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC,MAAM,CAAC;IASjD,YAAY,CACjB,UAAU,EAAE,mBAAmB,CAAC,MAAM,CAAC,EACvC,MAAM,EAAE,mBAAmB,CAAC,KAAK,CAAC;IAQ7B,YAAY,CAAC,UAAU,EAAE,kBAAkB;IAM3C,QAAQ,CAAC,KAAK,EAAE,kBAAkB;IAsClC,YAAY;IASZ,WAAW,CAAC,KAAK,EAAE,kBAAkB;IASrC,SAAS;IAUT,kBAAkB,CAAC,KAAK,EAAE,kBAAkB;IAa5C,qBAAqB,CAAC,EAC3B,KAAK,EACL,OAAO,GACR,EAAE;QACD,KAAK,EAAE,kBAAkB,CAAC;QAC1B,OAAO,EAAE,OAAO,CAAC;KAClB;CASF"}
package/dist/index.cjs CHANGED
@@ -26636,21 +26636,22 @@ const DartcomInitializeProvider = ({ children, configOptions }) => {
26636
26636
 
26637
26637
  const MapProvider = ({ children }) => {
26638
26638
  const [isReady, setIsReady] = React__namespace.useState(false);
26639
- React__namespace.useEffect(() => {
26640
- Promise.all([
26641
- Promise.resolve().then(function () { return tangram_min; }),
26642
- Promise.resolve().then(function () { return leaflet_rotatedMarker; }),
26643
- Promise.resolve().then(function () { return leaflet_polylineoffset$1; }),
26644
- Promise.resolve().then(function () { return index$1; }),
26645
- Promise.resolve().then(function () { return index; }),
26646
- Promise.resolve().then(function () { return leafletArrows$1; }),
26647
- ])
26648
- .then(() => {
26639
+ const init = async () => {
26640
+ try {
26641
+ await Promise.resolve().then(function () { return tangram_min; });
26642
+ await Promise.resolve().then(function () { return leaflet_rotatedMarker; });
26643
+ await Promise.resolve().then(function () { return leaflet_polylineoffset$1; });
26644
+ await Promise.resolve().then(function () { return index$1; });
26645
+ await Promise.resolve().then(function () { return index; });
26646
+ await Promise.resolve().then(function () { return leafletArrows$1; });
26649
26647
  setIsReady(true);
26650
- })
26651
- .catch(() => {
26648
+ }
26649
+ catch {
26652
26650
  setIsReady(false);
26653
- });
26651
+ }
26652
+ };
26653
+ React__namespace.useEffect(() => {
26654
+ init();
26654
26655
  }, []);
26655
26656
  if (!isReady)
26656
26657
  return null;
@@ -39318,7 +39319,7 @@ const tile_size = 256;
39318
39319
  const sourceUrl = {
39319
39320
  [exports.TangramSourceNames.TILE]: `${"https://dalganmap.ru/api"}/tiles/get_tile/{z}/{x}/{y}.mvt`,
39320
39321
  [exports.TangramSourceNames.NATURE_TILE]: `${"https://dalganmap.ru/api"}/tiles/get_nature_tile/{z}/{x}/{y}.mvt`,
39321
- [exports.TangramSourceNames.MSK]: `${"http://89.108.118.23:3070"}/tiles/get_tile/{z}/{x}/{y}.mvt`,
39322
+ [exports.TangramSourceNames.MSK]: `${"$VITE_API_HOST:$VITE_API_PORT"}/tiles/get_tile/{z}/{x}/{y}.mvt`,
39322
39323
  };
39323
39324
 
39324
39325
  var data = { global:{ links:{ getIsConstruction:"function (feature) {\n const { construction } = feature;\n\n return construction;\n}\n",
@@ -43952,6 +43953,9 @@ class TangramLayer {
43952
43953
  props;
43953
43954
  constructor(props) {
43954
43955
  this.props = props;
43956
+ this._initLayer();
43957
+ }
43958
+ _initLayer() {
43955
43959
  if (GlobalConfig.instance.isValidApiKey) {
43956
43960
  const layer = this._createLayer();
43957
43961
  if (layer) {
@@ -43964,8 +43968,8 @@ class TangramLayer {
43964
43968
  },
43965
43969
  });
43966
43970
  this.layer = layer;
43967
- this._addHandlers();
43968
- this.props.onCreate({ layer });
43971
+ this.props.onCreate?.({ layer });
43972
+ this._addHandlers(layer);
43969
43973
  }
43970
43974
  }
43971
43975
  }
@@ -43977,43 +43981,48 @@ class TangramLayer {
43977
43981
  return leafletLayer;
43978
43982
  }
43979
43983
  }
43980
- _addHandlers() {
43981
- if (this.layer) {
43982
- this.layer.addEventListener('load', (event) => {
43983
- const { sourceTarget } = event;
43984
- const mapInstance = sourceTarget._map;
43985
- if (this.layer) {
43986
- this.layer.setSelectionEvents({
43987
- click: ({ feature, leaflet_event }) => {
43988
- if (feature) {
43989
- const { source_layer, properties } = feature;
43990
- this.props.eventHandlers?.[source_layer]?.click?.({
43991
- leaflet_event,
43992
- properties,
43993
- });
43994
- }
43995
- },
43996
- hover: ({ feature, leaflet_event }) => {
43997
- const mapContainer = mapInstance.getContainer();
43998
- if (feature) {
43999
- const { source_layer, properties } = feature;
44000
- mapContainer.style.cursor = 'pointer';
44001
- this.props.eventHandlers?.[source_layer]?.hover?.({
44002
- leaflet_event,
44003
- properties,
44004
- });
44005
- }
44006
- else {
44007
- mapContainer.style.cursor = 'default';
44008
- }
44009
- },
44010
- });
44011
- }
43984
+ _addHandlers(layer) {
43985
+ layer.addEventListener('load', ({ sourceTarget }) => {
43986
+ this.props.onLoad?.({ layer });
43987
+ const mapInstance = sourceTarget._map;
43988
+ layer.setSelectionEvents({
43989
+ click: ({ feature, leaflet_event }) => {
43990
+ if (feature) {
43991
+ const { source_layer, properties } = feature;
43992
+ this.props.eventHandlers?.[source_layer]?.click?.({
43993
+ leaflet_event,
43994
+ properties,
43995
+ });
43996
+ }
43997
+ },
43998
+ hover: ({ feature, leaflet_event }) => {
43999
+ const mapContainer = mapInstance.getContainer();
44000
+ if (feature) {
44001
+ const { source_layer, properties } = feature;
44002
+ mapContainer.style.cursor = 'pointer';
44003
+ this.props.eventHandlers?.[source_layer]?.hover?.({
44004
+ leaflet_event,
44005
+ properties,
44006
+ });
44007
+ }
44008
+ else {
44009
+ mapContainer.style.cursor = 'default';
44010
+ }
44011
+ },
44012
44012
  });
44013
- }
44013
+ }, this);
44014
+ layer.addEventListener('add', () => {
44015
+ this.props.onAdd?.({ layer });
44016
+ }, this);
44017
+ layer.addEventListener('remove', () => {
44018
+ this.props.onRemove?.({ layer });
44019
+ }, this);
44014
44020
  }
44015
- removeLayer() {
44021
+ destroy() {
44016
44022
  if (this.layer) {
44023
+ this.props.onDestroy?.({
44024
+ layer: this.layer,
44025
+ });
44017
44026
  this.layer.clearAllEventListeners();
44018
44027
  this.layer.remove();
44019
44028
  }
@@ -44036,20 +44045,20 @@ class TangramLayer {
44036
44045
  u_stripe_width: 1,
44037
44046
  },
44038
44047
  blocks: {
44039
- filter: `
44040
- vec3 pos = worldPosition().xyz;
44041
-
44042
- float ang = radians(a_angle);
44043
-
44044
- vec2 dir = vec2(sin(ang), cos(ang));
44045
-
44046
- float positionAlongLine = dot(pos.xy, dir);
44047
-
44048
- float stripe = step(1.0, mod(positionAlongLine / u_stripe_width, 2.0));
44049
-
44050
- color.rgb = mix(vec3(1.0, 1.0, 1.0), vec3(1.0, 0.8, 0.0), stripe);
44051
-
44052
- color.a = 1.0;
44048
+ filter: `
44049
+ vec3 pos = worldPosition().xyz;
44050
+
44051
+ float ang = radians(a_angle);
44052
+
44053
+ vec2 dir = vec2(sin(ang), cos(ang));
44054
+
44055
+ float positionAlongLine = dot(pos.xy, dir);
44056
+
44057
+ float stripe = step(1.0, mod(positionAlongLine / u_stripe_width, 2.0));
44058
+
44059
+ color.rgb = mix(vec3(1.0, 1.0, 1.0), vec3(1.0, 0.8, 0.0), stripe);
44060
+
44061
+ color.a = 1.0;
44053
44062
  `,
44054
44063
  },
44055
44064
  },
@@ -44204,25 +44213,27 @@ const LeafletLayer = ({ layers }) => {
44204
44213
  const controlRef = React__namespace.useRef(null);
44205
44214
  const map = useMap();
44206
44215
  React__namespace.useEffect(() => {
44216
+ const { current: layersControl } = controlRef;
44207
44217
  const googleSatelliteLayer = leafletSrcExports.tileLayer('http://{s}.google.com/vt/lyrs=s&x={x}&y={y}&z={z}', {
44208
44218
  minZoom: 2,
44209
44219
  maxZoom: 25,
44210
44220
  maxNativeZoom: 19,
44211
44221
  subdomains: ['mt0', 'mt1', 'mt2', 'mt3'],
44212
44222
  });
44223
+ if (layersControl) {
44224
+ layersControl.addBaseLayer(googleSatelliteLayer, 'Google Satellite');
44225
+ }
44213
44226
  new TangramLayer({
44214
44227
  defaultLayers: layers,
44215
44228
  onCreate: ({ layer }) => {
44216
- const { current: layersControl } = controlRef;
44217
- if (layer && layersControl) {
44229
+ if (layersControl) {
44218
44230
  layersControl.addBaseLayer(layer, 'Dartcom');
44219
- layersControl.addBaseLayer(googleSatelliteLayer, 'Google Satellite');
44220
44231
  layer.addTo(map);
44221
44232
  }
44222
44233
  },
44223
- onDelete: ({ layer }) => {
44224
- const { current: layersControl } = controlRef;
44234
+ onDestroy: ({ layer }) => {
44225
44235
  if (layersControl) {
44236
+ layersControl.removeLayer(layer);
44226
44237
  map.removeLayer(layer);
44227
44238
  }
44228
44239
  },