Skip to content

Commit

Permalink
Fix geosolutions-it#4675 Remove ogc-schemas, w3c-schemas and jsonix d…
Browse files Browse the repository at this point in the history
…ependencies
  • Loading branch information
allyoucanmap committed Jul 4, 2024
1 parent b5fab79 commit 74c78b3
Show file tree
Hide file tree
Showing 14 changed files with 187 additions and 906 deletions.
1 change: 0 additions & 1 deletion build/buildConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ module.exports = (...args) => mapArgumentsToObject(args, ({
},
extensions: [".js", ".jsx"],
alias: assign({}, {
jsonix: '@boundlessgeo/jsonix',
// next libs are added because of this issue https://github.com/geosolutions-it/MapStore2/issues/4569
proj4: '@geosolutions/proj4',
"react-joyride": '@geosolutions/react-joyride'
Expand Down
1 change: 0 additions & 1 deletion build/testConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ module.exports = ({browsers = [ 'ChromeHeadless' ], files, path, testFile, singl
zlib: false
},
alias: assign({}, {
jsonix: '@boundlessgeo/jsonix',
// next libs are added because of this issue https://github.com/geosolutions-it/MapStore2/issues/4569
proj4: '@geosolutions/proj4',
"react-joyride": '@geosolutions/react-joyride'
Expand Down
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
"webpack-dev-server": "3.11.0"
},
"dependencies": {
"@boundlessgeo/jsonix": "2.4.3",
"@carnesen/redux-add-action-listener-enhancer": "0.0.1",
"@geosolutions/geostyler-geocss-parser": "1.0.0",
"@geosolutions/geostyler-sld-parser": "2.0.1-1",
Expand Down Expand Up @@ -228,7 +227,6 @@
"node-geo-distance": "1.2.0",
"object-assign": "4.1.1",
"object-fit-images": "3.2.4",
"ogc-schemas": "2.6.1",
"ol": "7.4.0",
"pdfmake": "0.2.7",
"pdfviewer": "0.3.2",
Expand Down Expand Up @@ -309,7 +307,6 @@
"util": "0.12.3",
"uuid": "3.0.1",
"vis": "4.21.0",
"w3c-schemas": "1.3.1",
"web-ifc": "0.0.50",
"webfontloader": "1.6.28",
"wellknown": "0.5.0",
Expand Down
395 changes: 185 additions & 210 deletions web/client/api/CSW.js

Large diffs are not rendered by default.

24 changes: 0 additions & 24 deletions web/client/api/WFS.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,30 +152,6 @@ export const getCapabilities = function(url) {
return json;
});
};
/**
* @deprecated
*/
export const describeFeatureTypeOGCSchemas = function(url, typeName) {
const parsed = urlUtil.parse(getDefaultUrl(url), true);
const describeLayerUrl = urlUtil.format(assign({}, parsed, {
query: assign({
service: "WFS",
version: "1.1.0",
typeName: typeName,
request: "DescribeFeatureType"
}, parsed.query)
}));
return new Promise((resolve) => {
require.ensure(['../utils/ogc/WFS'], () => {
const {unmarshaller} = require('../utils/ogc/WFS');
resolve(axios.get(describeLayerUrl).then((response) => {
let json = unmarshaller.unmarshalString(response.data);
return json && json.value;

}));
});
});
};

export const describeFeatureType = function(url, typeName) {
return axios.get(toDescribeURL(url, typeName)).then(({data}) => data);
Expand Down
2 changes: 1 addition & 1 deletion web/client/api/__tests__/CSW-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ describe('tests with mockedActions', () => {
expect(data.records).toExist();
expect(data.records.length).toBe(4);
done();
});
}).catch(done);
});
});
describe("getRecords for 3D layers", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
HelpBlock
} from "react-bootstrap";
import CodeMirror from '../../../../libs/codemirror/react-codemirror-suspense';
import template from "lodash/template";
import isEqual from "lodash/isEqual";
import { cswGetRecordsXml } from "../../../../api/CSW";
import OverlayTrigger from "../../../misc/OverlayTrigger";
Expand Down Expand Up @@ -88,7 +87,7 @@ export default ({

const cmProps = { code, setCode, error };
const isValid = value => {
const _filter = template(cswGetRecordsXml)({
const _filter = cswGetRecordsXml({
filterXml: value,
startPosition: 1,
maxRecords: 4,
Expand Down
89 changes: 0 additions & 89 deletions web/client/utils/__tests__/SLDUtils-test.js

This file was deleted.

128 changes: 0 additions & 128 deletions web/client/utils/ogc/CSW.js

This file was deleted.

Loading

0 comments on commit 74c78b3

Please sign in to comment.