@opengeoweb/core 4.16.0 → 4.17.0
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/index.esm.js +161 -55
- package/index.umd.js +196 -73
- package/package.json +6 -6
package/index.esm.js
CHANGED
|
@@ -590,7 +590,11 @@ var getPreviousTimeStepForLayerId = function getPreviousTimeStepForLayerId(layer
|
|
|
590
590
|
var wmjsTimeDim = getWMJSTimeDimensionForLayerId(layerId);
|
|
591
591
|
if (!wmjsTimeDim) return null;
|
|
592
592
|
var currentIndex = wmjsTimeDim.getIndexForValue(wmjsTimeDim.currentValue, false);
|
|
593
|
-
|
|
593
|
+
|
|
594
|
+
if (currentIndex < 0 || currentIndex - 1 < 0) {
|
|
595
|
+
return wmjsTimeDim.getClosestValue(wmjsTimeDim.currentValue, true);
|
|
596
|
+
}
|
|
597
|
+
|
|
594
598
|
return wmjsTimeDim.getValueForIndex(currentIndex - 1);
|
|
595
599
|
};
|
|
596
600
|
/**
|
|
@@ -600,9 +604,17 @@ var getPreviousTimeStepForLayerId = function getPreviousTimeStepForLayerId(layer
|
|
|
600
604
|
|
|
601
605
|
var getNextTimeStepForLayerId = function getNextTimeStepForLayerId(layerId) {
|
|
602
606
|
var wmjsTimeDim = getWMJSTimeDimensionForLayerId(layerId);
|
|
603
|
-
|
|
607
|
+
|
|
608
|
+
if (!wmjsTimeDim) {
|
|
609
|
+
return null;
|
|
610
|
+
}
|
|
611
|
+
|
|
604
612
|
var currentIndex = wmjsTimeDim.getIndexForValue(wmjsTimeDim.currentValue, false);
|
|
605
|
-
|
|
613
|
+
|
|
614
|
+
if (currentIndex < 0 || currentIndex + 1 >= wmjsTimeDim.size()) {
|
|
615
|
+
return wmjsTimeDim.getClosestValue(wmjsTimeDim.currentValue, true);
|
|
616
|
+
}
|
|
617
|
+
|
|
606
618
|
return wmjsTimeDim.getValueForIndex(currentIndex + 1);
|
|
607
619
|
};
|
|
608
620
|
/**
|
|
@@ -1757,7 +1769,10 @@ var slice$8 = createSlice({
|
|
|
1757
1769
|
},
|
|
1758
1770
|
baseLayerDelete: function baseLayerDelete(draft, action) {
|
|
1759
1771
|
var layerId = action.payload.layerId;
|
|
1760
|
-
|
|
1772
|
+
|
|
1773
|
+
if (draft.byId[layerId].layerType !== LayerType.baseLayer && draft.byId[layerId].layerType !== LayerType.overLayer) {
|
|
1774
|
+
return;
|
|
1775
|
+
}
|
|
1761
1776
|
|
|
1762
1777
|
if (draft.byId[layerId]) {
|
|
1763
1778
|
draft.allIds = draft.allIds.filter(function (id) {
|
|
@@ -1812,8 +1827,13 @@ var slice$8 = createSlice({
|
|
|
1812
1827
|
|
|
1813
1828
|
var layerTypes = [];
|
|
1814
1829
|
filtererdBaseLayers.forEach(function (layer) {
|
|
1815
|
-
if (layer.layerType !== LayerType.baseLayer && layer.layerType !== LayerType.overLayer)
|
|
1816
|
-
|
|
1830
|
+
if (layer.layerType !== LayerType.baseLayer && layer.layerType !== LayerType.overLayer) {
|
|
1831
|
+
return;
|
|
1832
|
+
}
|
|
1833
|
+
|
|
1834
|
+
if (!layerTypes.includes(layer.layerType)) {
|
|
1835
|
+
layerTypes.push(layer.layerType);
|
|
1836
|
+
}
|
|
1817
1837
|
});
|
|
1818
1838
|
var state = current(draft); // remove current layers with same type as one of the passed layers
|
|
1819
1839
|
|
|
@@ -1836,7 +1856,10 @@ var slice$8 = createSlice({
|
|
|
1836
1856
|
},
|
|
1837
1857
|
addBaseLayer: function addBaseLayer(draft, action) {
|
|
1838
1858
|
var layer = action.payload.layer;
|
|
1839
|
-
|
|
1859
|
+
|
|
1860
|
+
if (layer.layerType !== LayerType.baseLayer && layer.layerType !== LayerType.overLayer) {
|
|
1861
|
+
return;
|
|
1862
|
+
}
|
|
1840
1863
|
|
|
1841
1864
|
if (!draft.byId[layer.id]) {
|
|
1842
1865
|
draft.byId[layer.id] = createLayer(Object.assign({
|
|
@@ -1857,7 +1880,10 @@ var slice$8 = createSlice({
|
|
|
1857
1880
|
},
|
|
1858
1881
|
addAvailableBaseLayer: function addAvailableBaseLayer(draft, action) {
|
|
1859
1882
|
var layer = action.payload.layer;
|
|
1860
|
-
|
|
1883
|
+
|
|
1884
|
+
if (layer.layerType !== LayerType.baseLayer && layer.layerType !== LayerType.overLayer || !layer.mapId) {
|
|
1885
|
+
return;
|
|
1886
|
+
}
|
|
1861
1887
|
|
|
1862
1888
|
if (!draft.availableBaseLayers.byId[layer.id]) {
|
|
1863
1889
|
draft.availableBaseLayers.byId[layer.id] = createLayer(Object.assign({
|
|
@@ -1871,7 +1897,10 @@ var slice$8 = createSlice({
|
|
|
1871
1897
|
var layers = action.payload.layers; // add new available baselayers
|
|
1872
1898
|
|
|
1873
1899
|
layers.forEach(function (layer) {
|
|
1874
|
-
if (layer.layerType !== LayerType.baseLayer || draft.availableBaseLayers.byId[layer.id] || !layer.mapId)
|
|
1900
|
+
if (layer.layerType !== LayerType.baseLayer || draft.availableBaseLayers.byId[layer.id] || !layer.mapId) {
|
|
1901
|
+
return;
|
|
1902
|
+
}
|
|
1903
|
+
|
|
1875
1904
|
draft.availableBaseLayers.byId[layer.id] = createLayer(Object.assign({
|
|
1876
1905
|
id: layer.id,
|
|
1877
1906
|
layerType: layer.layerType
|
|
@@ -2781,8 +2810,13 @@ var slice$5 = createSlice({
|
|
|
2781
2810
|
});
|
|
2782
2811
|
|
|
2783
2812
|
if (draft.byId[mapId]) {
|
|
2784
|
-
if (baseLayerIds.length !== 0)
|
|
2785
|
-
|
|
2813
|
+
if (baseLayerIds.length !== 0) {
|
|
2814
|
+
draft.byId[mapId].baseLayers = baseLayerIds;
|
|
2815
|
+
}
|
|
2816
|
+
|
|
2817
|
+
if (overLayerIds.length !== 0) {
|
|
2818
|
+
draft.byId[mapId].overLayers = overLayerIds;
|
|
2819
|
+
}
|
|
2786
2820
|
}
|
|
2787
2821
|
}).addCase(layerDelete$1, function (draft, action) {
|
|
2788
2822
|
var _action$payload27 = action.payload,
|
|
@@ -13099,17 +13133,23 @@ var SearchFieldButtonContainer = function SearchFieldButtonContainer(_ref) {
|
|
|
13099
13133
|
}, /*#__PURE__*/React__default.createElement(Clear, null)));
|
|
13100
13134
|
};
|
|
13101
13135
|
|
|
13102
|
-
if (isURL(localSearchString))
|
|
13103
|
-
|
|
13104
|
-
|
|
13105
|
-
|
|
13106
|
-
|
|
13107
|
-
|
|
13108
|
-
|
|
13109
|
-
|
|
13110
|
-
|
|
13111
|
-
|
|
13112
|
-
|
|
13136
|
+
if (isURL(localSearchString)) {
|
|
13137
|
+
return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
|
|
13138
|
+
style: {
|
|
13139
|
+
marginRight: '15px'
|
|
13140
|
+
}
|
|
13141
|
+
}, /*#__PURE__*/React__default.createElement(ClearButton, null)), /*#__PURE__*/React__default.createElement(Button, {
|
|
13142
|
+
variant: "tertiary",
|
|
13143
|
+
onClick: function onClick() {
|
|
13144
|
+
return setPopupIsOpen(true);
|
|
13145
|
+
}
|
|
13146
|
+
}, "Save"));
|
|
13147
|
+
}
|
|
13148
|
+
|
|
13149
|
+
if (localSearchString) {
|
|
13150
|
+
return /*#__PURE__*/React__default.createElement(ClearButton, null);
|
|
13151
|
+
}
|
|
13152
|
+
|
|
13113
13153
|
return /*#__PURE__*/React__default.createElement(CustomTooltip, {
|
|
13114
13154
|
title: "Search",
|
|
13115
13155
|
placement: "top"
|
|
@@ -16298,6 +16338,13 @@ var DimensionSelectSlider = function DimensionSelectSlider(_ref) {
|
|
|
16298
16338
|
var sliderValue = managedValue !== null ? values.findIndex(function (v) {
|
|
16299
16339
|
return v === managedValue;
|
|
16300
16340
|
}) : currentIndex;
|
|
16341
|
+
|
|
16342
|
+
var upDownNavigation = function upDownNavigation(event) {
|
|
16343
|
+
if (event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.metaKey || event.ctrlKey) {
|
|
16344
|
+
event.preventDefault();
|
|
16345
|
+
}
|
|
16346
|
+
};
|
|
16347
|
+
|
|
16301
16348
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Box, {
|
|
16302
16349
|
"data-testid": "slider-dimensionSelect",
|
|
16303
16350
|
sx: {
|
|
@@ -16323,6 +16370,7 @@ var DimensionSelectSlider = function DimensionSelectSlider(_ref) {
|
|
|
16323
16370
|
} : {},
|
|
16324
16371
|
disabled: isDisabled,
|
|
16325
16372
|
value: sliderValue,
|
|
16373
|
+
onKeyDown: upDownNavigation,
|
|
16326
16374
|
onChange: function onChange(e, val) {
|
|
16327
16375
|
onChangeDimensionValue(values[val].toString());
|
|
16328
16376
|
if (!managedValue) setCurrentIndex(val);
|
|
@@ -18453,7 +18501,11 @@ function useAnimationTime(animationStartTime, animationEndTime, onSetAnimationSt
|
|
|
18453
18501
|
if (leftMarkerDragging) {
|
|
18454
18502
|
var mousePosition = leftMarkerPx + x;
|
|
18455
18503
|
var rightAnimationPosition = rightMarkerPx - DRAG_AREA_WIDTH * 2;
|
|
18456
|
-
|
|
18504
|
+
|
|
18505
|
+
if (mousePosition >= rightAnimationPosition || mousePosition <= 0) {
|
|
18506
|
+
return;
|
|
18507
|
+
} // eslint-disable-next-line no-param-reassign
|
|
18508
|
+
|
|
18457
18509
|
|
|
18458
18510
|
dragTooltipPosition.current = pixelsToLeft ? mousePosition + pixelsToLeft : mousePosition;
|
|
18459
18511
|
var mouseTimeUnix = pixelToTimestamp(mousePosition, centerTime, canvasWidth, secondsPerPx);
|
|
@@ -18466,7 +18518,11 @@ function useAnimationTime(animationStartTime, animationEndTime, onSetAnimationSt
|
|
|
18466
18518
|
var _mousePosition = rightMarkerPx + x;
|
|
18467
18519
|
|
|
18468
18520
|
var leftAnimationPosition = leftMarkerPx + DRAG_AREA_WIDTH * 2;
|
|
18469
|
-
|
|
18521
|
+
|
|
18522
|
+
if (leftAnimationPosition >= _mousePosition || _mousePosition >= canvasWidth) {
|
|
18523
|
+
return;
|
|
18524
|
+
} // eslint-disable-next-line no-param-reassign
|
|
18525
|
+
|
|
18470
18526
|
|
|
18471
18527
|
dragTooltipPosition.current = pixelsToLeft ? _mousePosition + pixelsToLeft : _mousePosition;
|
|
18472
18528
|
|
|
@@ -18712,7 +18768,9 @@ var TimeSliderLegend = function TimeSliderLegend(_ref) {
|
|
|
18712
18768
|
isClickOrDrag.current = 'drag';
|
|
18713
18769
|
}
|
|
18714
18770
|
|
|
18715
|
-
if (selectedTimeDragging || leftMarkerDragging || rightMarkerDragging)
|
|
18771
|
+
if (selectedTimeDragging || leftMarkerDragging || rightMarkerDragging) {
|
|
18772
|
+
return;
|
|
18773
|
+
}
|
|
18716
18774
|
|
|
18717
18775
|
var _map5 = [localAnimationStartTime, localAnimationEndTime, selectedTime].map(function (timestamp) {
|
|
18718
18776
|
return timestampToPixel(timestamp, centerTime, width, secondsPerPx);
|
|
@@ -19805,10 +19863,12 @@ var TimeSliderCurrentTimeBoxConnectComponent = function TimeSliderCurrentTimeBox
|
|
|
19805
19863
|
isAutoUpdating: isAutoUpdating,
|
|
19806
19864
|
unfilteredSelectedTime: unfilteredSelectedTime || selectedTime,
|
|
19807
19865
|
setUnfilteredSelectedTime: function setUnfilteredSelectedTime(timeSliderUnfilteredSelectedTime) {
|
|
19808
|
-
if (setTimeSliderUnfilteredSelectedTime)
|
|
19809
|
-
|
|
19810
|
-
|
|
19811
|
-
|
|
19866
|
+
if (setTimeSliderUnfilteredSelectedTime) {
|
|
19867
|
+
setTimeSliderUnfilteredSelectedTime({
|
|
19868
|
+
timeSliderUnfilteredSelectedTime: timeSliderUnfilteredSelectedTime,
|
|
19869
|
+
mapId: mapId
|
|
19870
|
+
});
|
|
19871
|
+
}
|
|
19812
19872
|
},
|
|
19813
19873
|
onSetNewDate: function onSetNewDate(newDate) {
|
|
19814
19874
|
if (isAnimating) {
|
|
@@ -21558,12 +21618,19 @@ var AdagucMapDraw = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
21558
21618
|
if (this.myDrawMode === DRAWMODE.POINT || this.myDrawMode === DRAWMODE.MULTIPOINT) {
|
|
21559
21619
|
/* Create points */
|
|
21560
21620
|
var pointGeometry = feature.geometry;
|
|
21561
|
-
|
|
21562
|
-
|
|
21621
|
+
|
|
21622
|
+
if (pointGeometry) {
|
|
21623
|
+
if (pointGeometry.coordinates === undefined) {
|
|
21624
|
+
pointGeometry.coordinates = [];
|
|
21625
|
+
}
|
|
21563
21626
|
}
|
|
21627
|
+
|
|
21564
21628
|
var multiPointGeometry = feature.geometry;
|
|
21565
|
-
|
|
21566
|
-
|
|
21629
|
+
|
|
21630
|
+
if (multiPointGeometry) {
|
|
21631
|
+
if (multiPointGeometry.coordinates === undefined) {
|
|
21632
|
+
multiPointGeometry.coordinates = [[]];
|
|
21633
|
+
}
|
|
21567
21634
|
}
|
|
21568
21635
|
|
|
21569
21636
|
if (this.myDrawMode === DRAWMODE.POINT) {
|
|
@@ -21604,8 +21671,11 @@ var AdagucMapDraw = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
21604
21671
|
if (this.myDrawMode === DRAWMODE.POLYGON || this.myDrawMode === DRAWMODE.BOX) {
|
|
21605
21672
|
/* Create poly's and boxes */
|
|
21606
21673
|
this.myEditMode = EDITMODE.ADD_FEATURE;
|
|
21607
|
-
|
|
21608
|
-
|
|
21674
|
+
|
|
21675
|
+
if (feature.geometry) {
|
|
21676
|
+
if (feature.geometry.coordinates === undefined) {
|
|
21677
|
+
feature.geometry.coordinates = [[]];
|
|
21678
|
+
}
|
|
21609
21679
|
}
|
|
21610
21680
|
|
|
21611
21681
|
if (feature.geometry.coordinates[0] === undefined || feature.geometry.coordinates[0].length === 0) {
|
|
@@ -22026,7 +22096,9 @@ var AdagucMapDraw = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
22026
22096
|
}, {
|
|
22027
22097
|
key: "validatePolys",
|
|
22028
22098
|
value: function validatePolys(fixPolys) {
|
|
22029
|
-
if (!this.geojson || !this.geojson.features || !this.geojson.features.length)
|
|
22099
|
+
if (!this.geojson || !this.geojson.features || !this.geojson.features.length) {
|
|
22100
|
+
return;
|
|
22101
|
+
}
|
|
22030
22102
|
|
|
22031
22103
|
for (var featureIndex = 0; featureIndex < this.geojson.features.length; featureIndex += 1) {
|
|
22032
22104
|
if (!this.geojson.features) this.geojson.features = [];
|
|
@@ -22111,7 +22183,11 @@ var AdagucMapDraw = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
22111
22183
|
var _this$props12 = this.props,
|
|
22112
22184
|
featureNrToEdit = _this$props12.featureNrToEdit,
|
|
22113
22185
|
isInEditMode = _this$props12.isInEditMode;
|
|
22114
|
-
|
|
22186
|
+
|
|
22187
|
+
if (!this.geojson || !this.geojson.features || !this.geojson.features.length) {
|
|
22188
|
+
return;
|
|
22189
|
+
}
|
|
22190
|
+
|
|
22115
22191
|
this.textPositions = [];
|
|
22116
22192
|
this.mouseOverPolygonCoordinates = [];
|
|
22117
22193
|
this.mouseOverPolygonFeatureIndex = -1;
|
|
@@ -22673,7 +22749,11 @@ var AdagucMapDraw = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
22673
22749
|
featureNrToEdit = _this$props14.featureNrToEdit;
|
|
22674
22750
|
var feature = this.geojson.features[featureIndex];
|
|
22675
22751
|
if (!feature || !feature.geometry) return;
|
|
22676
|
-
|
|
22752
|
+
|
|
22753
|
+
if (feature.geometry.type !== 'Polygon' && feature.geometry.type !== 'MultiPolygon') {
|
|
22754
|
+
return;
|
|
22755
|
+
}
|
|
22756
|
+
|
|
22677
22757
|
var polyProps = feature.properties;
|
|
22678
22758
|
if (!polyProps) polyProps = this.defaultPolyProps;
|
|
22679
22759
|
/* Draw polygons and calculate center of poly */
|
|
@@ -22785,7 +22865,10 @@ var AdagucMapDraw = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
22785
22865
|
} else {
|
|
22786
22866
|
this.validateFeature(feature); // eslint-disable-next-line no-underscore-dangle
|
|
22787
22867
|
|
|
22788
|
-
if (feature.properties._adaguctype)
|
|
22868
|
+
if (feature.properties._adaguctype) {
|
|
22869
|
+
delete feature.properties._adaguctype;
|
|
22870
|
+
} // eslint-disable-next-line default-case
|
|
22871
|
+
|
|
22789
22872
|
|
|
22790
22873
|
switch (type) {
|
|
22791
22874
|
case DRAWMODE.POINT:
|
|
@@ -22794,8 +22877,12 @@ var AdagucMapDraw = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
22794
22877
|
|
|
22795
22878
|
case DRAWMODE.MULTIPOINT:
|
|
22796
22879
|
feature.geometry.type = 'MultiPoint';
|
|
22797
|
-
|
|
22880
|
+
|
|
22881
|
+
if (feature.geometry.coordinates.length === 0) {
|
|
22882
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
22798
22883
|
feature.geometry.coordinates.push([]);
|
|
22884
|
+
}
|
|
22885
|
+
|
|
22799
22886
|
break;
|
|
22800
22887
|
|
|
22801
22888
|
case DRAWMODE.BOX:
|
|
@@ -22806,14 +22893,22 @@ var AdagucMapDraw = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
22806
22893
|
|
|
22807
22894
|
case DRAWMODE.POLYGON:
|
|
22808
22895
|
feature.geometry.type = 'Polygon';
|
|
22809
|
-
|
|
22896
|
+
|
|
22897
|
+
if (feature.geometry.coordinates.length === 0) {
|
|
22898
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
22810
22899
|
feature.geometry.coordinates.push([]);
|
|
22900
|
+
}
|
|
22901
|
+
|
|
22811
22902
|
break;
|
|
22812
22903
|
|
|
22813
22904
|
case DRAWMODE.LINESTRING:
|
|
22814
22905
|
feature.geometry.type = 'LineString';
|
|
22815
|
-
|
|
22906
|
+
|
|
22907
|
+
if (feature.geometry.coordinates.length === 0) {
|
|
22908
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
22816
22909
|
feature.geometry.coordinates.push([]);
|
|
22910
|
+
}
|
|
22911
|
+
|
|
22817
22912
|
break;
|
|
22818
22913
|
}
|
|
22819
22914
|
}
|
|
@@ -22824,7 +22919,10 @@ var AdagucMapDraw = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
22824
22919
|
}, {
|
|
22825
22920
|
key: "checkIfFeatureIsBox",
|
|
22826
22921
|
value: function checkIfFeatureIsBox(feature) {
|
|
22827
|
-
if (!feature || !feature.properties || !feature.properties._adaguctype)
|
|
22922
|
+
if (!feature || !feature.properties || !feature.properties._adaguctype) {
|
|
22923
|
+
return false;
|
|
22924
|
+
}
|
|
22925
|
+
|
|
22828
22926
|
return feature.properties._adaguctype === 'box';
|
|
22829
22927
|
}
|
|
22830
22928
|
}, {
|
|
@@ -23017,24 +23115,31 @@ var getWMJSLayerFromReactLayer = function getWMJSLayerFromReactLayer(mapId, wmLa
|
|
|
23017
23115
|
var wmjsMap = getWMJSMapById(mapId);
|
|
23018
23116
|
/* Some safety checks */
|
|
23019
23117
|
|
|
23020
|
-
if (!wmjsMap || !wmLayers || !reactLayerId || !layerName)
|
|
23021
|
-
|
|
23022
|
-
|
|
23023
|
-
|
|
23118
|
+
if (!wmjsMap || !wmLayers || !reactLayerId || !layerName) {
|
|
23119
|
+
return {
|
|
23120
|
+
layer: null,
|
|
23121
|
+
layerArrayMutated: false
|
|
23122
|
+
};
|
|
23123
|
+
}
|
|
23024
23124
|
/* Find the wmlayer by its react layer id */
|
|
23025
23125
|
|
|
23126
|
+
|
|
23026
23127
|
var matchingLayerIndex = wmLayers.findIndex(function (wmLayer) {
|
|
23027
23128
|
return wmLayer.id === reactLayerId;
|
|
23028
23129
|
});
|
|
23029
|
-
|
|
23030
|
-
|
|
23031
|
-
|
|
23032
|
-
|
|
23130
|
+
|
|
23131
|
+
if (matchingLayerIndex === -1) {
|
|
23132
|
+
return {
|
|
23133
|
+
layer: null,
|
|
23134
|
+
layerArrayMutated: false
|
|
23135
|
+
};
|
|
23136
|
+
}
|
|
23033
23137
|
/*
|
|
23034
23138
|
The layer order in the react children array index is
|
|
23035
23139
|
reversed compared to the layer order in the wmLayer array index
|
|
23036
23140
|
*/
|
|
23037
23141
|
|
|
23142
|
+
|
|
23038
23143
|
var reactLayerIndex = wmLayers.length - 1 - wmLayerIndex;
|
|
23039
23144
|
var isMapLayer = isAMapLayer(reactWebMapJSLayer.props);
|
|
23040
23145
|
var mapLayerArrayShouldBeMutated = isMapLayer && matchingLayerIndex !== reactLayerIndex;
|
|
@@ -25487,6 +25592,7 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_a) {
|
|
|
25487
25592
|
} // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
25488
25593
|
|
|
25489
25594
|
}, []);
|
|
25595
|
+
var mapControlsPositionTop = title ? 24 : 8;
|
|
25490
25596
|
return /*#__PURE__*/React__default.createElement(Box, {
|
|
25491
25597
|
sx: {
|
|
25492
25598
|
width: '100%',
|
|
@@ -25495,13 +25601,13 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_a) {
|
|
|
25495
25601
|
overflow: 'hidden'
|
|
25496
25602
|
},
|
|
25497
25603
|
"data-testid": "ConfigurableMap"
|
|
25498
|
-
}, /*#__PURE__*/React__default.createElement(Typography, {
|
|
25604
|
+
}, title && /*#__PURE__*/React__default.createElement(Typography, {
|
|
25499
25605
|
"data-testid": "mapTitle",
|
|
25500
25606
|
sx: titleStyle
|
|
25501
|
-
}, title
|
|
25607
|
+
}, title), /*#__PURE__*/React__default.createElement(MapControls, {
|
|
25502
25608
|
"data-testid": "mapControls",
|
|
25503
25609
|
style: {
|
|
25504
|
-
top:
|
|
25610
|
+
top: mapControlsPositionTop
|
|
25505
25611
|
}
|
|
25506
25612
|
}, /*#__PURE__*/React__default.createElement(ZoomControlConnect, {
|
|
25507
25613
|
mapId: id
|
|
@@ -25635,7 +25741,7 @@ var MultiMapViewConnect = function MultiMapViewConnect(_ref) {
|
|
|
25635
25741
|
style: mapStyle,
|
|
25636
25742
|
sx: mapBoxStyle
|
|
25637
25743
|
}, /*#__PURE__*/React__default.createElement(ConfigurableMapConnect, {
|
|
25638
|
-
title: map.title,
|
|
25744
|
+
title: map.title || mapId,
|
|
25639
25745
|
id: mapId,
|
|
25640
25746
|
layers: map.layers || [],
|
|
25641
25747
|
activeLayerId: map.activeLayerId || undefined,
|
package/index.umd.js
CHANGED
|
@@ -431,7 +431,11 @@
|
|
|
431
431
|
var wmjsTimeDim = getWMJSTimeDimensionForLayerId(layerId);
|
|
432
432
|
if (!wmjsTimeDim) return null;
|
|
433
433
|
var currentIndex = wmjsTimeDim.getIndexForValue(wmjsTimeDim.currentValue, false);
|
|
434
|
-
|
|
434
|
+
|
|
435
|
+
if (currentIndex < 0 || currentIndex - 1 < 0) {
|
|
436
|
+
return wmjsTimeDim.getClosestValue(wmjsTimeDim.currentValue, true);
|
|
437
|
+
}
|
|
438
|
+
|
|
435
439
|
return wmjsTimeDim.getValueForIndex(currentIndex - 1);
|
|
436
440
|
};
|
|
437
441
|
/**
|
|
@@ -441,9 +445,17 @@
|
|
|
441
445
|
|
|
442
446
|
var getNextTimeStepForLayerId = function getNextTimeStepForLayerId(layerId) {
|
|
443
447
|
var wmjsTimeDim = getWMJSTimeDimensionForLayerId(layerId);
|
|
444
|
-
|
|
448
|
+
|
|
449
|
+
if (!wmjsTimeDim) {
|
|
450
|
+
return null;
|
|
451
|
+
}
|
|
452
|
+
|
|
445
453
|
var currentIndex = wmjsTimeDim.getIndexForValue(wmjsTimeDim.currentValue, false);
|
|
446
|
-
|
|
454
|
+
|
|
455
|
+
if (currentIndex < 0 || currentIndex + 1 >= wmjsTimeDim.size()) {
|
|
456
|
+
return wmjsTimeDim.getClosestValue(wmjsTimeDim.currentValue, true);
|
|
457
|
+
}
|
|
458
|
+
|
|
447
459
|
return wmjsTimeDim.getValueForIndex(currentIndex + 1);
|
|
448
460
|
};
|
|
449
461
|
/**
|
|
@@ -1617,7 +1629,10 @@
|
|
|
1617
1629
|
},
|
|
1618
1630
|
baseLayerDelete: function baseLayerDelete(draft, action) {
|
|
1619
1631
|
var layerId = action.payload.layerId;
|
|
1620
|
-
|
|
1632
|
+
|
|
1633
|
+
if (draft.byId[layerId].layerType !== LayerType.baseLayer && draft.byId[layerId].layerType !== LayerType.overLayer) {
|
|
1634
|
+
return;
|
|
1635
|
+
}
|
|
1621
1636
|
|
|
1622
1637
|
if (draft.byId[layerId]) {
|
|
1623
1638
|
draft.allIds = draft.allIds.filter(function (id) {
|
|
@@ -1672,8 +1687,13 @@
|
|
|
1672
1687
|
|
|
1673
1688
|
var layerTypes = [];
|
|
1674
1689
|
filtererdBaseLayers.forEach(function (layer) {
|
|
1675
|
-
if (layer.layerType !== LayerType.baseLayer && layer.layerType !== LayerType.overLayer)
|
|
1676
|
-
|
|
1690
|
+
if (layer.layerType !== LayerType.baseLayer && layer.layerType !== LayerType.overLayer) {
|
|
1691
|
+
return;
|
|
1692
|
+
}
|
|
1693
|
+
|
|
1694
|
+
if (!layerTypes.includes(layer.layerType)) {
|
|
1695
|
+
layerTypes.push(layer.layerType);
|
|
1696
|
+
}
|
|
1677
1697
|
});
|
|
1678
1698
|
var state = produce.current(draft); // remove current layers with same type as one of the passed layers
|
|
1679
1699
|
|
|
@@ -1696,7 +1716,10 @@
|
|
|
1696
1716
|
},
|
|
1697
1717
|
addBaseLayer: function addBaseLayer(draft, action) {
|
|
1698
1718
|
var layer = action.payload.layer;
|
|
1699
|
-
|
|
1719
|
+
|
|
1720
|
+
if (layer.layerType !== LayerType.baseLayer && layer.layerType !== LayerType.overLayer) {
|
|
1721
|
+
return;
|
|
1722
|
+
}
|
|
1700
1723
|
|
|
1701
1724
|
if (!draft.byId[layer.id]) {
|
|
1702
1725
|
draft.byId[layer.id] = createLayer(__assign({
|
|
@@ -1717,7 +1740,10 @@
|
|
|
1717
1740
|
},
|
|
1718
1741
|
addAvailableBaseLayer: function addAvailableBaseLayer(draft, action) {
|
|
1719
1742
|
var layer = action.payload.layer;
|
|
1720
|
-
|
|
1743
|
+
|
|
1744
|
+
if (layer.layerType !== LayerType.baseLayer && layer.layerType !== LayerType.overLayer || !layer.mapId) {
|
|
1745
|
+
return;
|
|
1746
|
+
}
|
|
1721
1747
|
|
|
1722
1748
|
if (!draft.availableBaseLayers.byId[layer.id]) {
|
|
1723
1749
|
draft.availableBaseLayers.byId[layer.id] = createLayer(__assign({
|
|
@@ -1731,7 +1757,10 @@
|
|
|
1731
1757
|
var layers = action.payload.layers; // add new available baselayers
|
|
1732
1758
|
|
|
1733
1759
|
layers.forEach(function (layer) {
|
|
1734
|
-
if (layer.layerType !== LayerType.baseLayer || draft.availableBaseLayers.byId[layer.id] || !layer.mapId)
|
|
1760
|
+
if (layer.layerType !== LayerType.baseLayer || draft.availableBaseLayers.byId[layer.id] || !layer.mapId) {
|
|
1761
|
+
return;
|
|
1762
|
+
}
|
|
1763
|
+
|
|
1735
1764
|
draft.availableBaseLayers.byId[layer.id] = createLayer(__assign({
|
|
1736
1765
|
id: layer.id,
|
|
1737
1766
|
layerType: layer.layerType
|
|
@@ -2675,8 +2704,13 @@
|
|
|
2675
2704
|
});
|
|
2676
2705
|
|
|
2677
2706
|
if (draft.byId[mapId]) {
|
|
2678
|
-
if (baseLayerIds.length !== 0)
|
|
2679
|
-
|
|
2707
|
+
if (baseLayerIds.length !== 0) {
|
|
2708
|
+
draft.byId[mapId].baseLayers = baseLayerIds;
|
|
2709
|
+
}
|
|
2710
|
+
|
|
2711
|
+
if (overLayerIds.length !== 0) {
|
|
2712
|
+
draft.byId[mapId].overLayers = overLayerIds;
|
|
2713
|
+
}
|
|
2680
2714
|
}
|
|
2681
2715
|
}).addCase(layerDelete$1, function (draft, action) {
|
|
2682
2716
|
var _a = action.payload,
|
|
@@ -5719,9 +5753,12 @@
|
|
|
5719
5753
|
switch (_b.label) {
|
|
5720
5754
|
case 0:
|
|
5721
5755
|
/* Should not listen to actions from itself */
|
|
5722
|
-
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer)
|
|
5723
|
-
|
|
5724
|
-
|
|
5756
|
+
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
|
|
5757
|
+
return [2
|
|
5758
|
+
/*return*/
|
|
5759
|
+
];
|
|
5760
|
+
}
|
|
5761
|
+
|
|
5725
5762
|
return [4
|
|
5726
5763
|
/*yield*/
|
|
5727
5764
|
, effects.select(getLayerActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS)];
|
|
@@ -5755,9 +5792,12 @@
|
|
|
5755
5792
|
switch (_b.label) {
|
|
5756
5793
|
case 0:
|
|
5757
5794
|
/* Should not listen to actions from itself */
|
|
5758
|
-
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer)
|
|
5759
|
-
|
|
5760
|
-
|
|
5795
|
+
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
|
|
5796
|
+
return [2
|
|
5797
|
+
/*return*/
|
|
5798
|
+
];
|
|
5799
|
+
}
|
|
5800
|
+
|
|
5761
5801
|
return [4
|
|
5762
5802
|
/*yield*/
|
|
5763
5803
|
, effects.select(getAddLayerActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS)];
|
|
@@ -5791,9 +5831,12 @@
|
|
|
5791
5831
|
switch (_b.label) {
|
|
5792
5832
|
case 0:
|
|
5793
5833
|
/* Should not listen to actions from itself */
|
|
5794
|
-
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer)
|
|
5795
|
-
|
|
5796
|
-
|
|
5834
|
+
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
|
|
5835
|
+
return [2
|
|
5836
|
+
/*return*/
|
|
5837
|
+
];
|
|
5838
|
+
}
|
|
5839
|
+
|
|
5797
5840
|
return [4
|
|
5798
5841
|
/*yield*/
|
|
5799
5842
|
, effects.select(getLayerDeleteActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS)];
|
|
@@ -5827,9 +5870,12 @@
|
|
|
5827
5870
|
switch (_b.label) {
|
|
5828
5871
|
case 0:
|
|
5829
5872
|
/* Should not listen to actions from itself */
|
|
5830
|
-
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer)
|
|
5831
|
-
|
|
5832
|
-
|
|
5873
|
+
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
|
|
5874
|
+
return [2
|
|
5875
|
+
/*return*/
|
|
5876
|
+
];
|
|
5877
|
+
}
|
|
5878
|
+
|
|
5833
5879
|
return [4
|
|
5834
5880
|
/*yield*/
|
|
5835
5881
|
, effects.select(getLayerMoveActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS)];
|
|
@@ -5895,9 +5941,12 @@
|
|
|
5895
5941
|
switch (_b.label) {
|
|
5896
5942
|
case 0:
|
|
5897
5943
|
/* Should not listen to actions from itself */
|
|
5898
|
-
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer)
|
|
5899
|
-
|
|
5900
|
-
|
|
5944
|
+
if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
|
|
5945
|
+
return [2
|
|
5946
|
+
/*return*/
|
|
5947
|
+
];
|
|
5948
|
+
}
|
|
5949
|
+
|
|
5901
5950
|
return [4
|
|
5902
5951
|
/*yield*/
|
|
5903
5952
|
, effects.select(getMapBaseLayerActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS)];
|
|
@@ -9083,7 +9132,8 @@
|
|
|
9083
9132
|
case 38:
|
|
9084
9133
|
if (!(toggleTimestepAuto !== undefined)) return [3
|
|
9085
9134
|
/*break*/
|
|
9086
|
-
, 40];
|
|
9135
|
+
, 40]; // Set timestep auto based on preset if animation is off
|
|
9136
|
+
|
|
9087
9137
|
return [4
|
|
9088
9138
|
/*yield*/
|
|
9089
9139
|
, effects.put(mapActions$1.toggleTimestepAuto({
|
|
@@ -9092,6 +9142,7 @@
|
|
|
9092
9142
|
}))];
|
|
9093
9143
|
|
|
9094
9144
|
case 39:
|
|
9145
|
+
// Set timestep auto based on preset if animation is off
|
|
9095
9146
|
_f.sent();
|
|
9096
9147
|
|
|
9097
9148
|
_f.label = 40;
|
|
@@ -13643,17 +13694,23 @@
|
|
|
13643
13694
|
}, /*#__PURE__*/React__default["default"].createElement(theme.Clear, null)));
|
|
13644
13695
|
};
|
|
13645
13696
|
|
|
13646
|
-
if (isURL(localSearchString))
|
|
13647
|
-
|
|
13648
|
-
|
|
13649
|
-
|
|
13650
|
-
|
|
13651
|
-
|
|
13652
|
-
|
|
13653
|
-
|
|
13654
|
-
|
|
13655
|
-
|
|
13656
|
-
|
|
13697
|
+
if (isURL(localSearchString)) {
|
|
13698
|
+
return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
|
|
13699
|
+
style: {
|
|
13700
|
+
marginRight: '15px'
|
|
13701
|
+
}
|
|
13702
|
+
}, /*#__PURE__*/React__default["default"].createElement(ClearButton, null)), /*#__PURE__*/React__default["default"].createElement(material.Button, {
|
|
13703
|
+
variant: "tertiary",
|
|
13704
|
+
onClick: function onClick() {
|
|
13705
|
+
return setPopupIsOpen(true);
|
|
13706
|
+
}
|
|
13707
|
+
}, "Save"));
|
|
13708
|
+
}
|
|
13709
|
+
|
|
13710
|
+
if (localSearchString) {
|
|
13711
|
+
return /*#__PURE__*/React__default["default"].createElement(ClearButton, null);
|
|
13712
|
+
}
|
|
13713
|
+
|
|
13657
13714
|
return /*#__PURE__*/React__default["default"].createElement(shared.CustomTooltip, {
|
|
13658
13715
|
title: "Search",
|
|
13659
13716
|
placement: "top"
|
|
@@ -16970,8 +17027,8 @@
|
|
|
16970
17027
|
* See the License for the specific language governing permissions and
|
|
16971
17028
|
* limitations under the License.
|
|
16972
17029
|
*
|
|
16973
|
-
* Copyright
|
|
16974
|
-
* Copyright
|
|
17030
|
+
* Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
|
|
17031
|
+
* Copyright 2023 - Finnish Meteorological Institute (FMI)
|
|
16975
17032
|
* */
|
|
16976
17033
|
var SmallFontSlider = material.styled(material.Slider)(function () {
|
|
16977
17034
|
return {
|
|
@@ -17022,6 +17079,13 @@
|
|
|
17022
17079
|
var sliderValue = managedValue !== null ? values.findIndex(function (v) {
|
|
17023
17080
|
return v === managedValue;
|
|
17024
17081
|
}) : currentIndex;
|
|
17082
|
+
|
|
17083
|
+
var upDownNavigation = function upDownNavigation(event) {
|
|
17084
|
+
if (event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.metaKey || event.ctrlKey) {
|
|
17085
|
+
event.preventDefault();
|
|
17086
|
+
}
|
|
17087
|
+
};
|
|
17088
|
+
|
|
17025
17089
|
return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(material.Box, {
|
|
17026
17090
|
"data-testid": "slider-dimensionSelect",
|
|
17027
17091
|
sx: {
|
|
@@ -17047,6 +17111,7 @@
|
|
|
17047
17111
|
} : {},
|
|
17048
17112
|
disabled: isDisabled,
|
|
17049
17113
|
value: sliderValue,
|
|
17114
|
+
onKeyDown: upDownNavigation,
|
|
17050
17115
|
onChange: function onChange(e, val) {
|
|
17051
17116
|
onChangeDimensionValue(values[val].toString());
|
|
17052
17117
|
if (!managedValue) setCurrentIndex(val);
|
|
@@ -19289,7 +19354,11 @@
|
|
|
19289
19354
|
if (leftMarkerDragging) {
|
|
19290
19355
|
var mousePosition = leftMarkerPx + x;
|
|
19291
19356
|
var rightAnimationPosition = rightMarkerPx - DRAG_AREA_WIDTH * 2;
|
|
19292
|
-
|
|
19357
|
+
|
|
19358
|
+
if (mousePosition >= rightAnimationPosition || mousePosition <= 0) {
|
|
19359
|
+
return;
|
|
19360
|
+
} // eslint-disable-next-line no-param-reassign
|
|
19361
|
+
|
|
19293
19362
|
|
|
19294
19363
|
dragTooltipPosition.current = pixelsToLeft ? mousePosition + pixelsToLeft : mousePosition;
|
|
19295
19364
|
var mouseTimeUnix = pixelToTimestamp(mousePosition, centerTime, canvasWidth, secondsPerPx);
|
|
@@ -19301,7 +19370,11 @@
|
|
|
19301
19370
|
if (rightMarkerDragging) {
|
|
19302
19371
|
var mousePosition = rightMarkerPx + x;
|
|
19303
19372
|
var leftAnimationPosition = leftMarkerPx + DRAG_AREA_WIDTH * 2;
|
|
19304
|
-
|
|
19373
|
+
|
|
19374
|
+
if (leftAnimationPosition >= mousePosition || mousePosition >= canvasWidth) {
|
|
19375
|
+
return;
|
|
19376
|
+
} // eslint-disable-next-line no-param-reassign
|
|
19377
|
+
|
|
19305
19378
|
|
|
19306
19379
|
dragTooltipPosition.current = pixelsToLeft ? mousePosition + pixelsToLeft : mousePosition;
|
|
19307
19380
|
var mouseTimeUnix = pixelToTimestamp(mousePosition, centerTime, canvasWidth, secondsPerPx);
|
|
@@ -19534,7 +19607,9 @@
|
|
|
19534
19607
|
isClickOrDrag.current = 'drag';
|
|
19535
19608
|
}
|
|
19536
19609
|
|
|
19537
|
-
if (selectedTimeDragging || leftMarkerDragging || rightMarkerDragging)
|
|
19610
|
+
if (selectedTimeDragging || leftMarkerDragging || rightMarkerDragging) {
|
|
19611
|
+
return;
|
|
19612
|
+
}
|
|
19538
19613
|
|
|
19539
19614
|
var _a = __read([localAnimationStartTime, localAnimationEndTime, selectedTime].map(function (timestamp) {
|
|
19540
19615
|
return timestampToPixel(timestamp, centerTime, width, secondsPerPx);
|
|
@@ -20727,10 +20802,12 @@
|
|
|
20727
20802
|
isAutoUpdating: isAutoUpdating,
|
|
20728
20803
|
unfilteredSelectedTime: unfilteredSelectedTime || selectedTime,
|
|
20729
20804
|
setUnfilteredSelectedTime: function setUnfilteredSelectedTime(timeSliderUnfilteredSelectedTime) {
|
|
20730
|
-
if (setTimeSliderUnfilteredSelectedTime)
|
|
20731
|
-
|
|
20732
|
-
|
|
20733
|
-
|
|
20805
|
+
if (setTimeSliderUnfilteredSelectedTime) {
|
|
20806
|
+
setTimeSliderUnfilteredSelectedTime({
|
|
20807
|
+
timeSliderUnfilteredSelectedTime: timeSliderUnfilteredSelectedTime,
|
|
20808
|
+
mapId: mapId
|
|
20809
|
+
});
|
|
20810
|
+
}
|
|
20734
20811
|
},
|
|
20735
20812
|
onSetNewDate: function onSetNewDate(newDate) {
|
|
20736
20813
|
if (isAnimating) {
|
|
@@ -22490,12 +22567,19 @@
|
|
|
22490
22567
|
if (this.myDrawMode === DRAWMODE.POINT || this.myDrawMode === DRAWMODE.MULTIPOINT) {
|
|
22491
22568
|
/* Create points */
|
|
22492
22569
|
var pointGeometry = feature.geometry;
|
|
22493
|
-
|
|
22494
|
-
|
|
22570
|
+
|
|
22571
|
+
if (pointGeometry) {
|
|
22572
|
+
if (pointGeometry.coordinates === undefined) {
|
|
22573
|
+
pointGeometry.coordinates = [];
|
|
22574
|
+
}
|
|
22495
22575
|
}
|
|
22576
|
+
|
|
22496
22577
|
var multiPointGeometry = feature.geometry;
|
|
22497
|
-
|
|
22498
|
-
|
|
22578
|
+
|
|
22579
|
+
if (multiPointGeometry) {
|
|
22580
|
+
if (multiPointGeometry.coordinates === undefined) {
|
|
22581
|
+
multiPointGeometry.coordinates = [[]];
|
|
22582
|
+
}
|
|
22499
22583
|
}
|
|
22500
22584
|
|
|
22501
22585
|
if (this.myDrawMode === DRAWMODE.POINT) {
|
|
@@ -22535,8 +22619,11 @@
|
|
|
22535
22619
|
if (this.myDrawMode === DRAWMODE.POLYGON || this.myDrawMode === DRAWMODE.BOX) {
|
|
22536
22620
|
/* Create poly's and boxes */
|
|
22537
22621
|
this.myEditMode = EDITMODE.ADD_FEATURE;
|
|
22538
|
-
|
|
22539
|
-
|
|
22622
|
+
|
|
22623
|
+
if (feature.geometry) {
|
|
22624
|
+
if (feature.geometry.coordinates === undefined) {
|
|
22625
|
+
feature.geometry.coordinates = [[]];
|
|
22626
|
+
}
|
|
22540
22627
|
}
|
|
22541
22628
|
|
|
22542
22629
|
if (feature.geometry.coordinates[0] === undefined || feature.geometry.coordinates[0].length === 0) {
|
|
@@ -22940,7 +23027,9 @@
|
|
|
22940
23027
|
};
|
|
22941
23028
|
|
|
22942
23029
|
AdagucMapDraw.prototype.validatePolys = function (fixPolys) {
|
|
22943
|
-
if (!this.geojson || !this.geojson.features || !this.geojson.features.length)
|
|
23030
|
+
if (!this.geojson || !this.geojson.features || !this.geojson.features.length) {
|
|
23031
|
+
return;
|
|
23032
|
+
}
|
|
22944
23033
|
|
|
22945
23034
|
for (var featureIndex = 0; featureIndex < this.geojson.features.length; featureIndex += 1) {
|
|
22946
23035
|
if (!this.geojson.features) this.geojson.features = [];
|
|
@@ -23024,7 +23113,11 @@
|
|
|
23024
23113
|
var _a = this.props,
|
|
23025
23114
|
featureNrToEdit = _a.featureNrToEdit,
|
|
23026
23115
|
isInEditMode = _a.isInEditMode;
|
|
23027
|
-
|
|
23116
|
+
|
|
23117
|
+
if (!this.geojson || !this.geojson.features || !this.geojson.features.length) {
|
|
23118
|
+
return;
|
|
23119
|
+
}
|
|
23120
|
+
|
|
23028
23121
|
this.textPositions = [];
|
|
23029
23122
|
this.mouseOverPolygonCoordinates = [];
|
|
23030
23123
|
this.mouseOverPolygonFeatureIndex = -1;
|
|
@@ -23570,7 +23663,11 @@
|
|
|
23570
23663
|
featureNrToEdit = _a.featureNrToEdit;
|
|
23571
23664
|
var feature = this.geojson.features[featureIndex];
|
|
23572
23665
|
if (!feature || !feature.geometry) return;
|
|
23573
|
-
|
|
23666
|
+
|
|
23667
|
+
if (feature.geometry.type !== 'Polygon' && feature.geometry.type !== 'MultiPolygon') {
|
|
23668
|
+
return;
|
|
23669
|
+
}
|
|
23670
|
+
|
|
23574
23671
|
var polyProps = feature.properties;
|
|
23575
23672
|
if (!polyProps) polyProps = this.defaultPolyProps;
|
|
23576
23673
|
/* Draw polygons and calculate center of poly */
|
|
@@ -23680,7 +23777,10 @@
|
|
|
23680
23777
|
} else {
|
|
23681
23778
|
this.validateFeature(feature); // eslint-disable-next-line no-underscore-dangle
|
|
23682
23779
|
|
|
23683
|
-
if (feature.properties._adaguctype)
|
|
23780
|
+
if (feature.properties._adaguctype) {
|
|
23781
|
+
delete feature.properties._adaguctype;
|
|
23782
|
+
} // eslint-disable-next-line default-case
|
|
23783
|
+
|
|
23684
23784
|
|
|
23685
23785
|
switch (type) {
|
|
23686
23786
|
case DRAWMODE.POINT:
|
|
@@ -23689,8 +23789,12 @@
|
|
|
23689
23789
|
|
|
23690
23790
|
case DRAWMODE.MULTIPOINT:
|
|
23691
23791
|
feature.geometry.type = 'MultiPoint';
|
|
23692
|
-
|
|
23792
|
+
|
|
23793
|
+
if (feature.geometry.coordinates.length === 0) {
|
|
23794
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
23693
23795
|
feature.geometry.coordinates.push([]);
|
|
23796
|
+
}
|
|
23797
|
+
|
|
23694
23798
|
break;
|
|
23695
23799
|
|
|
23696
23800
|
case DRAWMODE.BOX:
|
|
@@ -23701,14 +23805,22 @@
|
|
|
23701
23805
|
|
|
23702
23806
|
case DRAWMODE.POLYGON:
|
|
23703
23807
|
feature.geometry.type = 'Polygon';
|
|
23704
|
-
|
|
23808
|
+
|
|
23809
|
+
if (feature.geometry.coordinates.length === 0) {
|
|
23810
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
23705
23811
|
feature.geometry.coordinates.push([]);
|
|
23812
|
+
}
|
|
23813
|
+
|
|
23706
23814
|
break;
|
|
23707
23815
|
|
|
23708
23816
|
case DRAWMODE.LINESTRING:
|
|
23709
23817
|
feature.geometry.type = 'LineString';
|
|
23710
|
-
|
|
23818
|
+
|
|
23819
|
+
if (feature.geometry.coordinates.length === 0) {
|
|
23820
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
23711
23821
|
feature.geometry.coordinates.push([]);
|
|
23822
|
+
}
|
|
23823
|
+
|
|
23712
23824
|
break;
|
|
23713
23825
|
}
|
|
23714
23826
|
}
|
|
@@ -23718,7 +23830,10 @@
|
|
|
23718
23830
|
|
|
23719
23831
|
|
|
23720
23832
|
AdagucMapDraw.prototype.checkIfFeatureIsBox = function (feature) {
|
|
23721
|
-
if (!feature || !feature.properties || !feature.properties._adaguctype)
|
|
23833
|
+
if (!feature || !feature.properties || !feature.properties._adaguctype) {
|
|
23834
|
+
return false;
|
|
23835
|
+
}
|
|
23836
|
+
|
|
23722
23837
|
return feature.properties._adaguctype === 'box';
|
|
23723
23838
|
};
|
|
23724
23839
|
|
|
@@ -23908,24 +24023,31 @@
|
|
|
23908
24023
|
var wmjsMap = getWMJSMapById(mapId);
|
|
23909
24024
|
/* Some safety checks */
|
|
23910
24025
|
|
|
23911
|
-
if (!wmjsMap || !wmLayers || !reactLayerId || !layerName)
|
|
23912
|
-
|
|
23913
|
-
|
|
23914
|
-
|
|
24026
|
+
if (!wmjsMap || !wmLayers || !reactLayerId || !layerName) {
|
|
24027
|
+
return {
|
|
24028
|
+
layer: null,
|
|
24029
|
+
layerArrayMutated: false
|
|
24030
|
+
};
|
|
24031
|
+
}
|
|
23915
24032
|
/* Find the wmlayer by its react layer id */
|
|
23916
24033
|
|
|
24034
|
+
|
|
23917
24035
|
var matchingLayerIndex = wmLayers.findIndex(function (wmLayer) {
|
|
23918
24036
|
return wmLayer.id === reactLayerId;
|
|
23919
24037
|
});
|
|
23920
|
-
|
|
23921
|
-
|
|
23922
|
-
|
|
23923
|
-
|
|
24038
|
+
|
|
24039
|
+
if (matchingLayerIndex === -1) {
|
|
24040
|
+
return {
|
|
24041
|
+
layer: null,
|
|
24042
|
+
layerArrayMutated: false
|
|
24043
|
+
};
|
|
24044
|
+
}
|
|
23924
24045
|
/*
|
|
23925
24046
|
The layer order in the react children array index is
|
|
23926
24047
|
reversed compared to the layer order in the wmLayer array index
|
|
23927
24048
|
*/
|
|
23928
24049
|
|
|
24050
|
+
|
|
23929
24051
|
var reactLayerIndex = wmLayers.length - 1 - wmLayerIndex;
|
|
23930
24052
|
var isMapLayer = isAMapLayer(reactWebMapJSLayer.props);
|
|
23931
24053
|
var mapLayerArrayShouldBeMutated = isMapLayer && matchingLayerIndex !== reactLayerIndex;
|
|
@@ -26406,6 +26528,7 @@
|
|
|
26406
26528
|
} // eslint-disable-next-line react-hooks/exhaustive-deps
|
|
26407
26529
|
|
|
26408
26530
|
}, []);
|
|
26531
|
+
var mapControlsPositionTop = title ? 24 : 8;
|
|
26409
26532
|
return /*#__PURE__*/React__default["default"].createElement(material.Box, {
|
|
26410
26533
|
sx: {
|
|
26411
26534
|
width: '100%',
|
|
@@ -26414,13 +26537,13 @@
|
|
|
26414
26537
|
overflow: 'hidden'
|
|
26415
26538
|
},
|
|
26416
26539
|
"data-testid": "ConfigurableMap"
|
|
26417
|
-
}, /*#__PURE__*/React__default["default"].createElement(material.Typography, {
|
|
26540
|
+
}, title && /*#__PURE__*/React__default["default"].createElement(material.Typography, {
|
|
26418
26541
|
"data-testid": "mapTitle",
|
|
26419
26542
|
sx: titleStyle
|
|
26420
|
-
}, title
|
|
26543
|
+
}, title), /*#__PURE__*/React__default["default"].createElement(MapControls, {
|
|
26421
26544
|
"data-testid": "mapControls",
|
|
26422
26545
|
style: {
|
|
26423
|
-
top:
|
|
26546
|
+
top: mapControlsPositionTop
|
|
26424
26547
|
}
|
|
26425
26548
|
}, /*#__PURE__*/React__default["default"].createElement(ZoomControlConnect, {
|
|
26426
26549
|
mapId: id
|
|
@@ -26554,7 +26677,7 @@
|
|
|
26554
26677
|
style: mapStyle,
|
|
26555
26678
|
sx: mapBoxStyle
|
|
26556
26679
|
}, /*#__PURE__*/React__default["default"].createElement(ConfigurableMapConnect, {
|
|
26557
|
-
title: map.title,
|
|
26680
|
+
title: map.title || mapId,
|
|
26558
26681
|
id: mapId,
|
|
26559
26682
|
layers: map.layers || [],
|
|
26560
26683
|
activeLayerId: map.activeLayerId || undefined,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opengeoweb/core",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.17.0",
|
|
4
4
|
"description": "GeoWeb Core library for the opengeoweb project",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"repository": {
|
|
@@ -13,9 +13,9 @@
|
|
|
13
13
|
"dependencies": {},
|
|
14
14
|
"peerDependencies": {
|
|
15
15
|
"react": "^18.2.0",
|
|
16
|
-
"@opengeoweb/shared": "4.
|
|
16
|
+
"@opengeoweb/shared": "4.17.0",
|
|
17
17
|
"@mui/material": "^5.10.8",
|
|
18
|
-
"@opengeoweb/theme": "4.
|
|
18
|
+
"@opengeoweb/theme": "4.17.0",
|
|
19
19
|
"react-draggable": "^4.4.5",
|
|
20
20
|
"re-resizable": "^6.9.0",
|
|
21
21
|
"@redux-eggs/core": "^2.2.0",
|
|
@@ -24,16 +24,16 @@
|
|
|
24
24
|
"axios": "^0.25.0",
|
|
25
25
|
"date-fns": "^2.29.3",
|
|
26
26
|
"moment": "^2.29.0",
|
|
27
|
-
"@opengeoweb/webmap": "4.
|
|
27
|
+
"@opengeoweb/webmap": "4.17.0",
|
|
28
28
|
"throttle-debounce": "^3.0.1",
|
|
29
29
|
"proj4": "^2.6.2",
|
|
30
|
-
"@opengeoweb/api": "4.
|
|
30
|
+
"@opengeoweb/api": "4.17.0",
|
|
31
31
|
"react-intl": "^5.17.5",
|
|
32
32
|
"react-sortablejs": "^6.1.4",
|
|
33
33
|
"sortablejs": "^1.15.0",
|
|
34
34
|
"immer": "^9.0.15",
|
|
35
35
|
"react-window": "^1.8.7",
|
|
36
|
-
"@opengeoweb/form-fields": "4.
|
|
36
|
+
"@opengeoweb/form-fields": "4.17.0",
|
|
37
37
|
"react-hook-form": "^7.41.5",
|
|
38
38
|
"moment-timezone": "^0.5.31",
|
|
39
39
|
"@mui/x-date-pickers": "^5.0.4",
|