schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2024-12-29 08:00:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #523 from orangemug/feature/update-ol-plus-stability-fixes

Browse source 
Update openlayers + stability fixes
This commit is contained in:
pathmapper 2019-05-22 09:47:13 +02:00 committed by GitHub
commit 470277c253
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
package-lock.json generated
View file

@ -9739,19 +9739,48 @@
"dev": true "dev": true
}, },
"ol": { "ol": {
"version": "5.3.2", "version": "6.0.0-beta.8",
"resolved": "https://registry.npmjs.org/ol/-/ol-5.3.2.tgz", "resolved": "https://registry.npmjs.org/ol/-/ol-6.0.0-beta.8.tgz",
"integrity": "sha512-PfS8Fe1iy4YNJ7P+TvebKME+8gp5NBfQuIldAHfBCkc7agmTezscQrsJWggz5B6Sprm/M/4YBtbyQtw4pIC65w==", "integrity": "sha512-oxMAue70DIx/PrlisQvXTDFTx9WXau+LofShYC3oKDaxBEOjRLaYV4mRa6ldQ9ps/3E2ydQ+2MNwJyaMzktbCg==",
"requires": { "requires": {
"pbf": "3.1.0", "pbf": "3.2.0",
"pixelworks": "1.1.0", "pixelworks": "1.1.0",
"rbush": "2.0.2" "rbush": "2.0.2"
},
"dependencies": {
"ieee754": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
},
"pbf": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.0.tgz",
"integrity": "sha512-98Eh7rsJNJF/Im6XYMLaOW3cLnNyedlOd6hu3iWMD5I7FZGgpw8yN3vQBrmLbLodu7G784Irb9Qsv2yFrxSAGw==",
"requires": {
"ieee754": "^1.1.12",
"resolve-protobuf-schema": "^2.1.0"
}
},
"protocol-buffers-schema": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz",
"integrity": "sha512-Xdayp8sB/mU+sUV4G7ws8xtYMGdQnxbeIfLjyO9TZZRJdztBGhlmbI5x1qcY4TG5hBkIKGnc28i7nXxaugu88w=="
},
"resolve-protobuf-schema": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
"integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
"requires": {
"protocol-buffers-schema": "^3.3.1"
}
}
} }
}, },
"ol-mapbox-style": { "ol-mapbox-style": {
"version": "4.3.1", "version": "5.0.0-beta.2",
"resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-4.3.1.tgz", "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-5.0.0-beta.2.tgz",
"integrity": "sha512-b3p4lvmEAxyoid3WklQJVH0wfQgz8QU6E0c15Avbybt/3oL0LtZ76+TdHxq29GomFXWK3ywn+4PscPm4o+edRw==", "integrity": "sha512-xU960zy6VhKXSaur/5hLM0j6OgJd+EHFaMWbX3o6oU/fnJKBmxJFYg55Ry50p8+Hv5FkUd5zGK9u6n8ewahiPw==",
"requires": { "requires": {
"@mapbox/mapbox-gl-style-spec": "^13.6.0", "@mapbox/mapbox-gl-style-spec": "^13.6.0",
"mapbox-to-css-font": "^2.3.0", "mapbox-to-css-font": "^2.3.0",

4
package.json
View file

@ -37,8 +37,8 @@
"mapbox-gl": "^0.53.1", "mapbox-gl": "^0.53.1",
"mapbox-gl-inspect": "^1.3.1", "mapbox-gl-inspect": "^1.3.1",
"maputnik-design": "github:maputnik/design", "maputnik-design": "github:maputnik/design",
"ol": "^5.3.2", "ol": "^6.0.0-beta.8",
"ol-mapbox-style": "^4.3.0", "ol-mapbox-style": "^5.0.0-beta.2",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^16.5.2", "react": "^16.5.2",
"react-aria-menubutton": "^6.0.1", "react-aria-menubutton": "^6.0.1",

7
src/components/map/OpenLayersMap.jsx
View file

@ -1,4 +1,5 @@
import React from 'react' import React from 'react'
import {throttle} from 'lodash';
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { loadJSON } from '../../libs/urlopen' import { loadJSON } from '../../libs/urlopen'
@ -22,10 +23,14 @@ export default class OpenLayersMap extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.updateStyle = throttle(this._updateStyle.bind(this), 200);
} }
updateStyle(newMapStyle) { _updateStyle(newMapStyle) {
if(!this.map) return; if(!this.map) return;
// See <https://github.com/openlayers/ol-mapbox-style/issues/215#issuecomment-493198815>
this.map.getLayers().clear();
apply(this.map, newMapStyle); apply(this.map, newMapStyle);
} }