Merge branch 'master' into LayersWindow

Author: eran-pinhas

src/components/ToolsScreen/ToolsScreen.js

@@ -4,11 +4,12 @@ import Select from "react-select";
 
 import { pyWpsUrl, version } from "../../config";
 import ProcessForm from "../ProcessForm/ProcessForm";
+import { wpsServerUrl, version } from "../../config";
+import ProcessForm from "../ProcessForm";
+import { GetInputGenerator, CreateClientInstance, GetOutputGenerator } from "../../utils/wpsjs";
 
 export default class ToolsScreen extends React.Component {
- constructor(props) {
- super(props);
-
+ constructor (props) {
  this.state = {
  processes: [],
  processInputs: []
@@ -22,11 +23,7 @@ export default class ToolsScreen extends React.Component {
  }
 
  componentDidMount() {
- this.wps = new window.WpsService({
- url: pyWpsUrl,
- version: version
- });
-
+ this.wps = CreateClientInstance(wpsServerUrl, version);
  this.wps.getCapabilities_GET(this.getCapabilitiesCallback);
  }
 

src/config.js

@@ -1,3 +1,3 @@
-export const pyWpsUrl = "http://geoprocessing.demo.52north.org:8080/wps/WebProcessingService";
+export const wpsServerUrl = "http://geoprocessing.demo.52north.org:8080/wps/WebProcessingService";
 
 export const version = "1.0.0";

src/utils/wpsjs.js

@@ -0,0 +1,22 @@
+if(!window.WpsService) {
+ console.error("wpsjs Failed to load")
+}
+
+let inputGenerator = null;
+let outputGenerator = null;
+
+export function CreateClientInstance(url, version) {
+ return new window.WpsService({ url, version });
+}
+ 
+export function GetInputGenerator(url, version) {
+ if(!inputGenerator)
+ inputGenerator = new window.InputGenerator();
+ return inputGenerator;
+ }
+ 
+export function GetOutputGenerator(url, version) {
+ if(!outputGenerator)
+ outputGenerator = new window.OutputGenerator();
+ return outputGenerator;
+}