From 7e5a5ce077ea7d70c02e9937e069fde86eeac9ee Mon Sep 17 00:00:00 2001 From: pathmapper Date: Fri, 10 Jan 2020 14:06:17 +0100 Subject: [PATCH 1/7] Set map maxZoom to 24 --- src/components/map/MapboxGlMap.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/map/MapboxGlMap.jsx b/src/components/map/MapboxGlMap.jsx index 7047d6a..a0baebb 100644 --- a/src/components/map/MapboxGlMap.jsx +++ b/src/components/map/MapboxGlMap.jsx @@ -124,6 +124,7 @@ export default class MapboxGlMap extends React.Component { container: this.container, style: this.props.mapStyle, hash: true, + maxZoom: 24 } const map = new MapboxGl.Map(mapOpts); From 401c6971f4e6cd41530028efaa5f044a15ca3fdb Mon Sep 17 00:00:00 2001 From: pathmapper Date: Sat, 11 Jan 2020 09:38:20 +0100 Subject: [PATCH 2/7] Remove node v8 from circleci --- .circleci/config.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e27134..6450a6e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,11 +50,6 @@ templates: path: /tmp/artifacts destination: /artifacts jobs: - build-linux-node-v8: - docker: - - image: node:8 - working_directory: ~/repo-linux-node-v8 - steps: *build-steps build-linux-node-v10: docker: - image: node:10 @@ -71,14 +66,6 @@ jobs: - image: node:13 working_directory: ~/repo-linux-node-v13 steps: *build-steps - build-osx-node-v8: - macos: - xcode: "9.0" - dependencies: - override: - - brew install node@8 - working_directory: ~/repo-osx-node-v8 - steps: *build-steps build-osx-node-v10: macos: xcode: "9.0" @@ -108,11 +95,9 @@ workflows: version: 2 build: jobs: - - build-linux-node-v8 - build-linux-node-v10 - build-linux-node-v12 - build-linux-node-v13 - - build-osx-node-v8 - build-osx-node-v10 - build-osx-node-v12 - build-osx-node-v13 From b1c8a12e8896fff3b0f9e24a7b2cb9e124dca09b Mon Sep 17 00:00:00 2001 From: pathmapper Date: Sat, 11 Jan 2020 09:39:09 +0100 Subject: [PATCH 3/7] Remove node v8 from appveyor --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4bfc59e..c334d73 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,6 @@ image: Visual Studio 2015 environment: matrix: - - nodejs_version: "8" - nodejs_version: "10" - nodejs_version: "12" - nodejs_version: "13" From 6c5dc7e06b3d54846676ba6e3973fb2132b16eba Mon Sep 17 00:00:00 2001 From: pathmapper Date: Sat, 11 Jan 2020 10:26:07 +0100 Subject: [PATCH 4/7] Update appveyor to "Visual Studio 2019" --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4bfc59e..a0240b9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -image: Visual Studio 2015 +image: Visual Studio 2019 environment: matrix: - nodejs_version: "8" @@ -18,7 +18,7 @@ install: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform } - md public - - npm --vs2015 install --global windows-build-tools + - npm install --global windows-build-tools - npm install build_script: - npm run build From fea0798349580c200dac9827d24f2bc5c9811866 Mon Sep 17 00:00:00 2001 From: pathmapper Date: Tue, 14 Jan 2020 10:28:32 +0100 Subject: [PATCH 5/7] Update OMT styles for v3.11 --- src/config/styles.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/styles.json b/src/config/styles.json index a9e0ea1..ff0e407 100644 --- a/src/config/styles.json +++ b/src/config/styles.json @@ -8,31 +8,31 @@ { "id": "klokantech-basic", "title": "Klokantech Basic", - "url": "https://cdn.jsdelivr.net/gh/openmaptiles/klokantech-basic-gl-style@e142f83/style.json", + "url": "https://cdn.jsdelivr.net/gh/openmaptiles/klokantech-basic-gl-style@v1.9/style.json", "thumbnail": "https://maputnik.github.io/thumbnails/klokantech-basic.png" }, { "id": "dark-matter", "title": "Dark Matter", - "url": "https://cdn.jsdelivr.net/gh/openmaptiles/dark-matter-gl-style@1dcc1d3/style.json", + "url": "https://cdn.jsdelivr.net/gh/openmaptiles/dark-matter-gl-style@v1.8/style.json", "thumbnail": "https://maputnik.github.io/thumbnails/dark-matter.png" }, { "id": "positron", "title": "Positron", - "url": "https://cdn.jsdelivr.net/gh/openmaptiles/positron-gl-style@2877814/style.json", + "url": "https://cdn.jsdelivr.net/gh/openmaptiles/positron-gl-style@v1.8/style.json", "thumbnail": "https://maputnik.github.io/thumbnails/positron.png" }, { "id": "osm-bright", "title": "OSM Bright", - "url": "https://cdn.jsdelivr.net/gh/openmaptiles/osm-bright-gl-style@500e26e/style.json", + "url": "https://cdn.jsdelivr.net/gh/openmaptiles/osm-bright-gl-style@v1.9/style.json", "thumbnail": "https://maputnik.github.io/thumbnails/osm-bright.png" }, { "id": "toner-gl-style", "title": "Toner", - "url": "https://cdn.jsdelivr.net/gh/openmaptiles/toner-gl-style@bb49571/style.json", + "url": "https://cdn.jsdelivr.net/gh/openmaptiles/toner-gl-style@dcb6e64/style.json", "thumbnail": "https://maputnik.github.io/thumbnails/toner.png" }, { From 9cadda02364dad6ec1fb6a8fb721230a7e2acd5d Mon Sep 17 00:00:00 2001 From: orangemug Date: Sat, 18 Jan 2020 22:03:29 +0000 Subject: [PATCH 6/7] Update react-collapse which was needlessly updating and causing scroll position jump. --- package-lock.json | 9 +++------ package.json | 2 +- src/components/layers/JSONEditor.jsx | 11 ----------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0fc459b..223a485 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9070,12 +9070,9 @@ } }, "react-collapse": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-4.0.3.tgz", - "integrity": "sha512-OO4NhtEqFtz+1ma31J1B7+ezdRnzHCZiTGSSd/Pxoks9hxrZYhzFEddeYt05A/1477xTtdrwo7xEa2FLJyWGCQ==", - "requires": { - "prop-types": "^15.5.8" - } + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-5.0.1.tgz", + "integrity": "sha512-cN2tkxBWizhPQ2JHfe0aUSJtmMthKA17NZkTElpiQ2snQAAi1hssXZ2fv88rAPNNvG5ss4t0PbOZT0TIl9Lk3Q==" }, "react-color": { "version": "2.17.3", diff --git a/package.json b/package.json index c08f087..a8f02d0 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react-aria-modal": "^4.0.0", "react-autobind": "^1.0.6", "react-autocomplete": "^1.8.1", - "react-collapse": "^4.0.3", + "react-collapse": "^5.0.1", "react-color": "^2.17.3", "react-dom": "^16.10.2", "react-file-reader-input": "^2.0.0", diff --git a/src/components/layers/JSONEditor.jsx b/src/components/layers/JSONEditor.jsx index a8c0ce5..840e0ad 100644 --- a/src/components/layers/JSONEditor.jsx +++ b/src/components/layers/JSONEditor.jsx @@ -105,17 +105,6 @@ class JSONEditor extends React.Component { } render() { - const codeMirrorOptions = { - mode: {name: "javascript", json: true}, - tabSize: 2, - theme: 'maputnik', - viewportMargin: Infinity, - lineNumbers: true, - lint: true, - gutters: ["CodeMirror-lint-markers"], - scrollbarStyle: "null", - } - const style = {}; if (this.props.maxHeight) { style.maxHeight = this.props.maxHeight; From bd1204a7a51d2db47ef80f428a548c87714381cc Mon Sep 17 00:00:00 2001 From: orangemug Date: Sat, 18 Jan 2020 22:11:02 +0000 Subject: [PATCH 7/7] Added react-collapse transition, required for react-collapse@^5 --- src/styles/_react-collapse.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/_react-collapse.scss b/src/styles/_react-collapse.scss index 3ee0cae..ce8db33 100644 --- a/src/styles/_react-collapse.scss +++ b/src/styles/_react-collapse.scss @@ -7,3 +7,7 @@ flex: 1; } } + +.ReactCollapse--collapse { + transition: height 180ms; +}