qwc2 2025.10.7 → 2025.10.9

package/components/PrintSelection.js

@@ -4,7 +4,7 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import React from"react";import isEqual from"lodash.isequal";import ol from"openlayers";import PropTypes from"prop-types";import FeatureStyles from"../utils/FeatureStyles";import MapUtils from"../utils/MapUtils";var PrintSelection=/*#__PURE__*/function(_React$Component){function PrintSelection(props){var _this$map$getView$get;var _this;_classCallCheck(this,PrintSelection);_this=_callSuper(this,PrintSelection,[props]);_defineProperty(_this,"getGeometry",function(){var modifyGeometry=_this.feature.get("modifyGeometry");return modifyGeometry?modifyGeometry.geometry:_this.feature.getGeometry()});_defineProperty(_this,"getBackgroundGeometry",function(feature){var background=feature.getGeometry().clone();if(_this.feature!==null){var geom=_this.getGeometry().clone();// ignore degenerate geometries
+ */import React from"react";import isEqual from"lodash.isequal";import ol from"openlayers";import PropTypes from"prop-types";import rotateCursor from"../resources/rotate.svg";import FeatureStyles from"../utils/FeatureStyles";import MapUtils from"../utils/MapUtils";var PrintSelection=/*#__PURE__*/function(_React$Component){function PrintSelection(props){var _this$map$getView$get;var _this;_classCallCheck(this,PrintSelection);_this=_callSuper(this,PrintSelection,[props]);_defineProperty(_this,"setViewportCursor",function(ev){if(_this.isInteracting){return}var overFeature=_this.map.getFeaturesAtPixel(ev.pixel,{hitTolerance:20,layerFilter:function layerFilter(layer){return layer===_this.selectionLayer}}).includes(_this.feature);if(!overFeature){_this.map.getViewport().style.cursor="";return}var sqdist=function sqdist(p,q){return(p[0]-q[0])*(p[0]-q[0])+(p[1]-q[1])*(p[1]-q[1])};var getPixelFromCoordinate=MapUtils.getHook(MapUtils.GET_PIXEL_FROM_COORDINATES_HOOK);var topright=getPixelFromCoordinate(_this.feature.getGeometry().getCoordinates()[0][0],false);var bottomright=getPixelFromCoordinate(_this.feature.getGeometry().getCoordinates()[0][1],false);var bottomleft=getPixelFromCoordinate(_this.feature.getGeometry().getCoordinates()[0][2],false);var topleft=getPixelFromCoordinate(_this.feature.getGeometry().getCoordinates()[0][3],false);if(sqdist(ev.pixel,topright)<400){_this.map.getViewport().style.cursor="nesw-resize"}else if(sqdist(ev.pixel,bottomright)<400){_this.map.getViewport().style.cursor="url(".concat(rotateCursor,") 12 12, auto")}else if(sqdist(ev.pixel,bottomleft)<400){_this.map.getViewport().style.cursor="nesw-resize"}else if(sqdist(ev.pixel,topleft)<400){_this.map.getViewport().style.cursor="nwse-resize"}else{_this.map.getViewport().style.cursor=""}});_defineProperty(_this,"getGeometry",function(){var modifyGeometry=_this.feature.get("modifyGeometry");return modifyGeometry?modifyGeometry.geometry:_this.feature.getGeometry()});_defineProperty(_this,"getBackgroundGeometry",function(feature){var background=feature.getGeometry().clone();if(_this.feature!==null){var geom=_this.getGeometry().clone();// ignore degenerate geometries
 if(geom.getArea()===0){return background}// make the current selection transparent
 background.appendLinearRing(geom.getLinearRing(0));// add the origin to the selected tiles
 var selected=["0,0"].concat(_toConsumableArray(_this.props.printSeriesSelected));// make the selected series transparent
@@ -43,10 +43,10 @@ var x1=this.props.center[0]+0.5*width;var x2=this.props.center[0]-0.5*width;var
 if(this.props.rotation){geometry.rotate(this.props.rotation*Math.PI/180,this.props.center)}if(this.props.scale){geometry.scale(this.props.scale/1000,undefined,this.props.center)}// add feature to layer
 this.feature=new ol.Feature(geometry);this.feature.on("change",this.geometryChanged);this.source.addFeature(this.feature);// store initial width and height for future updates
 this.initialWidth=width;this.initialHeight=height;// update geometry to new extent
-this.geometryChanged()}}},{key:"componentDidMount",value:function componentDidMount(){this.map.addLayer(this.selectionLayer);this.addInteractions();this.recomputeFeature()}},{key:"componentWillUnmount",value:function componentWillUnmount(){this.map.removeLayer(this.selectionLayer);this.removeInteractions()}},{key:"addInteractions",value:function addInteractions(){var _this2=this;// move the selection
+this.geometryChanged()}}},{key:"componentDidMount",value:function componentDidMount(){this.map.on("pointermove",this.setViewportCursor);this.map.addLayer(this.selectionLayer);this.addInteractions();this.recomputeFeature()}},{key:"componentWillUnmount",value:function componentWillUnmount(){this.map.un("pointermove",this.setViewportCursor);this.map.removeLayer(this.selectionLayer);this.removeInteractions()}},{key:"addInteractions",value:function addInteractions(){var _this2=this;// move the selection
 var translateCondition=function translateCondition(ev){return ol.events.condition.primaryAction(ev)&&_this2.props.fixedFrame&&_this2.props.allowTranslation};this.translateInteraction=new ol.interaction.Translate({condition:translateCondition,// add condition to filter for correct cursor selection
 filter:function filter(feature){return _this2.props.fixedFrame&&_this2.props.allowTranslation&&feature===_this2.feature},layers:[this.selectionLayer]});this.translateInteraction.on("translatestart",function(){_this2.isInteracting=true});this.translateInteraction.on("translateend",function(){_this2.isInteracting=false});// scale and rotate the selection
-var modifyCondition=function modifyCondition(ev){return ol.events.condition.primaryAction(ev)&&_this2.props.fixedFrame&&(_this2.props.allowScaling||_this2.props.allowRotation)};this.scaleRotateInteraction=new ol.interaction.Modify({source:this.source,condition:modifyCondition,deleteCondition:ol.events.condition.never,insertVertexCondition:ol.events.condition.never,pixelTolerance:20,style:this.scaleRotateStyle});this.scaleRotateInteraction.on("modifystart",function(ev){_this2.isInteracting=true;_this2.map.getViewport().style.cursor="grabbing";ev.features.forEach(function(feature){feature.set("modifyGeometry",{geometry:feature.getGeometry().clone()},true)})});this.scaleRotateInteraction.on("modifyend",function(ev){_this2.isInteracting=false;_this2.map.getViewport().style.cursor="";ev.features.forEach(function(feature){var modifyGeometry=feature.get("modifyGeometry");if(modifyGeometry){feature.setGeometry(modifyGeometry.geometry);feature.unset("modifyGeometry",true)}})});// select frames for printing a series
+var modifyCondition=function modifyCondition(ev){return ol.events.condition.primaryAction(ev)&&_this2.props.fixedFrame&&(_this2.props.allowScaling||_this2.props.allowRotation)};this.scaleRotateInteraction=new ol.interaction.Modify({source:this.source,condition:modifyCondition,deleteCondition:ol.events.condition.never,insertVertexCondition:ol.events.condition.never,pixelTolerance:20,style:this.scaleRotateStyle});this.scaleRotateInteraction.on("modifystart",function(ev){_this2.isInteracting=true;ev.features.forEach(function(feature){feature.set("modifyGeometry",{geometry:feature.getGeometry().clone()},true)})});this.scaleRotateInteraction.on("modifyend",function(ev){_this2.isInteracting=false;ev.features.forEach(function(feature){var modifyGeometry=feature.get("modifyGeometry");if(modifyGeometry){feature.setGeometry(modifyGeometry.geometry);feature.unset("modifyGeometry",true)}});_this2.recomputeFeature()});// select frames for printing a series
 this.selectPrintSeriesInteraction=new ol.interaction.Select({filter:function filter(feature){return feature===_this2.printSeriesFeature},layers:[this.selectionLayer],condition:ol.events.condition.click,addCondition:ol.events.condition.always,removeCondition:ol.events.condition.always,style:null});this.selectPrintSeriesInteraction.on("select",function(ev){var coordinate=ev.mapBrowserEvent.coordinate;var intersecting=_this2.seriesGeometries.find(function(entry){return!isEqual(entry.index,[0,0])&&entry.geometry.intersectsCoordinate(coordinate)});if(intersecting){var selected=_this2.props.printSeriesSelected;if(selected.includes(intersecting.index.join(","))){selected=selected.filter(function(index){return index!==intersecting.index.join(",")})}else{selected=[].concat(_toConsumableArray(selected),[intersecting.index.join(",")])}_this2.props.printSeriesChanged(selected)}});// select a new area when no frame is given (only added when no fixed frame is given)
 var drawCondition=function drawCondition(ev){return ol.events.condition.primaryAction(ev)&&!_this2.props.fixedFrame};this.drawInteraction=new ol.interaction.Draw({source:this.source,type:"Circle",style:FeatureStyles.printInteraction(),geometryFunction:ol.interaction.createBox(),condition:ol.events.condition.never,freehandCondition:drawCondition});this.drawInteraction.on("drawstart",function(ev){_this2.isInteracting=true;_this2.feature=ev.feature;_this2.feature.on("change",_this2.geometryChanged)});this.drawInteraction.on("drawend",function(){_this2.isInteracting=false;_this2.geometryChanged()});// register interactions
 this.map.addInteraction(this.translateInteraction);this.map.addInteraction(this.scaleRotateInteraction);this.map.addInteraction(this.selectPrintSeriesInteraction);this.map.addInteraction(this.drawInteraction)}},{key:"removeInteractions",value:function removeInteractions(){if(this.translateInteraction!==null){this.map.removeInteraction(this.translateInteraction);this.translateInteraction=null}if(this.scaleRotateInteraction!==null){this.map.removeInteraction(this.scaleRotateInteraction);this.scaleRotateInteraction=null}if(this.selectPrintSeriesInteraction!==null){this.map.removeInteraction(this.selectPrintSeriesInteraction);this.selectPrintSeriesInteraction=null}if(this.drawInteraction!==null){this.map.removeInteraction(this.drawInteraction);this.drawInteraction=null}}},{key:"render",value:function render(){return null}}])}(React.Component);_defineProperty(PrintSelection,"propTypes",{allowRotation:PropTypes.bool,allowScaling:PropTypes.bool,allowTranslation:PropTypes.bool,center:PropTypes.arrayOf(PropTypes.number),fixedFrame:PropTypes.shape({width:PropTypes.number,// in meters

package/components/SearchBox.js

@@ -4,12 +4,14 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import React from"react";import{connect}from"react-redux";import axios from"axios";import classnames from"classnames";import DOMPurify from"dompurify";import isEmpty from"lodash.isempty";import pointInPolygon from"point-in-polygon";import polygonIntersectTest from"polygon-intersect-test";import PropTypes from"prop-types";import{createSelector}from"reselect";import{v4 as uuidv4}from"uuid";import{LayerRole,addLayerFeatures,addThemeSublayer,changeLayerProperty,removeLayer,addLayer}from"../actions/layers";import{logAction}from"../actions/logging";import{panTo,zoomToExtent,zoomToPoint}from"../actions/map";import{setCurrentSearchResult}from"../actions/search";import{setCurrentTask}from"../actions/task";import{setCurrentTheme}from"../actions/theme";import{openExternalUrl,showNotification}from"../actions/windows";import searchProvidersSelector from"../selectors/searchproviders";import ConfigUtils from"../utils/ConfigUtils";import CoordinatesUtils from"../utils/CoordinatesUtils";import LayerUtils from"../utils/LayerUtils";import LocaleUtils from"../utils/LocaleUtils";import MapUtils from"../utils/MapUtils";import MiscUtils from"../utils/MiscUtils";import{UrlParams}from"../utils/PermaLinkUtils";import{FulltextSearch,SearchResultType}from"../utils/SearchProviders";import VectorLayerUtils from"../utils/VectorLayerUtils";import Icon from"./Icon";import MapSelection from"./MapSelection";import ButtonBar from"./widgets/ButtonBar";import ComboBox from"./widgets/ComboBox";import InputContainer from"./widgets/InputContainer";import NumberInput from"./widgets/NumberInput";import Spinner from"./widgets/Spinner";import"./style/SearchBox.css";var SearchBox=/*#__PURE__*/function(_React$Component){function SearchBox(props){var _this;_classCallCheck(this,SearchBox);_this=_callSuper(this,SearchBox,[props]);_defineProperty(_this,"state",{searchText:"",searchSession:null,pendingSearches:[],recentSearches:[],searchResults:{},resultsVisible:false,collapsedSections:{},expandedLayerGroup:null,activeLayerInfo:null,filterOptionsVisible:false,searchFilterRegions:null,selectedProvider:"",filterRegionName:"",filterGeomType:null,filterGeometry:null});_defineProperty(_this,"loadFilterRegions",function(){var searchRegions=ConfigUtils.getConfigProp("searchFilterRegions",_this.props.theme);if(Array.isArray(searchRegions)){_this.setState({searchFilterRegions:searchRegions})}else if(typeof searchRegions==="string"){axios.get(searchRegions).then(function(response){_this.setState({searchFilterRegions:response.data})})["catch"](function(){_this.setState({searchFilterRegions:null})})}else{_this.setState({searchFilterRegions:null})}});_defineProperty(_this,"renderFilterOptions",function(){var _this$state$filterGeo;if(!_this.state.filterOptionsVisible){return null}var providerSelection=/*#__PURE__*/React.createElement(ComboBox,{onChange:function onChange(value){return _this.setState({selectedProvider:value})},value:_this.state.selectedProvider},/*#__PURE__*/React.createElement("div",{value:""},LocaleUtils.tr("search.all")),Object.entries(_this.props.searchProviders).map(function(_ref){var _prov$params,_prov$label;var _ref2=_slicedToArray(_ref,2),key=_ref2[0],prov=_ref2[1];return/*#__PURE__*/React.createElement("div",{key:key,value:key},(prov===null||prov===void 0||(_prov$params=prov.params)===null||_prov$params===void 0?void 0:_prov$params.title)||((_prov$label=prov.label)!==null&&_prov$label!==void 0?_prov$label:LocaleUtils.tr(prov.labelmsgid)))}));var searchRegionSelection=null;if(Array.isArray(_this.state.searchFilterRegions)){searchRegionSelection=/*#__PURE__*/React.createElement(ComboBox,{onChange:function onChange(value){return _this.setFilterRegion(value,_this.state.searchFilterRegions)},value:_this.state.filterRegionName},/*#__PURE__*/React.createElement("div",{value:""},LocaleUtils.tr("search.none")),_this.state.searchFilterRegions.map(function(group,gidx){return[/*#__PURE__*/React.createElement("div",{"data-group-header":gidx,disabled:true,key:"group"+gidx},group.name)].concat(_toConsumableArray(group.items.map(function(item,idx){return/*#__PURE__*/React.createElement("div",{"data-group":gidx,key:item.name,value:gidx+":"+idx+":"+item.name},item.name)})))}))}var filterButtons=[{key:"Polygon",tooltip:LocaleUtils.tr("redlining.polygon"),icon:"polygon",label:LocaleUtils.tr("redlining.polygon")},{key:"Circle",tooltip:LocaleUtils.tr("redlining.circle"),icon:"circle",label:LocaleUtils.tr("redlining.circle")}];return/*#__PURE__*/React.createElement("div",{className:"searchbox-filter-options"},/*#__PURE__*/React.createElement("table",null,/*#__PURE__*/React.createElement("tbody",null,/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("search.providerselection"),":"),/*#__PURE__*/React.createElement("td",null,providerSelection)),/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("search.limittoarea"),":"),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement("div",{className:"searchbox-filter-options-geometry controlgroup"},/*#__PURE__*/React.createElement(ButtonBar,{active:_this.state.filterGeomType,buttons:filterButtons,onClick:_this.setFilterGeomType}),searchRegionSelection,/*#__PURE__*/React.createElement("button",{className:"button",onClick:_this.clearFilter,title:LocaleUtils.tr("search.clearfilter")},/*#__PURE__*/React.createElement(Icon,{icon:"clear"}))))),_this.state.filterGeomType==="Circle"?/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("search.circleradius"),":"),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{disabled:!_this.state.filterGeometry,min:1,mobile:true,onChange:_this.setCircleRadius,suffix:" m",value:((_this$state$filterGeo=_this.state.filterGeometry)===null||_this$state$filterGeo===void 0?void 0:_this$state$filterGeo.radius)||0}))):null)))});_defineProperty(_this,"setFilterGeomType",function(geomType){_this.setState({filterGeomType:geomType,filterRegionName:"",filterGeometry:null})});_defineProperty(_this,"setFilterRegion",function(value,searchRegions){if(value){var parts=value.split(":");var item=searchRegions[parts[0]].items[parts[1]];var geometry={type:"Polygon",coordinates:[item.coordinates]};var mapGeometry=VectorLayerUtils.reprojectGeometry(geometry,item.crs,_this.props.map.projection);_this.setState({filterGeomType:null,filterRegionName:value,filterGeometry:mapGeometry})}else{_this.setState({filterGeomType:null,filterRegionName:"",filterGeometry:null})}});_defineProperty(_this,"setCircleRadius",function(value){_this.setState(function(state){return{filterGeometry:_objectSpread(_objectSpread({},state.filterGeometry),{},{radius:value})}})});_defineProperty(_this,"clearFilter",function(){_this.setState({filterGeomType:null,filterRegionName:"",filterGeometry:null})});_defineProperty(_this,"renderResultsMenu",function(){if(!_this.state.resultsVisible){return false}var children=[_this.renderRecentResults(),_this.renderFilters(),_this.renderResults()];children=children.filter(function(child){return!isEmpty(child)});if(isEmpty(children)){if(isEmpty(_this.state.pendingSearches)&&_this.state.searchResults.query_text){children=/*#__PURE__*/React.createElement("div",{className:"searchbox-noresults"},LocaleUtils.tr("search.noresults"))}else{return null}}return/*#__PURE__*/React.createElement("div",{className:"searchbox-results",onMouseDown:_this.setPreventBlur,ref:MiscUtils.setupKillTouchEvents},children)});_defineProperty(_this,"renderRecentResults",function(){var recentSearches=_this.state.recentSearches.filter(function(entry){return entry.toLowerCase().includes(_this.state.searchText.toLowerCase())});if(isEmpty(recentSearches)||recentSearches.length===1&&recentSearches[0].toLowerCase()===_this.state.searchText.toLowerCase()){return null}return/*#__PURE__*/React.createElement("div",{key:"recent"},/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-title",onClick:function onClick(){return _this.toggleSection("recent")},onMouseDown:MiscUtils.killEvent},/*#__PURE__*/React.createElement(Icon,{icon:_this.isCollapsed("recent")?"expand":"collapse"}),LocaleUtils.tr("search.recent")),!_this.isCollapsed("recent")?/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-body"},recentSearches.map(function(entry,idx){return/*#__PURE__*/React.createElement("div",{className:"searchbox-result",key:"r"+idx,onClick:function onClick(){return _this.searchTextChanged(entry)},onMouseDown:MiscUtils.killEvent},entry)})):null)});_defineProperty(_this,"renderFilters",function(){return Object.entries(_this.state.searchResults).map(function(_ref3){var _ref4=_slicedToArray(_ref3,2),provider=_ref4[0],results=_ref4[1];if(isEmpty(results.result_counts)||results.result_counts.length<2){return null}var collapsed=_this.isCollapsed("filter",false);var values=results.result_counts.map(function(entry){return entry.filterword+": "+_this.state.searchResults.query_text});values.sort(function(a,b){return a.localeCompare(b)});return/*#__PURE__*/React.createElement("div",{key:"filter"},/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-title",onClick:function onClick(){return _this.toggleSection("filter")},onMouseDown:MiscUtils.killEvent},/*#__PURE__*/React.createElement(Icon,{icon:collapsed?"expand":"collapse"}),LocaleUtils.tr("search.filter")),!collapsed?/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-body"},values.map(function(value,idx){return/*#__PURE__*/React.createElement("div",{className:"searchbox-result",key:"f"+idx,onClick:function onClick(){return _this.searchTextChanged(value,true,provider)},onMouseDown:MiscUtils.killEvent},/*#__PURE__*/React.createElement("span",{className:"searchbox-result-label"},value))})):null)}).filter(Boolean)});_defineProperty(_this,"renderResults",function(){var resultRenderers=_defineProperty(_defineProperty(_defineProperty({},SearchResultType.PLACE,_this.renderPlaceResult),SearchResultType.THEMELAYER,_this.renderThemeLayerResult),SearchResultType.THEME,_this.renderThemeResult);var layersBeforePlaces=_this.props.searchOptions.showLayerResultsBeforePlaces;var priorities=_defineProperty(_defineProperty(_defineProperty({},SearchResultType.PLACE,layersBeforePlaces?0:2),SearchResultType.THEMELAYER,layersBeforePlaces?2:1),SearchResultType.THEME,layersBeforePlaces?1:0);var results=Object.keys(_this.props.searchProviders).reduce(function(result,provider){if(!_this.state.searchResults[provider]){return result}return result.concat(_this.state.searchResults[provider].results.map(function(group){var _group$type,_group$type2,_group$title,_group$title2;var sectionId=provider+":"+group.id;var moreLabel=null;if(group.resultCount>0&&group.resultCount>group.items.length){moreLabel=LocaleUtils.tr("search.more",group.resultCount-group.items.length)}else if(group.resultCount===-1){moreLabel=LocaleUtils.tr("search.unknownmore")}if(group.items.length===0){return null}var renderer=resultRenderers[(_group$type=group.type)!==null&&_group$type!==void 0?_group$type:SearchResultType.PLACE];if(!renderer){return null}var priority=priorities[(_group$type2=group.type)!==null&&_group$type2!==void 0?_group$type2:SearchResultType.PLACE];return{priority:priority*1000000+(group.priority||0),title:(_group$title=group.title)!==null&&_group$title!==void 0?_group$title:LocaleUtils.tr(group.titlemsgid),tree:/*#__PURE__*/React.createElement("div",{key:sectionId},/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-title",onClick:function onClick(){return _this.toggleSection(sectionId)},onMouseDown:MiscUtils.killEvent},/*#__PURE__*/React.createElement(Icon,{icon:_this.isCollapsed(sectionId)?"expand":"collapse"}),/*#__PURE__*/React.createElement("span",null,(_group$title2=group.title)!==null&&_group$title2!==void 0?_group$title2:LocaleUtils.tr(group.titlemsgid))),!_this.isCollapsed(sectionId)?/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-body"},group.items.map(function(entry){return renderer(provider,group,entry)}),moreLabel?/*#__PURE__*/React.createElement("div",{className:"searchbox-more-results"},moreLabel):null):null)}}))},[]).filter(Boolean);results.sort(function(a,b){if(b.priority!==a.priority){return b.priority-a.priority}else{return b.title.localeCompare(a.title)}});return isEmpty(results)?null:results.map(function(entry){return entry.tree})});_defineProperty(_this,"renderPlaceResult",function(provider,group,result){var _result$label;var key=provider+":"+group.id+":"+result.id;return/*#__PURE__*/React.createElement("div",{className:"searchbox-result",key:key,onClick:function onClick(){_this.selectPlaceResult(provider,group,result);_this.blur()},onMouseDown:MiscUtils.killEvent},result.thumbnail?/*#__PURE__*/React.createElement("img",{className:"searchbox-result-thumbnail",onError:function onError(ev){return _this.loadFallbackResultImage(ev,result)},src:result.thumbnail}):null,/*#__PURE__*/React.createElement("span",{className:"searchbox-result-label",dangerouslySetInnerHTML:{__html:DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig," ")},title:(_result$label=result.label)!==null&&_result$label!==void 0?_result$label:result.text}),result.externalLink?/*#__PURE__*/React.createElement(Icon,{icon:"info-sign",onClick:function onClick(ev){var _result$label2;MiscUtils.killEvent(ev);_this.openUrl(result.externalLink,result.target,(_result$label2=result.label)!==null&&_result$label2!==void 0?_result$label2:result.text)}}):null)});_defineProperty(_this,"renderThemeLayerResult",function(provider,group,result){var _result$label3,_result$layer;var parent=arguments.length>3&&arguments[3]!==undefined?arguments[3]:null;var key=provider+":"+group.id+":"+result.id;var addThemes=ConfigUtils.getConfigProp("allowAddingOtherThemes",_this.props.theme);var icon=null;if(result.sublayers){var toggleLayerGroup=function toggleLayerGroup(){_this.setState(function(state){return{expandedLayerGroup:state.expandedLayerGroup===key?null:key}})};icon=/*#__PURE__*/React.createElement(Icon,{className:"searchbox-result-thumbnail",icon:_this.state.expandedLayerGroup===key?"minus":"plus",onClick:function onClick(ev){MiscUtils.killEvent(ev);toggleLayerGroup()}})}else if(result.thumbnail){icon=/*#__PURE__*/React.createElement("img",{className:"searchbox-result-thumbnail",onError:function onError(ev){return _this.loadFallbackResultImage(ev,result)},src:result.thumbnail})}var selectResult=result.theme?_this.selectThemeResult:_this.selectThemeLayerResult;return/*#__PURE__*/React.createElement("div",{key:key},/*#__PURE__*/React.createElement("div",{className:"searchbox-result",onClick:function onClick(){selectResult(provider,group,result);_this.blur()},onMouseDown:MiscUtils.killEvent},icon,result.theme?/*#__PURE__*/React.createElement(Icon,{className:"searchbox-result-openicon",icon:"open"}):null,/*#__PURE__*/React.createElement("span",{className:"searchbox-result-label",dangerouslySetInnerHTML:{__html:DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig," ")},title:(_result$label3=result.label)!==null&&_result$label3!==void 0?_result$label3:result.text}),result.theme&&addThemes?/*#__PURE__*/React.createElement(Icon,{icon:"plus",onClick:function onClick(ev){MiscUtils.killEvent(ev);_this.selectThemeLayerResult(provider,group,result);_this.blur()},title:LocaleUtils.tr("themeswitcher.addtotheme")}):null,result.info?/*#__PURE__*/React.createElement(Icon,{icon:"info-sign",onClick:function onClick(ev){MiscUtils.killEvent(ev);_this.toggleLayerInfo(provider,group,result,key,parent)}}):null),_this.state.activeLayerInfo===key?/*#__PURE__*/React.createElement("div",{className:"searchbox-result-abstract",dangerouslySetInnerHTML:{__html:MiscUtils.addLinkAnchors(DOMPurify.sanitize(((_result$layer=result.layer)===null||_result$layer===void 0?void 0:_result$layer["abstract"])||""))||LocaleUtils.tr("search.nodescription")}}):null,_this.state.expandedLayerGroup===key?/*#__PURE__*/React.createElement("div",{className:"searchbox-result-group"},result.sublayers.map(function(sublayer){return _this.renderThemeLayerResult(provider,group,sublayer,result.id)})):null)});_defineProperty(_this,"renderThemeResult",function(provider,group,result){var _result$label4;var addThemes=ConfigUtils.getConfigProp("allowAddingOtherThemes",_this.props.theme);return/*#__PURE__*/React.createElement("div",{className:"searchbox-result",key:provider+":"+group.id+":"+result.id,onClick:function onClick(){_this.selectThemeResult(provider,group,result);_this.blur()},onMouseDown:MiscUtils.killEvent},result.thumbnail?/*#__PURE__*/React.createElement("img",{className:"searchbox-result-thumbnail",onError:function onError(ev){return _this.loadFallbackResultImage(ev,result)},src:result.thumbnail}):null,/*#__PURE__*/React.createElement(Icon,{className:"searchbox-result-openicon",icon:"open"}),/*#__PURE__*/React.createElement("span",{className:"searchbox-result-label",dangerouslySetInnerHTML:{__html:DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig," ")},title:(_result$label4=result.label)!==null&&_result$label4!==void 0?_result$label4:result.text}),result.theme&&addThemes?/*#__PURE__*/React.createElement(Icon,{icon:"plus",onClick:function onClick(ev){MiscUtils.killEvent(ev);_this.addThemeLayers(result.layer);_this.blur()},title:LocaleUtils.tr("themeswitcher.addtotheme")}):null)});_defineProperty(_this,"selectPlaceResult",function(provider,group,result){var resultText=result.text.replace(/<\/?\w+\s*\/?>/g,"");if(_this.props.searchOptions.showResultInSearchText!==false){// Show selected result text in search field
+ */import React from"react";import{connect}from"react-redux";import axios from"axios";import classnames from"classnames";import DOMPurify from"dompurify";import isEmpty from"lodash.isempty";import pointInPolygon from"point-in-polygon";import polygonIntersectTest from"polygon-intersect-test";import PropTypes from"prop-types";import{createSelector}from"reselect";import{v4 as uuidv4}from"uuid";import{LayerRole,addLayerFeatures,addThemeSublayer,changeLayerProperty,removeLayer,replacePlaceholderLayer,addLayer}from"../actions/layers";import{logAction}from"../actions/logging";import{panTo,zoomToExtent,zoomToPoint}from"../actions/map";import{setCurrentSearchResult}from"../actions/search";import{setCurrentTask}from"../actions/task";import{setCurrentTheme}from"../actions/theme";import{openExternalUrl,showNotification}from"../actions/windows";import searchProvidersSelector from"../selectors/searchproviders";import ConfigUtils from"../utils/ConfigUtils";import CoordinatesUtils from"../utils/CoordinatesUtils";import LayerUtils from"../utils/LayerUtils";import LocaleUtils from"../utils/LocaleUtils";import MapUtils from"../utils/MapUtils";import MiscUtils from"../utils/MiscUtils";import{UrlParams}from"../utils/PermaLinkUtils";import{FulltextSearch,SearchResultType}from"../utils/SearchProviders";import ServiceLayerUtils from"../utils/ServiceLayerUtils";import VectorLayerUtils from"../utils/VectorLayerUtils";import Icon from"./Icon";import MapSelection from"./MapSelection";import ButtonBar from"./widgets/ButtonBar";import ComboBox from"./widgets/ComboBox";import InputContainer from"./widgets/InputContainer";import NumberInput from"./widgets/NumberInput";import Spinner from"./widgets/Spinner";import"./style/SearchBox.css";var SearchBox=/*#__PURE__*/function(_React$Component){function SearchBox(props){var _this;_classCallCheck(this,SearchBox);_this=_callSuper(this,SearchBox,[props]);_defineProperty(_this,"state",{searchText:"",searchSession:null,pendingSearches:[],recentSearches:[],searchResults:{},resultsVisible:false,collapsedSections:{},expandedLayerGroup:null,activeLayerInfo:null,filterOptionsVisible:false,searchFilterRegions:null,selectedProvider:"",filterRegionName:"",filterGeomType:null,filterGeometry:null});_defineProperty(_this,"loadFilterRegions",function(){var searchRegions=ConfigUtils.getConfigProp("searchFilterRegions",_this.props.theme);if(Array.isArray(searchRegions)){_this.setState({searchFilterRegions:searchRegions})}else if(typeof searchRegions==="string"){axios.get(searchRegions).then(function(response){_this.setState({searchFilterRegions:response.data})})["catch"](function(){_this.setState({searchFilterRegions:null})})}else{_this.setState({searchFilterRegions:null})}});_defineProperty(_this,"renderFilterOptions",function(){var _this$state$filterGeo;if(!_this.state.filterOptionsVisible){return null}var providerSelection=/*#__PURE__*/React.createElement(ComboBox,{onChange:function onChange(value){return _this.setState({selectedProvider:value})},value:_this.state.selectedProvider},/*#__PURE__*/React.createElement("div",{value:""},LocaleUtils.tr("search.all")),Object.entries(_this.props.searchProviders).map(function(_ref){var _prov$params,_prov$label;var _ref2=_slicedToArray(_ref,2),key=_ref2[0],prov=_ref2[1];return/*#__PURE__*/React.createElement("div",{key:key,value:key},(prov===null||prov===void 0||(_prov$params=prov.params)===null||_prov$params===void 0?void 0:_prov$params.title)||((_prov$label=prov.label)!==null&&_prov$label!==void 0?_prov$label:LocaleUtils.tr(prov.labelmsgid)))}));var searchRegionSelection=null;if(Array.isArray(_this.state.searchFilterRegions)){searchRegionSelection=/*#__PURE__*/React.createElement(ComboBox,{onChange:function onChange(value){return _this.setFilterRegion(value,_this.state.searchFilterRegions)},value:_this.state.filterRegionName},/*#__PURE__*/React.createElement("div",{value:""},LocaleUtils.tr("search.none")),_this.state.searchFilterRegions.map(function(group,gidx){return[/*#__PURE__*/React.createElement("div",{"data-group-header":gidx,disabled:true,key:"group"+gidx},group.name)].concat(_toConsumableArray(group.items.map(function(item,idx){return/*#__PURE__*/React.createElement("div",{"data-group":gidx,key:item.name,value:gidx+":"+idx+":"+item.name},item.name)})))}))}var filterButtons=[{key:"Polygon",tooltip:LocaleUtils.tr("redlining.polygon"),icon:"polygon",label:LocaleUtils.tr("redlining.polygon")},{key:"Circle",tooltip:LocaleUtils.tr("redlining.circle"),icon:"circle",label:LocaleUtils.tr("redlining.circle")}];return/*#__PURE__*/React.createElement("div",{className:"searchbox-filter-options"},/*#__PURE__*/React.createElement("table",null,/*#__PURE__*/React.createElement("tbody",null,/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("search.providerselection"),":"),/*#__PURE__*/React.createElement("td",null,providerSelection)),/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("search.limittoarea"),":"),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement("div",{className:"searchbox-filter-options-geometry controlgroup"},/*#__PURE__*/React.createElement(ButtonBar,{active:_this.state.filterGeomType,buttons:filterButtons,onClick:_this.setFilterGeomType}),searchRegionSelection,/*#__PURE__*/React.createElement("button",{className:"button",onClick:_this.clearFilter,title:LocaleUtils.tr("search.clearfilter")},/*#__PURE__*/React.createElement(Icon,{icon:"clear"}))))),_this.state.filterGeomType==="Circle"?/*#__PURE__*/React.createElement("tr",null,/*#__PURE__*/React.createElement("td",null,LocaleUtils.tr("search.circleradius"),":"),/*#__PURE__*/React.createElement("td",null,/*#__PURE__*/React.createElement(NumberInput,{disabled:!_this.state.filterGeometry,min:1,mobile:true,onChange:_this.setCircleRadius,suffix:" m",value:((_this$state$filterGeo=_this.state.filterGeometry)===null||_this$state$filterGeo===void 0?void 0:_this$state$filterGeo.radius)||0}))):null)))});_defineProperty(_this,"setFilterGeomType",function(geomType){_this.setState({filterGeomType:geomType,filterRegionName:"",filterGeometry:null})});_defineProperty(_this,"setFilterRegion",function(value,searchRegions){if(value){var parts=value.split(":");var item=searchRegions[parts[0]].items[parts[1]];var geometry={type:"Polygon",coordinates:[item.coordinates]};var mapGeometry=VectorLayerUtils.reprojectGeometry(geometry,item.crs,_this.props.map.projection);_this.setState({filterGeomType:null,filterRegionName:value,filterGeometry:mapGeometry})}else{_this.setState({filterGeomType:null,filterRegionName:"",filterGeometry:null})}});_defineProperty(_this,"setCircleRadius",function(value){_this.setState(function(state){return{filterGeometry:_objectSpread(_objectSpread({},state.filterGeometry),{},{radius:value})}})});_defineProperty(_this,"clearFilter",function(){_this.setState({filterGeomType:null,filterRegionName:"",filterGeometry:null})});_defineProperty(_this,"renderResultsMenu",function(){if(!_this.state.resultsVisible){return false}var children=[_this.renderRecentResults(),_this.renderFilters(),_this.renderResults()];children=children.filter(function(child){return!isEmpty(child)});if(isEmpty(children)){if(isEmpty(_this.state.pendingSearches)&&_this.state.searchResults.query_text){children=/*#__PURE__*/React.createElement("div",{className:"searchbox-noresults"},LocaleUtils.tr("search.noresults"))}else{return null}}return/*#__PURE__*/React.createElement("div",{className:"searchbox-results",onMouseDown:_this.setPreventBlur,ref:MiscUtils.setupKillTouchEvents},children)});_defineProperty(_this,"renderRecentResults",function(){var recentSearches=_this.state.recentSearches.filter(function(entry){return entry.toLowerCase().includes(_this.state.searchText.toLowerCase())});if(isEmpty(recentSearches)||recentSearches.length===1&&recentSearches[0].toLowerCase()===_this.state.searchText.toLowerCase()){return null}return/*#__PURE__*/React.createElement("div",{key:"recent"},/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-title",onClick:function onClick(){return _this.toggleSection("recent")},onMouseDown:MiscUtils.killEvent},/*#__PURE__*/React.createElement(Icon,{icon:_this.isCollapsed("recent")?"expand":"collapse"}),LocaleUtils.tr("search.recent")),!_this.isCollapsed("recent")?/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-body"},recentSearches.map(function(entry,idx){return/*#__PURE__*/React.createElement("div",{className:"searchbox-result",key:"r"+idx,onClick:function onClick(){return _this.searchTextChanged(entry)},onMouseDown:MiscUtils.killEvent},entry)})):null)});_defineProperty(_this,"renderFilters",function(){return Object.entries(_this.state.searchResults).map(function(_ref3){var _ref4=_slicedToArray(_ref3,2),provider=_ref4[0],results=_ref4[1];if(isEmpty(results.result_counts)||results.result_counts.length<2){return null}var collapsed=_this.isCollapsed("filter",false);var values=results.result_counts.map(function(entry){return entry.filterword+": "+_this.state.searchResults.query_text});values.sort(function(a,b){return a.localeCompare(b)});return/*#__PURE__*/React.createElement("div",{key:"filter"},/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-title",onClick:function onClick(){return _this.toggleSection("filter")},onMouseDown:MiscUtils.killEvent},/*#__PURE__*/React.createElement(Icon,{icon:collapsed?"expand":"collapse"}),LocaleUtils.tr("search.filter")),!collapsed?/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-body"},values.map(function(value,idx){return/*#__PURE__*/React.createElement("div",{className:"searchbox-result",key:"f"+idx,onClick:function onClick(){return _this.searchTextChanged(value,true,provider)},onMouseDown:MiscUtils.killEvent},/*#__PURE__*/React.createElement("span",{className:"searchbox-result-label"},value))})):null)}).filter(Boolean)});_defineProperty(_this,"renderResults",function(){var resultRenderers=_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},SearchResultType.PLACE,_this.renderPlaceResult),SearchResultType.THEMELAYER,_this.renderLayerResult),SearchResultType.EXTERNALLAYER,_this.renderLayerResult),SearchResultType.THEME,_this.renderThemeResult),SearchResultType.TASK,_this.renderTaskResult);var layersBeforePlaces=_this.props.searchOptions.showLayerResultsBeforePlaces;var priorities=_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},SearchResultType.PLACE,layersBeforePlaces?0:3),SearchResultType.THEMELAYER,layersBeforePlaces?2:1),SearchResultType.EXTERNALLAYER,layersBeforePlaces?3:2),SearchResultType.THEME,layersBeforePlaces?1:0),SearchResultType.TASK,4);var results=Object.keys(_this.props.searchProviders).reduce(function(result,provider){if(!_this.state.searchResults[provider]){return result}return result.concat(_this.state.searchResults[provider].results.map(function(group){var _group$type,_group$type2,_group$title,_group$title2;var sectionId=provider+":"+group.id;var moreLabel=null;if(group.resultCount>0&&group.resultCount>group.items.length){moreLabel=LocaleUtils.tr("search.more",group.resultCount-group.items.length)}else if(group.resultCount===-1){moreLabel=LocaleUtils.tr("search.unknownmore")}if(group.items.length===0){return null}var renderer=resultRenderers[(_group$type=group.type)!==null&&_group$type!==void 0?_group$type:SearchResultType.PLACE];if(!renderer){return null}var priority=priorities[(_group$type2=group.type)!==null&&_group$type2!==void 0?_group$type2:SearchResultType.PLACE];return{priority:priority*1000000+(group.priority||0),title:(_group$title=group.title)!==null&&_group$title!==void 0?_group$title:LocaleUtils.tr(group.titlemsgid),tree:/*#__PURE__*/React.createElement("div",{key:sectionId},/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-title",onClick:function onClick(){return _this.toggleSection(sectionId)},onMouseDown:MiscUtils.killEvent},/*#__PURE__*/React.createElement(Icon,{icon:_this.isCollapsed(sectionId)?"expand":"collapse"}),/*#__PURE__*/React.createElement("span",null,(_group$title2=group.title)!==null&&_group$title2!==void 0?_group$title2:LocaleUtils.tr(group.titlemsgid))),!_this.isCollapsed(sectionId)?/*#__PURE__*/React.createElement("div",{className:"searchbox-results-section-body"},group.items.map(function(entry){return renderer(provider,group,entry)}),moreLabel?/*#__PURE__*/React.createElement("div",{className:"searchbox-more-results"},moreLabel):null):null)}}))},[]).filter(Boolean);results.sort(function(a,b){if(b.priority!==a.priority){return b.priority-a.priority}else{return b.title.localeCompare(a.title)}});return isEmpty(results)?null:results.map(function(entry){return entry.tree})});_defineProperty(_this,"renderPlaceResult",function(provider,group,result){var _result$label;var key=provider+":"+group.id+":"+result.id;return/*#__PURE__*/React.createElement("div",{className:"searchbox-result",key:key,onClick:function onClick(){_this.selectPlaceResult(provider,group,result);_this.blur()},onMouseDown:MiscUtils.killEvent},result.thumbnail?/*#__PURE__*/React.createElement("img",{className:"searchbox-result-thumbnail",onError:function onError(ev){return _this.loadFallbackResultImage(ev,group.type)},src:result.thumbnail}):null,/*#__PURE__*/React.createElement("span",{className:"searchbox-result-label",dangerouslySetInnerHTML:{__html:DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig," ")},title:(_result$label=result.label)!==null&&_result$label!==void 0?_result$label:result.text}),result.externalLink?/*#__PURE__*/React.createElement(Icon,{icon:"info-sign",onClick:function onClick(ev){var _result$label2;MiscUtils.killEvent(ev);_this.openUrl(result.externalLink,result.target,(_result$label2=result.label)!==null&&_result$label2!==void 0?_result$label2:result.text)}}):null)});_defineProperty(_this,"renderLayerResult",function(provider,group,result){var _result$label3,_result$layer;var parent=arguments.length>3&&arguments[3]!==undefined?arguments[3]:null;var key=provider+":"+group.id+":"+result.id;var addThemes=ConfigUtils.getConfigProp("allowAddingOtherThemes",_this.props.theme);var icon=null;if(result.sublayers){var toggleLayerGroup=function toggleLayerGroup(){_this.setState(function(state){return{expandedLayerGroup:state.expandedLayerGroup===key?null:key}})};icon=/*#__PURE__*/React.createElement(Icon,{icon:_this.state.expandedLayerGroup===key?"minus":"plus",onClick:function onClick(ev){MiscUtils.killEvent(ev);toggleLayerGroup()}})}else if(result.thumbnail){icon=/*#__PURE__*/React.createElement("img",{className:"searchbox-result-thumbnail",onError:function onError(ev){return _this.loadFallbackResultImage(ev,group.type)},src:result.thumbnail})}var selectResult=result.theme?_this.selectThemeResult:_this.selectLayerResult;return/*#__PURE__*/React.createElement("div",{key:key},/*#__PURE__*/React.createElement("div",{className:"searchbox-result",onClick:function onClick(){selectResult(provider,group,result);_this.blur()},onMouseDown:MiscUtils.killEvent},icon,result.theme?/*#__PURE__*/React.createElement(Icon,{className:"searchbox-result-openicon",icon:"open"}):null,/*#__PURE__*/React.createElement("span",{className:"searchbox-result-label",dangerouslySetInnerHTML:{__html:DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig," ")},title:(_result$label3=result.label)!==null&&_result$label3!==void 0?_result$label3:result.text}),result.theme&&addThemes?/*#__PURE__*/React.createElement(Icon,{icon:"plus",onClick:function onClick(ev){MiscUtils.killEvent(ev);_this.selectLayerResult(provider,group,result);_this.blur()},title:LocaleUtils.tr("themeswitcher.addtotheme")}):null,result.sublayers?/*#__PURE__*/React.createElement(Icon,{icon:"group",onClick:function onClick(ev){MiscUtils.killEvent(ev);_this.selectLayerResult(provider,group,result,true)},title:LocaleUtils.tr("importlayer.asgroup")}):null,result.info?/*#__PURE__*/React.createElement(Icon,{icon:"info-sign",onClick:function onClick(ev){MiscUtils.killEvent(ev);_this.toggleLayerInfo(provider,group,result,key,parent)}}):null),_this.state.activeLayerInfo===key?/*#__PURE__*/React.createElement("div",{className:"searchbox-result-abstract",dangerouslySetInnerHTML:{__html:MiscUtils.addLinkAnchors(DOMPurify.sanitize(((_result$layer=result.layer)===null||_result$layer===void 0?void 0:_result$layer["abstract"])||""))||LocaleUtils.tr("search.nodescription")}}):null,_this.state.expandedLayerGroup===key?/*#__PURE__*/React.createElement("div",{className:"searchbox-result-group"},result.sublayers.map(function(sublayer){return _this.renderLayerResult(provider,group,sublayer,result.id)})):null)});_defineProperty(_this,"renderThemeResult",function(provider,group,result){var _result$label4;var addThemes=ConfigUtils.getConfigProp("allowAddingOtherThemes",_this.props.theme);return/*#__PURE__*/React.createElement("div",{className:"searchbox-result",key:provider+":"+group.id+":"+result.id,onClick:function onClick(){_this.selectThemeResult(provider,group,result);_this.blur()},onMouseDown:MiscUtils.killEvent},result.thumbnail?/*#__PURE__*/React.createElement("img",{className:"searchbox-result-thumbnail",onError:function onError(ev){return _this.loadFallbackResultImage(ev,group.type)},src:result.thumbnail}):null,/*#__PURE__*/React.createElement(Icon,{className:"searchbox-result-openicon",icon:"open"}),/*#__PURE__*/React.createElement("span",{className:"searchbox-result-label",dangerouslySetInnerHTML:{__html:DOMPurify.sanitize(result.text).replace(/<br\s*\/>/ig," ")},title:(_result$label4=result.label)!==null&&_result$label4!==void 0?_result$label4:result.text}),result.theme&&addThemes?/*#__PURE__*/React.createElement(Icon,{icon:"plus",onClick:function onClick(ev){MiscUtils.killEvent(ev);_this.addThemeLayers(result.layer);_this.blur()},title:LocaleUtils.tr("themeswitcher.addtotheme")}):null)});_defineProperty(_this,"renderTaskResult",function(provider,group,result){return/*#__PURE__*/React.createElement("div",{className:"searchbox-result",key:provider+":"+group.id+":"+result.id,onClick:function onClick(){_this.selectTaskResult(provider,group,result);_this.blur()},onMouseDown:MiscUtils.killEvent},result.task.icon?/*#__PURE__*/React.createElement(Icon,{icon:result.task.icon}):null,/*#__PURE__*/React.createElement("span",{className:"searchbox-result-label"},result.text))});_defineProperty(_this,"selectPlaceResult",function(provider,group,result){var resultText=result.text.replace(/<\/?\w+\s*\/?>/g,"");if(_this.props.searchOptions.showResultInSearchText!==false){// Show selected result text in search field
 _this.setState({searchText:resultText,searchResults:_defineProperty({query_text:resultText},provider,{results:[_objectSpread(_objectSpread({},group),{},{items:[result]})],tot_result_count:1})})}_this.updateRecentSearches();if(result.geometry){_this.showResultGeometry(result,{feature:{type:"Feature",geometry:result.geometry},crs:result.crs})}else if(_this.props.searchProviders[provider].getResultGeometry){_this.props.searchProviders[provider].getResultGeometry(result,function(response){_this.showResultGeometry(result,response)},axios)}else{// Display marker
 _this.showResultGeometry(result,{feature:{type:"Feature",geometry:{type:"Point",coordinates:[result.x,result.y]}},crs:result.crs})}if(result.dataproduct_id){var quot=typeof result.id==="string"?"\"":"";var filter="[[\"".concat(result.id_field_name,"\",\"=\", ").concat(quot).concat(result.id).concat(quot,"]]");UrlParams.updateParams({hp:result.dataproduct_id,hf:filter,st:resultText})}else{UrlParams.updateParams({hp:undefined,hf:undefined,st:resultText})}_this.props.logAction("SEARCH_TEXT",{searchText:_this.state.searchText});_this.props.logAction("SEARCH_RESULT_SELECTED",{place:resultText});// Enable layer
-if(result.layername){var path=[];var sublayer=null;var layer=_this.props.layers.find(function(l){return l.role===LayerRole.THEME&&(sublayer=LayerUtils.searchSubLayer(l,"name",result.layername,path))});if(layer&&sublayer){_this.props.changeLayerProperty(layer.id,"visibility",true,path,"both")}}});_defineProperty(_this,"selectThemeLayerResult",function(provider,group,result){if(result.layer){if(result.theme){_this.addThemeLayers(result.layer)}else{_this.props.addThemeSublayer(result.layer)}// Show layer tree to notify user that something has happened
-_this.props.setCurrentTask("LayerTree")}else if(_this.props.searchProviders[provider].getLayerDefinition){_this.props.searchProviders[provider].getLayerDefinition(result,function(layer){if(layer){if(result.theme){_this.addThemeLayers(layer)}else{_this.props.addThemeSublayer({sublayers:[layer]})}// Show layer tree to notify user that something has happened
-_this.props.setCurrentTask("LayerTree")}},axios)}});_defineProperty(_this,"selectThemeResult",function(provider,group,result){_this.props.setCurrentTheme(result.theme,_this.props.themes);if(_this.props.searchOptions.showLayerAfterChangeTheme){_this.props.setCurrentTask("LayerTree")}});_defineProperty(_this,"loadFallbackResultImage",function(ev,item){var _item$type;if(((_item$type=item.type)!==null&&_item$type!==void 0?_item$type:SearchResultType.PLACE)===SearchResultType.PLACE){var iconPath=ConfigUtils.getAssetsPath()+"/img/search/";if(!ev.target.src.endsWith(iconPath+"feature.svg")){ev.target.src=iconPath+"feature.svg"}}});_defineProperty(_this,"toggleLayerInfo",function(provider,group,result,key,parent){var setResultLayerAndActiveInfo=function setResultLayerAndActiveInfo(layer){// Embed returned layer into result item, so that layer info is read from item.layer.abstract
+if(result.layername){var path=[];var sublayer=null;var layer=_this.props.layers.find(function(l){return l.role===LayerRole.THEME&&(sublayer=LayerUtils.searchSubLayer(l,"name",result.layername,path))});if(layer&&sublayer){_this.props.changeLayerProperty(layer.id,"visibility",true,path,"both")}}});_defineProperty(_this,"selectLayerResult",function(provider,group,result){var asGroup=arguments.length>3&&arguments[3]!==undefined?arguments[3]:false;if(result.layer){if(result.theme){_this.addThemeLayers(result.layer)}else if(group.type===SearchResultType.THEMELAYER){_this.props.addThemeSublayer(result.layer)}else if(group.type===SearchResultType.EXTERNALLAYER){_this.addExternalLayer(result.layer,asGroup)}// Show layer tree to notify user that something has happened
+_this.props.setCurrentTask("LayerTree")}else if(_this.props.searchProviders[provider].getLayerDefinition){_this.props.searchProviders[provider].getLayerDefinition(result,function(layer){if(layer){if(result.theme){_this.addThemeLayers(layer)}else if(group.type===SearchResultType.THEMELAYER){_this.props.addThemeSublayer({sublayers:[layer]})}else if(group.type===SearchResultType.EXTERNALLAYER){_this.addExternalLayer(layer,asGroup)}// Show layer tree to notify user that something has happened
+_this.props.setCurrentTask("LayerTree")}},axios)}});_defineProperty(_this,"addExternalLayer",function(entry){var asGroup=arguments.length>1&&arguments[1]!==undefined?arguments[1]:false;if(entry.resource){var _entry$title;var params=LayerUtils.splitLayerUrlParam(entry.resource);// Create placeholder layer
+_this.props.addLayer({id:params.id,type:"placeholder",name:params.name,title:(_entry$title=entry.title)!==null&&_entry$title!==void 0?_entry$title:params.name,role:params.USERLAYER,loading:true});ServiceLayerUtils.findLayers(params.type,params.url,[params],_this.props.map.projection,function(id,layer){if(layer){if(!asGroup){layer.sublayers=null}LayerUtils.propagateLayerProperty(layer,"opacity",params.opacity);_this.props.replacePlaceholderLayer(params.id,layer)}else{// eslint-disable-next-line
+alert(LocaleUtils.tr("importlayer.addfailed"));_this.props.removeLayer(params.id)}})}else if(entry.type==="wms"||entry.type==="wfs"||entry.type==="wmts"){if(asGroup){_this.props.addLayer(entry)}else{_this.props.addLayer(_objectSpread(_objectSpread({},entry),{},{sublayers:null}))}}});_defineProperty(_this,"selectThemeResult",function(provider,group,result){_this.props.setCurrentTheme(result.theme,_this.props.themes);if(_this.props.searchOptions.showLayerAfterChangeTheme){_this.props.setCurrentTask("LayerTree")}});_defineProperty(_this,"selectTaskResult",function(provider,group,result){if(result.task.url){_this.props.openExternalUrl(result.task.url,result.task.target,result.text,result.task.icon)}else{_this.props.setCurrentTask(result.task.task||result.task.key,result.task.mode,result.task.mapClickAction||(result.task.identifyEnabled?"identify":null))}});_defineProperty(_this,"loadFallbackResultImage",function(ev,type){if(type===SearchResultType.PLACE){var iconPath=ConfigUtils.getAssetsPath()+"/img/search/";if(!ev.target.src.endsWith(iconPath+"feature.svg")){ev.target.src=iconPath+"feature.svg"}}else{ev.target.style.display="none"}});_defineProperty(_this,"toggleLayerInfo",function(provider,group,result,key,parent){var setResultLayerAndActiveInfo=function setResultLayerAndActiveInfo(layer){// Embed returned layer into result item, so that layer info is read from item.layer.abstract
 _this.setState(function(state){return{searchResults:_objectSpread(_objectSpread({},state.searchResults),{},_defineProperty({},provider,_objectSpread(_objectSpread({},state.searchResults[provider]),{},{results:state.searchResults[provider].results.map(function(g){if(g.id===group.id){return _objectSpread(_objectSpread({},g),{},{items:g.items.map(function(item){if(item.id===result.id){return _objectSpread(_objectSpread({},item),{},{layer:layer})}else if(item.id===parent){return _objectSpread(_objectSpread({},item),{},{sublayers:item.sublayers.map(function(sublayer){if(sublayer.id===result.id){return _objectSpread(_objectSpread({},sublayer),{},{layer:layer})}else{return sublayer}})})}else{return item}})})}else{return g}})}))),activeLayerInfo:key}})};_this.setState(function(state){if(state.activeLayerInfo===key){return{activeLayerInfo:null}}else{if(!result.layer&&_this.props.searchProviders[provider].getLayerDefinition){_this.props.searchProviders[provider].getLayerDefinition(result,setResultLayerAndActiveInfo,axios);return{}}else{return{activeLayerInfo:key}}}})});_defineProperty(_this,"setPreventBlur",function(){_this.preventBlur=true;setTimeout(function(){_this.preventBlur=false;return false},100)});_defineProperty(_this,"toggleSection",function(key){return _this.setState(function(state){var _newCollapsedSections;var newCollapsedSections=_objectSpread({},state.collapsedSections);var deflt=_this.props.searchOptions.sectionsDefaultCollapsed||false;newCollapsedSections[key]=!((_newCollapsedSections=newCollapsedSections[key])!==null&&_newCollapsedSections!==void 0?_newCollapsedSections:deflt);return{collapsedSections:newCollapsedSections}})});_defineProperty(_this,"isCollapsed",function(section){var _this$state$collapsed;var deflt=arguments.length>1&&arguments[1]!==undefined?arguments[1]:null;deflt=deflt!==null&&deflt!==void 0?deflt:_this.props.searchOptions.sectionsDefaultCollapsed||false;return(_this$state$collapsed=_this.state.collapsedSections[section])!==null&&_this$state$collapsed!==void 0?_this$state$collapsed:deflt});_defineProperty(_this,"toggleFilterOptions",function(visible){_this.setState({filterOptionsVisible:visible})});_defineProperty(_this,"searchTextChanged",function(text){var expandSections=arguments.length>1&&arguments[1]!==undefined?arguments[1]:false;var provider=arguments.length>2&&arguments[2]!==undefined?arguments[2]:null;if(_this.props.layers.find(function(layer){return layer.id==="searchselection"})){_this.props.removeLayer("searchselection")}var newState={searchText:text,expandedLayerGroup:null,activeLayerInfo:null,pendingSearches:[],searchSession:null};if(expandSections){newState.collapsedSections={}}_this.setState(newState);clearTimeout(_this.searchTimeout);_this.searchTimeout=setTimeout(function(){return _this.startSearch(provider)},250)});_defineProperty(_this,"onFocus",function(){_this.setState({resultsVisible:true});if(_this.searchBox){_this.searchBox.select()}if(isEmpty(_this.state.searchResults)&&_this.props.theme){_this.startSearch()}if(_this.props.searchOptions.allowSearchFilters){_this.toggleFilterOptions(false)}});_defineProperty(_this,"onBlur",function(){if(_this.preventBlur&&_this.searchBox){_this.searchBox.focus()}else{_this.setState({resultsVisible:false,collapsedSections:{},expandedLayerGroup:null,activeLayerInfo:null})}});_defineProperty(_this,"clear",function(){_this.props.setCurrentSearchResult(null);_this.blur();_this.setState({searchText:"",searchResults:{},selectedProvider:"",filterRegionName:"",filterGeometry:null});_this.props.removeLayer("searchselection");UrlParams.updateParams({hp:undefined,hf:undefined,st:undefined})});_defineProperty(_this,"startSearch",function(){var _this$state$filterGeo2;var provider=arguments.length>0&&arguments[0]!==undefined?arguments[0]:null;var uniquePlaceResult=arguments.length>1&&arguments[1]!==undefined?arguments[1]:false;var availableProviders=_this.props.searchProviders;var selectedProvider=provider!==null&&provider!==void 0?provider:_this.state.selectedProvider;if(selectedProvider){availableProviders=_defineProperty({},selectedProvider,_this.props.searchProviders[selectedProvider])}// eslint-disable-next-line
 var searchText=_this.state.searchText.trim();if(isEmpty(searchText)){_this.setState({searchResults:{}});return}var searchSession=uuidv4();_this.setState({searchResults:{query_text:searchText},searchSession:searchSession,pendingSearches:Object.keys(availableProviders)});var searchParams={mapcrs:_this.props.map.projection,displaycrs:_this.props.map.displayCrs,lang:LocaleUtils.lang(),limit:_this.props.searchOptions.resultLimit,filterPoly:(_this$state$filterGeo2=_this.state.filterGeometry)===null||_this$state$filterGeo2===void 0||(_this$state$filterGeo2=_this$state$filterGeo2.coordinates)===null||_this$state$filterGeo2===void 0?void 0:_this$state$filterGeo2[0],filterBBox:_this.state.filterGeometry?VectorLayerUtils.computeFeatureBBox(_this.state.filterGeometry):null};Object.entries(availableProviders).forEach(function(_ref5){var _ref6=_slicedToArray(_ref5,2),provKey=_ref6[0],prov=_ref6[1];prov.onSearch(searchText,_objectSpread(_objectSpread({cfgParams:prov.cfgParams},prov.params),searchParams),function(response){var results=prov.handlesGeomFilter?response.results:_this.filterProviderResults(response.results);var totResultCount=results.reduce(function(tot,group){var _group$resultCount;return tot+((_group$resultCount=group.resultCount)!==null&&_group$resultCount!==void 0?_group$resultCount:group.items.length)},0);if(uniquePlaceResult){// If looking for unique place result, filter non-place results
 results=results.filter(function(group){var _group$type3;return((_group$type3=group.type)!==null&&_group$type3!==void 0?_group$type3:SearchResultType.PLACE)===SearchResultType.PLACE})}_this.setState(function(state){if(searchSession!==state.searchSession){return{}}var searchResults=_objectSpread(_objectSpread({},state.searchResults),{},_defineProperty({},provKey,{results:results,result_counts:response.result_counts,tot_result_count:totResultCount}));var newPendingSearches=state.pendingSearches.filter(function(entry){return entry!==provKey});if(isEmpty(newPendingSearches)&&uniquePlaceResult){var providersWithResults=Object.entries(searchResults).filter(function(_ref7){var _ref8=_slicedToArray(_ref7,2),_=_ref8[0],providerResults=_ref8[1];return providerResults.tot_result_count>0});if(providersWithResults.length===1&&providersWithResults[0][1].tot_result_count===1){var group=providersWithResults[0][1].results[0];// Avoid warning about setState called in setState
@@ -20,4 +22,4 @@ if(features[0].styleName!=="marker"&&!response.hidemarker&&_this.props.searchOpt
 if(!_this.props.searchOptions.hideResultLabels){var _ref9,_item$label;var label=((_ref9=(_item$label=item.label)!==null&&_item$label!==void 0?_item$label:item.text)!==null&&_ref9!==void 0?_ref9:"").replace(/<\/?\w+\s*\/?>/g,"");features[0].properties=_objectSpread(_objectSpread({},features[0].properties),{},{label:label})}// Mark first feature as searchmarker
 features[0].id="searchmarker";_this.props.addLayerFeatures(layer,features,true)}else{var _item$crs3;var _center=CoordinatesUtils.reproject([item.x,item.y],(_item$crs3=item.crs)!==null&&_item$crs3!==void 0?_item$crs3:mapCrs,mapCrs);var marker={type:"Feature",geometry:{type:"Point",coordinates:_center},styleName:"marker"};if(!_this.props.searchOptions.hideResultLabels){var _ref10,_item$label2;var _label=((_ref10=(_item$label2=item.label)!==null&&_item$label2!==void 0?_item$label2:item.text)!==null&&_ref10!==void 0?_ref10:"").replace(/<\/?\w+\s*\/?>/g,"");marker.properties={label:_label}}_this.props.addLayerFeatures(layer,[marker],true)}var bbox=response!==null&&response!==void 0&&response.bbox?CoordinatesUtils.reprojectBbox(response.bbox,(_response$crs3=response.crs)!==null&&_response$crs3!==void 0?_response$crs3:mapCrs,mapCrs):CoordinatesUtils.reprojectBbox((_item$bbox=item.bbox)!==null&&_item$bbox!==void 0?_item$bbox:[item.x,item.y,item.x,item.y],(_item$crs4=item.crs)!==null&&_item$crs4!==void 0?_item$crs4:mapCrs,mapCrs);_this.zoomToResultBBox(bbox,scale);_this.props.setCurrentSearchResult(item)});_defineProperty(_this,"zoomToResultBBox",function(bbox,scale){var zoom=0;if(scale){zoom=MapUtils.computeZoom(_this.props.map.scales,scale)}else{var maxZoom=MapUtils.computeZoom(_this.props.map.scales,_this.props.theme.minSearchScaleDenom||_this.props.searchOptions.minScaleDenom);if(bbox[0]!==bbox[2]&&bbox[1]!==bbox[3]){zoom=Math.max(0,MapUtils.getZoomForExtent(bbox,_this.props.map.resolutions,_this.props.map.size,0,maxZoom+1)-1)}else{zoom=maxZoom}}var x=0.5*(bbox[0]+bbox[2]);var y=0.5*(bbox[1]+bbox[3]);_this.props.zoomToPoint([x,y],zoom,_this.props.map.projection)});_defineProperty(_this,"openUrl",function(url,target,title){if(target==="iframe"){target=":iframedialog:externallinkiframe"}_this.props.openExternalUrl(url,target,{title:title})});_this.searchBox=null;_this.searchTimeout=null;_this.preventBlur=false;return _this}_inherits(SearchBox,_React$Component);return _createClass(SearchBox,[{key:"componentDidUpdate",value:function componentDidUpdate(prevProps,prevState){var _this2=this;// Restore highlight from URL as soon as theme is loaded
 if(this.props.theme&&!prevProps.theme){var hp=this.props.startupParams.hp;var hf=this.props.startupParams.hf;var st=this.props.startupParams.st||this.props.startupParams.ht||"";if(hp&&(hf||st)){this.setState({searchText:st});FulltextSearch.handleHighlightParameters(hp,hf,st,function(item,result){_this2.showResultGeometry(item,result,_this2.props.startupParams.s)})}else{this.setState({searchText:st},function(){return _this2.startSearch(null,true)})}UrlParams.updateParams({hp:undefined,hf:undefined,ht:undefined,st:undefined});this.loadFilterRegions()}else if(this.props.theme!==prevProps.theme){this.clear();this.loadFilterRegions()}// Trigger search when closing filter options
-if(!this.state.filterOptionsVisible&&prevState.filterOptionsVisible){this.searchTextChanged(this.state.searchText)}}},{key:"render",value:function render(){var _this3=this;var placeholder=LocaleUtils.tr("search.placeholder");var filterButtonClasses=classnames({"button":true,"searchbox-filter-button":true,"pressed":this.state.filterOptionsVisible||this.state.selectedProvider||this.state.filterGeometry});return[/*#__PURE__*/React.createElement("div",{className:"SearchBox",key:"SearchBox"},/*#__PURE__*/React.createElement(InputContainer,{className:"searchbox-field"},/*#__PURE__*/React.createElement(Icon,{icon:"search",role:"prefix"}),/*#__PURE__*/React.createElement("input",{onBlur:this.onBlur,onChange:function onChange(ev){return _this3.searchTextChanged(ev.target.value)},onFocus:this.onFocus,placeholder:placeholder,ref:function ref(el){_this3.searchBox=el},role:"input",type:"text",value:this.state.searchText}),this.state.pendingSearches.length>0?/*#__PURE__*/React.createElement(Spinner,{role:"suffix"}):/*#__PURE__*/React.createElement(Icon,{icon:"clear",onClick:this.clear,role:"suffix"})),this.props.searchOptions.allowSearchFilters?/*#__PURE__*/React.createElement("button",{className:filterButtonClasses,onClick:function onClick(){return _this3.toggleFilterOptions(!_this3.state.filterOptionsVisible)},title:LocaleUtils.tr("search.filter")},/*#__PURE__*/React.createElement(Icon,{icon:"filter"}),/*#__PURE__*/React.createElement(Icon,{icon:"chevron-down"})):null,this.renderResultsMenu(),this.renderFilterOptions()),/*#__PURE__*/React.createElement(MapSelection,{active:this.state.filterOptionsVisible&&this.state.filterGeomType!==null,geomType:this.state.filterGeomType,geometry:this.state.filterGeometry,geometryChanged:function geometryChanged(geom){return _this3.setState({filterGeometry:geom})},key:"MapSelection",measure:this.state.filterGeomType==="Circle"})]}}])}(React.Component);_defineProperty(SearchBox,"propTypes",{addLayer:PropTypes.func,addLayerFeatures:PropTypes.func,addThemeSublayer:PropTypes.func,changeLayerProperty:PropTypes.func,layers:PropTypes.array,logAction:PropTypes.func,map:PropTypes.object,openExternalUrl:PropTypes.func,panTo:PropTypes.func,removeLayer:PropTypes.func,searchOptions:PropTypes.shape({allowSearchFilters:PropTypes.bool,hideResultLabels:PropTypes.bool,highlightStyle:PropTypes.object,minScaleDenom:PropTypes.number,resultLimit:PropTypes.number,sectionsDefaultCollapsed:PropTypes.bool,showHighlightMarker:PropTypes.bool,showLayerAfterChangeTheme:PropTypes.bool,showLayerResultsBeforePlaces:PropTypes.bool,showResultInSearchText:PropTypes.bool,zoomToLayers:PropTypes.bool}),searchProviders:PropTypes.object,setCurrentSearchResult:PropTypes.func,setCurrentTask:PropTypes.func,setCurrentTheme:PropTypes.func,showNotification:PropTypes.func,startupParams:PropTypes.object,theme:PropTypes.object,themes:PropTypes.object,zoomToExtent:PropTypes.func,zoomToPoint:PropTypes.func});export default connect(createSelector([function(state){return state},searchProvidersSelector],function(state,searchProviders){return{map:state.map,layers:state.layers.flat,theme:state.theme.current,themes:state.theme.themes,selection:state.selection,searchProviders:searchProviders,startupParams:state.localConfig.startupParams}}),{addThemeSublayer:addThemeSublayer,addLayer:addLayer,addLayerFeatures:addLayerFeatures,changeLayerProperty:changeLayerProperty,removeLayer:removeLayer,setCurrentSearchResult:setCurrentSearchResult,setCurrentTask:setCurrentTask,zoomToExtent:zoomToExtent,zoomToPoint:zoomToPoint,panTo:panTo,logAction:logAction,setCurrentTheme:setCurrentTheme,showNotification:showNotification,openExternalUrl:openExternalUrl})(SearchBox);
+if(!this.state.filterOptionsVisible&&prevState.filterOptionsVisible){this.searchTextChanged(this.state.searchText)}}},{key:"render",value:function render(){var _this3=this;var placeholder=LocaleUtils.tr("search.placeholder");var filterButtonClasses=classnames({"button":true,"searchbox-filter-button":true,"pressed":this.state.filterOptionsVisible||this.state.selectedProvider||this.state.filterGeometry});return[/*#__PURE__*/React.createElement("div",{className:"SearchBox",key:"SearchBox"},/*#__PURE__*/React.createElement(InputContainer,{className:"searchbox-field"},/*#__PURE__*/React.createElement(Icon,{icon:"search",role:"prefix"}),/*#__PURE__*/React.createElement("input",{onBlur:this.onBlur,onChange:function onChange(ev){return _this3.searchTextChanged(ev.target.value)},onFocus:this.onFocus,placeholder:placeholder,ref:function ref(el){_this3.searchBox=el},role:"input",type:"text",value:this.state.searchText}),this.state.pendingSearches.length>0?/*#__PURE__*/React.createElement(Spinner,{role:"suffix"}):/*#__PURE__*/React.createElement(Icon,{icon:"clear",onClick:this.clear,role:"suffix"})),this.props.searchOptions.allowSearchFilters?/*#__PURE__*/React.createElement("button",{className:filterButtonClasses,onClick:function onClick(){return _this3.toggleFilterOptions(!_this3.state.filterOptionsVisible)},title:LocaleUtils.tr("search.filter")},/*#__PURE__*/React.createElement(Icon,{icon:"filter"}),/*#__PURE__*/React.createElement(Icon,{icon:"chevron-down"})):null,this.renderResultsMenu(),this.renderFilterOptions()),/*#__PURE__*/React.createElement(MapSelection,{active:this.state.filterOptionsVisible&&this.state.filterGeomType!==null,geomType:this.state.filterGeomType,geometry:this.state.filterGeometry,geometryChanged:function geometryChanged(geom){return _this3.setState({filterGeometry:geom})},key:"MapSelection",measure:this.state.filterGeomType==="Circle"})]}}])}(React.Component);_defineProperty(SearchBox,"propTypes",{addLayer:PropTypes.func,addLayerFeatures:PropTypes.func,addThemeSublayer:PropTypes.func,changeLayerProperty:PropTypes.func,layers:PropTypes.array,logAction:PropTypes.func,map:PropTypes.object,openExternalUrl:PropTypes.func,panTo:PropTypes.func,removeLayer:PropTypes.func,replacePlaceholderLayer:PropTypes.func,searchOptions:PropTypes.shape({allowSearchFilters:PropTypes.bool,hideResultLabels:PropTypes.bool,highlightStyle:PropTypes.object,minScaleDenom:PropTypes.number,resultLimit:PropTypes.number,sectionsDefaultCollapsed:PropTypes.bool,showHighlightMarker:PropTypes.bool,showLayerAfterChangeTheme:PropTypes.bool,showLayerResultsBeforePlaces:PropTypes.bool,showResultInSearchText:PropTypes.bool,zoomToLayers:PropTypes.bool}),searchProviders:PropTypes.object,setCurrentSearchResult:PropTypes.func,setCurrentTask:PropTypes.func,setCurrentTheme:PropTypes.func,showNotification:PropTypes.func,startupParams:PropTypes.object,theme:PropTypes.object,themes:PropTypes.object,zoomToExtent:PropTypes.func,zoomToPoint:PropTypes.func});export default connect(createSelector([function(state){return state},searchProvidersSelector],function(state,searchProviders){return{map:state.map,layers:state.layers.flat,theme:state.theme.current,themes:state.theme.themes,selection:state.selection,searchProviders:searchProviders,startupParams:state.localConfig.startupParams}}),{addThemeSublayer:addThemeSublayer,addLayer:addLayer,addLayerFeatures:addLayerFeatures,changeLayerProperty:changeLayerProperty,removeLayer:removeLayer,replacePlaceholderLayer:replacePlaceholderLayer,setCurrentSearchResult:setCurrentSearchResult,setCurrentTask:setCurrentTask,zoomToExtent:zoomToExtent,zoomToPoint:zoomToPoint,panTo:panTo,logAction:logAction,setCurrentTheme:setCurrentTheme,showNotification:showNotification,openExternalUrl:openExternalUrl})(SearchBox);

package/components/StandardApp.js

@@ -8,7 +8,7 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
  */import React from"react";import{Provider,connect}from"react-redux";import axios from"axios";import deepmerge from"deepmerge";import{register as olProj4Register}from"ol/proj/proj4";import Proj4js from"proj4";import PropTypes from"prop-types";import{localConfigLoaded,setStartupParameters,setColorScheme}from"../actions/localConfig";import{changeLocale}from"../actions/locale";import{setCurrentTask}from"../actions/task";import{themesLoaded,setCurrentTheme}from"../actions/theme";import{NotificationType,showNotification,setBottombarHeight,setTopbarHeight}from"../actions/windows";import ReducerIndex from"../reducers/index";import{createStore}from"../stores/StandardStore";import ConfigUtils from"../utils/ConfigUtils";import CoordinatesUtils from"../utils/CoordinatesUtils";import LocaleUtils from"../utils/LocaleUtils";import MapUtils from"../utils/MapUtils";import MiscUtils from"../utils/MiscUtils";import{UrlParams,resolvePermaLink}from"../utils/PermaLinkUtils";import PluginStore from"../utils/PluginStore";import ThemeUtils from"../utils/ThemeUtils";import PluginsContainer from"./PluginsContainer";import"./style/App.css";import"./style/DefaultColorScheme.css";var CSRF_TOKEN=MiscUtils.getCsrfToken();if(CSRF_TOKEN){axios.interceptors.request.use(function(config){if(["POST","PUT","PATCH","DELETE"].includes(config.method.toUpperCase())){config.headers["X-CSRF-TOKEN"]=CSRF_TOKEN}return config},function(error){return Promise.reject(error)})}var AppContainerComponent=/*#__PURE__*/function(_React$Component){function AppContainerComponent(props){var _this;_classCallCheck(this,AppContainerComponent);_this=_callSuper(this,AppContainerComponent,[props]);_defineProperty(_this,"loadThemes",function(){_this.themesLoaded=true;var _this$props$startupCo=_this.props.startupConfig,state=_this$props$startupCo.state,permalinkInvalid=_this$props$startupCo.permalinkInvalid;var params=_objectSpread({},_this.props.startupConfig.params);// Clone as changed below
 // Warn if permalink key is invalid
 if(permalinkInvalid){_this.props.showNotification("missingtheme",LocaleUtils.tr("app.missingpermalink"),NotificationType.WARN,true)}// Load themes.json
-axios.get("themes.json",{params:{lang:_this.props.locale}}).then(function(response){var _this$props$appConfig,_this$props$appConfig2,_theme;var themes=ThemeUtils.applyTranslations(response.data.themes||{});(_this$props$appConfig=(_this$props$appConfig2=_this.props.appConfig).themePreprocessor)===null||_this$props$appConfig===void 0||_this$props$appConfig.call(_this$props$appConfig2,themes);_this.props.themesLoaded(themes);var theme=ThemeUtils.getThemeById(themes,params.t);if((!theme||theme.restricted)&&!ConfigUtils.getConfigProp("dontLoadDefaultTheme")&&!ConfigUtils.havePlugin("Portal")){if(params.t){_this.props.showNotification("missingtheme",LocaleUtils.tr("app.missingtheme",params.t),NotificationType.WARN,true);params.l=undefined}var defaultTheme=Object.fromEntries(_this.props.defaultUrlParams.split("&").map(function(x){return x.split("=")})).t||themes.defaultTheme;theme=ThemeUtils.getThemeById(themes,defaultTheme);params.t=defaultTheme}if(theme){var _params$bl;// Compute initial view
+axios.get("themes.json",{params:{lang:_this.props.locale}}).then(function(response){var _this$props$appConfig,_this$props$appConfig2,_theme;var themes=ThemeUtils.applyTranslations(response.data.themes||{});(_this$props$appConfig=(_this$props$appConfig2=_this.props.appConfig).themePreprocessor)===null||_this$props$appConfig===void 0||_this$props$appConfig.call(_this$props$appConfig2,themes);_this.props.themesLoaded(themes);var theme=ThemeUtils.getThemeById(themes,params.t);if((!theme||theme.restricted)&&!ConfigUtils.getConfigProp("dontLoadDefaultTheme")&&(params.t||!ConfigUtils.havePlugin("Portal"))){if(params.t){_this.props.showNotification("missingtheme",LocaleUtils.tr("app.missingtheme",params.t),NotificationType.WARN,true);params.l=undefined}var userDefaultTheme=Object.fromEntries(_this.props.defaultUrlParams.split("&").map(function(x){return x.split("=")})).t;var defaultTheme=themes.defaultTheme;if(userDefaultTheme){var _ThemeUtils$getThemeB;theme=(_ThemeUtils$getThemeB=ThemeUtils.getThemeById(themes,userDefaultTheme))!==null&&_ThemeUtils$getThemeB!==void 0?_ThemeUtils$getThemeB:ThemeUtils.getThemeById(themes,defaultTheme)}else{theme=ThemeUtils.getThemeById(themes,defaultTheme)}}if(theme){var _params$bl;// Compute initial view
 var initialView=params.v;var initialExtent=null;if(params.c&&params.s!==undefined){var coords=params.c.split(/[;,]/g).map(function(x){return parseFloat(x)||0});var scales=theme.scales||themes.defaultScales;var zoom=MapUtils.computeZoom(scales,params.s);if(coords.length===2){var p=CoordinatesUtils.reproject(coords,params.crs||theme.mapCrs,theme.bbox.crs);var bounds=theme.bbox.bounds;// Only accept c if it is within the theme bounds
 if(bounds[0]<=p[0]&&p[0]<=bounds[2]&&bounds[1]<=p[1]&&p[1]<=bounds[3]){initialExtent={center:coords,zoom:zoom,crs:params.crs||theme.mapCrs}}else{initialExtent={center:[0.5*(bounds[0]+bounds[2]),0.5*(bounds[1]+bounds[3])],zoom:zoom,crs:theme.bbox.crs}}}}else if(params.e){var _bounds=params.e.split(/[;,]/g).map(function(x){return parseFloat(x)||0});if(CoordinatesUtils.isValidExtent(_bounds)){initialExtent={bounds:_bounds,crs:params.crs||theme.mapCrs}}}var layerParams=params.l!==undefined?params.l.split(",").filter(function(entry){return entry}):null;if(layerParams&&ConfigUtils.getConfigProp("urlReverseLayerOrder")){layerParams.reverse()}_this.props.setCurrentTheme(theme,themes,false,initialExtent,layerParams,(_params$bl=params.bl)!==null&&_params$bl!==void 0?_params$bl:null,state.layers,_this.props.appConfig.themeLayerRestorer,_this.props.appConfig.externalLayerRestorer,initialView)}else if(!ConfigUtils.havePlugin("Portal")){_this.props.showNotification("missingdefaulttheme",LocaleUtils.tr("app.missingdefaulttheme",params.t),NotificationType.WARN,true)}var task=ConfigUtils.getConfigProp("startupTask");if(task&&!((_theme=theme)!==null&&_theme!==void 0&&(_theme=_theme.config)!==null&&_theme!==void 0&&_theme.startupTask)){var mapClickAction=ConfigUtils.getPluginConfig(task.key).mapClickAction;_this.props.setCurrentTask(task.key,task.mode,mapClickAction)}})});_this.themesLoaded=false;// Set initial bottom/topbar height to zero in case not topbar/bottombar is enabled
 // The components will set the proper height if and when initialized

package/components/style/SearchBox.css

@@ -31,7 +31,7 @@ div.searchbox-results {
     left: 0;
     top: 100%;
     width: 100%;
-    max-height: calc(var(--plugins-container-height) * 100 - var(--topbar-height) - var(--bottombar-height));
+    max-height: calc(var(--plugins-container-height) - var(--topbar-height) - var(--bottombar-height));
     background-color: var(--list-bg-color);
     border-left: 1px solid var(--border-color);
     border-right: 1px solid var(--border-color);
@@ -56,7 +56,7 @@ div.searchbox-results-section-title > span.icon {
 }
 
 div.searchbox-result {
-    padding: 0.125em 0.25em;
+    padding: 0.25em 0.25em;
     display: flex;
     align-items: center;
 }

package/components/widgets/LayerCatalogWidget.js

@@ -1,3 +1,3 @@
 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)}function _createForOfIteratorHelper(r,e){var t="undefined"!=typeof Symbol&&r[Symbol.iterator]||r["@@iterator"];if(!t){if(Array.isArray(r)||(t=_unsupportedIterableToArray(r))||e&&r&&"number"==typeof r.length){t&&(r=t);var _n=0,F=function F(){};return{s:F,n:function n(){return _n>=r.length?{done:!0}:{done:!1,value:r[_n++]}},e:function e(r){throw r},f:F}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,a=!0,u=!1;return{s:function s(){t=t.call(r)},n:function n(){var r=t.next();return a=r.done,r},e:function e(r){u=!0,o=r},f:function f(){try{a||null==t["return"]||t["return"]()}finally{if(u)throw o}}}}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}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}function _toConsumableArray(r){return _arrayWithoutHoles(r)||_iterableToArray(r)||_unsupportedIterableToArray(r)||_nonIterableSpread()}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.")}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}}function _iterableToArray(r){if("undefined"!=typeof Symbol&&null!=r[Symbol.iterator]||null!=r["@@iterator"])return Array.from(r)}function _arrayWithoutHoles(r){if(Array.isArray(r))return _arrayLikeToArray(r)}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}function _classCallCheck(a,n){if(!(a instanceof n))throw new TypeError("Cannot call a class as a function")}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)}}function _createClass(e,r,t){return r&&_defineProperties(e.prototype,r),t&&_defineProperties(e,t),Object.defineProperty(e,"prototype",{writable:!1}),e}function _callSuper(t,o,e){return o=_getPrototypeOf(o),_possibleConstructorReturn(t,_isNativeReflectConstruct()?Reflect.construct(o,e||[],_getPrototypeOf(t).constructor):o.apply(t,e))}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)}function _assertThisInitialized(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function _isNativeReflectConstruct(){try{var t=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(t){}return(_isNativeReflectConstruct=function _isNativeReflectConstruct(){return!!t})()}function _getPrototypeOf(t){return _getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(t){return t.__proto__||Object.getPrototypeOf(t)},_getPrototypeOf(t)}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)}function _setPrototypeOf(t,e){return _setPrototypeOf=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},_setPrototypeOf(t,e)}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}function _toPropertyKey(t){var i=_toPrimitive(t,"string");return"symbol"==_typeof(i)?i:i+""}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)}import React from"react";import{remove as removeDiacritics}from"diacritics";import isEmpty from"lodash.isempty";import PropTypes from"prop-types";import LayerUtils from"../../utils/LayerUtils";import LocaleUtils from"../../utils/LocaleUtils";import ServiceLayerUtils from"../../utils/ServiceLayerUtils";import Icon from"../Icon";import InputContainer from"./InputContainer";import"./style/LayerCatalogWidget.css";var LayerCatalogWidget=/*#__PURE__*/function(_React$PureComponent){function LayerCatalogWidget(props){var _this;_classCallCheck(this,LayerCatalogWidget);_this=_callSuper(this,LayerCatalogWidget,[props]);_defineProperty(_this,"state",{catalog:[],filter:""});_defineProperty(_this,"toggleLayerListEntry",function(path){_this.setState(function(state){var newCatalog=_toConsumableArray(state.catalog);newCatalog[path[0]]=_objectSpread({},newCatalog[path[0]]);var cur=newCatalog[path[0]];var _iterator=_createForOfIteratorHelper(path.slice(1)),_step;try{for(_iterator.s();!(_step=_iterator.n()).done;){var idx=_step.value;cur.sublayers[idx]=_objectSpread({},cur.sublayers[idx]);cur=cur.sublayers[idx]}}catch(err){_iterator.e(err)}finally{_iterator.f()}cur.expanded=!cur.expanded;return{catalog:newCatalog}})});_defineProperty(_this,"addServiceLayer",function(entry){var asGroup=arguments.length>1&&arguments[1]!==undefined?arguments[1]:false;if(entry.resource){var _entry$title;var params=LayerUtils.splitLayerUrlParam(entry.resource);// Create placeholder layer
-_this.props.addLayer({id:params.id,type:"placeholder",name:params.name,title:(_entry$title=entry.title)!==null&&_entry$title!==void 0?_entry$title:params.name,role:params.USERLAYER,loading:true});ServiceLayerUtils.findLayers(params.type,params.url,[params],_this.props.mapCrs,function(id,layer){if(layer){if(entry.sublayers===false){layer.sublayers=null}LayerUtils.propagateLayerProperty(layer,"opacity",params.opacity);_this.props.replacePlaceholderLayer(params.id,layer)}else{// eslint-disable-next-line
-alert(LocaleUtils.tr("importlayer.addfailed"));_this.props.removeLayer(params.id)}})}else if(entry.type==="wms"||entry.type==="wfs"||entry.type==="wmts"){if(asGroup){_this.props.addLayer(entry)}else{_this.props.addLayer(_objectSpread(_objectSpread({},entry),{},{sublayers:null}))}}});_this.state.catalog=props.catalog||[];return _this}_inherits(LayerCatalogWidget,_React$PureComponent);return _createClass(LayerCatalogWidget,[{key:"componentDidUpdate",value:function componentDidUpdate(prevProps){if(this.props.catalog!==prevProps.catalog){this.setState({catalog:this.props.catalog||[]})}}},{key:"renderCatalogEntry",value:function renderCatalogEntry(entry,filter,path){var _this2=this;var level=arguments.length>3&&arguments[3]!==undefined?arguments[3]:0;var idx=arguments.length>4?arguments[4]:undefined;var hasSublayers=!isEmpty(entry.sublayers);var sublayers=hasSublayers?entry.sublayers.map(function(sublayer,i){return _this2.renderCatalogEntry(sublayer,filter,[].concat(_toConsumableArray(path),[i]),level+1,i)}):[];if(sublayers.filter(function(item){return item}).length===0&&filter&&!removeDiacritics(entry.title).match(filter)){return null}var type=entry.resource?entry.resource.slice(0,entry.resource.indexOf(":")):entry.type;var key=(entry.resource||entry.type+":"+entry.name)+":"+idx;var indentSize=!this.props.levelBasedIndentSize&&level>0?1.5:level;return/*#__PURE__*/React.createElement("div",{key:key,style:{paddingLeft:indentSize+"em"}},/*#__PURE__*/React.createElement("div",{className:"layer-catalog-widget-entry"},hasSublayers?/*#__PURE__*/React.createElement(Icon,{icon:entry.expanded?"tree_minus":"tree_plus",onClick:function onClick(){return _this2.toggleLayerListEntry(path)}}):/*#__PURE__*/React.createElement("span",{className:"layer-catalog-widget-entry-iconspacer"}),/*#__PURE__*/React.createElement("span",{className:"layer-catalog-widget-entry-contents",onClick:function onClick(){return type?_this2.addServiceLayer(entry):_this2.toggleLayerListEntry(path)}},type?/*#__PURE__*/React.createElement("span",{className:"layer-catalog-widget-entry-service"},type):null,entry.title),hasSublayers&&entry.type==="wms"?/*#__PURE__*/React.createElement(Icon,{icon:"group",onClick:function onClick(){return _this2.addServiceLayer(entry,true)},title:LocaleUtils.tr("importlayer.asgroup")}):null),entry.expanded?sublayers:null)}},{key:"render",value:function render(){var _this3=this;var filter=new RegExp(removeDiacritics(this.state.filter).replace(/[-[\]/{}()*+?.\\^$|]/g,"\\$&"),"i");var emptyEntry=null;if(isEmpty(this.state.catalog)&&this.props.pendingRequests===0){emptyEntry=/*#__PURE__*/React.createElement("div",{className:"layer-catalog-placeholder"},LocaleUtils.tr("importlayer.noresults"))}else if(isEmpty(this.state.catalog)){emptyEntry=/*#__PURE__*/React.createElement("div",{className:"layer-catalog-placeholder"},LocaleUtils.tr("importlayer.loading"))}var filterplaceholder=LocaleUtils.tr("importlayer.filter");return/*#__PURE__*/React.createElement("div",{className:"layer-catalog-widget"},/*#__PURE__*/React.createElement(InputContainer,{className:"layer-catalog-widget-filter"},/*#__PURE__*/React.createElement("input",{onChange:function onChange(ev){return _this3.setState({filter:ev.target.value})},placeholder:filterplaceholder,role:"input",type:"text",value:this.state.filter}),/*#__PURE__*/React.createElement(Icon,{icon:"clear",onClick:function onClick(){return _this3.setState({filter:""})},role:"suffix"})),/*#__PURE__*/React.createElement("div",{className:"layer-catalog-widget-body"},this.state.catalog.map(function(entry,idx){return _this3.renderCatalogEntry(entry,filter,[idx],0,idx)}),emptyEntry))}}])}(React.PureComponent);_defineProperty(LayerCatalogWidget,"propTypes",{addLayer:PropTypes.func,catalog:PropTypes.array,levelBasedIndentSize:PropTypes.bool,mapCrs:PropTypes.string,pendingRequests:PropTypes.number,removeLayer:PropTypes.func,replacePlaceholderLayer:PropTypes.func});export{LayerCatalogWidget as default};
+_this.props.addLayer({id:params.id,type:"placeholder",name:params.name,title:(_entry$title=entry.title)!==null&&_entry$title!==void 0?_entry$title:params.name,role:params.USERLAYER,loading:true});ServiceLayerUtils.findLayers(params.type,params.url,[params],_this.props.mapCrs,function(id,layer){if(layer){if(entry.sublayers===false||!asGroup){layer.sublayers=null}LayerUtils.propagateLayerProperty(layer,"opacity",params.opacity);_this.props.replacePlaceholderLayer(params.id,layer)}else{// eslint-disable-next-line
+alert(LocaleUtils.tr("importlayer.addfailed"));_this.props.removeLayer(params.id)}})}else if(entry.type==="wms"||entry.type==="wfs"||entry.type==="wmts"){if(asGroup){_this.props.addLayer(entry)}else{_this.props.addLayer(_objectSpread(_objectSpread({},entry),{},{sublayers:null}))}}});_this.state.catalog=props.catalog||[];return _this}_inherits(LayerCatalogWidget,_React$PureComponent);return _createClass(LayerCatalogWidget,[{key:"componentDidUpdate",value:function componentDidUpdate(prevProps){if(this.props.catalog!==prevProps.catalog){this.setState({catalog:this.props.catalog||[]})}}},{key:"renderCatalogEntry",value:function renderCatalogEntry(entry,filter,path){var _this2=this;var level=arguments.length>3&&arguments[3]!==undefined?arguments[3]:0;var idx=arguments.length>4?arguments[4]:undefined;var hasSublayers=!isEmpty(entry.sublayers);var sublayers=hasSublayers?entry.sublayers.map(function(sublayer,i){return _this2.renderCatalogEntry(sublayer,filter,[].concat(_toConsumableArray(path),[i]),level+1,i)}):[];if(sublayers.filter(function(item){return item}).length===0&&filter&&!removeDiacritics(entry.title).match(filter)){return null}var type=entry.resource?entry.resource.slice(0,entry.resource.indexOf(":")):entry.type;var key=(entry.resource||entry.type+":"+entry.name)+":"+idx;var indentSize=!this.props.levelBasedIndentSize&&level>0?1.5:level;return/*#__PURE__*/React.createElement("div",{key:key,style:{paddingLeft:indentSize+"em"}},/*#__PURE__*/React.createElement("div",{className:"layer-catalog-widget-entry"},hasSublayers?/*#__PURE__*/React.createElement(Icon,{icon:entry.expanded?"tree_minus":"tree_plus",onClick:function onClick(){return _this2.toggleLayerListEntry(path)}}):/*#__PURE__*/React.createElement("span",{className:"layer-catalog-widget-entry-iconspacer"}),/*#__PURE__*/React.createElement("span",{className:"layer-catalog-widget-entry-contents",onClick:function onClick(){return type?_this2.addServiceLayer(entry,!hasSublayers):_this2.toggleLayerListEntry(path)}},type?/*#__PURE__*/React.createElement("span",{className:"layer-catalog-widget-entry-service"},type):null,entry.title),hasSublayers&&type==="wms"?/*#__PURE__*/React.createElement(Icon,{icon:"group",onClick:function onClick(){return _this2.addServiceLayer(entry,true)},title:LocaleUtils.tr("importlayer.asgroup")}):null),entry.expanded?sublayers:null)}},{key:"render",value:function render(){var _this3=this;var filter=new RegExp(removeDiacritics(this.state.filter).replace(/[-[\]/{}()*+?.\\^$|]/g,"\\$&"),"i");var emptyEntry=null;if(isEmpty(this.state.catalog)&&this.props.pendingRequests===0){emptyEntry=/*#__PURE__*/React.createElement("div",{className:"layer-catalog-placeholder"},LocaleUtils.tr("importlayer.noresults"))}else if(isEmpty(this.state.catalog)){emptyEntry=/*#__PURE__*/React.createElement("div",{className:"layer-catalog-placeholder"},LocaleUtils.tr("importlayer.loading"))}var filterplaceholder=LocaleUtils.tr("importlayer.filter");return/*#__PURE__*/React.createElement("div",{className:"layer-catalog-widget"},/*#__PURE__*/React.createElement(InputContainer,{className:"layer-catalog-widget-filter"},/*#__PURE__*/React.createElement("input",{onChange:function onChange(ev){return _this3.setState({filter:ev.target.value})},placeholder:filterplaceholder,role:"input",type:"text",value:this.state.filter}),/*#__PURE__*/React.createElement(Icon,{icon:"clear",onClick:function onClick(){return _this3.setState({filter:""})},role:"suffix"})),/*#__PURE__*/React.createElement("div",{className:"layer-catalog-widget-body"},this.state.catalog.map(function(entry,idx){return _this3.renderCatalogEntry(entry,filter,[idx],0,idx)}),emptyEntry))}}])}(React.PureComponent);_defineProperty(LayerCatalogWidget,"propTypes",{addLayer:PropTypes.func,catalog:PropTypes.array,levelBasedIndentSize:PropTypes.bool,mapCrs:PropTypes.string,pendingRequests:PropTypes.number,removeLayer:PropTypes.func,replacePlaceholderLayer:PropTypes.func});export{LayerCatalogWidget as default};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qwc2",
-    "version": "2025.10.07",
+    "version": "2025.10.09",
     "description": "QGIS Web Client",
     "author": "Sourcepole AG",
     "license": "BSD-2-Clause",

package/plugins/FeatureSearch.js

@@ -4,8 +4,8 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import React from"react";import{connect}from"react-redux";import axios from"axios";import isEmpty from"lodash.isempty";import PropTypes from"prop-types";import{v4 as uuidv4}from"uuid";import IdentifyViewer from"../components/IdentifyViewer";import SideBar from"../components/SideBar";import Spinner from"../components/widgets/Spinner";import IdentifyUtils from"../utils/IdentifyUtils";import LocaleUtils from"../utils/LocaleUtils";import"./style/FeatureSearch.css";/**
+ */import React from"react";import{connect}from"react-redux";import axios from"axios";import isEmpty from"lodash.isempty";import PropTypes from"prop-types";import{v4 as uuidv4}from"uuid";import Icon from"../components/Icon";import IdentifyViewer from"../components/IdentifyViewer";import SideBar from"../components/SideBar";import InputContainer from"../components/widgets/InputContainer";import Spinner from"../components/widgets/Spinner";import IdentifyUtils from"../utils/IdentifyUtils";import LocaleUtils from"../utils/LocaleUtils";import"./style/FeatureSearch.css";/**
  * Displays a dialog with a search form for configured QGIS feature searches with one or more input fields.
  *
  * See [Configuring the QGIS feature search](../../topics/Search/#configuring-the-qgis-feature-search).
- */var FeatureSearch=/*#__PURE__*/function(_React$Component){function FeatureSearch(){var _this;_classCallCheck(this,FeatureSearch);for(var _len=arguments.length,args=new Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key]}_this=_callSuper(this,FeatureSearch,[].concat(args));_defineProperty(_this,"state",{busy:false,searchProviders:{},providerGroups:{},selectedProvider:"",formValues:{},providerSelectOptions:{},searchResults:null});_defineProperty(_this,"onHide",function(){_this.setState({searchResults:null})});_defineProperty(_this,"renderBody",function(){return/*#__PURE__*/React.createElement("div",{className:"feature-search-body"},/*#__PURE__*/React.createElement("div",{className:"feature-search-selection"},/*#__PURE__*/React.createElement("select",{onChange:_this.selectProvider,value:_this.state.selectedProvider},/*#__PURE__*/React.createElement("option",{disabled:true,value:""},LocaleUtils.tr("featuresearch.select")),Object.entries(_this.state.providerGroups).map(function(_ref){var _ref2=_slicedToArray(_ref,2),group=_ref2[0],entries=_ref2[1];return[group!==""?/*#__PURE__*/React.createElement("option",{disabled:true,key:group,value:group},group):null,entries.map(function(providerId){return/*#__PURE__*/React.createElement("option",{key:providerId,value:providerId},_this.state.searchProviders[providerId].params.title)})]}))),_this.renderSearchForm(),_this.renderSearchResults())});_defineProperty(_this,"renderSearchForm",function(){var provider=_this.state.searchProviders[_this.state.selectedProvider];if(!provider){return null}return/*#__PURE__*/React.createElement("form",{className:"feature-search-form",disabled:_this.state.busy,onChange:function onChange(){return _this.setState({searchResults:null})},onSubmit:_this.search},/*#__PURE__*/React.createElement("fieldset",{disabled:_this.state.busy},provider.params.description?/*#__PURE__*/React.createElement("div",{className:"feature-search-form-descr"},provider.params.description):null,/*#__PURE__*/React.createElement("table",null,/*#__PURE__*/React.createElement("tbody",null,Object.entries(provider.params.fields).map(function(_ref3){var _value$label;var _ref4=_slicedToArray(_ref3,2),key=_ref4[0],value=_ref4[1];return/*#__PURE__*/React.createElement("tr",{key:key},/*#__PURE__*/React.createElement("td",null,(_value$label=value.label)!==null&&_value$label!==void 0?_value$label:LocaleUtils.tr(value.labelmsgid),":"),/*#__PURE__*/React.createElement("td",null,_this.renderField(key,value)))})))),/*#__PURE__*/React.createElement("div",{className:"feature-search-bar"},/*#__PURE__*/React.createElement("button",{className:"button",disabled:_this.state.busy,type:"submit"},_this.state.busy?/*#__PURE__*/React.createElement(Spinner,null):null,LocaleUtils.tr("search.search"))))});_defineProperty(_this,"renderField",function(fieldname,fieldcfg){var onChange=function onChange(ev){return _this.setState(function(state){return{formValues:_objectSpread(_objectSpread({},state.formValues),{},_defineProperty({},fieldname,ev.target.value))}})};if(fieldcfg.type==="select"){var _this$state$providerS,_this$state$providerS2;var options=(_this$state$providerS=(_this$state$providerS2=_this.state.providerSelectOptions[fieldname])===null||_this$state$providerS2===void 0?void 0:_this$state$providerS2.options)!==null&&_this$state$providerS!==void 0?_this$state$providerS:fieldcfg.options;return/*#__PURE__*/React.createElement("select",{name:fieldname,onChange:onChange},options.map(function(entry){var _entry$value,_entry$value2,_entry$label;return/*#__PURE__*/React.createElement("option",{key:(_entry$value=entry.value)!==null&&_entry$value!==void 0?_entry$value:entry,value:(_entry$value2=entry.value)!==null&&_entry$value2!==void 0?_entry$value2:entry},(_entry$label=entry.label)!==null&&_entry$label!==void 0?_entry$label:entry.labelmsgid?LocaleUtils.tr(entry.labelmsgid):entry)}))}else{return/*#__PURE__*/React.createElement("input",_extends({name:fieldname,onChange:onChange,type:fieldcfg.type||"text"},fieldcfg.options))}});_defineProperty(_this,"renderSearchResults",function(){if(!_this.state.searchResults){return null}var provider=_this.state.searchProviders[_this.state.selectedProvider];return/*#__PURE__*/React.createElement("div",{className:"feature-search-results"},isEmpty(_this.state.searchResults)?/*#__PURE__*/React.createElement("div",{className:"feature-search-noresults"},LocaleUtils.tr("featuresearch.noresults")):/*#__PURE__*/React.createElement(IdentifyViewer,{collapsible:true,displayResultTree:false,enableExport:true,identifyResults:_this.state.searchResults,showLayerTitles:!provider.params.resultTitle}))});_defineProperty(_this,"selectProvider",function(ev){_this.setState({selectedProvider:ev.target.value,searchResults:null,providerSelectOptions:{},formValues:{}})});_defineProperty(_this,"search",function(ev){ev.preventDefault();var provider=_this.state.searchProviders[_this.state.selectedProvider];if(!provider){return}var form=ev.target;var filter=_objectSpread({},provider.params.expression);var values={};Object.keys(provider.params.fields).forEach(function(fieldname){values[fieldname]=form.elements[fieldname].value});var params={SERVICE:"WMS",VERSION:_this.props.theme.version,REQUEST:"GetFeatureInfo",CRS:_this.props.theme.mapCrs,WIDTH:100,HEIGHT:100,LAYERS:[],FILTER:[],WITH_GEOMETRY:true,WITH_MAPTIP:false,feature_count:provider.params.featureCount||100,info_format:"text/xml"};Object.keys(filter).forEach(function(layer){Object.entries(values).forEach(function(_ref5){var _ref6=_slicedToArray(_ref5,2),key=_ref6[0],value=_ref6[1];filter[layer]=filter[layer].replaceAll("$".concat(key,"$"),value.replace("'","\\'"))});params.LAYERS.push(layer);params.FILTER.push(layer+":"+filter[layer])});params.QUERY_LAYERS=params.LAYERS=params.LAYERS.join(",");params.FILTER=params.FILTER.join(";");_this.setState({busy:true,searchResults:null});axios.get(_this.props.theme.featureInfoUrl,{params:params}).then(function(response){var results=IdentifyUtils.parseResponse(response.data,_this.props.theme,"text/xml",null,_this.props.map.projection);if(provider.params.resultTitle){Object.entries(results).forEach(function(_ref7){var _ref8=_slicedToArray(_ref7,2),layername=_ref8[0],features=_ref8[1];features.forEach(function(feature){var formatValues=_objectSpread(_objectSpread({},feature.properties),{},{id:feature.id,layername:layername});feature.displayname=provider.params.resultTitle.replace(/{([^}]+)}/g,function(match){return formatValues[match.slice(1,-1)]})})})}_this.setState({busy:false,searchResults:results})})["catch"](function(){_this.setState({busy:false,searchResults:{}})})});_defineProperty(_this,"reloadSelectOptions",function(){var _this$state$searchPro,_this$state$searchPro2;Object.entries((_this$state$searchPro=(_this$state$searchPro2=_this.state.searchProviders[_this.state.selectedProvider])===null||_this$state$searchPro2===void 0||(_this$state$searchPro2=_this$state$searchPro2.params)===null||_this$state$searchPro2===void 0?void 0:_this$state$searchPro2.fields)!==null&&_this$state$searchPro!==void 0?_this$state$searchPro:{}).forEach(function(_ref9){var _ref10=_slicedToArray(_ref9,2),name=_ref10[0],fieldcfg=_ref10[1];if(fieldcfg.type==="select"){if(fieldcfg.options_query){var _this$state$providerS3;var url=fieldcfg.options_query;Object.entries(_this.state.formValues).forEach(function(_ref11){var _ref12=_slicedToArray(_ref11,2),key=_ref12[0],value=_ref12[1];url=url.replace("$".concat(key,"$"),value)});if(((_this$state$providerS3=_this.state.providerSelectOptions[name])===null||_this$state$providerS3===void 0?void 0:_this$state$providerS3.source)!==url){axios.get(url).then(function(response){var options=[];if(response.data.type==="FeatureCollection"){options=Object.entries(response.data.features.reduce(function(res,feature){var value=fieldcfg.value_field==="id"?feature.id:feature.properties[fieldcfg.value_field];var label=fieldcfg.label_field==="id"?feature.id:feature.properties[fieldcfg.label_field];return _objectSpread(_objectSpread({},res),{},_defineProperty({},value,label))},{})).map(function(entry){return{value:entry[0],label:entry[1]}})}else if(Array.isArray(response.data)){options=response.data.map(function(entry){return{value:entry.key,label:entry.value}})}_this.setState(function(state){return{providerSelectOptions:_objectSpread(_objectSpread({},state.providerSelectOptions),{},_defineProperty({},name,{source:url,options:options}))}})})["catch"](function(){/* eslint-disable-next-line */console.warn("Failed to query options for field ".concat(name));_this.setState(function(state){return{providerSelectOptions:_objectSpread(_objectSpread({},state.providerSelectOptions),{},_defineProperty({},name,{source:url,options:[]}))}})})}}else if(fieldcfg.options&&!_this.state.providerSelectOptions[name]){_this.setState(function(state){return{providerSelectOptions:_objectSpread(_objectSpread({},state.providerSelectOptions),{},_defineProperty({},name,{source:"static",options:fieldcfg.options}))}})}}})});return _this}_inherits(FeatureSearch,_React$Component);return _createClass(FeatureSearch,[{key:"componentDidUpdate",value:function componentDidUpdate(prevProps,prevState){if(this.props.theme!==prevProps.theme){var _this$props$theme;var defaultProvider="";var providerGroups={};var searchProviders=(((_this$props$theme=this.props.theme)===null||_this$props$theme===void 0?void 0:_this$props$theme.searchProviders)||[]).reduce(function(res,entry){if(entry.provider==="qgis"&&entry.params){var providerDef=_objectSpread({},entry);if(!providerDef.params.fields){providerDef.params=_objectSpread({},providerDef.params);providerDef.params.fields={TEXT:{label:LocaleUtils.tr("featuresearch.query"),type:"text"}}}if(providerDef.params.titlemsgid){providerDef.params.title=LocaleUtils.tr(providerDef.params.titlemsgid)}var providerId=uuidv4();res[providerId]=providerDef;if(providerDef.params["default"]){defaultProvider=providerId}var group=providerDef.params.group||"";providerGroups[group]=[].concat(_toConsumableArray(providerGroups[group]||[]),[providerId])}return res},{});var sortedProviderGroups=Object.keys(providerGroups).sort().reduce(function(res,group){res[group]=providerGroups[group].sort(function(a,b){return searchProviders[a].params.title.localeCompare(searchProviders[b].params.title)});return res},{});this.setState({searchProviders:searchProviders,selectedProvider:defaultProvider,providerGroups:sortedProviderGroups})}if(this.state.selectedProvider!==prevState.selectedProvider){this.setState(function(state){return{formValues:Object.entries(state.searchProviders[state.selectedProvider].params.fields).reduce(function(res,_ref13){var _ref15,_cfg$options$0$value,_cfg$options,_cfg$options2;var _ref14=_slicedToArray(_ref13,2),field=_ref14[0],cfg=_ref14[1];return _objectSpread(_objectSpread({},res),{},_defineProperty({},field,(_ref15=(_cfg$options$0$value=(_cfg$options=cfg.options)===null||_cfg$options===void 0||(_cfg$options=_cfg$options[0])===null||_cfg$options===void 0?void 0:_cfg$options.value)!==null&&_cfg$options$0$value!==void 0?_cfg$options$0$value:(_cfg$options2=cfg.options)===null||_cfg$options2===void 0?void 0:_cfg$options2[0])!==null&&_ref15!==void 0?_ref15:""))},{})}})}else if(this.state.formValues!==prevState.formValues){this.reloadSelectOptions()}}},{key:"render",value:function render(){var _this2=this;return/*#__PURE__*/React.createElement(SideBar,{icon:"search",id:"FeatureSearch",onHide:this.onHide,side:this.props.side,title:LocaleUtils.tr("featuresearch.title"),width:"20em"},function(){return{body:_this2.renderBody()}})}}])}(React.Component);_defineProperty(FeatureSearch,"propTypes",{map:PropTypes.object,/** The side of the application on which to display the sidebar. */side:PropTypes.string,theme:PropTypes.object});_defineProperty(FeatureSearch,"defaultProps",{side:"right"});export default connect(function(state){return{map:state.map,theme:state.theme.current}},{})(FeatureSearch);
+ */var FeatureSearch=/*#__PURE__*/function(_React$Component){function FeatureSearch(){var _this;_classCallCheck(this,FeatureSearch);for(var _len=arguments.length,args=new Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key]}_this=_callSuper(this,FeatureSearch,[].concat(args));_defineProperty(_this,"state",{busy:false,searchProviders:{},providerGroups:{},selectedProvider:"",formValues:{},providerSelectOptions:{},searchResults:null});_defineProperty(_this,"onHide",function(){_this.setState({searchResults:null})});_defineProperty(_this,"renderBody",function(){return/*#__PURE__*/React.createElement("div",{className:"feature-search-body"},/*#__PURE__*/React.createElement("div",{className:"feature-search-selection"},/*#__PURE__*/React.createElement("select",{onChange:_this.selectProvider,value:_this.state.selectedProvider},/*#__PURE__*/React.createElement("option",{disabled:true,value:""},LocaleUtils.tr("featuresearch.select")),Object.entries(_this.state.providerGroups).map(function(_ref){var _ref2=_slicedToArray(_ref,2),group=_ref2[0],entries=_ref2[1];return[group!==""?/*#__PURE__*/React.createElement("option",{disabled:true,key:group,value:group},group):null,entries.map(function(providerId){return/*#__PURE__*/React.createElement("option",{key:providerId,value:providerId},_this.state.searchProviders[providerId].params.title)})]}))),_this.renderSearchForm(),_this.renderSearchResults())});_defineProperty(_this,"renderSearchForm",function(){var provider=_this.state.searchProviders[_this.state.selectedProvider];if(!provider){return null}var fields=Object.entries(provider.params.fields).map(function(_ref3,idx){var _value$order;var _ref4=_slicedToArray(_ref3,2),key=_ref4[0],value=_ref4[1];return _objectSpread(_objectSpread({key:key},value),{},{order:(_value$order=value.order)!==null&&_value$order!==void 0?_value$order:idx})}).sort(function(a,b){return a.order-b.order});return/*#__PURE__*/React.createElement("form",{className:"feature-search-form",disabled:_this.state.busy,onChange:function onChange(){return _this.setState({searchResults:null})},onSubmit:_this.search},/*#__PURE__*/React.createElement("fieldset",{disabled:_this.state.busy},provider.params.description?/*#__PURE__*/React.createElement("div",{className:"feature-search-form-descr"},provider.params.description):null,/*#__PURE__*/React.createElement("table",null,/*#__PURE__*/React.createElement("tbody",null,fields.map(function(field){var _field$label;return/*#__PURE__*/React.createElement("tr",{key:field.key},/*#__PURE__*/React.createElement("td",null,(_field$label=field.label)!==null&&_field$label!==void 0?_field$label:LocaleUtils.tr(field.labelmsgid),":"),/*#__PURE__*/React.createElement("td",null,_this.renderField(field.key,field)))})))),/*#__PURE__*/React.createElement("div",{className:"feature-search-bar"},/*#__PURE__*/React.createElement("button",{className:"button",disabled:_this.state.busy,type:"submit"},_this.state.busy?/*#__PURE__*/React.createElement(Spinner,null):null,LocaleUtils.tr("search.search"))))});_defineProperty(_this,"renderField",function(fieldname,fieldcfg){var onChange=function onChange(ev){return _this.setState(function(state){return{formValues:_objectSpread(_objectSpread({},state.formValues),{},_defineProperty({},fieldname,ev.target.value))}})};if(fieldcfg.type==="select"){var _ref5,_this$state$providerS,_this$state$providerS2;var options=(_ref5=(_this$state$providerS=(_this$state$providerS2=_this.state.providerSelectOptions[fieldname])===null||_this$state$providerS2===void 0?void 0:_this$state$providerS2.options)!==null&&_this$state$providerS!==void 0?_this$state$providerS:fieldcfg.options)!==null&&_ref5!==void 0?_ref5:[];return/*#__PURE__*/React.createElement(InputContainer,null,/*#__PURE__*/React.createElement("select",{defaultValue:"",name:fieldname,onChange:onChange,role:"input"},/*#__PURE__*/React.createElement("option",{disabled:true,value:""},LocaleUtils.tr("featuresearch.select")),options.map(function(entry){var _entry$value,_entry$value2,_entry$label;return/*#__PURE__*/React.createElement("option",{key:(_entry$value=entry.value)!==null&&_entry$value!==void 0?_entry$value:entry,value:(_entry$value2=entry.value)!==null&&_entry$value2!==void 0?_entry$value2:entry},(_entry$label=entry.label)!==null&&_entry$label!==void 0?_entry$label:entry.labelmsgid?LocaleUtils.tr(entry.labelmsgid):entry)})),/*#__PURE__*/React.createElement(Icon,{icon:"clear",onClick:function onClick(ev){return _this.clearField(ev,fieldname)},role:"suffix"}))}else{return/*#__PURE__*/React.createElement("input",_extends({name:fieldname,onChange:onChange,type:fieldcfg.type||"text"},fieldcfg.options))}});_defineProperty(_this,"renderSearchResults",function(){if(!_this.state.searchResults){return null}var provider=_this.state.searchProviders[_this.state.selectedProvider];return/*#__PURE__*/React.createElement("div",{className:"feature-search-results"},isEmpty(_this.state.searchResults)?/*#__PURE__*/React.createElement("div",{className:"feature-search-noresults"},LocaleUtils.tr("featuresearch.noresults")):/*#__PURE__*/React.createElement(IdentifyViewer,{collapsible:true,displayResultTree:false,enableExport:true,identifyResults:_this.state.searchResults,showLayerTitles:!provider.params.resultTitle}))});_defineProperty(_this,"selectProvider",function(ev){_this.setState({selectedProvider:ev.target.value,searchResults:null,providerSelectOptions:{},formValues:{}})});_defineProperty(_this,"search",function(ev){ev.preventDefault();var provider=_this.state.searchProviders[_this.state.selectedProvider];if(!provider){return}var form=ev.target;var filter=_objectSpread({},provider.params.expression);var values={};Object.keys(provider.params.fields).forEach(function(fieldname){values[fieldname]=form.elements[fieldname].value});var params={SERVICE:"WMS",VERSION:_this.props.theme.version,REQUEST:"GetFeatureInfo",CRS:_this.props.theme.mapCrs,WIDTH:100,HEIGHT:100,LAYERS:[],FILTER:[],WITH_GEOMETRY:true,WITH_MAPTIP:false,feature_count:provider.params.featureCount||100,info_format:"text/xml"};Object.keys(filter).forEach(function(layer){Object.entries(values).forEach(function(_ref6){var _ref7=_slicedToArray(_ref6,2),key=_ref7[0],value=_ref7[1];filter[layer]=filter[layer].replaceAll("$".concat(key,"$"),value.replace("'","\\'"))});params.LAYERS.push(layer);params.FILTER.push(layer+":"+filter[layer])});params.QUERY_LAYERS=params.LAYERS=params.LAYERS.join(",");params.FILTER=params.FILTER.join(";");_this.setState({busy:true,searchResults:null});axios.get(_this.props.theme.featureInfoUrl,{params:params}).then(function(response){var results=IdentifyUtils.parseResponse(response.data,_this.props.theme,"text/xml",null,_this.props.map.projection);if(provider.params.resultTitle){Object.entries(results).forEach(function(_ref8){var _ref9=_slicedToArray(_ref8,2),layername=_ref9[0],features=_ref9[1];features.forEach(function(feature){var formatValues=_objectSpread(_objectSpread({},feature.properties),{},{id:feature.id,layername:layername});feature.displayname=provider.params.resultTitle.replace(/{([^}]+)}/g,function(match){return formatValues[match.slice(1,-1)]})})})}_this.setState({busy:false,searchResults:results})})["catch"](function(){_this.setState({busy:false,searchResults:{}})})});_defineProperty(_this,"clearField",function(ev,fieldname){ev.target.previousElementSibling.value="";_this.setState(function(state){return{formValues:_objectSpread(_objectSpread({},state.formValues),{},_defineProperty({},fieldname,ev.target.value))}})});_defineProperty(_this,"reloadSelectOptions",function(){var _this$state$searchPro,_this$state$searchPro2;Object.entries((_this$state$searchPro=(_this$state$searchPro2=_this.state.searchProviders[_this.state.selectedProvider])===null||_this$state$searchPro2===void 0||(_this$state$searchPro2=_this$state$searchPro2.params)===null||_this$state$searchPro2===void 0?void 0:_this$state$searchPro2.fields)!==null&&_this$state$searchPro!==void 0?_this$state$searchPro:{}).forEach(function(_ref10){var _ref11=_slicedToArray(_ref10,2),name=_ref11[0],fieldcfg=_ref11[1];if(fieldcfg.type==="select"){if(fieldcfg.options_query){var _this$state$providerS3;var url=fieldcfg.options_query;Object.entries(_this.state.formValues).forEach(function(_ref12){var _ref13=_slicedToArray(_ref12,2),key=_ref13[0],value=_ref13[1];url=url.replace("$".concat(key,"$"),value)});if(((_this$state$providerS3=_this.state.providerSelectOptions[name])===null||_this$state$providerS3===void 0?void 0:_this$state$providerS3.source)!==url){axios.get(url).then(function(response){var options=[];if(response.data.type==="FeatureCollection"){options=Object.entries(response.data.features.reduce(function(res,feature){var value=fieldcfg.value_field==="id"?feature.id:feature.properties[fieldcfg.value_field];var label=fieldcfg.label_field==="id"?feature.id:feature.properties[fieldcfg.label_field];return _objectSpread(_objectSpread({},res),{},_defineProperty({},value,label))},{})).map(function(entry){return{value:entry[0],label:entry[1]}})}else if(Array.isArray(response.data)){options=response.data.map(function(entry){return{value:entry.key,label:entry.value}})}_this.setState(function(state){return{providerSelectOptions:_objectSpread(_objectSpread({},state.providerSelectOptions),{},_defineProperty({},name,{source:url,options:options}))}})})["catch"](function(){/* eslint-disable-next-line */console.warn("Failed to query options for field ".concat(name));_this.setState(function(state){return{providerSelectOptions:_objectSpread(_objectSpread({},state.providerSelectOptions),{},_defineProperty({},name,{source:url,options:[]}))}})})}}else if(fieldcfg.options&&!_this.state.providerSelectOptions[name]){_this.setState(function(state){return{providerSelectOptions:_objectSpread(_objectSpread({},state.providerSelectOptions),{},_defineProperty({},name,{source:"static",options:fieldcfg.options}))}})}}})});return _this}_inherits(FeatureSearch,_React$Component);return _createClass(FeatureSearch,[{key:"componentDidUpdate",value:function componentDidUpdate(prevProps,prevState){if(this.props.theme!==prevProps.theme){var _this$props$theme;var defaultProvider="";var providerGroups={};var searchProviders=(((_this$props$theme=this.props.theme)===null||_this$props$theme===void 0?void 0:_this$props$theme.searchProviders)||[]).reduce(function(res,entry){if(entry.provider==="qgis"&&entry.params){var providerDef=_objectSpread({},entry);if(!providerDef.params.fields){providerDef.params=_objectSpread({},providerDef.params);providerDef.params.fields={TEXT:{label:LocaleUtils.tr("featuresearch.query"),type:"text"}}}if(providerDef.params.titlemsgid){providerDef.params.title=LocaleUtils.tr(providerDef.params.titlemsgid)}var providerId=uuidv4();res[providerId]=providerDef;if(providerDef.params["default"]){defaultProvider=providerId}var group=providerDef.params.group||"";providerGroups[group]=[].concat(_toConsumableArray(providerGroups[group]||[]),[providerId])}return res},{});var sortedProviderGroups=Object.keys(providerGroups).sort().reduce(function(res,group){res[group]=providerGroups[group].sort(function(a,b){return searchProviders[a].params.title.localeCompare(searchProviders[b].params.title)});return res},{});this.setState({searchProviders:searchProviders,selectedProvider:defaultProvider,providerGroups:sortedProviderGroups})}if(this.state.selectedProvider!==prevState.selectedProvider){this.setState(function(state){var _state$searchProvider;return{formValues:Object.entries(((_state$searchProvider=state.searchProviders[state.selectedProvider])===null||_state$searchProvider===void 0||(_state$searchProvider=_state$searchProvider.params)===null||_state$searchProvider===void 0?void 0:_state$searchProvider.fields)||[]).reduce(function(res,_ref14){var _ref15=_slicedToArray(_ref14,2),field=_ref15[0],cfg=_ref15[1];return _objectSpread(_objectSpread({},res),{},_defineProperty({},field,""))},{})}})}else if(this.state.formValues!==prevState.formValues){this.reloadSelectOptions()}}},{key:"render",value:function render(){var _this2=this;return/*#__PURE__*/React.createElement(SideBar,{icon:"search",id:"FeatureSearch",onHide:this.onHide,side:this.props.side,title:LocaleUtils.tr("featuresearch.title"),width:"20em"},function(){return{body:_this2.renderBody()}})}}])}(React.Component);_defineProperty(FeatureSearch,"propTypes",{map:PropTypes.object,/** The side of the application on which to display the sidebar. */side:PropTypes.string,theme:PropTypes.object});_defineProperty(FeatureSearch,"defaultProps",{side:"right"});export default connect(function(state){return{map:state.map,theme:state.theme.current}},{})(FeatureSearch);

package/plugins/LayerCatalog.js

@@ -4,7 +4,7 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
- */import React from"react";import{connect}from"react-redux";import axios from"axios";import PropTypes from"prop-types";import{addLayer,removeLayer,replacePlaceholderLayer}from"../actions/layers";import{setCurrentTask}from"../actions/task";import ResizeableWindow from"../components/ResizeableWindow";import LayerCatalogWidget from"../components/widgets/LayerCatalogWidget";import LocaleUtils from"../utils/LocaleUtils";import MiscUtils from"../utils/MiscUtils";import"./style/LayerCatalog.css";/**
+ */import React from"react";import{connect}from"react-redux";import axios from"axios";import{remove as removeDiacritics}from"diacritics";import PropTypes from"prop-types";import{addLayer,removeLayer,replacePlaceholderLayer}from"../actions/layers";import{setCurrentTask}from"../actions/task";import ResizeableWindow from"../components/ResizeableWindow";import LayerCatalogWidget from"../components/widgets/LayerCatalogWidget";import LocaleUtils from"../utils/LocaleUtils";import MiscUtils from"../utils/MiscUtils";import{registerSearchProvider,SearchResultType,unregisterSearchProvider}from"../utils/SearchProviders";import"./style/LayerCatalog.css";/**
  * Displays a pre-configured catalog of external layers in a window.
  *
  * Configured through a catalog JSON containing a tree of external layer identifiers.
@@ -41,5 +41,5 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
  *   ]
  * }
  * ```
- */var LayerCatalog=/*#__PURE__*/function(_React$Component){function LayerCatalog(){var _this;_classCallCheck(this,LayerCatalog);for(var _len=arguments.length,args=new Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key]}_this=_callSuper(this,LayerCatalog,[].concat(args));_defineProperty(_this,"state",{catalog:null});_defineProperty(_this,"setCatalog",function(response){_this.setState({catalog:response.data.catalog||[]});_this.props.setCurrentTask("LayerTree")});_defineProperty(_this,"onClose",function(){_this.setState({catalog:null})});return _this}_inherits(LayerCatalog,_React$Component);return _createClass(LayerCatalog,[{key:"componentDidUpdate",value:function componentDidUpdate(prevProps){var _this2=this;if(this.props.active&&!prevProps.active&&this.props.catalogUrl){axios.get(MiscUtils.resolveAssetsPath(this.props.catalogUrl)).then(this.setCatalog)["catch"](function(e){_this2.setState({catalog:[]});// eslint-disable-next-line
-console.warn("Failed to load catalog: "+e)})}}},{key:"render",value:function render(){if(!this.state.catalog){return null}return/*#__PURE__*/React.createElement(ResizeableWindow,{dockable:this.props.geometry.side,icon:"catalog",initialHeight:this.props.geometry.initialHeight,initialWidth:this.props.geometry.initialWidth,initialX:this.props.geometry.initialX,initialY:this.props.geometry.initialY,initiallyDocked:this.props.geometry.initiallyDocked,onClose:this.onClose,title:LocaleUtils.tr("layercatalog.windowtitle")},/*#__PURE__*/React.createElement("div",{className:"layer-catalog",role:"body"},/*#__PURE__*/React.createElement(LayerCatalogWidget,{addLayer:this.props.addLayer,catalog:this.state.catalog,levelBasedIndentSize:this.props.levelBasedIndentSize,pendingRequests:0,removeLayer:this.props.removeLayer,replacePlaceholderLayer:this.props.replacePlaceholderLayer})))}}])}(React.Component);_defineProperty(LayerCatalog,"propTypes",{active:PropTypes.bool,addLayer:PropTypes.func,/** The URL to the catalog JSON file. */catalogUrl:PropTypes.string,/** Default window geometry with size, position and docking status. Positive position values (including '0') are related to top (InitialY) and left (InitialX), negative values (including '-0') to bottom (InitialY) and right (InitialX). */geometry:PropTypes.shape({initialWidth:PropTypes.number,initialHeight:PropTypes.number,initialX:PropTypes.number,initialY:PropTypes.number,initiallyDocked:PropTypes.bool,side:PropTypes.string}),/** Whether to increase the indent size dynamically according to the current level (`true`) or keep the indent size constant (`false`). */levelBasedIndentSize:PropTypes.bool,removeLayer:PropTypes.func,replacePlaceholderLayer:PropTypes.func,setCurrentTask:PropTypes.func});_defineProperty(LayerCatalog,"defaultProps",{geometry:{initialWidth:320,initialHeight:320,initialX:0,initialY:0,initiallyDocked:false,side:"left"},levelBasedIndentSize:true});export default connect(function(state){return{active:state.task.id==="LayerCatalog"}},{addLayer:addLayer,removeLayer:removeLayer,replacePlaceholderLayer:replacePlaceholderLayer,setCurrentTask:setCurrentTask})(LayerCatalog);
+ */var LayerCatalog=/*#__PURE__*/function(_React$Component){function LayerCatalog(){var _this;_classCallCheck(this,LayerCatalog);for(var _len=arguments.length,args=new Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key]}_this=_callSuper(this,LayerCatalog,[].concat(args));_defineProperty(_this,"state",{catalog:null,visible:false});_defineProperty(_this,"onClose",function(){_this.setState({visible:false})});_defineProperty(_this,"searchCatalog",function(text,searchParams,callback){var filter=new RegExp(removeDiacritics(text).replace(/[-[\]/{}()*+?.\\^$|]/g,"\\$&"),"i");var results=[];if(_this.state.catalog){_this.searchCatalogGroup(results,filter,_this.state.catalog)}if(results.length>0){callback({results:[{id:"cataloglayers",title:LocaleUtils.tr("layercatalog.windowtitle"),type:SearchResultType.EXTERNALLAYER,items:results}]})}else{callback({results:[]})}});_defineProperty(_this,"searchCatalogGroup",function(results,filter,group){group.forEach(function(entry){var type=entry.resource?entry.resource.slice(0,entry.resource.indexOf(":")):entry.type;if(entry.sublayers){_this.searchCatalogGroup(results,filter,entry.sublayers)}if(entry.sublayers&&type!=="wms"){return}if(removeDiacritics(entry.title).match(filter)){var _entry$sublayers,_entry$sublayers$map;results.push({id:"cataloglayer:"+results.length,text:entry.title,layer:entry,sublayers:(_entry$sublayers=entry.sublayers)===null||_entry$sublayers===void 0||(_entry$sublayers$map=_entry$sublayers.map)===null||_entry$sublayers$map===void 0?void 0:_entry$sublayers$map.call(_entry$sublayers,function(sublayer,idx){return{id:"cataloglayer:"+results.length+":"+idx,text:sublayer.title,layer:sublayer}})})}})});return _this}_inherits(LayerCatalog,_React$Component);return _createClass(LayerCatalog,[{key:"componentDidMount",value:function componentDidMount(){var _this2=this;if(this.props.catalogUrl){axios.get(MiscUtils.resolveAssetsPath(this.props.catalogUrl)).then(function(response){_this2.setState({catalog:response.data.catalog||[]})})["catch"](function(e){_this2.setState({catalog:[]});// eslint-disable-next-line
+console.warn("Failed to load catalog: "+e)})}if(this.props.registerCatalogSearchProvider){registerSearchProvider("catalogsearch",{label:LocaleUtils.tr("layercatalog.windowtitle"),onSearch:this.searchCatalog})}}},{key:"componentWillUnmount",value:function componentWillUnmount(){if(this.props.registerCatalogSearchProvider){unregisterSearchProvider("catalogsearch")}}},{key:"componentDidUpdate",value:function componentDidUpdate(prevProps){if(this.props.active&&!prevProps.active){this.setState({visible:true});this.props.setCurrentTask("LayerTree")}}},{key:"render",value:function render(){if(!this.state.visible){return null}return/*#__PURE__*/React.createElement(ResizeableWindow,{dockable:this.props.geometry.side,icon:"catalog",initialHeight:this.props.geometry.initialHeight,initialWidth:this.props.geometry.initialWidth,initialX:this.props.geometry.initialX,initialY:this.props.geometry.initialY,initiallyDocked:this.props.geometry.initiallyDocked,onClose:this.onClose,title:LocaleUtils.tr("layercatalog.windowtitle")},/*#__PURE__*/React.createElement("div",{className:"layer-catalog",role:"body"},/*#__PURE__*/React.createElement(LayerCatalogWidget,{addLayer:this.props.addLayer,catalog:this.state.catalog,levelBasedIndentSize:this.props.levelBasedIndentSize,pendingRequests:0,removeLayer:this.props.removeLayer,replacePlaceholderLayer:this.props.replacePlaceholderLayer})))}}])}(React.Component);_defineProperty(LayerCatalog,"propTypes",{active:PropTypes.bool,addLayer:PropTypes.func,/** The URL to the catalog JSON file. */catalogUrl:PropTypes.string,/** Default window geometry with size, position and docking status. Positive position values (including '0') are related to top (InitialY) and left (InitialX), negative values (including '-0') to bottom (InitialY) and right (InitialX). */geometry:PropTypes.shape({initialWidth:PropTypes.number,initialHeight:PropTypes.number,initialX:PropTypes.number,initialY:PropTypes.number,initiallyDocked:PropTypes.bool,side:PropTypes.string}),/** Whether to increase the indent size dynamically according to the current level (`true`) or keep the indent size constant (`false`). */levelBasedIndentSize:PropTypes.bool,/** Whether to register a search provider which allows searching catalog layers through the global search field. */registerCatalogSearchProvider:PropTypes.bool,removeLayer:PropTypes.func,replacePlaceholderLayer:PropTypes.func,setCurrentTask:PropTypes.func});_defineProperty(LayerCatalog,"defaultProps",{geometry:{initialWidth:320,initialHeight:320,initialX:0,initialY:0,initiallyDocked:false,side:"left"},levelBasedIndentSize:true,registerCatalogSearchProvider:true});export default connect(function(state){return{active:state.task.id==="LayerCatalog"}},{addLayer:addLayer,removeLayer:removeLayer,replacePlaceholderLayer:replacePlaceholderLayer,setCurrentTask:setCurrentTask})(LayerCatalog);

package/plugins/Map.js

@@ -7,7 +7,7 @@ function _typeof(o){"@babel/helpers - typeof";return _typeof="function"==typeof
  * LICENSE file in the root directory of this source tree.
  */import React from"react";import ReactDOM from"react-dom";import{connect}from"react-redux";import isEmpty from"lodash.isempty";import PropTypes from"prop-types";import{LayerRole}from"../actions/layers";import{MapContainerPortalContext}from"../components/PluginsContainer";import OlLayer from"../components/map/OlLayer";import OlMap from"../components/map/OlMap";import Spinner from"../components/widgets/Spinner";import LayerUtils from"../utils/LayerUtils";import LocaleUtils from"../utils/LocaleUtils";import"./style/Map.css";/**
  * The main map component.
- */var Map=/*#__PURE__*/function(_React$Component){function Map(props){var _this;_classCallCheck(this,Map);_this=_callSuper(this,Map,[props]);_defineProperty(_this,"state",{renderLayers:[],swipeLayer:null});_defineProperty(_this,"renderLayers",function(){var zIndex=0;return _this.state.renderLayers.map(function(layer){var _ref,_layer$params,_layer$zIndex;if(layer.type==="placeholder"){return null}++zIndex;var swipe=_this.props.swipe!==null&&layer===_this.state.swipeLayer;var key=(_ref=layer.id+":"+((_layer$params=layer.params)===null||_layer$params===void 0?void 0:_layer$params.LAYERS))!==null&&_ref!==void 0?_ref:"";return/*#__PURE__*/React.createElement(OlLayer,{key:key,options:layer,swipe:swipe?_this.props.swipe:null,zIndex:(_layer$zIndex=layer.zIndex)!==null&&_layer$zIndex!==void 0?_layer$zIndex:zIndex})})});_defineProperty(_this,"renderSupportTools",function(){return Object.entries(_this.props.tools).map(function(_ref2){var _ref3=_slicedToArray(_ref2,2),key=_ref3[0],Tool=_ref3[1];var options=_this.props.toolsOptions[key]||{};return/*#__PURE__*/React.createElement(Tool,_extends({key:key},options))})});_this.loadingEl=null;return _this}_inherits(Map,_React$Component);return _createClass(Map,[{key:"componentDidUpdate",value:function componentDidUpdate(prevProps){var _this2=this;if(this.props.layers!==prevProps.layers||this.props.swipe!==null!==(prevProps.swipe!==null)){var renderLayers=[];// Inject external layers
+ */var Map=/*#__PURE__*/function(_React$Component){function Map(props){var _this;_classCallCheck(this,Map);_this=_callSuper(this,Map,[props]);_defineProperty(_this,"state",{renderLayers:[],swipeLayer:null});_defineProperty(_this,"renderLayers",function(){var zIndex=0;var usedKeys=new Set;return _this.state.renderLayers.map(function(layer){var _layer$zIndex;if(layer.type==="placeholder"){return null}++zIndex;var swipe=_this.props.swipe!==null&&layer===_this.state.swipeLayer;var key=layer.id;for(var i=0;usedKeys.has(key);++i){key=layer.id+":"+i}usedKeys.add(key);return/*#__PURE__*/React.createElement(OlLayer,{key:key,options:layer,swipe:swipe?_this.props.swipe:null,zIndex:(_layer$zIndex=layer.zIndex)!==null&&_layer$zIndex!==void 0?_layer$zIndex:zIndex})})});_defineProperty(_this,"renderSupportTools",function(){return Object.entries(_this.props.tools).map(function(_ref){var _ref2=_slicedToArray(_ref,2),key=_ref2[0],Tool=_ref2[1];var options=_this.props.toolsOptions[key]||{};return/*#__PURE__*/React.createElement(Tool,_extends({key:key},options))})});_this.loadingEl=null;return _this}_inherits(Map,_React$Component);return _createClass(Map,[{key:"componentDidUpdate",value:function componentDidUpdate(prevProps){var _this2=this;if(this.props.layers!==prevProps.layers||this.props.swipe!==null!==(prevProps.swipe!==null)){var renderLayers=[];// Inject external layers
 this.props.layers.slice(0).reverse().forEach(function(layer){if(layer.type==="wms"&&layer.role===LayerRole.THEME){var sublayers=layer.params.LAYERS.split(",");var opacities=layer.params.OPACITIES.split(",");var styles=(layer.params.STYLES||"").split(",");for(var i=0;i<sublayers.length;++i){if(layer.externalLayerMap&&layer.externalLayerMap[sublayers[i]]){// Sublayer is mapped to an external layer
 var sublayer=LayerUtils.searchSubLayer(layer,"name",sublayers[i]);if(sublayer.visibility){var extlayer=_objectSpread(_objectSpread({},layer.externalLayerMap[sublayers[i]]),{},{rev:layer.rev,opacity:parseInt(opacities[i],10),visibility:true,role:LayerRole.THEME,minScale:sublayer.minScale,maxScale:sublayer.maxScale});if(extlayer.type==="wms"){extlayer.params=_objectSpread(_objectSpread(_objectSpread({},layer.params),layer.externalLayerMap[sublayers[i]].params),{},{OPACITIES:opacities[i],STYLES:""})}renderLayers.push(extlayer)}}else if(renderLayers.length>0&&renderLayers[renderLayers.length-1].id===layer.id){// Compress with previous renderlayer
 renderLayers[renderLayers.length-1].params.LAYERS+=","+sublayers[i];renderLayers[renderLayers.length-1].params.OPACITIES+=","+opacities[i];renderLayers[renderLayers.length-1].params.STYLES+=","+(styles[i]||"")}else{// Add new renderlayer