diff --git a/web/client/components/TOC/fragments/settings/FeatureInfoFormat.jsx b/web/client/components/TOC/fragments/settings/FeatureInfoFormat.jsx deleted file mode 100644 index 1741c78fc5..0000000000 --- a/web/client/components/TOC/fragments/settings/FeatureInfoFormat.jsx +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2017, GeoSolutions Sas. - * All rights reserved. - * - * 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 PropTypes from 'prop-types'; -import { DropdownList } from 'react-widgets'; -import { getAvailableInfoFormat, getLabelFromValue } from '../../../../utils/MapInfoUtils'; -import { Grid } from 'react-bootstrap'; -import Message from '../../../I18N/Message'; - -/** - * FeatureInfoFormat shows the infoformat selected for that layer or the default one taken - * from the general settings. - * @class - * @memberof components.toc - * @prop {object} [element] the layer options - * @prop {object} [label] the label shown for the combobox - * @prop {object} [defaultInfoFormat] the object used to show options labels - * @prop {string} [generalInfoFormat] the infoFormat value set in the general settings - * @prop {function} [onInfoFormatChange] it updates the infoFormat and/or viewer for the given layer - */ -export default class extends React.Component { - static propTypes = { - element: PropTypes.object, - label: PropTypes.object, - defaultInfoFormat: PropTypes.object, - generalInfoFormat: PropTypes.string, - onChange: PropTypes.func - }; - - static defaultProps = { - defaultInfoFormat: getAvailableInfoFormat(), - generalInfoFormat: "text/plain", - onChange: () => {}, - label:
- { !firstPage &&
- this.props.onUpdateField(this.props.filterField.rowId, "value", this.props.filterField.value, "string", {currentPage: this.props.filterField.fieldOptions.currentPage - 1, delayDebounce: 0}) }/>
- }
- { !lastPage &&
- this.props.onUpdateField(this.props.filterField.rowId, "value", this.props.filterField.value, "string", {currentPage: this.props.filterField.fieldOptions.currentPage + 1, delayDebounce: 0})}/>
- }
-
- );
- };
- renderField = () => {
- let selectedValue;
- if (this.props.filterField && this.props.filterField.value && this.props.filterField.value !== "*") {
- selectedValue = {
- 'value': this.props.filterField.value,
- 'label': this.props.filterField.value
- };
- }
- let options = this.getOptions() ? this.getOptions().slice(0) : [];
- if (this.props.paginated && options.length > 0) {
- options.push({ label: '', value: '', disabled: true, pagination: this.renderPagination() });
- }
- const messages = {
- emptyList: getMessageById(this.context.messages, "queryform.attributefilter.autocomplete.emptyList"),
- open: getMessageById(this.context.messages, "queryform.attributefilter.autocomplete.open"),
- emptyFilter: getMessageById(this.context.messages, "queryform.attributefilter.autocomplete.emptyFilter")
- };
- const tooltip = (
- {label}
- {this.renderField()}
-
);
- }
-
- // called before onChange
- handleSelect = () => {
- this.selected = true;
- };
-
- handleChange = (input) => {
- if (this.selected) {
- this.selected = false;
- if (input && input.value !== "") {
- this.props.onUpdateField(this.props.filterField.rowId, "value", input.value, "string", {currentPage: 1, selected: "selected", delayDebounce: 0});
- }
- } else {
- this.props.onUpdateField(this.props.filterField.rowId, "value", input, "string", {currentPage: 1, delayDebounce: 1000});
- }
- };
-
- // called before onToggle
- handleFocus = (options) => {
- this.loadWithoutfilter(options);
- };
-
- handleToggle = () => {
- this.props.toggleMenu(this.props.filterField.rowId, !this.props.filterField.openAutocompleteMenu);
- };
-
- loadWithoutfilter = (options) => {
- if (options.length === 0 && !this.props.filterField.value) {
- this.props.onUpdateField(this.props.filterField.rowId, "value", "", "string", {currentPage: 1, delayDebounce: 0});
- }
- };
-}
-
-export default AutocompleteField;
diff --git a/web/client/components/data/query/SimpleFilterField.jsx b/web/client/components/data/query/SimpleFilterField.jsx
deleted file mode 100644
index 3ac4856131..0000000000
--- a/web/client/components/data/query/SimpleFilterField.jsx
+++ /dev/null
@@ -1,328 +0,0 @@
-
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import PropTypes from 'prop-types';
-import React from 'react';
-import { Panel, ButtonToolbar, Tooltip } from 'react-bootstrap';
-import Button from '../../misc/Button';
-import OverlayTrigger from '../../misc/OverlayTrigger';
-import ComboField from './ComboField';
-import NumberField from './NumberField';
-import TextField from './TextField';
-import { isEqual, head, findIndex } from 'lodash';
-
-class SimpleFilterField extends React.Component {
- static propTypes = {
- dropUp: PropTypes.bool,
- operator: PropTypes.string.isRequired,
- maxLabelSize: PropTypes.number,
- label: PropTypes.string,
- attribute: PropTypes.string.isRequired,
- optionsValues: PropTypes.array,
- defaultOptions: PropTypes.array,
- optionsLabels: PropTypes.object,
- values: PropTypes.oneOfType([PropTypes.array, PropTypes.object, PropTypes.number, PropTypes.string]),
- multivalue: PropTypes.bool,
- combo: PropTypes.bool,
- toolbar: PropTypes.bool,
- type: PropTypes.oneOf(['list', 'number', 'string']).isRequired,
- collapsible: PropTypes.bool,
- defaultExpanded: PropTypes.bool,
- eventKey: PropTypes.string,
- fieldId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
- checkboxStyle: PropTypes.object,
- radioStyle: PropTypes.object,
- comboStyle: PropTypes.object,
- sort: PropTypes.oneOf(['ASC', 'DESC', false]),
- exception: PropTypes.oneOfType([
- PropTypes.object,
- PropTypes.bool,
- PropTypes.string
- ]),
- required: PropTypes.bool,
- addAllOpt: PropTypes.bool,
- updateFilter: PropTypes.func,
- valueFormatter: PropTypes.func,
- options: PropTypes.object
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- options: null,
- operator: null,
- maxLabelSize: 20,
- sort: false,
- required: false,
- exception: false,
- checkboxStyle: {},
- radioStyle: {},
- comboStyle: {},
- optionsValues: [],
- optionsLabels: {},
- defaultOptions: [],
- values: [],
- attribute: "",
- multivalue: false,
- combo: false,
- toolbar: false,
- type: null,
- collapsible: false,
- defaultExpanded: false,
- updateFilter: () => {},
- valueFormatter: (value, labels) => {
- return labels[value] ? labels[value] : value;
- }
- };
-
- shouldComponentUpdate(nextProps) {
- return !isEqual(this.props, nextProps);
- }
-
- onRChange = (e) => {
- this.props.updateFilter(this.props.fieldId, {values: [e.target.value]});
- };
-
- onCheckChange = (e) => {
- let values;
- if (e.target.checked) {
- values = [...this.props.values, e.target.value];
- } else {
- values = this.props.values.filter((v) => {
- return v !== e.target.value;
- });
- }
- let exception = this.props.required && values.length === 0 ? true : false;
- this.props.updateFilter(this.props.fieldId, {values: values, exception: exception});
- };
-
- onComboChange = (id, fieldName, value) => {
- let values = Array.isArray(value) ? value : [value];
- let exception = this.props.required && values.length === 0 ? true : false;
- this.props.updateFilter(id, {values: values, exception: exception});
- };
-
- onNumberChange = (id, fieldName, value) => {
- this.props.updateFilter(id, {values: value});
- };
-
- onNumberException = (id, exception) => {
- this.props.updateFilter(id, {exception: exception});
- };
-
- onTextChange = (id, fieldName, value) => {
- let exception = this.props.required && value.length === 0 ? true : false;
- this.props.updateFilter(id, {values: value, exception: exception});
- };
-
- getOptionsValue = () => {
- let optionsValues = this.props.optionsValues.map((opt) => {
- let val = opt;
- if (val === null) {
- val = "null";
- } else if (typeof val !== 'string') {
- val = opt.toString();
- }
- return val;
- }, this);
- if ( this.props.defaultOptions.length > 0) {
- optionsValues = this.props.defaultOptions.reduce((opts, opt) => {
- let nOpt = head(optionsValues.filter((v) => {
- return v === opt;
- }));
- if (nOpt) {
- opts.push(nOpt);
- }
- return opts;
- }, []);
- } else if (this.props.sort) {
- optionsValues = this.props.sort === "ASC" ? optionsValues.sort() : optionsValues.sort().reverse();
- }
- return optionsValues;
- };
-
- renderLabel = (opt) => {
- let lab = this.props.valueFormatter(opt, this.props.optionsLabels, this.props.maxLabelSize);
- return opt.length > this.props.maxLabelSize ?
-
- {this.renderCheckboxElements()}
- {this.props.toolbar ? this.renderToolbar() : null}
-
- );
- };
-
- renderCombo = () => {
- let optionsValues = this.getOptionsValue();
- let options = optionsValues.map((o) => {
- return {val: o, text: this.props.valueFormatter(o, this.props.optionsLabels)};
- }, this);
- let val = this.props.values && this.props.values.length > 0 ? {fieldValue: this.props.multivalue ? this.props.values : this.props.values[0] } : {};
- return (
-
-
- );
- };
-
- renderCheckOrRadio = () => {
- return this.props.multivalue ? this.renderCheckboxPanel() : this.renderRadioPanel();
- };
-
- renderText = () => {
- return (
- | {file.name} | -{this.humanFileSize(file.size)} | -{file.type} | -
{this.props.error.data}
-
);
- }
-
- return (
-
-
- -
-
- {e.preventDefault(); this.props.loadImports(); }}>
- {e.preventDefault(); this.props.loadImport(this.props.selectedImport.id); }}>
-
-
- - {e.preventDefault(); this.props.loadTask(this.props.selectedImport.id, this.props.selectedTask.id); }}> - Package {this.props.selectedTask.id} - -
- Transform {this.props.selectedTransform.id} -
-
-
- {e.preventDefault(); this.props.loadImports(); }}>
- {e.preventDefault(); this.props.loadImport(this.props.selectedImport.id); }}>
-
-
- - Package {this.props.selectedTask.id} -
-
-
-
-
- {importObj.archive} -
- {this.renderLoadingMessage(task)}
-
);
- }
- return null;
- };
-
- render() {
- return (
-
- {breadcrumb}
-
);
- }
- if ( this.props.selectedImport && this.props.selectedTask) {
- return (Transform {this.props.selectedTransform.id}
-
- {breadcrumb}
-
);
- }
- if (this.props.selectedImport) {
- return (
- {breadcrumb}
-
);
- }
- return (
- {breadcrumb}
-
);
- };
-
- render() {
- let message = this.props.selectedImport ? "importer.dropfileImport" : "importer.dropfile";
- return (
- {this.renderLoadingMessage(importObj)}
;
- }
- return null;
- };
-
- renderImportErrorMessage = (imp) => {
- if (imp && imp.error) {
- return ;
- }
- return null;
- };
-
- renderImport = (importObj) => {
- let tooltip = -
- {["name", "title", "description"].map(this.renderInput)}
-
-
-
- -
-
- {this.renderErrorMessage(task)} -
- {
- this.props.task.state === "READY" // force this to default because APPEND and REPLACE are not supported yet.
- /* this.props.task */?
: - task.updateMode}
-
-
-
- {data.file} -
- {data.format} -
-
-
- {target.dataStore && target.dataStore.type || target.coverageStore && target.coverageStore.type} -
- {target.dataStore && target.dataStore.name || target.coverageStore && target.coverageStore.name} -
{this.props.transform.type}
- {this.renderTransformOptions()} - {this.renderSave()} -
-
);
- }
-
- isValid = (name) => {
- // should not contain spaces
- return name.indexOf(" ") < 0 && name.length > 0;
- };
-
- validate = (e) => {
- let name = e.target.value;
- let valid = this.isValid(name);
- this.setState({valid, name});
- };
-
- createWorkspace = () => {
- let name = this.state && this.state.name;
- let valid = this.isValid(name);
- if (name && valid) {
- this.props.createWorkspace(name, this.props.datastoreTemplates);
- }
- };
-}
diff --git a/web/client/components/manager/importer/style/importer.css b/web/client/components/manager/importer/style/importer.css
deleted file mode 100644
index 9ef15187cf..0000000000
--- a/web/client/components/manager/importer/style/importer.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.importer-button {
- margin-left: 5px;
-}
-.importer-page .importer-plugin{
- margin: 20px
-}
diff --git a/web/client/components/manager/importer/transforms/GdalAddoTransform.jsx b/web/client/components/manager/importer/transforms/GdalAddoTransform.jsx
deleted file mode 100644
index b1b56a3f76..0000000000
--- a/web/client/components/manager/importer/transforms/GdalAddoTransform.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import PropTypes from 'prop-types';
-
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 { FormControl } from 'react-bootstrap';
-import assign from 'object-assign';
-import { findIndex } from 'lodash';
-import { Message, Alert } from '../../../I18N/I18N';
-
-class GdalTranslateTransform extends React.Component {
- static propTypes = {
- transform: PropTypes.object,
- editTransform: PropTypes.func
- };
-
- static defaultProps = {
- transform: {
- options: [],
- levels: []
- },
- editTransform: () => {},
- updateTransform: () => {}
- };
-
- onChange = (event) => {
- let value = event.target.value || "";
- this.props.editTransform(assign({}, this.props.transform, {[event.target.name]: value.split(/\s+/g) }));
- };
-
- renderInvalid = () => {
- if (!this.isValid(this.props.transform)) {
- return {this.props.selectedWorkSpace}
)
- : (
-
);
- }
-
- isValid = (t) => {
- return t && t.options && findIndex(t.options, (e) => e === "") < 0;
- };
-}
-
-export default GdalTranslateTransform;
diff --git a/web/client/components/manager/importer/transforms/GdalWarpTransform.jsx b/web/client/components/manager/importer/transforms/GdalWarpTransform.jsx
deleted file mode 100644
index 8e547da1b2..0000000000
--- a/web/client/components/manager/importer/transforms/GdalWarpTransform.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-export default require('./GdalTranslateTransform').default;
diff --git a/web/client/components/manager/importer/transforms/index.js b/web/client/components/manager/importer/transforms/index.js
deleted file mode 100644
index 3c61a50c38..0000000000
--- a/web/client/components/manager/importer/transforms/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
- GdalAddoTransform: require("./GdalAddoTransform").default,
- GdalTranslateTransform: require('./GdalTranslateTransform').default,
- GdalWarpTransform: require('./GdalWarpTransform').default,
- help: {
- GdalAddoTransform: "http://www.gdal.org/gdaladdo.html",
- GdalTranslateTransform: "http://www.gdal.org/gdal_translate.html",
- GdalWarpTransform: "http://www.gdal.org/gdalwarp.html"
- }
-};
diff --git a/web/client/components/manager/users/GroupManager.jsx b/web/client/components/manager/users/GroupManager.jsx
deleted file mode 100644
index 65c799655d..0000000000
--- a/web/client/components/manager/users/GroupManager.jsx
+++ /dev/null
@@ -1,56 +0,0 @@
-
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import PropTypes from 'prop-types';
-import React from 'react';
-import { ListGroup, ListGroupItem, Glyphicon } from 'react-bootstrap';
-
-import Button from '../misc/Button';
-
-class GroupManager extends React.Component {
- static propTypes = {
- // props
- groups: PropTypes.object,
- style: PropTypes.object,
- onDeleteGroup: PropTypes.func,
- onCreateGroup: PropTypes.func,
- user: PropTypes.object
- };
-
- static defaultProps = {
- groups: [],
- onUserGroupsChange: () => {},
- user: {}
- };
-
- render() {
- return (
-
-
-
- {this.props.groups.map( group => (
- {group.groupName}
-
- ))}
-
-
- );
- }
-}
-
-/*
-
-*/
-
-export default GroupManager;
diff --git a/web/client/components/map/cesium/Layer.jsx b/web/client/components/map/cesium/Layer.jsx
index bead9e5ee9..64332bf86f 100644
--- a/web/client/components/map/cesium/Layer.jsx
+++ b/web/client/components/map/cesium/Layer.jsx
@@ -10,8 +10,9 @@ import React from 'react';
import Layers from '../../../utils/cesium/Layers';
import assign from 'object-assign';
import PropTypes from 'prop-types';
-import { round, isNil } from 'lodash';
+import { round, isNil, castArray } from 'lodash';
import { getResolutions } from '../../../utils/MapUtils';
+import { testCors, getProxyCacheByUrl } from '../../../api/CORS';
class CesiumLayer extends React.Component {
static propTypes = {
@@ -146,6 +147,9 @@ class CesiumLayer extends React.Component {
...props.options,
visibility
}, props.position, props.map, props.securityToken);
+ if (this.layer.add) {
+ this.layer.add();
+ }
return;
}
// while hidden layers will be completely removed
@@ -210,9 +214,18 @@ class CesiumLayer extends React.Component {
createLayer = (type, options, position, map, securityToken) => {
if (type) {
- const opts = assign({}, options, position ? {zIndex: position} : null, {securityToken});
+ const isProxy = options?.url ? getProxyCacheByUrl(castArray(options.url)[0]) : undefined;
+ if (isProxy !== undefined) {
+ this._isProxy = isProxy;
+ this._prevIsProxy = this._isProxy;
+ }
+ const opts = {
+ ...options,
+ ...(position ? { zIndex: position } : null),
+ securityToken,
+ ...(this._isProxy ? { forceProxy: this._isProxy } : null)
+ };
this.layer = Layers.createLayer(type, opts, map);
-
if (this.layer) {
this.layer.layerName = options.name;
this.layer.layerId = options.id;
@@ -225,7 +238,20 @@ class CesiumLayer extends React.Component {
};
updateLayer = (newProps, oldProps) => {
- const newLayer = Layers.updateLayer(newProps.type, this.layer, {...newProps.options, securityToken: newProps.securityToken}, {...oldProps.options, securityToken: oldProps.securityToken}, this.props.map);
+ const newLayer = Layers.updateLayer(
+ newProps.type,
+ this.layer,
+ {
+ ...newProps.options,
+ securityToken: newProps.securityToken,
+ forceProxy: this._isProxy
+ },
+ {
+ ...oldProps.options,
+ securityToken: oldProps.securityToken,
+ forceProxy: this._prevIsProxy
+ },
+ this.props.map);
if (newLayer) {
this.removeLayer();
this.layer = newLayer;
@@ -233,6 +259,7 @@ class CesiumLayer extends React.Component {
this.addLayer(newProps);
}
}
+ this.updateZIndex(newProps.position);
newProps.map.scene.requestRender();
};
@@ -249,7 +276,7 @@ class CesiumLayer extends React.Component {
newProps.map.scene.requestRender();
};
- addLayer = (newProps) => {
+ _addLayer = (newProps) => {
// detached layers are layers that do not work through a provider
// for this reason they cannot be added or removed from the map imageryProviders
if (this.layer && !this.layer.detached) {
@@ -265,8 +292,24 @@ class CesiumLayer extends React.Component {
}, this.props.options.refresh);
}
}
+ if (this.layer?.detached && this.layer?.add) {
+ this.layer.add();
+ }
};
+ addLayer = (newProps) => {
+ if (this._isProxy === undefined && newProps?.options?.url) {
+ const urls = castArray(newProps.options.url);
+ return testCors(urls[0])
+ .then((isProxy) => {
+ this._isProxy = isProxy;
+ this.updateLayer(newProps, this.props);
+ this._prevIsProxy = this._isProxy;
+ });
+ }
+ return this._addLayer(newProps);
+ }
+
removeLayer = (provider) => {
const toRemove = provider || this.provider;
if (toRemove) {
diff --git a/web/client/components/map/cesium/__tests__/Layer-test.jsx b/web/client/components/map/cesium/__tests__/Layer-test.jsx
index 573d8fd830..a8fbac721d 100644
--- a/web/client/components/map/cesium/__tests__/Layer-test.jsx
+++ b/web/client/components/map/cesium/__tests__/Layer-test.jsx
@@ -148,14 +148,14 @@ describe('Cesium layer', () => {
expect(layer).toExist();
});
- it('creates a wms layer for Cesium map', () => {
+ it('creates a wms layer for Cesium map', (done) => {
var options = {
"type": "wms",
"visibility": true,
"name": "nurc:Arc_Sample",
"group": "Meteo",
"format": "image/png",
- "url": "http://demo.geo-solutions.it/geoserver/wms"
+ "url": "/geoserver/wms"
};
// create layers
var layer = ReactDOM.render(
@@ -163,10 +163,16 @@ describe('Cesium layer', () => {
options={options} map={map}/>, document.getElementById("container"));
expect(layer).toExist();
- expect(map.imageryLayers.length).toBe(1);
- expect(map.imageryLayers._layers[0]._imageryProvider._resource._url).toBe('{s}');
- expect(map.imageryLayers._layers[0]._imageryProvider._tileProvider._subdomains.length).toBe(1);
- expect(map.imageryLayers._layers[0]._imageryProvider.proxy.proxy).toExist();
+
+ waitFor(() => {
+ return expect(map.imageryLayers.length).toBe(1);
+ }).then(() => {
+ expect(map.imageryLayers._layers[0]._imageryProvider._resource._url).toBe('{s}');
+ expect(map.imageryLayers._layers[0]._imageryProvider._tileProvider._subdomains.length).toBe(1);
+ expect(map.imageryLayers._layers[0]._imageryProvider.proxy.proxy).toBeFalsy();
+ done();
+ }).catch(done);
+
});
it('test wms vector formats must change to default image format (image/png)', () => {
@@ -224,14 +230,14 @@ describe('Cesium layer', () => {
expect(layer.layer._tileProvider._resource._queryParameters.format).toBe('image/jpeg');
});
- it('wms layer with credits', () => {
+ it('wms layer with credits', (done) => {
var options = {
"type": "wms",
"visibility": true,
"name": "nurc:Arc_Sample",
"group": "Meteo",
"format": "image/png",
- "url": "http://demo.geo-solutions.it/geoserver/wms",
+ "url": "/geoserver/wms",
credits: {
imageUrl: "test.png",
title: "test"
@@ -243,10 +249,15 @@ describe('Cesium layer', () => {
options={options} map={map}/>, document.getElementById("container"));
expect(layer).toExist();
- expect(map.imageryLayers.length).toBe(1);
- expect(map.imageryLayers._layers[0].imageryProvider.credit).toExist();
+
+ waitFor(() => {
+ return expect(map.imageryLayers.length).toBe(1);
+ }).then(() => {
+ expect(map.imageryLayers._layers[0].imageryProvider.credit).toExist();
+ done();
+ }).catch(done);
});
- it('creates a wms layer with caching for Cesium map', () => {
+ it('creates a wms layer with caching for Cesium map', (done) => {
var options = {
"type": "wms",
"visibility": true,
@@ -254,7 +265,7 @@ describe('Cesium layer', () => {
"group": "Meteo",
"format": "image/png",
"tiled": true,
- "url": "http://demo.geo-solutions.it/geoserver/wms"
+ "url": "/geoserver/wms"
};
// create layers
var layer = ReactDOM.render(
@@ -262,13 +273,19 @@ describe('Cesium layer', () => {
options={options} map={map}/>, document.getElementById("container"));
expect(layer).toExist();
- expect(map.imageryLayers.length).toBe(1);
- expect(map.imageryLayers._layers[0]._imageryProvider._resource._url).toBe('{s}');
- expect(map.imageryLayers._layers[0]._imageryProvider._tileProvider._subdomains.length).toBe(1);
- expect(map.imageryLayers._layers[0]._imageryProvider.proxy.proxy).toExist();
- expect(map.imageryLayers._layers[0]._imageryProvider._tileProvider._resource._queryParameters.tiled).toBe(true);
+
+ waitFor(() => {
+ return expect(map.imageryLayers.length).toBe(1);
+ }).then(() => {
+ expect(map.imageryLayers._layers[0]._imageryProvider._resource._url).toBe('{s}');
+ expect(map.imageryLayers._layers[0]._imageryProvider._tileProvider._subdomains.length).toBe(1);
+ expect(map.imageryLayers._layers[0]._imageryProvider.proxy.proxy).toBeFalsy();
+ expect(map.imageryLayers._layers[0]._imageryProvider._tileProvider._resource._queryParameters.tiled).toBe(true);
+ done();
+ }).catch(done);
+
});
- it('check wms layer proxy skip for relative urls', () => {
+ it('check wms layer proxy skip for relative urls', (done) => {
var options = {
"type": "wms",
"visibility": true,
@@ -283,13 +300,18 @@ describe('Cesium layer', () => {
options={options} map={map}/>, document.getElementById("container"));
expect(layer).toExist();
- expect(map.imageryLayers.length).toBe(1);
- expect(map.imageryLayers._layers[0]._imageryProvider._resource._url).toBe('{s}');
- expect(map.imageryLayers._layers[0]._imageryProvider._tileProvider._subdomains.length).toBe(1);
- expect(map.imageryLayers._layers[0]._imageryProvider.proxy.proxy).toNotExist();
+
+ waitFor(() => {
+ return expect(map.imageryLayers.length).toBe(1);
+ }).then(() => {
+ expect(map.imageryLayers._layers[0]._imageryProvider._resource._url).toBe('{s}');
+ expect(map.imageryLayers._layers[0]._imageryProvider._tileProvider._subdomains.length).toBe(1);
+ expect(map.imageryLayers._layers[0]._imageryProvider.proxy.proxy).toNotExist();
+ done();
+ }).catch(done);
});
- it('creates a wmts layer for Cesium map', () => {
+ it('creates a wmts layer for Cesium map', (done) => {
var options = {
"type": "wmts",
"visibility": true,
@@ -305,21 +327,24 @@ describe('Cesium layer', () => {
}
}]
},
- "url": "http://sample.server/geoserver/gwc/service/wmts"
+ "url": "/geoserver/gwc/service/wmts"
};
// create layers
var layer = ReactDOM.render(
- {this.renderFieldValue(field, annotation)}
-
);
- };
-
- renderFieldValue = (field, annotation) => {
- const fieldValue = annotation.properties[field.name] || '';
- if (field.type === 'html') {
- // Return the text content of the first child of the html string (to prevent collating all texts into a single word)
- return (new DOMParser).parseFromString(fieldValue, "text/html").documentElement.lastElementChild
- ?.firstChild
- ?.textContent || '';
- }
- return fieldValue;
- };
-
- renderThumbnail = ({featureType, geometry, properties = {}}) => {
- if (properties?.type === "Measure") {
- return (
-
-
-
- );
- }
- if (this.props.mode === 'list') {
- const annotationsPresent = !!this.props.annotations.length;
- return (
- <>
-
-
-
-
-
- {!annotationsPresent && }
- { annotationsPresent &&
- this.renderItems(a))}/>
- }
-
-
- );
- }
- const annotation = this.props.annotations && head(this.props.annotations.filter(a => a.properties.id === this.props.current));
- const Editor = this.props.editor;
- if (this.props.mode === 'detail') {
- return (
-
- );
- }
-
- render() {
- let body;
- if (this.state.selectFile) {
- body = (
-
-
-
-
-
-
-
-
-
-
-
-
- {field.showLabel ? : null}
- {isError ? this.renderErrorOn(field.name) : ''}
- {this.renderProperty(field, this.props[field.name] || field.value, editing)}
-
- );
- });
- };
-
-
- getValidator = (validator) => {
- if (isFunction(validator)) {
- return validator;
- }
- return handleExpression({}, {}, '{(function(value) {return ' + validator + ';})}');
- };
-
- renderViewButtons = () => {
- return (
- {toolbar}
);
- };
-
- renderProperty = (field, prop, editing) => {
- const fieldValue = this.props.editedFields[field.name] === undefined ? prop : this.props.editedFields[field.name];
- if (editing) {
- switch (field.type) {
- case 'html':
- return ({fieldValue}
); - } - }; - - renderErrorOn = (field) => { - return
- {this.renderMarkers(marker.markers, marker.name + '-')}
-
);
- }
- return (
- this.selectStyle(marker)}
- className={"mapstore-annotations-info-viewer-marker mapstore-annotations-info-viewer-marker-" + prefix + marker.name +
- (this.isCurrentStyle(marker) ? " mapstore-annotations-info-viewer-marker-selected" : "")} style={marker.thumbnailStyle} />);
- });
- };
-
- renderBody = (editing) => {
- const items = this.getBodyItems(editing);
- if (items.length === 0) {
- return null;
- }
-
- return ( this.props.onConfirmClose(this.props.editing?.properties)}
- confirmButtonBSStyle="default"
- closeGlyph="1-close"
- confirmButtonContent={ {
- this.props.selected && this.props.onResetCoordEditor();
- this.props.onCancelEdit(this.props.editing?.properties); this.props.onToggleUnsavedChangesModal();
- }}
- confirmButtonBSStyle="default"
- closeGlyph="1-close"
- confirmButtonContent={ {
- this.props.onResetCoordEditor();
- this.props.onCancelEdit(this.props.editing?.properties);
- }}
- confirmButtonBSStyle="default"
- closeGlyph="1-close"
- title={ {
- this.props.onCancelStyle();
- this.props.onToggleUnsavedStyleModal();
- if (this.isMeasureEditDisabled()) {
- this.setTabValue('coordinates');
- } else {
- this.setTabValue('style');
- }
- }}
- confirmButtonBSStyle="default"
- closeGlyph="1-close"
- confirmButtonContent={ { this.props.onConfirmDeleteFeature(); this.props.onToggleDeleteFtModal(); }}
- confirmButtonBSStyle="default"
- closeGlyph="1-close"
- confirmButtonContent={ {
- this.state.removing && this.setState({removing: null});
- this.props.onCancelRemove();
- }}
- focusConfirm={this.props.removing}
- onConfirm={() => {
- if (this.state.removing) {
- this.setState({removing: null});
- this.props.onConfirmRemove(this.state.removing, "features");
- } else {
- this.props.onConfirmRemove(this.props.removing, "geometry");
- }
- }}
- confirmButtonBSStyle="default"
- closeGlyph="1-close"
- confirmButtonContent={ }
- disabled={!!props.disabled}
- noCaret>
-
-
-
-
-
-
-
-
-
-
-
-);
-
-export default DropdownFeatureType;
diff --git a/web/client/components/mapcontrols/annotations/FeaturesList.jsx b/web/client/components/mapcontrols/annotations/FeaturesList.jsx
deleted file mode 100644
index c69fa022c3..0000000000
--- a/web/client/components/mapcontrols/annotations/FeaturesList.jsx
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright 2020, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 {Glyphicon, ControlLabel, Tooltip } from 'react-bootstrap';
-import uuidv1 from 'uuid/v1';
-import bbox from '@turf/bbox';
-import Toolbar from '../../misc/toolbar/Toolbar';
-import OverlayTrigger from '../../misc/OverlayTrigger';
-import cs from 'classnames';
-import Message from '../../I18N/Message';
-import {get} from 'lodash';
-import {DEFAULT_ANNOTATIONS_STYLES, getStartEndPointsForLinestring, getGeometryGlyphInfo, getGeometryType} from '../../../utils/LegacyAnnotationsUtils';
-
-/**
- * Feature List component for Annotation Viewer.
- * @memberof components.mapControls.annotations
- * @function
- *
-*/
-const FeaturesList = (props) => {
- const {
- editing,
- onAddGeometry,
- onSetStyle,
- onStartDrawing,
- onAddText,
- onStyleGeometry,
- setTabValue,
- isMeasureEditDisabled,
- onSetAnnotationMeasurement,
- showPopupWarning,
- setPopupWarning,
- geodesic,
- defaultStyles,
- defaultPointType,
- onValidateFeature,
- validateFeatures
- } = props;
- const {features = []} = editing || {};
- const isValidFeature = get(props, "selected.properties.isValidFeature", true);
- const areAllFeaturesValid = validateFeatures();
-
- const onClickGeometry = (type, style) => {
- onStyleGeometry(false);
- onAddGeometry(type);
- type === "Text" && onAddText();
- onSetStyle(style);
- onStartDrawing({geodesic});
- setTabValue('coordinates');
- onValidateFeature();
- };
- const circleCenterStyles = defaultPointType === "symbol" ? defaultStyles.POINT?.[defaultPointType] : DEFAULT_ANNOTATIONS_STYLES.Point;
-
- const linePointStyles = defaultPointType === "symbol" ? [{...defaultStyles.POINT?.[defaultPointType], highlight: true, iconAnchor: [0.5, 0.5], type: "Point", title: "StartPoint Style", geometry: "startPoint", filtering: false, id: uuidv1()},
- {...defaultStyles.POINT?.[defaultPointType], highlight: true, iconAnchor: [0.5, 0.5], type: "Point", title: "EndPoint Style", geometry: "endPoint", filtering: false, id: uuidv1()}] : getStartEndPointsForLinestring();
-
- return (
- <>
-
-
- );
- }
- setError = () => {
- this.setState(() => ({error: this.props.errorMessage, loading: false}));
- }
- // Modificare per accettare file json ma non devono per forza avere ext.json
- // inoltre può accettare qualsiasi collezione di features inoltre filtrare le features che hanno medesimo id
- checkfile = (files) => {
- this.setState(() => ({loading: true}));
- Promise.all(files.map(file => readGeoJson(file))).then((contents) => {
- if (this.state.error) {
- this.setState(() => ({error: null}));
- }
- // Get only features
- const annotations = contents.filter(({geoJSON, errors = []}) => errors.length === 0 || geoJSON.type === ANNOTATION_TYPE).reduce((acc, {geoJSON}) => acc.concat(geoJSON.features || geoJSON), []);
- if (annotations.length === 0) {
- throw new Error();
- }
- this.props.onFileChoosen(annotations, this.state.override);
- this.setState(() => ({loading: false}));
- this.props.onClose();
- }).catch(() => {
- this.setError();
- });
- };
-}
-
-export default SelectAnnotationsFile;
diff --git a/web/client/components/mapcontrols/annotations/__tests__/Annotations-test.js b/web/client/components/mapcontrols/annotations/__tests__/Annotations-test.js
deleted file mode 100644
index 5eb466e541..0000000000
--- a/web/client/components/mapcontrols/annotations/__tests__/Annotations-test.js
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright 2015-2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import expect from 'expect';
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import Annotations from '../Annotations';
-import TestUtils from 'react-dom/test-utils';
-
-describe("test the Annotations Panel", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.body);
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('test default properties', () => {
- const annotations = ReactDOM.render(, document.getElementById("container"));
- expect(annotations).toBeTruthy();
-
- const annotationsNode = ReactDOM.findDOMNode(annotations);
- expect(annotationsNode).toBeTruthy();
- });
-
- it('test rendering detail mode', () => {
- const annotationsList = [{
- properties: {
- id: '1',
- title: 'a',
- description: 'b'
- },
- geometry: {
- type: "MultiPoint"
- },
- style: {
- iconShape: 'square',
- iconColor: 'blue'
- }
- }, {
- properties: {
- id: '2',
- title: 'a',
- description: 'b'
- },
- geometry: {
- type: "MultiPoint"
- },
- style: {
- iconShape: 'square',
- iconColor: 'blue'
- }
- }];
-
- const Editor = () => ;
- const annotations = ReactDOM.render(, document.getElementById("container"));
- expect(annotations).toBeTruthy();
- expect(TestUtils.scryRenderedDOMComponentsWithClass(annotations, "mapstore-annotations-panel-card").length).toBe(0);
- expect(TestUtils.scryRenderedDOMComponentsWithClass(annotations, "myeditor").length).toBe(1);
- });
-
- it('test rendering editing mode', () => {
- const Editor = () => ;
- const annotations = ReactDOM.render({}} onSetUnsavedChanges={()=>{}}
- onConfirmRemove={testHandlers.onRemoveHandler}/>, document.getElementById("container"));
- expect(viewer).toExist();
- let btnGroup = document.querySelector(".mapstore-annotations-info-viewer-buttons");
- let toolBarButtons = btnGroup.querySelectorAll('button');
- let removeBtn = toolBarButtons[1];
- expect(toolBarButtons.length).toBe(4);
- expect(removeBtn).toExist();
- TestUtils.Simulate.click(removeBtn);
- const dialog = document.getElementById("confirm-dialog");
- expect(dialog).toExist();
- const confirm = dialog.querySelectorAll('button')[1];
- TestUtils.Simulate.click(confirm);
- expect(spyRemove).toHaveBeenCalled();
-
- // Disable remove button when no annotations present except for the unsaved new annotation
- viewer = ReactDOM.render({}} onSetUnsavedChanges={()=>{}}
- onConfirmRemove={testHandlers.onRemoveHandler}/>, document.getElementById("container"));
- expect(viewer).toExist();
- btnGroup = document.querySelector(".mapstore-annotations-info-viewer-buttons");
- toolBarButtons = btnGroup.querySelectorAll('button');
- removeBtn = toolBarButtons[1];
- expect(toolBarButtons.length).toBe(4);
- expect(removeBtn.classList.contains('disabled')).toBe(true);
-
- });
-
- it('test click save annotation', () => {
- const feature = {
- id: "1",
- title: 'mytitle',
- description: 'desc'
- };
-
- const testHandlers = {
- onSaveHandler: (id) => { return id; },
- onCancelHandler: (id) => { return id; },
- onToggleGeometryEditHandler: (flag) => { return flag; }
- };
-
- const spySave = expect.spyOn(testHandlers, 'onSaveHandler');
- const spyCancel = expect.spyOn(testHandlers, 'onCancelHandler');
-
- const viewer = ReactDOM.render(, document.getElementById("container"));
- expect(viewer).toExist();
-
- let saveButton = ReactDOM.findDOMNode(TestUtils.scryRenderedDOMComponentsWithTag(viewer, "button")[2]);
-
- expect(saveButton).toExist();
- TestUtils.Simulate.click(saveButton);
- expect(spySave.calls.length).toEqual(1);
- expect(spySave.calls[0].arguments[0]).toEqual(1);
- expect(spySave.calls[0].arguments[5]).toEqual({...feature, visibility: true});
- expect(spyCancel.calls.length).toEqual(0);
- });
-
- it('test click save annotation', () => {
- const feature = {
- id: "1",
- title: 'mytitle',
- description: 'desc'
- };
-
- const testHandlers = {
- onAddNewFeature: () => {}
- };
-
- const spySaveGeometry = expect.spyOn(testHandlers, 'onAddNewFeature');
- const defaultStyles = {POINT: {
- marker: ["Test marker"],
- symbol: ["Test symbol"]
- }};
- const viewer = ReactDOM.render(null}/>, document.getElementById("container"));
- expect(viewer).toExist();
-
- let cancelButton = ReactDOM.findDOMNode(TestUtils.scryRenderedDOMComponentsWithTag(viewer, "button")[0]);
-
- expect(cancelButton).toExist();
- TestUtils.Simulate.click(cancelButton);
-
- expect(spySave.calls.length).toEqual(0);
- expect(spyCancel.calls.length).toEqual(1);
- const properties = spyCancel.calls[0].arguments[0];
- expect(Object.keys(properties).length > 0).toBe(true);
- expect(spyCancel.calls[0].arguments[0].id).toBe('1');
- expect(spyCancel.calls[0].arguments[0].visibility).toBe(false);
- });
-
- it('test click cancel trigger UnsavedChangesModal', () => {
- const feature = {
- id: "1",
- title: 'mytitle',
- description: 'desc'
- };
-
- const testHandlers = {
- onToggleUnsavedChangesModal: (id) => { return id; }
- };
-
- const spyUnsavedModal = expect.spyOn(testHandlers, 'onToggleUnsavedChangesModal');
-
- const viewer = ReactDOM.render(, document.getElementById("container"));
- expect(viewer).toExist();
-
- let saveButton = ReactDOM.findDOMNode(TestUtils.scryRenderedDOMComponentsWithTag(viewer, "button")[2]);
-
- expect(saveButton).toExist();
- TestUtils.Simulate.click(saveButton);
-
- expect(spySave.calls.length).toEqual(0);
- expect(spyError.calls.length).toEqual(1);
- expect(spyError.calls[0].arguments[0].title).toBe('annotations.mandatory');
- });
-
- it('test click save validate geometry error', () => {
- const feature = {
- id: "1",
- title: 'mytitle',
- description: 'desc'
- };
-
- const testHandlers = {
- onSaveHandler: (id) => { return id; },
- onErrorHandler: (msg) => { return msg; }
- };
-
- const spySave = expect.spyOn(testHandlers, 'onSaveHandler');
- const spyError = expect.spyOn(testHandlers, 'onErrorHandler');
-
- const viewer = ReactDOM.render(, document.getElementById("container"));
- expect(viewer).toExist();
-
- let saveButton = ReactDOM.findDOMNode(TestUtils.scryRenderedDOMComponentsWithTag(viewer, "button")[2]);
-
- expect(saveButton).toExist();
- TestUtils.Simulate.click(saveButton);
-
- expect(spySave.calls.length).toEqual(0);
- expect(spyError.calls.length).toEqual(1);
- expect(spyError.calls[0].arguments[0].geometry).toBe('annotations.emptygeometry');
- });
-
- it('test edit field', () => {
- const feature = {
- id: "1",
- title: 'mytitle',
- description: 'desc'
- };
- const testHandlers = {
- onChangeProperties: (id) => { return id; }
- };
- const spyChangeProperties = expect.spyOn(testHandlers, 'onChangeProperties');
- const viewer = ReactDOM.render(, document.getElementById("container"));
- expect(viewer).toBeTruthy();
- const viewerNode = ReactDOM.findDOMNode(viewer);
- expect(viewerNode.className).toBe('mapstore-annotations-info-viewer');
-
- const annotationInfoViewer = TestUtils.findRenderedDOMComponentWithClass(viewer, "mapstore-annotations-info-viewer-items");
- const geometryCard = document.querySelectorAll('.geometry-card');
- expect(annotationInfoViewer).toBeTruthy();
- expect(geometryCard.length).toBe(2);
-
- // Onclick of measurement geometry
- TestUtils.Simulate.click(geometryCard[0]);
- const navTabs = document.querySelector('.nav-tabs');
- expect(navTabs.children.length).toBe(1);
- const styleTab = navTabs.children[0].childNodes[0].textContent;
- expect(styleTab).toContain('Style');
- });
-
- it('test onDownload annotation', () => {
- const feature = {
- id: "1",
- title: 'mytitle',
- description: 'desc'
- };
-
- const spyOnDownload = expect.spyOn(actions, 'onDownload');
- let viewer = ReactDOM.render(, document.getElementById("container"));
- const container = document.getElementById('container');
- expect(container).toBeTruthy();
- const buttons = container.querySelectorAll("button");
- expect(buttons.length).toBe(1);
- });
- it('test geometries toolbar', () => {
- const editing = {
- features: [{
- properties: {id: '1', isValidFeature: true, geometryTitle: 'Polygon'},
- geometry: {type: "Polygon"}
- }]
- };
- const actions = {
- onAddGeometry: () => {},
- onSetStyle: () => {},
- onStyleGeometry: () => {},
- onStartDrawing: () => {},
- onAddText: () => {}
- };
- const defaultStyle = {POINT: {
- marker: ["Test marker"],
- symbol: ["Test symbol"]
- }};
- const spyOnAddGeometry = expect.spyOn(actions, "onAddGeometry");
- const spyOnSetStyle = expect.spyOn(actions, "onSetStyle");
- const spyOnStyleGeometry = expect.spyOn(actions, "onStyleGeometry");
- const spyOnStartDrawing = expect.spyOn(actions, "onStartDrawing");
- const spyOnAddText = expect.spyOn(actions, "onAddText");
- ReactDOM.render(, document.getElementById("container"));
- const container = document.getElementById('container');
- expect(container).toBeTruthy();
-
- const cardContainer = document.getElementsByClassName('geometry-card');
- expect(cardContainer).toBeTruthy();
-
- const previewIcon = document.querySelector('.glyphicon-polygon');
- expect(previewIcon).toBeTruthy();
-
- const cardTitle = document.querySelector('.geometry-card-label');
- expect(cardTitle.innerText).toBe('Polygon');
-
- const glyphIcons = document.querySelectorAll('.btn-group .glyphicon');
- expect(glyphIcons.length).toBe(7);
- expect(glyphIcons[5].className).toContain('zoom-to');
- expect(glyphIcons[6].className).toContain('trash');
- });
-
- it('test actions on feature card', () => {
- const editing = {
- features: [{
- type: "Feature",
- properties: {id: '1', isValidFeature: true, geometryTitle: 'Polygon'},
- geometry: {type: "Polygon", coordinates: [
- [
- [-121.07812513411045, 42.11778385718358],
- [-116.2265622317791, 44.72175879125132],
- [-115.87499973177908, 40.773885871584866],
- [-114.96093589067458, 42.68889580392076],
- [-121.07812513411045, 42.11778385718358]
- ]
- ]}
- }]
- };
- const testHandlers = {
- onSelectFeature: () => {},
- onUnselectFeature: () => {},
- onStyleGeometry: () => {},
- onZoom: () => {},
- onDeleteGeometry: () => {},
- setTabValue: () => {}
- };
- const spyOnSelectFeature = expect.spyOn(testHandlers, "onSelectFeature");
- const spyOnZoom = expect.spyOn(testHandlers, "onZoom");
- const spyOnDeleteGeometry = expect.spyOn(testHandlers, "onDeleteGeometry");
- const spyOnStyleGeometry = expect.spyOn(testHandlers, "onStyleGeometry");
- ReactDOM.render(
- , document.getElementById("container"));
- const container = document.getElementById('container');
- expect(container).toBeTruthy();
-
- const featureCard = document.getElementsByClassName('geometry-card');
- expect(featureCard).toBeTruthy();
-
- // OnUnSelectFeature
- TestUtils.Simulate.click(featureCard[0]);
- expect(spyOnUnselectFeature).toHaveBeenCalled();
- expect(spyOnGeometryHighlight).toHaveBeenCalled();
- expect(spyOnGeometryHighlight.calls[0].arguments[0]).toBe('1');
- });
-
- it('test geometry highlight', () => {
- let props = {
- editing: {
- features: [{
- type: "Feature",
- properties: {id: '1', isValidFeature: true, geometryTitle: 'Polygon'},
- geometry: {type: "Polygon"}
- }]
- },
- selected: {properties: {id: '1'}}
- };
- const testHandlers = {
- onGeometryHighlight: () => {}
- };
- const spyOnGeometryHighlight = expect.spyOn(testHandlers, "onGeometryHighlight");
- ReactDOM.render(, document.getElementById("container"));
- let container = document.getElementById('container');
- expect(container).toBeTruthy();
-
- let featureCard = document.getElementsByClassName('geometry-card');
- expect(featureCard).toBeTruthy();
-
- TestUtils.Simulate.mouseEnter(featureCard[0]);
- expect(spyOnGeometryHighlight).toNotHaveBeenCalled();
-
- // When geometry card is not selected
- props = {...props, selected: {...props.selected, properties: {id: 2}}};
- ReactDOM.render(, document.getElementById("container"));
- container = document.getElementById('container');
- featureCard = document.getElementsByClassName('geometry-card');
- // OnMouseEnter
- TestUtils.Simulate.mouseEnter(featureCard[0]);
- expect(spyOnGeometryHighlight).toHaveBeenCalled();
- expect(spyOnGeometryHighlight.calls[0].arguments[0]).toBe('1');
-
- // OnMouseLeave
- TestUtils.Simulate.mouseLeave(featureCard[0]);
- expect(spyOnGeometryHighlight).toHaveBeenCalled();
- expect(spyOnGeometryHighlight.calls[1].arguments[0]).toBe('1');
- expect(spyOnGeometryHighlight.calls[1].arguments[1]).toBe(false);
- });
-
- it('test geometry highlight limitations', () => {
- let props = {
- editing: {
- features: [{
- type: "Feature",
- properties: {id: '1', isValidFeature: false, geometryTitle: 'Polygon'},
- geometry: {type: "Polygon"}
- }]
- },
- selected: {properties: {id: '2', isValidFeature: false}}
- };
- const testHandlers = {
- onGeometryHighlight: () => {}
- };
- const spyOnGeometryHighlight = expect.spyOn(testHandlers, "onGeometryHighlight");
- ReactDOM.render(, document.getElementById("container"));
- let container = document.getElementById('container');
- expect(container).toBeTruthy();
-
- let featureCard = document.getElementsByClassName('geometry-card');
- expect(featureCard).toBeTruthy();
-
- ReactDOM.render(, document.getElementById("container"));
- container = document.getElementById('container');
- featureCard = document.getElementsByClassName('geometry-card');
- // OnMouseEnter
- TestUtils.Simulate.mouseEnter(featureCard[0]);
- expect(spyOnGeometryHighlight).toNotHaveBeenCalled();
-
- // OnMouseLeave
- TestUtils.Simulate.mouseLeave(featureCard[0]);
- expect(spyOnGeometryHighlight).toNotHaveBeenCalled();
- });
-
- it('test render defaults with defaultPointType as symbol', () => {
- ReactDOM.render(, document.getElementById("container"));
- const container = document.getElementById('container');
- expect(container).toBeTruthy();
- const labels = container.querySelectorAll(".control-label");
- expect(labels[0].innerText).toBe('annotations.geometries');
- const buttons = container.querySelectorAll("button");
- expect(buttons.length).toBe(5);
- expect(container.innerText).toContain('annotations.addGeometry');
- });
-});
diff --git a/web/client/components/mapcontrols/annotations/__tests__/SelectAnnotationsFile-test.js b/web/client/components/mapcontrols/annotations/__tests__/SelectAnnotationsFile-test.js
deleted file mode 100644
index e4b228d7a2..0000000000
--- a/web/client/components/mapcontrols/annotations/__tests__/SelectAnnotationsFile-test.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import expect from 'expect';
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import SelectAnnotationsFile from '../SelectAnnotationsFile';
-
-
-describe("test the SelectAnnotationsFile modal", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.body);
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('test default properties', () => {
- const annotations = ReactDOM.render(; });
- };
-
- render() {
- var notFoundMessage = this.props.notFoundMessage;
- if (!notFoundMessage) {
- notFoundMessage = , document.getElementById("container"));
- expect(tb).toExist();
-
- });
-
- it('create component without item', () => {
- const tb = ReactDOM.render(, document.getElementById("container"));
- let elem = TestUtils.findRenderedDOMComponentWithClass(tb, "search-result");
-
- expect(elem).toExist();
- ReactDOM.findDOMNode(elem).click();
- expect(spy.calls.length).toEqual(1);
- });
-});
diff --git a/web/client/components/mapcontrols/search/geocoding/__tests__/NominatimResultList-test.jsx b/web/client/components/mapcontrols/search/geocoding/__tests__/NominatimResultList-test.jsx
deleted file mode 100644
index 50fe1e6083..0000000000
--- a/web/client/components/mapcontrols/search/geocoding/__tests__/NominatimResultList-test.jsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright 2015, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import expect from 'expect';
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import NominatimResultList from '../NominatimResultList';
-import NominatimResult from '../NominatimResult';
-import TestUtils from 'react-dom/test-utils';
-
-describe("test the NominatimResultList", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('test component creation', () => {
- var results = [{
- osm_id: 1,
- display_name: "Name",
- boundingbox: []
- }];
- const tb = ReactDOM.render(, document.getElementById("container"));
- expect(tb).toExist();
-
- });
-
- it('create component without items', () => {
- const tb = ReactDOM.render(, document.getElementById("container"));
- let elem = TestUtils.scryRenderedComponentsWithType(tb, NominatimResult);
- expect(elem.length).toBe(1);
-
- let elem1 = TestUtils.findRenderedDOMComponentWithClass(elem[0], "search-result");
- ReactDOM.findDOMNode(elem1).click();
- expect(spy.calls.length).toEqual(1);
- });
-});
diff --git a/web/client/components/maps/MapItem.jsx b/web/client/components/maps/MapItem.jsx
deleted file mode 100644
index df2b7997ef..0000000000
--- a/web/client/components/maps/MapItem.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright 2015, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import { isFunction } from 'lodash';
-import PropTypes from 'prop-types';
-import React from 'react';
-import {
- Glyphicon,
- ListGroupItem,
- Tooltip
-} from 'react-bootstrap';
-
-import I18N from '../I18N/I18N';
-import OverlayTrigger from '../misc/OverlayTrigger';
-import Button from '../misc/Button';
-
-class MapItem extends React.Component {
- static propTypes = {
- map: PropTypes.object,
- viewerUrl: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
- mapType: PropTypes.string
- };
-
- renderButtons = () => {
- if (this.props.viewerUrl) {
- let button = isFunction(this.props.viewerUrl) ?
- :
- ;
- const tooltip =
- {button}
-
- );
- }
- return "";
- };
-
- render() {
- return (
- {this.props.map.description} {this.renderButtons()}
- );
- }
-}
-
-export default MapItem;
diff --git a/web/client/components/maps/MapList.jsx b/web/client/components/maps/MapList.jsx
deleted file mode 100644
index 6f11c7c98f..0000000000
--- a/web/client/components/maps/MapList.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import PropTypes from 'prop-types';
-
-/**
- * Copyright 2015, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 { ListGroup, Panel } from 'react-bootstrap';
-import MapItem from './MapItem';
-import { MapLibraries } from '../../utils/MapTypeUtils';
-class MapList extends React.Component {
- static propTypes = {
- panelProps: PropTypes.object,
- maps: PropTypes.array,
- viewerUrl: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
- mapType: PropTypes.string
- };
-
- static defaultProps = {
- onChangeMapType: function() {},
- mapType: MapLibraries.OPENLAYERS,
- maps: []
- };
-
- renderMaps = (maps, mapType) => {
- const viewerUrl = this.props.viewerUrl;
- return maps.map((map) => {
- let children = React.Children.count(this.props.children);
- return children === 1 ?
- React.cloneElement(React.Children.only(this.props.children), {viewerUrl, key: map.id, mapType, map}) :
-
-
- {this.renderMaps(this.props.maps, this.props.mapType)}
-
-
- );
- }
-}
-
-export default MapList;
diff --git a/web/client/components/maps/__tests__/MapItem-test.jsx b/web/client/components/maps/__tests__/MapItem-test.jsx
deleted file mode 100644
index d18b252dab..0000000000
--- a/web/client/components/maps/__tests__/MapItem-test.jsx
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright 2015, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 ReactDOM from 'react-dom';
-import MapItem from '../MapItem.jsx';
-import expect from 'expect';
-import TestUtils from 'react-dom/test-utils';
-
-describe('This test for MapItem', () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- // test DEFAULTS
- it('creates the component with defaults', () => {
- const mapItem = ReactDOM.render(, document.getElementById("container"));
- expect(mapItem).toExist();
-
- const mapItemDom = ReactDOM.findDOMNode(mapItem);
- expect(mapItemDom).toExist();
-
- expect(mapItemDom.className).toBe('list-group-item');
- const headings = mapItemDom.getElementsByClassName('list-group-item-heading');
- expect(headings.length).toBe(0);
- });
- // test DEFAULTS
- it('creates the component with data', () => {
- const testName = "test";
- const testDescription = "testDescription";
- const mapItem = ReactDOM.render(, document.getElementById("container"));
- const container = document.getElementById('container');
- const el = container.querySelectorAll('input');
- expect(el.length).toBe(2);
- expect(el[0].value).toBe("NAME");
- expect(el[1].value).toBe("DESCRIPTION");
- });
-});
diff --git a/web/client/components/maps/modals/css/modals.css b/web/client/components/maps/modals/css/modals.css
deleted file mode 100644
index ccde63f377..0000000000
--- a/web/client/components/maps/modals/css/modals.css
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/* MODAL */
-
-#MetadataModal .modal-dialog {
- width:600px;
-}
-
-@media screen and (max-width: 600px) {
- #MetadataModal .modal-dialog {
- width:100%;
- }
-}
diff --git a/web/client/components/mediaEditor/enhancers/withFilter.js b/web/client/components/mediaEditor/enhancers/withFilter.js
deleted file mode 100644
index ec82a3bffa..0000000000
--- a/web/client/components/mediaEditor/enhancers/withFilter.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2019, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import {
- compose,
- withState
-} from 'recompose';
-/**
- * holds the state of the text filter in the media editor
- */
-const withFilter = compose(
- withState('filterText', "onFilter", null)
-);
-
-export default withFilter;
diff --git a/web/client/components/misc/DockablePanel.jsx b/web/client/components/misc/DockablePanel.jsx
deleted file mode 100644
index 4ed6ab4079..0000000000
--- a/web/client/components/misc/DockablePanel.jsx
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2017, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 Dock from 'react-dock';
-import PropTypes from 'prop-types';
-
-/**
- * Component for rendering a dockablePanel panel.
- * @memberof components.dockablePanel
- * @class
- * @prop {string} id. The
-
);
- };
-
- renderError = (editing) => {
- return editing ? (Object.keys(this.props.errors)
- .filter(field => this.getConfig().fields.filter(f => f.name === field).length === 0).map(field => this.renderErrorOn(field))) : null;
- };
-
- renderModals = () => {
- if (this.props.closing) {
- return (
- {items}
- {editing &&
-
-
-
- );
- }
-
- validateFeatures = () => {
- let areAllGeometriesValid = true;
- if (Array.isArray(this.props?.editing?.features)) {
- areAllGeometriesValid = this.props.editing.features.every(feature => feature?.properties?.isValidFeature);
- }
- return areAllGeometriesValid;
- };
-
- change = (field, value) => {
- this.props.onChangeProperties(field, value);
- };
-
- isCurrentStyle = (m) => {
- return this.getConfig().markersConfig.matches(this.props.editing.style.MultiPoint, m.style);
- };
-
- selectStyle = (marker) => {
- return this.props.onSetStyle(assign({}, {
- "Point": {
- ...this.getConfig().markersConfig.getStyle(marker.style),
- iconGlyph: this.props.editing.style.Point && this.props.editing.style.Point.iconGlyph
- },
- "MultiPoint": {
- ...this.getConfig().markersConfig.getStyle(marker.style),
- iconGlyph: this.props.editing.style.MultiPoint && this.props.editing.style.MultiPoint.iconGlyph
- }
- }));
- };
-
- selectGlyph = (option) => {
- return this.props.onSetStyle(
- assign({}, this.props.editing.style, {
- "Point": {
- ...this.props.editing.style.Point,
- iconGlyph: option && option.value || ""
- },
- "MultiPoint": {
- ...this.props.editing.style.MultiPoint,
- iconGlyph: option && option.value || ""
- }
- }));
- };
-
- validate = () => {
- return assign(this.getConfig().fields.filter(field => field.editable).reduce((previous, field) => {
- const value = this.props.editedFields[field.name] === undefined ? this.props[field.name] : this.props.editedFields[field.name];
- if (field.validator && !this.getValidator(field.validator)(value)) {
- return assign(previous, {
- [field.name]: field.validateError
- });
- }
- return previous;
- }, {}), this.props.editing.features && this.props.editing.features.length ? {} : {
- geometry: 'annotations.emptygeometry'
- });
-
- };
-
- validateText = (components, valueText) => {
- if (components && components.length) {
- const cmp = head(components);
- return !!valueText && validateCoords(cmp);
- }
- return false;
- }
-
- save = () => {
- if (!isEmpty(this.props.selected)) {
- this.props.onAddNewFeature();
- } else {
- const errors = this.validate();
- if (Object.keys(errors).length === 0) {
- this.props.onError({});
- this.props.onSave(this.props.id, assign({}, this.props.editedFields),
- this.props.editing.features, this.props.editing.style, this.props.editing.newFeature || false, {
- ...this.props.editing.properties,
- visibility: !isUndefined(this.props.editing.properties.visibility)
- ? this.props.editing.properties.visibility
- : this.props.editing.visibility
- }
- );
- } else {
- this.props.onError(errors);
- }
- }
- };
-
- setTabValue = (tabValue) =>{
- if (this.state.tabValue !== tabValue) {
- this.setState({...this.state, tabValue});
- }
- }
-
- setPopupWarning = (showPopupWarning) =>{
- this.setState({...this.state, showPopupWarning});
- }
-
- isMeasureEditDisabled = () => {
- const isMeasureAnnotation = this.props.editing?.properties?.type === MEASURE_TYPE || false;
- return !this.props.measurementAnnotationEdit || !isMeasureAnnotation;
- }
-
- setAnnotationMeasurement = () => {
- // Excluding geometry types not supported by measurement
- this.props.onSetAnnotationMeasurement(this.props.editing.features.filter(f=> f.geometry.type !== 'Point' && !f.properties.isCircle), this.props.editing?.properties);
- this.hideWarning();
- }
-
- hideWarning = () => {
- if (this.props.showAgain) {
- try {
- getApi().setItem("showPopupWarning", false);
- } catch (e) {
- console.error(e);
- }
- this.props.onHideMeasureWarning();
- }
- this.setPopupWarning(false);
- }
-}
-
-export default AnnotationsEditor;
diff --git a/web/client/components/mapcontrols/annotations/DropdownFeatureType.jsx b/web/client/components/mapcontrols/annotations/DropdownFeatureType.jsx
deleted file mode 100644
index a7c4b76823..0000000000
--- a/web/client/components/mapcontrols/annotations/DropdownFeatureType.jsx
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-import { Glyphicon, DropdownButton, MenuItem } from 'react-bootstrap';
-
-import tooltip from '../../misc/enhancers/tooltip';
-import { DEFAULT_ANNOTATIONS_STYLES, getStartEndPointsForLinestring } from '../../../utils/LegacyAnnotationsUtils';
-import React from 'react';
-import uuidv1 from 'uuid/v1';
-import assign from 'object-assign';
-
-
-const DropdownButtonT = tooltip(DropdownButton);
-const DropdownFeatureType = ({
- onClick = () => {},
- onStartDrawing = () => {},
- onAddText = () => {},
- onSetStyle = () => {},
- defaultStyles = {},
- defaultPointType = 'marker',
- titles = {},
- glyph = "",
- bsStyle = "primary",
- ...props
-} = {}) => (
-
- {this.renderButtons(editing)}
- {this.renderError(editing)}
- {this.renderModals()}
- {this.renderBody(editing)}
-
- {!isEmpty(this.props.selected) &&
-
-
- }
-
-
- {this.props.selected?.properties?.isText &&
- {
- const valueText = e.target.value.trim();
- this.props.onChangeGeometryTitle(valueText ? valueText : label);
- }}
- type="text"/>
-
-
-
-
- {
- const valueText = e.target.value;
- const components = this.props?.selected?.geometry?.coordinates?.length ?
- getComponents(this.props.selected.geometry) : [];
- if (this.validateText(components, valueText )) {
- this.props.onChangeText(valueText, components.map(coordToArray));
- } else if (valueText !== "") {
- this.props.onChangeText(valueText, components.map(coordToArray));
- } else {
- this.props.onChangeText("", components.map(coordToArray));
- this.props.onSetInvalidSelected("text", components.map(coordToArray));
- }
- }}
- type="text"/>
-
-
-
}
-
-
- {this.state.tabValue === 'coordinates' &&
- {
- this.props.onSetStyle(style);
- this.props.onSetUnsavedStyle(true);
- this.props.onSetUnsavedChanges(true);
- }}
- pointType={this.props.pointType}
- style={this.props.selected && this.props.selected.style || this.props.editing.style}
- width={this.props.width}
- symbolsPath={this.props.symbolsPath}
- onSetErrorSymbol={this.props.onSetErrorSymbol}
- symbolErrors={this.props.symbolErrors}
- onUpdateSymbols={this.props.onUpdateSymbols}
- symbolList={this.props.symbolList}
- defaultShape={this.props.defaultShape}
- defaultShapeSize={this.props.defaultShapeSize}
- defaultShapeFillColor={this.props.defaultShapeFillColor}
- defaultShapeStrokeColor={this.props.defaultShapeStrokeColor}
- defaultStyles={this.props.defaultStyles}
- lineDashOptions={this.props.lineDashOptions}
- markersOptions={this.getConfig()}
- textRotationStep={this.props.textRotationStep}
- />
- }
-
-
- {
- showPopupWarning ? setPopupWarning(true) : onSetAnnotationMeasurement();
- },
- tooltip:
- {features && features.length === 0 && allowCardMouseEvent && onGeometryHighlight(properties.id)}
- onMouseLeave={() => allowCardMouseEvent && onGeometryHighlight(properties.id, false)}
- onClick={() =>{
-
- if (isSelected && isValidFeature) {
- onUnselectFeature();
- onGeometryHighlight(properties.id);
- } else if (!disabled) {
- onSelectFeature([feature]);
- setTabValue(isMeasureEditDisabled ? 'coordinates' : 'style');
- onStyleGeometry(!isMeasureEditDisabled);
- }
- onValidateFeature();
- } }
- >
-
- );
-
- return disabled && !isSelected ? overlayWrapper(content) : content;
-};
-
-FeaturesList.defaultProps = {
- onAddGeometry: () => {},
- onSetStyle: () => {},
- onStartDrawing: () => {},
- onAddText: () => {},
- onStyleGeometry: () => {},
- onSetAnnotationMeasurement: () => {},
- onSelectFeature: () => {},
- setTabValue: () => {},
- isMeasureEditDisabled: true,
- defaultPointType: 'marker',
- defaultStyles: {},
- onValidateFeature: () => {},
- validateFeatures: () => { return true; }
-};
-
-export default FeaturesList;
diff --git a/web/client/components/mapcontrols/annotations/SelectAnnotationsFile.jsx b/web/client/components/mapcontrols/annotations/SelectAnnotationsFile.jsx
deleted file mode 100644
index 6eb6595d60..0000000000
--- a/web/client/components/mapcontrols/annotations/SelectAnnotationsFile.jsx
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2017, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import { Promise } from 'es6-promise';
-import PropTypes from 'prop-types';
-import React from 'react';
-import { Checkbox } from 'react-bootstrap';
-import Dropzone from 'react-dropzone';
-import Spinner from 'react-spinkit';
-
-import { ANNOTATION_TYPE } from '../../../plugins/Annotations/utils/AnnotationsUtils';
-import { readGeoJson } from '../../../utils/FileUtils';
-import Message from '../../I18N/Message';
-import ResizableModal from '../../misc/ResizableModal';
-
-class SelectAnnotationsFile extends React.Component {
- static propTypes = {
- show: PropTypes.bool,
- text: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
- onFileChoosen: PropTypes.func,
- error: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
- errorMessage: PropTypes.string,
- onClose: PropTypes.func,
- title: PropTypes.node,
- closeGlyph: PropTypes.string,
- disableOvveride: PropTypes.bool
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- show: false,
- text:
-
-
-
-
- {properties?.geometryTitle || label || properties?.id}
-
-
)
- render() {
- return (
-
-
-
-
- {this.state.error && this.renderError()}
-
-
-
- {this.state.loading &&
-
- this.setState(() => ({override: !this.state.override}))}>
-
-
- Description
Next Line
", - "visibility": true - }, - "features": [ - { - "type": "Feature", - "geometry": { - "coordinates": [[[-121.07812513411045, 42.11778385718358], - [ -116.2265622317791, 44.72175879125132], - [ -115.87499973177908, 40.773885871584866], - [ -114.96093589067458, 42.68889580392076], - [ -121.07812513411045, 42.11778385718358]] - ], - "type": "Polygon" - }, - "properties": { - "id": "829d47d0-aa2c-11ea-95b6-c74060290256", - "isValidFeature": true, - "canEdit": false, - "geometryTitle": "Polygon-test" - } - } - ] - }]; - const container = ReactDOM.render(
- 
- {item.display_name}
-
- );
- }
-}
-
-export default NominatimResult;
diff --git a/web/client/components/mapcontrols/search/geocoding/NominatimResultList.jsx b/web/client/components/mapcontrols/search/geocoding/NominatimResultList.jsx
deleted file mode 100644
index 43c4d56300..0000000000
--- a/web/client/components/mapcontrols/search/geocoding/NominatimResultList.jsx
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright 2015, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 PropTypes from 'prop-types';
-import NominatimResult from './NominatimResult';
-import { getZoomForExtent, getCenterForExtent } from '../../../../utils/MapUtils';
-import { reprojectBbox } from '../../../../utils/CoordinatesUtils';
-import I18N from '../../../I18N/I18N';
-
-
-class ResultList extends React.Component {
- static propTypes = {
- results: PropTypes.array,
- mapConfig: PropTypes.object,
- onItemClick: PropTypes.func,
- addMarker: PropTypes.func,
- afterItemClick: PropTypes.func,
- notFoundMessage: PropTypes.oneOfType([PropTypes.object, PropTypes.string])
- };
-
- static defaultProps = {
- onItemClick: () => {},
- addMarker: () => {},
- afterItemClick: () => {}
- };
-
- onItemClick = (item) => {
- // coordinates from nominatim are minY minX maxY maxX as strings
- var nBbox = item.boundingbox.map( (elem) => {return parseFloat(elem); });
- var bbox = [nBbox[2], nBbox[0], nBbox[3], nBbox[1]];
- // zoom by the max. extent defined in the map's config
- var mapSize = this.props.mapConfig.size;
-
- var newZoom = getZoomForExtent(reprojectBbox(bbox, "EPSG:4326", this.props.mapConfig.projection), mapSize, 0, 21, null);
-
- // center by the max. extent defined in the map's config
- var newCenter = getCenterForExtent(bbox, "EPSG:4326");
-
- this.props.onItemClick(newCenter, newZoom, {
- bounds: {
- minx: bbox[0],
- miny: bbox[1],
- maxx: bbox[2],
- maxy: bbox[3]
- },
- crs: "EPSG:4326",
- rotation: 0
- }, this.props.mapConfig.size, null, this.props.mapConfig.projection);
- this.props.addMarker({lat: newCenter.y, lng: newCenter.x});
- this.props.afterItemClick();
- };
-
- renderResults = () => {
- return this.props.results.map((item, idx)=> {return {notFoundMessage}
;
- }
- return (
-
- {this.renderResults()}
-
- );
- }
-
- purgeResults = () => {
-
- };
-}
-
-export default ResultList;
diff --git a/web/client/components/mapcontrols/search/geocoding/__tests__/NominatimResult-test.jsx b/web/client/components/mapcontrols/search/geocoding/__tests__/NominatimResult-test.jsx
deleted file mode 100644
index c70c39545d..0000000000
--- a/web/client/components/mapcontrols/search/geocoding/__tests__/NominatimResult-test.jsx
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright 2015, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import expect from 'expect';
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import NominatimResult from '../NominatimResult';
-import TestUtils from 'react-dom/test-utils';
-
-describe("test the NominatimResult", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('test component creation', () => {
- var item = {
- osm_id: 1,
- display_name: "Name",
- boundingbox: []
- };
- const tb = ReactDOM.render( id value of the dockable panel
- * @prop {string} dimMode. If none - content is not dimmed, if transparent - pointer events are disabled (so you can click through it), if opaque - click on dim area closes the dock. Default is none
- * @prop {number} dockSize. Size of dock panel (width or height, depending on position). Is a % value [0~1]
- * @prop {bool} isVisible. If true, dock is visible. Default is true.
- * @prop {number} maxDockSize. The maximum extension in %. Default 1.0
- * @prop {number} minDockSize. The minimum extension in %. Default 0.1
- * @prop {string} position. Side to dock (left, right, top or bottom). Default is bottom.
- * @prop {bool} fluid. If true, resize dock proportionally on window resize. Default is true.
- * @prop {function} setDockSize. The metod called when the dockable panel is resized
- * @prop {object} toolbar. it contains the toolbar
- * @prop {object} toolbarHeight. the height of the toolbar in px. Default 40
- * @prop {object} wrappedComponent. A connected Component to be rendered inside the dock panel
- * @prop {number} zIndex. Positioned below dialogs, above left menu
- *
- */
-class DockablePanel extends React.Component {
- static propTypes = {
- id: PropTypes.string,
- dimMode: PropTypes.string,
- dockSize: PropTypes.number,
- isVisible: PropTypes.bool,
- fluid: PropTypes.bool,
- maxDockSize: PropTypes.number,
- minDockSize: PropTypes.number,
- position: PropTypes.string,
- setDockSize: PropTypes.func,
- toolbar: PropTypes.object,
- toolbarHeight: PropTypes.number,
- wrappedComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
- zIndex: PropTypes.number
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- dimMode: "none",
- dockSize: 0.35,
- fluid: true,
- isVisible: true,
- maxDockSize: 1.0,
- minDockSize: 0.1,
- position: "bottom",
- setDockSize: () => {},
- toolbar: null,
- toolbarHeight: 40,
- wrappedComponent: {},
- zIndex: 1030
- };
-
- getHeight = (pos) => {
- return pos === "top" || pos === "bottom" ? true : undefined;
- };
-
- getWidth = (pos) => {
- return pos === "left" || pos === "right" ? true : undefined;
- };
-
- render() {
- const WrappedComponent = this.props.wrappedComponent;
- return (
-
-
- );
- }
-
- limitDockHeight = (size) => {
- if (size >= this.props.maxDockSize) {
- this.props.setDockSize(this.props.maxDockSize);
- } else if (size <= this.props.minDockSize) {
- this.props.setDockSize(this.props.minDockSize);
- } else {
- this.props.setDockSize(size);
- }
- };
-}
-
-export default DockablePanel;
diff --git a/web/client/components/misc/LinkToPage.jsx b/web/client/components/misc/LinkToPage.jsx
deleted file mode 100644
index 65f8c88282..0000000000
--- a/web/client/components/misc/LinkToPage.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 PropTypes from 'prop-types';
-import Button from './Button';
-
-class LinkToPage extends React.Component {
- static propTypes = {
- params: PropTypes.object,
- url: PropTypes.string,
- txt: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
- btProps: PropTypes.object
- };
-
- static defaultProps = {
- params: [],
- url: '',
- btProps: {},
- txt: 'Link'
- };
-
- render() {
- return (
-
- );
- }
-
- buildUrl = () => {
- let urlParams = '?';
- Object.keys(this.props.params).forEach(function(p) {
- urlParams += p + "=" + this.props.params[p] + "&";
- }, this);
- return this.props.url + encodeURI(urlParams);
- };
-}
-
-export default LinkToPage;
diff --git a/web/client/components/misc/ResizableGrid.jsx b/web/client/components/misc/ResizableGrid.jsx
deleted file mode 100644
index 40604e7ec0..0000000000
--- a/web/client/components/misc/ResizableGrid.jsx
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2017, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 ReactDataGrid from 'react-data-grid';
-import PropTypes from 'prop-types';
-
-/**
- * Component for rendering a feature grid.
- * @memberof components.ResizableGrid
- * @class
- * @prop {object[]} columns. The columns rendered in the header. Each object is composed by key,name,[reizable=true|false].
- * @prop {number} headerRowHeight the height in pixels of the rows in the header. Default 55
- * @prop {number} minHeight the min height of the grid container. Default 250
- * @prop {number} minWidth the min width of the grid container.
- * @prop {string} refGrid the reference to the react-data-grid-component
- * @prop {number} rowHeight the height of the rows in the grid. Default 30
- * @prop {string} rowKey the key used to distinguish rows.
- * @prop {string} rowGetter method to render a row
- * @prop {object} rowSelection The object used to handle selection of rows. It puts a column of check as the first row.
- * @prop {object[]} rows. The features passed to the grid.
- * @prop {number} size. The size of the dock panel wrapping this component.
- *
- */
-class ResizableGrid extends React.Component {
- static propTypes = {
- columns: PropTypes.array.isRequired,
- headerRowHeight: PropTypes.number,
- minHeight: PropTypes.number.isRequired,
- minWidth: PropTypes.number,
- refGrid: PropTypes.string,
- rowHeight: PropTypes.number.isRequired,
- rowKey: PropTypes.string,
- rowSelection: PropTypes.object,
- rowGetter: PropTypes.func,
- selectBy: PropTypes.object,
- rows: PropTypes.array.isRequired,
- size: PropTypes.object,
- onCellsSelected: PropTypes.func,
- onRowsSelected: PropTypes.func,
- onRowsDeselected: PropTypes.func
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- columns: [],
- headerRowHeight: 55,
- minHeight: 250,
- minWidth: null,
- refGrid: "grid",
- rowHeight: 30,
- rowKey: "id",
- rowSelection: {},
- rowGetter: null,
- selectBy: null,
- onRowsSelected: () => {},
- onRowsDeselected: () => {},
- rows: []
- };
-
- state = {
- minHeight: this.props.minHeight,
- minWidth: this.props.minWidth
- };
-
- UNSAFE_componentWillReceiveProps(newProps) {
- if (this.props.size.width !== newProps.size.width ) {
- this.setState({
- minWidth: this.getWidth(this.refs.grid),
- minHeight: this.getHeight(this.refs.grid)}
- );
- }
- if (this.props.size.height !== newProps.size.height ) {
- this.setState({
- minHeight: this.getHeight(this.refs.grid)}
- );
- }
- }
-
- getHeight = (element) => {
- return element && element.getDataGridDOMNode().clientHeight || this.props.minHeight;
- };
-
- getWidth = (element) => {
- return element && element.getDataGridDOMNode().clientWidth || this.props.minWidth;
- };
-
- render() {
- return (
- {
- if (typeof selected === 'string') {
- this.selectMemberPage = 0;
- this.setState({selectedMember: selected});
- this.searchUsers(selected, true);
- return;
- }
- if (selected.value) {
- this.setState({selectedMember: selected.label});
- // this.selectMemberPage = 0;
- }
- }}
- placeholder={placeholder}
- // pagination={pagination}
- selectedValue={this.state.selectedMember}
- onSelect={() => {}}
- stopPropagation
- // dropUp
-
- />
- //
- );
- }
- handleToggleSelectMember = () => {
- this.setState(prevState => ({
- openSelectMember: !prevState.openSelectMember
- }));
- }
- handleKeyDown = event => {
- let { key } = event;
- let { focusedItemIndex, times } = this.state;
- if (key === 'Enter') {
- const focusedItem = times[focusedItemIndex];
- this.props.onSelect(focusedItem);
- event.preventDefault();
- } else if (key === 'ArrowDown') {
- event.preventDefault();
- const index = focusedItemIndex + 1;
- this.scrollDown(index);
- if (index < times.length) {
- this.setState({ focusedItemIndex: index });
- }
- } else if (key === 'ArrowUp') {
- event.preventDefault();
- const index = focusedItemIndex - 1;
- this.scrollUp(index);
- if (index > -1) {
- this.setState({ focusedItemIndex: index });
- }
- }
- }
-
- scrollDown = index => {
- const item = this.itemsRef[index];
- if (item && item.offsetTop > this.listRef.offsetHeight) {
- this.listRef.scrollTop = item.offsetTop - this.listRef.offsetTop;
- }
- }
-
- scrollUp = index => {
- const item = this.itemsRef[index];
- if (item) {
- const topScroll = this.listRef.scrollTop;
- const itemTop = item.offsetTop;
- if (topScroll && (itemTop < topScroll)) {
- this.listRef.scrollTop = item.offsetTop - this.listRef.offsetTop;
- }
- }
- }
-
- attachListRef = ref => (this.listRef = ref)
-
- itemsRef = {};
-}
-
-export default TimePicker;
diff --git a/web/client/components/misc/enhancers/__tests__/debounce-test.jsx b/web/client/components/misc/enhancers/__tests__/debounce-test.jsx
deleted file mode 100644
index 1bd6d047cb..0000000000
--- a/web/client/components/misc/enhancers/__tests__/debounce-test.jsx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 ReactDOM from 'react-dom';
-import { createSink, compose } from 'recompose';
-import expect from 'expect';
-import debounce from '../debounce';
-
-describe('debounce enhancer', () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
- it('debounce call only last action', (done) => {
- const action = (status, method, owner, features) => {
- expect(status).toExist();
- expect(status).toBe("replace");
- expect(method).toNotExist();
- expect(owner).toExist();
- expect(owner).toBe("queryform");
- expect(features).toExist();
- expect(features).toBe("geom2");
- done();
- };
- const Sink = compose(debounce("onChangeDrawingStatus", 800))(createSink( props => {
- expect(props).toExist();
- expect(props.onChangeDrawingStatus).toExist();
- props.onChangeDrawingStatus("geom");
- props.onChangeDrawingStatus("geom1");
- props.onChangeDrawingStatus("replace", undefined, "queryform", "geom2");
- }));
- ReactDOM.render((
-
- );
diff --git a/web/client/components/misc/sidebar/SidebarHeader.jsx b/web/client/components/misc/sidebar/SidebarHeader.jsx
deleted file mode 100644
index 14d1d69784..0000000000
--- a/web/client/components/misc/sidebar/SidebarHeader.jsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2017, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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';
-
-export default ({title} = {}) => ;
diff --git a/web/client/components/misc/sidebar/__tests__/Sidebar-test.jsx b/web/client/components/misc/sidebar/__tests__/Sidebar-test.jsx
deleted file mode 100644
index 0e9dc646a2..0000000000
--- a/web/client/components/misc/sidebar/__tests__/Sidebar-test.jsx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2017, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import expect from 'expect';
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import Sidebar from '../Sidebar';
-import SidebarHeader from '../SidebarHeader';
-
-describe("Sidebar component", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
- it('create Sidebar with content', () => {
- ReactDOM.render(
-
- , document.getElementById("container"));
- const el = document.getElementById('content');
- expect(el).toExist();
- });
- it('create Sidebar wjth title and content', () => {
- ReactDOM.render(
- content} />
- , document.getElementById("container"));
- const titleContainer = document.getElementsByClassName('sidebar-title')[0];
- expect(titleContainer).toExist();
- const content = document.getElementById("content");
- expect(content).toExist();
- });
-
-});
diff --git a/web/client/components/misc/sidebar/index.js b/web/client/components/misc/sidebar/index.js
deleted file mode 100644
index b16202021f..0000000000
--- a/web/client/components/misc/sidebar/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright 2017, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import Sidebar from './Sidebar';
-
-import SidebarHeader from './SidebarHeader';
-
-export default {
- Sidebar,
- SidebarHeader
-};
diff --git a/web/client/components/misc/spinners/InlineSpinner/InlineSpinner.jsx b/web/client/components/misc/spinners/InlineSpinner/InlineSpinner.jsx
deleted file mode 100644
index 442fc4231d..0000000000
--- a/web/client/components/misc/spinners/InlineSpinner/InlineSpinner.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright 2015, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import {isFunction} from 'lodash';
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import defaultIcon from './img/spinner.gif';
-
-class InlineSpinner extends React.Component {
- static propTypes = {
- className: PropTypes.string,
- loading: PropTypes.oneOfType([PropTypes.bool, PropTypes.func]),
- icon: PropTypes.string
- };
-
- static defaultProps = {
- loading: false,
- icon: defaultIcon,
- className: "inline-spinner"
- };
-
- getDisplayStyle = () => {
- let loading;
- if (isFunction(this.props.loading)) {
- loading = this.props.loading(this.props);
- } else {
- loading = this.props.loading;
- }
- return loading ? 'inline-block' : 'none';
- };
-
- render() {
- return (
- 
- );
- }
-}
-
-export default InlineSpinner;
diff --git a/web/client/components/misc/spinners/InlineSpinner/__tests__/InlineSpinner-test.jsx b/web/client/components/misc/spinners/InlineSpinner/__tests__/InlineSpinner-test.jsx
deleted file mode 100644
index 03041c850d..0000000000
--- a/web/client/components/misc/spinners/InlineSpinner/__tests__/InlineSpinner-test.jsx
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright 2015, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import expect from 'expect';
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import InlineSpinner from '../InlineSpinner';
-
-describe('InlineSpinner', () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('test defaults', () => {
- const spinner = ReactDOM.render( : ;
- return (
-
- );
- }
-}
-
-export default PrintSubmit;
diff --git a/web/client/components/print/__tests__/PrintSubmit-test.jsx b/web/client/components/print/__tests__/PrintSubmit-test.jsx
deleted file mode 100644
index c419b4fb7d..0000000000
--- a/web/client/components/print/__tests__/PrintSubmit-test.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import expect from 'expect';
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import PrintSubmit from '../PrintSubmit';
-import ReactTestUtils from 'react-dom/test-utils';
-
-describe("Test the PrintSubmit component", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('creates component with defaults', () => {
- const cmp = ReactDOM.render(, document.getElementById("container"));
- expect(cmp).toExist();
- const node = ReactDOM.findDOMNode(cmp);
- ReactTestUtils.Simulate.click(node);
- });
-});
diff --git a/web/client/components/security/PermissionEditor.jsx b/web/client/components/security/PermissionEditor.jsx
deleted file mode 100644
index 4a877ff28c..0000000000
--- a/web/client/components/security/PermissionEditor.jsx
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
-* Copyright 2016, GeoSolutions Sas.
-* All rights reserved.
-*
-* 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 PropTypes from 'prop-types';
-import assign from 'object-assign';
-import {find, findIndex, head} from 'lodash';
-import Select from 'react-select';
-import Spinner from 'react-spinkit';
-import { Table, Glyphicon } from 'react-bootstrap';
-import Message from '../I18N/Message';
-import { getMessageById } from '../../utils/LocaleUtils';
-import Button from '../misc/Button';
-
-/**
-* Map permission editor
-*/
-class PermissionEditor extends React.Component {
- static propTypes = {
- // props
- id: PropTypes.string,
- user: PropTypes.object,
- buttonSize: PropTypes.string,
- includeCloseButton: PropTypes.bool,
- disabled: PropTypes.bool,
- map: PropTypes.object,
- style: PropTypes.object,
- fluid: PropTypes.bool,
- // CALLBACKS
- onGroupsChange: PropTypes.func,
- onAddPermission: PropTypes.func,
- onErrorCurrentMap: PropTypes.func,
- onUpdateCurrentMap: PropTypes.func,
- onNewGroupChoose: PropTypes.func,
- onNewPermissionChoose: PropTypes.func,
- availablePermissions: PropTypes.arrayOf(PropTypes.string),
- availableGroups: PropTypes.arrayOf(PropTypes.object),
- updatePermissions: PropTypes.func,
- groups: PropTypes.arrayOf(PropTypes.object),
- newGroup: PropTypes.object,
- newPermission: PropTypes.string
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- disabled: true,
- id: "PermissionEditor",
- user: {
- name: "Guest"
- },
- style: {},
- buttonSize: "small",
- // CALLBACKS
- onGroupsChange: ()=> {},
- onAddPermission: ()=> {},
- onNewGroupChoose: ()=> {},
- onNewPermissionChoose: ()=> {},
- onErrorCurrentMap: ()=> {},
- onUpdateCurrentMap: ()=> {},
- availablePermissions: ["canRead", "canWrite"],
- availableGroups: [],
- updatePermissions: () => {},
- groups: []
- };
-
- onNewGroupChoose = (selected) => {
- // TODO: use find(this.props.availableGroups,['id', toInteger(id)]) when lodash will be updated to version 4
- this.props.onNewGroupChoose(find(this.props.availableGroups, (o)=> o.id === selected.value));
- };
-
- onAddPermission = () => {
- // Check if the new permission will edit ad existing one
- if (this.isPermissionPresent(this.props.newGroup.groupName)) {
- this.props.onGroupsChange(
- {
- SecurityRuleList: {
- SecurityRule: this.props.map.permissions.SecurityRuleList.SecurityRule.map(
- function(rule) {
- if (rule.group && rule.group.groupName === this.props.newGroup.groupName) {
- if (this.props.newPermission === "canWrite") {
- return assign({}, rule, {canRead: true, canWrite: true});
- }
- return assign({}, rule, {canRead: true, canWrite: false});
- }
- return rule;
- }, this
- ).filter(rule => rule.canRead || rule.canWrite)
- }
- }
- );
-
- } else {
- this.props.onAddPermission({
- canRead: true,
- canWrite: this.props.newPermission === "canWrite",
- group: this.props.newGroup
- });
- }
- };
-
- onChangePermission = (index, input) => {
- if (this.props.map.permissions) {
- this.props.onGroupsChange(
- {
- SecurityRuleList: {
- SecurityRule: this.props.map.permissions.SecurityRuleList.SecurityRule.map(
- function(rule) {
- if (rule.group && rule.group.groupName === this.localGroups[index].name) {
- if (input === "canWrite") {
- return assign({}, rule, {canRead: true, canWrite: true});
- } else if (input === "canRead") {
- return assign({}, rule, {canRead: true, canWrite: false});
- }
- // TODO: this entry is useless, it should be removed from the array
- return assign({}, rule, {canRead: false, canWrite: false});
- }
- return rule;
- }, this
- ).filter(rule => rule.canRead || rule.canWrite)
- }
- }
- );
- }
- };
-
- getSelectableGroups = () => {
- return this.props.availableGroups && this.props.availableGroups.filter( (group) => {
- return !this.isPermissionPresent(group.groupName);
- }).map((group) => ({label: group.groupName, value: group.id}));
- };
-
- getPermissonLabel = (perm) => {
- switch (perm) {
- case "canRead":
- return getMessageById(this.context.messages, "map.permissions.canView");
- case "canWrite":
- return getMessageById(this.context.messages, "map.permissions.canWrite");
- default:
- return perm;
- }
- };
-
- getAvailablePermissions = () => {
- return this.props.availablePermissions.map((perm) => ({value: perm, label: this.getPermissonLabel(perm)}));
- };
-
- renderPermissionRows = () => {
- if (this.localGroups.length === 0) {
- return
- {group.name}
-
-
- {
- // {
- //
- }
-
-
-
- );
- });
- };
- render() {
- // Hack to convert map permissions to a simpler format, TODO: remove this
- if (this.props.map && this.props.map.permissions && this.props.map.permissions.SecurityRuleList && this.props.map.permissions.SecurityRuleList.SecurityRule) {
- this.localGroups = this.props.map.permissions.SecurityRuleList.SecurityRule
- .map(function(rule) {
- if (rule && rule.group && rule.canRead) {
- return {name: rule.group.groupName, permission: rule.canWrite ? "canWrite" : "canRead" };
- }
- return null;
- }
- ).filter(rule => rule); // filter out undefined values
- } else {
- this.localGroups = this.props.groups;
- }
- return (
-
-
-
-
- this.props.onChange("band", v)}
- {...this.props.bandsComboOptions}/>
-
- this.props.onChange("contrast", v.value)}/>
-
- { this.props.contrast === "GammaValue" ? this.props.onChange("gammaValue", v)}/> : null}
- { this.props.contrast === "Normalize" ?
- this.props.onChange("algorithm", v.value)}/>
-
- : null}
-
- {this.props.contrast === "Normalize" && this.props.algorithm !== "none" ?
-
-
: null }
- {this.props.contrast === "Normalize" && this.props.algorithm !== "none" ?
-
- this.props.onChange("min", v)}
- />
- this.props.onChange("max", v)}
- />
-
: null }
- );
- }
-}
-
-export default BandSelector;
diff --git a/web/client/components/style/CircleStyler.jsx b/web/client/components/style/CircleStyler.jsx
deleted file mode 100644
index bcf6b74aa8..0000000000
--- a/web/client/components/style/CircleStyler.jsx
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import assign from 'object-assign';
-import { Grid, Row, Col } from 'react-bootstrap';
-import ColorSelector from './ColorSelector';
-import StyleCanvas from './StyleCanvas';
-import Slider from 'react-nouislider';
-import numberLocalizer from 'react-widgets/lib/localizers/simple-number';
-numberLocalizer();
-import { isNil } from 'lodash';
-import Message from '../I18N/Message';
-import tinycolor from 'tinycolor2';
-
-class StylePolygon extends React.Component {
- static propTypes = {
- shapeStyle: PropTypes.object,
- width: PropTypes.number,
- setStyleParameter: PropTypes.func
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- shapeStyle: {},
- setStyleParameter: () => {}
- };
-
- render() {
- const styleType = "Circle";
- const style = this.props.shapeStyle[styleType] || this.props.shapeStyle; // in case of old version of style.
- return (
-
-
-
- {
- if (!isNil(c)) {
- const fillColor = tinycolor(c).toHexString();
- const fillOpacity = c.a;
- const newStyle = assign({}, this.props.shapeStyle, {
- [styleType]: assign({}, style, {fillColor, fillOpacity})
- });
- this.props.setStyleParameter(newStyle);
- }
- }}/>
-
-
-
- {
- if (!isNil(c)) {
- const color = tinycolor(c).toHexString();
- const opacity = c.a;
- const newStyle = assign({}, this.props.shapeStyle, {
- [styleType]: assign({}, style, {color, opacity})
- });
- this.props.setStyleParameter(newStyle);
- }
- }}/>
-
-
-
-
- );
- }
- addOpacityToColor = (color, opacity) => {
- return assign({}, color, {
- a: opacity
- });
- }
-}
-
-export default StylePolygon;
diff --git a/web/client/components/style/ColorMapGrid.jsx b/web/client/components/style/ColorMapGrid.jsx
deleted file mode 100644
index d9208978c3..0000000000
--- a/web/client/components/style/ColorMapGrid.jsx
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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';
-import { AgGridReact } from 'ag-grid-react';
-import PropTypes from 'prop-types';
-import reactCellRendererFactory from './ColorMapGridComponents/ReactCellRendererFactoryParams';
-import ColorPickerRenderer from './ColorMapGridComponents/ColorPickerRenderer';
-import assign from 'object-assign';
-import NumberRenderer from './ColorMapGridComponents/NumberRenderer';
-import { getMessageById } from '../../utils/LocaleUtils';
-import 'ag-grid-community/dist/styles/ag-grid.css';
-import 'ag-grid-community/dist/styles/ag-theme-blue.css';
-
-class ColorMapGrid extends React.Component {
- static propTypes = {
- entries: PropTypes.array,
- style: PropTypes.object,
- selectEntry: PropTypes.func,
- valueChanged: PropTypes.func
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- entries: [],
- style: {height: "200px"},
- selectEntry: () => {},
- valueChanged: () => {}
- };
-
- shouldComponentUpdate(nextProps) {
- return !isEqual(nextProps.entries, this.props.entries);
- }
-
- componentDidUpdate() {
- this.api.sizeColumnsToFit();
- }
-
- onGridReady = (params) => {
- this.api = params.api;
- this.api.sizeColumnsToFit();
- this.columnApi = params.columnApi;
- };
-
- render() {
- return (
-
- {this.props.wrappedComponent !== null ? (
- {this.props.toolbar}
-
-
- //
- //
- {title}
-
-
-
-
- );
- }
-
- disablePermission(a, b) {
- return a || !b;
- }
- isPermissionPresent = (group) => {
- return this.props.map && this.props.map.permissions && this.props.map.permissions.SecurityRuleList && this.props.map.permissions.SecurityRuleList.SecurityRule &&
- findIndex(this.props.map.permissions.SecurityRuleList.SecurityRule, (o) => o.group && o.group.groupName === group) >= 0;
- };
-}
-
-export default PermissionEditor;
diff --git a/web/client/components/security/__tests__/PermissionEditor-test.jsx b/web/client/components/security/__tests__/PermissionEditor-test.jsx
deleted file mode 100644
index ea24feff91..0000000000
--- a/web/client/components/security/__tests__/PermissionEditor-test.jsx
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import expect from 'expect';
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import ReactTestUtils from 'react-dom/test-utils';
-import PermissionEditor from '../PermissionEditor';
-
-let setupEditor = (docElement, actions) => {
- return ReactDOM.render(| - | -- | -- - | -
-
-
-
- Math.round(value),
- to: value => Math.round(value) + ' px'
- }}
- range={{min: 1, max: 15}}
- onChange={(values) => {
- const weight = parseInt(values[0].replace(' px', ''), 10);
- const newStyle = assign({}, this.props.shapeStyle, {
- [styleType]: assign({}, style, {weight})
- });
- this.props.setStyleParameter(newStyle);
- }}
- />
-
-
-
-
);
- }
-
- selectEntry = (row) => {
- if (row) {
- this.props.selectEntry(row.node.childIndex);
- }
- };
-
- valueChanged = () => {
- let newData = [];
- this.api.getModel().forEachNode((node) => {newData.push(node.data); });
- this.props.valueChanged(newData);
- };
-
- changeColor = (node, colorOpacity) => {
- let newData = [];
- this.api.getModel().forEachNode((n, idx) => {
- let data = idx === node.childIndex ? assign({}, n.data, colorOpacity) : n.data;
- newData.push(data);
- });
- this.props.valueChanged(newData);
- };
-
- changeQuantity = (node, value) => {
- let newData = [];
- this.api.getModel().forEachNode((n, idx) => {
- let data = idx === node.childIndex ? assign({}, n.data, {quantity: value}) : n.data;
- newData.push(data);
- });
- this.props.valueChanged(newData);
- };
-}
-
-export default ColorMapGrid;
diff --git a/web/client/components/style/ColorMapGridComponents/ColorPickerRenderer.jsx b/web/client/components/style/ColorMapGridComponents/ColorPickerRenderer.jsx
deleted file mode 100644
index bc175b5877..0000000000
--- a/web/client/components/style/ColorMapGridComponents/ColorPickerRenderer.jsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import PropTypes from 'prop-types';
-
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 { SketchPicker } from 'react-color';
-import './colorenderer.css';
-import { getWindowSize } from '../../../utils/AgentUtils';
-
-class ColorPickerRenderer extends React.Component {
- static propTypes = {
- params: PropTypes.object,
- onChangeColor: PropTypes.func,
- disabled: PropTypes.bool
- };
-
- static defaultProps = {
- disabled: false,
- onChangeColor: () => {}
- };
-
- state = {
- displayColorPicker: false
- };
-
- onChangeColor = () => {
- if ( this.state.color) {
- let opacity = this.state.color.rgb.a !== 1 ? this.state.color.rgb.a : undefined;
- let color = this.state.color.hex.indexOf("#") === 0 ? this.state.color.hex : "#" + this.state.color.hex;
- this.props.onChangeColor( this.props.params.node, {color: color, opacity: opacity});
- }
- };
-
- getBackgroundColor = (data) => {
- let color = 'blue';
- if ( data && data.color) {
- let rgb = this.hexToRgb(data.color);
- let opacity = data.opacity !== undefined ? data.opacity : 1;
- color = rgb ? `rgba(${ rgb.r }, ${ rgb.g }, ${ rgb.b }, ${ opacity })` : 'blue';
- }
- return color;
- };
-
- render() {
- let data = this.props.params.data;
- let colorValue = data && data.color ? this.hexToRgb(data.color) : {r: 0, g: 0, b: 255};
- colorValue.a = data.opacity !== undefined ? data.opacity : 1;
- let bkgColor = this.getBackgroundColor(data);
- return (
-
-
{
- if (!this.props.disabled) {
- this.setState({
- displayColorPicker: !this.state.displayColorPicker,
- y: e.pageY
- });
- }
- }}
- />
- { this.state.displayColorPicker ?
-
-
- );
- }
-
- calculateTop = (y) => {
- let h = getWindowSize().maxHeight;
- return (y + 300 > h ? h - 305 : y ) - 300;
- };
-
- hexToRgb = (hex) => {
- const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
- return result ? {
- r: parseInt(result[1], 16),
- g: parseInt(result[2], 16),
- b: parseInt(result[3], 16)
- } : null;
- };
-}
-
-export default ColorPickerRenderer;
diff --git a/web/client/components/style/ColorMapGridComponents/NumberRenderer.jsx b/web/client/components/style/ColorMapGridComponents/NumberRenderer.jsx
deleted file mode 100644
index 6573d3e796..0000000000
--- a/web/client/components/style/ColorMapGridComponents/NumberRenderer.jsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import PropTypes from 'prop-types';
-
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 { findDOMNode } from 'react-dom';
-import { Popover, Label, Overlay } from 'react-bootstrap';
-import numberLocalizer from 'react-widgets/lib/localizers/simple-number';
-numberLocalizer();
-import { NumberPicker } from 'react-widgets';
-import './numberpicker.css';
-
-class NumberRenderer extends React.Component {
- static propTypes = {
- params: PropTypes.object,
- onChangeValue: PropTypes.func,
- errorMessage: PropTypes.string
- };
-
- static defaultProps = {
- onChangeValue: () => {},
- errorMessage: "Value not valid"
- };
-
- state = {
- displayNumberPicker: false,
- showError: false
- };
-
- componentDidMount() {
- this.props.params.api.addEventListener('cellClicked', this.cellClicked);
- }
-
- componentWillUnmount() {
- this.props.params.api.removeEventListener('cellClicked', this.cellClicked);
- }
-
- getRange = () => {
- let data = [];
- this.props.params.api.forEachNode((node) => {data.push(node.data); });
- let idx = this.props.params.node.childIndex;
- let min = data[idx - 1] ? data[idx - 1].quantity + 0.01 : -Infinity;
- let max = data[idx + 1] ? data[idx + 1].quantity - 0.01 : Infinity;
- return {min: min, max: max};
- };
-
- render() {
-
- return (
- {
- this.setState({ displayColorPicker: false});
- this.onChangeColor();
- }}/>
- { this.setState({ color: color }); }} />
-
- : null }
- {
- if (!this.state.displayNumberPicker) {
- this.setState({displayNumberPicker: !this.state.displayNumberPicker});
- }
- } }
- >
- { this.state.displayNumberPicker ?
- findDOMNode(this.refs[this.props.error.type])}
- show placement="top" >
-
-
-
-
- );
- };
-
- render() {
- return (
-
-
- |
- |
-
- |
- |
-
-
-
-
- this.props.onChange("classes", number)}
- precision={0} min={3} max={12} step={1}
- value={this.props.classes}
- />
-
-
-
-
-
- |
- this.props.onChange("ramp", value.name)}
- textField="name"
- itemComponent={ColorRampItem} value={this.getRampValue()}/>
- |
-
-
-
-
-
- );
- }
-
- classifyDisabled = () => {
- return this.props.error && this.props.error.type ? true : false;
- };
-
- generateEqualIntervalRamp = () => {
- let ramp = colors[this.getRampValue()][this.props.classes];
- let min = this.props.min;
- let max = this.props.max;
- let step = (max - min) / this.props.classes;
- let colorRamp = ramp.map((color, idx) => {
- return {color: color, quantity: min + idx * step};
- });
- this.props.onClassify("colorRamp", colorRamp);
- };
-
- changeMin = (value) => {
- if (value < this.props.max) {
- if (this.props.error) {
- this.props.onChange("error", {});
- }
- this.props.onChange("min", value);
- } else {
- this.props.onChange("error", {
- type: "min",
- msg: "equalinterval.minerror"
- });
- }
-
- };
-
- changeMax = (value) => {
- if (value > this.props.min) {
- if (this.props.error) {
- this.props.onChange("error", {});
- }
- this.props.onChange("max", value);
- } else {
- this.props.onChange("error", {
- type: "max",
- msg: "equalinterval.maxerror"
- });
- }
- };
-}
-
-export default EqualInterval;
diff --git a/web/client/components/style/EqualIntervalComponents/ColorRamp.js b/web/client/components/style/EqualIntervalComponents/ColorRamp.js
deleted file mode 100644
index 5d04aa786a..0000000000
--- a/web/client/components/style/EqualIntervalComponents/ColorRamp.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const colorsSchema = [
- {name: "BuGn", schema: "Sequential", max: 9}, {name: "BuPu", schema: "Sequential", max: 9}, {name: "GnBu", schema: "Sequential", max: 9},
- {name: "OrRd", schema: "Sequential", max: 9}, {name: "PuBu", schema: "Sequential", max: 9}, {name: "PuBuGn", schema: "Sequential", max: 9},
- {name: "PuRd", schema: "Sequential", max: 9}, {name: "RdPu", schema: "Sequential", max: 9}, {name: "YlGn", schema: "Sequential", max: 9},
- {name: "YlGnBu", schema: "Sequential", max: 9}, {name: "YlOrBr", schema: "Sequential", max: 9}, {name: "YlOrRd", schema: "Sequential", max: 9},
- {name: "Blues", schema: "Singlehue", max: 9}, {name: "Greens", schema: "Singlehue", max: 9}, {name: "Greys", schema: "Singlehue", max: 9},
- {name: "Oranges", schema: "Singlehue", max: 9}, {name: "Purples", schema: "Singlehue", max: 9}, {name: "Reds", schema: "Singlehue", max: 9},
- {name: "BrBG", schema: "Diverging", max: 11}, {name: "PiYG", schema: "Diverging", max: 11}, {name: "PRGn", schema: "Diverging", max: 11},
- {name: "PuOr", schema: "Diverging", max: 11}, {name: "RdBu", schema: "Diverging", max: 11}, {name: "RdGy", schema: "Diverging", max: 11},
- {name: "RdYlBu", schema: "Diverging", max: 11}, {name: "RdYlGn", schema: "Diverging", max: 11}, {name: "Spectral", schema: "Diverging", max: 11},
- {name: "Accent", schema: "Qualitative", max: 8}, {name: "Dark2", schema: "Qualitative", max: 8}, {name: "Paired", schema: "Qualitative", max: 12},
- {name: "Pastel1", schema: "Qualitative", max: 9}, {name: "Pastel2", schema: "Qualitative", max: 8}, {name: "Set1", schema: "Qualitative", max: 9},
- {name: "Set2", schema: "Qualitative", max: 8}, {name: "Set3", schema: "Qualitative", max: 12}, {name: "Earth", schema: "Dem", max: 12},
- {name: "Land", schema: "Dem", max: 12}, {name: "Water", schema: "Dem", max: 12}, {name: "CDA", schema: "Dem", max: 12},
- {name: "Simple", schema: "Dem", max: 7}];
-
-export default colorsSchema;
diff --git a/web/client/components/style/EqualIntervalComponents/ColorRampItem.jsx b/web/client/components/style/EqualIntervalComponents/ColorRampItem.jsx
deleted file mode 100644
index e7b78d4f7f..0000000000
--- a/web/client/components/style/EqualIntervalComponents/ColorRampItem.jsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2019, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 PropTypes from 'prop-types';
-import colors from './ExtendColorBrewer';
-import Message from '../../I18N/Message';
-
-/**
- * @name ColorRampItem
- * @description Simple component to display color label
- */
-const ColorRampItem = ({ item }) => {
- let ramp = item && (item.ramp || colors[item.name] && colors[item.name][5]) || [];
- return (
- onOpen(isOpen)}
- content={
-
- );
-}
-
-MarkerPropertyPicker.propTypes = {
- value: PropTypes.oneOfType([
- PropTypes.string,
- PropTypes.shape({r: PropTypes.number, g: PropTypes.number, b: PropTypes.number, a: PropTypes.number})
- ]),
- format: PropTypes.string,
- onChangeColor: PropTypes.func,
- text: PropTypes.string,
- line: PropTypes.bool,
- disabled: PropTypes.bool,
- pickerProps: PropTypes.object,
- containerNode: PropTypes.node,
- onOpen: PropTypes.function,
- placement: PropTypes.string
-};
-
-MarkerPropertyPicker.defaultProps = {
- disabled: false,
- line: false,
- onChangeColor: () => {},
- pickerProps: {},
- onOpen: () => {}
-};
-
-export default MarkerPropertyPicker;
diff --git a/web/client/components/style/OpacityPicker.jsx b/web/client/components/style/OpacityPicker.jsx
deleted file mode 100644
index 3b2538a791..0000000000
--- a/web/client/components/style/OpacityPicker.jsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import PropTypes from 'prop-types';
-
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 Slider from 'react-nouislider';
-import 'react-nouislider/example/nouislider.css';
-import './opacitypicker.css';
-
-class OpacityPicker extends React.Component {
- static propTypes = {
- opacity: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
- onChange: PropTypes.func,
- disabled: PropTypes.bool
- };
-
- static defaultProps = {
- opacity: "1",
- onChange: () => {},
- disabled: false
- };
-
- render() {
- return (
-
-
-
-
- {
- if (!isNil(c)) {
- const fillColor = tinycolor(c).toHexString();
- const fillOpacity = c.a;
- const newStyle = assign({}, this.props.shapeStyle, {
- [styleType]: assign({}, style, {fillColor, fillOpacity}),
- [otherStyleType]: assign({}, style, {fillColor, fillOpacity})
- });
- this.props.setStyleParameter(newStyle);
- }
- }}/>
-
-
-
- {
- if (!isNil(c)) {
- const color = tinycolor(c).toHexString();
- const opacity = c.a;
- const newStyle = assign({}, this.props.shapeStyle, {
- [styleType]: assign({}, style, {color, opacity}),
- [otherStyleType]: assign({}, style, {color, opacity})
- });
- this.props.setStyleParameter(newStyle);
- }
- }}/>
-
-
-
-
- );
- }
- addOpacityToColor = (color, opacity) => {
- return assign({}, color, {
- a: opacity
- });
- }
-}
-
-export default StylePolygon;
diff --git a/web/client/components/style/PolylineStyler.jsx b/web/client/components/style/PolylineStyler.jsx
deleted file mode 100644
index 50e3757ccd..0000000000
--- a/web/client/components/style/PolylineStyler.jsx
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import { Grid, Row, Col } from 'react-bootstrap';
-import assign from 'object-assign';
-import ColorSelector from './ColorSelector';
-import StyleCanvas from './StyleCanvas';
-import Slider from 'react-nouislider';
-import numberLocalizer from 'react-widgets/lib/localizers/simple-number';
-numberLocalizer();
-import Message from '../I18N/Message';
-import { isNil } from 'lodash';
-import tinycolor from 'tinycolor2';
-
-class StylePolyline extends React.Component {
- static propTypes = {
- width: PropTypes.number,
- shapeStyle: PropTypes.object,
- setStyleParameter: PropTypes.func
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- shapeStyle: {},
- setStyleParameter: () => {}
- };
-
- render() {
- const styleType = !!this.props.shapeStyle.MultiLineString ? "MultiLineString" : "LineString";
- const otherStyleType = !this.props.shapeStyle.MultiLineString ? "MultiLineString" : "LineString";
- const style = this.props.shapeStyle[styleType];
- return (
-
-
-
- {
- if (!isNil(c)) {
- const color = tinycolor(c).toHexString();
- const opacity = c.a;
- const newStyle = assign({}, this.props.shapeStyle, {
- [styleType]: assign({}, style, {color, opacity}),
- [otherStyleType]: assign({}, style, {color, opacity})
- });
- this.props.setStyleParameter(newStyle);
- }
- }}/>
-
-
-
-
- );
- }
- addOpacityToColor = (color, opacity) => {
- return assign({}, color, {
- a: opacity
- });
- }
-}
-
-export default StylePolyline;
diff --git a/web/client/components/style/PseudoColorSettings.jsx b/web/client/components/style/PseudoColorSettings.jsx
deleted file mode 100644
index 191b79ef70..0000000000
--- a/web/client/components/style/PseudoColorSettings.jsx
+++ /dev/null
@@ -1,108 +0,0 @@
-
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import PropTypes from 'prop-types';
-import React from 'react';
-import { Grid, Row, Col} from 'react-bootstrap';
-import { Combobox } from 'react-widgets';
-
-import Button from '../misc/Button';
-import ColorMapGrid from './ColorMapGrid';
-import Message from '../I18N/Message';
-
-class PseudoColorSettings extends React.Component {
- static propTypes = {
- type: PropTypes.oneOf(['ramp', 'intervals', 'values']),
- opacity: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
- selected: PropTypes.number,
- colorMapEntry: PropTypes.array,
- onChange: PropTypes.func,
- extended: PropTypes.bool
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- type: 'ramp',
- opacity: "1",
- selected: null,
- colorMapEntry: [],
- onChange: () => {},
- extended: false
- };
-
- render() {
- return (
-
-
-
-
-
-
- this.props.onChange("type", v)} />
-
-
- this.props.onChange("extended", e.target.checked)} checked={this.props.extended} />
-
-
-
-
- this.props.onChange("colorMapEntry", colorMap)}
- entries={this.props.colorMapEntry}/>
-
-
-
-
-
-
- );
- }
-
- addEntry = () => {
- let colorMapEntry = this.props.colorMapEntry ? this.props.colorMapEntry.slice() : [];
- let quantity = colorMapEntry.length > 0 ? colorMapEntry[colorMapEntry.length - 1].quantity + 0.01 : 0;
- let label = quantity.toFixed ? quantity.toFixed(2) : quantity;
- colorMapEntry.push({color: '#AA34FF', quantity: quantity, label: label });
- this.props.onChange("colorMapEntry", colorMapEntry);
- };
-
- removeEntry = () => {
- let colorMapEntry = this.props.colorMapEntry.filter((e, idx) => {
- return idx !== this.props.selected;
- });
- this.props.onChange("selected", null);
- this.props.onChange("colorMapEntry", colorMapEntry);
- };
-
- selectEntry = (id) => {
- if ( id !== this.props.selected) {
- this.props.onChange("selected", id);
- }
- };
-}
-
-export default PseudoColorSettings;
diff --git a/web/client/components/style/RasterStyleTypePicker.jsx b/web/client/components/style/RasterStyleTypePicker.jsx
deleted file mode 100644
index 2ab2610588..0000000000
--- a/web/client/components/style/RasterStyleTypePicker.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 { Combobox } from 'react-widgets';
-import PropTypes from 'prop-types';
-import { getMessageById } from '../../utils/LocaleUtils';
-
-class RasterStyleTypePicker extends React.Component {
- static propTypes = {
- styletype: PropTypes.oneOf(['rgb', 'gray', 'pseudo']),
- onChange: PropTypes.func
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- render() {
- return (
- this.props.onChange("styletype", v.value)}
- value={this.props.styletype} />
- );
- }
-}
-
-export default RasterStyleTypePicker;
diff --git a/web/client/components/style/ScaleDenominator.jsx b/web/client/components/style/ScaleDenominator.jsx
deleted file mode 100644
index 3f59de5317..0000000000
--- a/web/client/components/style/ScaleDenominator.jsx
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 PropTypes from 'prop-types';
-import { getGoogleMercatorScales } from '../../utils/MapUtils';
-import { findDOMNode } from 'react-dom';
-import { DropdownList } from 'react-widgets';
-import { Row, Col, Overlay, Popover, Label } from 'react-bootstrap';
-import { getMessageById } from '../../utils/LocaleUtils';
-import Message from '../I18N/Message';
-
-class ScaleDenominator extends React.Component {
- static propTypes = {
- minValue: PropTypes.number,
- maxValue: PropTypes.number,
- onChange: PropTypes.func.isRequired
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- minValue: null,
- maxValue: null,
- onChange: () => null
- };
-
- state = {error: false};
-
- UNSAFE_componentWillMount() {
- let scales = getGoogleMercatorScales(0, 21);
- this.scales = [{value: null, text: getMessageById(this.context.messages, "scaledenominator.none") || 'None'}, ...scales.map((v) => ({value: v, text: `${v.toFixed(0)}`}))];
- }
-
- onChange = (t, {value: v}) => {
- if (t === 'minDenominator' && this.props.maxValue && v >= this.props.maxValue) {
- this.setState({error: {type: t, msg: "scaledenominator.minerror"}});
- } else if (t === 'maxDenominator' && this.props.minValue && v <= this.props.minValue) {
- this.setState({error: {type: t, msg: "scaledenominator.maxerror"}});
- } else {
- if (this.state.error) {
- this.setState({error: false});
- }
- this.props.onChange(t, v);
- }
- };
-
- renderErrorPopOver = () => {
- return (
- findDOMNode(this.refs[this.state.error.type])}
- show placement="top" >
-
-
-
-
- );
- };
-
- render() {
- return (
- this.onChange("minDenominator", v)}
- />
-
- this.onChange("maxDenominator", v)}
- />
-
- {(this.state.error) ? this.renderErrorPopOver() : null}
-
)
- ;
- }
-}
-
-export default ScaleDenominator;
diff --git a/web/client/components/style/TextStyler.jsx b/web/client/components/style/TextStyler.jsx
deleted file mode 100644
index 67bc560ec6..0000000000
--- a/web/client/components/style/TextStyler.jsx
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 PropTypes from 'prop-types';
-import { Grid, Row, Col } from 'react-bootstrap';
-import { Combobox } from 'react-widgets';
-import assign from 'object-assign';
-import ColorSelector from './ColorSelector';
-import StyleCanvas from './StyleCanvas';
-import numberLocalizer from 'react-widgets/lib/localizers/simple-number';
-numberLocalizer();
-import { getMessageById } from '../../utils/LocaleUtils';
-import { createFont } from '../../utils/LegacyAnnotationsUtils';
-import Message from '../I18N/Message';
-import tinycolor from 'tinycolor2';
-import IntlNumberFormControl from '../I18N/IntlNumberFormControl';
-
-class TextStyler extends React.Component {
- static propTypes = {
- width: PropTypes.number,
- uomValues: PropTypes.array,
- alignValues: PropTypes.array,
- fontStyleValues: PropTypes.array,
- fontWeightValues: PropTypes.array,
- fontFamilyValues: PropTypes.array,
- shapeStyle: PropTypes.object,
- setStyleParameter: PropTypes.func,
- styleType: PropTypes.String
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- styleType: "Text",
- uomValues: [{value: "px"}, {value: "em"}],
- fontWeightValues: [{value: "normal"}, {value: "bold"}],
- alignValues: [{value: "start", label: "left"}, {value: "center", label: "center"}, {value: "end", label: "right"}],
- fontStyleValues: [{value: "normal"}, {value: "italic"}],
- fontFamilyValues: [{value: "Arial"}, {value: "Helvetica"}, {value: "sans-serif"}, {value: "Courier"}],
- shapeStyle: {},
- setStyleParameter: () => {}
- };
-
- state = {
- fontFamily: "Arial"
- };
-
- render() {
- const messages = {
- emptyList: getMessageById(this.context.messages, "queryform.attributefilter.autocomplete.emptyList"),
- open: getMessageById(this.context.messages, "queryform.attributefilter.autocomplete.open"),
- emptyFilter: getMessageById(this.context.messages, "queryform.attributefilter.autocomplete.emptyFilter")
- };
- const {styleType, shapeStyle} = this.props;
- const style = shapeStyle[styleType];
- return (
-
-
-
- {
- const color = tinycolor(c).toHexString();
- const opacity = c.a;
- const newStyle = assign({}, shapeStyle, {
- [styleType]: assign({}, style, {color, opacity})
- });
- this.props.setStyleParameter(newStyle);
- }}/>
-
-
-
- {
- let fontFamily = e.value ? e.value : e;
- if (fontFamily === "") {
- fontFamily = "Arial";
- }
- this.setState({fontFamily});
- const font = createFont({...style, fontFamily});
- const newStyle = assign({}, shapeStyle, {
- [styleType]: assign({}, style, {fontFamily, font})
- });
- this.props.setStyleParameter(newStyle);
- }}
- />
-
-
-
- {
- const fontSize = val;
- const font = createFont({...style, fontSize});
- const newStyle = assign({}, shapeStyle, {
- [styleType]: assign({}, style, {fontSize, font})
- });
- this.props.setStyleParameter(newStyle);
- }}
- type="number"/>
-
- {
- let fontSizeUom = e.value ? e.value : e;
- if (this.props.uomValues.map(f => f.value).indexOf(fontSizeUom) === -1) {
- fontSizeUom = "px";
- }
- const font = createFont({...style, fontSizeUom});
- const newStyle = assign({}, shapeStyle, {
- [styleType]: assign({}, style, {fontSizeUom, font})
- });
- this.props.setStyleParameter(newStyle);
- }}
- />
-
-
-
- {
- let textAlign = e.value ? e.value : e;
- if (this.props.alignValues.map(f => f.value).indexOf(textAlign) === -1) {
- textAlign = "center";
- }
- const newStyle = assign({}, shapeStyle, {
- [styleType]: assign({}, style, {textAlign})
- });
- this.props.setStyleParameter(newStyle);
- }}
- />
-
-
-
- {
- let fontStyle = e.value ? e.value : e;
- if (this.props.fontStyleValues.map(f => f.value).indexOf(fontStyle) === -1) {
- fontStyle = style.fontStyle;
- }
- const font = createFont({...style, fontStyle});
- const newStyle = assign({}, shapeStyle, {
- [styleType]: assign({}, style, {fontStyle, font})
- });
- this.props.setStyleParameter(newStyle);
- }}
- />
-
-
-
- {
- let fontWeight = e.value ? e.value : e;
- if (this.props.fontWeightValues.map(f => f.value).indexOf(fontWeight) === -1) {
- fontWeight = style.fontWeight;
- }
- const font = createFont({...style, fontWeight});
- const newStyle = assign({}, shapeStyle, {
- [styleType]: assign({}, style, {fontWeight, font})
- });
- this.props.setStyleParameter(newStyle);
- }}
- />
-
-
- );
- }
- addOpacityToColor = (color, opacity) => {
- return assign({}, color, {
- a: opacity
- });
- }
-}
-
-export default TextStyler;
diff --git a/web/client/components/style/__tests__/BandSelector-test.jsx b/web/client/components/style/__tests__/BandSelector-test.jsx
deleted file mode 100644
index f582a69472..0000000000
--- a/web/client/components/style/__tests__/BandSelector-test.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-import expect from 'expect';
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import BandSelector from '../BandSelector';
-
-describe("Test the BandSelector component", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('creates component with defaults', () => {
- const cmp = ReactDOM.render(, document.getElementById("container"));
- expect(sb).toExist();
- const domNode = ReactDOM.findDOMNode(sb);
- expect(domNode).toExist();
-
- const comboItems = sb.scales;
- expect(comboItems.length).toBe(23);
- sb.onChange("minDenominator", {value: 1000});
- sb.onChange("minDenominator", {value: 100000});
- sb.onChange("maxDenominator", {value: 100});
- });
-});
diff --git a/web/client/components/style/opacitypicker.css b/web/client/components/style/opacitypicker.css
deleted file mode 100644
index eeda0d82a0..0000000000
--- a/web/client/components/style/opacitypicker.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.opacity-picker .noUi-tooltip {
- display: block;
- position: absolute;
- border: 1px solid #D9D9D9;
- border-radius: 3px;
- background: #fff;
- padding: 5px;
- left: -1px;
- text-align: center;
- width: 34px;
- font-style: normal;
- font-variant: normal;
- font-weight: 700;
- font-stretch: normal;
- font-size: 10px;
- line-height: 12px;
- font-family: Arial;
- }
-
-.opacity-picker .noUi-handle-lower .noUi-tooltip {
- top: 28px;
-}
diff --git a/web/client/components/style/thumbGeoms/CircleThumb.jsx b/web/client/components/style/thumbGeoms/CircleThumb.jsx
deleted file mode 100644
index 43f3e55c85..0000000000
--- a/web/client/components/style/thumbGeoms/CircleThumb.jsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 PropTypes from 'prop-types';
-
-class CircleThumb extends React.Component {
-
- static propTypes = {
- linecap: PropTypes.string,
- linejoin: PropTypes.string,
- stroke: PropTypes.string,
- fillColor: PropTypes.string,
- strokeWidth: PropTypes.number,
- styleRect: PropTypes.object
- };
-
- static defaultProps = {
- styleRect: {},
- linecap: 'round', // butt round square
- linejoin: 'round', // miter round bevel
- strokeWidth: 3,
- stroke: '#ffcc33',
- fillColor: '#FFFFFF'
- };
-
- render() {
- const {color, weight, fillColor} = this.props.styleRect;
- return (
- , document.getElementById("container"));
- expect(cmp).toExist();
- const path = TestUtils.findRenderedDOMComponentWithTag(cmp, 'path');
- expect(path).toExist();
- expect(path.attributes.d.value).toBe("M25 75 L50 50 L75 75 L100 75");
- expect(path.attributes["stroke-linecap"].value).toBe("round");
- expect(path.attributes["stroke-linejoin"].value).toBe("round");
- expect(path.attributes["stroke-width"].value).toBe(style.weight.toString());
- expect(path.attributes.stroke.value).toBe(style.color.toString());
-
- });
-
-
-});
diff --git a/web/client/components/style/thumbGeoms/__tests__/MultiGeomThumb-test.js b/web/client/components/style/thumbGeoms/__tests__/MultiGeomThumb-test.js
deleted file mode 100644
index 15dfba7b1a..0000000000
--- a/web/client/components/style/thumbGeoms/__tests__/MultiGeomThumb-test.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import expect from 'expect';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import TestUtils from 'react-dom/test-utils';
-
-import {DEFAULT_ANNOTATIONS_STYLES} from '../../../../utils/LegacyAnnotationsUtils';
-import MultiGeomThumb from '../MultiGeomThumb';
-
-describe("Test the MultiGeomThumb component", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('create component with default', () => {
- const cmp = ReactDOM.render(, document.getElementById("container"));
- expect(cmp).toExist();
- const rect = TestUtils.findRenderedDOMComponentWithTag(cmp, 'rect');
- const svg = TestUtils.findRenderedDOMComponentWithTag(cmp, 'svg');
- expect(rect).toExist();
- expect(rect.attributes.width.value).toBe("50");
- expect(rect.attributes.height.value).toBe("50");
- expect(rect.attributes.x.value).toBe("25");
- expect(rect.attributes.y.value).toBe("25");
- expect(svg.attributes.xmlns.value).toBe("http://www.w3.org/2000/svg");
- expect(svg.attributes.viewBox.value).toBe("0 0 100 100");
-
- });
-
-
-});
diff --git a/web/client/components/style/vector/Fill.jsx b/web/client/components/style/vector/Fill.jsx
deleted file mode 100644
index 917114d6d4..0000000000
--- a/web/client/components/style/vector/Fill.jsx
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import { Row, Col } from 'react-bootstrap';
-import { isNil } from 'lodash';
-import tinycolor from 'tinycolor2';
-
-// number localizer?
-import numberLocalizer from 'react-widgets/lib/localizers/simple-number';
-
-// not sure this is needed, TODO check!
-numberLocalizer();
-
-import Message from '../../I18N/Message';
-import OpacitySlider from '../../../plugins/TOC/components/OpacitySlider';
-import ColorSelector from '../ColorSelector';
-import { addOpacityToColor } from '../../../utils/VectorStyleUtils';
-
-/**
- * Styler for the stroke properties of a vector style
-*/
-class Fill extends React.Component {
- static propTypes = {
- style: PropTypes.object,
- defaultColor: PropTypes.string,
- onChange: PropTypes.func,
- width: PropTypes.number
- };
-
- static defaultProps = {
- style: {},
- onChange: () => {}
- };
-
- render() {
- const {style} = this.props;
- return ( || null;
- const markerType = (isMarkerStyle(style) || isSymbolStyle(style)) && || null;
- const markerGlyph = isMarkerStyle(style) && || null;
- const symbolLayout = isSymbolStyle(style) && (
- {
- this.props.onUpdateSymbols(symbols);
- }}
- options={this.props.symbolList}
- symbolErrors={this.props.symbolErrors}
- onLoadingError={this.props.onSetErrorSymbol}/>) || null;
- const separator =
; - - const sections = [markerType, preview, symbolLayout, markerGlyph, text, fill, stroke]; - - return (
-
- {
- /* adding the separator between sections */
- sections.reduce((prev, curr, k) => [prev, prev && curr && {separator}, curr])
- }
-
- );
- }
-
- render() {
- const styles = castArray(this.props.style);
- return (
-
- );
- }
-
- cellClicked = (e) => {
- if (this.props.params.value !== e.value && this.state.displayNumberPicker) {
- this.stopEditing();
- }
- };
-
- stopEditing = () => {
- let range = this.getRange();
- let newValue = this.state.value === undefined ? this.props.params.value : this.state.value;
- if (range.min < newValue && newValue < range.max) {
- this.setState({ displayNumberPicker: false, showError: false});
- if (newValue !== this.props.params.value) {
- this.props.onChangeValue(this.props.params.node, newValue);
- }
- } else {
- this.setState({showError: true});
- }
-
- };
-
- changeNumber = (value) => {
- this.setState({value: value, showError: false});
- };
-}
-
-export default NumberRenderer;
diff --git a/web/client/components/style/ColorMapGridComponents/ReactCellRendererFactoryParams.jsx b/web/client/components/style/ColorMapGridComponents/ReactCellRendererFactoryParams.jsx
deleted file mode 100644
index c6ab15917f..0000000000
--- a/web/client/components/style/ColorMapGridComponents/ReactCellRendererFactoryParams.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright 2016, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 ReactDOM from 'react-dom';
-function reactCellRendererFactoryParams(ReactComponent, compParams) {
- return function(params) {
- if (params.eParentOfValue.addElementAttachedListener) {
- params.eParentOfValue.addElementAttachedListener(function(eCell) {
- ReactDOM.render(
-
:
- {this.props.params.value.toFixed ? this.props.params.value.toFixed(2) : this.props.params.value} }
- {e.stopPropagation(); }}>
- findDOMNode(this.refs.colorMapNumberPicker)}
- show={this.state.showError} placement="top" >
-
-
-
-
-
-
- {
- this.setState({
- ramp: ramp.name
- });
- }}/>
-
);
- }
-}
-
-export default ColorRampSelector;
diff --git a/web/client/components/style/ColorRangeSelector.jsx b/web/client/components/style/ColorRangeSelector.jsx
deleted file mode 100644
index cab4a35ba4..0000000000
--- a/web/client/components/style/ColorRangeSelector.jsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { sameToneRangeColors } from '../../utils/ColorUtils';
-import ColorRampItem from './EqualIntervalComponents/ColorRampItem';
-import { DropdownList } from 'react-widgets';
-import { head } from 'lodash';
-
-class ColorRangeSelector extends React.Component {
-
- static propTypes = {
- value: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
- samples: PropTypes.number,
- onChange: PropTypes.func,
- items: PropTypes.array,
- rampFunction: PropTypes.func,
- disabled: PropTypes.bool
- };
- static contextTypes = {
- messages: PropTypes.object
- };
- static defaultProps = {
- samples: 5,
- onChange: () => {},
- items: [{
- name: 'global.colors.blue',
- schema: 'sequencial',
- options: {base: 190, range: 20}
- }, {
- name: 'global.colors.red',
- schema: 'sequencial',
- options: {base: 10, range: 4}
- }, {
- name: 'global.colors.green',
- schema: 'sequencial',
- options: {base: 120, range: 4}
- }, {
- name: 'global.colors.brown',
- schema: 'sequencial',
- options: {base: 30, range: 4, s: 1, v: 0.5}
- }, {
- name: 'global.colors.purple',
- schema: 'sequencial',
- options: {base: 300, range: 4}
- }, {
- name: 'global.colors.random',
- schema: 'qualitative',
- options: {base: 190, range: 340, options: {base: 10, range: 360, s: 0.67, v: 0.67}}
- }],
- disabled: false
- };
- getValue = () => {
- return head(this.getItems().filter( (i = {}) => i === this.props.value || i.name === (this.props.value && this.props.value.name)));
- }
- getItems = () => {
- return this.props.items.map(({options = {}, ...item}) => ({
- ...item,
- options,
- ramp: this.props.rampFunction ? this.props.rampFunction(item, options) : (sameToneRangeColors(options.base, options.range, this.props.samples + 1, options.options) || ["#AAA"]).splice(1)
- }));
- }
-
- render() {
- const items = this.getItems();
- return (
-
- {this.getRamp()}
-
-
- {ramp.map(cell => )}
-
- );
-};
-
-ColorRampItem.propTypes = {
- item: PropTypes.oneOfType([PropTypes.string, PropTypes.object])
-};
-
-export default ColorRampItem;
diff --git a/web/client/components/style/EqualIntervalComponents/ExtendColorBrewer.js b/web/client/components/style/EqualIntervalComponents/ExtendColorBrewer.js
deleted file mode 100644
index b539a09ebe..0000000000
--- a/web/client/components/style/EqualIntervalComponents/ExtendColorBrewer.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2017, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-const extendColorBrewer = {
- Earth: {
- 3: ["#3e2f8d", "#d3e1b2", "#f1e8dd"],
- 4: ["#3e2f8d", "#a4cef4", "#676c52", "#f1e8dd"],
- 5: ["#3e2f8d", "#87b2f1", "#d3e1b2", "#615742", "#f1e8dd"],
- 6: ["#3e2f8d", "#739cd3", "#cbe1da", "#8e9f79", "#7e6d4f", "#f1e8dd"],
- 7: ["#3e2f8d", "#6a8dc7", "#a4cef4", "#d3e1b2", "#676c52", "#89795d", "#f1e8dd"],
- 8: ["#3e2f8d", "#6783c7", "#94c0fb", "#e1e9ca", "#a3b990", "#524d3d", "#908169", "#f1e8dd"],
- 9: ["#3e2f8d", "#657bc7", "#87b2f1", "#b9dae8", "#d3e1b2", "#7b8965", "#615742", "#948671", "#f1e8dd"],
- 10: ["#3e2f8d", "#6375c7", "#7ca6e0", "#a4cef4", "#eceec1", "#afc79c", "#676c52", "#716349", "#988b78", "#f1e8dd"],
- 11: ["#3e2f8d", "#6271c7", "#739cd3", "#99c4f9", "#cbe1da", "#d3e1b2", "#8e9f79", "#585743", "#7e6d4f", "#9b8f7e", "#f1e8dd"],
- 12: ["#3e2f8d", "#616dc7", "#6c93c7", "#8fbcfe", "#aed6f1", "#f1f0be", "#bbd5a9", "#788562", "#504a3b", "#847252", "#9b8f7e", "#f1e8dd"]
- },
- Land: {
- 3: ["#c3e2df", "#2f412c", "#e7e9dd"],
- 4: ["#c3e2df", "#5d7a65", "#3f3633", "#e7e9dd"],
- 5: ["#c3e2df", "#868f65", "#2f412c", "#5c4e4b", "#e7e9dd"],
- 6: ["#c3e2df", "#979f72", "#446553", "#302f26", "#6e5d56", "#e7e9dd"],
- 7: ["#c3e2df", "#a5ac7d", "#5d7a65", "#2f412c", "#3f3633", "#7b695a", "#e7e9dd"],
- 8: ["#c3e2df", "#b0b788", "#768562", "#3c5a46", "#2d3123", "#4f4342", "#84715c", "#e7e9dd"],
- 9: ["#c3e2df", "#b8c091", "#868f65", "#4b6e5f", "#2f412c", "#322d28", "#5c4e4b", "#8c775d", "#e7e9dd"],
- 10: ["#c3e2df", "#bfc697", "#8f986c", "#5d7a65", "#37553e", "#2b3221", "#3f3633", "#665651", "#917c5e", "#e7e9dd"],
- 11: ["#c3e2df", "#c4cc9d", "#979f72", "#6f8263", "#446553", "#2f412c", "#302f26", "#4a3f3d", "#6e5d56", "#96805f", "#e7e9dd"],
- 12: ["#c3e2df", "#c8d0a1", "#9ea576", "#7d8861", "#4e7265", "#35513a", "#2a3320", "#352e2a", "#534745", "#756359", "#9d896a", "#e7e9dd"]
- },
- Water: {
- 3: ["#1f373d", "#4cc1b2", "#dee2b6"],
- 4: ["#1f373d", "#309590", "#85dfce", "#dee2b6"],
- 5: ["#1f373d", "#2a8180", "#4cc1b2", "#a1f3dc", "#dee2b6"],
- 6: ["#1f373d", "#2f6f79", "#30a8a2", "#76d1c6", "#c1fdf6", "#dee2b6"],
- 7: ["#1f373d", "#306573", "#309590", "#4cc1b2", "#85dfce", "#c8f3dc", "#dee2b6"],
- 8: ["#1f373d", "#305f6b", "#2a8b86", "#2fb2aa", "#6eccbd", "#8deccd", "#c8e6bb", "#dee2b6"],
- 9: ["#1f373d", "#2f5b66", "#2a8180", "#32a09a", "#4cc1b2", "#7dd5ce", "#a1f3dc", "#c8dda3", "#dee2b6"],
- 10: ["#1f373d", "#2f5862", "#2d777c", "#309590", "#2eb8af", "#69cab8", "#85dfce", "#b3f8eb", "#c8d690", "#dee2b6"],
- 11: ["#1f373d", "#2f555f", "#2f6f79", "#2c8e89", "#30a8a2", "#4cc1b2", "#76d1c6", "#8ae8cd", "#c1fdf6", "#c8d181", "#dee2b6"],
- 12: ["#1f373d", "#2f535c", "#306977", "#298883", "#329c97", "#30bab1", "#66c8b4", "#80d7cf", "#92efd0", "#c8faf0", "#cad285", "#dee2b6"]
- },
- CDA: {
- 3: ["#18c6ca", "#fed873", "#ffffff"],
- 4: ["#18c6ca", "#fffbc3", "#e3ce9b", "#ffffff"],
- 5: ["#18c6ca", "#e9feb4", "#fed873", "#d0c6b0", "#ffffff"],
- 6: ["#18c6ca", "#cffea9", "#fef5af", "#efd28b", "#c8c2b6", "#ffffff"],
- 7: ["#18c6ca", "#bafea1", "#fffbc3", "#fed873", "#e3ce9b", "#ccc8c1", "#ffffff"],
- 8: ["#18c6ca", "#affe9d", "#f0feb8", "#fef3a8", "#f3d486", "#d8c9a8", "#d3d0ca", "#ffffff"],
- 9: ["#18c6ca", "#affe9d", "#e9feb4", "#fef7b5", "#fed873", "#e7cf96", "#d0c6b0", "#dad8d2", "#ffffff"],
- 10: ["#18c6ca", "#a3fe9a", "#d8feac", "#fffbc3", "#feee9b", "#f7d580", "#e3ce9b", "#ccc4b3", "#dad8d2", "#ffffff"],
- 11: ["#18c6ca", "#97fe96", "#cffea9", "#f7febb", "#fef5af", "#fed873", "#efd28b", "#dccaa4", "#c8c2b6", "#e1dfdb", "#ffffff"],
- 12: ["#18c6ca", "#97fe96", "#c5fea5", "#f0feb8", "#fef9bc", "#feee9b", "#f7d580", "#e7cf96", "#d8c9a8", "#c4c1b9", "#e1dfdb", "#ffffff"]
- },
- Simple: {
- 3: ["#000000", "#7fff00", "#bf7f3f"],
- 4: ["#000000", "#38ff38", "#ffd400", "#bf7f3f"],
- 5: ["#000000", "#7fff7f", "#7fff00", "#ff9f00", "#bf7f3f"],
- 6: ["#000000", "#aaffaa", "#00ff00", "#ffff00", "#ff7f00", "#bf7f3f"],
- 7: ["#000000", "#8dd48d", "#38ff38", "#7fff00", "#ffd400", "#f47f0a", "#bf7f3f"]
- }
-};
-
-import assign from 'object-assign';
-
-export default assign({}, require("colorbrewer"), extendColorBrewer);
diff --git a/web/client/components/style/EqualIntervalComponents/__tests__/ColorRampItem-test.jsx b/web/client/components/style/EqualIntervalComponents/__tests__/ColorRampItem-test.jsx
deleted file mode 100644
index 2c503c8b91..0000000000
--- a/web/client/components/style/EqualIntervalComponents/__tests__/ColorRampItem-test.jsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright 2019, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import expect from 'expect';
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import ColorRampItem from '../ColorRampItem';
-
-describe("Test the ColorRampItem", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('creates colorRamp with defaults', () => {
- ReactDOM.render(
- {item && ( item.label || item.name )
- ?
-
- {children}
-
- }
- >
-
-
-
- {triggerNode}
-
-
- this.props.onChange("opacity", (v / 100).toFixed(2))}
- connect="lower"
- tooltips={[ {
- to: function( value ) {
- return Math.round(value) + '%';
- }
- }
- ]}
- />
-
);
- }
-}
-
-export default OpacityPicker;
diff --git a/web/client/components/style/PolygonStyler.jsx b/web/client/components/style/PolygonStyler.jsx
deleted file mode 100644
index d16aedaaa7..0000000000
--- a/web/client/components/style/PolygonStyler.jsx
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import assign from 'object-assign';
-import { Grid, Row, Col } from 'react-bootstrap';
-import ColorSelector from './ColorSelector';
-import StyleCanvas from './StyleCanvas';
-import Slider from 'react-nouislider';
-import numberLocalizer from 'react-widgets/lib/localizers/simple-number';
-numberLocalizer();
-import Message from '../I18N/Message';
-import { isNil } from 'lodash';
-import tinycolor from 'tinycolor2';
-
-class StylePolygon extends React.Component {
- static propTypes = {
- shapeStyle: PropTypes.object,
- width: PropTypes.number,
- setStyleParameter: PropTypes.func
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- shapeStyle: {},
- setStyleParameter: () => {}
- };
-
- render() {
- const styleType = !!this.props.shapeStyle.MultiPolygon ? "MultiPolygon" : "Polygon";
- const otherStyleType = !this.props.shapeStyle.MultiPolygon ? "MultiPolygon" : "Polygon";
- const style = this.props.shapeStyle[styleType] || this.props.shapeStyle; // in case of old version of style.
- return (
-
-
-
- Math.round(value),
- to: value => Math.round(value) + ' px'
- }}
- range={{min: 1, max: 15}}
- onChange={(values) => {
- const weight = parseInt(values[0].replace(' px', ''), 10);
- const newStyle = assign({}, this.props.shapeStyle, {
- [styleType]: assign({}, style, {weight}),
- [otherStyleType]: assign({}, style, {weight})
- });
- this.props.setStyleParameter(newStyle);
- }}
- />
-
-
-
-
-
-
- Math.round(value),
- to: value => Math.round(value) + ' px'
- }}
- range={{min: 1, max: 15}}
- onChange={(values) => {
- const weight = parseInt(values[0].replace(' px', ''), 10);
- const newStyle = assign({}, this.props.shapeStyle, {
- [styleType]: assign({}, style, {weight}),
- [otherStyleType]: assign({}, style, {weight})
- });
- this.props.setStyleParameter(newStyle);
- }}
- />
-
-
-
- {
-
-
- */
-
- );
- }
-}
-
-export default CircleThumb;
diff --git a/web/client/components/style/thumbGeoms/LineThumb.jsx b/web/client/components/style/thumbGeoms/LineThumb.jsx
deleted file mode 100644
index 57a004c907..0000000000
--- a/web/client/components/style/thumbGeoms/LineThumb.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 PropTypes from 'prop-types';
-
-class LineThumb extends React.Component {
-
- static propTypes = {
- linecap: PropTypes.string,
- linejoin: PropTypes.string,
- stroke: PropTypes.string,
- fillColor: PropTypes.string,
- strokeWidth: PropTypes.number,
- style: PropTypes.object
- };
-
- static defaultProps = {
- style: {},
- linecap: 'round', // butt round square
- linejoin: 'round', // miter round bevel
- strokeWidth: 3,
- stroke: '#ffcc33',
- fillColor: '#FFFFFF'
- };
-
- render() {
- const {color, weight, fillColor} = this.props.style;
- return (
-
-
-
- );
- }
-}
-
-export default LineThumb;
diff --git a/web/client/components/style/thumbGeoms/MultiGeomThumb.jsx b/web/client/components/style/thumbGeoms/MultiGeomThumb.jsx
deleted file mode 100644
index 08ca532679..0000000000
--- a/web/client/components/style/thumbGeoms/MultiGeomThumb.jsx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 PropTypes from 'prop-types';
-import markerIcon from '../../map/openlayers/img/marker-icon.png';
-
-class MultiGeomThumb extends React.Component {
-
- static propTypes = {
- linecap: PropTypes.string,
- linejoin: PropTypes.string,
- stroke: PropTypes.string,
- strokeWidth: PropTypes.number,
- styleMultiGeom: PropTypes.object,
- geometry: PropTypes.object,
- properties: PropTypes.object
- };
-
- static defaultProps = {
- linecap: 'round', // butt round square
- linejoin: 'round', // miter round bevel
- stroke: '#ffcc33',
- strokeWidth: 3,
- styleMultiGeom: {},
- geometry: {
- features: []
- },
- properties: {}
- };
-
- getGeoms() {
- return this.props.geometry && this.props.geometry.features.reduce((p, c) => {
- if (c.properties && c.properties.isCircle) {
- return {...p, "Circle": true};
- }
- if (c.properties && c.properties.isText) {
- return {...p, "Text": true};
- }
- return {...p, [c.geometry.type]: true};
- }, {"Circle": false, "Text": false});
- }
- render() {
- let geoms = this.getGeoms();
- const stroke = {color: "#ffcc33", opacity: 1, weight: 2 };
- const fill = {fillColor: "#FFFFFF", fillOpacity: 0 };
- let textPresent = geoms.Text;
- let circlePresent = geoms.Circle;
- let polygonPresent = geoms.Polygon || geoms.MultiPolygon;
- let lineStringPresent = geoms.LineString || geoms.MultiLineString;
- let pointPresent = geoms.Point || geoms.MultiPoint; // this can be a symbol tho..
-
- let styleLine = {...stroke};
- let stylePolygon = {...stroke, ...fill};
- let styleCircle = {...stroke, ...fill};
- let styleText = textPresent ? {
- fontStyle: 'normal',
- fontSize: '14',
- fontSizeUom: 'px',
- fontFamily: 'Arial',
- fontWeight: 'normal',
- font: "14px Arial",
- textAlign: 'center',
- ...stroke, ...fill} : {};
- return (
-
-
- {pointPresent && 
}
-
- );
- }
-}
-
-export default MultiGeomThumb;
diff --git a/web/client/components/style/thumbGeoms/PolygonThumb.jsx b/web/client/components/style/thumbGeoms/PolygonThumb.jsx
deleted file mode 100644
index 085d10df15..0000000000
--- a/web/client/components/style/thumbGeoms/PolygonThumb.jsx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * 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 PropTypes from 'prop-types';
-
-class PolygonThumb extends React.Component {
-
- static propTypes = {
- stroke: PropTypes.string,
- fill: PropTypes.string,
- fillOpacity: PropTypes.number,
- strokeWidth: PropTypes.number,
- opacity: PropTypes.number,
- styleRect: PropTypes.object,
- viewBox: PropTypes.string,
- rectParams: PropTypes.object
- };
-
- static defaultProps = {
- stroke: '#ffcc33',
- fill: '#FFFFFF',
- fillOpacity: 0.2,
- strokeWidth: 3,
- opacity: 1,
- styleRect: {},
- viewBox: "0 0 100 100",
- rectParams: {
- height: "50",
- width: "50",
- x: "25",
- y: "25"
- }
- };
-
- render() {
- const {color, weight, fillColor, fillOpacity, opacity} = this.props.styleRect;
- const {height, width, x, y} = this.props.rectParams;
- return (
-
-
-
- );
- }
-}
-
-export default PolygonThumb;
diff --git a/web/client/components/style/thumbGeoms/__tests__/LineThumb-test.js b/web/client/components/style/thumbGeoms/__tests__/LineThumb-test.js
deleted file mode 100644
index 77011584ee..0000000000
--- a/web/client/components/style/thumbGeoms/__tests__/LineThumb-test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import expect from 'expect';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import TestUtils from 'react-dom/test-utils';
-
-import {DEFAULT_ANNOTATIONS_STYLES} from '../../../../plugins/Annotations/utils/AnnotationsUtils';
-import LineThumb from '../LineThumb';
-
-describe("Test the LineThumb component", () => {
- beforeEach((done) => {
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- afterEach((done) => {
- ReactDOM.unmountComponentAtNode(document.getElementById("container"));
- document.body.innerHTML = '';
- setTimeout(done);
- });
-
- it('create component with default', () => {
- const cmp = ReactDOM.render(
-
-
-
- {
- if (!isNil(c)) {
- const fillColor = tinycolor(c).toHexString();
- const fillOpacity = c.a;
- this.props.onChange(style.id, {fillColor, fillOpacity});
- }
- }}/>
-
-
-
- {
- this.props.onChange(style.id, {fillOpacity});
- }}/>
-
-
-
);
- }
-}
-
-export default Fill;
diff --git a/web/client/components/style/vector/Manager.jsx b/web/client/components/style/vector/Manager.jsx
deleted file mode 100644
index 1e072d1224..0000000000
--- a/web/client/components/style/vector/Manager.jsx
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import axios from 'axios';
-import { castArray, filter, find, findIndex, isNil } from 'lodash';
-import assign from 'object-assign';
-import PropTypes from 'prop-types';
-import React from 'react';
-import { Grid } from 'react-bootstrap';
-import tinycolor from 'tinycolor2';
-import uuidv1 from 'uuid/v1';
-
-import { DEFAULT_PATH, DEFAULT_SHAPE, checkSymbolsError } from '../../../utils/LegacyAnnotationsUtils';
-import { arrayUpdate } from '../../../utils/ImmutableUtils';
-import {
- addOpacityToColor,
- createSvgUrl,
- fetchStyle,
- getStylerTitle,
- hashAndStringify,
- isFillStyle,
- isMarkerStyle,
- isStrokeStyle,
- isSymbolStyle,
- isTextStyle,
- registerStyle
-} from '../../../utils/VectorStyleUtils';
-import SwitchPanel from '../../misc/switch/SwitchPanel';
-import StyleCanvas from '../StyleCanvas';
-import Fill from './Fill';
-import MarkerGlyph from './marker/MarkerGlyph';
-import MarkerType from './marker/MarkerType';
-import SymbolLayout from './marker/SymbolLayout';
-import Stroke from './Stroke';
-import Text from './Text';
-
-class Manager extends React.Component {
- static propTypes = {
- style: PropTypes.object,
- switchPanelOptions: PropTypes.array,
- lineDashOptions: PropTypes.array,
- onChangeStyle: PropTypes.func,
- pointType: PropTypes.string,
- onUpdateSymbols: PropTypes.func,
- onSetErrorSymbol: PropTypes.func,
- width: PropTypes.number,
- symbolsPath: PropTypes.string,
- defaultShape: PropTypes.string,
- defaultShapeSize: PropTypes.number,
- defaultShapeFillColor: PropTypes.string,
- defaultShapeStrokeColor: PropTypes.string,
- defaultStyles: PropTypes.object,
- symbolList: PropTypes.array,
- symbolErrors: PropTypes.array,
- defaultSymbol: PropTypes.object,
- defaultMarker: PropTypes.object,
- markersOptions: PropTypes.object,
- textRotationStep: PropTypes.number
- };
-
- static defaultProps = {
- style: {},
- defaultShape: DEFAULT_SHAPE,
- symbolsPath: DEFAULT_PATH,
- defaultShapeSize: 64,
- defaultShapeFillColor: '#000000',
- defaultShapeStrokeColor: '#000000',
- symbolErrors: [],
- onChangeStyle: () => {},
- onUpdateSymbols: () => {},
- defaultStyles: {},
- switchPanelOptions: []
- };
-
- state = {}
-
-
- UNSAFE_componentWillMount() {
- // we assume that the default symbols shape is correctly configured
-
- const styles = castArray(this.props.style);
- const expanded = styles.map((s, i) => i === 0 || s.filtering );
- const locked = styles.map((s, i) => i === 0 );
- this.setState({expanded, locked});
- styles.filter(({type}) => type === 'Point').forEach(style => {
- this.checkSymbolUrl({...this.props, style});
- });
- }
-
- /**
- * it renders a switch panel styler
- * @prop {object} style
- * @prop {object} switchPanelOptions
- */
- renderPanelStyle = (style = {}, switchPanelOptions = {}, i) => {
-
- const stylerProps = {
- style,
- onChange: this.change,
- width: this.props.width
- };
-
- /* getting pieces to render in the styler
- // only for marker there is no preview
- // TODO move into separate functions the checks for showing the various pieces of styler
- */
- const isTextOrSymbol = isTextStyle(style) || isSymbolStyle(style);
- const preview = !(isMarkerStyle(style) || isSymbolStyle(style) && (checkSymbolsError(this.props.symbolErrors) ||
- checkSymbolsError(this.props.symbolErrors, "loading_symbol" + style.shape))) && (
-
);
- // TODO improve conditions to show the stroke and fill
- const stroke = isStrokeStyle(style) && isSymbolStyle(style) &&
- (checkSymbolsError(this.props.symbolErrors) ||
- checkSymbolsError(this.props.symbolErrors, "loading_symbol" + style.shape))
- ? null : isStrokeStyle(style) ? ; - - const sections = [markerType, preview, symbolLayout, markerGlyph, text, fill, stroke]; - - return (
{styles.map((style, i) => this.renderPanelStyle(
- {...style, id: style.id || uuidv1()},
- {
- expanded: this.state.expanded[i],
- locked: this.state.locked[i],
- onSwitch: () => {
- this.setState(() => {
- const expanded = this.state.expanded.map((e, k) => i === k ? !this.state.expanded[i] : this.state.expanded[k]);
- return {expanded};
- });
- let newStyles = styles.map((s, k) => k === i ? {...s, "filtering": !this.state.expanded[i]} : s);
- this.props.onChangeStyle(newStyles);
- },
- title: style.title || getStylerTitle(style) + " Style"},
- i))}
);
- }
- change = (id, values) => {
- const styles = castArray(this.props.style);
- let styleChanged = {...find(styles, { 'id': id }), ...values};
-
- if (isSymbolStyle(styleChanged)) {
- if (!fetchStyle(hashAndStringify(styleChanged))) {
- createSvgUrl(styleChanged, styleChanged.symbolUrl)
- .then(symbolUrlCustomized => {
- this.updateStyles(id, {...styleChanged, symbolUrlCustomized}, styles, true);
- });
- } else {
- this.updateStyles(id, fetchStyle(hashAndStringify(styleChanged)), styles, true);
- }
- } else {
- this.updateStyles(id, styleChanged, styles, true);
- }
- }
- updateStyles = (id, style, styles, register = true) => {
- if (register) {
- registerStyle(hashAndStringify(style), style);
- }
- let newStyles = arrayUpdate(false, style, { 'id': id }, styles );
- this.props.onChangeStyle(newStyles);
- }
- changeSymbolType = (id, pointType) => {
- this.updateStylesAndType(id, pointType, this.props.defaultStyles.POINT?.[pointType]);
- }
-
- updateStylesAndType = (id, pointType, pointStyle) => {
- const styles = castArray(this.props.style);
- const styleChangedIndex = findIndex(styles, { 'id': id});
- if (styleChangedIndex !== -1) {
- let newStyles = styles.map((s, k) => k === styleChangedIndex ? {...pointStyle, id: s.id, title: s.title, geometry: s.geometry, filtering: s.filtering} : s);
- this.props.onChangeStyle(newStyles);
- }
- }
- checkSymbolUrl = ({style, symbolErrors, onLoadingError = this.props.onSetErrorSymbol}) => {
- axios.get(style.symbolUrl)
- .then(() => {
- if (!checkSymbolsError(this.props.symbolErrors, "loading_symbol" + style.shape )) {
- const errors = filter(symbolErrors, s => s !== "loading_symbol" + style.shape);
- onLoadingError(errors);
- }
- })
- .catch(() => {
- if (!checkSymbolsError(this.props.symbolErrors, "loading_symbol" + style.shape )) {
- onLoadingError(symbolErrors.concat(["loading_symbol" + style.shape]));
- }
- });
- }
-}
-
-export default Manager;
diff --git a/web/client/components/style/vector/Stroke.jsx b/web/client/components/style/vector/Stroke.jsx
deleted file mode 100644
index dab70b50ab..0000000000
--- a/web/client/components/style/vector/Stroke.jsx
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import { Row, Col } from 'react-bootstrap';
-import { isNil, isEqual } from 'lodash';
-import tinycolor from 'tinycolor2';
-import Slider from 'react-nouislider';
-
-// number localizer?
-import numberLocalizer from 'react-widgets/lib/localizers/simple-number';
-
-// not sure this is needed, TODO check!
-numberLocalizer();
-import Message from '../../I18N/Message';
-import OpacitySlider from '../../../plugins/TOC/components/OpacitySlider';
-import ColorSelector from '../ColorSelector';
-import DashArray from './DashArray';
-import { addOpacityToColor } from '../../../utils/VectorStyleUtils';
-
-/**
- * Styler for the stroke properties of a vector style
-*/
-class Stroke extends React.Component {
- static propTypes = {
- style: PropTypes.object,
- defaultColor: PropTypes.string,
- lineDashOptions: PropTypes.array,
- onChange: PropTypes.func,
- width: PropTypes.number,
- constraints: PropTypes.object
- };
-
- static defaultProps = {
- style: {},
- constraints: {
- maxWidth: 15,
- minWidth: 1
- },
- onChange: () => {}
- };
-
- shouldComponentUpdate(nextProps) {
- return !isEqual(this.props.style, nextProps.style)
- || !isEqual(this.props.lineDashOptions, nextProps.lineDashOptions);
- }
- render() {
- const {style} = this.props;
- return (
-
-
-
- {
- this.props.onChange(style.id, {dashArray});
- }}
- />
-
-
-
- {
- if (!isNil(c)) {
- const color = tinycolor(c).toHexString();
- const opacity = c.a;
- this.props.onChange(style.id, {color, opacity});
- }
- }}/>
-
-
-
- {
- this.props.onChange(style.id, {opacity});
- }}/>
-
-
-
-
-
);
- }
-}
-
-export default Stroke;
diff --git a/web/client/components/style/vector/Text.jsx b/web/client/components/style/vector/Text.jsx
deleted file mode 100644
index d131df60d6..0000000000
--- a/web/client/components/style/vector/Text.jsx
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import { Combobox } from 'react-widgets';
-import Slider from 'react-nouislider';
-import IntlNumberFormControl from '../../I18N/IntlNumberFormControl';
-import numberLocalizer from 'react-widgets/lib/localizers/simple-number';
-// not sure this is needed, TODO check!
-numberLocalizer();
-
-import Message from '../../I18N/Message';
-import { getMessageById } from '../../../utils/LocaleUtils';
-import { createFont } from '../../../utils/LegacyAnnotationsUtils';
-
-/**
- * Styler for the stroke properties of a vector style
-*/
-class Text extends React.Component {
- static propTypes = {
- style: PropTypes.object,
- onChange: PropTypes.func,
- addOpacityToColor: PropTypes.func,
- width: PropTypes.number,
- uomValues: PropTypes.array,
- alignValues: PropTypes.array,
- fontStyleValues: PropTypes.array,
- fontWeightValues: PropTypes.array,
- fontFamilyValues: PropTypes.array,
- shapeStyle: PropTypes.object,
- rotationStep: PropTypes.number
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- style: {},
- onChange: () => {},
- uomValues: [{value: "px"}, {value: "em"}],
- fontWeightValues: [{value: "normal"}, {value: "bold"}],
- alignValues: [{value: "start", label: "left"}, {value: "center", label: "center"}, {value: "end", label: "right"}],
- fontStyleValues: [{value: "normal"}, {value: "italic"}],
- fontFamilyValues: [{value: "Arial"}, {value: "Helvetica"}, {value: "sans-serif"}, {value: "Courier"}],
- shapeStyle: {},
- rotationStep: 5
- };
-
- state = {
- fontFamily: "Arial"
- };
-
- render() {
- const messages = {
- emptyList: getMessageById(this.context.messages, "queryform.attributefilter.autocomplete.emptyList"),
- open: getMessageById(this.context.messages, "queryform.attributefilter.autocomplete.open"),
- emptyFilter: getMessageById(this.context.messages, "queryform.attributefilter.autocomplete.emptyFilter")
- };
- const {style} = this.props;
- return (
- Math.round(value),
- to: value => Math.round(value) + ' px'
- }}
- range={{
- min: isNil(this.props.constraints && this.props.constraints.minWidth) ? 1 : this.props.constraints.maxWidth,
- max: this.props.constraints && this.props.constraints.maxWidth || 15
- }}
- onChange={(values) => {
- const weight = parseInt(values[0].replace(' px', ''), 10);
- this.props.onChange(style.id, {weight});
- }}
- />
-
-
-
-
);
- }
-}
-
-export default Text;
diff --git a/web/client/components/style/vector/marker/MarkerGlyph.jsx b/web/client/components/style/vector/marker/MarkerGlyph.jsx
deleted file mode 100644
index ba268bfc45..0000000000
--- a/web/client/components/style/vector/marker/MarkerGlyph.jsx
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import Filter from '../../../misc/Filter';
-import MarkerPropertyPicker from '../../MarkerPropertyPicker';
-import Message from '../../../I18N/Message';
-
-/**
- * Styler for the glyph, color and shape
-*/
-class MarkerGlyph extends React.Component {
- static propTypes = {
- style: PropTypes.object,
- markersOptions: PropTypes.object,
- onChange: PropTypes.func,
- width: PropTypes.number
- };
-
- static defaultProps = {
- style: {},
- onChange: () => {}
- };
-
- // eslint-disable-next-line no-unused-vars
- renderMarkers = (markers, prefix = '') => {
- return markers.map((marker) => {
- if (marker.markers) {
- return this.renderMarkers(marker.markers, marker.name + '-');
- }
- return (
-
-
-
-
-
-
-
- {
- let fontFamily = e.value ? e.value : e;
- if (fontFamily === "") {
- fontFamily = "Arial";
- }
- this.setState({fontFamily});
- const font = createFont({...style, fontFamily});
- this.props.onChange(style.id, {fontFamily, font});
- }}
- />
-
-
-
-
-
-
- {
- let fontSizeUom = e.value ? e.value : e;
- if (this.props.uomValues.map(f => f.value).indexOf(fontSizeUom) === -1) {
- fontSizeUom = "px";
- }
- const font = createFont({...style, fontSizeUom});
- this.props.onChange(style.id, {fontSizeUom, font});
- }}
- />
-
-
- {
- const fontSize = val || 14;
- const font = createFont({...style, fontSize});
- this.props.onChange(style.id, {fontSize, font});
- }}
- type="number"/>
-
-
-
-
-
-
- {
- let fontStyle = e.value ? e.value : e;
- if (this.props.fontStyleValues.map(f => f.value).indexOf(fontStyle) === -1) {
- fontStyle = style.fontStyle;
- }
- const font = createFont({...style, fontStyle});
- this.props.onChange(style.id, {fontStyle, font});
- }}
- />
-
-
-
-
-
-
- {
- let fontWeight = e.value ? e.value : e;
- if (this.props.fontWeightValues.map(f => f.value).indexOf(fontWeight) === -1) {
- fontWeight = style.fontWeight;
- }
- const font = createFont({...style, fontWeight});
- this.props.onChange(style.id, {fontWeight, font});
- }}
- />
-
-
-
-
-
-
-
-
-
-
- {
- let textAlign = e.value ? e.value : e;
- if (this.props.alignValues.map(f => f.value).indexOf(textAlign) === -1) {
- textAlign = "center";
- }
- this.props.onChange(style.id, {textAlign});
- }}
- />
-
-
-
-
-
-
-
-
- Math.round(parseFloat(value)),
- to: value => Math.round(value) + ' °'
- }}
- range={{
- min: 0,
- max: 359
- }}
- onChange={(values) => {
- const rotationDeg = parseInt(values[0].replace(' °', ''), 10);
- this.props.onChange(style.id, {textRotationDeg: rotationDeg});
- }}
- />
-
- this.selectStyle(marker)}
- className={this.isCurrentStyle(marker) ? 'ms-marker-selected' : ''}
- style={{
- ...marker.thumbnailStyle
- }}
- />);
- });
- };
-
- render() {
- const selectedMarker = this.props.markersOptions.markers.reduce((acc, { markers }) => [...acc, ...markers], []).find((marker) => this.isCurrentStyle(marker)) || {};
- return (
-
- );
- }
-
- isCurrentStyle = (m) => {
- // TODO change this
- return this.props.markersOptions.markersConfig.matches(this.props.style, m.style);
- }
-
- selectStyle = (marker) => {
- return this.props.onChange(this.props.style.id, {...this.props.markersOptions.markersConfig.getStyle(marker.style)});
- };
-
- filterMarkerGlyph = (marker) =>{
- return marker && marker.toLowerCase().indexOf(this.props.markersOptions?.filter?.toLowerCase() || '') !== -1;
- };
-}
-
-export default MarkerGlyph;
diff --git a/web/client/components/style/vector/marker/MarkerType.jsx b/web/client/components/style/vector/marker/MarkerType.jsx
deleted file mode 100644
index 0e2591ab94..0000000000
--- a/web/client/components/style/vector/marker/MarkerType.jsx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import { Row, Col } from 'react-bootstrap';
-import Select from 'react-select';
-import Message from '../../../I18N/Message';
-
-/**
- * Styler for the gliph, color and shape
-*/
-class MarkerType extends React.Component {
- static propTypes = {
- style: PropTypes.object,
- pointType: PropTypes.string,
- options: PropTypes.array,
- onChangeType: PropTypes.func,
- width: PropTypes.number
- };
-
- static defaultProps = {
- style: {},
- options: [{
- label: 'Marker',
- value: 'marker'
- }, {
- label: 'Symbol',
- value: 'symbol'
- }],
- pointType: "marker",
- onChangeType: () => {}
- };
-
- render() {
- return (
-
-
-
-
-
-
-
-
-
-
-
- }>
-
-
-
-
-
-
-
- {this.props.markersOptions.glyphs.map(glyph => {
- if (this.filterMarkerGlyph(glyph)) {
- return (
-
- {
- this.props.onChange(this.props.style.id, {iconGlyph: glyph});
- }}>
-
-
- );
- }
- return null;
- })}
-
-
-
-
-
-
-
- {this.renderMarkers(this.props.markersOptions.markers)}
-
-
-
-
-
-
- );
- }
-
-}
-
-export default MarkerType;
diff --git a/web/client/components/style/vector/marker/SymbolLayout.jsx b/web/client/components/style/vector/marker/SymbolLayout.jsx
deleted file mode 100644
index dae6018bea..0000000000
--- a/web/client/components/style/vector/marker/SymbolLayout.jsx
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2018, GeoSolutions Sas.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import PropTypes from 'prop-types';
-
-import React from 'react';
-import Select from 'react-select';
-import { Row, Col, InputGroup, Glyphicon, Alert } from 'react-bootstrap';
-import { isArray, find, filter, isEqual } from 'lodash';
-import axios from 'axios';
-import Slider from '../../../misc/Slider';
-import Message from '../../../I18N/Message';
-import { DEFAULT_SHAPE, DEFAULT_PATH, checkSymbolsError } from '../../../../utils/LegacyAnnotationsUtils';
-import { randomInt } from '../../../../utils/RandomUtils';
-
-/**
- * Styler for the layout of the symbol
-*/
-class SymbolLayout extends React.Component {
- static propTypes = {
- style: PropTypes.object,
- options: PropTypes.array,
- defaultShape: PropTypes.string,
- defaultShapeSize: PropTypes.number,
- onChange: PropTypes.func,
- onUpdateOptions: PropTypes.func,
- onLoadingError: PropTypes.func,
- symbolErrors: PropTypes.array,
- width: PropTypes.number,
- symbolsPath: PropTypes.string
- };
-
- static contextTypes = {
- messages: PropTypes.object
- };
-
- static defaultProps = {
- symbolsPath: DEFAULT_PATH,
- style: {},
- defaultShape: DEFAULT_SHAPE,
- defaultShapeSize: 64,
- options: [],
- symbolErrors: [],
- onChange: () => {},
- onUpdateOptions: () => {}
- };
-
- UNSAFE_componentWillMount() {
- if (isArray(this.props.options) && this.props.options.length === 0) {
- const shapeDefault = this.props.options && this.props.options.length ? find(this.props.options, (s) => s.value === this.props.defaultShape) && this.props.defaultShape : DEFAULT_SHAPE;
- this.loadSymbolsList(shapeDefault);
- }
- // this.checkSymbolUrl(this.props);
- }
- UNSAFE_componentWillReceiveProps(newProps) {
- if (!isEqual(newProps.style, this.props.style)) {
- this.checkSymbolUrl(newProps);
- }
- if (!isEqual(newProps.symbolErrors, this.props.symbolErrors)) {
- const shapeDefault = this.props.options && this.props.options.length ? find(this.props.options, (s) => s.value === this.props.defaultShape) && this.props.defaultShape : DEFAULT_SHAPE;
- this.loadSymbolsList(shapeDefault);
- }
- }
- render() {
- // maybe we can use the original svg as the preview in the