Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating to replace Proj4 by Proj4rs #4860

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion assets/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"jsts": "^2.11.0",
"lit-html": "^3.1.1",
"ol": "^10.2.1",
"proj4": "^2.11.0",
"proj4rs": "^0.1.6",
"shpjs": "^6.1.0",
"svg-sprite-loader": "^6.0.11",
"svgo": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion assets/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import executeJSFromServer from './modules/ExecuteJSFromServer.js';

import olDep from './dependencies/ol.js';
import litHTMLDep from './dependencies/lit-html.js';
import proj4 from 'proj4';
import {proj4} from 'proj4rs/proj4.js'

lizMap.ol = olDep;
lizMap.litHTML = litHTMLDep;
Expand Down
2 changes: 1 addition & 1 deletion assets/src/modules/Lizmap.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { Extent as olExtent, intersects as olExtentIntersects} from 'ol/extent.j
import { Projection as olProjection, transform as olTransform, transformExtent as olTransformExtent, get as getProjection, clearAllProjections, addCommon } from 'ol/proj.js';
import { register } from 'ol/proj/proj4.js';

import proj4 from 'proj4';
import {proj4} from 'proj4rs/proj4.js';
import ProxyEvents from './ProxyEvents.js';

/**
Expand Down
6 changes: 5 additions & 1 deletion assets/webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@ import common from './webpack.common.js';

export default merge(common, {
mode: 'development',
devtool: 'eval-source-map'
devtool: 'eval-source-map',
experiments: {
asyncWebAssembly: true,
syncWebAssembly: true
}
});
6 changes: 5 additions & 1 deletion assets/webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@ import common from './webpack.common.js';

export default merge(common, {
mode: 'production',
devtool: 'source-map'
devtool: 'source-map',
experiments: {
asyncWebAssembly: true,
syncWebAssembly: true
}
});
Loading