qwc2 2026.7.7 → 2026.7.8
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/actions/theme.js +14 -12
- package/components/AttributeForm.js +1 -0
- package/components/LinkFeatureForm.js +9 -4
- package/components/map3d/utils/OrbitControls3D.js +2 -3
- package/components/widgets/TextInput.js +1 -1
- package/components/widgets/style/TextInput.css +4 -2
- package/package.json +1 -1
- package/plugins/TimeManager.js +3 -3
- package/reducers/editing.js +12 -0
- package/utils/EditingInterface.js +1 -1
package/actions/theme.js
CHANGED
|
@@ -63,6 +63,16 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, preserve
|
|
|
63
63
|
return layer.role === LayerRole.BACKGROUND && layer.visibility === true;
|
|
64
64
|
})) === null || _prevLayers$find === void 0 ? void 0 : _prevLayers$find.name) !== null && _prevLayers$find$name !== void 0 ? _prevLayers$find$name : null;
|
|
65
65
|
}
|
|
66
|
+
// Create theme background layers
|
|
67
|
+
var bgLayers = ThemeUtils.createThemeBackgroundLayers(theme.backgroundLayers || [], themes, visibleBgLayer, externalLayers);
|
|
68
|
+
var actuallyVisibleBgLayer = (_bgLayers$find = bgLayers.find(function (entry) {
|
|
69
|
+
return entry.visibility;
|
|
70
|
+
})) === null || _bgLayers$find === void 0 ? void 0 : _bgLayers$find.name;
|
|
71
|
+
if (!prevTheme && visibleBgLayer && actuallyVisibleBgLayer !== visibleBgLayer) {
|
|
72
|
+
dispatch(showNotification("missingbglayer", LocaleUtils.tr("app.missingbg", visibleBgLayer), NotificationType.WARN, true));
|
|
73
|
+
} else if (actuallyVisibleBgLayer !== visibleBgLayer) {
|
|
74
|
+
visibleBgLayer = null;
|
|
75
|
+
}
|
|
66
76
|
|
|
67
77
|
// Remove old layers
|
|
68
78
|
var preserveUserLayers = preserve && ConfigUtils.getConfigProp("preserveNonThemeLayersOnThemeSwitch", theme) === true;
|
|
@@ -101,24 +111,16 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, preserve
|
|
|
101
111
|
}
|
|
102
112
|
|
|
103
113
|
// Add background layers for theme
|
|
104
|
-
var bgLayers = ThemeUtils.createThemeBackgroundLayers(theme.backgroundLayers || [], themes, visibleBgLayer, externalLayers);
|
|
105
|
-
var actuallyVisibleBgLayer = (_bgLayers$find = bgLayers.find(function (entry) {
|
|
106
|
-
return entry.visibility;
|
|
107
|
-
})) === null || _bgLayers$find === void 0 ? void 0 : _bgLayers$find.name;
|
|
108
|
-
if (!prevTheme && visibleBgLayer && actuallyVisibleBgLayer !== visibleBgLayer) {
|
|
109
|
-
dispatch(showNotification("missingbglayer", LocaleUtils.tr("app.missingbg", visibleBgLayer), NotificationType.WARN, true));
|
|
110
|
-
}
|
|
111
114
|
var _iterator = _createForOfIteratorHelper(bgLayers.reverse()),
|
|
112
115
|
_step;
|
|
113
116
|
try {
|
|
114
117
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
115
118
|
var bgLayer = _step.value;
|
|
116
119
|
// If previous visible BG layer kept, insert other BG layers around that layer
|
|
117
|
-
if (bgLayer.name === visibleBgLayer && bgLayerKept) {
|
|
118
|
-
|
|
119
|
-
} else {
|
|
120
|
-
dispatch(addLayer(bgLayer, bgLayerKept ? 1 : 0));
|
|
120
|
+
if (!(bgLayer.name === visibleBgLayer && bgLayerKept)) {
|
|
121
|
+
dispatch(addLayer(bgLayer, insPos));
|
|
121
122
|
}
|
|
123
|
+
++insPos;
|
|
122
124
|
}
|
|
123
125
|
} catch (err) {
|
|
124
126
|
_iterator.e(err);
|
|
@@ -133,7 +135,7 @@ export function finishThemeSetup(dispatch, theme, themes, layerConfigs, preserve
|
|
|
133
135
|
try {
|
|
134
136
|
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
|
135
137
|
var layer = _step2.value;
|
|
136
|
-
dispatch(addLayer(layer
|
|
138
|
+
dispatch(addLayer(layer));
|
|
137
139
|
}
|
|
138
140
|
|
|
139
141
|
// Restore external layers
|
|
@@ -138,6 +138,7 @@ var AttributeForm = /*#__PURE__*/function (_React$Component) {
|
|
|
138
138
|
finished: _this.state.childEdit.finishCallback,
|
|
139
139
|
iface: _this.props.iface,
|
|
140
140
|
mapPrefix: _this.props.editContext.mapPrefix,
|
|
141
|
+
parentContextId: _this.props.editContext.id,
|
|
141
142
|
pickFilter: _this.props.childPickFilter,
|
|
142
143
|
readOnly: _this.props.readOnly,
|
|
143
144
|
translations: _this.props.translations
|
|
@@ -119,7 +119,8 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
|
|
|
119
119
|
feature: this.props.feature,
|
|
120
120
|
geomType: this.props.editConfig.geomType,
|
|
121
121
|
editConfig: this.props.editConfig,
|
|
122
|
-
mapPrefix: this.props.mapPrefix
|
|
122
|
+
mapPrefix: this.props.mapPrefix,
|
|
123
|
+
parentContextId: this.props.parentContextId
|
|
123
124
|
});
|
|
124
125
|
} else {
|
|
125
126
|
this.props.iface.getFeatureById(this.props.editConfig, this.props.featureId, this.props.map.projection, function (result) {
|
|
@@ -129,7 +130,8 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
|
|
|
129
130
|
feature: result,
|
|
130
131
|
geomType: _this2.props.editConfig.geomType,
|
|
131
132
|
editConfig: _this2.props.editConfig,
|
|
132
|
-
mapPrefix: _this2.props.mapPrefix
|
|
133
|
+
mapPrefix: _this2.props.mapPrefix,
|
|
134
|
+
parentContextId: _this2.props.parentContextId
|
|
133
135
|
});
|
|
134
136
|
}
|
|
135
137
|
});
|
|
@@ -145,13 +147,15 @@ var LinkFeatureForm = /*#__PURE__*/function (_React$Component) {
|
|
|
145
147
|
geomType: _this2.props.editConfig.geomType,
|
|
146
148
|
feature: feature,
|
|
147
149
|
editConfig: _this2.props.editConfig,
|
|
148
|
-
mapPrefix: _this2.props.mapPrefix
|
|
150
|
+
mapPrefix: _this2.props.mapPrefix,
|
|
151
|
+
parentContextId: _this2.props.parentContextId
|
|
149
152
|
});
|
|
150
153
|
});
|
|
151
154
|
} else if (this.props.action === 'Pick') {
|
|
152
155
|
this.props.setEditContext(this.props.editContextId, {
|
|
153
156
|
editConfig: this.props.editConfig,
|
|
154
|
-
mapPrefix: this.props.mapPrefix
|
|
157
|
+
mapPrefix: this.props.mapPrefix,
|
|
158
|
+
parentContextId: this.props.parentContextId
|
|
155
159
|
});
|
|
156
160
|
}
|
|
157
161
|
}
|
|
@@ -240,6 +244,7 @@ _defineProperty(LinkFeatureForm, "propTypes", {
|
|
|
240
244
|
iface: PropTypes.object,
|
|
241
245
|
map: PropTypes.object,
|
|
242
246
|
mapPrefix: PropTypes.string,
|
|
247
|
+
parentContextId: PropTypes.string,
|
|
243
248
|
pickFilter: PropTypes.func,
|
|
244
249
|
readOnly: PropTypes.bool,
|
|
245
250
|
removeLayer: PropTypes.func,
|
|
@@ -56,7 +56,7 @@ var OrbitControls3D = /*#__PURE__*/function (_MapControls) {
|
|
|
56
56
|
_this.enableDamping = true;
|
|
57
57
|
_this.dampingFactor = 0.2;
|
|
58
58
|
_this.keyPanSpeed = 10.0;
|
|
59
|
-
_this.maxPolarAngle =
|
|
59
|
+
_this.maxPolarAngle = 89 / 180 * Math.PI;
|
|
60
60
|
_this.mouseButtons = mouseButtons;
|
|
61
61
|
_this.zoomSpeed = 5;
|
|
62
62
|
return _this;
|
|
@@ -65,10 +65,9 @@ var OrbitControls3D = /*#__PURE__*/function (_MapControls) {
|
|
|
65
65
|
return _createClass(OrbitControls3D, [{
|
|
66
66
|
key: "connect",
|
|
67
67
|
value: function connect(sceneContext) {
|
|
68
|
-
this.domElement = sceneContext.scene.domElement;
|
|
69
68
|
this.sceneContext = sceneContext;
|
|
70
69
|
this.enabled = true;
|
|
71
|
-
_superPropGet(OrbitControls3D, "connect", this, 3)([]);
|
|
70
|
+
_superPropGet(OrbitControls3D, "connect", this, 3)([sceneContext.scene.domElement]);
|
|
72
71
|
this.listenToKeyEvents(this.domElement);
|
|
73
72
|
this.domElement.addEventListener('pointerdown', this.stopAnimations);
|
|
74
73
|
this.domElement.addEventListener('wheel', this.stopAnimations);
|
|
@@ -248,11 +248,11 @@ var TextInput = /*#__PURE__*/function (_React$Component) {
|
|
|
248
248
|
var wrapperClassName = classNames({
|
|
249
249
|
"TextInput": true,
|
|
250
250
|
"text-input-wrapper": true,
|
|
251
|
-
"text-input-wrapper-multiline": this.props.multiline,
|
|
252
251
|
"text-input-wrapper-focused": this.state.focus
|
|
253
252
|
});
|
|
254
253
|
var preClassName = classNames({
|
|
255
254
|
"text-input": true,
|
|
255
|
+
"text-input-multiline": this.props.multiline,
|
|
256
256
|
"text-input-disabled": this.props.disabled,
|
|
257
257
|
"text-input-readonly": this.props.readOnly || !this.state.curValue,
|
|
258
258
|
"text-input-invalid": this.props.required && !this.state.curValue
|
|
@@ -38,9 +38,11 @@ pre.text-input {
|
|
|
38
38
|
flex: 1 1 auto;
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
pre.text-input.text-input-multiline {
|
|
42
|
+
overflow-x: hidden;
|
|
43
43
|
white-space: pre-wrap;
|
|
44
|
+
overflow-wrap: break-word;
|
|
45
|
+
word-break: break-word;
|
|
44
46
|
}
|
|
45
47
|
|
|
46
48
|
pre.text-input[contenteditable="true"] a {
|
package/package.json
CHANGED
package/plugins/TimeManager.js
CHANGED
|
@@ -227,7 +227,7 @@ var TimeManager = /*#__PURE__*/function (_React$Component) {
|
|
|
227
227
|
}, LocaleUtils.tr("timemanager.displayfeatures")), /*#__PURE__*/React.createElement("option", {
|
|
228
228
|
value: "layers"
|
|
229
229
|
}, LocaleUtils.tr("timemanager.displaylayers"))))) : null)));
|
|
230
|
-
var timeSpan = _this.state.endTime
|
|
230
|
+
var timeSpan = _this.state.endTime.diff(_this.state.startTime);
|
|
231
231
|
var Timeline = _this.state.timelineMode === 'infinite' ? InfiniteTimeline : FixedTimeline;
|
|
232
232
|
var filterActive = !isEmpty(_this.props.filter.filterParams) || !!_this.props.filter.filterGeom;
|
|
233
233
|
var startdate = _this.state.timeData.values.length > 0 ? _this.state.timeData.values[0].hour(0).minute(0).second(0) : null;
|
|
@@ -760,7 +760,7 @@ var TimeManager = /*#__PURE__*/function (_React$Component) {
|
|
|
760
760
|
timeData: timeData,
|
|
761
761
|
currentTimestamp: (_state$currentTimesta = state.currentTimestamp) !== null && _state$currentTimesta !== void 0 ? _state$currentTimesta : timeData.values.length > 0 ? +timeData.values[0] : null,
|
|
762
762
|
startTime: startdate,
|
|
763
|
-
endTime: enddate && enddate.year() !== DUMMY_END_DATE.getFullYear() ? enddate :
|
|
763
|
+
endTime: enddate && enddate.year() !== DUMMY_END_DATE.getFullYear() ? enddate : dayjs()
|
|
764
764
|
};
|
|
765
765
|
});
|
|
766
766
|
this.updateTimeFeatures(timeData);
|
|
@@ -784,7 +784,7 @@ var TimeManager = /*#__PURE__*/function (_React$Component) {
|
|
|
784
784
|
}
|
|
785
785
|
return {
|
|
786
786
|
startTime: startdate,
|
|
787
|
-
endTime: enddate && enddate.year() !== DUMMY_END_DATE.getFullYear() ? enddate :
|
|
787
|
+
endTime: enddate && enddate.year() !== DUMMY_END_DATE.getFullYear() ? enddate : dayjs()
|
|
788
788
|
};
|
|
789
789
|
});
|
|
790
790
|
}
|
package/reducers/editing.js
CHANGED
|
@@ -69,6 +69,18 @@ export default function editing() {
|
|
|
69
69
|
contexts: _objectSpread({}, state.contexts),
|
|
70
70
|
currentContext: state.currentContext === action.contextId ? action.newActiveContextId : state.currentContext
|
|
71
71
|
};
|
|
72
|
+
var _clearChildContexts = function clearChildContexts(parentId) {
|
|
73
|
+
Object.values(newState.contexts).forEach(function (context) {
|
|
74
|
+
if (context.parentContextId === parentId) {
|
|
75
|
+
_clearChildContexts(context.id);
|
|
76
|
+
delete newState.contexts[context.id];
|
|
77
|
+
if (newState.currentContext === context.id) {
|
|
78
|
+
newState.currentContext = action.newActiveContextId;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
};
|
|
83
|
+
_clearChildContexts(action.contextId);
|
|
72
84
|
delete newState.contexts[action.contextId];
|
|
73
85
|
return newState;
|
|
74
86
|
}
|
|
@@ -424,7 +424,7 @@ var EditingInterface = {
|
|
|
424
424
|
getKeyValues: function getKeyValues(keyvalues, callback) {
|
|
425
425
|
var filter = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
|
|
426
426
|
var editServiceUrl = ConfigUtils.getConfigProp("editServiceUrl").replace(/\/$/, '');
|
|
427
|
-
var req = editServiceUrl +
|
|
427
|
+
var req = editServiceUrl + "/keyvals?tables=" + keyvalues;
|
|
428
428
|
var params = {
|
|
429
429
|
filter: filter ? JSON.stringify(filter) : undefined
|
|
430
430
|
};
|