diff --git a/package.json b/package.json index 07c549e30..5f3536c7a 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "eslint": "^4.2.0", "eslint-config-mourner": "^2.0.1", "express": "^4.13.4", - "mapbox-gl": "0.40.0", + "mapbox-gl": "0.42.0", "mapbox-gl-js-mock": "^0.28.0", "mock-browser": "^0.92.10", "nyc": "^11.0.2", @@ -67,16 +67,16 @@ "unassertify": "^2.0.3" }, "peerDependencies": { - "mapbox-gl": ">=0.27.0 <=0.41.0" + "mapbox-gl": ">=0.42.0 <=0.42.2" }, "dependencies": { "@mapbox/geojson-area": "^0.2.1", + "@mapbox/geojson-extent": "^0.3.2", "@mapbox/geojson-normalize": "0.0.1", "@mapbox/geojsonhint": "^2.0.0", - "@mapbox/geojson-extent": "^0.3.2", + "@mapbox/point-geometry": "0.1.0", "hat": "0.0.3", "lodash.isequal": "^4.2.0", - "@mapbox/point-geometry": "0.1.0", "xtend": "^4.0.1" } } diff --git a/src/lib/theme.js b/src/lib/theme.js index 2788a5f38..72371923f 100644 --- a/src/lib/theme.js +++ b/src/lib/theme.js @@ -99,19 +99,6 @@ module.exports = [ 'line-width': 2 } }, - { - 'id': 'gl-draw-polygon-and-line-vertex-stroke-inactive', - 'type': 'circle', - 'filter': ['all', - ['==', 'meta', 'vertex'], - ['==', '$type', 'Point'], - ['!=', 'mode', 'static'] - ], - 'paint': { - 'circle-radius': 5, - 'circle-color': '#fff' - } - }, { 'id': 'gl-draw-polygon-and-line-vertex-inactive', 'type': 'circle', @@ -122,22 +109,9 @@ module.exports = [ ], 'paint': { 'circle-radius': 3, - 'circle-color': '#fbb03b' - } - }, - { - 'id': 'gl-draw-point-point-stroke-inactive', - 'type': 'circle', - 'filter': ['all', - ['==', 'active', 'false'], - ['==', '$type', 'Point'], - ['==', 'meta', 'feature'], - ['!=', 'mode', 'static'] - ], - 'paint': { - 'circle-radius': 5, - 'circle-opacity': 1, - 'circle-color': '#fff' + 'circle-color': '#fbb03b', + 'circle-stroke-width': 2, + 'circle-stroke-color': '#fff' } }, { @@ -151,20 +125,9 @@ module.exports = [ ], 'paint': { 'circle-radius': 3, - 'circle-color': '#3bb2d0' - } - }, - { - 'id': 'gl-draw-point-stroke-active', - 'type': 'circle', - 'filter': ['all', - ['==', '$type', 'Point'], - ['==', 'active', 'true'], - ['!=', 'meta', 'midpoint'] - ], - 'paint': { - 'circle-radius': 7, - 'circle-color': '#fff' + 'circle-color': '#3bb2d0', + 'circle-stroke-width': 2, + 'circle-stroke-color': '#fff' } }, { @@ -176,7 +139,9 @@ module.exports = [ ['==', 'active', 'true']], 'paint': { 'circle-radius': 5, - 'circle-color': '#fbb03b' + 'circle-color': '#fbb03b', + 'circle-stroke-width': 2, + 'circle-stroke-color': '#fff' } }, { diff --git a/yarn.lock b/yarn.lock index b5fb964fc..84be60d33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1892,6 +1892,12 @@ express@^4.13.4: utils-merge "1.0.0" vary "~1.1.0" +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + dependencies: + is-extendable "^0.1.0" + extend@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4" @@ -2221,6 +2227,15 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2: version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" +gray-matter@^3.0.8: + version "3.1.1" + resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-3.1.1.tgz#101f80d9e69eeca6765cdce437705b18f40876ac" + dependencies: + extend-shallow "^2.0.1" + js-yaml "^3.10.0" + kind-of "^5.0.2" + strip-bom-string "^1.0.0" + grid-index@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.0.0.tgz#ad2c5d54ce5b35437faff1d70a9aeb3d1d261110" @@ -2488,7 +2503,7 @@ is-equal-shallow@^0.1.3: dependencies: is-primitive "^2.0.0" -is-extendable@^0.1.1: +is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -2663,6 +2678,13 @@ js-tokens@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" +js-yaml@^3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + js-yaml@^3.8.4: version "3.9.0" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz#4ffbbf25c2ac963b8299dc74da7e3740de1c18ce" @@ -2787,6 +2809,10 @@ kind-of@^3.0.2: dependencies: is-buffer "^1.1.5" +kind-of@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + labeled-stream-splicer@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59" @@ -3009,9 +3035,9 @@ mapbox-gl-supported@^1.2.0: webworkify "^1.4.0" whoots-js "^2.0.0" -mapbox-gl@0.40.0: - version "0.40.0" - resolved "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.40.0.tgz#2419531a020ecd7f05232023a332f70c930d9732" +mapbox-gl@0.42.0: + version "0.42.0" + resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.42.0.tgz#accdd0abcb7a4142e3c55054ec3a0321bf09c173" dependencies: "@mapbox/gl-matrix" "^0.0.1" "@mapbox/point-geometry" "^0.1.0" @@ -3026,6 +3052,7 @@ mapbox-gl@0.40.0: earcut "^2.0.3" geojson-rewind "^0.2.0" geojson-vt "^2.4.0" + gray-matter "^3.0.8" grid-index "^1.0.0" jsonlint-lines-primitives "~1.6.0" lodash.isequal "^3.0.4" @@ -4330,6 +4357,10 @@ strip-ansi@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991" +strip-bom-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" + strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"