qwc2 2025.10.9 → 2025.10.14
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/display.js +30 -1
- package/actions/editing.js +22 -1
- package/actions/layerinfo.js +13 -1
- package/actions/layers.js +213 -3
- package/actions/localConfig.js +58 -1
- package/actions/locale.js +21 -1
- package/actions/locate.js +26 -1
- package/actions/logging.js +10 -1
- package/actions/map.js +105 -2
- package/actions/measurement.js +12 -1
- package/actions/processNotifications.js +37 -1
- package/actions/redlining.js +18 -1
- package/actions/redliningPick.js +12 -1
- package/actions/search.js +12 -1
- package/actions/serviceinfo.js +12 -1
- package/actions/task.js +55 -3
- package/actions/theme.js +339 -19
- package/actions/windows.js +164 -5
- package/components/AppMenu.js +435 -3
- package/components/AttributeForm.js +928 -32
- package/components/AttributeTableWidget.js +1105 -13
- package/components/AutoEditForm.js +189 -3
- package/components/CoordinateDisplayer.js +78 -2
- package/components/EditComboField.js +190 -6
- package/components/EditUploadField.js +315 -3
- package/components/ExportSelection.js +203 -2
- package/components/FullscreenSwitcher.js +90 -3
- package/components/Icon.js +81 -2
- package/components/IdentifyViewer.js +1161 -6
- package/components/ImportLayer.js +718 -20
- package/components/LayerInfoWindow.js +145 -2
- package/components/LinkFeatureForm.js +246 -5
- package/components/MapButton.js +88 -2
- package/components/MapSelection.js +287 -8
- package/components/MessageBar.js +68 -2
- package/components/NumericInputWindow.js +359 -2
- package/components/PickFeature.js +266 -2
- package/components/PluginsContainer.js +227 -8
- package/components/PrintSelection.js +620 -49
- package/components/ProcessNotifications.js +104 -2
- package/components/QtDesignerForm.js +1137 -18
- package/components/ResizeableWindow.js +591 -8
- package/components/SearchBox.js +1307 -20
- package/components/ServiceInfoWindow.js +107 -2
- package/components/SideBar.js +204 -4
- package/components/StandardApp.js +381 -20
- package/components/Swipeable.js +15 -1
- package/components/TaskBar.js +85 -2
- package/components/ThemeLayersListWindow.js +216 -4
- package/components/ThemeList.js +381 -7
- package/components/Toolbar.js +106 -2
- package/components/WindowManager.js +178 -2
- package/components/map/OlLayer.js +257 -6
- package/components/map/OlMap.js +405 -5
- package/components/map/layers/BingLayer.js +31 -2
- package/components/map/layers/GoogleLayer.js +222 -19
- package/components/map/layers/GraticuleLayer.js +21 -1
- package/components/map/layers/ImageLayer.js +15 -1
- package/components/map/layers/MVTLayer.js +52 -2
- package/components/map/layers/OSMLayer.js +24 -2
- package/components/map/layers/OverlayLayer.js +55 -3
- package/components/map/layers/VectorLayer.js +173 -8
- package/components/map/layers/WFSLayer.js +220 -6
- package/components/map/layers/WMSLayer.js +180 -6
- package/components/map/layers/WMTSLayer.js +67 -3
- package/components/map/layers/XYZLayer.js +24 -2
- package/components/map/layers/index.js +28 -1
- package/components/map3d/EditDataset3D.js +190 -3
- package/components/map3d/HeightProfile3D.js +402 -3
- package/components/map3d/ImportObjects3D.js +162 -2
- package/components/map3d/Map3D.js +1304 -38
- package/components/map3d/MapControls3D.js +392 -7
- package/components/map3d/SearchField3D.js +183 -11
- package/components/map3d/View3DSwitcher.js +98 -2
- package/components/map3d/drawtool/CreateTool3D.js +174 -4
- package/components/map3d/drawtool/EditTool3D.js +590 -6
- package/components/map3d/drawtool/NumericInput3D.js +336 -4
- package/components/map3d/layers/GeoTIFFLayer3D.js +15 -1
- package/components/map3d/layers/VectorLayer3D.js +53 -2
- package/components/map3d/layers/WFSLayer3D.js +109 -3
- package/components/map3d/layers/WMSLayer3D.js +70 -2
- package/components/map3d/layers/WMTSLayer3D.js +27 -3
- package/components/map3d/layers/index.js +14 -1
- package/components/map3d/utils/FirstPersonControls3D.js +423 -16
- package/components/map3d/utils/MiscUtils3D.js +221 -13
- package/components/map3d/utils/OrbitControls3D.js +176 -5
- package/components/map3d/utils/Tiles3DStyle.js +238 -9
- package/components/share/ShareLink.js +54 -2
- package/components/share/ShareQRCode.js +62 -2
- package/components/share/ShareSocials.js +125 -3
- package/components/timeline/FixedTimeline.js +236 -5
- package/components/timeline/InfiniteTimeline.js +347 -8
- package/components/timeline/TimelineFeaturesSlider.js +439 -5
- package/components/widgets/AccordeonWidget.js +96 -2
- package/components/widgets/ButtonBar.js +124 -2
- package/components/widgets/ColorButton.js +201 -3
- package/components/widgets/ComboBox.js +166 -2
- package/components/widgets/CopyButton.js +110 -2
- package/components/widgets/DateTimeInput.js +100 -3
- package/components/widgets/EditableSelect.js +230 -3
- package/components/widgets/FileSelector.js +128 -4
- package/components/widgets/Input.js +124 -2
- package/components/widgets/InputContainer.js +96 -2
- package/components/widgets/LayerCatalogWidget.js +219 -3
- package/components/widgets/MenuButton.js +157 -1
- package/components/widgets/ModalDialog.js +64 -2
- package/components/widgets/NavBar.js +119 -2
- package/components/widgets/NumberInput.js +226 -4
- package/components/widgets/PopupMenu.js +72 -1
- package/components/widgets/Primitives.js +6 -1
- package/components/widgets/ReCaptchaWidget.js +55 -1
- package/components/widgets/SearchWidget.js +255 -2
- package/components/widgets/Spinner.js +44 -2
- package/components/widgets/SuggestionInput.js +77 -2
- package/components/widgets/TextInput.js +308 -2
- package/components/widgets/ToggleSwitch.js +85 -2
- package/components/widgets/VectorLayerPicker.js +85 -3
- package/libs/openlayers.js +225 -5
- package/package.json +1 -1
- package/plugins/API.js +358 -15
- package/plugins/AttributeTable.js +109 -3
- package/plugins/Authentication.js +130 -5
- package/plugins/BackgroundSwitcher.js +218 -4
- package/plugins/Bookmark.js +289 -3
- package/plugins/BottomBar.js +298 -4
- package/plugins/CookiePopup.js +67 -3
- package/plugins/Cyclomedia.js +442 -5
- package/plugins/Editing.js +497 -9
- package/plugins/FeatureForm.js +366 -4
- package/plugins/FeatureSearch.js +458 -3
- package/plugins/GeometryDigitizer.js +664 -7
- package/plugins/HeightProfile.js +763 -15
- package/plugins/Help.js +102 -3
- package/plugins/HomeButton.js +80 -3
- package/plugins/Identify.js +543 -5
- package/plugins/LayerCatalog.js +215 -4
- package/plugins/LayerTree.js +1194 -6
- package/plugins/LocateButton.js +94 -3
- package/plugins/Map.js +320 -16
- package/plugins/MapCompare.js +94 -3
- package/plugins/MapCopyright.js +127 -5
- package/plugins/MapExport.js +613 -20
- package/plugins/MapFilter.js +868 -12
- package/plugins/MapInfoTooltip.js +277 -3
- package/plugins/MapLegend.js +253 -4
- package/plugins/MapTip.js +290 -4
- package/plugins/Measure.js +220 -4
- package/plugins/NewsPopup.js +137 -3
- package/plugins/OverviewMap.js +167 -7
- package/plugins/Panoramax.js +340 -2
- package/plugins/Portal.js +199 -4
- package/plugins/Print.js +1231 -15
- package/plugins/Redlining.js +750 -6
- package/plugins/Reports.js +332 -3
- package/plugins/Routing.js +1278 -15
- package/plugins/ScratchDrawing.js +173 -5
- package/plugins/Settings.js +241 -4
- package/plugins/Share.js +198 -3
- package/plugins/StartupMarker.js +84 -4
- package/plugins/TaskButton.js +88 -3
- package/plugins/ThemeSwitcher.js +164 -4
- package/plugins/TimeManager.js +971 -10
- package/plugins/TopBar.js +300 -7
- package/plugins/TourGuide.js +213 -2
- package/plugins/ValueTool.js +419 -4
- package/plugins/View3D.js +519 -14
- package/plugins/ZoomButtons.js +165 -3
- package/plugins/map/EditingSupport.js +199 -7
- package/plugins/map/LocateSupport.js +260 -4
- package/plugins/map/MeasurementSupport.js +216 -8
- package/plugins/map/RedliningPickSupport.js +201 -7
- package/plugins/map/RedliningSupport.js +726 -17
- package/plugins/map/SnapInteraction.js +101 -1
- package/plugins/map/SnapSupport.js +210 -2
- package/plugins/map/SnappingSupport.js +356 -17
- package/plugins/map3d/BackgroundSwitcher3D.js +44 -3
- package/plugins/map3d/BottomBar3D.js +118 -3
- package/plugins/map3d/Compare3D.js +422 -8
- package/plugins/map3d/Draw3D.js +353 -6
- package/plugins/map3d/ExportObjects3D.js +393 -18
- package/plugins/map3d/HideObjects3D.js +313 -12
- package/plugins/map3d/Identify3D.js +283 -12
- package/plugins/map3d/LayerTree3D.js +323 -3
- package/plugins/map3d/MapCopyright3D.js +128 -5
- package/plugins/map3d/MapExport3D.js +590 -10
- package/plugins/map3d/MapLight3D.js +553 -6
- package/plugins/map3d/Measure3D.js +571 -20
- package/plugins/map3d/OverviewMap3D.js +169 -3
- package/plugins/map3d/Settings3D.js +73 -3
- package/plugins/map3d/TopBar3D.js +207 -9
- package/plugins/redlining/RedliningBufferSupport.js +206 -3
- package/reducers/display.js +34 -2
- package/reducers/editing.js +68 -3
- package/reducers/index.js +9 -1
- package/reducers/layerinfo.js +26 -2
- package/reducers/layers.js +456 -9
- package/reducers/localConfig.js +122 -2
- package/reducers/locale.js +38 -2
- package/reducers/locate.js +40 -2
- package/reducers/map.js +176 -5
- package/reducers/measurement.js +42 -2
- package/reducers/processNotifications.js +49 -2
- package/reducers/redlining.js +50 -2
- package/reducers/redliningPick.js +27 -2
- package/reducers/search.js +20 -1
- package/reducers/serviceinfo.js +25 -2
- package/reducers/task.js +45 -2
- package/reducers/theme.js +51 -2
- package/reducers/windows.js +203 -2
- package/scripts/dist.sh +1 -1
- package/scripts/gen-plugin-docs.js +152 -2
- package/scripts/makeIconkit.js +85 -6
- package/scripts/themesConfig.js +742 -40
- package/scripts/updateTranslations.js +251 -10
- package/selectors/searchproviders.js +44 -2
- package/stores/StandardStore.js +42 -2
- package/utils/ConfigUtils.js +84 -3
- package/utils/CoordinatesUtils.js +234 -23
- package/utils/DxfUtils.js +237 -11
- package/utils/EditingInterface.js +421 -87
- package/utils/EditingUtils.js +357 -13
- package/utils/ElevationInterface.js +83 -22
- package/utils/FeatureStyles.js +429 -5
- package/utils/IdentifyUtils.js +443 -7
- package/utils/ImageEditor.js +79 -9
- package/utils/LayerUtils.js +1516 -50
- package/utils/LocaleUtils.js +117 -7
- package/utils/MapUtils.js +241 -59
- package/utils/MeasureUtils.js +323 -2
- package/utils/MiscUtils.js +189 -11
- package/utils/PermaLinkUtils.js +429 -6
- package/utils/PluginStore.js +27 -1
- package/utils/ResourceRegistry.js +15 -1
- package/utils/RoutingInterface.js +307 -7
- package/utils/SearchProviders.js +722 -19
- package/utils/ServiceLayerUtils.js +669 -14
- package/utils/Signal.js +32 -2
- package/utils/ThemeUtils.js +341 -7
- package/utils/VectorLayerUtils.js +589 -15
- package/utils/expr_grammar/grammar.js +2239 -2
- package/utils/expr_grammar/test.js +65 -3
|
@@ -1,4 +1,20 @@
|
|
|
1
|
-
function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(o){
|
|
1
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
+
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
|
|
5
|
+
function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
|
|
6
|
+
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
7
|
+
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
8
|
+
function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
|
|
9
|
+
function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
|
|
10
|
+
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
11
|
+
function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
|
|
12
|
+
function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
|
|
13
|
+
function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
|
|
14
|
+
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
15
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
16
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
17
|
+
/**
|
|
2
18
|
* Copyright 2015 GeoSolutions Sas
|
|
3
19
|
* Copyright 2016-2024 Sourcepole AG
|
|
4
20
|
* All rights reserved.
|
|
@@ -6,7 +22,247 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
|
|
|
6
22
|
* This source code is licensed under the BSD-style license found in the
|
|
7
23
|
* LICENSE file in the root directory of this source tree.
|
|
8
24
|
*
|
|
9
|
-
*/
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
import React from 'react';
|
|
28
|
+
import { connect } from 'react-redux';
|
|
29
|
+
import ol from 'openlayers';
|
|
30
|
+
import PropTypes from 'prop-types';
|
|
31
|
+
import { changeLocateState, changeLocatePosition, onLocateError } from '../../actions/locate';
|
|
32
|
+
import CoordinatesUtils from '../../utils/CoordinatesUtils';
|
|
33
|
+
import LocaleUtils from '../../utils/LocaleUtils';
|
|
34
|
+
import './style/LocateSupport.css';
|
|
35
|
+
|
|
36
|
+
/**
|
|
10
37
|
* GPS locate support for the map component.
|
|
11
|
-
*/
|
|
12
|
-
|
|
38
|
+
*/
|
|
39
|
+
var LocateSupport = /*#__PURE__*/function (_React$Component) {
|
|
40
|
+
function LocateSupport(props) {
|
|
41
|
+
var _this;
|
|
42
|
+
_classCallCheck(this, LocateSupport);
|
|
43
|
+
_this = _callSuper(this, LocateSupport, [props]);
|
|
44
|
+
_defineProperty(_this, "onLocationError", function (err) {
|
|
45
|
+
_this.props.onLocateError(err.message);
|
|
46
|
+
// User denied geolocation prompt
|
|
47
|
+
if (err.code === 1) {
|
|
48
|
+
_this.props.changeLocateState("PERMISSION_DENIED");
|
|
49
|
+
} else {
|
|
50
|
+
_this.props.changeLocateState("DISABLED");
|
|
51
|
+
}
|
|
52
|
+
_this.stop();
|
|
53
|
+
});
|
|
54
|
+
_defineProperty(_this, "start", function () {
|
|
55
|
+
_this.props.changeLocateState("LOCATING");
|
|
56
|
+
_this.geolocate.on('change:position', _this.positionChanged);
|
|
57
|
+
_this.geolocate.on('error', _this.onLocationError);
|
|
58
|
+
_this.geolocate.setTracking(true);
|
|
59
|
+
_this.props.map.addLayer(_this.posLayer);
|
|
60
|
+
_this.props.map.addOverlay(_this.posOverlay);
|
|
61
|
+
_this.props.map.on('pointerdrag', _this.maybeStopFollow);
|
|
62
|
+
_this.props.map.on('click', _this.maybeShowPopup);
|
|
63
|
+
_this.props.map.on('touch', _this.maybeShowPopup);
|
|
64
|
+
_this.posPopup.hidden = true;
|
|
65
|
+
_this.posLayer.setVisible(false);
|
|
66
|
+
});
|
|
67
|
+
_defineProperty(_this, "stop", function () {
|
|
68
|
+
_this.geolocate.un('change:position', _this.positionChanged);
|
|
69
|
+
_this.geolocate.un('error', _this.onLocationError);
|
|
70
|
+
_this.geolocate.setTracking(false);
|
|
71
|
+
_this.props.map.removeLayer(_this.posLayer);
|
|
72
|
+
_this.props.map.removeOverlay(_this.posOverlay);
|
|
73
|
+
_this.props.map.un('pointerdrag', _this.maybeStopFollow);
|
|
74
|
+
_this.props.map.un('click', _this.maybeShowPopup);
|
|
75
|
+
_this.props.map.un('touch', _this.maybeShowPopup);
|
|
76
|
+
});
|
|
77
|
+
_defineProperty(_this, "positionChanged", function () {
|
|
78
|
+
if (_this.props.locateState.state === "LOCATING") {
|
|
79
|
+
_this.props.changeLocateState(_this.requestedMode);
|
|
80
|
+
_this.posLayer.setVisible(true);
|
|
81
|
+
}
|
|
82
|
+
var mapPos = _this.geolocate.getPosition();
|
|
83
|
+
var wgsPos = CoordinatesUtils.reproject(mapPos, _this.props.projection, "EPSG:4326");
|
|
84
|
+
_this.props.changeLocatePosition(wgsPos);
|
|
85
|
+
var point = new ol.geom.Point(mapPos);
|
|
86
|
+
if (_this.props.drawCircle) {
|
|
87
|
+
var circle = new ol.geom.Circle(mapPos, _this.geolocate.getAccuracy());
|
|
88
|
+
_this.posFeature.setGeometry(new ol.geom.GeometryCollection([point, circle]));
|
|
89
|
+
} else {
|
|
90
|
+
_this.posFeature.setGeometry(point);
|
|
91
|
+
}
|
|
92
|
+
if (!_this.posPopup.hidden) {
|
|
93
|
+
_this.updatePopupContents();
|
|
94
|
+
}
|
|
95
|
+
if (_this.props.locateState.state === "FOLLOWING") {
|
|
96
|
+
_this.props.map.getView().setCenter(mapPos);
|
|
97
|
+
}
|
|
98
|
+
});
|
|
99
|
+
_defineProperty(_this, "maybeStopFollow", function () {
|
|
100
|
+
if (_this.props.locateState.state === "FOLLOWING" && _this.props.stopFollowingOnDrag) {
|
|
101
|
+
_this.props.changeLocateState("ENABLED");
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
_defineProperty(_this, "maybeShowPopup", function (ev) {
|
|
105
|
+
if (_this.props.showPopup) {
|
|
106
|
+
var feature = _this.props.map.getFeaturesAtPixel(ev.pixel, {
|
|
107
|
+
layerFilter: function layerFilter(layer) {
|
|
108
|
+
return layer === _this.posLayer;
|
|
109
|
+
}
|
|
110
|
+
})[0];
|
|
111
|
+
if (feature) {
|
|
112
|
+
_this.posPopup.hidden = false;
|
|
113
|
+
_this.updatePopupContents();
|
|
114
|
+
ev.stopPropagation();
|
|
115
|
+
} else {
|
|
116
|
+
_this.posPopup.hidden = true;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
});
|
|
120
|
+
_defineProperty(_this, "updatePopupContents", function () {
|
|
121
|
+
var accuracy = _this.geolocate.getAccuracy();
|
|
122
|
+
var contents = LocaleUtils.tr("locate.popup");
|
|
123
|
+
if (_this.props.metric) {
|
|
124
|
+
contents = contents.replace("{distance}", accuracy);
|
|
125
|
+
contents = contents.replace("{unit}", LocaleUtils.tr("locate.metersUnit"));
|
|
126
|
+
} else {
|
|
127
|
+
contents = contents.replace("{distance}", Math.round(accuracy * 3.2808399));
|
|
128
|
+
contents = contents.replace("{unit}", LocaleUtils.tr("locate.feetUnit"));
|
|
129
|
+
}
|
|
130
|
+
_this.posOverlayContents.innerHTML = contents;
|
|
131
|
+
_this.posOverlay.setPosition(_this.posFeature.getGeometry().getGeometries()[0].getCoordinates());
|
|
132
|
+
});
|
|
133
|
+
_defineProperty(_this, "locationPositionFeatureStyle", function () {
|
|
134
|
+
return new ol.style.Style({
|
|
135
|
+
image: new ol.style.Circle({
|
|
136
|
+
radius: 6,
|
|
137
|
+
fill: new ol.style.Fill({
|
|
138
|
+
color: 'rgba(42, 147, 238, 0.7)'
|
|
139
|
+
}),
|
|
140
|
+
stroke: new ol.style.Stroke({
|
|
141
|
+
color: 'rgba(19, 106, 236, 1)',
|
|
142
|
+
width: 2
|
|
143
|
+
})
|
|
144
|
+
}),
|
|
145
|
+
fill: new ol.style.Fill({
|
|
146
|
+
color: 'rgba(19, 106, 236, 0.15)'
|
|
147
|
+
}),
|
|
148
|
+
stroke: new ol.style.Stroke({
|
|
149
|
+
color: 'rgba(19, 106, 236, 1)',
|
|
150
|
+
width: 2
|
|
151
|
+
})
|
|
152
|
+
});
|
|
153
|
+
});
|
|
154
|
+
_defineProperty(_this, "createPopup", function () {
|
|
155
|
+
var popup = document.createElement('div');
|
|
156
|
+
popup.className = "locate-popup";
|
|
157
|
+
popup.innerHTML = "\n <a class=\"locate-popup-close\">\u2716</a>\n <div class=\"locate-popup-contents\">\n ";
|
|
158
|
+
return popup;
|
|
159
|
+
});
|
|
160
|
+
var trackingOptions = _objectSpread(_objectSpread({}, LocateSupport.defaultProps.trackingOptions), props.trackingOptions);
|
|
161
|
+
_this.geolocate = new ol.Geolocation({
|
|
162
|
+
projection: _this.props.projection,
|
|
163
|
+
trackingOptions: trackingOptions
|
|
164
|
+
});
|
|
165
|
+
_this.posLayer = new ol.layer.Vector({
|
|
166
|
+
source: new ol.source.Vector(),
|
|
167
|
+
zIndex: 1000000,
|
|
168
|
+
style: _this.locationPositionFeatureStyle
|
|
169
|
+
});
|
|
170
|
+
_this.posFeature = new ol.Feature();
|
|
171
|
+
_this.posFeature.set('__suppress_map_click', true);
|
|
172
|
+
_this.posLayer.getSource().addFeature(_this.posFeature);
|
|
173
|
+
_this.posPopup = _this.createPopup();
|
|
174
|
+
_this.posOverlay = new ol.Overlay({
|
|
175
|
+
element: _this.posPopup,
|
|
176
|
+
positioning: 'top-center',
|
|
177
|
+
stopEvent: true
|
|
178
|
+
});
|
|
179
|
+
_this.posOverlayContents = _this.posPopup.getElementsByClassName("locate-popup-contents")[0];
|
|
180
|
+
_this.posPopup.getElementsByClassName("locate-popup-close")[0].onclick = function () {
|
|
181
|
+
_this.posPopup.hidden = true;
|
|
182
|
+
};
|
|
183
|
+
_this.requestedMode = 'DISABLED';
|
|
184
|
+
return _this;
|
|
185
|
+
}
|
|
186
|
+
_inherits(LocateSupport, _React$Component);
|
|
187
|
+
return _createClass(LocateSupport, [{
|
|
188
|
+
key: "componentDidMount",
|
|
189
|
+
value: function componentDidMount() {
|
|
190
|
+
var startupMode = this.props.startupMode.toUpperCase();
|
|
191
|
+
var startupParams = this.props.startupParams;
|
|
192
|
+
var highlightCenter = ["true", "1"].includes((startupParams.hc || "").toLowerCase());
|
|
193
|
+
var searchParams = startupParams.hp || startupParams.hf || startupParams.st;
|
|
194
|
+
if (startupMode !== "DISABLED" && !searchParams && !highlightCenter) {
|
|
195
|
+
this.requestedMode = startupMode;
|
|
196
|
+
this.start();
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
}, {
|
|
200
|
+
key: "componentDidUpdate",
|
|
201
|
+
value: function componentDidUpdate(prevProps) {
|
|
202
|
+
var newState = this.props.locateState.state;
|
|
203
|
+
var oldState = prevProps.locateState.state;
|
|
204
|
+
if (newState !== oldState) {
|
|
205
|
+
if (newState === "ENABLED" || newState === "FOLLOWING") {
|
|
206
|
+
this.requestedMode = newState;
|
|
207
|
+
if (oldState === "DISABLED") {
|
|
208
|
+
this.start();
|
|
209
|
+
}
|
|
210
|
+
} else if (newState === "DISABLED") {
|
|
211
|
+
this.requestedMode = "DISABLED";
|
|
212
|
+
this.stop();
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
if (this.props.projection !== prevProps.projection) {
|
|
216
|
+
this.geolocate.setProjection(this.props.projection);
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}, {
|
|
220
|
+
key: "render",
|
|
221
|
+
value: function render() {
|
|
222
|
+
return null;
|
|
223
|
+
}
|
|
224
|
+
}]);
|
|
225
|
+
}(React.Component);
|
|
226
|
+
_defineProperty(LocateSupport, "propTypes", {
|
|
227
|
+
changeLocatePosition: PropTypes.func,
|
|
228
|
+
changeLocateState: PropTypes.func,
|
|
229
|
+
/** Whether to draw an accuracy circle around the location point. */
|
|
230
|
+
drawCircle: PropTypes.bool,
|
|
231
|
+
locateState: PropTypes.object,
|
|
232
|
+
map: PropTypes.object,
|
|
233
|
+
/** Whether to display the accuracy in meters (`true`) or in feet (`false`). */
|
|
234
|
+
metric: PropTypes.bool,
|
|
235
|
+
onLocateError: PropTypes.func,
|
|
236
|
+
projection: PropTypes.string,
|
|
237
|
+
/** Whether to show a popup displaying accuracy information when clicking on the location point. */
|
|
238
|
+
showPopup: PropTypes.bool,
|
|
239
|
+
/** The geolocation startup mode. Either `DISABLED`, `ENABLED` or `FOLLOWING`. */
|
|
240
|
+
startupMode: PropTypes.string,
|
|
241
|
+
startupParams: PropTypes.object,
|
|
242
|
+
/** Whether to stop following when the map is dragged. */
|
|
243
|
+
stopFollowingOnDrag: PropTypes.bool,
|
|
244
|
+
/** Tracking options, as documented in the [HTML5 Geolocation spec](https://www.w3.org/TR/geolocation-API/#position_options_interface) */
|
|
245
|
+
trackingOptions: PropTypes.object
|
|
246
|
+
});
|
|
247
|
+
_defineProperty(LocateSupport, "defaultProps", {
|
|
248
|
+
drawCircle: true,
|
|
249
|
+
metric: true,
|
|
250
|
+
showPopup: false,
|
|
251
|
+
startupMode: "DISABLED",
|
|
252
|
+
stopFollowingOnDrag: false,
|
|
253
|
+
trackingOptions: {
|
|
254
|
+
maximumAge: 2000,
|
|
255
|
+
enableHighAccuracy: true,
|
|
256
|
+
timeout: 10000
|
|
257
|
+
}
|
|
258
|
+
});
|
|
259
|
+
export default connect(function (state) {
|
|
260
|
+
return {
|
|
261
|
+
locateState: state.locate,
|
|
262
|
+
startupParams: state.localConfig.startupParams
|
|
263
|
+
};
|
|
264
|
+
}, {
|
|
265
|
+
changeLocateState: changeLocateState,
|
|
266
|
+
changeLocatePosition: changeLocatePosition,
|
|
267
|
+
onLocateError: onLocateError
|
|
268
|
+
})(LocateSupport);
|
|
@@ -1,15 +1,223 @@
|
|
|
1
|
-
function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==
|
|
1
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
+
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
3
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
|
+
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
5
|
+
function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
|
|
6
|
+
function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
|
|
7
|
+
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
8
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
9
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
10
|
+
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
|
|
11
|
+
function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
|
|
12
|
+
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
13
|
+
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
14
|
+
function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
|
|
15
|
+
function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
|
|
16
|
+
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
17
|
+
function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
|
|
18
|
+
function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
|
|
19
|
+
function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
|
|
20
|
+
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
21
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
22
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
23
|
+
/**
|
|
2
24
|
* Copyright 2016 GeoSolutions Sas
|
|
3
25
|
* Copyright 2016-2024 Sourcepole AG
|
|
4
26
|
* All rights reserved.
|
|
5
27
|
*
|
|
6
28
|
* This source code is licensed under the BSD-style license found in the
|
|
7
29
|
* LICENSE file in the root directory of this source tree.
|
|
8
|
-
*/
|
|
30
|
+
*/
|
|
31
|
+
|
|
32
|
+
import React from 'react';
|
|
33
|
+
import { connect } from 'react-redux';
|
|
34
|
+
import ol from 'openlayers';
|
|
35
|
+
import PropTypes from 'prop-types';
|
|
36
|
+
import { changeMeasurementState } from '../../actions/measurement';
|
|
37
|
+
import FeatureStyles from '../../utils/FeatureStyles';
|
|
38
|
+
import MeasureUtils from '../../utils/MeasureUtils';
|
|
39
|
+
|
|
40
|
+
/**
|
|
9
41
|
* Measurement support for the map component.
|
|
10
|
-
*/
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
42
|
+
*/
|
|
43
|
+
var MeasurementSupport = /*#__PURE__*/function (_React$Component) {
|
|
44
|
+
function MeasurementSupport(props) {
|
|
45
|
+
var _this;
|
|
46
|
+
_classCallCheck(this, MeasurementSupport);
|
|
47
|
+
_this = _callSuper(this, MeasurementSupport, [props]);
|
|
48
|
+
_defineProperty(_this, "addDrawInteraction", function (newProps) {
|
|
49
|
+
_this.reset();
|
|
50
|
+
|
|
51
|
+
// Create a layer to draw on
|
|
52
|
+
_this.measureLayer = new ol.layer.Vector({
|
|
53
|
+
source: new ol.source.Vector(),
|
|
54
|
+
zIndex: 1000000
|
|
55
|
+
});
|
|
56
|
+
_this.props.map.addLayer(_this.measureLayer);
|
|
57
|
+
var geometryType = newProps.measurement.geomType;
|
|
58
|
+
if (geometryType === 'Bearing') {
|
|
59
|
+
geometryType = 'LineString';
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
// create an interaction to draw with
|
|
63
|
+
_this.drawInteraction = new ol.interaction.Draw({
|
|
64
|
+
stopClick: true,
|
|
65
|
+
source: _this.measureLayer.getSource(),
|
|
66
|
+
condition: function condition(event) {
|
|
67
|
+
return event.originalEvent.buttons === 1;
|
|
68
|
+
},
|
|
69
|
+
type: geometryType,
|
|
70
|
+
style: function style() {
|
|
71
|
+
return _this.modifyInteraction ? [] : FeatureStyles.sketchInteraction();
|
|
72
|
+
}
|
|
73
|
+
});
|
|
74
|
+
_this.drawInteraction.on('drawstart', function (ev) {
|
|
75
|
+
_this.leaveTemporaryPickMode();
|
|
76
|
+
_this.measureLayer.getSource().clear();
|
|
77
|
+
_this.sketchFeature = ev.feature;
|
|
78
|
+
_this.sketchFeature.setStyle(_this.featureStyleFunction);
|
|
79
|
+
_this.sketchFeature.on('change', function (evt) {
|
|
80
|
+
return _this.updateMeasurementResults(evt.target);
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
_this.drawInteraction.on('drawend', function () {
|
|
84
|
+
_this.updateMeasurementResults(_this.sketchFeature, false);
|
|
85
|
+
_this.enterTemporaryPickMode();
|
|
86
|
+
});
|
|
87
|
+
_this.props.map.addInteraction(_this.drawInteraction);
|
|
88
|
+
});
|
|
89
|
+
_defineProperty(_this, "reset", function () {
|
|
90
|
+
if (_this.drawInteraction !== null) {
|
|
91
|
+
_this.props.map.removeInteraction(_this.drawInteraction);
|
|
92
|
+
_this.drawInteraction = null;
|
|
93
|
+
_this.leaveTemporaryPickMode();
|
|
94
|
+
_this.props.map.removeLayer(_this.measureLayer);
|
|
95
|
+
_this.measureLayer = null;
|
|
96
|
+
_this.sketchFeature = null;
|
|
97
|
+
}
|
|
98
|
+
});
|
|
99
|
+
_defineProperty(_this, "enterTemporaryPickMode", function () {
|
|
100
|
+
_this.modifyInteraction = new ol.interaction.Modify({
|
|
101
|
+
features: new ol.Collection([_this.sketchFeature]),
|
|
102
|
+
condition: function condition(event) {
|
|
103
|
+
return event.originalEvent.buttons === 1;
|
|
104
|
+
},
|
|
105
|
+
insertVertexCondition: function insertVertexCondition() {
|
|
106
|
+
return _this.props.measurement.geomType === 'Bearing' ? false : true;
|
|
107
|
+
},
|
|
108
|
+
deleteCondition: function deleteCondition(event) {
|
|
109
|
+
return ol.events.condition.shiftKeyOnly(event) && ol.events.condition.singleClick(event);
|
|
110
|
+
},
|
|
111
|
+
style: function style(feature) {
|
|
112
|
+
// Hack to get cursor position over geometry...
|
|
113
|
+
if (_this.props.measurement.pickPositionCallback) {
|
|
114
|
+
clearTimeout(_this.pickPositionCallbackTimeout);
|
|
115
|
+
_this.props.measurement.pickPositionCallback(feature.getGeometry().getCoordinates());
|
|
116
|
+
}
|
|
117
|
+
return FeatureStyles.sketchInteraction();
|
|
118
|
+
}
|
|
119
|
+
});
|
|
120
|
+
_this.props.map.on('pointermove', _this.clearPickPosition);
|
|
121
|
+
_this.modifyInteraction.on('modifyend', function () {
|
|
122
|
+
_this.updateMeasurementResults(_this.sketchFeature, false);
|
|
123
|
+
});
|
|
124
|
+
_this.props.map.addInteraction(_this.modifyInteraction);
|
|
125
|
+
});
|
|
126
|
+
_defineProperty(_this, "leaveTemporaryPickMode", function () {
|
|
127
|
+
if (_this.modifyInteraction) {
|
|
128
|
+
_this.props.map.un('pointermove', _this.clearPickPosition);
|
|
129
|
+
_this.props.map.removeInteraction(_this.modifyInteraction);
|
|
130
|
+
_this.modifyInteraction = null;
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
_defineProperty(_this, "clearPickPosition", function () {
|
|
134
|
+
if (_this.props.measurement.pickPositionCallback) {
|
|
135
|
+
clearTimeout(_this.pickPositionCallbackTimeout);
|
|
136
|
+
// Works because style function clears timeout if marker is rendered, i.e. if mouse is over measure geometry
|
|
137
|
+
_this.pickPositionCallbackTimeout = setTimeout(function () {
|
|
138
|
+
if (_this.props.measurement.pickPositionCallback) {
|
|
139
|
+
_this.props.measurement.pickPositionCallback(null);
|
|
140
|
+
}
|
|
141
|
+
}, 50);
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
_defineProperty(_this, "updateMeasurementResults", function (feature) {
|
|
145
|
+
var drawing = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
146
|
+
var geomType = _this.props.measurement.geomType;
|
|
147
|
+
var settings = {
|
|
148
|
+
lenUnit: _this.props.measurement.lenUnit,
|
|
149
|
+
areaUnit: _this.props.measurement.areaUnit,
|
|
150
|
+
displayCrs: _this.props.displayCrs
|
|
151
|
+
};
|
|
152
|
+
MeasureUtils.updateFeatureMeasurements(feature, geomType, _this.props.projection, settings);
|
|
153
|
+
|
|
154
|
+
// Only one segment for bearing measurement
|
|
155
|
+
if (geomType === 'Bearing' && feature.getGeometry().getCoordinates().length > 2) {
|
|
156
|
+
_this.drawInteraction.finishDrawing();
|
|
157
|
+
}
|
|
158
|
+
_this.measureLayer.getSource().changed();
|
|
159
|
+
_this.props.changeMeasurementState(_objectSpread({
|
|
160
|
+
geomType: _this.props.measurement.geomType,
|
|
161
|
+
drawing: drawing,
|
|
162
|
+
coordinates: feature.getGeometry().getCoordinates()
|
|
163
|
+
}, structuredClone(feature.get('measurements'))));
|
|
164
|
+
});
|
|
165
|
+
_defineProperty(_this, "featureStyleFunction", function (feature) {
|
|
166
|
+
var geometryFunction = function geometryFunction(f) {
|
|
167
|
+
if (f.getGeometry().getType() === "Point") {
|
|
168
|
+
return new ol.geom.MultiPoint([f.getGeometry().getCoordinates()]);
|
|
169
|
+
} else if (f.getGeometry().getType() === "LineString") {
|
|
170
|
+
return new ol.geom.MultiPoint(f.getGeometry().getCoordinates());
|
|
171
|
+
}
|
|
172
|
+
return new ol.geom.MultiPoint(f.getGeometry().getCoordinates()[0]);
|
|
173
|
+
};
|
|
174
|
+
var opts = {};
|
|
175
|
+
if (_this.props.measurement.geomType === 'LineString') {
|
|
176
|
+
opts.headmarker = _this.props.measurement.lineHeadMarker;
|
|
177
|
+
opts.tailmarker = _this.props.measurement.lineHeadMarker;
|
|
178
|
+
} else if (_this.props.measurement.geomType === 'Bearing') {
|
|
179
|
+
opts.headmarker = _this.props.measurement.bearingHeadMarker;
|
|
180
|
+
opts.tailmarker = _this.props.measurement.bearingHeadMarker;
|
|
181
|
+
}
|
|
182
|
+
return [].concat(_toConsumableArray(FeatureStyles.measureInteraction(feature, opts)), [FeatureStyles.measureInteractionVertex({
|
|
183
|
+
geometryFunction: geometryFunction
|
|
184
|
+
})]);
|
|
185
|
+
});
|
|
186
|
+
_this.pickPositionCallbackTimeout = null;
|
|
187
|
+
_this.measureLayer = null;
|
|
188
|
+
return _this;
|
|
189
|
+
}
|
|
190
|
+
_inherits(MeasurementSupport, _React$Component);
|
|
191
|
+
return _createClass(MeasurementSupport, [{
|
|
192
|
+
key: "componentDidUpdate",
|
|
193
|
+
value: function componentDidUpdate(prevProps) {
|
|
194
|
+
if (this.props.measurement.geomType && this.props.measurement.geomType !== prevProps.measurement.geomType) {
|
|
195
|
+
this.addDrawInteraction(this.props);
|
|
196
|
+
} else if (!this.props.measurement.geomType) {
|
|
197
|
+
this.reset();
|
|
198
|
+
} else if (this.sketchFeature && (this.props.measurement.lenUnit !== prevProps.measurement.lenUnit || this.props.measurement.areaUnit !== prevProps.measurement.areaUnit || this.props.displayCrs !== prevProps.displayCrs)) {
|
|
199
|
+
this.updateMeasurementResults(this.sketchFeature, this.props.measurement.drawing);
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
}, {
|
|
203
|
+
key: "render",
|
|
204
|
+
value: function render() {
|
|
205
|
+
return null;
|
|
206
|
+
}
|
|
207
|
+
}]);
|
|
208
|
+
}(React.Component);
|
|
209
|
+
_defineProperty(MeasurementSupport, "propTypes", {
|
|
210
|
+
changeMeasurementState: PropTypes.func,
|
|
211
|
+
displayCrs: PropTypes.string,
|
|
212
|
+
map: PropTypes.object,
|
|
213
|
+
measurement: PropTypes.object,
|
|
214
|
+
projection: PropTypes.string
|
|
215
|
+
});
|
|
216
|
+
export default connect(function (state) {
|
|
217
|
+
return {
|
|
218
|
+
displayCrs: state.map.displayCrs,
|
|
219
|
+
measurement: state.measurement
|
|
220
|
+
};
|
|
221
|
+
}, {
|
|
222
|
+
changeMeasurementState: changeMeasurementState
|
|
223
|
+
})(MeasurementSupport);
|