diff --git a/REQUIREMENTS.md b/REQUIREMENTS.md index a2f720d..0fd9dd6 100644 --- a/REQUIREMENTS.md +++ b/REQUIREMENTS.md @@ -1,33 +1,33 @@ # Requirements ## Core -- [ ] An text box on the page that can be used to filter based on the name of a school. When the value of this text box changes, only schools that have the value as a substring of their name should be shown on the map and in the list. +- [X] An text box on the page that can be used to filter based on the name of a school. When the value of this text box changes, only schools that have the value as a substring of their name should be shown on the map and in the list. **The `input` element should be available on the global `window` object as a variable named `window.schoolNameFilter`.** -- [ ] A set of checkboxes that can be used to filter based on the grades (K-12) served at a school. When a box is checked, only schools that serve the corresponding grade should be shown on the map. (_You can alternatively choose to include filters for grade levels. If you do, only include options for Elementary, Middle, High, and Transition/Overage -- not, for example, `Elementary-Middle`_). +- [X] A set of checkboxes that can be used to filter based on the grades (K-12) served at a school. When a box is checked, only schools that serve the corresponding grade should be shown on the map. (_You can alternatively choose to include filters for grade levels. If you do, only include options for Elementary, Middle, High, and Transition/Overage -- not, for example, `Elementary-Middle`_). **An array of `input` elements should be available on the global `window` object as a variable named `window.schoolGradeFilters` (or `window.schoolLevelFilters` if using school levels instead of grades).** -- [ ] A marker should be present on the map for each school that meets the current filter criteria, and no markers should be present for schools that _do not_ meet the filter criteria. +- [X] A marker should be present on the map for each school that meets the current filter criteria, and no markers should be present for schools that _do not_ meet the filter criteria. **The Leaflet Map object that represents the map on the page should be available on the global `window` objects as a variable named `window.schoolMap`.** -- [ ] A list item should be present in the schools list for each school that meets the current filter criteria, and no list items should be present for schools that _do not_ meet the filter criteria. List items should contain at least: +- [X] A list item should be present in the schools list for each school that meets the current filter criteria, and no list items should be present for schools that _do not_ meet the filter criteria. List items should contain at least: - School name - Grades served - **The element represeting the list (i.e. the `ul` or `ol`) should be available on the global `window` object as a variable named `window.schoolList`.** + **The element representing the list (i.e. the `ul` or `ol`) should be available on the global `window` object as a variable named `window.schoolList`.** ## Stretch 1: Selecting Schools -- [ ] When you click on a school in the list or map, the school should be highlighted. The corresponding school in the map or list should also be highlighted. +- [X] When you click on a school in the list or map, the school should be highlighted. The corresponding school in the map or list should also be highlighted. -- [ ] When a school is highlighted, that school's catchment area should be shown on the map. If the school is not a neighborhood school (i.e., doesn't have a catchment), then the outline of the city should be shown. +- [X] When a school is highlighted, that school's catchment area should be shown on the map. If the school is not a neighborhood school (i.e., doesn't have a catchment), then the outline of the city should be shown. ## Stretch 2: Comparing Schools -- [ ] When a school is highlighted, it should be added to a table where multiple schools can be campared side-by-side. +- [X] When a school is highlighted, it should be added to a table where multiple schools can be campared side-by-side. ## Stretch 3: Sharing School Selections diff --git a/package-lock.json b/package-lock.json index d2ad9fb..725a4f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,10 @@ "name": "school-explorer", "version": "1.0.0", "license": "ISC", + "dependencies": { + "jest-puppeteer-preset": "^6.1.1", + "puppeteer": "^18.0.5" + }, "devDependencies": { "eslint": "^8.22.0", "http-server": "^14.1.1", @@ -34,7 +38,6 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", - "dev": true, "dependencies": { "@babel/highlight": "^7.18.6" }, @@ -238,7 +241,6 @@ "version": "7.19.1", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -270,7 +272,6 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", - "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.18.6", "chalk": "^2.0.0", @@ -284,7 +285,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "dependencies": { "color-convert": "^1.9.0" }, @@ -296,7 +296,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -310,7 +309,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "dependencies": { "color-name": "1.1.3" } @@ -318,14 +316,12 @@ "node_modules/@babel/highlight/node_modules/color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, "node_modules/@babel/highlight/node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, "engines": { "node": ">=0.8.0" } @@ -334,7 +330,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, "engines": { "node": ">=4" } @@ -343,7 +338,6 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "dependencies": { "has-flag": "^3.0.0" }, @@ -647,14 +641,12 @@ "node_modules/@hapi/hoek": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==", - "dev": true + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "node_modules/@hapi/topo": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", - "dev": true, "dependencies": { "@hapi/hoek": "^9.0.0" } @@ -1164,7 +1156,6 @@ "version": "4.1.4", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", - "dev": true, "dependencies": { "@hapi/hoek": "^9.0.0" } @@ -1172,14 +1163,12 @@ "node_modules/@sideway/formula": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz", - "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==", - "dev": true + "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==" }, "node_modules/@sideway/pinpoint": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", - "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==", - "dev": true + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@sinclair/typebox": { "version": "0.24.46", @@ -1191,7 +1180,6 @@ "version": "1.8.3", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", - "dev": true, "dependencies": { "type-detect": "4.0.8" } @@ -1258,14 +1246,12 @@ "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==" }, "node_modules/@types/istanbul-lib-report": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, "dependencies": { "@types/istanbul-lib-coverage": "*" } @@ -1274,7 +1260,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, "dependencies": { "@types/istanbul-lib-report": "*" } @@ -1312,8 +1297,7 @@ "node_modules/@types/stack-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true + "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==" }, "node_modules/@types/yargs": { "version": "17.0.13", @@ -1327,16 +1311,13 @@ "node_modules/@types/yargs-parser": { "version": "21.0.0", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" }, "node_modules/@types/yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", - "dev": true, "optional": true, - "peer": true, "dependencies": { "@types/node": "*" } @@ -1366,8 +1347,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "peer": true, "dependencies": { "debug": "4" }, @@ -1422,7 +1401,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -1431,7 +1409,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -1465,7 +1442,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1510,7 +1486,6 @@ "version": "0.25.0", "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz", "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==", - "dev": true, "dependencies": { "follow-redirects": "^1.14.7" } @@ -1609,14 +1584,12 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, "funding": [ { "type": "github", @@ -1630,8 +1603,7 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "peer": true + ] }, "node_modules/basic-auth": { "version": "2.0.1", @@ -1649,8 +1621,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "peer": true, "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -1661,7 +1631,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1671,7 +1640,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -1720,7 +1688,6 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, "funding": [ { "type": "github", @@ -1735,7 +1702,6 @@ "url": "https://feross.org/support" } ], - "peer": true, "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -1745,8 +1711,6 @@ "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "dev": true, - "peer": true, "engines": { "node": "*" } @@ -1825,7 +1789,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1849,9 +1812,7 @@ "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true, - "peer": true + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, "node_modules/ci-info": { "version": "3.5.0", @@ -1883,7 +1844,6 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz", "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==", - "dev": true, "dependencies": { "for-own": "^0.1.3", "is-plain-object": "^2.0.1", @@ -1915,7 +1875,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -1926,8 +1885,7 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/colord": { "version": "2.9.3", @@ -1939,7 +1897,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "dev": true, "engines": { "node": ">= 6" } @@ -1947,8 +1904,7 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/convert-source-map": { "version": "1.9.0", @@ -1985,8 +1941,6 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", - "dev": true, - "peer": true, "dependencies": { "node-fetch": "2.6.7" } @@ -2030,7 +1984,6 @@ "version": "0.10.0", "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz", "integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==", - "dev": true, "dependencies": { "find-pkg": "^0.1.2", "fs-exists-sync": "^0.1.0" @@ -2043,7 +1996,6 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -2185,8 +2137,6 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "peer": true, "dependencies": { "once": "^1.4.0" } @@ -2430,7 +2380,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true, "engines": { "node": ">= 0.8.0" } @@ -2439,7 +2388,6 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", "integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==", - "dev": true, "dependencies": { "os-homedir": "^1.0.1" }, @@ -2466,15 +2414,12 @@ "node_modules/expect-puppeteer": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-6.1.1.tgz", - "integrity": "sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw==", - "dev": true + "integrity": "sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw==" }, "node_modules/extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "peer": true, "dependencies": { "debug": "^4.1.1", "get-stream": "^5.1.0", @@ -2494,8 +2439,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "peer": true, "dependencies": { "pump": "^3.0.0" }, @@ -2583,8 +2526,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "dev": true, - "peer": true, "dependencies": { "pend": "~1.2.0" } @@ -2605,7 +2546,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -2617,7 +2557,6 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz", "integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==", - "dev": true, "dependencies": { "fs-exists-sync": "^0.1.0", "resolve-dir": "^0.1.0" @@ -2630,7 +2569,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz", "integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==", - "dev": true, "dependencies": { "find-file-up": "^0.1.2" }, @@ -2642,7 +2580,6 @@ "version": "1.4.7", "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz", "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==", - "dev": true, "dependencies": { "chalk": "^4.0.0", "commander": "^5.1.0", @@ -2691,7 +2628,6 @@ "version": "1.15.2", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "dev": true, "funding": [ { "type": "individual", @@ -2711,7 +2647,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2720,7 +2655,6 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==", - "dev": true, "dependencies": { "for-in": "^1.0.1" }, @@ -2731,15 +2665,12 @@ "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true, - "peer": true + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "node_modules/fs-exists-sync": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz", "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2747,8 +2678,7 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { "version": "2.3.2", @@ -2827,7 +2757,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2859,7 +2788,6 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", "integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==", - "dev": true, "dependencies": { "global-prefix": "^0.1.4", "is-windows": "^0.2.0" @@ -2872,7 +2800,6 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", "integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==", - "dev": true, "dependencies": { "homedir-polyfill": "^1.0.0", "ini": "^1.3.4", @@ -2887,7 +2814,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -2939,8 +2865,7 @@ "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" }, "node_modules/grapheme-splitter": { "version": "1.0.4", @@ -2973,7 +2898,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -3003,7 +2927,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, "dependencies": { "parse-passwd": "^1.0.0" }, @@ -3098,8 +3021,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "peer": true, "dependencies": { "agent-base": "6", "debug": "4" @@ -3133,7 +3054,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, "funding": [ { "type": "github", @@ -3147,8 +3067,7 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "peer": true + ] }, "node_modules/ignore": { "version": "5.2.0", @@ -3225,7 +3144,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -3234,14 +3152,12 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "node_modules/is-arrayish": { "version": "0.2.1", @@ -3252,8 +3168,7 @@ "node_modules/is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "node_modules/is-core-module": { "version": "2.10.0", @@ -3271,7 +3186,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3319,7 +3233,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, "engines": { "node": ">=0.12.0" } @@ -3337,7 +3250,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, "dependencies": { "isobject": "^3.0.1" }, @@ -3361,7 +3273,6 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3369,14 +3280,12 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3599,7 +3508,6 @@ "version": "6.1.1", "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.1.1.tgz", "integrity": "sha512-z5LnaGDvlIkdMv/rppSO4+rq+GyQKf1xI9oiBxf9/2EBeN2hxRaWiMvaLNDnHPZj2PAhBXsycrKslDDoZO2Xtw==", - "dev": true, "dependencies": { "chalk": "^4.1.2", "cwd": "^0.10.0", @@ -3674,7 +3582,6 @@ "version": "6.1.1", "resolved": "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-6.1.1.tgz", "integrity": "sha512-Ces37g8Gdj7QaVxszeoXlvmsZxcEJN9EPUdJt8fGMLA+6ARVFKyVmFgP9xVeGyjTvzsXdtIiJdeOKMLMeD8r2A==", - "dev": true, "dependencies": { "chalk": "^4.1.2", "cwd": "^0.10.0", @@ -3687,7 +3594,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz", "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==", - "dev": true, "dependencies": { "@jest/fake-timers": "^27.5.1", "@jest/types": "^27.5.1", @@ -3702,7 +3608,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz", "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==", - "dev": true, "dependencies": { "@jest/types": "^27.5.1", "@sinonjs/fake-timers": "^8.0.1", @@ -3719,7 +3624,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", - "dev": true, "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", @@ -3735,7 +3639,6 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz", "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==", - "dev": true, "dependencies": { "@sinonjs/commons": "^1.7.0" } @@ -3744,7 +3647,6 @@ "version": "16.0.4", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", - "dev": true, "dependencies": { "@types/yargs-parser": "*" } @@ -3753,7 +3655,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, "engines": { "node": ">=10" }, @@ -3765,7 +3666,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz", "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==", - "dev": true, "dependencies": { "@jest/environment": "^27.5.1", "@jest/fake-timers": "^27.5.1", @@ -3782,7 +3682,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", - "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", "@jest/types": "^27.5.1", @@ -3802,7 +3701,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz", "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==", - "dev": true, "dependencies": { "@jest/types": "^27.5.1", "@types/node": "*" @@ -3815,7 +3713,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", - "dev": true, "dependencies": { "@jest/types": "^27.5.1", "@types/node": "*", @@ -3832,7 +3729,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -3845,8 +3741,7 @@ "node_modules/jest-environment-puppeteer/node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, "node_modules/jest-get-type": { "version": "29.2.0", @@ -3974,6 +3869,18 @@ "puppeteer": ">= 1.5.0" } }, + "node_modules/jest-puppeteer-preset": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/jest-puppeteer-preset/-/jest-puppeteer-preset-6.1.1.tgz", + "integrity": "sha512-CIR5OJ/rIu3w0AoThMAMCOCLnBDgUUVCK9fBXjVHoAcun1IPiGlp5OOvvDSjsHZ7mDdbzpQU8EmI5dQC9dWi6g==", + "dependencies": { + "expect-puppeteer": "^6.1.1", + "jest-environment-puppeteer": "^6.1.1" + }, + "peerDependencies": { + "puppeteer": ">= 1.5.0" + } + }, "node_modules/jest-regex-util": { "version": "29.2.0", "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.2.0.tgz", @@ -4248,8 +4155,7 @@ "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { "version": "4.1.0", @@ -4309,7 +4215,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, "dependencies": { "is-buffer": "^1.1.5" }, @@ -4321,7 +4226,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true, "engines": { "node": ">=6" } @@ -4336,7 +4240,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4387,8 +4290,7 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash.merge": { "version": "4.6.2", @@ -4502,7 +4404,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz", "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==", - "dev": true, "dependencies": { "arr-union": "^3.1.0", "clone-deep": "^0.2.4", @@ -4531,7 +4432,6 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -4574,7 +4474,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -4618,7 +4517,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==", - "dev": true, "dependencies": { "for-in": "^0.1.3", "is-extendable": "^0.1.1" @@ -4631,7 +4529,6 @@ "version": "0.1.8", "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4651,15 +4548,12 @@ "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true, - "peer": true + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nanoid": { "version": "3.3.4", @@ -4683,8 +4577,6 @@ "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "peer": true, "dependencies": { "whatwg-url": "^5.0.0" }, @@ -4776,7 +4668,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -4826,7 +4717,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4904,7 +4794,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4922,7 +4811,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4954,9 +4842,7 @@ "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", - "dev": true, - "peer": true + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" }, "node_modules/picocolors": { "version": "1.0.0", @@ -4968,7 +4854,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, "engines": { "node": ">=8.6" }, @@ -5182,8 +5067,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "peer": true, "engines": { "node": ">=0.4.0" } @@ -5192,7 +5075,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, "dependencies": { "kleur": "^3.0.3", "sisteransi": "^1.0.5" @@ -5204,16 +5086,12 @@ "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true, - "peer": true + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "peer": true, "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -5234,7 +5112,6 @@ "integrity": "sha512-3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw==", "dev": true, "hasInstallScript": true, - "peer": true, "dependencies": { "https-proxy-agent": "5.0.1", "progress": "2.0.3", @@ -5450,8 +5327,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "peer": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -5552,7 +5427,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", "integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==", - "dev": true, "dependencies": { "expand-tilde": "^1.2.2", "global-modules": "^0.2.3" @@ -5593,7 +5467,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -5631,7 +5504,6 @@ "version": "7.5.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", - "dev": true, "dependencies": { "tslib": "^2.1.0" } @@ -5667,7 +5539,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==", - "dev": true, "dependencies": { "is-extendable": "^0.1.1", "kind-of": "^2.0.1", @@ -5682,7 +5553,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==", - "dev": true, "dependencies": { "is-buffer": "^1.0.2" }, @@ -5694,7 +5564,6 @@ "version": "0.2.7", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5737,20 +5606,17 @@ "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, "engines": { "node": ">=8" } @@ -5804,7 +5670,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.0.2.tgz", "integrity": "sha512-+YJtx0dvy2wt304MrHD//tASc84zinBUYU1jacPBzrjhZUd7RsDo25krxr4HUHAQzEQFuMAs4/p+yLYU5ciZ1w==", - "dev": true, "dependencies": { "exit": "^0.1.2", "signal-exit": "^3.0.6", @@ -5853,7 +5718,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", - "dev": true, "dependencies": { "escape-string-regexp": "^2.0.0" }, @@ -5865,7 +5729,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true, "engines": { "node": ">=8" } @@ -5874,8 +5737,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "peer": true, "dependencies": { "safe-buffer": "~5.2.0" } @@ -5884,7 +5745,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, "funding": [ { "type": "github", @@ -5898,8 +5758,7 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "peer": true + ] }, "node_modules/string-length": { "version": "4.0.2", @@ -6140,7 +5999,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -6221,8 +6079,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "dev": true, - "peer": true, "dependencies": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", @@ -6234,8 +6090,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "peer": true, "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -6270,9 +6124,7 @@ "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true, - "peer": true + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "node_modules/tmpl": { "version": "1.0.5", @@ -6293,7 +6145,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "dependencies": { "is-number": "^7.0.0" }, @@ -6304,15 +6155,12 @@ "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true, - "peer": true + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", - "dev": true, "bin": { "tree-kill": "cli.js" } @@ -6329,8 +6177,7 @@ "node_modules/tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "dev": true + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" }, "node_modules/type-check": { "version": "0.4.0", @@ -6348,7 +6195,6 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, "engines": { "node": ">=4" } @@ -6369,8 +6215,6 @@ "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", - "dev": true, - "peer": true, "dependencies": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -6432,8 +6276,7 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/v8-compile-cache": { "version": "2.3.0", @@ -6469,7 +6312,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz", "integrity": "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==", - "dev": true, "dependencies": { "axios": "^0.25.0", "joi": "^17.6.0", @@ -6496,9 +6338,7 @@ "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true, - "peer": true + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/whatwg-encoding": { "version": "2.0.0", @@ -6516,8 +6356,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "peer": true, "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -6567,8 +6405,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/write-file-atomic": { "version": "4.0.2", @@ -6669,8 +6506,6 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dev": true, - "peer": true, "dependencies": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" @@ -6704,7 +6539,6 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", - "dev": true, "requires": { "@babel/highlight": "^7.18.6" } @@ -6857,8 +6691,7 @@ "@babel/helper-validator-identifier": { "version": "7.19.1", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", - "dev": true + "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==" }, "@babel/helper-validator-option": { "version": "7.18.6", @@ -6881,7 +6714,6 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.18.6", "chalk": "^2.0.0", @@ -6892,7 +6724,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -6901,7 +6732,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -6912,7 +6742,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -6920,26 +6749,22 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==" }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "requires": { "has-flag": "^3.0.0" } @@ -7159,14 +6984,12 @@ "@hapi/hoek": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==", - "dev": true + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "@hapi/topo": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", - "dev": true, "requires": { "@hapi/hoek": "^9.0.0" } @@ -7565,7 +7388,6 @@ "version": "4.1.4", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", - "dev": true, "requires": { "@hapi/hoek": "^9.0.0" } @@ -7573,14 +7395,12 @@ "@sideway/formula": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz", - "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==", - "dev": true + "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==" }, "@sideway/pinpoint": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", - "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==", - "dev": true + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "@sinclair/typebox": { "version": "0.24.46", @@ -7592,7 +7412,6 @@ "version": "1.8.3", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", - "dev": true, "requires": { "type-detect": "4.0.8" } @@ -7659,14 +7478,12 @@ "@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", - "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", - "dev": true + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==" }, "@types/istanbul-lib-report": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, "requires": { "@types/istanbul-lib-coverage": "*" } @@ -7675,7 +7492,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, "requires": { "@types/istanbul-lib-report": "*" } @@ -7713,8 +7529,7 @@ "@types/stack-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", - "dev": true + "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==" }, "@types/yargs": { "version": "17.0.13", @@ -7728,16 +7543,13 @@ "@types/yargs-parser": { "version": "21.0.0", "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", - "dev": true + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" }, "@types/yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", - "dev": true, "optional": true, - "peer": true, "requires": { "@types/node": "*" } @@ -7759,8 +7571,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "peer": true, "requires": { "debug": "4" } @@ -7797,14 +7607,12 @@ "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -7828,8 +7636,7 @@ "arr-union": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", - "dev": true + "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==" }, "array-union": { "version": "2.1.0", @@ -7862,7 +7669,6 @@ "version": "0.25.0", "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz", "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==", - "dev": true, "requires": { "follow-redirects": "^1.14.7" } @@ -7940,15 +7746,12 @@ "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "peer": true + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "basic-auth": { "version": "2.0.1", @@ -7963,8 +7766,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "peer": true, "requires": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -7975,7 +7776,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7985,7 +7785,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -8015,8 +7814,6 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "peer": true, "requires": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -8025,9 +7822,7 @@ "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "dev": true, - "peer": true + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==" }, "buffer-from": { "version": "1.1.2", @@ -8078,7 +7873,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -8093,9 +7887,7 @@ "chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true, - "peer": true + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, "ci-info": { "version": "3.5.0", @@ -8124,7 +7916,6 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz", "integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==", - "dev": true, "requires": { "for-own": "^0.1.3", "is-plain-object": "^2.0.1", @@ -8149,7 +7940,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -8157,8 +7947,7 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "colord": { "version": "2.9.3", @@ -8169,14 +7958,12 @@ "commander": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "dev": true + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "convert-source-map": { "version": "1.9.0", @@ -8207,8 +7994,6 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", - "dev": true, - "peer": true, "requires": { "node-fetch": "2.6.7" } @@ -8240,7 +8025,6 @@ "version": "0.10.0", "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz", "integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==", - "dev": true, "requires": { "find-pkg": "^0.1.2", "fs-exists-sync": "^0.1.0" @@ -8250,7 +8034,6 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, "requires": { "ms": "2.1.2" } @@ -8356,8 +8139,6 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "peer": true, "requires": { "once": "^1.4.0" } @@ -8535,14 +8316,12 @@ "exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", - "dev": true + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==" }, "expand-tilde": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", "integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==", - "dev": true, "requires": { "os-homedir": "^1.0.1" } @@ -8563,15 +8342,12 @@ "expect-puppeteer": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-6.1.1.tgz", - "integrity": "sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw==", - "dev": true + "integrity": "sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw==" }, "extract-zip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "peer": true, "requires": { "@types/yauzl": "^2.9.1", "debug": "^4.1.1", @@ -8583,8 +8359,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "peer": true, "requires": { "pump": "^3.0.0" } @@ -8661,8 +8435,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "dev": true, - "peer": true, "requires": { "pend": "~1.2.0" } @@ -8680,7 +8452,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -8689,7 +8460,6 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz", "integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==", - "dev": true, "requires": { "fs-exists-sync": "^0.1.0", "resolve-dir": "^0.1.0" @@ -8699,7 +8469,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz", "integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==", - "dev": true, "requires": { "find-file-up": "^0.1.2" } @@ -8708,7 +8477,6 @@ "version": "1.4.7", "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz", "integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==", - "dev": true, "requires": { "chalk": "^4.0.0", "commander": "^5.1.0", @@ -8744,20 +8512,17 @@ "follow-redirects": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "dev": true + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "dev": true + "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==" }, "for-own": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==", - "dev": true, "requires": { "for-in": "^1.0.1" } @@ -8765,21 +8530,17 @@ "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true, - "peer": true + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "fs-exists-sync": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz", - "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==", - "dev": true + "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==" }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "fsevents": { "version": "2.3.2", @@ -8833,7 +8594,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -8856,7 +8616,6 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", "integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==", - "dev": true, "requires": { "global-prefix": "^0.1.4", "is-windows": "^0.2.0" @@ -8866,7 +8625,6 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", "integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==", - "dev": true, "requires": { "homedir-polyfill": "^1.0.0", "ini": "^1.3.4", @@ -8878,7 +8636,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, "requires": { "isexe": "^2.0.0" } @@ -8917,8 +8674,7 @@ "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" }, "grapheme-splitter": { "version": "1.0.4", @@ -8944,8 +8700,7 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "has-symbols": { "version": "1.0.3", @@ -8963,7 +8718,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, "requires": { "parse-passwd": "^1.0.0" } @@ -9034,8 +8788,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "peer": true, "requires": { "agent-base": "6", "debug": "4" @@ -9059,9 +8811,7 @@ "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "peer": true + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "ignore": { "version": "5.2.0", @@ -9111,7 +8861,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -9120,14 +8869,12 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "is-arrayish": { "version": "0.2.1", @@ -9138,8 +8885,7 @@ "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-core-module": { "version": "2.10.0", @@ -9153,8 +8899,7 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==" }, "is-extglob": { "version": "2.1.1", @@ -9186,8 +8931,7 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, "is-plain-obj": { "version": "1.1.0", @@ -9199,7 +8943,6 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, "requires": { "isobject": "^3.0.1" } @@ -9213,20 +8956,17 @@ "is-windows": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", - "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==", - "dev": true + "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==" }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" }, "istanbul-lib-coverage": { "version": "3.2.0", @@ -9382,7 +9122,6 @@ "version": "6.1.1", "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.1.1.tgz", "integrity": "sha512-z5LnaGDvlIkdMv/rppSO4+rq+GyQKf1xI9oiBxf9/2EBeN2hxRaWiMvaLNDnHPZj2PAhBXsycrKslDDoZO2Xtw==", - "dev": true, "requires": { "chalk": "^4.1.2", "cwd": "^0.10.0", @@ -9445,7 +9184,6 @@ "version": "6.1.1", "resolved": "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-6.1.1.tgz", "integrity": "sha512-Ces37g8Gdj7QaVxszeoXlvmsZxcEJN9EPUdJt8fGMLA+6ARVFKyVmFgP9xVeGyjTvzsXdtIiJdeOKMLMeD8r2A==", - "dev": true, "requires": { "chalk": "^4.1.2", "cwd": "^0.10.0", @@ -9458,7 +9196,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz", "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==", - "dev": true, "requires": { "@jest/fake-timers": "^27.5.1", "@jest/types": "^27.5.1", @@ -9470,7 +9207,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz", "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==", - "dev": true, "requires": { "@jest/types": "^27.5.1", "@sinonjs/fake-timers": "^8.0.1", @@ -9484,7 +9220,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", - "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", @@ -9497,7 +9232,6 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz", "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==", - "dev": true, "requires": { "@sinonjs/commons": "^1.7.0" } @@ -9506,7 +9240,6 @@ "version": "16.0.4", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", - "dev": true, "requires": { "@types/yargs-parser": "*" } @@ -9514,14 +9247,12 @@ "ansi-styles": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==" }, "jest-environment-node": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz", "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==", - "dev": true, "requires": { "@jest/environment": "^27.5.1", "@jest/fake-timers": "^27.5.1", @@ -9535,7 +9266,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", - "dev": true, "requires": { "@babel/code-frame": "^7.12.13", "@jest/types": "^27.5.1", @@ -9552,7 +9282,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz", "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==", - "dev": true, "requires": { "@jest/types": "^27.5.1", "@types/node": "*" @@ -9562,7 +9291,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", - "dev": true, "requires": { "@jest/types": "^27.5.1", "@types/node": "*", @@ -9576,7 +9304,6 @@ "version": "27.5.1", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, "requires": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -9586,8 +9313,7 @@ "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" } } }, @@ -9684,6 +9410,15 @@ "jest-environment-puppeteer": "^6.1.1" } }, + "jest-puppeteer-preset": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/jest-puppeteer-preset/-/jest-puppeteer-preset-6.1.1.tgz", + "integrity": "sha512-CIR5OJ/rIu3w0AoThMAMCOCLnBDgUUVCK9fBXjVHoAcun1IPiGlp5OOvvDSjsHZ7mDdbzpQU8EmI5dQC9dWi6g==", + "requires": { + "expect-puppeteer": "^6.1.1", + "jest-environment-puppeteer": "^6.1.1" + } + }, "jest-regex-util": { "version": "29.2.0", "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.2.0.tgz", @@ -9916,8 +9651,7 @@ "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { "version": "4.1.0", @@ -9962,7 +9696,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, "requires": { "is-buffer": "^1.1.5" } @@ -9970,8 +9703,7 @@ "kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==" }, "known-css-properties": { "version": "0.25.0", @@ -9982,8 +9714,7 @@ "lazy-cache": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==", - "dev": true + "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==" }, "leven": { "version": "3.1.0", @@ -10019,8 +9750,7 @@ "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash.merge": { "version": "4.6.2", @@ -10105,7 +9835,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz", "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==", - "dev": true, "requires": { "arr-union": "^3.1.0", "clone-deep": "^0.2.4", @@ -10128,7 +9857,6 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, "requires": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -10156,7 +9884,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -10190,7 +9917,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", "integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==", - "dev": true, "requires": { "for-in": "^0.1.3", "is-extendable": "^0.1.1" @@ -10199,8 +9925,7 @@ "for-in": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==", - "dev": true + "integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==" } } }, @@ -10216,15 +9941,12 @@ "mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true, - "peer": true + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "nanoid": { "version": "3.3.4", @@ -10242,8 +9964,6 @@ "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "peer": true, "requires": { "whatwg-url": "^5.0.0" } @@ -10308,7 +10028,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "requires": { "wrappy": "1" } @@ -10345,8 +10064,7 @@ "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", - "dev": true + "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==" }, "p-limit": { "version": "3.1.0", @@ -10396,8 +10114,7 @@ "parse-passwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", - "dev": true + "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==" }, "path-exists": { "version": "4.0.0", @@ -10408,8 +10125,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" }, "path-key": { "version": "3.1.1", @@ -10432,9 +10148,7 @@ "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", - "dev": true, - "peer": true + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" }, "picocolors": { "version": "1.0.0", @@ -10445,8 +10159,7 @@ "picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" }, "pirates": { "version": "4.0.5", @@ -10598,15 +10311,12 @@ "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "peer": true + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" }, "prompts": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", - "dev": true, "requires": { "kleur": "^3.0.3", "sisteransi": "^1.0.5" @@ -10615,16 +10325,12 @@ "proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true, - "peer": true + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "peer": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -10799,8 +10505,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "peer": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -10873,7 +10577,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", "integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==", - "dev": true, "requires": { "expand-tilde": "^1.2.2", "global-modules": "^0.2.3" @@ -10901,7 +10604,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, "requires": { "glob": "^7.1.3" } @@ -10919,7 +10621,6 @@ "version": "7.5.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", - "dev": true, "requires": { "tslib": "^2.1.0" } @@ -10952,7 +10653,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", "integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==", - "dev": true, "requires": { "is-extendable": "^0.1.1", "kind-of": "^2.0.1", @@ -10964,7 +10664,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", "integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==", - "dev": true, "requires": { "is-buffer": "^1.0.2" } @@ -10972,8 +10671,7 @@ "lazy-cache": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", - "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==", - "dev": true + "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==" } } }, @@ -11006,20 +10704,17 @@ "signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "slice-ansi": { "version": "4.0.0", @@ -11058,7 +10753,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.0.2.tgz", "integrity": "sha512-+YJtx0dvy2wt304MrHD//tASc84zinBUYU1jacPBzrjhZUd7RsDo25krxr4HUHAQzEQFuMAs4/p+yLYU5ciZ1w==", - "dev": true, "requires": { "exit": "^0.1.2", "signal-exit": "^3.0.6", @@ -11107,7 +10801,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", - "dev": true, "requires": { "escape-string-regexp": "^2.0.0" }, @@ -11115,8 +10808,7 @@ "escape-string-regexp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" } } }, @@ -11124,8 +10816,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "peer": true, "requires": { "safe-buffer": "~5.2.0" }, @@ -11133,9 +10823,7 @@ "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "peer": true + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" } } }, @@ -11323,7 +11011,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -11387,8 +11074,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "dev": true, - "peer": true, "requires": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", @@ -11400,8 +11085,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "peer": true, "requires": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -11430,9 +11113,7 @@ "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true, - "peer": true + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "tmpl": { "version": "1.0.5", @@ -11450,7 +11131,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "requires": { "is-number": "^7.0.0" } @@ -11458,15 +11138,12 @@ "tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true, - "peer": true + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", - "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", - "dev": true + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==" }, "trim-newlines": { "version": "3.0.1", @@ -11477,8 +11154,7 @@ "tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "dev": true + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" }, "type-check": { "version": "0.4.0", @@ -11492,8 +11168,7 @@ "type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==" }, "type-fest": { "version": "0.20.2", @@ -11505,8 +11180,6 @@ "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", - "dev": true, - "peer": true, "requires": { "buffer": "^5.2.1", "through": "^2.3.8" @@ -11549,8 +11222,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "v8-compile-cache": { "version": "2.3.0", @@ -11583,7 +11255,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz", "integrity": "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==", - "dev": true, "requires": { "axios": "^0.25.0", "joi": "^17.6.0", @@ -11604,9 +11275,7 @@ "webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true, - "peer": true + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "whatwg-encoding": { "version": "2.0.0", @@ -11621,8 +11290,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "peer": true, "requires": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -11657,8 +11324,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "write-file-atomic": { "version": "4.0.2", @@ -11729,8 +11395,6 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dev": true, - "peer": true, "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" diff --git a/package.json b/package.json index 3a52e5f..b120e9c 100644 --- a/package.json +++ b/package.json @@ -27,5 +27,9 @@ "jest-puppeteer": "^6.1.1", "stylelint": "^14.11.0", "stylelint-config-standard": "^28.0.0" + }, + "dependencies": { + "jest-puppeteer-preset": "^6.1.1", + "puppeteer": "^18.0.5" } } diff --git a/site/css/framework.css b/site/css/framework.css new file mode 100644 index 0000000..1a4c938 --- /dev/null +++ b/site/css/framework.css @@ -0,0 +1,117 @@ +/* ---------------------------------------------- */ + +/* For responsive design */ + +/* ---------------------------------------------- */ + +.row::after { + content: ""; + clear: both; + display: table; +} + +/* For all: */ +[class*="col-"] { + /* Unspecified: 100% width */ + float: left; + width: 100%; +} + +@media only screen and (min-width: 600px) { + /* For tablets: */ + .col-sm-1 { width: 8.33%; } + .col-sm-2 { width: 16.66%; } + .col-sm-3 { width: 25%; } + .col-sm-4 { width: 33.33%; } + .col-sm-5 { width: 41.66%; } + .col-sm-6 { width: 50%; } + .col-sm-7 { width: 58.33%; } + .col-sm-8 { width: 66.66%; } + .col-sm-9 { width: 75%; } + .col-sm-10 { width: 83.33%; } + .col-sm-11 { width: 91.66%; } + .col-sm-12 { width: 100%; } + + [class*="col-"] { + /* Unspecified: 100% width */ + float: left; + padding: 1em; + } +} + +@media only screen and (min-width: 768px) { + /* For desktop: */ + .col-l-1 { width: 8.33%; } + .col-l-2 { width: 16.66%; } + .col-l-3 { width: 25%; } + .col-l-4 { width: 33.33%; } + .col-l-5 { width: 41.66%; } + .col-l-6 { width: 50%; } + .col-l-7 { width: 58.33%; } + .col-l-8 { width: 66.66%; } + .col-l-9 { width: 75%; } + .col-l-10 { width: 83.33%; } + .col-l-11 { width: 91.66%; } + .col-l-12 { width: 100%; } + + [class*="col-"] { + /* Unspecified: 100% width */ + float: left; + padding: 1em; + } +} + +@media only screen and (min-width: 992px) { + /* For desktop: */ + .col-xl-1 { width: 8.33%; } + .col-xl-2 { width: 16.66%; } + .col-xl-3 { width: 25%; } + .col-xl-4 { width: 33.33%; } + .col-xl-5 { width: 41.66%; } + .col-xl-6 { width: 50%; } + .col-xl-7 { width: 58.33%; } + .col-xl-8 { width: 66.66%; } + .col-xl-9 { width: 75%; } + .col-xl-10 { width: 83.33%; } + .col-xl-11 { width: 91.66%; } + .col-xl-12 { width: 100%; } + + [class*="col-"] { + /* Unspecified: 100% width */ + float: left; + padding: 2em; + } +} + +/* ---------------------------------------------- */ + +/* Main framework boxes */ + +/* ---------------------------------------------- */ + +/* Outermost frame of the entire page */ + +.main { + max-width: 95rem; + margin-left: auto; + margin-right: auto; + padding: 0 2 2rem; +} + +@media only screen and (min-width: 600px) { + .main { + max-width: 95rem; + } +} + +@media only screen and (min-width: 768px) { + .main { + width: calc(100% - 4rem); + max-width: 90rem; + } +} + +.title-block { + margin-top: 2em; + margin-bottom: 0; +} diff --git a/site/css/scroll-list.css b/site/css/scroll-list.css new file mode 100644 index 0000000..b5830a6 --- /dev/null +++ b/site/css/scroll-list.css @@ -0,0 +1,36 @@ +/* ---------------------------------------------- */ + +/* Styles for the scroll list area */ + +/* ---------------------------------------------- */ + +.list-container { + margin: 1em 0 0; + display: flex; + max-height: 55vh; + border: 0.6px solid #aaa; + scrollbar-width: none; + overflow: auto; +} + +.listbox { + padding: 0 0.5em; +} + +[role="option"] { + display: block; + line-height: 1em; + padding: 0.2em; + font-size: 13px; +} + +/* ---------------------------------------------- */ + +/* Styles for the compare area */ + +/* ---------------------------------------------- */ + +.school-compare-scroll-box { + height: 65vh; + overflow-y: auto; +} diff --git a/site/css/styles.css b/site/css/styles.css new file mode 100644 index 0000000..2507682 --- /dev/null +++ b/site/css/styles.css @@ -0,0 +1,185 @@ +* { + box-sizing: border-box; +} + +html { + font-family: Roboto, sans-serif; +} + +/* ---------------------------------------------- */ + +/* General settings for main blocks */ + +/* ---------------------------------------------- */ + +.padding-top-15 { + padding-top: 1.5em; +} + +.viewport-70 { + height: 75vh; + width: auto; +} + +@media only screen and (min-width: 768px) { + .padding-right-big-screen { + padding-right: 1em; + } +} + +.entire-width-height { + width: 100%; + height: 100%; +} + +.flex-column-space-between { + display: flex; + flex-direction: column; + justify-content: space-between; +} + +/* ---------------------------------------------- */ + +/* Adding specific styles */ + +/* ---------------------------------------------- */ + +h1 { + font-size: 36px; + font-weight: 800; + margin-bottom: 0; +} + +.filter-title { + font-size: 16px; + font-weight: 800; + margin: 0.5em 0; +} + +input[type="text"] { + display: block; + width: 100%; + font-size: 13px; +} + +/* ---------------------------------------------- */ + +/* School list (school name and grades served) */ + +/* ---------------------------------------------- */ + +li.school-list-item { + border-bottom: 1px solid #bbb; + padding: 0.9em; +} + +li.school-list-item-clicked { + background-color: #000; + color: #fff; + padding: 0.9em; + border-bottom: 1px solid #000; +} + +li.school-list-item:hover { + background-color: #eee; +} + +.school-list-item > .grade-list { + padding-top: 0.6em; + font-size: 12px; + color: #aaa; +} + +.school-list-item-clicked > .grade-list { + color: #fff; + padding-top: 0.6em; + font-size: 12px; +} + +/* ---------------------------------------------- */ + +/* School comparison */ + +/* ---------------------------------------------- */ + +.school-compare-item { + border: 2px solid #000; + margin: 1em 0.5em 1em 0; + padding: 0.5em 0.5em 0.5em 1em; +} + +.school-compare-item > .school-name { + font-size: 17px; + font-weight: 800; + margin: 0.5em 0; +} + +.school-compare-item > .content { + font-size: 13px; + margin: 0.5em 0; + display: flex; + align-items: center; + flex-wrap: wrap; +} + +.school-compare-item > .content > .item-title { + background-color: #000; + color: #fff; + border-radius: 0.5em; + padding: 0.3em; + margin: 0.3em 0.3em 0; +} + +/* ---------------------------------------------- */ + +/* Making leaflet attribution show up */ + +/* ---------------------------------------------- */ + +.leaflet-control-container { + position: static; +} + +/* ---------------------------------------------- */ + +/* Styling for check boxes */ + +/* ---------------------------------------------- */ + +/* First the container */ + +#grade-select-set::after { + content: ""; + clear: both; + display: table; +} + +.grade-checkbox-text { + width: 30%; + float: left; + font-size: 13px; + margin-top: 0.1em; + margin-bottom: 0.1em; +} + +/* ---------------------------------------------- */ + +/* Bottom right links */ + +/* ---------------------------------------------- */ + +.save-reload { + display: flex; + justify-content: left; + margin: 0 -0.5em; + text-decoration: underline; +} + +.save-reload > a, +.save-reload > p { + display: block; + margin: 0 0.5em; + color: #000; + font-size: 14px; + font-weight: 800; +} diff --git a/site/data/City_Limits.js b/site/data/City_Limits.js new file mode 100644 index 0000000..0411ddd --- /dev/null +++ b/site/data/City_Limits.js @@ -0,0 +1,6 @@ +export default{ +"type": "FeatureCollection", +"features": [ +{ "type": "Feature", "id": 1, "properties": { "OBJECTID": 1, "Shape__Area": 3970705839.2602201, "Shape__Length": 394751.12047005002 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -75.014967420252006, 40.137934841110301 ], [ -75.014562402633103, 40.137688764048299 ], [ -75.013870165722594, 40.137267473359799 ], [ -75.012235676983707, 40.136266397439798 ], [ -75.011461067503305, 40.1357919508281 ], [ -75.010623930970695, 40.135279192389099 ], [ -75.0104294899661, 40.135160091061401 ], [ -75.009464931582897, 40.134579241422003 ], [ -75.009095555815506, 40.134364295890499 ], [ -75.008337703581503, 40.133923277271101 ], [ -75.006903515242499, 40.1330886718995 ], [ -75.005960344635298, 40.132540018722402 ], [ -75.003271744947696, 40.130975948203798 ], [ -75.000953454934802, 40.129619383519596 ], [ -74.999741846208494, 40.128915143646701 ], [ -74.998536422473407, 40.128206046462999 ], [ -74.997886790700505, 40.127826041459201 ], [ -74.997803637497398, 40.127911851054698 ], [ -74.997573930858593, 40.128127699689301 ], [ -74.997451389745905, 40.1282592864533 ], [ -74.994197021264398, 40.1315182491619 ], [ -74.993848540691602, 40.1318627640496 ], [ -74.993674905603697, 40.131742474060999 ], [ -74.993509584224896, 40.131623869798297 ], [ -74.993432794527905, 40.131559630793802 ], [ -74.993357066578398, 40.131469295368298 ], [ -74.993212509731705, 40.1313279679337 ], [ -74.993102665312307, 40.131193284224302 ], [ -74.992998485715802, 40.131058736189999 ], [ -74.992923289968004, 40.130955347791001 ], [ -74.992842612274501, 40.130824264399998 ], [ -74.992781990889895, 40.1307342906942 ], [ -74.992752829997599, 40.1306145972138 ], [ -74.9927456302877, 40.130512847761402 ], [ -74.992773490861595, 40.130432248785802 ], [ -74.992815328655894, 40.130309905230497 ], [ -74.992865669430202, 40.130234197284999 ], [ -74.9929424557548, 40.130205564066202 ], [ -74.993048696525406, 40.130196505113602 ], [ -74.993105526727106, 40.130100642666598 ], [ -74.993114258131101, 40.130025387928903 ], [ -74.993102278440006, 40.129901754242901 ], [ -74.993135560240901, 40.129803876602999 ], [ -74.993187966270597, 40.129770297682001 ], [ -74.993279868399199, 40.129742026575997 ], [ -74.9933907103227, 40.129712758640103 ], [ -74.993482777421406, 40.1296801391955 ], [ -74.993526096081993, 40.129637647068201 ], [ -74.993504309834407, 40.1295224826709 ], [ -74.993451134890705, 40.129435589195197 ], [ -74.993418837457199, 40.129183769921902 ], [ -74.993423967114595, 40.129011204135999 ], [ -74.993508010554194, 40.128781032543003 ], [ -74.993661922244797, 40.1287615099276 ], [ -74.993693439239806, 40.128683899814902 ], [ -74.993784807744802, 40.128622240182501 ], [ -74.993813715958893, 40.128515544282997 ], [ -74.993796721997398, 40.128468705248402 ], [ -74.993661854386005, 40.128391459743803 ], [ -74.993688760753002, 40.1282179651459 ], [ -74.993669995817498, 40.128121741432302 ], [ -74.993753784464502, 40.127920586824402 ], [ -74.993895541834803, 40.127758557885898 ], [ -74.994006320096503, 40.127684297837199 ], [ -74.994101757728501, 40.127615481941397 ], [ -74.994238435819, 40.1275084669373 ], [ -74.994409111117307, 40.127286182433799 ], [ -74.994474489684904, 40.127119412333997 ], [ -74.994528185900705, 40.126961075580802 ], [ -74.994545822682397, 40.126690134055501 ], [ -74.994482427347094, 40.126528982838401 ], [ -74.9944281315897, 40.126423203667201 ], [ -74.994351985676801, 40.126226920770399 ], [ -74.994277619687097, 40.126149683848098 ], [ -74.994154981528993, 40.1260974029544 ], [ -74.993926050120095, 40.1260556400944 ], [ -74.993482826738102, 40.126007289969998 ], [ -74.993148841445006, 40.125945589941203 ], [ -74.992877892065295, 40.125914423419303 ], [ -74.992637634431105, 40.125918827239801 ], [ -74.992365452483497, 40.125941324330803 ], [ -74.992045699158595, 40.1259946046615 ], [ -74.991703867626796, 40.126079279281697 ], [ -74.991455526265398, 40.126142975005401 ], [ -74.991068009849499, 40.126212044824001 ], [ -74.990783724781394, 40.126276327556297 ], [ -74.990621899763994, 40.126304369631796 ], [ -74.990397050022693, 40.126258967241803 ], [ -74.990295656364694, 40.126238494908101 ], [ -74.990082956607793, 40.126239193557502 ], [ -74.989742539827205, 40.126242638398999 ], [ -74.989561056823504, 40.126242634602796 ], [ -74.9893395733679, 40.126203942758799 ], [ -74.989157560825902, 40.126170550178998 ], [ -74.989060479332693, 40.126117426563297 ], [ -74.989043597807296, 40.126021247123703 ], [ -74.989013925859695, 40.125914596603998 ], [ -74.988978696064905, 40.1258049202237 ], [ -74.988992977338299, 40.125732700346902 ], [ -74.989068464834801, 40.125643090590501 ], [ -74.989074007692594, 40.125576472787699 ], [ -74.989015236654794, 40.125487991964597 ], [ -74.988940228042694, 40.125426693850997 ], [ -74.988799178290805, 40.125315927497802 ], [ -74.988714735068299, 40.1251615209435 ], [ -74.988696259145001, 40.125104490455797 ], [ -74.988501932585706, 40.124700751753601 ], [ -74.988484416522496, 40.124574082941301 ], [ -74.988391527843504, 40.124278717943 ], [ -74.988363390904098, 40.124180817358301 ], [ -74.988274923182701, 40.1240785665277 ], [ -74.988209061141504, 40.124024741102701 ], [ -74.988059227879106, 40.123967448252401 ], [ -74.987840689509795, 40.123949143067797 ], [ -74.987708266237604, 40.1239053243443 ], [ -74.987544389364302, 40.123798360158503 ], [ -74.987386945153702, 40.123672681946601 ], [ -74.987316425182399, 40.1235940729172 ], [ -74.987196571166294, 40.123520090509899 ], [ -74.987046732234305, 40.123486016612297 ], [ -74.986845911081701, 40.123334624277803 ], [ -74.986671174342206, 40.123169351196701 ], [ -74.986548728625394, 40.123066273466002 ], [ -74.986492789006704, 40.123047520632603 ], [ -74.986426275320596, 40.1230560772646 ], [ -74.986245029415002, 40.123143143713101 ], [ -74.986038116867604, 40.123257165620203 ], [ -74.985921318729297, 40.123339977662297 ], [ -74.985676047536899, 40.1234908046032 ], [ -74.985529321544504, 40.123612075220201 ], [ -74.985134487962299, 40.123837671386198 ], [ -74.985000160479998, 40.123909906082702 ], [ -74.984866610188703, 40.123940070517001 ], [ -74.984700130203706, 40.1239433210744 ], [ -74.9845541857174, 40.1239064361354 ], [ -74.984456338672999, 40.1238489379014 ], [ -74.984387887264205, 40.123766024595199 ], [ -74.984359638033098, 40.123671021616502 ], [ -74.984307645492194, 40.123601569532497 ], [ -74.984214468713503, 40.123568854589799 ], [ -74.984080261599402, 40.123568528241698 ], [ -74.983976752484097, 40.123603766314503 ], [ -74.983678489359804, 40.123616911086202 ], [ -74.983545223133902, 40.123639827234697 ], [ -74.983439819647202, 40.123628587300303 ], [ -74.983138695691693, 40.123457357670198 ], [ -74.982907360199505, 40.123335698159501 ], [ -74.982820795357895, 40.123279920663997 ], [ -74.982683071582798, 40.123157611725503 ], [ -74.982612682186399, 40.123029669394398 ], [ -74.982586726181694, 40.122924566068498 ], [ -74.982586212655505, 40.122798305222901 ], [ -74.982603517905801, 40.122745027087198 ], [ -74.982739267163595, 40.122545130188598 ], [ -74.982757992827501, 40.122457059977201 ], [ -74.9827241302375, 40.122360470726001 ], [ -74.982635206544401, 40.122223369061999 ], [ -74.982507121415196, 40.121957634677798 ], [ -74.982448651659695, 40.121908335840303 ], [ -74.982327497079993, 40.121912673645099 ], [ -74.982259628792505, 40.1219081387909 ], [ -74.982192122521894, 40.121848467301596 ], [ -74.982194964269794, 40.121778883208997 ], [ -74.982253157945195, 40.121696115142498 ], [ -74.982380004851805, 40.121529379941101 ], [ -74.982389871539198, 40.121426589390097 ], [ -74.982413675435794, 40.121306716634002 ], [ -74.982456232653803, 40.1212366376323 ], [ -74.982601757107801, 40.121190797343999 ], [ -74.982771313871993, 40.121158600653601 ], [ -74.982932425802801, 40.121101529303502 ], [ -74.983003962959302, 40.121016180526397 ], [ -74.983069238919001, 40.120898756257198 ], [ -74.983082525135103, 40.120804752253498 ], [ -74.983079418759701, 40.120649405659897 ], [ -74.983035002789194, 40.120464032722701 ], [ -74.9829845645679, 40.120356889657799 ], [ -74.982923018525199, 40.120290108394599 ], [ -74.982789368667895, 40.120230296336501 ], [ -74.982715904269696, 40.120177735332902 ], [ -74.982674899662996, 40.120117251114102 ], [ -74.982619789827794, 40.120054976714997 ], [ -74.982516286541198, 40.119997340521998 ], [ -74.982372653826204, 40.119950353180002 ], [ -74.982165824024904, 40.1199236053357 ], [ -74.981982706888502, 40.119917746971197 ], [ -74.981834877611206, 40.119927253970801 ], [ -74.981698972371206, 40.119968963641099 ], [ -74.981588726396595, 40.120030159238198 ], [ -74.981508874602298, 40.120087734320798 ], [ -74.981359803739593, 40.120150896431099 ], [ -74.981205481510102, 40.120180556372702 ], [ -74.981053935125203, 40.120188522167098 ], [ -74.980871125167994, 40.120175415849999 ], [ -74.980726782604194, 40.1201458179697 ], [ -74.980413615486199, 40.1200845813038 ], [ -74.9802927069845, 40.120013467395701 ], [ -74.980105974065594, 40.119858284088501 ], [ -74.979967020300705, 40.119742808093001 ], [ -74.979852120782695, 40.119647320380501 ], [ -74.979763507784895, 40.119572622691102 ], [ -74.979713233177094, 40.119507561864999 ], [ -74.979601123590101, 40.119429405558698 ], [ -74.9794705430226, 40.119387072111003 ], [ -74.979284837303894, 40.1193521236371 ], [ -74.979133648051302, 40.119351391148498 ], [ -74.979009602354694, 40.119380326940998 ], [ -74.978892396657201, 40.119426836072897 ], [ -74.978800801694106, 40.119494281370002 ], [ -74.978689199423002, 40.119542385068698 ], [ -74.978604866765806, 40.119547606248197 ], [ -74.978479831086304, 40.119508315752 ], [ -74.978368247195505, 40.119463546457503 ], [ -74.978244319507397, 40.119489582840998 ], [ -74.977976971613202, 40.119602133613299 ], [ -74.977738257933893, 40.119661679415501 ], [ -74.9776477289697, 40.119703027545199 ], [ -74.977588343266007, 40.119768356001401 ], [ -74.977549628560894, 40.119837075229199 ], [ -74.977521082305302, 40.120026485463598 ], [ -74.9773841647864, 40.120069625430297 ], [ -74.977248088545807, 40.120069245877403 ], [ -74.977143700023902, 40.120033353219704 ], [ -74.977042445012898, 40.119967061875499 ], [ -74.976930624490095, 40.119928079350501 ], [ -74.976796198769804, 40.1199335509531 ], [ -74.976613071737304, 40.119974115879103 ], [ -74.976400203156203, 40.120048798504698 ], [ -74.976138049919399, 40.120149864646301 ], [ -74.976067395162502, 40.120213460799 ], [ -74.976030376798803, 40.120286572640303 ], [ -74.976067945139206, 40.120384704243698 ], [ -74.976031460547404, 40.120444772469902 ], [ -74.975932320868296, 40.1204656014853 ], [ -74.975816071230398, 40.120442486995501 ], [ -74.975732757635797, 40.120399838853103 ], [ -74.975733896107698, 40.120325861497797 ], [ -74.975725227822196, 40.120260351881903 ], [ -74.975672961839294, 40.1201981426129 ], [ -74.9755678620173, 40.120179640009603 ], [ -74.975391358064698, 40.120197151267902 ], [ -74.975227712713604, 40.120223676861698 ], [ -74.975102191309901, 40.120219197295 ], [ -74.974973677866302, 40.120172556429097 ], [ -74.974807218443203, 40.120082919710804 ], [ -74.974689390787802, 40.120006071233597 ], [ -74.974613582022997, 40.119918621974598 ], [ -74.974537654555206, 40.119857291806298 ], [ -74.974428257625107, 40.119805308803798 ], [ -74.974288869440301, 40.1197932400189 ], [ -74.974077080146998, 40.119795381290601 ], [ -74.973609405183794, 40.119814564980402 ], [ -74.973367874233105, 40.119804381085501 ], [ -74.973112404774, 40.119788057202001 ], [ -74.972992784892199, 40.1198011264974 ], [ -74.972869210835, 40.119818461355401 ], [ -74.972772612533603, 40.119823382059501 ], [ -74.972673533457794, 40.1197963268569 ], [ -74.9725723546577, 40.119728573569397 ], [ -74.972548527729401, 40.119664148233298 ], [ -74.9725074268637, 40.119560127126803 ], [ -74.972430136182297, 40.119508917647202 ], [ -74.972240612104599, 40.119428884054599 ], [ -74.972057466085204, 40.119308365934899 ], [ -74.971934692763497, 40.119213977354399 ], [ -74.9718601227504, 40.119142514055703 ], [ -74.971786503419906, 40.119047862093097 ], [ -74.971711485851401, 40.118895129322397 ], [ -74.971604468636301, 40.118808374653199 ], [ -74.971495966854306, 40.1187346495323 ], [ -74.971297913179896, 40.1185861971436 ], [ -74.971208482397799, 40.118462139206002 ], [ -74.971142962272694, 40.118354625988303 ], [ -74.9710214703112, 40.118113699118901 ], [ -74.970915600341399, 40.117929745917799 ], [ -74.9708441252169, 40.117759680402301 ], [ -74.970752106826893, 40.1176529772208 ], [ -74.970615294829202, 40.117532125744603 ], [ -74.970452828071103, 40.117391785535098 ], [ -74.970348314831497, 40.1171977094601 ], [ -74.970269452987296, 40.117092765599203 ], [ -74.970180141554806, 40.117012249405697 ], [ -74.970083609947807, 40.116969277432098 ], [ -74.9699877882815, 40.116955355057399 ], [ -74.969917503048507, 40.116963810871503 ], [ -74.969867340167696, 40.116988720135502 ], [ -74.969814992286999, 40.117020830174901 ], [ -74.969739221777104, 40.117024810095799 ], [ -74.969647283094801, 40.117008070861402 ], [ -74.969593597958195, 40.116980650718901 ], [ -74.969480671842305, 40.116922774560997 ], [ -74.969326561156606, 40.116855198013297 ], [ -74.969204004765302, 40.1168246614832 ], [ -74.969087688714097, 40.116849421323103 ], [ -74.968918147955506, 40.116881598137503 ], [ -74.968686926935902, 40.116942766079298 ], [ -74.968441242424305, 40.117034048937903 ], [ -74.968321312719397, 40.117100800661603 ], [ -74.968218015042297, 40.117176667988602 ], [ -74.968126307282702, 40.117223792089497 ], [ -74.968036223671803, 40.117299969930897 ], [ -74.967891914392496, 40.117408220478502 ], [ -74.967733724360002, 40.117532092986899 ], [ -74.9675652786309, 40.117629595052399 ], [ -74.967517568822998, 40.117686487665502 ], [ -74.967485191382707, 40.117807601241203 ], [ -74.967463159392906, 40.117883983629 ], [ -74.967355148716806, 40.117936515554902 ], [ -74.967123939890897, 40.117951239504499 ], [ -74.966951376633702, 40.118010913170998 ], [ -74.966722752659706, 40.118054713411198 ], [ -74.966534318171895, 40.1180864385083 ], [ -74.966385478842199, 40.118120563513898 ], [ -74.966080882901693, 40.118242340403903 ], [ -74.965921234610605, 40.1183095788667 ], [ -74.965774412665795, 40.118340859500599 ], [ -74.965593689076101, 40.118414840869299 ], [ -74.965431913593207, 40.118487839084899 ], [ -74.965334214311099, 40.118565290238202 ], [ -74.965261913220701, 40.1186230371896 ], [ -74.965149353403802, 40.118671095753001 ], [ -74.964994628875104, 40.118664447103697 ], [ -74.964837082113903, 40.118634509240898 ], [ -74.964734661418703, 40.118597202040696 ], [ -74.964628990000904, 40.118546750447997 ], [ -74.964535479172298, 40.118476283137902 ], [ -74.964489364610799, 40.118402611684502 ], [ -74.964509085202906, 40.118244906016798 ], [ -74.964489239285598, 40.118129790763497 ], [ -74.964418476157604, 40.117988761684202 ], [ -74.964334275916798, 40.117829998304003 ], [ -74.964282079333501, 40.117628470312503 ], [ -74.964207221944093, 40.117403181652399 ], [ -74.964146990429697, 40.117332907478399 ], [ -74.964117031284303, 40.1172979588926 ], [ -74.963998803577695, 40.117231244442699 ], [ -74.963830906923604, 40.117131401377797 ], [ -74.963736266521494, 40.1170884788188 ], [ -74.963576375284305, 40.117046867478997 ], [ -74.963443611578796, 40.117011725227599 ], [ -74.963379019746498, 40.1169738827206 ], [ -74.963295249267006, 40.116896387703399 ], [ -74.963221187125299, 40.116766892671201 ], [ -74.963175553617702, 40.116682725759901 ], [ -74.963151551880998, 40.116506903267997 ], [ -74.963142220643803, 40.116365911398802 ], [ -74.963156459090598, 40.116203729837103 ], [ -74.963134073253698, 40.1161045017082 ], [ -74.963115462491203, 40.116005374078 ], [ -74.963112159610404, 40.115879044600398 ], [ -74.963147600131506, 40.115798635719898 ], [ -74.963250094402994, 40.115650198934397 ], [ -74.963317596736204, 40.115525585441297 ], [ -74.963330770683996, 40.115480914105099 ], [ -74.963395931756295, 40.115298196671702 ], [ -74.9634143709022, 40.115217375703203 ], [ -74.963349740626597, 40.115134550606598 ], [ -74.963261263218101, 40.1150337207592 ], [ -74.963237446787105, 40.114969293472903 ], [ -74.963146183246806, 40.114775531346901 ], [ -74.963090892768193, 40.114649392566903 ], [ -74.963112391958603, 40.114586063560502 ], [ -74.963249521515706, 40.1144689405698 ], [ -74.963457740193405, 40.1142084223194 ], [ -74.963670436066195, 40.114000256465602 ], [ -74.9640016402372, 40.113690473229497 ], [ -74.964091969408102, 40.113562060244099 ], [ -74.9641392098073, 40.113470331173303 ], [ -74.964157067019102, 40.113380791639599 ], [ -74.964138169401807, 40.113288910865201 ], [ -74.964022687597605, 40.113017647004703 ], [ -74.9639201643148, 40.112637856316297 ], [ -74.963879179361399, 40.112439501063001 ], [ -74.963884226744895, 40.112201640812302 ], [ -74.963880707604204, 40.112011447023598 ], [ -74.963850413989903, 40.111920740763097 ], [ -74.9637848160761, 40.1117464604338 ], [ -74.963777292680405, 40.111653404459503 ], [ -74.963796576113197, 40.111552293701699 ], [ -74.963852419338806, 40.111481083425602 ], [ -74.963935891419894, 40.111381528030499 ], [ -74.964046534906103, 40.111218780870502 ], [ -74.964105594847993, 40.111069291061497 ], [ -74.964121448558501, 40.110959383777796 ], [ -74.964121486700705, 40.110866511042403 ], [ -74.964040832820601, 40.110713635977 ], [ -74.963903172287999, 40.1105680838699 ], [ -74.963839380199204, 40.110464960025702 ], [ -74.963841067980496, 40.110377930167203 ], [ -74.963813158711304, 40.110229234472698 ], [ -74.963746891622193, 40.110094116532501 ], [ -74.963710598207001, 40.109965536842502 ], [ -74.9637105177666, 40.109875562671299 ], [ -74.963771922236901, 40.109760956349398 ], [ -74.963891524484694, 40.109610032302697 ], [ -74.9639785309584, 40.109516365481497 ], [ -74.964075324917999, 40.1094606637132 ], [ -74.964235114079798, 40.109435511785001 ], [ -74.964409846317395, 40.109506496789699 ], [ -74.964509342565705, 40.109476982258599 ], [ -74.964602825718202, 40.109409594020498 ], [ -74.964680155225594, 40.109321495176999 ], [ -74.964738497520401, 40.109189396452699 ], [ -74.964765209713207, 40.109091366983698 ], [ -74.964810320398897, 40.1090053890278 ], [ -74.964877496779494, 40.108934461865402 ], [ -74.964936158603194, 40.108886540070699 ], [ -74.9650594948383, 40.108828578991897 ], [ -74.965118168165304, 40.108780657388102 ], [ -74.965206243959003, 40.108660893481499 ], [ -74.965387241577702, 40.108395360736502 ], [ -74.965516632391299, 40.108235967836002 ], [ -74.965576043400304, 40.108160067533603 ], [ -74.965592429084396, 40.108139126942298 ], [ -74.965609196449904, 40.108098894601603 ], [ -74.965583805497801, 40.108071661984098 ], [ -74.9655621349104, 40.108048421108002 ], [ -74.965504106195596, 40.107988968605099 ], [ -74.965432395311794, 40.107894358212697 ], [ -74.965368949269703, 40.107782530194001 ], [ -74.965295846076799, 40.1076298388314 ], [ -74.965212490548794, 40.107450776967603 ], [ -74.965123680985499, 40.107312221338901 ], [ -74.965057395521598, 40.107223545007102 ], [ -74.9649790523858, 40.107198426629502 ], [ -74.964726541109698, 40.107180694826098 ], [ -74.964421753257596, 40.107147197628301 ], [ -74.964195785641905, 40.107127206298102 ], [ -74.963958493134996, 40.107106949103397 ], [ -74.963710710838896, 40.1070661089718 ], [ -74.963517337804305, 40.106988868024899 ], [ -74.963336600910594, 40.106880007958203 ], [ -74.963250033448006, 40.106779224074998 ], [ -74.963201214471894, 40.106679364125199 ], [ -74.963219972162193, 40.106648975023198 ], [ -74.963270059181596, 40.106567839898503 ], [ -74.963374041386302, 40.106521026416303 ], [ -74.963397191219798, 40.106512820059599 ], [ -74.963466091801394, 40.106488421937698 ], [ -74.963596259392801, 40.106448045826099 ], [ -74.963659302243599, 40.106385723589497 ], [ -74.963670903813806, 40.106287328134101 ], [ -74.963606766561199, 40.106146458675603 ], [ -74.9636287512336, 40.106071526532901 ], [ -74.963693092877406, 40.105977310707601 ], [ -74.963786572016502, 40.105909923116599 ], [ -74.963907797555194, 40.105811273778599 ], [ -74.963963766416001, 40.105737174134397 ], [ -74.963963804771197, 40.105644301365302 ], [ -74.963927951803498, 40.105596991185998 ], [ -74.963797693399201, 40.105547402194901 ], [ -74.963592761932503, 40.105475684070299 ], [ -74.963399632237895, 40.105392636772798 ], [ -74.963184557546597, 40.105291648445501 ], [ -74.962964886263094, 40.105210858486899 ], [ -74.962693636351204, 40.105143333941697 ], [ -74.962556188106504, 40.105084855798196 ], [ -74.962499464278693, 40.1049935082087 ], [ -74.962429322327907, 40.1048612057943 ], [ -74.962433375917499, 40.104762627404298 ], [ -74.962467985406093, 40.104656076490699 ], [ -74.962540126895902, 40.104556247491303 ], [ -74.962539332902693, 40.104483664707402 ], [ -74.962378443538398, 40.104352063438498 ], [ -74.962092148583594, 40.104144857413203 ], [ -74.961993089848605, 40.104026369772001 ], [ -74.961767335290403, 40.1038177295369 ], [ -74.961565023551898, 40.103682211968298 ], [ -74.961402826054098, 40.103582502593497 ], [ -74.961228696703998, 40.1034970198614 ], [ -74.961157464205002, 40.1034532207306 ], [ -74.961110734759203, 40.103424496238297 ], [ -74.961020161478601, 40.103329425224899 ], [ -74.960989994818206, 40.103235819587503 ], [ -74.960995243263199, 40.103108246545702 ], [ -74.961024898391997, 40.103030599458897 ], [ -74.961089781366098, 40.102785477114402 ], [ -74.961199246148595, 40.102605286395502 ], [ -74.961202747330802, 40.102428328091797 ], [ -74.961235133402297, 40.1022839955641 ], [ -74.961290667347399, 40.102128618690202 ], [ -74.961294961267498, 40.102024234181201 ], [ -74.961269383211302, 40.101956862078602 ], [ -74.961178203381095, 40.101876292745203 ], [ -74.961101776475104, 40.101804776602997 ], [ -74.961061717932793, 40.101676104435697 ], [ -74.9611257974518, 40.1014048404219 ], [ -74.961226604722995, 40.101296994265098 ], [ -74.961394801660802, 40.101158857611097 ], [ -74.961477906970401, 40.101067999638602 ], [ -74.961643401247201, 40.1009036839339 ], [ -74.961701515508295, 40.1007773840985 ], [ -74.961744280945396, 40.100656523903702 ], [ -74.961768400350394, 40.100529408537703 ], [ -74.961800796033202, 40.100385076116602 ], [ -74.961847138382794, 40.100177231763404 ], [ -74.961854251417705, 40.100096145330497 ], [ -74.961890203565204, 40.099911260661102 ], [ -74.961932729343701, 40.099796206532098 ], [ -74.961977599035393, 40.099716026773898 ], [ -74.962013954001804, 40.0996588612051 ], [ -74.962020363311296, 40.0995951664679 ], [ -74.961986064871894, 40.0995101652423 ], [ -74.961918142315298, 40.0994156441431 ], [ -74.961815999774899, 40.099326095963498 ], [ -74.961739217068896, 40.099263284946097 ], [ -74.9616736386171, 40.099203647096203 ], [ -74.961686643010097, 40.099163333039499 ], [ -74.961730796941197, 40.099100553798998 ], [ -74.961786035672802, 40.099043846319702 ], [ -74.962071091456295, 40.098775030786904 ], [ -74.962094255656297, 40.098671112905997 ], [ -74.962062432201904, 40.0986180968006 ], [ -74.961908390901499, 40.098504078322598 ], [ -74.961724262804196, 40.098386419403397 ], [ -74.961606905290495, 40.098299403410998 ], [ -74.961579202704499, 40.098237782725903 ], [ -74.961596923719597, 40.0981743623786 ], [ -74.961660318722096, 40.098103336489203 ], [ -74.961775036649698, 40.098024860020701 ], [ -74.961812714226795, 40.097935801512698 ], [ -74.961808254205707, 40.097860228291502 ], [ -74.9617888272995, 40.097781399603697 ], [ -74.9617847590536, 40.097777327188503 ], [ -74.961723489023797, 40.0977159556328 ], [ -74.961619560370494, 40.097669903834102 ], [ -74.9614146550105, 40.097598181790197 ], [ -74.961190986224395, 40.097523093700197 ], [ -74.961060280105002, 40.097485096147103 ], [ -74.960924476035004, 40.097478899858999 ], [ -74.960791265207703, 40.097501789973698 ], [ -74.960679745981494, 40.097548426987601 ], [ -74.960569181032, 40.097571866334299 ], [ -74.960463356544494, 40.0975721998905 ], [ -74.960078299786005, 40.097469972498303 ], [ -74.959734295705303, 40.097380364129201 ], [ -74.959626952844204, 40.097325514207498 ], [ -74.959476215688198, 40.097223178353097 ], [ -74.9593757057186, 40.097185911852101 ], [ -74.958784148934896, 40.096913238304502 ], [ -74.958758724401903, 40.096904087775897 ], [ -74.9585160173351, 40.096816755009598 ], [ -74.958252377297399, 40.096702962344601 ], [ -74.958168290989605, 40.096634168473798 ], [ -74.958111102326399, 40.096554421938997 ], [ -74.958080107161706, 40.096481105466701 ], [ -74.957996618500999, 40.096397809631299 ], [ -74.957653075102399, 40.096113744674298 ], [ -74.957354885388497, 40.0959671944482 ], [ -74.957209314848498, 40.095923019329099 ], [ -74.957059025991597, 40.095901959143603 ], [ -74.9568997323492, 40.095915497573898 ], [ -74.956640623694, 40.095967248890098 ], [ -74.956462577596895, 40.095977438576597 ], [ -74.956286694158294, 40.0959354270882 ], [ -74.9561871433839, 40.095874969273098 ], [ -74.956096706903594, 40.095776986767099 ], [ -74.956087893276404, 40.095715823694199 ], [ -74.956109273559406, 40.095655394479998 ], [ -74.956119450547902, 40.095591791502002 ], [ -74.955838122587195, 40.095265692881497 ], [ -74.955760073458606, 40.095141897957298 ], [ -74.955748561515705, 40.095054547024702 ], [ -74.955773966728898, 40.0949884127686 ], [ -74.955880866562794, 40.094732708420999 ], [ -74.9560087745175, 40.094471702667903 ], [ -74.956235181459405, 40.094021539780698 ], [ -74.956392587360796, 40.093732226883198 ], [ -74.956403529438305, 40.093558350632598 ], [ -74.956402671043705, 40.093395802478803 ], [ -74.956382452705597, 40.093244389689303 ], [ -74.956374404834804, 40.093072953385501 ], [ -74.956454737276005, 40.092865936894697 ], [ -74.956691717247395, 40.092479880546001 ], [ -74.956823940796198, 40.092297345577201 ], [ -74.956942572486099, 40.092169617113697 ], [ -74.957065454985297, 40.0920303949611 ], [ -74.957117204709306, 40.091874919010003 ], [ -74.957198703755296, 40.091685348237597 ], [ -74.957286890720397, 40.0915626916915 ], [ -74.9574428413964, 40.0913546103342 ], [ -74.957473319383098, 40.091256673845102 ], [ -74.957643851949797, 40.0911534263712 ], [ -74.957815421087901, 40.090841235097201 ], [ -74.957960774492307, 40.090569045375197 ], [ -74.957979929525493, 40.090470833732702 ], [ -74.9579647609267, 40.090380492756502 ], [ -74.957909249533301, 40.090260148129197 ], [ -74.957824024325703, 40.090127475799598 ], [ -74.957793867947899, 40.090033869242099 ], [ -74.957790857368295, 40.089923504290802 ], [ -74.957828655037304, 40.0898315484731 ], [ -74.957891317948494, 40.089777924749598 ], [ -74.957993749602807, 40.089722365536097 ], [ -74.958067507020999, 40.089674814147699 ], [ -74.958113448721306, 40.0895685487273 ], [ -74.958117268973496, 40.089475767526999 ], [ -74.958109528847402, 40.089388508464701 ], [ -74.958122999517499, 40.089336591224303 ], [ -74.9581552319666, 40.089288031161203 ], [ -74.958234433848304, 40.089199982365699 ], [ -74.958251797233999, 40.0891452672047 ], [ -74.958230501954503, 40.0890199418183 ], [ -74.958182046083394, 40.088728537025901 ], [ -74.958010868034194, 40.0882512956927 ], [ -74.957869943655993, 40.087911203019402 ], [ -74.957714356450794, 40.087652013051397 ], [ -74.957609690805498, 40.087211222408698 ], [ -74.957610573779107, 40.087098050547098 ], [ -74.957638673678801, 40.087058094644803 ], [ -74.958017931193595, 40.086840930323397 ], [ -74.958027720625907, 40.086603175650097 ], [ -74.958034502180794, 40.0864843441462 ], [ -74.958026319870896, 40.086315806168301 ], [ -74.958049736422495, 40.0862060921649 ], [ -74.958082194404199, 40.0861517346898 ], [ -74.958203870280599, 40.086041496959098 ], [ -74.958225542223801, 40.085882397572199 ], [ -74.958216211983199, 40.085649981408302 ], [ -74.958252139011805, 40.085282259492502 ], [ -74.958298840284698, 40.085065711655297 ], [ -74.958341124186703, 40.084956455883201 ], [ -74.958627827880093, 40.084600627716497 ], [ -74.958679948903594, 40.084390023331203 ], [ -74.958630675501098, 40.084301755574998 ], [ -74.958549064892907, 40.084264946849899 ], [ -74.958422637077703, 40.084215434636498 ], [ -74.958366067314898, 40.084121186598402 ], [ -74.958373541180407, 40.084031395585399 ], [ -74.958383833628801, 40.083964893789698 ], [ -74.958423133211895, 40.083928111229298 ], [ -74.958592991534701, 40.083932236766302 ], [ -74.958722402498694, 40.083909266533702 ], [ -74.958903564881297, 40.083730810603001 ], [ -74.958965908217493, 40.083593018085203 ], [ -74.9589846171083, 40.083459959846998 ], [ -74.958944692716997, 40.083328388218703 ], [ -74.958907814490104, 40.083214299354601 ], [ -74.959018759619894, 40.083089292967401 ], [ -74.959135029425795, 40.082926678680302 ], [ -74.959154777060604, 40.082813973940397 ], [ -74.959132061566507, 40.082723449810302 ], [ -74.959039285059802, 40.082590585766198 ], [ -74.959000986478202, 40.082511298064901 ], [ -74.959052104937697, 40.082416763960502 ], [ -74.959103093367304, 40.082371560641803 ], [ -74.959250056527495, 40.082380932260797 ], [ -74.959279753915197, 40.0823767695382 ], [ -74.959666834860101, 40.082322497879296 ], [ -74.959744104845001, 40.082311659667099 ], [ -74.959859730574806, 40.082256428410801 ], [ -74.959954970423894, 40.0821455472502 ], [ -74.960011508998207, 40.0820569472694 ], [ -74.960050760165501, 40.081929767009903 ], [ -74.960073765912398, 40.081793424903402 ], [ -74.960078431872006, 40.081680011520803 ], [ -74.960079710803498, 40.081543141987503 ], [ -74.960061426719307, 40.081459222390201 ], [ -74.960040728088202, 40.081328496314299 ], [ -74.960043198294599, 40.081268454463903 ], [ -74.960107426039897, 40.0811865378747 ], [ -74.9601811604483, 40.081084821088901 ], [ -74.960627621248804, 40.080798482818402 ], [ -74.9608158985546, 40.080659474772702 ], [ -74.960883923727394, 40.080591003897098 ], [ -74.9609868197862, 40.080520045244697 ], [ -74.961076684517906, 40.0804487702747 ], [ -74.961122296929702, 40.080396452321601 ], [ -74.961274040245897, 40.080194779214203 ], [ -74.961406552154202, 40.080037720140297 ], [ -74.961523986546794, 40.0799303859297 ], [ -74.961636101541004, 40.079846287454203 ], [ -74.961730038011893, 40.079781787773797 ], [ -74.9617500084141, 40.079768242527699 ], [ -74.961894569336295, 40.079670144331402 ], [ -74.961958088883193, 40.079627045993703 ], [ -74.962016045263098, 40.079591724114003 ], [ -74.962107553349298, 40.079480417400603 ], [ -74.962133244308205, 40.079384210976798 ], [ -74.962130816626399, 40.079337404255497 ], [ -74.962156902451298, 40.0791260138325 ], [ -74.962200508632705, 40.079016879025303 ], [ -74.962270438425705, 40.078901714779803 ], [ -74.962334112859196, 40.078833137580403 ], [ -74.962385923710698, 40.078784357569901 ], [ -74.962392891289994, 40.078777795538201 ], [ -74.962470144621605, 40.078696193692601 ], [ -74.962506934233801, 40.078647004229502 ], [ -74.962535463681803, 40.0785875944404 ], [ -74.962533584091105, 40.078527447078201 ], [ -74.962518685484099, 40.0784669839381 ], [ -74.962481798758205, 40.078412664438503 ], [ -74.962431510052497, 40.078261190210704 ], [ -74.962424318408793, 40.078119105293503 ], [ -74.962431670485998, 40.0780458279012 ], [ -74.962459651396898, 40.077999758775903 ], [ -74.962514081551305, 40.077944311217699 ], [ -74.962630002515098, 40.077873667145496 ], [ -74.963184392867106, 40.0773929351543 ], [ -74.963287457682597, 40.077211786127698 ], [ -74.963395435597306, 40.077122584793699 ], [ -74.963506458706107, 40.077065175070899 ], [ -74.963637687669802, 40.0770449830055 ], [ -74.963780713651204, 40.077055127683501 ], [ -74.964324179028495, 40.077051605603302 ], [ -74.964800157922298, 40.077158458070102 ], [ -74.964913141056002, 40.077183822248202 ], [ -74.964974508649902, 40.077197591117603 ], [ -74.965042626183802, 40.077204089657997 ], [ -74.965149767908997, 40.077214318148101 ], [ -74.965255928304302, 40.077224450672198 ], [ -74.965442096546397, 40.077242315639801 ], [ -74.965736833031897, 40.0772628106985 ], [ -74.966031956806205, 40.077273303436101 ], [ -74.966184145992301, 40.077271980139301 ], [ -74.966298966807599, 40.077228013695901 ], [ -74.966490064037998, 40.077125792966903 ], [ -74.9665976954916, 40.0770449242914 ], [ -74.9666708681535, 40.076956543985801 ], [ -74.966751022508305, 40.076698038601599 ], [ -74.966775507079603, 40.0765250034869 ], [ -74.966822219136603, 40.0764460022056 ], [ -74.966941921238401, 40.076388799450797 ], [ -74.967269366092097, 40.0763533150634 ], [ -74.967552835846305, 40.076330136977496 ], [ -74.967808888586902, 40.076339670237097 ], [ -74.9682834195156, 40.0763211067489 ], [ -74.968745752202096, 40.076282215211499 ], [ -74.968893853574301, 40.076274112491099 ], [ -74.969041636538094, 40.076274345821503 ], [ -74.969127520700894, 40.076299797973 ], [ -74.969296964317294, 40.076407404479198 ], [ -74.969481626696407, 40.076461963281602 ], [ -74.969628577961203, 40.0764822065968 ], [ -74.969750300231098, 40.0764818175019 ], [ -74.969825342455295, 40.076453582153803 ], [ -74.969901626986399, 40.076395326000402 ], [ -74.970012506870503, 40.076341240662003 ], [ -74.970110766162804, 40.076276839002198 ], [ -74.970251905122296, 40.076226828383 ], [ -74.970369143065795, 40.076229664146702 ], [ -74.970511894958094, 40.076246470793699 ], [ -74.970693851038007, 40.07626089144 ], [ -74.970838926687904, 40.076220995256499 ], [ -74.970942067690203, 40.076143348046102 ], [ -74.971054859589401, 40.0760425692892 ], [ -74.971171998490505, 40.075941895542897 ], [ -74.971261983291598, 40.0758672729186 ], [ -74.971348999114895, 40.075759184661599 ], [ -74.971382675074906, 40.0756798664614 ], [ -74.971416146269107, 40.075605544258998 ], [ -74.971398259507396, 40.075511625417199 ], [ -74.971350113652406, 40.075413631947598 ], [ -74.971290453162496, 40.075278623268801 ], [ -74.971233351468598, 40.075187090143302 ], [ -74.971237451717599, 40.075087016954697 ], [ -74.971250234419799, 40.074987162721698 ], [ -74.971281339813899, 40.074864368678298 ], [ -74.971320046083903, 40.0747684752439 ], [ -74.971367560148394, 40.074669451784203 ], [ -74.971452797413093, 40.074604734193997 ], [ -74.971593658641595, 40.074561392268897 ], [ -74.971623328328405, 40.0744736242019 ], [ -74.971617242087007, 40.0744100324779 ], [ -74.971576561292096, 40.074342270368099 ], [ -74.971488107911597, 40.074273353179699 ], [ -74.971271850274107, 40.074141244022996 ], [ -74.971080696916303, 40.074033106354499 ], [ -74.971028763711104, 40.073921667208303 ], [ -74.971031907396807, 40.073844944730403 ], [ -74.9710430502832, 40.073785112587402 ], [ -74.971106437739095, 40.073723200854303 ], [ -74.971200356727906, 40.073658693412298 ], [ -74.971539637351199, 40.0734398446669 ], [ -74.971733764813607, 40.073369415707099 ], [ -74.971874201918894, 40.073336074172197 ], [ -74.972014650234598, 40.073302741750702 ], [ -74.972130006964093, 40.073245428776502 ], [ -74.972220533527107, 40.073157464692699 ], [ -74.972272801904197, 40.073048544909099 ], [ -74.972298202825201, 40.072959006526297 ], [ -74.972332832981706, 40.072856328310102 ], [ -74.972414214427104, 40.072460958173501 ], [ -74.972435279548506, 40.0723713149658 ], [ -74.972501862843501, 40.072231014314198 ], [ -74.972575432542001, 40.072132620199604 ], [ -74.972656045227495, 40.072074466988802 ], [ -74.972798129723998, 40.072001102504203 ], [ -74.972918240529907, 40.071933883767798 ], [ -74.973063703748096, 40.071883974456 ], [ -74.973213513829293, 40.0718341700045 ], [ -74.973381917579403, 40.071754763860199 ], [ -74.973475558613202, 40.071696924903897 ], [ -74.973529986056604, 40.0716414813947 ], [ -74.973567173594603, 40.071582278342198 ], [ -74.973604099731503, 40.071529745913303 ], [ -74.973606694288605, 40.071466364059603 ], [ -74.973618107565102, 40.0713998613058 ], [ -74.973633036998507, 40.071353474354801 ], [ -74.973669962959903, 40.071300941903999 ], [ -74.973808175599302, 40.071215795772098 ], [ -74.973977134865905, 40.071123048329298 ], [ -74.974119340540497, 40.071046351248398 ], [ -74.974259919690894, 40.071009676401303 ], [ -74.974417590378806, 40.070980091168003 ], [ -74.974612048913301, 40.0709013216442 ], [ -74.9748018874172, 40.070829108160702 ], [ -74.974899997902895, 40.070768033063601 ], [ -74.97498156236, 40.070686527470002 ], [ -74.975041563036797, 40.070601167114901 ], [ -74.975071704207195, 40.070501722763098 ], [ -74.975101709022695, 40.070405609080296 ], [ -74.975123588652394, 40.070295954298899 ], [ -74.975121834765503, 40.070232467434202 ], [ -74.975098059943505, 40.070069952565497 ], [ -74.9751063645095, 40.069973323861397 ], [ -74.975165943526093, 40.069897964189401 ], [ -74.975251034546702, 40.0698365834442 ], [ -74.975349006571406, 40.069778847639803 ], [ -74.975459598436302, 40.069731427384099 ], [ -74.975582263726096, 40.069707681360498 ], [ -74.975723919313296, 40.069644314002801 ], [ -74.975968586266305, 40.069506643967699 ], [ -74.976185023139706, 40.069421716549002 ], [ -74.976402266062806, 40.0693167773589 ], [ -74.976609462459507, 40.0692449800123 ], [ -74.976733627069606, 40.069184532272601 ], [ -74.976828693789699, 40.069091664429102 ], [ -74.976872814997407, 40.068969192272398 ], [ -74.976912044087797, 40.0688599469146 ], [ -74.977007331535702, 40.0686552342071 ], [ -74.977079283031998, 40.068490019949898 ], [ -74.977153523949198, 40.068374942477597 ], [ -74.977204962664402, 40.0682860315084 ], [ -74.9772710665234, 40.068157403729003 ], [ -74.977330232347398, 40.068092052972297 ], [ -74.977460433730698, 40.067990012529798 ], [ -74.977628698180197, 40.067913940111403 ], [ -74.977858690184902, 40.067815982872702 ], [ -74.978009851157395, 40.067732811335397 ], [ -74.978161147870196, 40.067646308917503 ], [ -74.978372275079494, 40.067584623292298 ], [ -74.978617993423697, 40.067527105557303 ], [ -74.978882710251199, 40.067429983852897 ], [ -74.979093563634507, 40.067374967268996 ], [ -74.979183119813399, 40.0673103394573 ], [ -74.979413391709201, 40.067205709019198 ], [ -74.979557218098293, 40.067088973982798 ], [ -74.979606893328906, 40.067043424111297 ], [ -74.979713743868004, 40.066980888873204 ], [ -74.979781451743406, 40.066919085850401 ], [ -74.979805478337099, 40.066862897623103 ], [ -74.979838459126199, 40.066800248327198 ], [ -74.979845802886203, 40.066726970056401 ], [ -74.979910117263998, 40.0666417113694 ], [ -74.980049345888602, 40.066531541856499 ], [ -74.9801658988995, 40.066444190345898 ], [ -74.980268889342298, 40.066369883693802 ], [ -74.980379335845299, 40.066325798381698 ], [ -74.980515294461895, 40.066295681753999 ], [ -74.980677422467807, 40.0662628617278 ], [ -74.980753958552597, 40.066197927967103 ], [ -74.980858582623, 40.0660835805513 ], [ -74.980923179146103, 40.065991651204598 ], [ -74.980971558320803, 40.065870938264297 ], [ -74.980965736396499, 40.065800676631497 ], [ -74.980947975339006, 40.065703419535502 ], [ -74.980922349599098, 40.065585942095701 ], [ -74.980946102468394, 40.065536423998097 ], [ -74.980981614808798, 40.065507958970997 ], [ -74.981026972442095, 40.065471594522698 ], [ -74.981086404599694, 40.065399571449902 ], [ -74.981124138785304, 40.065327016466398 ], [ -74.981147993404505, 40.065268679301198 ], [ -74.981157934467006, 40.065244355667602 ], [ -74.981152520648294, 40.065164092982997 ], [ -74.981100974593105, 40.065042647987902 ], [ -74.981064284880404, 40.064939654482998 ], [ -74.981054195709802, 40.064911297938998 ], [ -74.980968139038097, 40.064677162272702 ], [ -74.980927193433004, 40.064509225086603 ], [ -74.980908240977499, 40.064228291994397 ], [ -74.980914913375301, 40.064064845354402 ], [ -74.980938552079195, 40.063911818499697 ], [ -74.980982798832798, 40.063786005041997 ], [ -74.981021416225403, 40.063584924614702 ], [ -74.981040843932206, 40.063428462299697 ], [ -74.981084817896104, 40.063309319172802 ], [ -74.981097856538796, 40.063202784401902 ], [ -74.981092987888204, 40.0631091719561 ], [ -74.981017453589999, 40.062937067252903 ], [ -74.980935110774595, 40.062824890824601 ], [ -74.980866216017006, 40.062703027543797 ], [ -74.980805106153596, 40.0626030496338 ], [ -74.980808918849405, 40.062509655406899 ], [ -74.980830514771398, 40.062406660861697 ], [ -74.980869597361306, 40.0623007538004 ], [ -74.980913298230305, 40.062188290106903 ], [ -74.980986981171498, 40.062086550864997 ], [ -74.981008973219801, 40.061973554941602 ], [ -74.981030704625994, 40.061867229669701 ], [ -74.981016598336495, 40.061786757465399 ], [ -74.981002912409394, 40.061696275479399 ], [ -74.980954762486704, 40.0615982859551 ], [ -74.980909960673003, 40.061418568859402 ], [ -74.980918652812093, 40.0613119293442 ], [ -74.980936037739994, 40.0612054993329 ], [ -74.980944605565, 40.061102190782897 ], [ -74.980927390349905, 40.0609915929099 ], [ -74.980918583958399, 40.060887874632002 ], [ -74.980887400283507, 40.0608003048646 ], [ -74.980843994454503, 40.060692409698902 ], [ -74.980768985492702, 40.060613803521299 ], [ -74.980549235652902, 40.060461596117001 ], [ -74.980482567958106, 40.0603915347195 ], [ -74.980425874715294, 40.060290005023603 ], [ -74.980434034513195, 40.060196706567098 ], [ -74.980486280090801, 40.060087773966998 ], [ -74.9805580543931, 40.060032745605803 ], [ -74.980668218081405, 40.059995330374001 ], [ -74.980816906775601, 40.059972206477099 ], [ -74.980935342548094, 40.059945010282803 ], [ -74.981089330866197, 40.059898630972299 ], [ -74.981209672580206, 40.059824732869203 ], [ -74.981312924449, 40.0597437458771 ], [ -74.9814028762503, 40.059669124247797 ], [ -74.9815262124431, 40.059521833675497 ], [ -74.981612918371596, 40.059420416926798 ], [ -74.981991398478598, 40.0589837763075 ], [ -74.982105370379699, 40.058852965410999 ], [ -74.982187456177101, 40.058758113894399 ], [ -74.982298705486301, 40.058694015585601 ], [ -74.982476835652903, 40.058588114663102 ], [ -74.982610472647195, 40.058507858509103 ], [ -74.982756047537904, 40.058454606488198 ], [ -74.982959674425103, 40.058362672827599 ], [ -74.983329308643505, 40.058142855916401 ], [ -74.983515708237505, 40.058047172494398 ], [ -74.983686915329002, 40.058004556446697 ], [ -74.983841033175906, 40.057954842754597 ], [ -74.983998533181094, 40.057928584050003 ], [ -74.984112754076705, 40.057897940249397 ], [ -74.984209489055303, 40.057870218360002 ], [ -74.984288715087999, 40.057845408860103 ], [ -74.984373362935898, 40.057794031114597 ], [ -74.984540240048005, 40.057644451691203 ], [ -74.984915219718005, 40.057399708812802 ], [ -74.9850670283288, 40.0572998564855 ], [ -74.985153386392696, 40.057206772784703 ], [ -74.985187581090997, 40.057114100684799 ], [ -74.985182706868599, 40.057020497382901 ], [ -74.985168189059607, 40.056950026744303 ], [ -74.985122751453304, 40.056892165847103 ], [ -74.984951432616398, 40.056724435480803 ], [ -74.984821353439401, 40.056611121874603 ], [ -74.984694793753405, 40.056517914600803 ], [ -74.984590484981496, 40.056411897930303 ], [ -74.984495128941802, 40.056299419734401 ], [ -74.984411712062396, 40.056213936577002 ], [ -74.984339355754798, 40.056070285213103 ], [ -74.984296774996494, 40.0559423804538 ], [ -74.984285480485198, 40.055883475913802 ], [ -74.984271691395506, 40.055811553927903 ], [ -74.984264920678896, 40.055657794494998 ], [ -74.984261135967202, 40.055537500608899 ], [ -74.984251224064394, 40.055426277164003 ], [ -74.984249214782807, 40.055403656981902 ], [ -74.984253974679305, 40.055286902757203 ], [ -74.984245028156494, 40.055186515393203 ], [ -74.984212346563595, 40.055135647116003 ], [ -74.984179925619998, 40.055078099161499 ], [ -74.984065783454099, 40.055000228911503 ], [ -74.983957633556997, 40.054935009673798 ], [ -74.983921594862494, 40.054913282189801 ], [ -74.983798569262802, 40.054840198712299 ], [ -74.983737269789899, 40.054745227638399 ], [ -74.983681392746405, 40.054623679366401 ], [ -74.983621305736904, 40.054498695725002 ], [ -74.9834771187803, 40.0544117484433 ], [ -74.982792963127807, 40.053927804572403 ], [ -74.982540735104195, 40.053826566690397 ], [ -74.982324240187396, 40.053807997339703 ], [ -74.982207078833298, 40.0537780794835 ], [ -74.982122120856303, 40.053756380241197 ], [ -74.981828854464894, 40.053702566551102 ], [ -74.981592707300393, 40.053633440730898 ], [ -74.981394118319699, 40.0536019382142 ], [ -74.981207194031299, 40.053604110188502 ], [ -74.981011861855194, 40.053599402265 ], [ -74.980832800509603, 40.053621802979698 ], [ -74.980645331570003, 40.0536373147931 ], [ -74.980492855014106, 40.053647001957103 ], [ -74.980288570308701, 40.053648753923298 ], [ -74.980089028501197, 40.053640599965597 ], [ -74.979838291076803, 40.053609513373097 ], [ -74.979659242677698, 40.0535250544728 ], [ -74.979511818271305, 40.053411316197902 ], [ -74.979382151615496, 40.053287986071602 ], [ -74.979251952296394, 40.053177996826598 ], [ -74.979143038841698, 40.053078540749603 ], [ -74.979008778595798, 40.052961776317197 ], [ -74.978866099534201, 40.052838131693697 ], [ -74.978705095780299, 40.052737409628897 ], [ -74.978556857212595, 40.052643681239601 ], [ -74.978404545709793, 40.052543177439297 ], [ -74.978274625066902, 40.052454278825898 ], [ -74.975663257240498, 40.050111411597797 ], [ -74.974785855479098, 40.049324179573802 ], [ -74.975762619392299, 40.048158022645097 ], [ -74.976215737770801, 40.047707606367297 ], [ -74.976641680087894, 40.047415625785497 ], [ -74.977189733872606, 40.047174312195096 ], [ -74.978258037697898, 40.046866012880699 ], [ -74.979200298996503, 40.046602384414598 ], [ -74.979893756233807, 40.046348661608 ], [ -74.980593046717402, 40.045951895050997 ], [ -74.981168893210693, 40.045536245023399 ], [ -74.981746689791393, 40.045072909506999 ], [ -74.982350337608196, 40.044482917806903 ], [ -74.983134954827307, 40.043515480616598 ], [ -74.983829711175005, 40.0427208715316 ], [ -74.9844320244529, 40.042162654437902 ], [ -74.984944493039706, 40.041777277562701 ], [ -74.985561632835996, 40.041362591967797 ], [ -74.986282169189394, 40.0409504001735 ], [ -74.987025298071998, 40.040491017852197 ], [ -74.987677322622403, 40.039990856142303 ], [ -74.9877089910119, 40.039966568012801 ], [ -74.992557140193199, 40.035771800109202 ], [ -74.997731573321602, 40.031171044266998 ], [ -74.998760698306498, 40.030288905398599 ], [ -74.999760743564394, 40.029612883302597 ], [ -75.000468954345195, 40.0292004743823 ], [ -75.000862856693104, 40.028971104021302 ], [ -75.006231605208598, 40.0256791488885 ], [ -75.009693757379907, 40.023470972523903 ], [ -75.010631583116407, 40.022793375762497 ], [ -75.012596263642607, 40.0212811823164 ], [ -75.013230953167295, 40.0208858951205 ], [ -75.013678723995298, 40.0206070099496 ], [ -75.014865805851997, 40.019903494490002 ], [ -75.016279609422199, 40.019221278068002 ], [ -75.0182579099327, 40.0183933848325 ], [ -75.019370740051301, 40.017990328074497 ], [ -75.020416438465304, 40.017712930752097 ], [ -75.021480237555707, 40.017499587104297 ], [ -75.022502700794206, 40.017285251861999 ], [ -75.023773190803595, 40.017076787911897 ], [ -75.026582889555797, 40.016666210477602 ], [ -75.029454730107503, 40.016286682317201 ], [ -75.030971787994901, 40.016086162194497 ], [ -75.033054753040005, 40.0157377615553 ], [ -75.034784383050606, 40.015428688451699 ], [ -75.036582365743797, 40.014962123691198 ], [ -75.037881076218298, 40.014563275114803 ], [ -75.038485855360193, 40.014341077326499 ], [ -75.039182932928895, 40.014084950395798 ], [ -75.040380795351297, 40.013620069763 ], [ -75.041665111809706, 40.013061758742097 ], [ -75.042636206663204, 40.012575593348302 ], [ -75.0431899883352, 40.012307566847497 ], [ -75.043599914673294, 40.012109168226601 ], [ -75.043733202616494, 40.012044658969103 ], [ -75.045952237149606, 40.0108719976797 ], [ -75.047009108273201, 40.0103082720318 ], [ -75.048025257943294, 40.009727666125698 ], [ -75.048832799387199, 40.009189881464501 ], [ -75.049940438195705, 40.008388698960701 ], [ -75.050922149307894, 40.007632265539101 ], [ -75.051712759919099, 40.006998606317602 ], [ -75.052357439000104, 40.006393329088198 ], [ -75.052666010443602, 40.006014947780798 ], [ -75.052879342668106, 40.005753357034997 ], [ -75.054222741548998, 40.0037009073002 ], [ -75.0543575195518, 40.003514968738898 ], [ -75.055163780696304, 40.0024026117704 ], [ -75.056029058118696, 40.000927529473799 ], [ -75.056936888881594, 39.999421632734702 ], [ -75.057805870819493, 39.997851177430199 ], [ -75.058431748732204, 39.996672730363699 ], [ -75.058820845568505, 39.995727354014498 ], [ -75.059398544234597, 39.994197787394199 ], [ -75.0597869839563, 39.993268296446601 ], [ -75.060083328383001, 39.992575270915403 ], [ -75.060532473030193, 39.991679025519097 ], [ -75.061114404348601, 39.9905631682958 ], [ -75.062615730618106, 39.988164355777499 ], [ -75.063185650096401, 39.987350464742597 ], [ -75.063948417509295, 39.986366092206502 ], [ -75.0644662992012, 39.9858214180421 ], [ -75.064980402008402, 39.985372110297 ], [ -75.065143448541306, 39.985251057520799 ], [ -75.065811327811105, 39.9847552093159 ], [ -75.065878764511893, 39.984705940416802 ], [ -75.067817925564498, 39.983289084714698 ], [ -75.068089867775299, 39.983090379799599 ], [ -75.0688806572999, 39.982433657783503 ], [ -75.069394092485297, 39.982007274568403 ], [ -75.070139789114194, 39.9814519851436 ], [ -75.071201643512694, 39.980745000874798 ], [ -75.072239051109506, 39.980132875586797 ], [ -75.073233242053306, 39.979567461679899 ], [ -75.074498495745303, 39.978944727738501 ], [ -75.0758244574467, 39.9783552109566 ], [ -75.077230529260802, 39.9778311859925 ], [ -75.078299777454205, 39.977458373174699 ], [ -75.079261976622007, 39.977178515843498 ], [ -75.080306177584305, 39.976916461796698 ], [ -75.0814968472271, 39.976610085317198 ], [ -75.086392847517104, 39.9756738949797 ], [ -75.091347558917903, 39.974818393983902 ], [ -75.093470886322606, 39.974453956515497 ], [ -75.094017095365302, 39.974346500760397 ], [ -75.096075536599102, 39.973941534995099 ], [ -75.099182765720698, 39.973265676013497 ], [ -75.101354134959806, 39.972727214273903 ], [ -75.103173039631997, 39.972212398181902 ], [ -75.105078270260506, 39.9716040970617 ], [ -75.106756853065505, 39.970974632013402 ], [ -75.108453694667702, 39.9703168925437 ], [ -75.1105144347801, 39.969518045753397 ], [ -75.112888784147799, 39.968538622911701 ], [ -75.113000837134194, 39.968489848308799 ], [ -75.118824026200699, 39.965955116461203 ], [ -75.119450004780006, 39.965682608541101 ], [ -75.123368819579099, 39.963783886467098 ], [ -75.125930800541198, 39.962474062844102 ], [ -75.127776580796706, 39.961530330904303 ], [ -75.129089664860402, 39.960717206444997 ], [ -75.129832187691704, 39.9602251126746 ], [ -75.130479788624697, 39.959620038608797 ], [ -75.130496987479901, 39.959603978531803 ], [ -75.130881612596795, 39.959152253486302 ], [ -75.131081600547901, 39.958917370743997 ], [ -75.1315398317535, 39.958291515360301 ], [ -75.132269786827607, 39.957051438196999 ], [ -75.133823853256004, 39.954271178381099 ], [ -75.134484260949705, 39.952952041545203 ], [ -75.1345404076134, 39.952839891385899 ], [ -75.1346900477091, 39.952506391010701 ], [ -75.134879551096503, 39.952084047942598 ], [ -75.135320863898201, 39.950821470330702 ], [ -75.135742738498607, 39.949526633105002 ], [ -75.135892793351601, 39.948893225135002 ], [ -75.136038849823294, 39.948276647189601 ], [ -75.136172676373207, 39.947484306472298 ], [ -75.136289512913606, 39.946596114742199 ], [ -75.136318246059304, 39.945849097553598 ], [ -75.136229196227603, 39.944940320174297 ], [ -75.136027248437003, 39.9437426234946 ], [ -75.135973585043601, 39.943389396366399 ], [ -75.1358623368358, 39.942657119286999 ], [ -75.135764737424694, 39.941970853211799 ], [ -75.135698176741698, 39.941014860261802 ], [ -75.135700592168703, 39.940802975763503 ], [ -75.135715578662101, 39.9394880883371 ], [ -75.135946258862305, 39.934022004377503 ], [ -75.135948976400996, 39.933957435655998 ], [ -75.135931059502397, 39.932811659784697 ], [ -75.135914238549205, 39.932453244274797 ], [ -75.135874286653504, 39.931601358616298 ], [ -75.135724543841704, 39.930659372232498 ], [ -75.135458274083604, 39.929523837238499 ], [ -75.135179784175506, 39.928706184498601 ], [ -75.135147780317993, 39.928625740852198 ], [ -75.134802967348804, 39.927759018421803 ], [ -75.134426160674295, 39.926811860096102 ], [ -75.134120689835299, 39.9260937920685 ], [ -75.134009313042796, 39.925831962521002 ], [ -75.133571204812696, 39.924867490182002 ], [ -75.132236950331603, 39.921940466528198 ], [ -75.1313802851231, 39.920060984437903 ], [ -75.130759108768899, 39.918487818242802 ], [ -75.130443113741606, 39.917573839770697 ], [ -75.130188430529998, 39.916677173373799 ], [ -75.129991392999202, 39.915893181745098 ], [ -75.129700537259794, 39.9143275472372 ], [ -75.129684554426404, 39.914232204472903 ], [ -75.1295157650123, 39.913225672401502 ], [ -75.129384957754795, 39.912331834906702 ], [ -75.129300333230503, 39.911311791518997 ], [ -75.129240632867393, 39.910180959566297 ], [ -75.1291985155096, 39.909130063347497 ], [ -75.129233437160593, 39.908224110854903 ], [ -75.129285926866501, 39.907398093842303 ], [ -75.129397883417894, 39.9066370669481 ], [ -75.129650824201704, 39.905433838936602 ], [ -75.129693310736499, 39.905262163895799 ], [ -75.129846545913495, 39.904642920147303 ], [ -75.130129097255093, 39.9037426184222 ], [ -75.130410428165604, 39.9028741036092 ], [ -75.131234153765106, 39.900793077355097 ], [ -75.131757131349204, 39.899548287450699 ], [ -75.133205057536998, 39.896272496873898 ], [ -75.134591933569496, 39.893629396322503 ], [ -75.135522789920401, 39.8918552464649 ], [ -75.135854909951703, 39.891274226016698 ], [ -75.136287727309195, 39.890759131754599 ], [ -75.136891717868494, 39.890088862578601 ], [ -75.137731816257599, 39.889185353425901 ], [ -75.139556374485096, 39.887381606503901 ], [ -75.140390915314399, 39.886621125871898 ], [ -75.141119226773199, 39.8859377549051 ], [ -75.142344511266998, 39.885217970645897 ], [ -75.143308188061994, 39.8848581029212 ], [ -75.144608038310096, 39.884346794702203 ], [ -75.146165730667207, 39.884111764427701 ], [ -75.1492489108619, 39.883943158542799 ], [ -75.152373944536805, 39.883759506728801 ], [ -75.157633069605495, 39.883385448522802 ], [ -75.159973460895898, 39.883199750247798 ], [ -75.162173059203894, 39.882915380204103 ], [ -75.164188771488696, 39.882579092272501 ], [ -75.166996893556004, 39.882037928349099 ], [ -75.169656924152207, 39.881588806919602 ], [ -75.172145866566694, 39.8812948504535 ], [ -75.173368483708998, 39.881179175636298 ], [ -75.174725642096703, 39.881055320865599 ], [ -75.175046787654594, 39.881026010308503 ], [ -75.176888910779098, 39.880908304934302 ], [ -75.178234703840602, 39.880811256206499 ], [ -75.179289269631695, 39.880771288624899 ], [ -75.184569480847202, 39.8809214332666 ], [ -75.184829552643905, 39.880902882798999 ], [ -75.185418331010595, 39.880860891922097 ], [ -75.186267778566503, 39.880784454822802 ], [ -75.187037099402204, 39.880642589949503 ], [ -75.187663198758898, 39.8804656938851 ], [ -75.188332350402106, 39.880242039306403 ], [ -75.188981471851903, 39.880002030417998 ], [ -75.190137070170493, 39.879471079922901 ], [ -75.193415229179806, 39.878028475751002 ], [ -75.194166344056896, 39.877697909848997 ], [ -75.194231031157301, 39.877669448106701 ], [ -75.195429000833201, 39.877107576445503 ], [ -75.197009031777597, 39.876267873891202 ], [ -75.198186927437206, 39.875689615398898 ], [ -75.199430258369404, 39.8750173579744 ], [ -75.2006505593546, 39.8744082134262 ], [ -75.202104302059496, 39.873629262772603 ], [ -75.202990342738303, 39.873124007640897 ], [ -75.205097777619699, 39.871977765641802 ], [ -75.205793949066702, 39.871579627901198 ], [ -75.206658708118795, 39.871089784827397 ], [ -75.207314212876994, 39.870674823785599 ], [ -75.207947888561193, 39.8702911983967 ], [ -75.211976621249804, 39.867471859708097 ], [ -75.216039928139594, 39.871124357226797 ], [ -75.215791000477196, 39.875050282066702 ], [ -75.2157290524611, 39.8760272397775 ], [ -75.215724696524902, 39.876096448640503 ], [ -75.215724065635399, 39.876113382566203 ], [ -75.215902165621401, 39.8760688293671 ], [ -75.216049606011595, 39.876033941423799 ], [ -75.216205912900307, 39.8760002404576 ], [ -75.216350628244399, 39.875966922692797 ], [ -75.216373101343393, 39.875961662183499 ], [ -75.216702488501099, 39.875885962349201 ], [ -75.216847677440299, 39.875852474237199 ], [ -75.217015663329704, 39.8758163273598 ], [ -75.217518389522894, 39.875754755269902 ], [ -75.217703280002198, 39.875729090259298 ], [ -75.217861712175406, 39.875710192465803 ], [ -75.218036146128696, 39.875692116560799 ], [ -75.218321206581294, 39.875687512902402 ], [ -75.218332169551104, 39.875687674027297 ], [ -75.218796437782899, 39.8756815683684 ], [ -75.218826973561804, 39.875681179711599 ], [ -75.218887507652397, 39.875682904299097 ], [ -75.218923308582504, 39.875678667506698 ], [ -75.2192428752128, 39.8756008964858 ], [ -75.219446196877101, 39.875553155742502 ], [ -75.219623695687304, 39.875511764109199 ], [ -75.219649940108894, 39.8755006756708 ], [ -75.219706649197704, 39.875485448596699 ], [ -75.219737057313196, 39.875482516053403 ], [ -75.219773353637294, 39.875488849687102 ], [ -75.220867176997203, 39.875579581640899 ], [ -75.221042793429007, 39.875595089612801 ], [ -75.221232731285198, 39.875611327829397 ], [ -75.221282633663805, 39.8756156186409 ], [ -75.222085667271898, 39.8756836672529 ], [ -75.222700979934601, 39.875739406960697 ], [ -75.222872349725193, 39.8757600172273 ], [ -75.223069275977906, 39.875783326195702 ], [ -75.223155371598196, 39.875793595090698 ], [ -75.223767719304007, 39.8758671845641 ], [ -75.224655930364605, 39.876032427788502 ], [ -75.224859460888695, 39.876069394213602 ], [ -75.225030371666605, 39.876102722249001 ], [ -75.225954495885006, 39.876275981658999 ], [ -75.226846635872207, 39.876411867541897 ], [ -75.226891965549001, 39.876413667551603 ], [ -75.227120927382799, 39.876445108123598 ], [ -75.228473463357204, 39.876640446536697 ], [ -75.228727344660001, 39.876676675927001 ], [ -75.228908570846798, 39.876701854783398 ], [ -75.229988125244105, 39.876856228105702 ], [ -75.230478581725393, 39.8768981155429 ], [ -75.230646550177497, 39.876910602369499 ], [ -75.230849067071802, 39.8769283534699 ], [ -75.230999151232794, 39.876942212562 ], [ -75.231057998693899, 39.876947830979802 ], [ -75.231872134395005, 39.877019226031102 ], [ -75.231930846172702, 39.877025669935001 ], [ -75.232312268383296, 39.877065657984403 ], [ -75.232551163428695, 39.877091079950198 ], [ -75.232659615647293, 39.877102445473497 ], [ -75.232816679304193, 39.877120482960898 ], [ -75.232993472696904, 39.877137530026701 ], [ -75.233272836708593, 39.877164037606697 ], [ -75.233958330972598, 39.8771866864518 ], [ -75.234020742694696, 39.877188588395803 ], [ -75.234124057784697, 39.877190253109802 ], [ -75.234304831626304, 39.877145216656402 ], [ -75.234483704341599, 39.8771038322813 ], [ -75.234655290323303, 39.877062792240501 ], [ -75.234686895829498, 39.877054989593802 ], [ -75.235027345336604, 39.876973776938797 ], [ -75.235540763388201, 39.876760920911103 ], [ -75.235798538140003, 39.876588449780797 ], [ -75.235930125910002, 39.876497479947503 ], [ -75.236052653955298, 39.8764130596835 ], [ -75.2363724474572, 39.876196699830203 ], [ -75.236642949362704, 39.875745800505797 ], [ -75.236716311359601, 39.875623468382798 ], [ -75.236775808431602, 39.875484244757203 ], [ -75.236935087067096, 39.875126032656802 ], [ -75.237501980110196, 39.875089630091999 ], [ -75.237593342891401, 39.8749911901633 ], [ -75.237538460388905, 39.874920997437201 ], [ -75.237503128901196, 39.874876479318999 ], [ -75.237462682041794, 39.874813423628503 ], [ -75.238112796330796, 39.874602220412797 ], [ -75.238248000211598, 39.874455879980601 ], [ -75.238328207919096, 39.874371619946999 ], [ -75.238379468134795, 39.874310944157301 ], [ -75.238691638252106, 39.8739683346082 ], [ -75.238995513292195, 39.873845610984297 ], [ -75.2391741008568, 39.873618058340902 ], [ -75.239263072586894, 39.873499688794297 ], [ -75.239350316426297, 39.873381236275598 ], [ -75.2394064481866, 39.873308917806298 ], [ -75.240101566965507, 39.873039251086801 ], [ -75.240107106803507, 39.8728678677424 ], [ -75.240103830687403, 39.872740196849101 ], [ -75.240102185822707, 39.872638672567703 ], [ -75.240104232586802, 39.8726066509345 ], [ -75.240473678868398, 39.872390953481002 ], [ -75.240899940210795, 39.872409235394699 ], [ -75.240940008857905, 39.8724144285789 ], [ -75.241091177159504, 39.872447174241003 ], [ -75.241218455144093, 39.87247518897 ], [ -75.241373069723707, 39.872510883888602 ], [ -75.241421719753902, 39.872520877880802 ], [ -75.241557885236602, 39.8725495192813 ], [ -75.241748681470796, 39.8725946733542 ], [ -75.242220931323601, 39.872786227440102 ], [ -75.242292037166905, 39.872817678701701 ], [ -75.242569998245401, 39.872964326070402 ], [ -75.242697123152297, 39.873030799283498 ], [ -75.242732329595, 39.873048634525702 ], [ -75.246736913814104, 39.875077564633102 ], [ -75.246778572255494, 39.875112379126101 ], [ -75.246826868008, 39.875152726544599 ], [ -75.248432954319895, 39.876494566501698 ], [ -75.251771875425902, 39.876016316645902 ], [ -75.252259069391499, 39.875946523687197 ], [ -75.252727790955106, 39.875975020864701 ], [ -75.253438060996501, 39.876018212443903 ], [ -75.253980804167995, 39.876051218374499 ], [ -75.256130162545006, 39.876181871914703 ], [ -75.257422994598002, 39.876260447930903 ], [ -75.259522882075601, 39.876388033324297 ], [ -75.261251663493198, 39.876493041755502 ], [ -75.262531777464702, 39.876570788123601 ], [ -75.262541100593396, 39.876587334466599 ], [ -75.264833853358994, 39.880655404317999 ], [ -75.265005250257502, 39.880990883453002 ], [ -75.265114213683106, 39.881664960813602 ], [ -75.264546860067995, 39.882121712324199 ], [ -75.264299750636297, 39.882250239720598 ], [ -75.263083579105398, 39.882363840781402 ], [ -75.262264689064097, 39.882579892075 ], [ -75.2619474074273, 39.882896937078002 ], [ -75.261887359560205, 39.883076759448997 ], [ -75.261966637005997, 39.883248227192198 ], [ -75.262434366661495, 39.883642337802101 ], [ -75.264136146786797, 39.884141823503697 ], [ -75.264445907785102, 39.884322964749799 ], [ -75.264640030621095, 39.884741810167903 ], [ -75.264229172722395, 39.885010277946499 ], [ -75.263155018975198, 39.885308690795199 ], [ -75.262731334011093, 39.8855621078404 ], [ -75.262618768292398, 39.885813050193804 ], [ -75.262684662285295, 39.886034006555001 ], [ -75.262805564286097, 39.886091131350497 ], [ -75.263685618971806, 39.886153339490399 ], [ -75.2639832750925, 39.886104953377298 ], [ -75.264285462688903, 39.886201057372602 ], [ -75.264800285574594, 39.886453471284597 ], [ -75.264853321446694, 39.886545125725299 ], [ -75.264935892166605, 39.886681830326602 ], [ -75.265039519292799, 39.886841480112999 ], [ -75.265107095500994, 39.886989103802897 ], [ -75.265137195828999, 39.887164016773902 ], [ -75.265130833905303, 39.887338148191198 ], [ -75.265097717268802, 39.887545423552403 ], [ -75.264980338315098, 39.887762116249299 ], [ -75.264879390990899, 39.887928565575201 ], [ -75.264727612341602, 39.888088299401304 ], [ -75.264598531681997, 39.888226036573499 ], [ -75.264448382459804, 39.888340827997602 ], [ -75.264263013343296, 39.888421131325899 ], [ -75.263998258932105, 39.888477223738299 ], [ -75.263727649095898, 39.888493833294 ], [ -75.263378270002406, 39.888469396009903 ], [ -75.262978677176903, 39.888421370310802 ], [ -75.262681567403703, 39.888364332055801 ], [ -75.262474946644005, 39.888427304787797 ], [ -75.262295018480899, 39.8885583136775 ], [ -75.262201766615206, 39.8887136925024 ], [ -75.262135618285797, 39.888925872382998 ], [ -75.262097829961306, 39.889161147566099 ], [ -75.262082729258196, 39.889374435531103 ], [ -75.262089648154003, 39.889683760504901 ], [ -75.262103101531494, 39.889914534839299 ], [ -75.262125080720296, 39.890111761167098 ], [ -75.262111418086306, 39.890285734112801 ], [ -75.262104226437103, 39.890482327228803 ], [ -75.262037677078794, 39.890705733738102 ], [ -75.261884019842697, 39.891315134555903 ], [ -75.261856798284896, 39.891460702247699 ], [ -75.261792096303495, 39.891633567162799 ], [ -75.2617353038262, 39.891789728214299 ], [ -75.261607225817201, 39.891899382179801 ], [ -75.261506728157102, 39.8919534130332 ], [ -75.261315286260299, 39.891999846952103 ], [ -75.261100332319899, 39.892090747433699 ], [ -75.260731827163198, 39.892189548092198 ], [ -75.260143527916796, 39.892311684012299 ], [ -75.259930833683498, 39.892340796446803 ], [ -75.259747505384496, 39.892364915333502 ], [ -75.259543120681201, 39.89236609668 ], [ -75.259351676282606, 39.892412527319799 ], [ -75.259109398085599, 39.892452239738297 ], [ -75.258960270812295, 39.892538935664298 ], [ -75.258779913433798, 39.892681174459298 ], [ -75.258570589151702, 39.8928171611499 ], [ -75.258388995637603, 39.892993096595603 ], [ -75.258214488044999, 39.8931748170181 ], [ -75.2580247762114, 39.893373064178597 ], [ -75.257831210871998, 39.893576849447598 ], [ -75.257671904435796, 39.893742024060202 ], [ -75.257435548529998, 39.894017957658001 ], [ -75.256912419977496, 39.894551860349402 ], [ -75.256744992000307, 39.8947393458729 ], [ -75.256667541196606, 39.8948613312308 ], [ -75.256664452021795, 39.894945587847502 ], [ -75.256711991767304, 39.895042190161902 ], [ -75.256793732940693, 39.895201362452298 ], [ -75.256970068869506, 39.895368223370198 ], [ -75.257126790746199, 39.895472822364603 ], [ -75.257276426072906, 39.895571635822698 ], [ -75.257391606439199, 39.895714677304397 ], [ -75.257364579419203, 39.895854626217201 ], [ -75.257278805535407, 39.896004541928001 ], [ -75.257149077308597, 39.896159114831597 ], [ -75.256937062058995, 39.8963681197489 ], [ -75.256764189639895, 39.8965048962936 ], [ -75.256452220520202, 39.896852262861003 ], [ -75.2562385649166, 39.897106199397498 ], [ -75.256092791470095, 39.897299777446399 ], [ -75.255984102371301, 39.897477304661997 ], [ -75.255806898908304, 39.897732033596597 ], [ -75.2556199898617, 39.897952826950302 ], [ -75.255509032350602, 39.898192130475202 ], [ -75.255332443509801, 39.898430005558097 ], [ -75.255227666133194, 39.898500804654503 ], [ -75.255158532110897, 39.898594868207397 ], [ -75.255097722046102, 39.898661001942699 ], [ -75.255094218537394, 39.898756493925397 ], [ -75.255099136806706, 39.898777395872997 ], [ -75.2551194659533, 39.898863847055303 ], [ -75.255168872857894, 39.8989098909163 ], [ -75.255236439633094, 39.899057520415901 ], [ -75.255341711232106, 39.899172246319701 ], [ -75.255489291660297, 39.899327230159699 ], [ -75.255622090661703, 39.899487523342202 ], [ -75.255667849627201, 39.8995265229211 ], [ -75.255519880445505, 39.899678363706002 ], [ -75.255522261805496, 39.899681370781799 ], [ -75.253714366467904, 39.901667778632898 ], [ -75.251291100238802, 39.904412701549397 ], [ -75.2534921019503, 39.905597365661102 ], [ -75.252478297966604, 39.906637364630498 ], [ -75.252396135407693, 39.906640845430502 ], [ -75.252154215545602, 39.906669298744703 ], [ -75.251992728915994, 39.906693891038202 ], [ -75.251757059428101, 39.906750590701698 ], [ -75.251630393781795, 39.906820909874298 ], [ -75.251499449653593, 39.9069080022579 ], [ -75.251304862466597, 39.907038675926501 ], [ -75.251058605587801, 39.9071850805785 ], [ -75.250872136886997, 39.907293450731302 ], [ -75.250715878537093, 39.907374359209498 ], [ -75.250446702613601, 39.907548382947802 ], [ -75.250319403178494, 39.907635544503002 ], [ -75.250272549851701, 39.907718846868001 ], [ -75.250225065105894, 39.907819002046701 ], [ -75.250206552361007, 39.9079254021431 ], [ -75.250186593764496, 39.908071126106996 ], [ -75.250200216930693, 39.908296284113803 ], [ -75.250194228202105, 39.908459170283699 ], [ -75.250168007156802, 39.908576655706298 ], [ -75.250118468514898, 39.9087329700467 ], [ -75.250046838684796, 39.908894433854599 ], [ -75.250004582551, 39.909050906960502 ], [ -75.249934810881697, 39.909161820442002 ], [ -75.249893793413307, 39.909284596337798 ], [ -75.249919874160398, 39.909369489080497 ], [ -75.249993515676493, 39.909448931810999 ], [ -75.250036290084495, 39.9094788315101 ], [ -75.250151548622995, 39.909520700202201 ], [ -75.250281810239599, 39.9095516424957 ], [ -75.2504714507009, 39.909555777270398 ], [ -75.250652545681803, 39.9095934586243 ], [ -75.250883683847107, 39.909660332560001 ], [ -75.251107103050899, 39.909738282167098 ], [ -75.251228625502705, 39.909808388263301 ], [ -75.251298671692595, 39.909888616702403 ], [ -75.251286629048394, 39.9100176467526 ], [ -75.251238123905097, 39.910145882088898 ], [ -75.251123552056598, 39.910283921801302 ], [ -75.251002097848996, 39.910410566995402 ], [ -75.250872327545096, 39.910565141782499 ], [ -75.250721692823205, 39.910691150604102 ], [ -75.250615446483494, 39.910801260352201 ], [ -75.250538172914702, 39.910917623858197 ], [ -75.250401105662704, 39.911072039071897 ], [ -75.250194735837795, 39.911224943063303 ], [ -75.249928435368801, 39.911320317839902 ], [ -75.249750488021306, 39.911395139071303 ], [ -75.249520236201704, 39.911502543475102 ], [ -75.249335004641097, 39.911577205212502 ], [ -75.249163925988299, 39.911663419782101 ], [ -75.248984737317997, 39.911771936984799 ], [ -75.248856819472493, 39.911875959250899 ], [ -75.248764538288597, 39.912003238653703 ], [ -75.248722277272705, 39.9121597112823 ], [ -75.248687115798703, 39.9123219700029 ], [ -75.248599442168498, 39.912522429433402 ], [ -75.248559247023906, 39.912622734076997 ], [ -75.248511136246904, 39.9127397416189 ], [ -75.248433856874797, 39.912856103704598 ], [ -75.248379289107604, 39.912950481503401 ], [ -75.248296161129105, 39.913027360473698 ], [ -75.248213446072199, 39.913093013002403 ], [ -75.248056952477498, 39.913179544292397 ], [ -75.247833585285605, 39.913298340142902 ], [ -75.247603530435001, 39.913400132007602 ], [ -75.247402254059807, 39.913513787002103 ], [ -75.247202412627601, 39.913588126560001 ], [ -75.247118455289197, 39.913687475436497 ], [ -75.2470709617305, 39.913787629303101 ], [ -75.247066205597704, 39.913916818164097 ], [ -75.2471196045326, 39.914052898782202 ], [ -75.247224667485895, 39.9141732405554 ], [ -75.247335880083298, 39.914307708901198 ], [ -75.247413880544599, 39.914427730053298 ], [ -75.247488227990402, 39.914542103267998 ], [ -75.247496815789006, 39.914558643757502 ], [ -75.247554640269101, 39.914591377591599 ], [ -75.247634385977094, 39.914645564984603 ], [ -75.247708426504403, 39.914731099531103 ], [ -75.247717791720703, 39.914846685237897 ], [ -75.247656705228295, 39.914964238207403 ], [ -75.247556803912701, 39.915087926685601 ], [ -75.247488269702203, 39.915222796309401 ], [ -75.247349750967203, 39.9154085851887 ], [ -75.247190204381496, 39.915641117991498 ], [ -75.247139024991895, 39.9157361548951 ], [ -75.247059534448795, 39.915860297548697 ], [ -75.246990788695797, 39.9159392105447 ], [ -75.2469221710613, 39.916014639451603 ], [ -75.246844223493, 39.916096856347004 ], [ -75.246784614124905, 39.916174220765299 ], [ -75.246754876016197, 39.916241758764002 ], [ -75.246766092984799, 39.916338157784999 ], [ -75.246788937107596, 39.916457533731801 ], [ -75.246837063910903, 39.916568731007203 ], [ -75.246879304119105, 39.916716506257401 ], [ -75.246941940833693, 39.916879494060503 ], [ -75.246941972593703, 39.916879584853298 ], [ -75.246963741942494, 39.916936002834497 ], [ -75.247003121785994, 39.916976199928399 ], [ -75.247041958006207, 39.917000653779297 ], [ -75.247105326498996, 39.917036995671801 ], [ -75.247157418169706, 39.917071352448502 ], [ -75.247190283032396, 39.917103541578598 ], [ -75.247203526498893, 39.917144916003899 ], [ -75.247212029043894, 39.917191430727499 ], [ -75.247195058734505, 39.9172207750834 ], [ -75.247174053187194, 39.917245625490899 ], [ -75.247241223313694, 39.917411685342799 ], [ -75.247306664063899, 39.9176247302901 ], [ -75.247349261577696, 39.917794947884403 ], [ -75.247359948111693, 39.918002094465301 ], [ -75.247349964048198, 39.918439219146101 ], [ -75.247334692698402, 39.9186881278561 ], [ -75.247335952402594, 39.918819826648701 ], [ -75.247392597707204, 39.919023273151701 ], [ -75.247499194333002, 39.919279544914801 ], [ -75.247586060871299, 39.919408408859297 ], [ -75.247624459480093, 39.919526808595897 ], [ -75.247625027813498, 39.919677305040601 ], [ -75.247598069610007, 39.9199118491441 ], [ -75.247582922556205, 39.919991463782303 ], [ -75.247529610810602, 39.920112565188496 ], [ -75.247489185447805, 39.920215144071499 ], [ -75.247478584851194, 39.9203371776225 ], [ -75.247467811216794, 39.9204639105863 ], [ -75.247462967876601, 39.9205954761687 ], [ -75.247470331211503, 39.920727308162597 ], [ -75.247470145210897, 39.920981249310202 ], [ -75.247462583122896, 39.921352591194001 ], [ -75.247487391779003, 39.921508319871002 ], [ -75.247518292619006, 39.921664172487702 ], [ -75.247516154330199, 39.921688245434403 ], [ -75.247507864517701, 39.921781515627998 ], [ -75.247473380601605, 39.921888918373 ], [ -75.247393911544606, 39.922056480770998 ], [ -75.247291770028397, 39.922176516375799 ], [ -75.247165398589004, 39.922291328849496 ], [ -75.247070398007295, 39.922383300998703 ], [ -75.246937737902201, 39.922502670149399 ], [ -75.2466435772875, 39.922778412928302 ], [ -75.246523122742204, 39.922898048097302 ], [ -75.246364327337602, 39.9230638779351 ], [ -75.246268459145398, 39.923179346479301 ], [ -75.246190208971399, 39.923314012412597 ], [ -75.246160602406803, 39.9234544436611 ], [ -75.246142337426804, 39.923618638513098 ], [ -75.246135587526297, 39.923801888559503 ], [ -75.246131433442699, 39.923914665436101 ], [ -75.246097107681393, 39.924017368097203 ], [ -75.246074481158999, 39.924134444800799 ], [ -75.246033705324393, 39.924246412985703 ], [ -75.245992583132306, 39.924367779978603 ], [ -75.245946580278897, 39.924456127048899 ], [ -75.245868327997997, 39.924590792760299 ], [ -75.245796859921299, 39.924706793813201 ], [ -75.245728108555298, 39.924832269550599 ], [ -75.245681903898401, 39.924891771282901 ], [ -75.245638340511604, 39.924947870863299 ], [ -75.245555021850706, 39.925054215594699 ], [ -75.245440665100503, 39.925173982930502 ], [ -75.245266537932594, 39.925424115998403 ], [ -75.245200490743201, 39.925559047897401 ], [ -75.245129193352298, 39.925670358125302 ], [ -75.245051977137095, 39.925776826817398 ], [ -75.244994284054897, 39.925850808605198 ], [ -75.244870141726906, 39.925904525961599 ], [ -75.244764137103999, 39.925963351645798 ], [ -75.244627971659398, 39.926012102886197 ], [ -75.244521966991101, 39.9260709193438 ], [ -75.244403234809496, 39.926143567193201 ], [ -75.244337866438499, 39.926259700703099 ], [ -75.244303548145396, 39.926362412082199 ], [ -75.244332604254197, 39.926485312001397 ], [ -75.244414594074101, 39.926581158359703 ], [ -75.244509473062806, 39.926658473494797 ], [ -75.244578897783697, 39.926763442568401 ], [ -75.244599491246007, 39.926867353746097 ], [ -75.244581926136206, 39.927012750960699 ], [ -75.244581621716193, 39.927186744450403 ], [ -75.244553569110707, 39.927284880594797 ], [ -75.244499888112102, 39.927415379143 ], [ -75.244428252865205, 39.927536088005603 ], [ -75.244344063302094, 39.927665919894601 ], [ -75.244271734889196, 39.927805417290898 ], [ -75.244201126932097, 39.927897920301298 ], [ -75.244123386651495, 39.928018495592902 ], [ -75.244057161418098, 39.928158126236703 ], [ -75.244003412454006, 39.928373271589301 ], [ -75.243987046813004, 39.928485772597298 ], [ -75.243968613663299, 39.928654666754802 ], [ -75.243968815761505, 39.928814561758898 ], [ -75.243973442209594, 39.929186161151698 ], [ -75.243968805279806, 39.929477621828397 ], [ -75.243969855044, 39.929610082034401 ], [ -75.243969885399096, 39.929614020046202 ], [ -75.243984213076303, 39.929722497601396 ], [ -75.244011788689207, 39.929803045486501 ], [ -75.244101087323301, 39.929866129341903 ], [ -75.244191079124406, 39.929910415494497 ], [ -75.244280377733901, 39.929973508212903 ], [ -75.244356949102297, 39.930050414340101 ], [ -75.244407544449402, 39.930169090624901 ], [ -75.244430336632604, 39.930296556807598 ], [ -75.244383449852705, 39.930408400030799 ], [ -75.244276398975202, 39.930495403706097 ], [ -75.2441330803467, 39.930572217430097 ], [ -75.243952616203501, 39.930662328848101 ], [ -75.243815389402002, 39.930739275312 ], [ -75.2436959671913, 39.9308307113076 ], [ -75.2436377367777, 39.930918790374299 ], [ -75.243607081867495, 39.931087417392099 ], [ -75.243560031916601, 39.931203950937501 ], [ -75.243518207898603, 39.931344114659602 ], [ -75.243476915313195, 39.931470180400403 ], [ -75.243436303775695, 39.931577457245098 ], [ -75.243420109732995, 39.931685258759501 ], [ -75.243404435235405, 39.931778971053298 ], [ -75.243402355852396, 39.931835354934101 ], [ -75.243344829147802, 39.9319046364785 ], [ -75.243281371295893, 39.931969085158897 ], [ -75.243187737873697, 39.932023476830302 ], [ -75.243106474985296, 39.932073426636698 ], [ -75.243051306620202, 39.932161572378398 ], [ -75.242936933504296, 39.932281337204998 ], [ -75.242846284130806, 39.932420433350501 ], [ -75.242724072235902, 39.932587058572999 ], [ -75.242626451108507, 39.932749509112497 ], [ -75.242531256067906, 39.932846185895897 ], [ -75.242454894192306, 39.9329291648029 ], [ -75.242352727620698, 39.933049195989703 ], [ -75.242288054029899, 39.933146539956297 ], [ -75.242241682273004, 39.933244275080597 ], [ -75.242171250665905, 39.933332086686903 ], [ -75.242126785704002, 39.933378137312602 ], [ -75.242014501193694, 39.9334415176167 ], [ -75.241890862573499, 39.933481142530702 ], [ -75.241718919920501, 39.933505601271698 ], [ -75.241559521634102, 39.933520918729201 ], [ -75.241399614280496, 39.933550343435201 ], [ -75.241190697745495, 39.933583390011798 ], [ -75.240975687878006, 39.933616311915301 ], [ -75.240761533924797, 39.933625727143301 ], [ -75.240518256590306, 39.933596897139203 ], [ -75.240245845292705, 39.933529803456601 ], [ -75.240162943732997, 39.933501680128799 ], [ -75.239904968621005, 39.933414178638401 ], [ -75.239614765993394, 39.933332584426502 ], [ -75.239422744089495, 39.933239038207397 ], [ -75.239285836656293, 39.933141986046401 ], [ -75.239113344318497, 39.933015944426202 ], [ -75.238857485925493, 39.932831638738499 ], [ -75.238654125863604, 39.9327143269036 ], [ -75.238497692171293, 39.932649759570701 ], [ -75.238315798889602, 39.932612862654302 ], [ -75.238127975421904, 39.932571123345198 ], [ -75.237952360627801, 39.932529660156099 ], [ -75.237788596055296, 39.9324978536781 ], [ -75.237561379199207, 39.9325305017407 ], [ -75.237437913697093, 39.932565413455301 ], [ -75.237325614463799, 39.9326287889144 ], [ -75.237219071943599, 39.932701696809801 ], [ -75.237123348042104, 39.932812467298099 ], [ -75.237015067810702, 39.932932359974799 ], [ -75.2369118490613, 39.933080582698899 ], [ -75.236791990606406, 39.933266057324801 ], [ -75.236719281494004, 39.933414948483303 ], [ -75.236659140274497, 39.933554708621003 ], [ -75.236644000169306, 39.933798916454599 ], [ -75.236649030552897, 39.933906587734498 ], [ -75.236650822609306, 39.933944847306002 ], [ -75.236663575822803, 39.934095611334001 ], [ -75.236653127411898, 39.934212944461997 ], [ -75.236605182753706, 39.934352971874901 ], [ -75.236555164447793, 39.934549383277599 ], [ -75.236525533087601, 39.934689812014099 ], [ -75.236470440459499, 39.934857901959198 ], [ -75.236394362921402, 39.935180719713898 ], [ -75.236321489109997, 39.9353343012653 ], [ -75.236171861136199, 39.935415670376798 ], [ -75.236015096870105, 39.935525102107398 ], [ -75.235864784775799, 39.935625259653797 ], [ -75.2356658083973, 39.935719655951303 ], [ -75.2354600316458, 39.935832706634898 ], [ -75.235265594175104, 39.9359695216313 ], [ -75.234981007063794, 39.936231328036499 ], [ -75.234921902891102, 39.936342899896196 ], [ -75.234923660598398, 39.936460500608 ], [ -75.234918444024999, 39.936601464414998 ], [ -75.234847987785599, 39.936689271263198 ], [ -75.234775012433801, 39.936762913203403 ], [ -75.234745724273594, 39.936893942687803 ], [ -75.234788823832304, 39.937050075719299 ], [ -75.234783433014798, 39.937195738912102 ], [ -75.234802275815994, 39.937346636762598 ], [ -75.234871186416498, 39.9374657101298 ], [ -75.234922640275499, 39.937560893614801 ], [ -75.234970268980604, 39.937759445733001 ], [ -75.234977436040296, 39.937895977886498 ], [ -75.234984603128893, 39.9380325100392 ], [ -75.235005197034496, 39.938136423176097 ], [ -75.235075661878199, 39.938213210621399 ], [ -75.235164789371296, 39.938281000818002 ], [ -75.235297346924995, 39.938330930350098 ], [ -75.235491463349604, 39.938368108738302 ], [ -75.2357834093619, 39.9384027191686 ], [ -75.235947708746806, 39.938420430320498 ], [ -75.236148614316306, 39.938438943578298 ], [ -75.236349184062107, 39.938466855532099 ], [ -75.236501795321104, 39.938470200107901 ], [ -75.236685614659393, 39.938455415540801 ], [ -75.236881643750905, 39.938440898217799 ], [ -75.237146204876495, 39.938390265455403 ], [ -75.237450794989499, 39.938331102596699 ], [ -75.237623619678899, 39.9382831622694 ], [ -75.237771156281198, 39.9382581747846 ], [ -75.237967531975698, 39.938234256810297 ], [ -75.238175075204794, 39.938238802291998 ], [ -75.238328021367295, 39.938232754387897 ], [ -75.238499803531795, 39.938213000130503 ], [ -75.238738913122702, 39.938190016608097 ], [ -75.238874238988899, 39.938164769366402 ], [ -75.239009229523305, 39.938148912018001 ], [ -75.239186074467597, 39.938157486787503 ], [ -75.239338499869604, 39.938165526733798 ], [ -75.239454654814594, 39.938163366145801 ], [ -75.2395648784466, 39.938156372413602 ], [ -75.239711372574504, 39.9381595788374 ], [ -75.239821075453804, 39.938166683061603 ], [ -75.239924326324697, 39.938183052376303 ], [ -75.240039093146194, 39.938218477403304 ], [ -75.240141476391003, 39.938258343529398 ], [ -75.240260427690203, 39.938345595091 ], [ -75.240411753665001, 39.938466468296603 ], [ -75.240594563383695, 39.938644468519499 ], [ -75.240713342759307, 39.9387364100103 ], [ -75.240765858514493, 39.9388033947141 ], [ -75.240763082687707, 39.938878576149797 ], [ -75.240741124384897, 39.938976853907697 ], [ -75.240700504377898, 39.939084120767298 ], [ -75.240629023608506, 39.939200127831299 ], [ -75.240546200553993, 39.939292361690299 ], [ -75.240426746892496, 39.939383803015801 ], [ -75.240344096548, 39.939471346329398 ], [ -75.2402424370608, 39.939577277417897 ], [ -75.240145667407205, 39.939716237821301 ], [ -75.240018545673195, 39.939849830735099 ], [ -75.239952994425494, 39.939970670379402 ], [ -75.239906453023593, 39.940043308269701 ], [ -75.239881685354902, 39.940081968572102 ], [ -75.2397988598795, 39.940174210892799 ], [ -75.239637985022796, 39.9403117679039 ], [ -75.239529350082293, 39.940441061739101 ], [ -75.239412885233406, 39.940617216095099 ], [ -75.239401746129602, 39.940753347060401 ], [ -75.239432984061594, 39.940899812009199 ], [ -75.239464581034895, 39.941036878404603 ], [ -75.239496340043402, 39.941169245134603 ], [ -75.239564568344903, 39.941307113275101 ], [ -75.239633306011697, 39.941430882917302 ], [ -75.239736939260794, 39.941602448231599 ], [ -75.239848055205201, 39.941736551601302 ], [ -75.239988668009701, 39.941899519546702 ], [ -75.240076416711602, 39.942004901130304 ], [ -75.240152476194694, 39.942095908251098 ], [ -75.240254345017604, 39.942149863474398 ], [ -75.240369291921894, 39.942180597769799 ], [ -75.240521379414403, 39.942198034946898 ], [ -75.240791987372802, 39.942232174372002 ], [ -75.240956112449496, 39.942254568493503 ], [ -75.241181463487393, 39.942273607398299 ], [ -75.241449886798804, 39.942284181487899 ], [ -75.241585058374895, 39.9422636217068 ], [ -75.2418299275203, 39.942250172816003 ], [ -75.242037656699395, 39.942250011905898 ], [ -75.242294042923106, 39.9422556176266 ], [ -75.242610962057896, 39.942276646643499 ], [ -75.243068625711501, 39.942291353666199 ], [ -75.243177630505897, 39.942317252046699 ], [ -75.243335662658197, 39.942339518588298 ], [ -75.2434172098435, 39.942405956105397 ], [ -75.243436494367103, 39.942421667421698 ], [ -75.243533127631906, 39.942451989282397 ], [ -75.243846463472806, 39.942487055144703 ], [ -75.244071642800094, 39.942510787779398 ], [ -75.244411933570305, 39.942560541551401 ], [ -75.244661003108206, 39.942598904467197 ], [ -75.245015075768094, 39.942606637746003 ], [ -75.245228207127994, 39.942625392771099 ], [ -75.245411689075496, 39.942620002044002 ], [ -75.245564483291602, 39.942618635154801 ], [ -75.245741860217194, 39.942613101589799 ], [ -75.245888710571606, 39.942606901306199 ], [ -75.246053357362001, 39.942615198909103 ], [ -75.246193594646499, 39.942622963439597 ], [ -75.246351270866398, 39.942654615389699 ], [ -75.246472672947306, 39.942676078013797 ], [ -75.246569134477895, 39.942711105730702 ], [ -75.246664557767403, 39.9427743208295 ], [ -75.246746731933399, 39.942865465828 ], [ -75.246824988473094, 39.942980032200801 ], [ -75.246874040198705, 39.943140993068504 ], [ -75.246966868322602, 39.943274690081097 ], [ -75.247023768567402, 39.943388790257501 ], [ -75.247030118888603, 39.943419139159403 ], [ -75.247044543891505, 39.943488001555203 ], [ -75.247053812523902, 39.943568149003298 ], [ -75.247110366993098, 39.943691647959099 ], [ -75.247212107348801, 39.943914890781997 ], [ -75.247305975288896, 39.944020400050803 ], [ -75.247380673874602, 39.944148997925502 ], [ -75.247423968422197, 39.944300426520101 ], [ -75.247511385966504, 39.944415192233102 ], [ -75.247635436381898, 39.944530766068198 ], [ -75.247758956730706, 39.944660428748499 ], [ -75.247900459709101, 39.9447998899251 ], [ -75.248093675491901, 39.944945182061304 ], [ -75.248169921681196, 39.945031493451097 ], [ -75.248215467360694, 39.945121838377901 ], [ -75.248235218923398, 39.945249237187298 ], [ -75.248322639057605, 39.945364002280002 ], [ -75.248416337724805, 39.945474210050598 ], [ -75.2485654945243, 39.945571508584599 ], [ -75.248707865614193, 39.945687480697799 ], [ -75.248897513947298, 39.945846803149102 ], [ -75.2490810578809, 39.946005983164 ], [ -75.249246112496806, 39.946169471970499 ], [ -75.249429657786806, 39.946328660429401 ], [ -75.249495252240195, 39.946372409999903 ], [ -75.2495550866321, 39.946406636611201 ], [ -75.249615451533103, 39.946426765201103 ], [ -75.249711747426403, 39.946466480685402 ], [ -75.249812592963096, 39.9465486239081 ], [ -75.249919186930697, 39.946640298693403 ], [ -75.249968146341004, 39.946721310882999 ], [ -75.2500375999835, 39.946826276615198 ], [ -75.250117363527394, 39.946983202008497 ], [ -75.250154917714198, 39.947125097922402 ], [ -75.250205017589494, 39.947257860857498 ], [ -75.250230360616101, 39.947399490625301 ], [ -75.250272280584198, 39.947588513462001 ], [ -75.250309835428894, 39.947730409323299 ], [ -75.250341791555797, 39.947858073616501 ], [ -75.250367480829993, 39.947990304520197 ], [ -75.250418272891693, 39.948104278698402 ], [ -75.250476220147803, 39.948190180654699 ], [ -75.2505590974001, 39.948262525247898 ], [ -75.250725543485302, 39.9483884255907 ], [ -75.251065350593706, 39.948701490485803 ], [ -75.251194829494693, 39.948835991144399 ], [ -75.251319055681606, 39.948946852311501 ], [ -75.251443812032903, 39.949043624348597 ], [ -75.251508200849898, 39.949120268688802 ], [ -75.251559007696997, 39.9492342336113 ], [ -75.251569712004098, 39.949441379690803 ], [ -75.251519553044901, 39.949642496975997 ], [ -75.251414439734205, 39.949842426293699 ], [ -75.251311745135098, 39.949976563672401 ], [ -75.251244822018094, 39.950134996078198 ], [ -75.251196896190905, 39.9502750295445 ], [ -75.251154742572695, 39.950424586086001 ], [ -75.251151920320794, 39.950584414762602 ], [ -75.251141926112396, 39.950690009631401 ], [ -75.251175613069407, 39.9507706885177 ], [ -75.251269353258394, 39.950963182241303 ], [ -75.251351197881505, 39.951063722760502 ], [ -75.251427455402506, 39.951150022971703 ], [ -75.251493067161306, 39.951193780653099 ], [ -75.251543920790098, 39.951223098316099 ], [ -75.251587297386607, 39.951289887568201 ], [ -75.251610962380397, 39.951393854930501 ], [ -75.2516113150687, 39.951509072521702 ], [ -75.251628107852198, 39.951634063531003 ], [ -75.251648028796893, 39.951756762062899 ], [ -75.251650506674807, 39.951855573812601 ], [ -75.251646533149696, 39.9519636424114 ], [ -75.251615686293405, 39.9520546736223 ], [ -75.251579090468098, 39.952136173257898 ], [ -75.251513795759905, 39.952249961092598 ], [ -75.2514125437133, 39.952386481638101 ], [ -75.251284297114694, 39.952550633210599 ], [ -75.2511881364521, 39.9526731549308 ], [ -75.251154420069199, 39.952759420350297 ], [ -75.251153844146302, 39.952858165603899 ], [ -75.251180907799196, 39.9529528007224 ], [ -75.251208242130303, 39.953040395966703 ], [ -75.251184710244004, 39.953098664148399 ], [ -75.251151512130605, 39.953170831316001 ], [ -75.251103209395595, 39.9532379662731 ], [ -75.251050332704395, 39.953305001575998 ], [ -75.250924589415703, 39.9534010202063 ], [ -75.250792405796503, 39.953506295754401 ], [ -75.250650618119096, 39.9536231288835 ], [ -75.250490263717396, 39.9537466030799 ], [ -75.250354322351001, 39.953870609007801 ], [ -75.250139037513605, 39.9540751825241 ], [ -75.250050361912599, 39.954160250031997 ], [ -75.250006124275302, 39.954241582698998 ], [ -75.249956707406, 39.954339263623197 ], [ -75.249890786904103, 39.954387201443097 ], [ -75.249839947635905, 39.954440171084201 ], [ -75.249800888743394, 39.954505155402501 ], [ -75.249770655205594, 39.9545797384163 ], [ -75.249749742429799, 39.954649821379299 ], [ -75.249762587762007, 39.954715936888299 ], [ -75.249769759029505, 39.954770170776598 ], [ -75.249752071999694, 39.9548356298695 ], [ -75.249697687819506, 39.954984919436697 ], [ -75.249615292967206, 39.955190045697897 ], [ -75.249597865422203, 39.9552484466425 ], [ -75.249559324665299, 39.955299332635001 ], [ -75.249495937336903, 39.9553614350163 ], [ -75.249424600535605, 39.955390450816203 ], [ -75.249359531730605, 39.955414891005503 ], [ -75.249282780199906, 39.955424975957101 ], [ -75.249236474499995, 39.955438076125802 ], [ -75.249201505508296, 39.955474930313002 ], [ -75.249166103718295, 39.955523542025801 ], [ -75.249145720646396, 39.955579526891903 ], [ -75.249124201506703, 39.955666057686102 ], [ -75.249137356709497, 39.955765093306198 ], [ -75.249176643089797, 39.955860004381798 ], [ -75.249219403561099, 39.955943233211201 ], [ -75.2492642781136, 39.9560523666064 ], [ -75.249276592643994, 39.956132580153103 ], [ -75.2492365061279, 39.956225761013101 ], [ -75.249116342819605, 39.956336000004399 ], [ -75.249047452671704, 39.956381530074701 ], [ -75.2489904182045, 39.956436715921797 ], [ -75.248959663952903, 39.956525396957701 ], [ -75.248928033299904, 39.956637565792398 ], [ -75.248949656321898, 39.956755598775104 ], [ -75.249007882922399, 39.956916758372202 ], [ -75.249067132613504, 39.956967433430698 ], [ -75.249196498850495, 39.9570219794807 ], [ -75.249316717071196, 39.957076325979301 ], [ -75.249403349073802, 39.957129940292297 ], [ -75.249510739335307, 39.957205504667797 ], [ -75.249534397298305, 39.957222148076397 ], [ -75.249640414028605, 39.957330271302297 ], [ -75.249780179229504, 39.957434417717202 ], [ -75.250039103339404, 39.957663434314199 ], [ -75.250180712825895, 39.957800542676402 ], [ -75.250244935612102, 39.957881887124898 ], [ -75.250361957965396, 39.958023162698403 ], [ -75.250465010349998, 39.958128868926998 ], [ -75.250561697341993, 39.958241482142199 ], [ -75.250668149484099, 39.958337855877801 ], [ -75.250737875054099, 39.958435781038403 ], [ -75.250795214791907, 39.9585381305128 ], [ -75.250841614097695, 39.958647305416797 ], [ -75.250878024333005, 39.958737440971902 ], [ -75.250884246178899, 39.958817521571603 ], [ -75.250894575224805, 39.958951778219401 ], [ -75.2508854557245, 39.959033867219397 ], [ -75.250852156263207, 39.959108383743299 ], [ -75.250755352001306, 39.9591650557538 ], [ -75.250608655807895, 39.959248859876801 ], [ -75.250456037023696, 39.959327831605599 ], [ -75.250294257645294, 39.9594066035488 ], [ -75.250083363850493, 39.959491359864401 ], [ -75.249827941711601, 39.959582191216498 ], [ -75.249654379674695, 39.959648947561497 ], [ -75.249555038752803, 39.959691462775702 ], [ -75.249445499978904, 39.959761965731303 ], [ -75.249320088750807, 39.959848574759199 ], [ -75.249216235600898, 39.959930959390597 ], [ -75.249125103214894, 39.9599995116698 ], [ -75.248975436265695, 39.960080897438097 ], [ -75.248838847770998, 39.960139052214998 ], [ -75.248692677859694, 39.960208755904503 ], [ -75.248549561099196, 39.960278525981799 ], [ -75.248461642361704, 39.960342444640403 ], [ -75.248386443332905, 39.960434859687901 ], [ -75.248337267495202, 39.960525490527601 ], [ -75.248284530955004, 39.960630144252001 ], [ -75.248201259212905, 39.960734141125798 ], [ -75.248060862054302, 39.960895664020903 ], [ -75.247977330043, 39.961006709848199 ], [ -75.247925186295006, 39.961094924215203 ], [ -75.247894169265805, 39.961190645069301 ], [ -75.247874538808901, 39.9613501072429 ], [ -75.2478743041992, 39.961439453638 ], [ -75.247868914498, 39.961502820089301 ], [ -75.247843138829097, 39.961622171166802 ], [ -75.247825015791705, 39.961699369476001 ], [ -75.2478100327709, 39.961774284670597 ], [ -75.247776815136305, 39.9618464505918 ], [ -75.247743782216602, 39.9619139173478 ], [ -75.247710564443395, 39.961986083249499 ], [ -75.247704568733695, 39.962065897629003 ], [ -75.247729504193501, 39.962176957309303 ], [ -75.247764069921303, 39.962234140377703 ], [ -75.247779535584201, 39.962312071217802 ], [ -75.247755676235002, 39.962462034781097 ], [ -75.247693925842796, 39.962811030311499 ], [ -75.247690058994493, 39.962826686331702 ], [ -75.247661609496404, 39.962941996676399 ], [ -75.247607448871094, 39.963001947835103 ], [ -75.247491251279499, 39.963128733068302 ], [ -75.247421401373799, 39.963200099907297 ], [ -75.247400916305693, 39.963258433902702 ], [ -75.247407221024503, 39.963336164976802 ], [ -75.247437510003493, 39.963426177151398 ], [ -75.2474823000816, 39.963537660928203 ], [ -75.247566861641502, 39.963647669538801 ], [ -75.247687016811398, 39.963786664459597 ], [ -75.247781172571607, 39.9638851241764 ], [ -75.247905692020694, 39.963988940139103 ], [ -75.248059561213395, 39.964083998600799 ], [ -75.248617689707103, 39.964361861603201 ], [ -75.248969988092298, 39.9645035642151 ], [ -75.249467345599697, 39.9647307238317 ], [ -75.249851594904698, 39.964917800198798 ], [ -75.249914326855205, 39.964956783558002 ], [ -75.249991808050595, 39.965010206805502 ], [ -75.250057507366193, 39.965051606328601 ], [ -75.250136038055501, 39.965076833251402 ], [ -75.250224323340106, 39.965085811505602 ], [ -75.250316267524298, 39.965078408269697 ], [ -75.250449539956904, 39.9650272340849 ], [ -75.250607944782303, 39.964957794498702 ], [ -75.250760230264305, 39.9648882214087 ], [ -75.250916064855502, 39.964846935497803 ], [ -75.251050661721095, 39.964842812272998 ], [ -75.251104763263001, 39.964867506470704 ], [ -75.251203621256494, 39.964921385437698 ], [ -75.251285828292495, 39.965012527138903 ], [ -75.251344383991594, 39.965081989415999 ], [ -75.251338910814297, 39.9651477057321 ], [ -75.251343030766094, 39.965201873008297 ], [ -75.251371493387794, 39.965258930988803 ], [ -75.251430654326597, 39.965311945266699 ], [ -75.251499667744895, 39.965346361337701 ], [ -75.251605929994497, 39.965365136332402 ], [ -75.251710175544304, 39.965355648242003 ], [ -75.251814679953895, 39.965339119935201 ], [ -75.251925119199299, 39.9653274149155 ], [ -75.252096706712507, 39.965314689435502 ], [ -75.252337514113606, 39.965289369991702 ], [ -75.252638035306205, 39.965260637582503 ], [ -75.252846082213196, 39.965253407722003 ], [ -75.252974756842903, 39.965244450157897 ], [ -75.253079433499707, 39.965223221281398 ], [ -75.253224141946902, 39.965193448067502 ], [ -75.253317326180095, 39.9652354527705 ], [ -75.2534107699137, 39.965270399267098 ], [ -75.253585043775203, 39.965309464961898 ], [ -75.253715390970996, 39.965338159356499 ], [ -75.253939256765406, 39.965399458707701 ], [ -75.254048832447694, 39.965411248741901 ], [ -75.254143485036806, 39.965413307707003 ], [ -75.254225372245699, 39.965346901893597 ], [ -75.254304119292897, 39.965282779310797 ], [ -75.254340040076301, 39.965220076767203 ], [ -75.254382845003505, 39.965136359659198 ], [ -75.254459142190896, 39.965055722580203 ], [ -75.254546704437701, 39.965001197921097 ], [ -75.2546346980875, 39.9649349246437 ], [ -75.254741358762999, 39.964859650914299 ], [ -75.254940134739797, 39.964772279727299 ], [ -75.255115398231098, 39.964700849048 ], [ -75.255269536196593, 39.964664223574701 ], [ -75.255411015947203, 39.964639089632001 ], [ -75.255546745425804, 39.964604415147001 ], [ -75.255689087667093, 39.9645557837515 ], [ -75.255814068458804, 39.9644809073273 ], [ -75.255855048153407, 39.964446524346997 ], [ -75.255894106970402, 39.964381537983897 ], [ -75.255969625161399, 39.964322047300698 ], [ -75.2560852717898, 39.964251670873303 ], [ -75.256195414687994, 39.964164713607602 ], [ -75.256283750649104, 39.964089040218298 ], [ -75.2563854217981, 39.9639830949749 ], [ -75.256588818690005, 39.963811164365502 ], [ -75.256689626587004, 39.963728715970198 ], [ -75.256748852523501, 39.963697080779298 ], [ -75.256819505065195, 39.963686858128298 ], [ -75.256902199574199, 39.963681600265801 ], [ -75.256984118037906, 39.963697489752803 ], [ -75.257129386432695, 39.9637359198694 ], [ -75.257253699392095, 39.963762127588602 ], [ -75.257338585437694, 39.9637804328773 ], [ -75.257421280020495, 39.963775174640702 ], [ -75.257489321337999, 39.9637531459339 ], [ -75.257545740229105, 39.963714394603997 ], [ -75.257632781050603, 39.963673965863897 ], [ -75.257707349055096, 39.963640311872403 ], [ -75.257790916787101, 39.963611565499498 ], [ -75.257861482887705, 39.963603691919701 ], [ -75.257936777435205, 39.963633537348102 ], [ -75.257995941750295, 39.963686557246596 ], [ -75.258016597384398, 39.963748138070301 ], [ -75.258015428337302, 39.963863322319298 ], [ -75.258016451007194, 39.964002070018999 ], [ -75.257994348855803, 39.964105050702599 ], [ -75.257964453110404, 39.964170236751798 ], [ -75.257946427085102, 39.964245086940998 ], [ -75.257947067641894, 39.964310936221302 ], [ -75.257977899870497, 39.964386847588401 ], [ -75.258010702538897, 39.964408724299901 ], [ -75.258061580568807, 39.964438039319099 ], [ -75.258122038494704, 39.964455813457903 ], [ -75.258192174508395, 39.964459688239799 ], [ -75.258274611304998, 39.964461478527397 ], [ -75.258341963924394, 39.964458238017301 ], [ -75.258409046304806, 39.964462046352999 ], [ -75.258472040939594, 39.964493984898098 ], [ -75.258512982712602, 39.964544248205499 ], [ -75.258549652771805, 39.964627340921801 ], [ -75.258593704735205, 39.9647176396576 ], [ -75.258640495217307, 39.964775093675101 ], [ -75.258686412724401, 39.964856035550198 ], [ -75.258708774359704, 39.964912950099901 ], [ -75.258715695340399, 39.964974232555399 ], [ -75.258718356312798, 39.965068344693798 ], [ -75.258714776061296, 39.965249311916899 ], [ -75.258702513276603, 39.965333693683 ], [ -75.258712746489707, 39.965387993301803 ], [ -75.258740784870895, 39.965456789018198 ], [ -75.258768811608903, 39.965525584473603 ], [ -75.258800420796007, 39.965580348197001 ], [ -75.258841609928496, 39.965623570994303 ], [ -75.258892316901694, 39.965657585071099 ], [ -75.258976861118697, 39.965685288000898 ], [ -75.259080158415102, 39.965701640065099 ], [ -75.259217465577606, 39.9657069724108 ], [ -75.259336634523706, 39.965707207697903 ], [ -75.259403201324204, 39.965725113735203 ], [ -75.2594259945662, 39.965770279574798 ], [ -75.259430207146295, 39.965822096845699 ], [ -75.259430332291501, 39.965902044398 ], [ -75.259452781037496, 39.965956609087399 ], [ -75.259554356063305, 39.966019955001499 ], [ -75.259651018377198, 39.966050263015902 ], [ -75.259780938564305, 39.966090708093702 ], [ -75.259911117619296, 39.966124094879198 ], [ -75.260067046188993, 39.966205071959898 ], [ -75.260312296687104, 39.966266822749503 ], [ -75.260480517554498, 39.9663191351964 ], [ -75.260492824145501, 39.966322970129497 ], [ -75.260585998079407, 39.966282654167003 ], [ -75.260664079449299, 39.966279059384703 ], [ -75.260753086937996, 39.9662898110833 ], [ -75.260831426925506, 39.966279158040003 ], [ -75.260935602780293, 39.966251433038799 ], [ -75.261028905322206, 39.966207596645603 ], [ -75.261118267112906, 39.9661460333257 ], [ -75.2611638578488, 39.966090575256402 ], [ -75.261218609675197, 39.966035315879999 ], [ -75.261286140351999, 39.966006795711401 ], [ -75.261389142036606, 39.966010786698703 ], [ -75.261447673919307, 39.966040284182398 ], [ -75.261482704628904, 39.966085138360299 ], [ -75.261549998938094, 39.966125403445098 ], [ -75.261664192924698, 39.9661684515332 ], [ -75.261739012411297, 39.966191247338799 ], [ -75.261814348650205, 39.966199935799203 ], [ -75.261895292694007, 39.966180517820902 ], [ -75.262015819897798, 39.966144325739499 ], [ -75.262095514594606, 39.966096670562102 ], [ -75.262105902256096, 39.966063378999799 ], [ -75.2621190994317, 39.966016038864701 ], [ -75.262141264216694, 39.965974181975497 ], [ -75.262165129571002, 39.9659482373835 ], [ -75.262245211308397, 39.965890003878997 ], [ -75.262273241827799, 39.965862870168998 ], [ -75.262275305344502, 39.965860878673602 ], [ -75.262275657503594, 39.965860534923102 ], [ -75.262345023697605, 39.965793383489803 ], [ -75.262385651128994, 39.965748403974402 ], [ -75.262424619067701, 39.965685747101801 ], [ -75.262460595362697, 39.965642432663302 ], [ -75.262514119498505, 39.965620662875097 ], [ -75.262562024770006, 39.965626990228003 ], [ -75.262620173159803, 39.965635305554599 ], [ -75.262681632158206, 39.965647224495498 ], [ -75.262768422237599, 39.965656160635099 ], [ -75.262839752361998, 39.965648886166001 ], [ -75.262921082395195, 39.965618898241601 ], [ -75.262963474713999, 39.965588066273803 ], [ -75.263031714118895, 39.965540153164604 ], [ -75.263095237838797, 39.965495669683797 ], [ -75.263146661908294, 39.9654685652851 ], [ -75.2631971829625, 39.965466128387298 ], [ -75.263253862068098, 39.965483232230397 ], [ -75.263272074384503, 39.965493348613698 ], [ -75.263310036845795, 39.965514434599697 ], [ -75.263386492779205, 39.965554897151797 ], [ -75.263470150680803, 39.965586704055298 ], [ -75.263533322722495, 39.965614526073203 ], [ -75.263617561671097, 39.9656304610265 ], [ -75.263698052464903, 39.965623393545698 ], [ -75.263773197697105, 39.965605614552103 ], [ -75.263857207591599, 39.965565097425902 ], [ -75.2639315400247, 39.965538489050601 ], [ -75.263992523696501, 39.965501004791399 ], [ -75.264019003902803, 39.965466295808703 ], [ -75.264059295810497, 39.965430129137602 ], [ -75.264134402173298, 39.965382364172001 ], [ -75.264244387114701, 39.9653212453074 ], [ -75.264375297968797, 39.965251758989801 ], [ -75.264498502086497, 39.965205044750498 ], [ -75.264556353707107, 39.965190422513899 ], [ -75.264645811937598, 39.965188828423699 ], [ -75.264760278202402, 39.965193073751102 ], [ -75.264921696391596, 39.9651983358835 ], [ -75.265061428934501, 39.965201362200403 ], [ -75.265255741305694, 39.965216147922199 ], [ -75.265390371893702, 39.965233172827098 ], [ -75.265451057598796, 39.9652662377502 ], [ -75.2655301669447, 39.965359680355398 ], [ -75.265569464070296, 39.9654134462915 ], [ -75.265658996920607, 39.965535333446397 ], [ -75.265747010213303, 39.965636023412998 ], [ -75.265807915800906, 39.9657255307905 ], [ -75.265860187300603, 39.965800750739497 ], [ -75.265924171046294, 39.965869169491398 ], [ -75.266051265512004, 39.965935422598101 ], [ -75.266196449888596, 39.965977371074999 ], [ -75.266316625636804, 39.966013489228303 ], [ -75.266398637022505, 39.966027607960903 ], [ -75.266547532516398, 39.966030830765398 ], [ -75.266710292620104, 39.966030830582 ], [ -75.266797845353494, 39.9660186069448 ], [ -75.266912506310604, 39.966017565507698 ], [ -75.267026523317099, 39.966034142351099 ], [ -75.267140913762006, 39.966071900371801 ], [ -75.267217759206005, 39.966101782131403 ], [ -75.267295609526599, 39.966166968257802 ], [ -75.267367236204393, 39.9662143783301 ], [ -75.2673847602546, 39.966223163709202 ], [ -75.267477543467294, 39.9662696799844 ], [ -75.267534429133093, 39.966281497347403 ], [ -75.267600850880797, 39.966282934389596 ], [ -75.267673315106805, 39.966307432250602 ], [ -75.267781791899097, 39.966350350474102 ], [ -75.267912586481302, 39.966409626773597 ], [ -75.2681327642197, 39.966500821183999 ], [ -75.268395127647807, 39.9665982163461 ], [ -75.2684628243437, 39.9666279083891 ], [ -75.268516633061196, 39.9666608229007 ], [ -75.268570196043996, 39.966700786801901 ], [ -75.268703893038804, 39.966805985188103 ], [ -75.268774941990799, 39.9668692572466 ], [ -75.268849740426802, 39.966955549470001 ], [ -75.268919630972306, 39.967050547171098 ], [ -75.269019122325503, 39.967244969092803 ], [ -75.269047097563401, 39.967294957078799 ], [ -75.269082145307706, 39.967339818191299 ], [ -75.2691268579606, 39.967370769791202 ], [ -75.269160771449506, 39.967383846558803 ], [ -75.269208678254103, 39.967390180139702 ], [ -75.269274790968296, 39.967400430170798 ], [ -75.269359226450902, 39.967411076287199 ], [ -75.269446844589297, 39.967397095090902 ], [ -75.269500046373807, 39.967384126748499 ], [ -75.269551211929695, 39.967364068645502 ], [ -75.269616254209495, 39.967340778624298 ], [ -75.269671813280993, 39.967326104236498 ], [ -75.269742951146696, 39.967324119102699 ], [ -75.269804413250498, 39.967336025225997 ], [ -75.269858802311703, 39.967353076236698 ], [ -75.269921656513503, 39.967389717446203 ], [ -75.269963573322002, 39.967434717735401 ], [ -75.270005168098606, 39.967488540718797 ], [ -75.270033454366796, 39.967561465283502 ], [ -75.270057270777599, 39.967662530160197 ], [ -75.270075120282101, 39.967738761010203 ], [ -75.270100674387606, 39.967792228258403 ], [ -75.270143276134405, 39.967881346580498 ], [ -75.270194460385099, 39.967986525753801 ], [ -75.2703003864263, 39.968193429033697 ], [ -75.270391634008305, 39.968331224667097 ], [ -75.270404095266898, 39.9683667765919 ], [ -75.270415270027698, 39.968437574343803 ], [ -75.270424847630593, 39.9684889303267 ], [ -75.2704506068862, 39.968537113125102 ], [ -75.270503517386402, 39.968594703285 ], [ -75.2705726740393, 39.968647355677298 ], [ -75.270601680133296, 39.968669146618304 ], [ -75.270606175595901, 39.968670460087601 ], [ -75.270653841550697, 39.968684383155697 ], [ -75.270720470285298, 39.968680534021303 ], [ -75.270775772947999, 39.968672908266001 ], [ -75.270840675566603, 39.968653146383602 ], [ -75.270914944576404, 39.968628289027201 ], [ -75.270988891895598, 39.968612245332103 ], [ -75.271045972979195, 39.968618776329301 ], [ -75.271112075465297, 39.968629025048898 ], [ -75.271171181289503, 39.968642645438898 ], [ -75.271243456159993, 39.968672434671902 ], [ -75.271330690644803, 39.9687007720662 ], [ -75.271410477055198, 39.968713082137597 ], [ -75.271492814329093, 39.9687183835185 ], [ -75.271593474403005, 39.9687240896099 ], [ -75.271700693222201, 39.968738748916799 ], [ -75.271805156796304, 39.968765701138601 ], [ -75.271865270100804, 39.968814625547303 ], [ -75.271925190385105, 39.968868843553302 ], [ -75.271988604805699, 39.968953112796697 ], [ -75.272026065703599, 39.968994493195503 ], [ -75.272089308452905, 39.969020554960998 ], [ -75.2721991844477, 39.969056444346201 ], [ -75.272346479869597, 39.9691037191878 ], [ -75.272507897540805, 39.9691407211754 ], [ -75.272627696789101, 39.969187401971197 ], [ -75.272729429679103, 39.9692266468914 ], [ -75.272817864478995, 39.969253252117397 ], [ -75.272960509745303, 39.969302191695299 ], [ -75.273056339133902, 39.969314837911497 ], [ -75.2731881821733, 39.969314160982897 ], [ -75.273282553643597, 39.969303845449403 ], [ -75.273418286648393, 39.969290899703601 ], [ -75.273494141789001, 39.969285482151903 ], [ -75.273572021573599, 39.969287162964498 ], [ -75.273684009321499, 39.969296634525698 ], [ -75.273812038422903, 39.969306461155497 ], [ -75.273914736284496, 39.969319254870797 ], [ -75.274015397451905, 39.969324958838001 ], [ -75.274152898159102, 39.9693261598036 ], [ -75.274328299961397, 39.969325538446498 ], [ -75.274490158048096, 39.969319326838097 ], [ -75.274810009500996, 39.969302413754001 ], [ -75.274892764997901, 39.969296261161801 ], [ -75.275029098550704, 39.969298318868397 ], [ -75.275087251607403, 39.9693066278777 ], [ -75.275199711937901, 39.969334632405698 ], [ -75.275269375214705, 39.969373174359397 ], [ -75.275322687510197, 39.969420184282598 ], [ -75.275365730201301, 39.969512841864201 ], [ -75.275397527036404, 39.969584083748401 ], [ -75.275458320901095, 39.9697873596497 ], [ -75.275496358354303, 39.969938995843897 ], [ -75.275570043224704, 39.970134620991701 ], [ -75.275609342110201, 39.970220134007498 ], [ -75.275654564238195, 39.970268735232601 ], [ -75.275707212201894, 39.970302504167996 ], [ -75.275821238543699, 39.970319072272403 ], [ -75.2760074283118, 39.970321329798502 ], [ -75.276189251919405, 39.9703331874925 ], [ -75.276247481962699, 39.970339731620598 ], [ -75.276305186919302, 39.9703603738241 ], [ -75.2763737691145, 39.9703971348439 ], [ -75.276414008431004, 39.9704253381597 ], [ -75.276440747022406, 39.970477955440998 ], [ -75.276469811488397, 39.970529730876898 ], [ -75.276510262360404, 39.970599402042097 ], [ -75.276614688322397, 39.970785102506802 ], [ -75.276642574233406, 39.970837735454502 ], [ -75.276658543556394, 39.9708715963015 ], [ -75.276670644152603, 39.970916834285802 ], [ -75.276677291344399, 39.970954900013403 ], [ -75.276664456060402, 39.970992554820803 ], [ -75.276639179733607, 39.971025517631503 ], [ -75.2765901420413, 39.9710659149519 ], [ -75.276531421598094, 39.971104337606803 ], [ -75.276473795236299, 39.971144549747301 ], [ -75.276488285210604, 39.9711871993714 ], [ -75.276526704354694, 39.971233887650001 ], [ -75.276584958837404, 39.971271299858003 ], [ -75.276691285231493, 39.9712630050917 ], [ -75.276762715790994, 39.971253084155101 ], [ -75.276827951725195, 39.971224505415698 ], [ -75.276899326653194, 39.971184589412999 ], [ -75.277075547930494, 39.971114299256897 ], [ -75.277138009089597, 39.971098887004203 ], [ -75.277200181167302, 39.971091415173603 ], [ -75.2772689771529, 39.971091131748501 ], [ -75.277341137304504, 39.971092686704502 ], [ -75.277424303810605, 39.971106822265902 ], [ -75.277493753439003, 39.9711197882542 ], [ -75.277543572358496, 39.971136737041597 ], [ -75.277579418141002, 39.971159556483101 ], [ -75.277612918023195, 39.971184091297999 ], [ -75.277659802050394, 39.971218618075802 ], [ -75.277689380878797, 39.971256294839101 ], [ -75.277707504412007, 39.971293724789 ], [ -75.277715330707906, 39.971330941891601 ], [ -75.277691554032302, 39.971354242641802 ], [ -75.277649646141796, 39.971371854951897 ], [ -75.277598672303, 39.971386632027603 ], [ -75.277553644724804, 39.971395365457496 ], [ -75.277526728246102, 39.971410660849301 ], [ -75.277510998826301, 39.971433251990099 ], [ -75.2775065320713, 39.9714613835934 ], [ -75.2775075425929, 39.9714966789141 ], [ -75.277516728600304, 39.9715277445749 ], [ -75.277532602182305, 39.971564252118597 ], [ -75.277556800461795, 39.971592109377703 ], [ -75.277594586999498, 39.971624674228899 ], [ -75.277642874595102, 39.971652176539003 ], [ -75.277678188725005, 39.9716690199703 ], [ -75.277768062046903, 39.971687768648799 ], [ -75.277889328313805, 39.971702400333001 ], [ -75.277969765063503, 39.971723351183698 ], [ -75.2780215074891, 39.971760505220601 ], [ -75.278299267803206, 39.971937089847401 ], [ -75.278355500005503, 39.9720223989396 ], [ -75.278452038333697, 39.972115784010299 ], [ -75.278539740043001, 39.972194562926397 ], [ -75.278611832525399, 39.972273005597401 ], [ -75.278659315921104, 39.972341304727301 ], [ -75.278700038596497, 39.972423873983701 ], [ -75.278727041428397, 39.9725397905069 ], [ -75.278762297404199, 39.972643874637598 ], [ -75.2787789233154, 39.972701895672699 ], [ -75.278783238530593, 39.972754849345399 ], [ -75.2787859933443, 39.972851016655902 ], [ -75.278797660621095, 39.972959395025903 ], [ -75.278812714214595, 39.973060638444103 ], [ -75.278833667253096, 39.973171613393397 ], [ -75.278861817806401, 39.973256317465797 ], [ -75.278918663263994, 39.9733248180722 ], [ -75.278954535416105, 39.973368846782499 ], [ -75.278973237945095, 39.973455743990002 ], [ -75.279001551645095, 39.973535649288998 ], [ -75.279049730889099, 39.973627992457303 ], [ -75.279084555653796, 39.973700821049398 ], [ -75.279111396473894, 39.973821545219401 ], [ -75.279126451053301, 39.973922779591199 ], [ -75.279173761246497, 39.973995885994597 ], [ -75.279243954828999, 39.974040644577499 ], [ -75.279361140885499, 39.974081612619102 ], [ -75.279468616471206, 39.974131984982002 ], [ -75.279603751196106, 39.974194962796297 ], [ -75.279808108119795, 39.974329112626201 ], [ -75.279957357453995, 39.9744332444428 ], [ -75.280029454275905, 39.974511677215602 ], [ -75.280047596739095, 39.974549611704397 ], [ -75.280087505352498, 39.974633072870603 ], [ -75.280133420584406, 39.974744584787402 ], [ -75.280195370648997, 39.974844431676097 ], [ -75.280306754892194, 39.975000897080498 ], [ -75.279430619997797, 39.975445837709998 ], [ -75.276381586037402, 39.977013775810299 ], [ -75.273574790165299, 39.978268833473003 ], [ -75.272268825845998, 39.978849540022701 ], [ -75.271339102835, 39.979262936873802 ], [ -75.269272214707698, 39.980179612222997 ], [ -75.265593670463602, 39.981810897061798 ], [ -75.264384795697694, 39.982346947295397 ], [ -75.263716282033002, 39.982643370869198 ], [ -75.262186243691801, 39.983490336496502 ], [ -75.260731320903204, 39.984290141200198 ], [ -75.259511407678005, 39.984960735512999 ], [ -75.258729338209406, 39.985390626235102 ], [ -75.258569542996398, 39.985521170798798 ], [ -75.258502733960796, 39.985575753075103 ], [ -75.256839612686406, 39.986808673585998 ], [ -75.256298406317001, 39.987209867042601 ], [ -75.256120910171305, 39.987321093995398 ], [ -75.255699219377803, 39.987518734974202 ], [ -75.254002444135097, 39.9883139585762 ], [ -75.251469774587207, 39.989501673111199 ], [ -75.250823375178399, 39.989804785584603 ], [ -75.249191492510207, 39.990571737804203 ], [ -75.248013005043404, 39.9911255737929 ], [ -75.245686202306302, 39.992219020626997 ], [ -75.241653111815694, 39.994114108969399 ], [ -75.239026911559904, 39.995345041647802 ], [ -75.235287921077401, 39.997097367402098 ], [ -75.2343106217632, 39.997553040450398 ], [ -75.233230788550898, 39.998056507886403 ], [ -75.232153109136306, 39.998558949573201 ], [ -75.230889523751003, 39.999148041485803 ], [ -75.229455230765595, 39.999820264139302 ], [ -75.228741667802694, 40.000155488116597 ], [ -75.228377658028705, 40.000326494160603 ], [ -75.226416499758599, 40.001247782672799 ], [ -75.223631734713393, 40.002555871122901 ], [ -75.220698280523393, 40.003933680667899 ], [ -75.219226470652998, 40.004624919496599 ], [ -75.218347691857701, 40.005037628071399 ], [ -75.214572156046998, 40.006810624849798 ], [ -75.213757192441506, 40.007155124398501 ], [ -75.213047529721507, 40.0074551111408 ], [ -75.210768586817807, 40.008560545873102 ], [ -75.208922215615601, 40.009456099286801 ], [ -75.208300820941602, 40.009750695067602 ], [ -75.208029320157607, 40.009879402388897 ], [ -75.207317042545796, 40.010217076071001 ], [ -75.2073109693888, 40.010280993930699 ], [ -75.207299435056797, 40.010402500136102 ], [ -75.207293961839397, 40.010460097225199 ], [ -75.207286800072595, 40.010535559863499 ], [ -75.207263934927596, 40.010776261197499 ], [ -75.207253601062504, 40.0108851078529 ], [ -75.207240461208201, 40.011023508357702 ], [ -75.206994056065895, 40.011205279662597 ], [ -75.206164658496306, 40.0118171049076 ], [ -75.206513222382696, 40.0120337338127 ], [ -75.206718226905494, 40.012164298413502 ], [ -75.207056108936698, 40.012385590439102 ], [ -75.207558479950805, 40.0127218428538 ], [ -75.207564152351296, 40.0127205628933 ], [ -75.207591936842107, 40.012744288868603 ], [ -75.207932620837795, 40.012971325558702 ], [ -75.208167892312005, 40.0131251907505 ], [ -75.208402775259202, 40.013275064400702 ], [ -75.2086447685639, 40.013424401151703 ], [ -75.208785952149, 40.013506823247297 ], [ -75.208929814296596, 40.013586565391101 ], [ -75.209149285686394, 40.013702470930802 ], [ -75.209668088712405, 40.0139661951496 ], [ -75.210035530883502, 40.014157705112801 ], [ -75.210552722679793, 40.0144230203503 ], [ -75.210772114218003, 40.014539010998099 ], [ -75.210952239461903, 40.0146384014161 ], [ -75.211518411886303, 40.0149694151227 ], [ -75.211798612605406, 40.015138970172103 ], [ -75.212037441402998, 40.015292455198498 ], [ -75.212169921701104, 40.015383149999202 ], [ -75.212266918669897, 40.0154528779697 ], [ -75.212392584495305, 40.015548458492098 ], [ -75.212483875981903, 40.015622240825898 ], [ -75.212603024417604, 40.015722596544499 ], [ -75.212748627465601, 40.015850683890299 ], [ -75.2130025428078, 40.016087554520297 ], [ -75.213274786581295, 40.0163579953403 ], [ -75.213618233752499, 40.016716225157602 ], [ -75.214032010011096, 40.017160304832302 ], [ -75.214305516471399, 40.0174715141832 ], [ -75.214668241495502, 40.017900606588697 ], [ -75.215056807314795, 40.018359595793797 ], [ -75.215331048756994, 40.0186698906709 ], [ -75.215485238880106, 40.018836330229 ], [ -75.215616937125105, 40.018973071705098 ], [ -75.215752101155203, 40.019107709084302 ], [ -75.215865167658905, 40.019214630382699 ], [ -75.216007665023895, 40.019342770878701 ], [ -75.216185822048203, 40.019494799712099 ], [ -75.216368778115594, 40.019643861725001 ], [ -75.216555360870402, 40.019790597769898 ], [ -75.217630973549703, 40.020606654151898 ], [ -75.217950669574904, 40.020844080676099 ], [ -75.218241695697699, 40.021054997441396 ], [ -75.218470695410005, 40.021216558786698 ], [ -75.218669123663503, 40.0213529115196 ], [ -75.218903435843998, 40.0215090839514 ], [ -75.219081700681897, 40.021623655822097 ], [ -75.2192486855336, 40.021723950242603 ], [ -75.2193982942769, 40.021806877645801 ], [ -75.219505042240399, 40.021861938495597 ], [ -75.219618523109503, 40.021916525913099 ], [ -75.219812173803504, 40.022000071828103 ], [ -75.219891161341593, 40.022030563064497 ], [ -75.220011226289898, 40.022072960461202 ], [ -75.220133251929894, 40.022112121285801 ], [ -75.220257008014499, 40.022148563039998 ], [ -75.220424248555503, 40.022193648068203 ], [ -75.220593445816405, 40.022235604429902 ], [ -75.221191829234002, 40.022372129978002 ], [ -75.221446777022095, 40.0224326508594 ], [ -75.221577951289504, 40.022457802803601 ], [ -75.221845757503601, 40.022500027298797 ], [ -75.221975822570997, 40.022526019321901 ], [ -75.222058859564399, 40.022548200868002 ], [ -75.222098911036099, 40.022561237016703 ], [ -75.222175462603701, 40.022592042430396 ], [ -75.222281879642907, 40.022649471973601 ], [ -75.222384702967602, 40.022711516517802 ], [ -75.222484992590907, 40.022776775824902 ], [ -75.222615442165804, 40.022867998872201 ], [ -75.222837301941098, 40.023036052375303 ], [ -75.223305599210406, 40.023407450309598 ], [ -75.223433544239398, 40.023503365530303 ], [ -75.223531442950502, 40.023573094282803 ], [ -75.223631650861194, 40.023640296893099 ], [ -75.223700366730498, 40.023683308583202 ], [ -75.223805855065294, 40.023745617646497 ], [ -75.223875920002001, 40.023784820650299 ], [ -75.223928324004405, 40.023813625031998 ], [ -75.224661944513002, 40.024217964175698 ], [ -75.226136545403605, 40.025037736681497 ], [ -75.226713952543903, 40.025355466811199 ], [ -75.227440071940094, 40.025747765514502 ], [ -75.228082343366296, 40.0260845637887 ], [ -75.2288411890747, 40.026469589107798 ], [ -75.229589264557504, 40.026836839454603 ], [ -75.229932400982406, 40.026994385558602 ], [ -75.2307419849719, 40.027351165768302 ], [ -75.230970081905795, 40.0274566122336 ], [ -75.231157403603902, 40.027547576901902 ], [ -75.231414410504996, 40.027680947696403 ], [ -75.231704057413495, 40.027839315465897 ], [ -75.231988963255304, 40.028003570147199 ], [ -75.232227056619607, 40.028148958101703 ], [ -75.232403271437093, 40.028262346210099 ], [ -75.232602820905299, 40.028397878436401 ], [ -75.232764452691001, 40.0285142259265 ], [ -75.232921140051303, 40.028634339090097 ], [ -75.233073186798904, 40.028758242625699 ], [ -75.233250929992707, 40.028910775073001 ], [ -75.233885955736696, 40.029483774903703 ], [ -75.234032601155505, 40.029612153825703 ], [ -75.234182255930307, 40.029738093703202 ], [ -75.234335934817494, 40.029860778826603 ], [ -75.234462431273997, 40.029956036720002 ], [ -75.234657626623303, 40.030094497141498 ], [ -75.234862614839102, 40.030232811275503 ], [ -75.235060625337695, 40.030361133363797 ], [ -75.235301436425701, 40.030512016126202 ], [ -75.236209560417095, 40.031061663305202 ], [ -75.236589405828298, 40.031298045297902 ], [ -75.237366484367598, 40.0318069551994 ], [ -75.238181366435896, 40.032351545801703 ], [ -75.239233157086701, 40.033068732173398 ], [ -75.239704758145095, 40.033383243101802 ], [ -75.239871562577093, 40.033496963085 ], [ -75.240098781218805, 40.033660359364298 ], [ -75.240284500633095, 40.033806207022899 ], [ -75.240402180973504, 40.033907320046197 ], [ -75.240486562684893, 40.033985586008697 ], [ -75.240567246832697, 40.034066221819103 ], [ -75.240669732146699, 40.034176985559498 ], [ -75.240767487189004, 40.034290790324697 ], [ -75.2408617007072, 40.0344068692227 ], [ -75.241203690885797, 40.034849519407302 ], [ -75.241297266891493, 40.034966079532701 ], [ -75.241418981460001, 40.035108770267101 ], [ -75.241521595906903, 40.035219608077199 ], [ -75.241658177228501, 40.035353018641899 ], [ -75.241803767864397, 40.035481490114101 ], [ -75.241988480845293, 40.035629745518897 ], [ -75.242181950209996, 40.035771983957197 ], [ -75.242415697620899, 40.035930976895699 ], [ -75.242689459316495, 40.036104357720298 ], [ -75.242971316279096, 40.036269643447099 ], [ -75.243260123775698, 40.036428629038703 ], [ -75.243664083399096, 40.036640681321003 ], [ -75.244107006181196, 40.036868980142501 ], [ -75.244219392074996, 40.036924572508902 ], [ -75.244414077044894, 40.037011251327897 ], [ -75.244933647144293, 40.037224784732402 ], [ -75.2450502135395, 40.037276394950098 ], [ -75.245163464522705, 40.037330500570697 ], [ -75.245272411112296, 40.037387854890099 ], [ -75.245376098799099, 40.037449229979501 ], [ -75.245473526556793, 40.037515387888199 ], [ -75.245563740206407, 40.0375870916899 ], [ -75.2456489321969, 40.037662740389599 ], [ -75.245758244069606, 40.037767079885498 ], [ -75.245863085820005, 40.037875033899603 ], [ -75.2459638950358, 40.037986179508103 ], [ -75.2460611083076, 40.038100120792798 ], [ -75.246155150845397, 40.038216452576101 ], [ -75.246246495373299, 40.038334752694396 ], [ -75.246357510541401, 40.038484799947398 ], [ -75.246487245018699, 40.038666969972702 ], [ -75.246910562516405, 40.039273895117198 ], [ -75.246990991246903, 40.039395515617798 ], [ -75.247047058833402, 40.039488611426201 ], [ -75.247117669104995, 40.039614567881401 ], [ -75.247370913770794, 40.040091349048303 ], [ -75.247443938311704, 40.040215763119498 ], [ -75.247502480464505, 40.040307272783103 ], [ -75.247565149786894, 40.040396854106902 ], [ -75.247632722565399, 40.0404841185496 ], [ -75.247829529768296, 40.040709463914602 ], [ -75.248062127299704, 40.040958635813503 ], [ -75.248332611277405, 40.041230120951496 ], [ -75.248585680615093, 40.041469412200897 ], [ -75.248876156201405, 40.041729429222499 ], [ -75.249174948221395, 40.041983004238098 ], [ -75.249480391090501, 40.042230163995001 ], [ -75.249914644374101, 40.042571180515203 ], [ -75.250363151555703, 40.042913929030398 ], [ -75.250705700783996, 40.043169803467698 ], [ -75.251064657058294, 40.043432881269702 ], [ -75.251546833016405, 40.043778780990799 ], [ -75.252072345170504, 40.044146875278003 ], [ -75.252636217152997, 40.044532577405697 ], [ -75.253105349881196, 40.044845327592903 ], [ -75.253513783860299, 40.045107760880299 ], [ -75.253961782553205, 40.0453871890359 ], [ -75.254448922564904, 40.045683989805397 ], [ -75.255132790628707, 40.046094062690102 ], [ -75.255850010731294, 40.046523830256703 ], [ -75.256356075782193, 40.0468318182822 ], [ -75.256803594016205, 40.047163544767002 ], [ -75.257963012791706, 40.048010420434998 ], [ -75.258313488487801, 40.048271866834497 ], [ -75.258602933168703, 40.048492777577898 ], [ -75.258968577694205, 40.048780904702603 ], [ -75.259301174476306, 40.049055024540699 ], [ -75.259624187880306, 40.049336062414497 ], [ -75.259967458043903, 40.049649172026399 ], [ -75.260414837355199, 40.050073844406803 ], [ -75.261241658013205, 40.050877221109403 ], [ -75.261510497484494, 40.051148718550699 ], [ -75.261945676793204, 40.051603519526999 ], [ -75.262302855330503, 40.051971810923497 ], [ -75.262576788352206, 40.052240199442203 ], [ -75.263447610009493, 40.053059071635801 ], [ -75.264468342244797, 40.054004263628997 ], [ -75.264507041869393, 40.054042113330297 ], [ -75.264507641011207, 40.054042720942299 ], [ -75.263870581780196, 40.0545589689292 ], [ -75.263644657776894, 40.054766973776502 ], [ -75.263521035877801, 40.054880777816201 ], [ -75.243459978725696, 40.073343694617499 ], [ -75.243290570129204, 40.073504214070802 ], [ -75.243068790343798, 40.073714361685397 ], [ -75.242117066870193, 40.0746546385218 ], [ -75.227754405545397, 40.088840552866799 ], [ -75.223588079030307, 40.092954164356101 ], [ -75.219635595639403, 40.090679936156903 ], [ -75.216790207969595, 40.089042539591198 ], [ -75.214133399524002, 40.087513529464601 ], [ -75.213753762344794, 40.087299996157597 ], [ -75.211778560587106, 40.086151015068403 ], [ -75.210354671850496, 40.085322701409901 ], [ -75.209973483420001, 40.0851772093161 ], [ -75.209781537925195, 40.085098121415697 ], [ -75.209637997966098, 40.085031068193103 ], [ -75.209483563945895, 40.084951412280397 ], [ -75.209286009257994, 40.084842358434301 ], [ -75.209157494444398, 40.084763464205103 ], [ -75.208912513696205, 40.084583416674199 ], [ -75.208436822679204, 40.084206967006097 ], [ -75.206326069974097, 40.082978927211897 ], [ -75.204147619279397, 40.081730876839202 ], [ -75.202675606665295, 40.080887693512501 ], [ -75.200454842619607, 40.079615539498697 ], [ -75.196436184115896, 40.077313249797299 ], [ -75.195005200150803, 40.076497427992301 ], [ -75.190834579821399, 40.074123565350298 ], [ -75.189678821372794, 40.073468433436098 ], [ -75.189616523040897, 40.07352213299 ], [ -75.188478743437301, 40.072878759761799 ], [ -75.182301620465907, 40.0789287705473 ], [ -75.179345778473404, 40.081850746332201 ], [ -75.177147477376593, 40.0840528465883 ], [ -75.176509801057605, 40.084701191046904 ], [ -75.1764400366377, 40.084660831537001 ], [ -75.176172642177207, 40.084506123477503 ], [ -75.175873411547599, 40.0843323031647 ], [ -75.175655559514695, 40.084203454103097 ], [ -75.175345469494303, 40.084020054666802 ], [ -75.175134192879597, 40.083895100062499 ], [ -75.174787474620501, 40.083690029122302 ], [ -75.174514605224502, 40.0835286440159 ], [ -75.174159882845004, 40.083318841638103 ], [ -75.173926618779603, 40.0831808679076 ], [ -75.173575536929306, 40.082973208549802 ], [ -75.1733065735758, 40.082814133493997 ], [ -75.172939308435602, 40.082596900968397 ], [ -75.172070897497804, 40.082083239960099 ], [ -75.171714378220599, 40.081872344202999 ], [ -75.169934118311104, 40.080819279044299 ], [ -75.168268693157103, 40.079834079008698 ], [ -75.167662612289007, 40.0794755282718 ], [ -75.164090069575494, 40.077361930194897 ], [ -75.163407648264396, 40.076979833712102 ], [ -75.163393680717903, 40.076972104006302 ], [ -75.159123267589905, 40.074607353816099 ], [ -75.158385449245799, 40.0741899459221 ], [ -75.156629419043895, 40.073192777120802 ], [ -75.155835833546007, 40.072742107546198 ], [ -75.154696738569001, 40.072093677456799 ], [ -75.154077867256106, 40.071741367349297 ], [ -75.153334834998404, 40.071318374649501 ], [ -75.152758100919897, 40.070990039239902 ], [ -75.152187352189799, 40.070665106804803 ], [ -75.151591323973307, 40.070325778186401 ], [ -75.150726536645706, 40.069833438506002 ], [ -75.150042481827697, 40.069443968958304 ], [ -75.148357105125598, 40.0684843793628 ], [ -75.147680468342898, 40.068099108635998 ], [ -75.146623322815401, 40.067497159274097 ], [ -75.145220839540301, 40.066698563353697 ], [ -75.144556345582998, 40.066320171145499 ], [ -75.143946221154707, 40.065972723663499 ], [ -75.140904114022007, 40.064240278062599 ], [ -75.139417348933705, 40.063394589158499 ], [ -75.136839328658695, 40.061981453405103 ], [ -75.133071575225898, 40.059656252349903 ], [ -75.130111838434203, 40.057877998970497 ], [ -75.125355742150006, 40.055020137085002 ], [ -75.122124217202398, 40.053168971935001 ], [ -75.120808472440302, 40.052422415683502 ], [ -75.119992122032798, 40.051958982494398 ], [ -75.118566993460306, 40.051149949816804 ], [ -75.117062147965498, 40.050295605996503 ], [ -75.114509254754196, 40.048815557691903 ], [ -75.112366198646896, 40.047572902863898 ], [ -75.112058314769996, 40.047394366994297 ], [ -75.111065332860505, 40.0468227061045 ], [ -75.109433846343705, 40.045883408638097 ], [ -75.109266591750497, 40.045787108964298 ], [ -75.108907637779595, 40.046136413007297 ], [ -75.109047246521797, 40.046218895516297 ], [ -75.108105480147699, 40.047175923059797 ], [ -75.108214093501601, 40.047239393750203 ], [ -75.107429499953497, 40.048030816848502 ], [ -75.107647072468495, 40.048148621838997 ], [ -75.107492943370005, 40.048337158502399 ], [ -75.106313300171394, 40.049299819089597 ], [ -75.100753117497106, 40.052597062321198 ], [ -75.100750402904396, 40.052598720696402 ], [ -75.100166380014102, 40.052956053974299 ], [ -75.099832160381993, 40.053161925735502 ], [ -75.099377157021195, 40.053308118588603 ], [ -75.099112229622094, 40.053571577319801 ], [ -75.098804317562596, 40.053723072129003 ], [ -75.098465149851705, 40.053896938287899 ], [ -75.097667362079605, 40.054374587396097 ], [ -75.097489591139507, 40.054488059161002 ], [ -75.096506770540302, 40.055180163616903 ], [ -75.095759310669195, 40.055638725238701 ], [ -75.095121101825399, 40.0559459100065 ], [ -75.094682471438404, 40.056378839423303 ], [ -75.093617614499706, 40.057429817165499 ], [ -75.092076766101599, 40.058974923160903 ], [ -75.089764752754107, 40.061294322131502 ], [ -75.089720475658098, 40.061342709834499 ], [ -75.087466288670001, 40.0635933942064 ], [ -75.087898774364703, 40.063845046287398 ], [ -75.088766839271301, 40.064350146973098 ], [ -75.089539605211201, 40.064799774004598 ], [ -75.090372346512396, 40.0652842843635 ], [ -75.096740027203396, 40.068988780984 ], [ -75.094044353048204, 40.071641379796098 ], [ -75.093822311699498, 40.071860353147898 ], [ -75.089521704202795, 40.076104123975597 ], [ -75.0879400614009, 40.077606702667403 ], [ -75.086949451520198, 40.078668591887997 ], [ -75.086878547188604, 40.0786151122417 ], [ -75.083417464340798, 40.081962541933699 ], [ -75.082459633429906, 40.082893225813898 ], [ -75.081190904804004, 40.084125938012598 ], [ -75.077804130030103, 40.085778702540999 ], [ -75.076286789088797, 40.087349933834702 ], [ -75.076212770434196, 40.087426584456097 ], [ -75.071235380598907, 40.092580097142097 ], [ -75.070710562844098, 40.093123420645099 ], [ -75.069457859647798, 40.094420269339899 ], [ -75.067176347909395, 40.096782017952798 ], [ -75.065672021466, 40.098339123705003 ], [ -75.064935370105104, 40.099101592525798 ], [ -75.063746773592896, 40.1003307258608 ], [ -75.061418759875707, 40.102737983131597 ], [ -75.060317387607896, 40.103876775461998 ], [ -75.059229757239606, 40.105001291735597 ], [ -75.058425923387304, 40.105831980485398 ], [ -75.058293027324098, 40.105924902516399 ], [ -75.055341370472306, 40.107990526004102 ], [ -75.0542747040423, 40.108736951792203 ], [ -75.052975055656006, 40.109646371920597 ], [ -75.048544069969594, 40.112738570457701 ], [ -75.039045323273101, 40.119365817637998 ], [ -75.038339427739999, 40.119879225677401 ], [ -75.037910446583894, 40.120176646521998 ], [ -75.031655425866006, 40.124512850022498 ], [ -75.025788716329203, 40.128579044487601 ], [ -75.025357117789099, 40.128898488794498 ], [ -75.024894618355802, 40.129225840501597 ], [ -75.020574014296699, 40.132283707826097 ], [ -75.017952528136604, 40.134857423331297 ], [ -75.014967420252006, 40.137934841110301 ] ] ] } } +] +} diff --git a/site/index.html b/site/index.html new file mode 100644 index 0000000..ca49ec8 --- /dev/null +++ b/site/index.html @@ -0,0 +1,86 @@ + + + + School Explorer + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+

School Explorer

+
+
+
+ + +
+ +
+
+
+
+
+ +
+
+
Filter by Grade
+ +
+ +
Filter by Name
+ +
+ +
+ +
+
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Share Selection

    + Clear Selection +
    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/site/js/main.js b/site/js/main.js new file mode 100644 index 0000000..9e8e164 --- /dev/null +++ b/site/js/main.js @@ -0,0 +1,137 @@ +//-----------------------------------------------// +// SETTING THINGS UP, IMPORT WHAT'S IMPORTED +//-----------------------------------------------// + +// Import school data +import schools from '../data/schools.js'; + +// This variable determines which school is shown on the map +// Initially, it is all schools +export let schoolsShownOnMap = schools; + +// Import functions related to showing the school map +import { showSchoolsOnMap } from './school-map.js'; + +import { showSchoolsInList } from './school-list.js'; + +// Funtion to add event listeners to prepare for highlighting schools in the list +import { prepareHighlight } from './school-compare.js'; + +// Import useful functions from template-tools +import { htmlToElement } from "./template-tools.js"; + +// This is an array that starts from "Grade 1" to "Grade 12" and "Grade K" +// It is used to extract certain properties (whether has a certain grade) from schools.js when making a school feature +export const gradeArr = Object.keys(schools[0]).filter(key => { + if((key.indexOf('Grade') === 0) && (key.length < 9)){ + return true; + } else { + return false; + } +}); + +//-----------------------------------------------// +// INITIAL SHOWING OF MAP +//-----------------------------------------------// + +// First initialize the base map +let schoolMap = document.querySelector("#school-map"); +export let baseMap = L.map(schoolMap).setView([40, -75.15], 11); +// For other map tile styles, see this website:https://leaflet-extras.github.io/leaflet-providers/preview/ + +L.tileLayer('https://tiles.stadiamaps.com/tiles/alidade_smooth/{z}/{x}/{y}{r}.png?api_key=029695db-b34b-4602-a119-bcf44d2d87d6', { + maxZoom: 20, + attribution: '© Stadia Maps, © OpenMapTiles © OpenStreetMap contributors', +}).addTo(baseMap); + +window.schoolMap = baseMap; + +// Then add school content: +// This is only the initial showing of the school points +// After any selection, the showing of the schools is done from inside the eventListeners +showSchoolsOnMap(schools, baseMap); + +//-----------------------------------------------// +// MAKING A LIST OF CHECKBOXES OF ALL THE GRADES +//-----------------------------------------------// + +// Add a set of checkboxes of different grades +for(const grade of gradeArr) { + const html = ` +

    + `; + const gradeCheckbox = htmlToElement(html); + document.querySelector("#grade-select-set").append(gradeCheckbox); +} + +//-----------------------------------------------// +// MAKING A LIST OF SCHOOLS +//-----------------------------------------------// + +let schoolList = document.querySelector('#school-list'); + +showSchoolsInList(schools, schoolList); +// Add event listener to prepare for highlight +prepareHighlight(); + +//-----------------------------------------------// +// CHANGE WHAT'S SHOWING ACCORDING TO EVENT LISTENER +//-----------------------------------------------// + +// Get all the grade-related checkboxes +let schoolGradeFilters = document.querySelectorAll(".grade-checkbox"); + +// Get what's inputted in the Filter By Name input box +let schoolNameFilter = document.querySelector("#school-name-input"); + +// Filter schools by name +function filterByName(schoolsList) { + let filteredSchools = schoolsList; + const inputText = schoolNameFilter.value.toLowerCase(); + filteredSchools = filteredSchools.filter(school => + school["name"].toLowerCase().includes(inputText)); + return filteredSchools; +} + +// Filter schools by grade +function filterByGrade(schoolsList) { + let filteredSchools = schoolsList; + for (const checkbox of schoolGradeFilters) { + if (checkbox.checked) { + filteredSchools = filteredSchools.filter(school => + school[checkbox.value] == '1', + ); + } + } + return filteredSchools; +} + + +// On each one of them, add an event listener +// Everytime a new change is happening, put schoollist through the two filters +// Also, add event listener to the newly created HTMLs + +for(const checkbox of schoolGradeFilters){ + checkbox.addEventListener('change', ( ) => { + schoolsShownOnMap = filterByGrade(filterByName(schools)); + showSchoolsOnMap(schoolsShownOnMap, baseMap); + showSchoolsInList(schoolsShownOnMap, schoolList); + prepareHighlight(); + }); +} + +// Add event listener to the input box +// Everytime a new change is happening, put schoollist through the two filters +schoolNameFilter.addEventListener('input', ( ) => { + schoolsShownOnMap = filterByGrade(filterByName(schools)); + showSchoolsOnMap(schoolsShownOnMap, baseMap); + showSchoolsInList(schoolsShownOnMap, schoolList); + prepareHighlight(); +}); + +window.schools = schools; +window.gradeArr = gradeArr; +window.schoolList = schoolList; +window.schoolNameFilter = schoolNameFilter; +window.schoolGradeFilters = schoolGradeFilters; +window.schoolsShownOnMap = schoolsShownOnMap; \ No newline at end of file diff --git a/site/js/school-compare.js b/site/js/school-compare.js new file mode 100644 index 0000000..ba85663 --- /dev/null +++ b/site/js/school-compare.js @@ -0,0 +1,287 @@ +import { schoolsShownOnMap } from "./main.js"; +import { baseMap } from "./main.js"; +import { showSchoolsOnMap } from "./school-map.js"; +import { makeSchoolFeature } from "./school-map.js"; +import catchments from "../data/catchments.js"; +import cityLimit from "../data/City_Limits.js"; +import { htmlToElement } from "./template-tools.js"; +import { gradeArr } from './main.js'; +import { saveStateToUrl } from './url-hash.js'; + +//-----------------------------------------------// +// A SET OF FUNCTIONS +// ALL THESE FUNCTIONS ARE SUPPOSED TO BE USED +// ON CLICK +//-----------------------------------------------// + +//-----------------------------------------------// +// FUNCTION TO GET ALL SCHOOLS CURRENTLY HIGHLIGHTED +//-----------------------------------------------// + +// Make school name highlighted on click, and cancel the highlight on the next click +// Highlight means: changing the CSS class to another class using JS + + +let schoolListItemClassNames = ['school-list-item', 'school-list-item-clicked']; + +// Everytime a new click is happening, we will recalculate which schools are highlighted +// A function to generate a list of school that's currently highlighted + +function getSchoolsToCompare() { + let schoolsShownInList = document.querySelectorAll(".school-list-item, .school-list-item-clicked"); + let schoolsToCompare = []; + + // In schoolsShownInList, find those with value=0 + for(let schoolShown of schoolsShownInList) { + if(schoolShown.value == 1) { + schoolsToCompare.push(schoolShown.title); + } + } + + return schoolsToCompare; +} + +//-----------------------------------------------// +// SHOW SCHOOLS TO COMPARE IN RIGHT COLUMN +//-----------------------------------------------// + +const schoolsCompareContainer = document.querySelector("#school-compare-container"); + +function showSchoolsCompare(schoolsToCompare) { + schoolsCompareContainer.innerHTML = ""; + + // Get all the schools + const schoolsToHighlight = schoolsShownOnMap.filter(school => + schoolsToCompare.includes(school["name"])); + + for(let school of schoolsToHighlight) { + + // Get what grades this schools serves + let thisGradeArr = []; + for(let grade of gradeArr) { + if(school[grade] === "1") { + thisGradeArr.push(grade.substring(6)); + } + } + // Get major interventions + let majorIntervention; + if(school["Major Intervention"] != "N/A") { + majorIntervention = school["Major Intervention"]; + } else { + majorIntervention = "No major intervention"; + } + // Create content for schools for comparison + const html = ` +
    +
    ${school["name"]}
    +
    +
    ${school["Admission Type"]}
    +
    Grade ${thisGradeArr.join(", ")}
    +
    ${school["Learning Network"]}
    +
    ${majorIntervention}
    +
    +
    + `; + const div = htmlToElement(html); + schoolsCompareContainer.append(div); + } + +} + +//-----------------------------------------------// +// FUNCTION TO HIGHLIGHT SCHOOLS ON THE MAP +//-----------------------------------------------// + +// Enlarge the schools that are highlighted +function highlightSchoolsOnMap(schoolsToCompare) { + + // First, remove the highlighted schools from the regular school points + let schoolsAfterRemove = schoolsShownOnMap; + schoolsAfterRemove = schoolsAfterRemove.filter(school => + !(schoolsToCompare.includes(school["name"]))); + showSchoolsOnMap(schoolsAfterRemove, baseMap); + + // Then, re-add the schools in a highlighted way + const schoolsToHighlight = schoolsShownOnMap.filter(school => + schoolsToCompare.includes(school["name"])); + const highlightSchoolFeatureCollection = { + "type": "FeatureCollection", + "features": schoolsToHighlight.map(makeSchoolFeature), + }; + // For this part, reference school-map.js + if(baseMap.highlightLayers !== undefined) { + baseMap.removeLayer(baseMap.highlightLayers); + } + baseMap.highlightLayers = L.geoJSON(highlightSchoolFeatureCollection, { + pointToLayer: (geoJsonPoint, latlng) => L.circleMarker(latlng), + style: { + radius: 12, + color: "#353795", + fillOpacity: 0.5, + stroke: true, + weight: 5, + }, + }) + .bindPopup(schoolPoint => schoolPoint.feature.properties["school_name"], { "autoClose": false, "popupOpen": true }) + .openPopup() + .addTo(baseMap); +} + +//-----------------------------------------------// +// FUNCTION TO SHOW SCHOOL CATCHMENT AREAS +//-----------------------------------------------// + +function showCatchments(schoolsToCompare) { + + // SchoolsToCompare is just a list of names + // Get the full info of the highlighted schools + const schoolsToHighlight = schoolsShownOnMap.filter(school => + schoolsToCompare.includes(school["name"])); + + // Get the ids of these schools to highlight + const highlightIds = []; + for(let school of schoolsToHighlight) { + highlightIds.push(school["sdp_id"]); + } + + // Filtering the catchments to show + let filteredCatchments = Object.assign({}, catchments); + filteredCatchments.features = filteredCatchments.features.filter(catchment => + highlightIds.includes(catchment["id"])); + + // With each new click, the original catchments will be cleared first + if(baseMap.catchmentLayers != undefined) { + baseMap.removeLayer(baseMap.catchmentLayers); + } + + if(baseMap.cityLayer != undefined) { + baseMap.removeLayer(baseMap.cityLayer); + } + + // Add the catchments + + // Some schools are not neighborhood schools + // Therefore, their catchment is Philadelphia + if(filteredCatchments.features.length < highlightIds.length) { + + // What are the schools that have catchments? Used for the popup + const catchmentIds = []; + if(filteredCatchments.features.length > 0) { + for(let catchment of filteredCatchments.features) { + catchmentIds.push(catchment["id"]); + } + } + // For the tooltip, add a phrase that says: x, y, and z are not neighborhood schools + // Find which one is missing or which ones are missing + const missedSchools = []; + + for(let id of highlightIds) { + if(!catchmentIds.includes(id)) { + let missedIndex = schoolsToHighlight.findIndex(school => school.sdp_id == id); + let missedSchool = schoolsToHighlight[missedIndex]["name"]; + missedSchools.push(missedSchool); + } + } + + let phrase; + + // Showing thru Popup which schools have no catchment + if(missedSchools.length == 1) { + phrase = missedSchools[0].concat(" is not a neighborhood school."); + } else if(missedSchools.length == 2) { + phrase = missedSchools.join(" and ").concat(" are not neighborhood schools."); + } else { + let phraseFirst = missedSchools.slice(missedSchools.length - 2).join(", "); + let phraseAll = phraseFirst.concat(", and ").concat(missedSchools[missedSchools.length - 1]); + phrase = phraseAll.concat(" are not neighborhood schools"); + } + + baseMap.cityLayer = L.geoJSON(cityLimit, { + style: { + color: "#353795", + fillOpacity: 0.07, + stroke: true, + weight: 0.5, + }, + }) + .bindPopup(phrase) + .addTo(baseMap); + } + + // Add catchment layers + baseMap.catchmentLayers = L.geoJSON(filteredCatchments, { + style: { + color: "#353795", + fillOpacity: 0.07, + stroke: true, + weight: 1.7, + }, + }) + .bindPopup(catchmentPolygon => { + let thisId = catchmentPolygon.feature["id"]; + let thisIndex = schoolsShownOnMap.findIndex(school => + school.sdp_id == thisId); + let thisSchool = schoolsShownOnMap[thisIndex]["name"]; + return "Catchment of ".concat(thisSchool); + }) + .addTo(baseMap); + +} + +//-----------------------------------------------// +// ONCLICK: EVERYTIME NEW HIGHLIGHT/UNHIGHLIGHT HAPPENS +//-----------------------------------------------// + +// Function: add listener that does something everytime we click on something +// The reason to wrap things up in a function is: +// Everytime we do filter, we need to re-add listener + +function prepareHighlight() { + + let schoolsShownInList = document.querySelectorAll(".school-list-item, .school-list-item-clicked"); + for(let schoolShown of schoolsShownInList) { + + // Check if this school is currently highlighted. If so, unhighlight on click + // We do this by changing the value of the HTML element + // Originally set to 0; if highlighted, value is set to 1 + schoolShown.addEventListener('click', ( ) => { + + // What happens when something is clicked? + // 1. Highlight/unhighlight + // 2. Calculate a list of all currently highlighted schools + if(schoolShown.value == 0) { + schoolShown.value = 1; + } else { + schoolShown.value = 0; + } + + // Highlight or unhighlight by changing the CSS class + schoolShown.className = schoolListItemClassNames[schoolShown.value]; + + // Generate the current schools + const schoolsToCompare = getSchoolsToCompare(); + + // Show catchments of highlighted schools + showCatchments(schoolsToCompare); + + // Show highlighted school on the map + highlightSchoolsOnMap(schoolsToCompare); + + // Show comparing school + showSchoolsCompare(schoolsToCompare); + + // Save current state to URL + saveStateToUrl(schoolsToCompare); + }); + } +} + +export{ + prepareHighlight, + showCatchments, + highlightSchoolsOnMap, + showSchoolsCompare, +}; + +window.catchments = catchments; +window.cityLimit = cityLimit; \ No newline at end of file diff --git a/site/js/school-list.js b/site/js/school-list.js new file mode 100644 index 0000000..756edd4 --- /dev/null +++ b/site/js/school-list.js @@ -0,0 +1,26 @@ +import { htmlToElement } from "./template-tools.js"; +import { gradeArr } from './main.js'; + +function showSchoolsInList(schoolsToShow, schoolList) { + schoolList.innerHTML = ""; + + for(const school of schoolsToShow) { + let thisGradeArr = []; + for(let grade of gradeArr) { + if(school[grade] === "1") { + thisGradeArr.push(grade.substring(6)); + } + } + const html = ` +
  • +
    ${school['name']}
    +
  • + `; + const li = htmlToElement(html); + schoolList.append(li); + } +} + +export { + showSchoolsInList, +}; \ No newline at end of file diff --git a/site/js/school-map.js b/site/js/school-map.js new file mode 100644 index 0000000..dec8ef3 --- /dev/null +++ b/site/js/school-map.js @@ -0,0 +1,66 @@ +// Schoolmap-related funcs + +// Function 2: make individual school features + +// First, we need to get an array of all "grade" properties + +function makeSchoolFeature(school) { + return { + "type": "Feature", + "id": school["sdp_id"], + "properties": { + "school_name": school["name"], + "school_level": school["School Level"], + "management_organization": school["Management Organization"], + "address": school["Street Address"], + }, + "geometry": school["geom"], + }; +} +// Function 3: show school features on the base map +function showSchoolsOnMap(schoolsToShow, baseMap) { + + // First, make the individual school features into a feature collection + const schoolFeatureCollection = { + "type": "FeatureCollection", + "features": schoolsToShow.map(makeSchoolFeature), + }; + // Then, add features onto the map + + // But first: everytime this function is called, it means the user has made a different selection and the stops to show have changed + // This means we have to first remove what's already showing + + if(baseMap.schoolLayers !== undefined){ + // removeLayer is a function that can be applied to a leaflet map + baseMap.removeLayer(baseMap.schoolLayers); + } + + // Because we want to constantly change what is being inputted into this function, + // we want to make the school feature layers as a property of the school map + // so that they can be altered and removed according to our need + baseMap.schoolLayers = L.geoJSON(schoolFeatureCollection, { + // This is an option within L.geoJSON. See doc here: https://leafletjs.com/reference.html#geojson + // poinToLayer means you can make the points + // into a layer of other features based on point latlng + // in this case, use L.circleMarker + pointToLayer: (geoJsonPoint, latlng) => L.circleMarker(latlng), + // Style is also an option to be called inside geoJSON. + style: { + radius: 5, + color: "#353795", + fillOpacity: 0.5, + stroke: true, + weight: 0.7, + }, + }) + .bindPopup(schoolPoint => schoolPoint.feature.properties['school_name']) + .openPopup().addTo(baseMap); +} + +export{ + makeSchoolFeature, + showSchoolsOnMap, +}; + +window.showSchoolsOnMap = showSchoolsOnMap; +window.makeSchoolFeature = makeSchoolFeature; \ No newline at end of file diff --git a/site/js/url-hash.js b/site/js/url-hash.js new file mode 100644 index 0000000..c34c7de --- /dev/null +++ b/site/js/url-hash.js @@ -0,0 +1,70 @@ +import { schoolsShownOnMap } from "./main.js"; +import schools from "../data/schools.js"; +import { + showCatchments, + highlightSchoolsOnMap, + showSchoolsCompare, +} from "./school-compare.js"; + +//-----------------------------------------------// +// FUNCTION TO SAVE CURRENT STATE INTO AN URL +//-----------------------------------------------// + +// This function takes schoolsToCompare, which is an arr of names of highlighted schools +function saveStateToUrl(schoolsToCompare) { + + // Turn the arr of school names into school id's: + // First, get the full info of the highlighted schools + const schoolsToHighlight = schoolsShownOnMap.filter(school => + schoolsToCompare.includes(school["name"])); + + // Get the ids of these schools to highlight + const highlightIds = []; + for(let school of schoolsToHighlight) { + highlightIds.push(school["sdp_id"]); + } + + const highlightIdArr = highlightIds.join(","); + + // Generate an URL + window.location.hash = highlightIdArr; + console.log(window.location.toString()); +} + +//-----------------------------------------------// +// FUNCTION TO LOAD THE CURRENT STATE +//-----------------------------------------------// + +// This function takes in a hash url and shows only the selected schools +function loadState() { + + // Get current hash + let urlHash = window.location.hash.substring(1, window.location.hash.length); + if(urlHash !== undefined && urlHash !== "") { + // Get array of ID's we're interested in + let idArr = urlHash.split(","); + // Get array of schools objects + let schoolsSelected = schools.filter(school => idArr.includes(school["sdp_id"])); + // Get array of school names + let schoolsSelectedNameArr = []; + for(let school of schoolsSelected) { + schoolsSelectedNameArr.push(school["name"]); + } + + // Step 1: Show catchment area + showCatchments(schoolsSelectedNameArr); + // Step 2: Highlight selected schools on the map + highlightSchoolsOnMap(schoolsSelectedNameArr); + // Step 3: Show compare + showSchoolsCompare(schoolsSelectedNameArr); + + } +} + +//-----------------------------------------------// +// FUNCTION TO COPY NEWLY CREATED URL +//-----------------------------------------------// + +window.onload = loadState; + +export { saveStateToUrl }; \ No newline at end of file