Merge MapStore2 and QWC2Components trees

QWC2Components/actions/search.js → actions/search.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const CoordinatesUtils = require('../../MapStore2Components/utils/CoordinatesUtils');
+const CoordinatesUtils = require('../utils/CoordinatesUtils');
 const uuid = require('uuid');
 
 const SEARCH_CHANGE = 'SEARCH_CHANGE';

QWC2Components/actions/task.js → actions/task.js

@@ -9,8 +9,8 @@
 const SET_CURRENT_TASK = 'SET_CURRENT_TASK';
 const SET_CURRENT_TASK_BLOCKED = 'SET_CURRENT_TASK_BLOCKED';
 const {setIdentifyEnabled} = require('./identify');
-const CoordinatesUtils = require('../../MapStore2Components/utils/CoordinatesUtils');
-const MapUtils = require('../../MapStore2Components/utils/MapUtils');
+const CoordinatesUtils = require('../utils/CoordinatesUtils');
+const MapUtils = require('../utils/MapUtils');
 const {UrlParams} = require('../utils/PermaLinkUtils');
 
 function setCurrentTask(task, mode=null, allowIdentify=false) {

QWC2Components/actions/theme.js → actions/theme.js

@@ -8,9 +8,9 @@
 
 const assign = require('object-assign');
 const uuid = require('uuid');
-const ConfigUtils = require("../../MapStore2Components/utils/ConfigUtils");
-const CoordinatesUtils = require("../../MapStore2Components/utils/CoordinatesUtils");
-const MapUtils = require("../../MapStore2Components/utils/MapUtils");
+const ConfigUtils = require("../utils/ConfigUtils");
+const CoordinatesUtils = require("../utils/CoordinatesUtils");
+const MapUtils = require("../utils/MapUtils");
 const ThemeUtils = require("../utils/ThemeUtils");
 const LayerUtils = require("../utils/LayerUtils");
 const {LayerRole, addLayer, removeLayer, removeAllLayers, setSwipe} = require("./layers");

QWC2Components/components/AppMenu.jsx → components/AppMenu.jsx

@@ -10,7 +10,7 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
 const {Swipeable} = require('react-swipeable');
-const Message = require('../../MapStore2Components/components/I18N/Message');
+const Message = require('../components/I18N/Message');
 const {setCurrentTask, openExternalUrl} = require('../actions/task');
 const Icon = require('./Icon');
 require('./style/AppMenu.css');

QWC2Components/components/CoordinateDisplayer.jsx → components/CoordinateDisplayer.jsx

@@ -10,8 +10,8 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
 const proj4js = require('proj4').default;
-const CoordinatesUtils = require('../../MapStore2Components/utils/CoordinatesUtils');
-const LocaleUtils = require('../../MapStore2Components/utils/LocaleUtils');
+const CoordinatesUtils = require('../utils/CoordinatesUtils');
+const LocaleUtils = require('../utils/LocaleUtils');
 
 class CoordinateDisplayer extends React.Component {
     static propTypes = {

QWC2Components/components/Icon.jsx → components/Icon.jsx

@@ -8,9 +8,8 @@
 
 const React = require('react');
 const PropTypes = require('prop-types');
-const ConfigUtils = require('../../MapStore2Components/utils/ConfigUtils');
+const ConfigUtils = require('../utils/ConfigUtils');
 require('./style/Icon.css');
-require('../../../icons/build/qwc2-icons.css')
 
 class Icon extends React.Component {
     static propTypes = {

QWC2Components/components/IdentifyViewer.jsx → components/IdentifyViewer.jsx

@@ -12,8 +12,8 @@ const assign = require('object-assign');
 const isEmpty = require('lodash.isempty');
 const FileSaver = require('file-saver');
 const {stringify} = require('wellknown');
-const Message = require('../../MapStore2Components/components/I18N/Message');
-const ConfigUtils = require('../../MapStore2Components/utils/ConfigUtils');
+const Message = require('../components/I18N/Message');
+const ConfigUtils = require('../utils/ConfigUtils');
 const {LayerRole, addLayerFeatures, removeLayer} = require('../actions/layers');
 const {setActiveLayerInfo} = require('../actions/layerinfo');
 const IdentifyUtils = require('../utils/IdentifyUtils');

QWC2Components/components/ImportLayer.jsx → components/ImportLayer.jsx

@@ -14,9 +14,9 @@ const axios = require('axios');
 const assign = require('object-assign');
 const removeDiacritics = require('diacritics').remove;
 const Spinner = require('./Spinner');
-const Message = require('../../MapStore2Components/components/I18N/Message');
-const LocaleUtils = require('../../MapStore2Components/utils/LocaleUtils');
-const ProxyUtils = require('../../MapStore2Components/utils/ProxyUtils');
+const Message = require('../components/I18N/Message');
+const LocaleUtils = require('../utils/LocaleUtils');
+const ProxyUtils = require('../utils/ProxyUtils');
 const {LayerRole,addLayer,addLayerFeatures} = require('../actions/layers');
 const FileSelector = require('./widgets/FileSelector');
 const ServiceLayerUtils = require('../utils/ServiceLayerUtils');

QWC2Components/components/LayerInfoWindow.jsx → components/LayerInfoWindow.jsx

@@ -9,8 +9,8 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
-const Message = require('../../MapStore2Components/components/I18N/Message');
-const MapUtils = require('../../MapStore2Components/utils/MapUtils');
+const Message = require('../components/I18N/Message');
+const MapUtils = require('../utils/MapUtils');
 const {setActiveLayerInfo} = require('../actions/layerinfo');
 const ResizeableWindow = require("../components/ResizeableWindow");
 const MiscUtils = require('../utils/MiscUtils');

QWC2Components/components/PrintFrame.jsx → components/PrintFrame.jsx

@@ -10,8 +10,8 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const assign = require('object-assign');
 const isEqual = require('lodash.isequal');
-const CoordinatesUtils = require('../../MapStore2Components/utils/CoordinatesUtils');
-const MapUtils = require('../../MapStore2Components/utils/MapUtils');
+const CoordinatesUtils = require('../utils/CoordinatesUtils');
+const MapUtils = require('../utils/MapUtils');
 require('./style/PrintFrame.css');
 
 class PrintFrame extends React.Component {

QWC2Components/components/ResizeableWindow.jsx → components/ResizeableWindow.jsx

@@ -10,7 +10,7 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const {Rnd} = require('react-rnd');
-const Message = require('../../MapStore2Components/components/I18N/Message');
+const Message = require('../components/I18N/Message');
 const Icon = require('./Icon');
 require('./style/ResizeableWindow.css');
 

QWC2Components/components/Search.jsx → components/Search.jsx

@@ -18,12 +18,12 @@ const ol = require('openlayers');
 const Icon = require('./Icon');
 const Spinner = require('./Spinner');
 const {MessageBar} = require('./MessageBar');
-const Message = require('../../MapStore2Components/components/I18N/Message');
-const LocaleUtils = require('../../MapStore2Components/utils/LocaleUtils');
-const MapUtils = require('../../MapStore2Components/utils/MapUtils');
-const ConfigUtils = require('../../MapStore2Components/utils/ConfigUtils');
+const Message = require('../components/I18N/Message');
+const LocaleUtils = require('../utils/LocaleUtils');
+const MapUtils = require('../utils/MapUtils');
+const ConfigUtils = require('../utils/ConfigUtils');
 const LayerUtils = require('../utils/LayerUtils');
-const CoordinatesUtils = require('../../MapStore2Components/utils/CoordinatesUtils');
+const CoordinatesUtils = require('../utils/CoordinatesUtils');
 const {LayerRole, addMarker, removeMarker, addLayerFeatures, removeLayer, addLayer, addThemeSublayer, changeLayerProperties} = require('../actions/layers');
 const {zoomToPoint} = require('../actions/map');
 const {addSearchResults, changeSearch, startSearch, searchMore, SearchResultType} = require("../actions/search");

QWC2Components/components/ShareLink.jsx → components/ShareLink.jsx

@@ -9,7 +9,7 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const CopyToClipboard = require('react-copy-to-clipboard');
-const Message = require('../../MapStore2Components/components/I18N/Message');
+const Message = require('../components/I18N/Message');
 const CopyButton = require('./widgets/CopyButton');
 require('./style/ShareLink.css');
 

QWC2Components/components/SideBar.jsx → components/SideBar.jsx

@@ -10,7 +10,7 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
 const {Swipeable} = require('react-swipeable');
-const Message = require('../../MapStore2Components/components/I18N/Message');
+const Message = require('../components/I18N/Message');
 const {setCurrentTask} = require('../actions/task');
 const Icon = require('./Icon')
 require('./style/SideBar.css');

QWC2Components/components/StandardApp.jsx → components/StandardApp.jsx

@@ -22,22 +22,22 @@ const isEmpty = require('lodash.isempty');
 const Proj4js = require('proj4').default;
 const olProj4 = require('ol/proj/proj4');
 
-const Localized = require('../../MapStore2Components/components/I18N/Localized');
+const Localized = require('../components/I18N/Localized');
 const StandardStore = require('../stores/StandardStore')
 const PluginsContainer = require('./PluginsContainer');
 
-const {changeBrowserProperties} = require('../../MapStore2Components/actions/browser');
-const {loadLocale} = require('../../MapStore2Components/actions/locale');
-const {localConfigLoaded} = require('../../MapStore2Components/actions/localConfig');
+const {changeBrowserProperties} = require('../actions/browser');
+const {loadLocale} = require('../actions/locale');
+const {localConfigLoaded} = require('../actions/localConfig');
 const {restoreLayerState, replacePlaceholderLayer} = require('../actions/layers');
 const {changeSearch} = require('../actions/search');
 const {themesLoaded,setCurrentTheme} = require('../actions/theme');
 
-const ConfigUtils = require('../../MapStore2Components/utils/ConfigUtils');
-const CoordinatesUtils = require('../../MapStore2Components/utils/CoordinatesUtils');
-const LocaleUtils = require('../../MapStore2Components/utils/LocaleUtils');
-const MapUtils = require('../../MapStore2Components/utils/MapUtils');
-const PluginsUtils = require('../../MapStore2Components/utils/PluginsUtils');
+const ConfigUtils = require('../utils/ConfigUtils');
+const CoordinatesUtils = require('../utils/CoordinatesUtils');
+const LocaleUtils = require('../utils/LocaleUtils');
+const MapUtils = require('../utils/MapUtils');
+const PluginsUtils = require('../utils/PluginsUtils');
 const ServiceLayerUtils = require('../utils/ServiceLayerUtils');
 const LayerUtils = require('../utils/LayerUtils');
 const {UrlParams, resolvePermaLink} = require('../utils/PermaLinkUtils');

QWC2Components/components/Toolbar.jsx → components/Toolbar.jsx

@@ -9,8 +9,8 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
-const Message = require('../../MapStore2Components/components/I18N/Message');
-const LocaleUtils = require("../../MapStore2Components/utils/LocaleUtils");
+const Message = require('../components/I18N/Message');
+const LocaleUtils = require("../utils/LocaleUtils");
 const {setCurrentTask, openExternalUrl} = require('../actions/task')
 const Icon = require('./Icon');
 require('./style/Toolbar.css');

MapStore2Components/components/map/openlayers/Map.jsx → components/map/openlayers/Map.jsx

@@ -5,16 +5,15 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var ol = require('openlayers');
-var React = require('react');
+const ol = require('openlayers');
+const React = require('react');
 const PropTypes = require('prop-types');
-var assign = require('object-assign');
-
-var CoordinatesUtils = require('../../../utils/CoordinatesUtils');
-var mapUtils = require('../../../utils/MapUtils');
-
+const assign = require('object-assign');
 const isEmpty = require('lodash.isempty');
 
+const CoordinatesUtils = require('../../../utils/CoordinatesUtils');
+const mapUtils = require('../../../utils/MapUtils');
+
 class OpenlayersMap extends React.Component {
     static propTypes = {
         id: PropTypes.string,

MapStore2Components/components/map/openlayers/plugins/BingLayer.js → components/map/openlayers/plugins/BingLayer.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var ol = require('openlayers');
+const ol = require('openlayers');
 
 const checkLoaded = (layer, options) => {
     if (layer.getSource && layer.getSource().getState() === 'error') {

MapStore2Components/components/map/openlayers/plugins/GoogleLayer.js → components/map/openlayers/plugins/GoogleLayer.js

@@ -6,8 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const React = require('react');
-var ol = require('openlayers');
+const ol = require('openlayers');
 
 var layersMap;
 var rendererItem;

MapStore2Components/components/map/openlayers/plugins/OSMLayer.js → components/map/openlayers/plugins/OSMLayer.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var ol = require('openlayers');
+const ol = require('openlayers');
 
 let OSMLayer = {
     create: (options) => {

MapStore2Components/components/map/openlayers/plugins/TileProviderLayer.js → components/map/openlayers/plugins/TileProviderLayer.js

@@ -5,10 +5,10 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var assign = require('object-assign');
-var ol = require('openlayers');
-var TileProvider = require('../../../../utils/TileConfigProvider');
-var CoordinatesUtils = require('../../../../utils/CoordinatesUtils');
+const assign = require('object-assign');
+const ol = require('openlayers');
+const TileProvider = require('../../../../utils/TileConfigProvider');
+const CoordinatesUtils = require('../../../../utils/CoordinatesUtils');
 
 function template(str, data) {
     return str.replace(/(?!(\{?[zyx]?\}))\{*([\w_]+)*\}/g, function() {

MapStore2Components/components/map/openlayers/plugins/WFSLayer.js → components/map/openlayers/plugins/WFSLayer.js

@@ -6,8 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var ol = require('openlayers');
-var assign = require('object-assign');
+const ol = require('openlayers');
+const assign = require('object-assign');
 const ProxyUtils = require('../../../../utils/ProxyUtils');
 const CoordinatesUtils = require('../../../../utils/CoordinatesUtils');
 const FeatureStyles = require('../FeatureStyles');

MapStore2Components/components/map/openlayers/plugins/WMTSLayer.js → components/map/openlayers/plugins/WMTSLayer.js

@@ -6,8 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var ol = require('openlayers');
-var assign = require('object-assign');
+const ol = require('openlayers');
+const assign = require('object-assign');
 const CoordinatesUtils = require('../../../../utils/CoordinatesUtils');
 const SecurityUtils = require('../../../../utils/SecurityUtils');
 

QWC2Components/components/widgets/ButtonBar.jsx → components/widgets/ButtonBar.jsx

@@ -11,7 +11,7 @@ const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
 const classnames = require('classnames');
 const Icon = require('../Icon');
-const Message = require('../../../MapStore2Components/components/I18N/Message');
+const Message = require('../../components/I18N/Message');
 require('./style/ButtonBar.css');
 
 

QWC2Components/components/widgets/CopyButton.jsx → components/widgets/CopyButton.jsx

@@ -10,7 +10,7 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const CopyToClipboard = require('react-copy-to-clipboard');
 const Icon = require('../Icon');
-const Message = require('../../../MapStore2Components/components/I18N/Message');
+const Message = require('../../components/I18N/Message');
 require('./style/CopyButton.css');
 
 class CopyButton extends React.Component {

QWC2Components/components/widgets/FileSelector.jsx → components/widgets/FileSelector.jsx

@@ -9,7 +9,7 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const Icon = require('../Icon');
-const LocaleUtils = require('../../../MapStore2Components/utils/LocaleUtils');
+const LocaleUtils = require('../../utils/LocaleUtils');
 require('./style/FileSelector.css');
 
 class FileSelector extends React.Component {

QWC2Components/plugins/Authentication.jsx → plugins/Authentication.jsx

@@ -9,7 +9,7 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
-const ConfigUtils = require('../../MapStore2Components/utils/ConfigUtils');
+const ConfigUtils = require('../utils/ConfigUtils');
 
 class Authentication extends React.Component {
     static propTypes = {

QWC2Components/plugins/BackgroundSwitcher.jsx → plugins/BackgroundSwitcher.jsx

@@ -10,9 +10,9 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
 const classnames = require('classnames');
-const ConfigUtils = require("../../MapStore2Components/utils/ConfigUtils");
-const Message = require('../../MapStore2Components/components/I18N/Message');
-const LocaleUtils = require('../../MapStore2Components/utils/LocaleUtils');
+const ConfigUtils = require("../utils/ConfigUtils");
+const Message = require('../components/I18N/Message');
+const LocaleUtils = require('../utils/LocaleUtils');
 const {LayerRole, changeLayerProperties} = require('../actions/layers');
 const Icon = require('../components/Icon');
 require('./style/BackgroundSwitcher.css');

QWC2Components/plugins/BottomBar.jsx → plugins/BottomBar.jsx

@@ -11,10 +11,10 @@ const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
 const {createSelector} = require('reselect');
 const pickBy = require('lodash.pickby');
-const Message = require('../../MapStore2Components/components/I18N/Message');
-const CoordinatesUtils = require('../../MapStore2Components/utils/CoordinatesUtils');
-const MapUtils = require('../../MapStore2Components/utils/MapUtils');
-const LocaleUtils = require('../../MapStore2Components/utils/LocaleUtils');
+const Message = require('../components/I18N/Message');
+const CoordinatesUtils = require('../utils/CoordinatesUtils');
+const MapUtils = require('../utils/MapUtils');
+const LocaleUtils = require('../utils/LocaleUtils');
 const {changeMousePositionState} = require('../actions/mousePosition');
 const {changeZoomLevel} = require('../actions/map');
 const {CoordinateDisplayer} = require('../components/CoordinateDisplayer');

QWC2Components/plugins/DxfExport.jsx → plugins/DxfExport.jsx

@@ -10,9 +10,9 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
 const isEmpty = require('lodash.isempty');
-const Message = require('../../MapStore2Components/components/I18N/Message');
-const CoordinatesUtils = require('../../MapStore2Components/utils/CoordinatesUtils');
-const ProxyUtils = require("../../MapStore2Components/utils/ProxyUtils");
+const Message = require('../components/I18N/Message');
+const CoordinatesUtils = require('../utils/CoordinatesUtils');
+const ProxyUtils = require("../utils/ProxyUtils");
 const {LayerRole} = require('../actions/layers');
 const {setCurrentTask} = require('../actions/task');
 const {TaskBar} = require('../components/TaskBar');

QWC2Components/plugins/Editing.jsx → plugins/Editing.jsx

@@ -13,10 +13,10 @@ const isEmpty = require('lodash.isempty');
 const isEqual = require('lodash.isequal');
 const assign = require('object-assign');
 const NumericInput = require('react-numeric-input');
-const CoordinatesUtils = require('../../MapStore2Components/utils/CoordinatesUtils');
-const LocaleUtils = require("../../MapStore2Components/utils/LocaleUtils");
-const MapUtils = require("../../MapStore2Components/utils/MapUtils");
-const Message = require('../../MapStore2Components/components/I18N/Message');
+const CoordinatesUtils = require('../utils/CoordinatesUtils');
+const LocaleUtils = require("../utils/LocaleUtils");
+const MapUtils = require("../utils/MapUtils");
+const Message = require('../components/I18N/Message');
 const {changeEditingState} = require('../actions/editing');
 const {setCurrentTaskBlocked} = require('../actions/task');
 const {LayerRole, refreshLayer} = require('../actions/layers');

QWC2Components/plugins/HeightProfile.jsx → plugins/HeightProfile.jsx

@@ -14,8 +14,8 @@ const isEmpty = require('lodash.isempty');
 const Chartist = require('chartist');
 const ChartistComponent = require('react-chartist').default;
 const ChartistAxisTitle = require('chartist-plugin-axistitle');
-const ConfigUtils = require('../../MapStore2Components/utils/ConfigUtils');
-const LocaleUtils = require('../../MapStore2Components/utils/LocaleUtils');
+const ConfigUtils = require('../utils/ConfigUtils');
+const LocaleUtils = require('../utils/LocaleUtils');
 const {addMarker, removeMarker} = require('../actions/layers');
 
 require('./style/HeightProfile.css');

QWC2Components/plugins/Help.jsx → plugins/Help.jsx

@@ -9,7 +9,7 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const {connect} = require('react-redux');
-const Message = require('../../MapStore2Components/components/I18N/Message');
+const Message = require('../components/I18N/Message');
 const {SideBar} = require('../components/SideBar');
 
 class Help extends React.Component {