ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-07-30 17:57:26 +00:00
Code Issues Projects Releases Wiki Activity

Update to latest version, remove unwanted code

Browse Source
This commit is contained in:
HarelM
2024-03-13 16:59:41 +02:00
parent 180e470689
commit b9102148d0
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+4 -4
View File
@@ -11,7 +11,7 @@
"dependencies": { "dependencies": {
"@mapbox/mapbox-gl-rtl-text": "^0.2.3", "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
"@maplibre/maplibre-gl-geocoder": "^1.5.0", "@maplibre/maplibre-gl-geocoder": "^1.5.0",
"@maplibre/maplibre-gl-inspect": "^1.5.2", "@maplibre/maplibre-gl-inspect": "^1.6.0",
"@maplibre/maplibre-gl-style-spec": "^20.1.0", "@maplibre/maplibre-gl-style-spec": "^20.1.0",
"@mdi/js": "^6.6.96", "@mdi/js": "^6.6.96",
"@mdi/react": "^1.5.0", "@mdi/react": "^1.5.0",
@@ -2592,9 +2592,9 @@
} }
}, },
"node_modules/@maplibre/maplibre-gl-inspect": { "node_modules/@maplibre/maplibre-gl-inspect": {
"version": "1.5.2", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-inspect/-/maplibre-gl-inspect-1.5.2.tgz", "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-inspect/-/maplibre-gl-inspect-1.6.0.tgz",
"integrity": "sha512-rdWNXGMoMt4ttQm3BwmtAp6Djmr7T+fUgUVr28ccZP6u8X6HowI6TUv3FKlh8JoTKCcomglEoNK7pfJWVu2w3A==", "integrity": "sha512-RKxj/GIHQP7qz4ptuyqsAq7SI57wuougE75Sk1DO7drBKSKuayzjPwZSWzqYFceIEQOGR2kUCECnAjUqTkQtoA==",
"dependencies": { "dependencies": {
"lodash.isequal": "^4.5.0", "lodash.isequal": "^4.5.0",
"randomcolor": "^0.6.2" "randomcolor": "^0.6.2"
package.json
+1 -1
View File
@@ -22,7 +22,7 @@
"dependencies": { "dependencies": {
"@mapbox/mapbox-gl-rtl-text": "^0.2.3", "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
"@maplibre/maplibre-gl-geocoder": "^1.5.0", "@maplibre/maplibre-gl-geocoder": "^1.5.0",
"@maplibre/maplibre-gl-inspect": "^1.5.2", "@maplibre/maplibre-gl-inspect": "^1.6.0",
"@maplibre/maplibre-gl-style-spec": "^20.1.0", "@maplibre/maplibre-gl-style-spec": "^20.1.0",
"@mdi/js": "^6.6.96", "@mdi/js": "^6.6.96",
"@mdi/react": "^1.5.0", "@mdi/react": "^1.5.0",
src/components/MapMaplibreGl.tsx
+4 -16
View File
@@ -99,9 +99,7 @@ export default class MapMaplibreGl extends React.Component<MapMaplibreGlProps, M
if (!props.mapStyle.metadata) { if (!props.mapStyle.metadata) {
props.mapStyle.metadata = {}; props.mapStyle.metadata = {};
} }
(props.mapStyle.metadata as any)['maplibregl-inspect:inspect'] = false;
} }
console.log('setting style', props.mapStyle.metadata);
this.state.map.setStyle( this.state.map.setStyle(
this.props.replaceAccessTokens(props.mapStyle), this.props.replaceAccessTokens(props.mapStyle),
{diff: true} {diff: true}
@@ -124,23 +122,13 @@ export default class MapMaplibreGl extends React.Component<MapMaplibreGlProps, M
this.updateMapFromProps(this.props); this.updateMapFromProps(this.props);
if(this.state.inspect && this.props.inspectModeEnabled !== this.state.inspect._showInspectMap) { if(this.state.inspect && this.props.inspectModeEnabled !== this.state.inspect._showInspectMap) {
// HACK: Fix for <https://github.com/maplibre/maputnik/issues/576>, while we wait for a proper fix.
// eslint-disable-next-line
this.state.inspect._popupBlocked = false;
this.state.inspect.toggleInspector() this.state.inspect.toggleInspector()
} }
if (this.state.inspect && this.props.inspectModeEnabled) {
this.state.inspect!.setOriginalStyle(this.props.replaceAccessTokens(this.props.mapStyle));
this.state.inspect!.render();
}
if (map) { if (map) {
if (this.props.inspectModeEnabled) {
// HACK: We need to work out why we need to do this and what's causing
// this error. I'm assuming an issue with maplibre-gl update and
// mapbox-gl-inspect.
try {
//this.state.inspect.render();
} catch(err) {
console.error("FIXME: Caught error", err);
}
}
map.showTileBoundaries = this.props.options?.showTileBoundaries!; map.showTileBoundaries = this.props.options?.showTileBoundaries!;
map.showCollisionBoxes = this.props.options?.showCollisionBoxes!; map.showCollisionBoxes = this.props.options?.showCollisionBoxes!;
map.showOverdrawInspector = this.props.options?.showOverdrawInspector!; map.showOverdrawInspector = this.props.options?.showOverdrawInspector!;