Merge pull request #281 from oterral/master

Block the popup on click in inspect mode
This commit is contained in:
Orange Mug 2018-04-13 15:06:28 +01:00 committed by GitHub
commit 740a75f2e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

6
package-lock.json generated
View file

@ -7597,9 +7597,9 @@
} }
}, },
"mapbox-gl-inspect": { "mapbox-gl-inspect": {
"version": "1.3.0", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.0.tgz", "resolved": "https://registry.npmjs.org/mapbox-gl-inspect/-/mapbox-gl-inspect-1.3.1.tgz",
"integrity": "sha512-84qABwzuCenZz3oNF8vzqymE5dBoDhEkG5FUdPE2XFXaYabLo4lODRLReMYzeoNPn/4IJFUb9Qy3MN7lGG8CfA==", "integrity": "sha512-qkcT8lcYQy2x8wn+BUb6a6YXCEIHeGKHlt01/FSf58yYEmeufuihtbCjN9of2JDQm2XeRGdDEksAH7if7tPyyg==",
"requires": { "requires": {
"lodash.isequal": "4.5.0", "lodash.isequal": "4.5.0",
"randomcolor": "0.4.4" "randomcolor": "0.4.4"

View file

@ -34,7 +34,7 @@
"lodash.isequal": "^4.5.0", "lodash.isequal": "^4.5.0",
"lodash.throttle": "^4.1.1", "lodash.throttle": "^4.1.1",
"mapbox-gl": "^0.44.1", "mapbox-gl": "^0.44.1",
"mapbox-gl-inspect": "^1.3.0", "mapbox-gl-inspect": "^1.3.1",
"maputnik-design": "github:maputnik/design", "maputnik-design": "github:maputnik/design",
"mousetrap": "^1.6.1", "mousetrap": "^1.6.1",
"ol-mapbox-style": "^2.10.1", "ol-mapbox-style": "^2.10.1",

View file

@ -121,6 +121,7 @@ export default class MapboxGlMap extends React.Component {
showMapPopupOnHover: false, showMapPopupOnHover: false,
showInspectMapPopupOnHover: true, showInspectMapPopupOnHover: true,
showInspectButton: false, showInspectButton: false,
blockHoverPopupOnClick: true,
assignLayerColor: (layerId, alpha) => { assignLayerColor: (layerId, alpha) => {
return Color(colors.brightColor(layerId, alpha)).desaturate(0.5).string() return Color(colors.brightColor(layerId, alpha)).desaturate(0.5).string()
}, },