From 41d3956c4b329368d4e3272bac85d228352818d8 Mon Sep 17 00:00:00 2001 From: Andy Rothwell Date: Fri, 3 Mar 2023 09:20:40 -0500 Subject: [PATCH 1/3] upgrades to cyclomedia 23.2 --- .github/workflows/dev_push_to_s3.yml | 2 +- public/index.html | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev_push_to_s3.yml b/.github/workflows/dev_push_to_s3.yml index ef70c0c..c386fc3 100644 --- a/.github/workflows/dev_push_to_s3.yml +++ b/.github/workflows/dev_push_to_s3.yml @@ -6,7 +6,7 @@ name: dev Push to S3 on: push: branches: - - main + - cyclomedia-upgrade jobs: build: diff --git a/public/index.html b/public/index.html index 3dfef52..7299b98 100644 --- a/public/index.html +++ b/public/index.html @@ -85,11 +85,17 @@

OpenMaps - + + + + + + + From 3510e3efb8d5a3ade80ef7c1ee1aaebfdb219ec4 Mon Sep 17 00:00:00 2001 From: Andy Rothwell Date: Fri, 3 Mar 2023 11:09:36 -0500 Subject: [PATCH 2/3] uses layerboard commit that fixes cyclomedia circle clicks --- package-lock.json | 24 +++++++++++------------- package.json | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e81515..bc82091 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2570,9 +2570,9 @@ "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==" }, "@mapbox/mapbox-gl-draw": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.4.0.tgz", - "integrity": "sha512-eFhdmW44ZKJt+9iDc5TBP0+hc88VjTrp8Ui1cUjrwElziSk3IerSs0WdkQvdyy9YFn1HODL65zfau/QfMy3Bbw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.4.1.tgz", + "integrity": "sha512-g6F49KZagF9269/IoF6vZJeail6qtoc5mVF3eVRikNT7UFnY0QASfe2y53mgE99s6GrHdpV+PZuFxaL71hkMhg==", "requires": { "@mapbox/geojson-area": "^0.2.2", "@mapbox/geojson-extent": "^1.0.1", @@ -2642,13 +2642,12 @@ "dev": true }, "@phila/layerboard": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@phila/layerboard/-/layerboard-2.0.2.tgz", - "integrity": "sha512-KOGS5qJ6jwVIz4xo3RQuuz9NYUl4wV+3mZYu068seEnHIN1aLpH3xySIriXc9zCyPipg/ZsM6EnPnTXvIRKcmw==", + "version": "git+https://github.com/CityOfPhiladelphia/layerboard.git#0a907c1b6e54ca3784e7f16f3851d8ec5ef3b20e", + "from": "git+https://github.com/CityOfPhiladelphia/layerboard.git#0a907c1", "requires": { "@phila/vue-comps": "3.0.6", "@phila/vue-datafetch": "2.2.10", - "@phila/vue-mapping": "3.1.11", + "@phila/vue-mapping": "git+https://github.com/CityOfPhiladelphia/phila-vue-mapping.git#52bfb5c", "esri-leaflet": "2.3.1", "leaflet": "1.5.1", "vue": "^2.7.10", @@ -2710,9 +2709,8 @@ } }, "@phila/vue-mapping": { - "version": "3.1.11", - "resolved": "https://registry.npmjs.org/@phila/vue-mapping/-/vue-mapping-3.1.11.tgz", - "integrity": "sha512-OF/jeorbrtHAm5yIcduP8p8Ues63AGwT6JIuHudAIBNc3zgFUFcezEGEwZ+AlLuIsmsGw5zGUHgmu84rSNap/w==", + "version": "git+https://github.com/CityOfPhiladelphia/phila-vue-mapping.git#52bfb5cdf3e47bd519418d2b70b58ca5829b3116", + "from": "git+https://github.com/CityOfPhiladelphia/phila-vue-mapping.git#52bfb5c", "requires": { "@fortawesome/fontawesome-svg-core": "1.2.36", "@fortawesome/free-regular-svg-icons": "5.15.4", @@ -11416,9 +11414,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" } } }, diff --git a/package.json b/package.json index 401ad16..45b5e73 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "lintFix": "vue-cli-service lint --fix" }, "dependencies": { - "@phila/layerboard": "2.0.2", + "@phila/layerboard": "https://github.com/CityOfPhiladelphia/layerboard#0a907c1", "@sentry/browser": "5.7.1", "vue": "^2.7.10" }, From 39ec2c3d4e27339b835c6ec7147369fbbee050dd Mon Sep 17 00:00:00 2001 From: Andy Rothwell Date: Mon, 13 Mar 2023 13:52:13 -0400 Subject: [PATCH 3/3] uses layerboard 2.0.3 --- package-lock.json | 32 +++++++++++++++++--------------- package.json | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index bc82091..0b3172f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2642,12 +2642,13 @@ "dev": true }, "@phila/layerboard": { - "version": "git+https://github.com/CityOfPhiladelphia/layerboard.git#0a907c1b6e54ca3784e7f16f3851d8ec5ef3b20e", - "from": "git+https://github.com/CityOfPhiladelphia/layerboard.git#0a907c1", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@phila/layerboard/-/layerboard-2.0.3.tgz", + "integrity": "sha512-WwZqWFCuM5wR2tftgZkIb8B7eV53IFizhkQuvO1OhC2A6JK2TAxqhidWeb7tm0Tz0q7yYex0OOK0i/1FhULzew==", "requires": { "@phila/vue-comps": "3.0.6", - "@phila/vue-datafetch": "2.2.10", - "@phila/vue-mapping": "git+https://github.com/CityOfPhiladelphia/phila-vue-mapping.git#52bfb5c", + "@phila/vue-datafetch": "2.2.11", + "@phila/vue-mapping": "3.1.12", "esri-leaflet": "2.3.1", "leaflet": "1.5.1", "vue": "^2.7.10", @@ -2676,9 +2677,9 @@ } }, "@phila/vue-datafetch": { - "version": "2.2.10", - "resolved": "https://registry.npmjs.org/@phila/vue-datafetch/-/vue-datafetch-2.2.10.tgz", - "integrity": "sha512-9t0AVZncvUvA1Pr5fauIISBbUJr80vYHN93Pmxv1jStOCxPeD00vPLmS3k4MrreaDkagcdt7LfTCZU8awaC1kQ==", + "version": "2.2.11", + "resolved": "https://registry.npmjs.org/@phila/vue-datafetch/-/vue-datafetch-2.2.11.tgz", + "integrity": "sha512-HDmqpAVLUZBCMsafNwEUABmK//T0Csom2mDRA0b6/FbB/WRTJqoyeU4nOHOGu6uInI0X+dZ7+0LU2sITLGcHMw==", "requires": { "@turf/turf": "^5.1.6", "airtable": "^0.8.1", @@ -2709,8 +2710,9 @@ } }, "@phila/vue-mapping": { - "version": "git+https://github.com/CityOfPhiladelphia/phila-vue-mapping.git#52bfb5cdf3e47bd519418d2b70b58ca5829b3116", - "from": "git+https://github.com/CityOfPhiladelphia/phila-vue-mapping.git#52bfb5c", + "version": "3.1.12", + "resolved": "https://registry.npmjs.org/@phila/vue-mapping/-/vue-mapping-3.1.12.tgz", + "integrity": "sha512-7XHfsqBE29tpRckxRxR3Umy6NqDyFSEa/no5zz4rOdWE2f717hAgpkUtLfp0B8799BX0sE8B7dM0b2mqCXGyVw==", "requires": { "@fortawesome/fontawesome-svg-core": "1.2.36", "@fortawesome/free-regular-svg-icons": "5.15.4", @@ -10788,9 +10790,9 @@ "dev": true }, "jquery": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", - "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", + "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" }, "js-message": { "version": "1.0.7", @@ -13779,9 +13781,9 @@ "dev": true }, "proj4": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.8.1.tgz", - "integrity": "sha512-KK/bgM6oIwxdpeCaJ/JK3V1D8LMQCKKKzndab4/pYQNd+NVKTcddUNtds053Q110GxTALXVjx98L9f5q8xPVXQ==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.9.0.tgz", + "integrity": "sha512-BoDXEzCVnRJVZoOKA0QHTFtYoE8lUxtX1jST38DJ8U+v1ixY70Kpwi0Llu6YqSWEH2xqu4XMEBNGcgeRIEywoA==", "requires": { "mgrs": "1.0.0", "wkt-parser": "^1.3.1" diff --git a/package.json b/package.json index 45b5e73..2c0f865 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "lintFix": "vue-cli-service lint --fix" }, "dependencies": { - "@phila/layerboard": "https://github.com/CityOfPhiladelphia/layerboard#0a907c1", + "@phila/layerboard": "2.0.3", "@sentry/browser": "5.7.1", "vue": "^2.7.10" },