diff --git a/.github/codeql/config.yml b/.github/codeql/config.yml new file mode 100644 index 0000000000..1402d55d8b --- /dev/null +++ b/.github/codeql/config.yml @@ -0,0 +1,4 @@ +name: "OpenLayers CodeQL Config" + +paths: + - src diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml new file mode 100644 index 0000000000..8686dd62a3 --- /dev/null +++ b/.github/workflows/security.yml @@ -0,0 +1,40 @@ +name: "Security Scan" + +on: + push: + branches: + - main + pull_request: + branches: + - main + schedule: + - cron: '0 0 * * 0' # At 00:00 on Sunday + +jobs: + codeql: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + # Must fetch at least the immediate parents so that if this is + # a pull request then we can checkout the head of the pull request. + # Only include this option if you are running this workflow on pull requests. + fetch-depth: 2 + + # If this run was triggered by a pull request event then checkout + # the head of the pull request instead of the merge commit. + # Only include this step if you are running this workflow on pull requests. + - run: git checkout HEAD^2 + if: ${{ github.event_name == 'pull_request' }} + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: javascript + config-file: ./.github/codeql/config.yml + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a29b692030..e91b51831b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Thanks for your interest in contributing to OpenLayers. Please see the project' ## Asking Questions -Please ask questions about using the library on [Stack Overflow using the tag 'openlayers'](http://stackoverflow.com/questions/tagged/openlayers). +Please ask questions about using the library on [Stack Overflow using the tag 'openlayers'](https://stackoverflow.com/questions/tagged/openlayers). When you want to get involved and discuss new features or changes, please use [the mailing list](https://groups.google.com/forum/#!forum/openlayers-dev). @@ -68,12 +68,12 @@ easily-understandable chunks. Any individual commit should not add more than one new class or one new function. Do not submit commits that change thousands of lines or that contain more than one distinct logical change. Trivial commits, e.g. to fix lint errors, should be merged into the commit that -introduced the error. See the [Atomic Commit Convention on Wikipedia](http://en.wikipedia.org/wiki/Atomic_commit#Atomic_Commit_Convention) for more detail. +introduced the error. See the [Atomic Commit Convention on Wikipedia](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_Commit_Convention) for more detail. `git apply --patch` and `git rebase` can help you create a clean commit history. -[Reviewboard.org](http://www.reviewboard.org/docs/codebase/dev/git/clean-commits/) -and [Pro GIT](http://git-scm.com/book/en/Git-Tools-Rewriting-History) have +[Reviewboard.org](https://www.reviewboard.org/docs/codebase/dev/git/clean-commits/) +and [Pro GIT](https://git-scm.com/book/en/Git-Tools-Rewriting-History) have explain how to use them. @@ -81,7 +81,7 @@ explain how to use them. Commit messages should be short, begin with a verb in the imperative, and contain no trailing punctuation. We follow -http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html +https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html for the formatting of commit messages. Git commit message should look like: diff --git a/DEVELOPING.md b/DEVELOPING.md index 82bc72557c..3718bc71d1 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -10,7 +10,7 @@ You will obviously start by The minimum requirements are: * Git -* [Node.js](http://nodejs.org/) (version 8 and above) +* [Node.js](https://nodejs.org/) (version 8 and above) The executables `git` and `node` should be in your `PATH`. diff --git a/README.md b/README.md index c2d5861182..48f96b6dba 100644 --- a/README.md +++ b/README.md @@ -108,14 +108,17 @@ TypeScript users may want to use a [third-party types package](https://github.co ## Supported Browsers -OpenLayers runs on all modern browsers that support [HTML5](https://html.spec.whatwg.org/multipage/) and [ECMAScript 5](http://www.ecma-international.org/ecma-262/5.1/). This includes Chrome, Firefox, Safari and Edge. +OpenLayers runs on all modern browsers that support [HTML5](https://html.spec.whatwg.org/multipage/) and [ECMAScript 5](https://262.ecma-international.org/5.1/). This includes Chrome, Firefox, Safari and Edge. For older browsers and platforms (Internet Explorer, Android 4.x, iOS v12 and older, Safari v12 and older), polyfills may be needed for the following browser features: -* [`requestAnimationFrame`](https://caniuse.com/#feat=requestanimationframe): Available from [polyfill.io](https://polyfill.io/). -* [`element.prototype.classList` (`add`/`remove`)](https://caniuse.com/#feat=classlist): Available from [polyfill.io](https://polyfill.io/). -* [`URL` API](https://caniuse.com/#feat=url): Available from [polyfill.io](https://polyfill.io/). -* [Pointer events](https://caniuse.com/#feat=pointer): Use [elm-pep](https://npmjs.com/package/elm-pep) (lightweight) or [@openlayers/pepjs](https://npmjs.com/package/pepjs) (for really, really old browsers). +* [`fetch`](https://caniuse.com/fetch): Available from [polyfill.io](https://polyfill.io/). +* [`requestAnimationFrame`](https://caniuse.com/requestanimationframe): Available from [polyfill.io](https://polyfill.io/). +* [`element.prototype.classList` (`add`/`remove`)](https://caniuse.com/classlist): Available from [polyfill.io](https://polyfill.io/). +* [`URL` API](https://caniuse.com/url): Available from [polyfill.io](https://polyfill.io/). +* [`TextDecoder`](https://caniuse.com/textencoder): Available from [polyfill.io](https://polyfill.io/). +* [`Number.isInteger`](https://caniuse.com/isInteger): Available from [polyfill.io](https://polyfill.io/). +* [Pointer events](https://caniuse.com/pointer): Use [elm-pep](https://npmjs.com/package/elm-pep) (lightweight) or [pepjs](https://npmjs.com/package/pepjs) (for really, really old browsers). ## Documentation @@ -131,7 +134,7 @@ Please see our guide on [contributing](CONTRIBUTING.md) if you're interested in ## Community -- Need help? Find it on [Stack Overflow using the tag 'openlayers'](http://stackoverflow.com/questions/tagged/openlayers) +- Need help? Find it on [Stack Overflow using the tag 'openlayers'](https://stackoverflow.com/questions/tagged/openlayers) - Follow [@openlayers](https://twitter.com/openlayers) on Twitter ![Test Status](https://github.com/openlayers/openlayers/workflows/Test/badge.svg) diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md index 1766664c5f..d6b37c7815 100644 --- a/changelog/upgrade-notes.md +++ b/changelog/upgrade-notes.md @@ -1,5 +1,26 @@ ## Upgrade notes +### Next version + +#### Deprecation of `image` render mode for vector tile layers + +`renderMode: 'image'` for vector tile layers has been deprecated. Applications continue to work, but a warning will be issued to the console. To get rid of the warning, simply remove the `renderMode` option. + +### v6.5.0 + +#### Units of the `hitTolerance` option fixed + +Previously, the `hitTolerance` option of the map's `getFeaturesAtPixel()`, `forEachFeatureAtPixel()` and `hasFeatureAtPixel()` methods behaved differently depending on the `devicePixelRatio` (or the `pixelRatio` of the map), because the original value was internally multiplied by the device pixel ratio twice instead of just once. Now this is fixed. **Note**: The `hitTolerance`'s units are css pixels. The documentation was updated to reflect this. + +If your application adjusts for that with code like +```js +{ hitTolerance: 10 / devicePixelRatio, } +``` +you'll have to change that code to +```js +{ hitTolerance: 10, } +``` + ### v6.4.0 #### Pointer events polyfill removed diff --git a/changelog/v6.4.1 b/changelog/v6.4.1.md similarity index 100% rename from changelog/v6.4.1 rename to changelog/v6.4.1.md diff --git a/changelog/v6.5.0.md b/changelog/v6.5.0.md new file mode 100644 index 0000000000..f24a4ac0c2 --- /dev/null +++ b/changelog/v6.5.0.md @@ -0,0 +1,279 @@ +# 6.5.0 + +With more than 110 pull requests, this release not only brings WFS 2.0 support and improved touch support for drawing geometries and querying features. In addition to that, several improvements, many bugs fixes, and nicer API docs and examples have found their way into the 6.5.0 release. + +## Upgrade notes + +### Units of the `hitTolerance` option fixed + +Previously, the `hitTolerance` option of the map's `getFeaturesAtPixel()`, `forEachFeatureAtPixel()` and `hasFeatureAtPixel()` methods behaved differently depending on the `devicePixelRatio` (or the `pixelRatio` of the map), because the original value was internally multiplied by the device pixel ratio twice instead of just once. Now this is fixed. **Note**: The `hitTolerance`'s units are css pixels. The documentation was updated to reflect this. + +If your application adjusts for that with code like +```js +{ hitTolerance: 10 / devicePixelRatio, } +``` +you'll have to change that code to +```js +{ hitTolerance: 10, } +``` +## New features and improvements + +* New scale option in `RegularShape` and `Circle` style constructors +* WFS 2.0.0 support +* Added `preRender` and `postRender` methods to `WebGLLayerRenderer` +* Added `className` constructor option in `ol/layer/Heatmap` +* Added load events for `ol/source/Vector` +* New `iconUrlFunction` option for `ol/format/KML` +* Added `transition` option to `OSM` and `CartoDB` sources +* `DragAndDrop` interaction support for formats that read ArrayBuffer sources +* New `padding` option for `ol/View` +* New `cancel` event for the `DragBox` interaction +* When using `hitTolerance`, detect closest features first +* Ability to draw `Circle` geometries with a custom renderer + + +## List of all changes + + * [#11859](https://github.com/openlayers/openlayers/pull/11859) - Do not fire duplicate postrender events ([@MoonE](https://github.com/MoonE)) + * [#11858](https://github.com/openlayers/openlayers/pull/11858) - Correct documented event names for VectorSourceEvent ([@MoonE](https://github.com/MoonE)) + * [#11844](https://github.com/openlayers/openlayers/pull/11844) - Fix Style expressions error message ([@MoonE](https://github.com/MoonE)) + * [#11838](https://github.com/openlayers/openlayers/pull/11838) - Custom circle render ([@changqingom](https://github.com/changqingom)) + * [#11811](https://github.com/openlayers/openlayers/pull/11811) - Better getPointResolution default when no transform available ([@mike-000](https://github.com/mike-000)) + * [#11821](https://github.com/openlayers/openlayers/pull/11821) - Call the finishCondition when drawing points / circles ([@MoonE](https://github.com/MoonE)) + * [#11824](https://github.com/openlayers/openlayers/pull/11824) - Add Units back to API docs ([@ahocevar](https://github.com/ahocevar)) + * [#11817](https://github.com/openlayers/openlayers/pull/11817) - stopPropagation support for PluggableMap ([@greggian](https://github.com/greggian)) + * [#11815](https://github.com/openlayers/openlayers/pull/11815) - Remove unnecessary line that breaks drawing with multi-touch ([@ahocevar](https://github.com/ahocevar)) + * [#11800](https://github.com/openlayers/openlayers/pull/11800) - Fix removeLastPoint when removing last point ([@ahocevar](https://github.com/ahocevar)) + * [#11769](https://github.com/openlayers/openlayers/pull/11769) - Modify interaction developer experience improvements ([@ahocevar](https://github.com/ahocevar)) + * [#11803](https://github.com/openlayers/openlayers/pull/11803) - Modify fix vertex insertion ([@MoonE](https://github.com/MoonE)) + * [#11783](https://github.com/openlayers/openlayers/pull/11783) - Cache hit detect indexes and check closest pixels first. ([@MoonE](https://github.com/MoonE)) + * [#11791](https://github.com/openlayers/openlayers/pull/11791) - Now that pepjs was updated, we can point to the official package ([@ahocevar](https://github.com/ahocevar)) + * [#11790](https://github.com/openlayers/openlayers/pull/11790) - Fix attributions links for WMS layers from swisstopo ([@openlayers](https://github.com/openlayers)) + * [#11781](https://github.com/openlayers/openlayers/pull/11781) - Pass geometry to forEachFeatureAtPixel callback ([@ahocevar](https://github.com/ahocevar)) + * [#11778](https://github.com/openlayers/openlayers/pull/11778) - No need to adjust hitTolerance for pixel ratio twice ([@ahocevar](https://github.com/ahocevar)) + * [#11780](https://github.com/openlayers/openlayers/pull/11780) - Add a cancel event to the DragBox interaction ([@M393](https://github.com/M393)) + * [#11779](https://github.com/openlayers/openlayers/pull/11779) - Restore Mode.CIRCLE in Draw interaction ([@mike-000](https://github.com/mike-000)) + * [#11753](https://github.com/openlayers/openlayers/pull/11753) - Use Mode.LINE_STRING in Draw interaction for Circle geometries ([@mike-000](https://github.com/mike-000)) + * [#11767](https://github.com/openlayers/openlayers/pull/11767) - Improve documentation of geometry rotation ([@mike-000](https://github.com/mike-000)) + * [#11755](https://github.com/openlayers/openlayers/pull/11755) - Add padding option for View ([@ahocevar](https://github.com/ahocevar)) + * [#11754](https://github.com/openlayers/openlayers/pull/11754) - Fix typo that prevents Rotate icon from indicating the view rotation ([@ahocevar](https://github.com/ahocevar)) + * [#11719](https://github.com/openlayers/openlayers/pull/11719) - Clamp EPSG:3857 y to lowest/highest possible value instead of validity extent ([@ahocevar](https://github.com/ahocevar)) + * [#11737](https://github.com/openlayers/openlayers/pull/11737) - Write the correct SRS code in EsriJSON ([@ahocevar](https://github.com/ahocevar)) + * [#11749](https://github.com/openlayers/openlayers/pull/11749) - Document that snapTolerance must be greater than 0 ([@ahocevar](https://github.com/ahocevar)) + * [#11750](https://github.com/openlayers/openlayers/pull/11750) - Update TMS tileUrlFunction example in ol/source/XYZ documentation ([@mike-000](https://github.com/mike-000)) + * [#11739](https://github.com/openlayers/openlayers/pull/11739) - Fix: Check for layer extent in CanvasLayerRenderer.getDataAtPixel ([@boeckMt](https://github.com/boeckMt)) + * [#11748](https://github.com/openlayers/openlayers/pull/11748) - Add fetch and TextDecoder to polyfill list in README ([@mike-000](https://github.com/mike-000)) + * [#11740](https://github.com/openlayers/openlayers/pull/11740) - Wfs bbox per feature type ([@ger-benjamin](https://github.com/ger-benjamin)) + * [#11722](https://github.com/openlayers/openlayers/pull/11722) - Correct meaning of 'start' and 'end' text align for LTR text ([@ahocevar](https://github.com/ahocevar)) + * [#11741](https://github.com/openlayers/openlayers/pull/11741) - Include LICENSE.md in built package ([@bz2](https://github.com/bz2)) + * [#11718](https://github.com/openlayers/openlayers/pull/11718) - Initialize sketch point on Draw#extend() ([@ahocevar](https://github.com/ahocevar)) + * [#11732](https://github.com/openlayers/openlayers/pull/11732) - Replace readURI with readStyleURL for KML StyleURLs ([@mike-000](https://github.com/mike-000)) + * [#11723](https://github.com/openlayers/openlayers/pull/11723) - Drag and Drop Interaction support for formats that read ArrayBuffer sources ([@mike-000](https://github.com/mike-000)) + * [#11724](https://github.com/openlayers/openlayers/pull/11724) - Add transition option to OSM and CartoDB sources, document default ([@MoonE](https://github.com/MoonE)) + * [#11721](https://github.com/openlayers/openlayers/pull/11721) - Handle empty Z coordinates in KML ([@mike-000](https://github.com/mike-000)) + * [#11587](https://github.com/openlayers/openlayers/pull/11587) - Determine orientation by actual text start and end x ([@MoonE](https://github.com/MoonE)) + * [#11720](https://github.com/openlayers/openlayers/pull/11720) - Return to simpler and less efficient winding order algorithm ([@ahocevar](https://github.com/ahocevar)) + * [#11715](https://github.com/openlayers/openlayers/pull/11715) - Add all symbols to the legacy build ([@ahocevar](https://github.com/ahocevar)) + * [#11716](https://github.com/openlayers/openlayers/pull/11716) - Treat svg as binary resource ([@mike-000](https://github.com/mike-000)) + * [#11698](https://github.com/openlayers/openlayers/pull/11698) - Draw pointer improvements ([@ahocevar](https://github.com/ahocevar)) + * [#11490](https://github.com/openlayers/openlayers/pull/11490) - iconUrlFunction option for ol/format/KML ([@mike-000](https://github.com/mike-000)) + * [#11628](https://github.com/openlayers/openlayers/pull/11628) - VectorSource load events ([@simonseyock](https://github.com/simonseyock)) + * [#11691](https://github.com/openlayers/openlayers/pull/11691) - Use Parcel v2 in copy/paste example code ([@ahocevar](https://github.com/ahocevar)) + * [#11673](https://github.com/openlayers/openlayers/pull/11673) - Do not emulate dblclick and slingleclick on multi-touch ([@ahocevar](https://github.com/ahocevar)) + * [#11676](https://github.com/openlayers/openlayers/pull/11676) - Fix countries.geojson Antarctica polygon so it wraps correctly ([@mike-000](https://github.com/mike-000)) + * [#11646](https://github.com/openlayers/openlayers/pull/11646) - Ensure a unique tile key for each tile coordinate ([@ahocevar](https://github.com/ahocevar)) + * [#11655](https://github.com/openlayers/openlayers/pull/11655) - Fix documentation of image render mode for vector tile layers ([@ahocevar](https://github.com/ahocevar)) + * [#11668](https://github.com/openlayers/openlayers/pull/11668) - Don't try to get image data for zero sized images ([@tapioko](https://github.com/tapioko)) + * [#11648](https://github.com/openlayers/openlayers/pull/11648) - Dwithin filter ([@virtualcitySYSTEMS](https://github.com/virtualcitySYSTEMS)) + * [#11658](https://github.com/openlayers/openlayers/pull/11658) - Make webpack dev server run with current version ([@MoonE](https://github.com/MoonE)) + * [#11590](https://github.com/openlayers/openlayers/pull/11590) - Export all the Event sub class ([@sbrunner](https://github.com/sbrunner)) + * [#11594](https://github.com/openlayers/openlayers/pull/11594) - Display current OS copyright date in the Raster Reprojection example ([@mike-000](https://github.com/mike-000)) + * [#11657](https://github.com/openlayers/openlayers/pull/11657) - Use https to avoid security warnings ([@mike-000](https://github.com/mike-000)) + * [#11649](https://github.com/openlayers/openlayers/pull/11649) - Deal with undefined units from proj4 longlat projections ([@ahocevar](https://github.com/ahocevar)) + * [#11403](https://github.com/openlayers/openlayers/pull/11403) - #11402 add CSS class name support for control buttons ([@cazacugmihai](https://github.com/cazacugmihai)) + * [#11592](https://github.com/openlayers/openlayers/pull/11592) - New decluttering implementation ([@ahocevar](https://github.com/ahocevar)) + * [#11618](https://github.com/openlayers/openlayers/pull/11618) - Update the Marker Animation example ([@mike-000](https://github.com/mike-000)) + * [#11620](https://github.com/openlayers/openlayers/pull/11620) - Add charset to the examples html below the map ([@MoonE](https://github.com/MoonE)) + * [#11613](https://github.com/openlayers/openlayers/pull/11613) - Allow mouse input if map is rendered in an other window ([@elnabo](https://github.com/elnabo)) + * [#11597](https://github.com/openlayers/openlayers/pull/11597) - Improved performance when removing feature with only one Select ([@MoonE](https://github.com/MoonE)) + * [#11607](https://github.com/openlayers/openlayers/pull/11607) - Reset attributions control to collapsible when no uncollapsible sources are visible ([@mike-000](https://github.com/mike-000)) + * [#11609](https://github.com/openlayers/openlayers/pull/11609) - Modify interaction insert only one vertex ([@M393](https://github.com/M393)) + * [#11605](https://github.com/openlayers/openlayers/pull/11605) - Remove context references when releasing tiles ([@ahocevar](https://github.com/ahocevar)) + * [#11591](https://github.com/openlayers/openlayers/pull/11591) - Make permalink example less complex ([@kannes](https://github.com/kannes)) + * [#11569](https://github.com/openlayers/openlayers/pull/11569) - Fix binary data exports to codesandbox in examples ([@mike-000](https://github.com/mike-000)) + * [#11579](https://github.com/openlayers/openlayers/pull/11579) - Replace Animated GIF example globe gif ([@mike-000](https://github.com/mike-000)) + * [#11565](https://github.com/openlayers/openlayers/pull/11565) - Animated GIF example ([@mike-000](https://github.com/mike-000)) + * [#11571](https://github.com/openlayers/openlayers/pull/11571) - Replace countryflags.io with flagcdn.com in the Style Renderer example ([@mike-000](https://github.com/mike-000)) + * [#11568](https://github.com/openlayers/openlayers/pull/11568) - Fix raster source crash bug when using multiple threads ([@rgroothuijsen](https://github.com/rgroothuijsen)) + * [#11563](https://github.com/openlayers/openlayers/pull/11563) - Fix end world calculation if projection is not symmetric ([@MoonE](https://github.com/MoonE)) + * [#11561](https://github.com/openlayers/openlayers/pull/11561) - Constrain resolution when fit called without duration ([@M393](https://github.com/M393)) + * [#11559](https://github.com/openlayers/openlayers/pull/11559) - Only draw visible worlds ([@MoonE](https://github.com/MoonE)) + * [#11519](https://github.com/openlayers/openlayers/pull/11519) - Do not draw multipoints outside render extent ([@MoonE](https://github.com/MoonE)) + * [#11532](https://github.com/openlayers/openlayers/pull/11532) - Make TileGrid behave as documented with extent and sizes options ([@ahocevar](https://github.com/ahocevar)) + * [#11545](https://github.com/openlayers/openlayers/pull/11545) - Use the className param in ol.layer.Heatmap ([@fredj](https://github.com/fredj)) + * [#11548](https://github.com/openlayers/openlayers/pull/11548) - Bind tileUrlFunction before returning it from getTileUrlFunction ([@ahocevar](https://github.com/ahocevar)) + * [#11549](https://github.com/openlayers/openlayers/pull/11549) - Only use elementFromPoint with ShadowRoot ([@ahocevar](https://github.com/ahocevar)) + * [#11502](https://github.com/openlayers/openlayers/pull/11502) - Fix issue with WMS Capabilities containing a single layer ([@jbelien](https://github.com/jbelien)) + * [#11540](https://github.com/openlayers/openlayers/pull/11540) - Avoid unnecessary transform in the MVT format ([@gberaudo](https://github.com/gberaudo)) + * [#11537](https://github.com/openlayers/openlayers/pull/11537) - Add rotation and rotateWithView to ol/style/Circle clone method and options ([@mike-000](https://github.com/mike-000)) + * [#11543](https://github.com/openlayers/openlayers/pull/11543) - wmts matrixset null pointer fix and improved handling of Identifier ([@sweco-dkjesh](https://github.com/sweco-dkjesh)) + * [#11509](https://github.com/openlayers/openlayers/pull/11509) - Add urn:x-ogc:def:crs:EPSG:6.6:4326 as WGS84 proj identifier ([@fgravin](https://github.com/fgravin)) + * [#11521](https://github.com/openlayers/openlayers/pull/11521) - Do not use fractional pixel ratio for rendering vector tiles ([@ahocevar](https://github.com/ahocevar)) + * [#11517](https://github.com/openlayers/openlayers/pull/11517) - Make clockwise check work when coordinates are duplicated ([@ahocevar](https://github.com/ahocevar)) + * [#11501](https://github.com/openlayers/openlayers/pull/11501) - Empty this.canvas_ for all pixel ratios when render() is called ([@mike-000](https://github.com/mike-000)) + * [#11471](https://github.com/openlayers/openlayers/pull/11471) - Feature: added preRender and postRender methods to WebGLLayerRenderer… ([@MichaelLangbein](https://github.com/MichaelLangbein)) + * [#11491](https://github.com/openlayers/openlayers/pull/11491) - Cosmetic fix to doc (missing closing quote) ([@mike-000](https://github.com/mike-000)) + * [#11488](https://github.com/openlayers/openlayers/pull/11488) - "Layer Z-Index" example bugfix ([@michalzielanski](https://github.com/michalzielanski)) + * [#11486](https://github.com/openlayers/openlayers/pull/11486) - guard for null ([@davidiamaf](https://github.com/davidiamaf)) + * [#11481](https://github.com/openlayers/openlayers/pull/11481) - Adding original properties to cloned geometry ([@michalzielanski](https://github.com/michalzielanski)) + * [#11404](https://github.com/openlayers/openlayers/pull/11404) - Add security scan ([@tschaub](https://github.com/tschaub)) + * [#11470](https://github.com/openlayers/openlayers/pull/11470) - Fix pointer events polyfill link ([@ahocevar](https://github.com/ahocevar)) + * [#11467](https://github.com/openlayers/openlayers/pull/11467) - Style renderer example ([@ahocevar](https://github.com/ahocevar)) + * [#11455](https://github.com/openlayers/openlayers/pull/11455) - Apidoc improvements ([@MoonE](https://github.com/MoonE)) + * [#11474](https://github.com/openlayers/openlayers/pull/11474) - fix: modify rbush package import ([@haasz](https://github.com/haasz)) + * [#11472](https://github.com/openlayers/openlayers/pull/11472) - Typescript 4.0.2 ([@ahocevar](https://github.com/ahocevar)) + * [#11454](https://github.com/openlayers/openlayers/pull/11454) - VectorTile source projection has to match the view projection ([@ahocevar](https://github.com/ahocevar)) + * [#11438](https://github.com/openlayers/openlayers/pull/11438) - Better scroll behaviour for apidocs ([@MoonE](https://github.com/MoonE)) + * [#11446](https://github.com/openlayers/openlayers/pull/11446) - Checks before calling handleEvent on interactions ([@ahocevar](https://github.com/ahocevar)) + * [#11305](https://github.com/openlayers/openlayers/pull/11305) - PluggableMap: avoid crash when multiple interactions are removed ([@megawac](https://github.com/megawac)) + * [#11433](https://github.com/openlayers/openlayers/pull/11433) - Fix typo in module name ([@fredj](https://github.com/fredj)) + * [#11419](https://github.com/openlayers/openlayers/pull/11419) - WFS 2.0.0 support ([@bjornharrtell](https://github.com/bjornharrtell)) + * [#11418](https://github.com/openlayers/openlayers/pull/11418) - Icon color default to composite operation ([@MoonE](https://github.com/MoonE)) + * [#11416](https://github.com/openlayers/openlayers/pull/11416) - Examples add labels to inputs ([@MoonE](https://github.com/MoonE)) + * [#11417](https://github.com/openlayers/openlayers/pull/11417) - Fix sort order of examples search results ([@ahocevar](https://github.com/ahocevar)) + * [#11413](https://github.com/openlayers/openlayers/pull/11413) - Include scale option in RegularShape and Circle style constructors ([@mike-000](https://github.com/mike-000)) + * [#11401](https://github.com/openlayers/openlayers/pull/11401) - Ensure image extent is valid when scale is negative ([@mike-000](https://github.com/mike-000)) + * [#11395](https://github.com/openlayers/openlayers/pull/11395) - Correct inchesPerMeter and add tests for ScaleBar text ([@mike-000](https://github.com/mike-000)) + * [#11407](https://github.com/openlayers/openlayers/pull/11407) - Support deprecated coordinates element for GML3+ formats ([@bjornharrtell](https://github.com/bjornharrtell)) + * [#11398](https://github.com/openlayers/openlayers/pull/11398) - Fix link to workshop / download ([@MoonE](https://github.com/MoonE)) + * [#11391](https://github.com/openlayers/openlayers/pull/11391) - Simplify scale calculation used for WMS getLegendUrl() ([@mike-000](https://github.com/mike-000)) + + +
+ Dependency Updates + + * [#11851](https://github.com/openlayers/openlayers/pull/11851) - Bump @babel/preset-env from 7.12.10 to 7.12.11 ([@openlayers](https://github.com/openlayers)) + * [#11850](https://github.com/openlayers/openlayers/pull/11850) - Bump marked from 1.2.6 to 1.2.7 ([@openlayers](https://github.com/openlayers)) + * [#11852](https://github.com/openlayers/openlayers/pull/11852) - Bump rollup from 2.35.0 to 2.35.1 ([@openlayers](https://github.com/openlayers)) + * [#11853](https://github.com/openlayers/openlayers/pull/11853) - Bump copy-webpack-plugin from 6.4.0 to 6.4.1 ([@openlayers](https://github.com/openlayers)) + * [#11849](https://github.com/openlayers/openlayers/pull/11849) - Bump eslint from 7.15.0 to 7.16.0 ([@openlayers](https://github.com/openlayers)) + * [#11848](https://github.com/openlayers/openlayers/pull/11848) - Bump ol-mapbox-style from 6.2.1 to 6.3.0 ([@openlayers](https://github.com/openlayers)) + * [#11828](https://github.com/openlayers/openlayers/pull/11828) - Bump ol-mapbox-style from 6.1.4 to 6.2.1 ([@openlayers](https://github.com/openlayers)) + * [#11830](https://github.com/openlayers/openlayers/pull/11830) - Bump jsdoc-plugin-typescript from 2.0.5 to 2.0.6 ([@openlayers](https://github.com/openlayers)) + * [#11829](https://github.com/openlayers/openlayers/pull/11829) - Bump typescript from 4.1.2 to 4.1.3 ([@openlayers](https://github.com/openlayers)) + * [#11833](https://github.com/openlayers/openlayers/pull/11833) - Bump rollup from 2.34.2 to 2.35.0 ([@openlayers](https://github.com/openlayers)) + * [#11834](https://github.com/openlayers/openlayers/pull/11834) - Bump copy-webpack-plugin from 6.3.2 to 6.4.0 ([@openlayers](https://github.com/openlayers)) + * [#11832](https://github.com/openlayers/openlayers/pull/11832) - Bump @babel/preset-env from 7.12.7 to 7.12.10 ([@openlayers](https://github.com/openlayers)) + * [#11835](https://github.com/openlayers/openlayers/pull/11835) - Bump sinon from 9.2.1 to 9.2.2 ([@openlayers](https://github.com/openlayers)) + * [#11831](https://github.com/openlayers/openlayers/pull/11831) - Bump marked from 1.2.5 to 1.2.6 ([@openlayers](https://github.com/openlayers)) + * [#11827](https://github.com/openlayers/openlayers/pull/11827) - Bump @babel/core from 7.12.9 to 7.12.10 ([@openlayers](https://github.com/openlayers)) + * [#11820](https://github.com/openlayers/openlayers/pull/11820) - [Security] Bump ini from 1.3.5 to 1.3.7 ([@openlayers](https://github.com/openlayers)) + * [#11809](https://github.com/openlayers/openlayers/pull/11809) - Bump yargs from 16.1.1 to 16.2.0 ([@openlayers](https://github.com/openlayers)) + * [#11808](https://github.com/openlayers/openlayers/pull/11808) - Bump worker-loader from 3.0.5 to 3.0.6 ([@openlayers](https://github.com/openlayers)) + * [#11807](https://github.com/openlayers/openlayers/pull/11807) - Bump eslint from 7.14.0 to 7.15.0 ([@openlayers](https://github.com/openlayers)) + * [#11806](https://github.com/openlayers/openlayers/pull/11806) - Bump rollup from 2.34.0 to 2.34.2 ([@openlayers](https://github.com/openlayers)) + * [#11786](https://github.com/openlayers/openlayers/pull/11786) - Bump rollup from 2.33.3 to 2.34.0 ([@openlayers](https://github.com/openlayers)) + * [#11787](https://github.com/openlayers/openlayers/pull/11787) - Bump babel-loader from 8.2.1 to 8.2.2 ([@openlayers](https://github.com/openlayers)) + * [#11785](https://github.com/openlayers/openlayers/pull/11785) - Bump @babel/core from 7.12.7 to 7.12.9 ([@openlayers](https://github.com/openlayers)) + * [#11762](https://github.com/openlayers/openlayers/pull/11762) - Bump typescript from 4.0.5 to 4.1.2 ([@openlayers](https://github.com/openlayers)) + * [#11764](https://github.com/openlayers/openlayers/pull/11764) - Bump copy-webpack-plugin from 6.3.1 to 6.3.2 ([@openlayers](https://github.com/openlayers)) + * [#11758](https://github.com/openlayers/openlayers/pull/11758) - Bump rollup from 2.33.2 to 2.33.3 ([@openlayers](https://github.com/openlayers)) + * [#11761](https://github.com/openlayers/openlayers/pull/11761) - Bump @babel/core from 7.12.3 to 7.12.7 ([@openlayers](https://github.com/openlayers)) + * [#11760](https://github.com/openlayers/openlayers/pull/11760) - Bump proj4 from 2.6.2 to 2.6.3 ([@openlayers](https://github.com/openlayers)) + * [#11763](https://github.com/openlayers/openlayers/pull/11763) - Bump eslint from 7.13.0 to 7.14.0 ([@openlayers](https://github.com/openlayers)) + * [#11759](https://github.com/openlayers/openlayers/pull/11759) - Bump @babel/preset-env from 7.12.1 to 7.12.7 ([@openlayers](https://github.com/openlayers)) + * [#11757](https://github.com/openlayers/openlayers/pull/11757) - Bump marked from 1.2.4 to 1.2.5 ([@openlayers](https://github.com/openlayers)) + * [#11756](https://github.com/openlayers/openlayers/pull/11756) - Bump puppeteer from 5.4.1 to 5.5.0 ([@openlayers](https://github.com/openlayers)) + * [#11747](https://github.com/openlayers/openlayers/pull/11747) - Bump rollup from 2.33.1 to 2.33.2 ([@openlayers](https://github.com/openlayers)) + * [#11746](https://github.com/openlayers/openlayers/pull/11746) - Bump babel-loader from 8.1.0 to 8.2.1 ([@openlayers](https://github.com/openlayers)) + * [#11745](https://github.com/openlayers/openlayers/pull/11745) - Bump yargs from 16.1.0 to 16.1.1 ([@openlayers](https://github.com/openlayers)) + * [#11744](https://github.com/openlayers/openlayers/pull/11744) - Bump webpack-dev-middleware from 4.0.0 to 4.0.2 ([@openlayers](https://github.com/openlayers)) + * [#11743](https://github.com/openlayers/openlayers/pull/11743) - Bump copy-webpack-plugin from 6.3.0 to 6.3.1 ([@openlayers](https://github.com/openlayers)) + * [#11742](https://github.com/openlayers/openlayers/pull/11742) - Bump marked from 1.2.3 to 1.2.4 ([@openlayers](https://github.com/openlayers)) + * [#11731](https://github.com/openlayers/openlayers/pull/11731) - Bump mocha from 8.2.0 to 8.2.1 ([@openlayers](https://github.com/openlayers)) + * [#11730](https://github.com/openlayers/openlayers/pull/11730) - Bump marked from 1.2.2 to 1.2.3 ([@openlayers](https://github.com/openlayers)) + * [#11729](https://github.com/openlayers/openlayers/pull/11729) - Bump eslint from 7.12.1 to 7.13.0 ([@openlayers](https://github.com/openlayers)) + * [#11728](https://github.com/openlayers/openlayers/pull/11728) - Bump webpack-cli from 4.1.0 to 4.2.0 ([@openlayers](https://github.com/openlayers)) + * [#11727](https://github.com/openlayers/openlayers/pull/11727) - Bump karma-firefox-launcher from 2.0.0 to 2.1.0 ([@openlayers](https://github.com/openlayers)) + * [#11726](https://github.com/openlayers/openlayers/pull/11726) - Bump copy-webpack-plugin from 6.2.1 to 6.3.0 ([@openlayers](https://github.com/openlayers)) + * [#11708](https://github.com/openlayers/openlayers/pull/11708) - Bump rollup from 2.32.1 to 2.33.1 ([@openlayers](https://github.com/openlayers)) + * [#11705](https://github.com/openlayers/openlayers/pull/11705) - Bump webpack-dev-middleware from 3.7.2 to 4.0.0 ([@openlayers](https://github.com/openlayers)) + * [#11706](https://github.com/openlayers/openlayers/pull/11706) - Bump url-polyfill from 1.1.11 to 1.1.12 ([@openlayers](https://github.com/openlayers)) + * [#11707](https://github.com/openlayers/openlayers/pull/11707) - Bump typescript from 4.0.3 to 4.0.5 ([@openlayers](https://github.com/openlayers)) + * [#11709](https://github.com/openlayers/openlayers/pull/11709) - Bump sinon from 9.2.0 to 9.2.1 ([@openlayers](https://github.com/openlayers)) + * [#11710](https://github.com/openlayers/openlayers/pull/11710) - Bump puppeteer from 5.4.0 to 5.4.1 ([@openlayers](https://github.com/openlayers)) + * [#11711](https://github.com/openlayers/openlayers/pull/11711) - Bump eslint from 7.12.0 to 7.12.1 ([@openlayers](https://github.com/openlayers)) + * [#11689](https://github.com/openlayers/openlayers/pull/11689) - Bump pngjs from 5.0.0 to 6.0.0 ([@openlayers](https://github.com/openlayers)) + * [#11686](https://github.com/openlayers/openlayers/pull/11686) - Bump shx from 0.3.2 to 0.3.3 ([@openlayers](https://github.com/openlayers)) + * [#11683](https://github.com/openlayers/openlayers/pull/11683) - Bump puppeteer from 5.3.1 to 5.4.0 ([@openlayers](https://github.com/openlayers)) + * [#11682](https://github.com/openlayers/openlayers/pull/11682) - Bump karma-firefox-launcher from 1.3.0 to 2.0.0 ([@openlayers](https://github.com/openlayers)) + * [#11684](https://github.com/openlayers/openlayers/pull/11684) - Bump marked from 1.2.0 to 1.2.2 ([@openlayers](https://github.com/openlayers)) + * [#11685](https://github.com/openlayers/openlayers/pull/11685) - Bump rollup from 2.32.0 to 2.32.1 ([@openlayers](https://github.com/openlayers)) + * [#11688](https://github.com/openlayers/openlayers/pull/11688) - Bump webpack-cli from 4.0.0 to 4.1.0 ([@openlayers](https://github.com/openlayers)) + * [#11687](https://github.com/openlayers/openlayers/pull/11687) - Bump eslint from 7.11.0 to 7.12.0 ([@openlayers](https://github.com/openlayers)) + * [#11666](https://github.com/openlayers/openlayers/pull/11666) - Bump worker-loader from 3.0.4 to 3.0.5 ([@openlayers](https://github.com/openlayers)) + * [#11665](https://github.com/openlayers/openlayers/pull/11665) - Bump url-polyfill from 1.1.10 to 1.1.11 ([@openlayers](https://github.com/openlayers)) + * [#11664](https://github.com/openlayers/openlayers/pull/11664) - Bump @babel/core from 7.11.6 to 7.12.3 ([@openlayers](https://github.com/openlayers)) + * [#11663](https://github.com/openlayers/openlayers/pull/11663) - Bump yargs from 16.0.3 to 16.1.0 ([@openlayers](https://github.com/openlayers)) + * [#11662](https://github.com/openlayers/openlayers/pull/11662) - Bump mocha from 8.1.3 to 8.2.0 ([@openlayers](https://github.com/openlayers)) + * [#11661](https://github.com/openlayers/openlayers/pull/11661) - Bump rollup from 2.29.0 to 2.32.0 ([@openlayers](https://github.com/openlayers)) + * [#11660](https://github.com/openlayers/openlayers/pull/11660) - Bump @babel/preset-env from 7.11.5 to 7.12.1 ([@openlayers](https://github.com/openlayers)) + * [#11643](https://github.com/openlayers/openlayers/pull/11643) - Bump terser-webpack-plugin from 4.2.2 to 4.2.3 ([@openlayers](https://github.com/openlayers)) + * [#11645](https://github.com/openlayers/openlayers/pull/11645) - Bump webpack-cli from 3.3.12 to 4.0.0 ([@openlayers](https://github.com/openlayers)) + * [#11644](https://github.com/openlayers/openlayers/pull/11644) - Bump copy-webpack-plugin from 6.2.0 to 6.2.1 ([@openlayers](https://github.com/openlayers)) + * [#11642](https://github.com/openlayers/openlayers/pull/11642) - Bump sinon from 9.1.0 to 9.2.0 ([@openlayers](https://github.com/openlayers)) + * [#11641](https://github.com/openlayers/openlayers/pull/11641) - Bump rollup from 2.28.2 to 2.29.0 ([@openlayers](https://github.com/openlayers)) + * [#11640](https://github.com/openlayers/openlayers/pull/11640) - Bump worker-loader from 3.0.3 to 3.0.4 ([@openlayers](https://github.com/openlayers)) + * [#11639](https://github.com/openlayers/openlayers/pull/11639) - Bump eslint from 7.10.0 to 7.11.0 ([@openlayers](https://github.com/openlayers)) + * [#11622](https://github.com/openlayers/openlayers/pull/11622) - Bump sinon from 9.0.3 to 9.1.0 ([@openlayers](https://github.com/openlayers)) + * [#11623](https://github.com/openlayers/openlayers/pull/11623) - Bump copy-webpack-plugin from 6.1.1 to 6.2.0 ([@openlayers](https://github.com/openlayers)) + * [#11603](https://github.com/openlayers/openlayers/pull/11603) - Bump rollup from 2.28.1 to 2.28.2 ([@openlayers](https://github.com/openlayers)) + * [#11602](https://github.com/openlayers/openlayers/pull/11602) - Bump marked from 1.1.1 to 1.2.0 ([@openlayers](https://github.com/openlayers)) + * [#11601](https://github.com/openlayers/openlayers/pull/11601) - Bump puppeteer from 5.3.0 to 5.3.1 ([@openlayers](https://github.com/openlayers)) + * [#11600](https://github.com/openlayers/openlayers/pull/11600) - Bump eslint from 7.9.0 to 7.10.0 ([@openlayers](https://github.com/openlayers)) + * [#11599](https://github.com/openlayers/openlayers/pull/11599) - Bump worker-loader from 3.0.2 to 3.0.3 ([@openlayers](https://github.com/openlayers)) + * [#11598](https://github.com/openlayers/openlayers/pull/11598) - Bump karma from 5.2.2 to 5.2.3 ([@openlayers](https://github.com/openlayers)) + * [#11578](https://github.com/openlayers/openlayers/pull/11578) - Bump rollup from 2.26.11 to 2.28.1 ([@openlayers](https://github.com/openlayers)) + * [#11576](https://github.com/openlayers/openlayers/pull/11576) - Bump terser-webpack-plugin from 4.2.0 to 4.2.2 ([@openlayers](https://github.com/openlayers)) + * [#11575](https://github.com/openlayers/openlayers/pull/11575) - Bump typescript from 4.0.2 to 4.0.3 ([@openlayers](https://github.com/openlayers)) + * [#11577](https://github.com/openlayers/openlayers/pull/11577) - Bump copy-webpack-plugin from 6.1.0 to 6.1.1 ([@openlayers](https://github.com/openlayers)) + * [#11574](https://github.com/openlayers/openlayers/pull/11574) - Bump jsdoc from 3.6.5 to 3.6.6 ([@openlayers](https://github.com/openlayers)) + * [#11573](https://github.com/openlayers/openlayers/pull/11573) - Bump webpack from 4.44.1 to 4.44.2 ([@openlayers](https://github.com/openlayers)) + * [#11558](https://github.com/openlayers/openlayers/pull/11558) - Bump yargs from 15.4.1 to 16.0.3 ([@openlayers](https://github.com/openlayers)) + * [#11557](https://github.com/openlayers/openlayers/pull/11557) - Bump eslint from 7.8.1 to 7.9.0 ([@openlayers](https://github.com/openlayers)) + * [#11556](https://github.com/openlayers/openlayers/pull/11556) - Bump puppeteer from 5.2.1 to 5.3.0 ([@openlayers](https://github.com/openlayers)) + * [#11555](https://github.com/openlayers/openlayers/pull/11555) - Bump karma from 5.2.1 to 5.2.2 ([@openlayers](https://github.com/openlayers)) + * [#11554](https://github.com/openlayers/openlayers/pull/11554) - Bump terser-webpack-plugin from 4.1.0 to 4.2.0 ([@openlayers](https://github.com/openlayers)) + * [#11553](https://github.com/openlayers/openlayers/pull/11553) - Bump rollup from 2.26.10 to 2.26.11 ([@openlayers](https://github.com/openlayers)) + * [#11531](https://github.com/openlayers/openlayers/pull/11531) - Bump rollup from 2.26.8 to 2.26.10 ([@openlayers](https://github.com/openlayers)) + * [#11530](https://github.com/openlayers/openlayers/pull/11530) - Bump @babel/preset-env from 7.11.0 to 7.11.5 ([@openlayers](https://github.com/openlayers)) + * [#11529](https://github.com/openlayers/openlayers/pull/11529) - Bump rollup-plugin-terser from 7.0.1 to 7.0.2 ([@openlayers](https://github.com/openlayers)) + * [#11528](https://github.com/openlayers/openlayers/pull/11528) - Bump @babel/core from 7.11.4 to 7.11.6 ([@openlayers](https://github.com/openlayers)) + * [#11526](https://github.com/openlayers/openlayers/pull/11526) - Bump eslint from 7.7.0 to 7.8.1 ([@openlayers](https://github.com/openlayers)) + * [#11527](https://github.com/openlayers/openlayers/pull/11527) - Bump karma from 5.1.1 to 5.2.1 ([@openlayers](https://github.com/openlayers)) + * [#11525](https://github.com/openlayers/openlayers/pull/11525) - Bump copy-webpack-plugin from 6.0.4 to 6.1.0 ([@openlayers](https://github.com/openlayers)) + * [#11515](https://github.com/openlayers/openlayers/pull/11515) - [Security] Bump http-proxy from 1.17.0 to 1.18.1 ([@openlayers](https://github.com/openlayers)) + * [#11504](https://github.com/openlayers/openlayers/pull/11504) - [Security] Bump bl from 4.0.2 to 4.0.3 ([@openlayers](https://github.com/openlayers)) + * [#11496](https://github.com/openlayers/openlayers/pull/11496) - Bump mocha from 8.1.1 to 8.1.3 ([@openlayers](https://github.com/openlayers)) + * [#11495](https://github.com/openlayers/openlayers/pull/11495) - Bump rollup-plugin-terser from 7.0.0 to 7.0.1 ([@openlayers](https://github.com/openlayers)) + * [#11494](https://github.com/openlayers/openlayers/pull/11494) - Bump copy-webpack-plugin from 6.0.3 to 6.0.4 ([@openlayers](https://github.com/openlayers)) + * [#11493](https://github.com/openlayers/openlayers/pull/11493) - Bump rollup from 2.26.5 to 2.26.8 ([@openlayers](https://github.com/openlayers)) + * [#11462](https://github.com/openlayers/openlayers/pull/11462) - Bump rollup from 2.26.3 to 2.26.5 ([@openlayers](https://github.com/openlayers)) + * [#11460](https://github.com/openlayers/openlayers/pull/11460) - Bump karma-sourcemap-loader from 0.3.7 to 0.3.8 ([@openlayers](https://github.com/openlayers)) + * [#11459](https://github.com/openlayers/openlayers/pull/11459) - Bump ol-mapbox-style from 6.1.3 to 6.1.4 ([@openlayers](https://github.com/openlayers)) + * [#11458](https://github.com/openlayers/openlayers/pull/11458) - Bump worker-loader from 3.0.1 to 3.0.2 ([@openlayers](https://github.com/openlayers)) + * [#11457](https://github.com/openlayers/openlayers/pull/11457) - Bump @babel/core from 7.11.1 to 7.11.4 ([@openlayers](https://github.com/openlayers)) + * [#11443](https://github.com/openlayers/openlayers/pull/11443) - Bump eslint from 7.6.0 to 7.7.0 ([@openlayers](https://github.com/openlayers)) + * [#11441](https://github.com/openlayers/openlayers/pull/11441) - Bump terser-webpack-plugin from 4.0.0 to 4.1.0 ([@openlayers](https://github.com/openlayers)) + * [#11440](https://github.com/openlayers/openlayers/pull/11440) - Bump rollup from 2.23.1 to 2.26.3 ([@openlayers](https://github.com/openlayers)) + * [#11439](https://github.com/openlayers/openlayers/pull/11439) - Bump sinon from 9.0.2 to 9.0.3 ([@openlayers](https://github.com/openlayers)) + * [#11442](https://github.com/openlayers/openlayers/pull/11442) - Bump ol-mapbox-style from 6.1.2 to 6.1.3 ([@openlayers](https://github.com/openlayers)) + * [#11426](https://github.com/openlayers/openlayers/pull/11426) - Bump @babel/core from 7.11.0 to 7.11.1 ([@openlayers](https://github.com/openlayers)) + * [#11425](https://github.com/openlayers/openlayers/pull/11425) - Bump rollup from 2.23.0 to 2.23.1 ([@openlayers](https://github.com/openlayers)) + * [#11424](https://github.com/openlayers/openlayers/pull/11424) - Bump rollup-plugin-terser from 6.1.0 to 7.0.0 ([@openlayers](https://github.com/openlayers)) + * [#11423](https://github.com/openlayers/openlayers/pull/11423) - Bump worker-loader from 3.0.0 to 3.0.1 ([@openlayers](https://github.com/openlayers)) + * [#11422](https://github.com/openlayers/openlayers/pull/11422) - Bump terser-webpack-plugin from 3.0.8 to 4.0.0 ([@openlayers](https://github.com/openlayers)) + * [#11421](https://github.com/openlayers/openlayers/pull/11421) - Bump mocha from 8.1.0 to 8.1.1 ([@openlayers](https://github.com/openlayers)) + + +
diff --git a/config/jsdoc/api/plugins/inline-options.js b/config/jsdoc/api/plugins/inline-options.js index b3ea474cae..72511a7d18 100644 --- a/config/jsdoc/api/plugins/inline-options.js +++ b/config/jsdoc/api/plugins/inline-options.js @@ -1,5 +1,5 @@ /** - * @filedesc + * @fileoverview * Inlines option params from typedefs */ diff --git a/config/jsdoc/api/plugins/markdown.js b/config/jsdoc/api/plugins/markdown.js index d5e5c486f8..3d7da8869a 100644 --- a/config/jsdoc/api/plugins/markdown.js +++ b/config/jsdoc/api/plugins/markdown.js @@ -1,7 +1,7 @@ /** * Modified from JSDoc's plugins/markdown and lib/jsdoc/util/markdown modules * (see https://github.com/jsdoc3/jsdoc/), which are licensed under the Apache 2 - * license (see http://www.apache.org/licenses/LICENSE-2.0). + * license (see https://www.apache.org/licenses/LICENSE-2.0). * * This version does not protect http(s) urls from being turned into links, and * works around an issue with `~` characters in module paths by escaping them. diff --git a/config/jsdoc/api/readme.md b/config/jsdoc/api/readme.md index 5179e075e5..849442a7fb 100644 --- a/config/jsdoc/api/readme.md +++ b/config/jsdoc/api/readme.md @@ -1,6 +1,6 @@ # API Documentation -This directory contains configuration (`conf.json`), static content (`index.md`), template (`template/`) and plugins (`plugins/`) for the [JSDoc3](http://usejsdoc.org/) API generator. +This directory contains configuration (`conf.json`), static content (`index.md`), template (`template/`) and plugins (`plugins/`) for the [JSDoc3](https://jsdoc.app/) API generator. ## Documenting the source code diff --git a/config/jsdoc/api/template/README.md b/config/jsdoc/api/template/README.md index dd759dfade..e419f46b15 100644 --- a/config/jsdoc/api/template/README.md +++ b/config/jsdoc/api/template/README.md @@ -1,3 +1,3 @@ This template is based on the [Jaguar](https://github.com/davidshimjs/jaguarjs/tree/master/docs/templates/jaguar) template. [JaguarJS](https://github.com/davidshimjs/jaguarjs) is licensed under the [LGPL license](https://github.com/davidshimjs/jaguarjs/tree/master/LICENSE). -The default template for JSDoc 3 uses: [the Taffy Database library](http://taffydb.com/) and the [Underscore Template library](http://documentcloud.github.com/underscore/#template). +The default template for JSDoc 3 uses: [the Taffy Database library](https://taffydb.com/) and the [Underscore Template library](https://underscorejs.org/#template). diff --git a/config/jsdoc/api/template/publish.js b/config/jsdoc/api/template/publish.js index ec79c81a88..f750010173 100644 --- a/config/jsdoc/api/template/publish.js +++ b/config/jsdoc/api/template/publish.js @@ -190,9 +190,9 @@ function generateSourceFiles(sourceFiles) { * for display purposes. This function mutates the original arrays. * * @private - * @param {Array} doclets - The array of classes and functions to + * @param {Array} doclets The array of classes and functions to * check. - * @param {Array} modules - The array of module doclets to search. + * @param {Array} modules The array of module doclets to search. */ function attachModuleSymbols(doclets, modules) { const symbols = {}; @@ -322,7 +322,7 @@ function buildNav(members) { } /** - * @param {Object} taffyData See . + * @param {Object} taffyData See {@link https://taffydb.com/}. * @param {Object} opts Options. * @param {Object} tutorials Tutorials. */ diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js index f93b44a33f..827c9c11b0 100644 --- a/config/jsdoc/api/template/static/scripts/main.js +++ b/config/jsdoc/api/template/static/scripts/main.js @@ -36,7 +36,7 @@ $(function () { } // If everything else is equal, prefer shorter names, and prefer classes over modules let weight = 10000 + matchedItem.dataset.longname.length - name.length * 100; - if (name.match(re.begin)) { + if (re.begin.test(name)) { weight += 10000; if (re.baseName.test(name)) { weight += 10000; @@ -79,6 +79,7 @@ $(function () { $currentItem: currentItem ? $(currentItem) : undefined, lastSearchTerm: undefined, lastState: {}, + lastClasses: undefined, getClassList: function () { return $classItems || ($classItems = $navList.find('li.item')); }, @@ -143,9 +144,9 @@ $(function () { if (state === 'search-empty' && search.$currentItem) { search.manualToggle(search.$currentItem, true); } + search.lastClasses = undefined; } else { search.changeStateClass('searching'); - searchTerm = searchTerm.toLowerCase(); const beginOnly = searchTerm.length < minInputForFullText; const getSearchWeight = getWeightFunction(searchTerm, allowRegex); const re = constructRegex(searchTerm, function (searchTerm) { @@ -197,13 +198,14 @@ $(function () { li.classList.add('match'); } }); + classes.sort(function (a, b) { + return b.weight - a.weight; + }); clearOldMatches(search.lastState, searchState); search.lastState = searchState; + search.lastClasses = classes; - classes.sort(function (a, b) { - return a.weight - b.weight; - }); - for (let i = classes.length - 1; i >= 0; --i) { + for (let i = 0, ii = classes.length; i < ii; ++i) { navList.appendChild(classes[i].item); } } @@ -217,15 +219,24 @@ $(function () { key = setTimeout(function () { key = undefined; - const searchTerm = searchInput.value; - doSearch(searchTerm); + doSearch(searchInput.value); }, 0); } } // Search Items searchInput.addEventListener('input', queueSearch); + searchInput.addEventListener('keydown', function(e) { + if (e.key === 'Enter') { + doSearch(searchInput.value); + const first = search.lastClasses ? search.lastClasses[0].item : null; + if (first) { + window.location.href = first.querySelector('.title a').href; + } + } + }); doSearch(searchInput.value); + searchInput.focus(); // Toggle when click an item element search.$navList.on('click', '.toggle', function (e) { @@ -237,33 +248,8 @@ $(function () { search.manualToggle(clsItem, show); }); -// Auto resizing on navigation - var _onResize = function () { - var height_w = $(window).height(); - var height_s = $('section').height(); - var $el = $('.navigation'); - var dif_h = height_w - height_s; - if (window.matchMedia("(min-width: 768px)").matches) { - if (dif_h >=0){ - $('.navigation').height(height_s+dif_h+74); - $('.navigation-list').height(height_s+dif_h) - } - else { - $('.navigation').height(height_s+74); - $('.navigation-list').height(height_s-60); - } - } - else{ - $('.navigation').height(220); - $('.navigation-list').height(140); - } - } - $(window).on('resize', _onResize); - _onResize(); - - var currentVersion = document.getElementById('package-version').innerHTML; - // warn about outdated version + var currentVersion = document.getElementById('package-version').innerHTML; var packageUrl = 'https://raw.githubusercontent.com/openlayers/openlayers.github.io/build/package.json'; fetch(packageUrl).then(function(response) { return response.json(); @@ -288,15 +274,4 @@ $(function () { } } }); - - // create source code links to github - var srcLinks = $('div.tag-source'); - srcLinks.each(function(i, el) { - var textParts = el.innerHTML.trim().split(', '); - var link = 'https://github.com/openlayers/openlayers/blob/v' + currentVersion + '/src/ol/' + - textParts[0]; - el.innerHTML = '' + textParts[0] + ', ' + - '' + - textParts[1] + ''; - }); }); diff --git a/config/jsdoc/api/template/static/styles/jaguar.css b/config/jsdoc/api/template/static/styles/jaguar.css index b25bbce331..247bdeba04 100644 --- a/config/jsdoc/api/template/static/styles/jaguar.css +++ b/config/jsdoc/api/template/static/styles/jaguar.css @@ -18,7 +18,7 @@ } body { - padding-top: 55px; + padding-top: 54px; } .nameContainer .anchor { padding-top: 70px; @@ -61,24 +61,43 @@ ol { li { list-style-type: none; } -::-webkit-scrollbar { - width: 8px; - background-color: transparent; -} -::-webkit-scrollbar-thumb { - background-color: transparent; - border-radius: 4px; +#wrap { + display: flex; + flex-flow: row; } .navigation { background-color: #2a2a2a; } -@media (max-width:768px) { +.navigation-list { + padding: 0 15px 0 15px; +} +@supports (position: sticky) { .navigation { - max-height:220px; - } - .navigation-list{ - height:140px; - } + position: sticky; + top: 54px; + height: calc(100vh - 54px); + } + .navigation-list { + overflow: auto; + /* 54px navbar height */ + /* 4.25rem + 2px searchbox height */ + /* 25px navigation padding */ + height: calc(100vh - 54px - 4.25rem - 2px - 25px); + } +} +@media (max-width: 768px) { + #wrap { + flex-flow: column; + } + .navigation { + height: inherit; + position: inherit; + } + .navigation-list { + overflow: auto; + max-height: 33vh; + height: inherit; + } } .navigation .applicationName { @@ -107,10 +126,8 @@ li { color: #fff; border-color: #555; } -.navigation .navigation-list { - padding: 10px 15px 0 15px; - position: relative; - overflow: auto; +.navigation .navigation-list-wrapper { + padding: 10px 0 15px 0; width: 100%; } .navigation li.item { @@ -318,8 +335,8 @@ span.type-signature.static { } .main .nameContainer { position: relative; - margin-top: 20px; - padding-top: 5px; + margin-top: 1.2rem; + padding-top: 1.2rem; border-top: 2px solid #1F6B75; } .main .nameContainer .inherited { @@ -337,7 +354,7 @@ span.type-signature.static { @media (min-width: 768px) { .main .nameContainer .tag-source { position: absolute; - top: 0.2rem; + top: 1.2rem; right: 0; font-size: 0.8rem; } diff --git a/config/jsdoc/api/template/tmpl/container.tmpl b/config/jsdoc/api/template/tmpl/container.tmpl index f9d86d6757..c69663bed9 100644 --- a/config/jsdoc/api/template/tmpl/container.tmpl +++ b/config/jsdoc/api/template/tmpl/container.tmpl @@ -54,11 +54,15 @@
- +
+ +
- +
+ +
diff --git a/config/jsdoc/api/template/tmpl/layout.tmpl b/config/jsdoc/api/template/tmpl/layout.tmpl index 2cd151aede..ee2de77e8f 100644 --- a/config/jsdoc/api/template/tmpl/layout.tmpl +++ b/config/jsdoc/api/template/tmpl/layout.tmpl @@ -4,6 +4,7 @@ var version = obj.packageInfo.version; + - OpenLayers v<?js= version ?> API - <?js= title ?> diff --git a/config/jsdoc/api/template/tmpl/method.tmpl b/config/jsdoc/api/template/tmpl/method.tmpl index 9ff68aa638..509d6e0057 100644 --- a/config/jsdoc/api/template/tmpl/method.tmpl +++ b/config/jsdoc/api/template/tmpl/method.tmpl @@ -1,10 +1,16 @@
+
-

@@ -16,11 +22,12 @@ var self = this;

- , + , + line
-
+

diff --git a/config/jsdoc/api/template/tmpl/navigation.tmpl b/config/jsdoc/api/template/tmpl/navigation.tmpl index 50709af9cc..03b03cca63 100644 --- a/config/jsdoc/api/template/tmpl/navigation.tmpl +++ b/config/jsdoc/api/template/tmpl/navigation.tmpl @@ -51,20 +51,24 @@ function listContent(item, title, listItemPrinter) { } ?>
-
- +
+
+ +
+
+
+
    +
  • + + + + +
-
    -
  • - - - - -
diff --git a/config/jsdoc/info/api-plugin.js b/config/jsdoc/info/api-plugin.js deleted file mode 100644 index 2a3dd96610..0000000000 --- a/config/jsdoc/info/api-plugin.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Handle the api annotation. - * @param {Object} dictionary The tag dictionary. - */ -exports.defineTags = function (dictionary) { - dictionary.defineTag('api', { - onTagged: function (doclet, tag) { - doclet.api = true; - }, - }); -}; diff --git a/config/jsdoc/info/conf.json b/config/jsdoc/info/conf.json index be9422ef95..969ae716c0 100644 --- a/config/jsdoc/info/conf.json +++ b/config/jsdoc/info/conf.json @@ -11,7 +11,6 @@ }, "plugins": [ "jsdoc-plugin-typescript", - "config/jsdoc/info/api-plugin", "config/jsdoc/info/define-plugin", "config/jsdoc/info/virtual-plugin" ], diff --git a/config/jsdoc/info/publish.js b/config/jsdoc/info/publish.js index f57c4dec57..188ddf4ad2 100644 --- a/config/jsdoc/info/publish.js +++ b/config/jsdoc/info/publish.js @@ -1,13 +1,12 @@ /** - * @fileoverview Generates JSON output based on exportable symbols (those with - * an api tag) and boolean defines (with a define tag and a default value). + * @fileoverview Generates JSON output based on exportable symbols. */ const assert = require('assert'); const path = require('path'); /** * Publish hook for the JSDoc template. Writes to JSON stdout. - * @param {function} data The root of the Taffy DB containing doclet records. + * @param {Function} data The root of the Taffy DB containing doclet records. * @param {Object} opts Options. * @return {Promise} A promise that resolves when writing is complete. */ @@ -20,26 +19,27 @@ exports.publish = function (data, opts) { return types; } - // get all doclets with the "api" property or define (excluding events) + // get all doclets that have exports const classes = {}; const docs = data( [ {define: {isObject: true}}, function () { if (this.kind == 'class') { - if (!('extends' in this) || typeof this.api == 'boolean') { - classes[this.longname] = this; - return true; - } + classes[this.longname] = this; + return true; } return ( - typeof this.api == 'boolean' || - (this.meta && /[\\\/]externs$/.test(this.meta.path)) + this.meta && + this.meta.path && + this.longname.indexOf('') !== 0 && + this.longname !== 'module:ol' ); }, ], {kind: {'!is': 'file'}}, - {kind: {'!is': 'event'}} + {kind: {'!is': 'event'}}, + {kind: {'!is': 'module'}} ).get(); // get symbols data, filter out those that are members of private classes @@ -77,7 +77,7 @@ exports.publish = function (data, opts) { path: path.join(doc.meta.path, doc.meta.filename), default: doc.define.default, }); - } else if (doc.kind == 'typedef' || doc.isEnum === true) { + } else if (doc.type && (doc.kind == 'typedef' || doc.isEnum === true)) { typedefs.push({ name: doc.longname, types: getTypes(doc.type.names), @@ -136,7 +136,7 @@ exports.publish = function (data, opts) { }); } - const target = isExterns ? externs : doc.api ? symbols : base; + const target = isExterns ? externs : symbols; const existingSymbol = symbolsByName[symbol.name]; if (existingSymbol) { const idx = target.indexOf(existingSymbol); @@ -145,10 +145,9 @@ exports.publish = function (data, opts) { target.push(symbol); symbolsByName[symbol.name] = symbol; - if (doc.api && symbol.extends) { + if (symbol.extends) { while ( symbol.extends in classes && - !classes[symbol.extends].api && classes[symbol.extends].augments ) { symbol.extends = classes[symbol.extends].augments[0]; diff --git a/config/webpack-config-legacy-build.js b/config/webpack-config-legacy-build.js index d66977b9c9..a7fb3a7977 100644 --- a/config/webpack-config-legacy-build.js +++ b/config/webpack-config-legacy-build.js @@ -3,6 +3,28 @@ module.exports = { entry: './build/index.js', devtool: 'source-map', mode: 'production', + module: { + rules: [ + { + test: /^((?!es2015-)[\s\S])*\.js$/, + use: { + loader: 'buble-loader', + options: { + transforms: {dangerousForOf: true}, + }, + }, + include: [ + path.join( + __dirname, + '..', + 'node_modules', + '@mapbox', + 'mapbox-gl-style-spec' + ), + ], + }, + ], + }, resolve: { alias: { ol: path.resolve('./build/ol'), diff --git a/doc/errors/index.md b/doc/errors/index.md index e45f47bd3b..21a033cd23 100644 --- a/doc/errors/index.md +++ b/doc/errors/index.md @@ -47,7 +47,7 @@ The default `geometryFunction` can only handle `ol/geom/Point` geometries. ### 11 -`options.featureTypes` should be an Array. +`options.featureTypes` must be an Array. ### 12 @@ -111,7 +111,7 @@ Features for `updates` must have an id set by the feature reader or `ol.Feature# ### 28 -`renderMode` must be `'image'`, `'hybrid'` or `'vector'`. +`renderMode` must be `'hybrid'` or `'vector'`. ### 29 @@ -248,4 +248,8 @@ This is done by providing adequate shaders using the `hitVertexShader` and `hitF ### 67 -A layer can only be added to the map once. Use either `layer.setMap()` or `map.addLayer()`, not both. \ No newline at end of file +A layer can only be added to the map once. Use either `layer.setMap()` or `map.addLayer()`, not both. + +### 68 + +Data from this source can only be rendered if it has a projection compatible with the view projection. diff --git a/doc/faq.md b/doc/faq.md index 908e14d54e..a161e7e8d2 100644 --- a/doc/faq.md +++ b/doc/faq.md @@ -7,7 +7,7 @@ layout: doc.hbs Certain questions arise more often than others when users ask for help. This document tries to list some of the common questions that frequently get asked, -e.g. on [Stack Overflow](http://stackoverflow.com/questions/tagged/openlayers). +e.g. on [Stack Overflow](https://stackoverflow.com/questions/tagged/openlayers). If you think a question (and naturally its answer) should be added here, feel free to ping us or to send a pull request enhancing this document. @@ -75,7 +75,7 @@ import {register} from 'ol/proj/proj4'; import {get as getProjection} from 'ol/proj'; // To use other projections, you have to register the projection in OpenLayers. -// This can easily be done with [https://proj4js.org](proj4) +// This can easily be done with [http://proj4js.org/](proj4) // // By default OpenLayers does not know about the EPSG:21781 (Swiss) projection. // So we create a projection instance for EPSG:21781 and pass it to @@ -198,8 +198,8 @@ for English, `en`, as a mnemonic: East before North. So you want to center your map on a certain place on the earth and obviously you need to have its coordinates for this. Let's assume you want your map centered on Schladming, a beautiful place in Austria. Head over to the wikipedia -page for [Schladming](http://en.wikipedia.org/wiki/Schladming). In the top-right -corner there is a link to [GeoHack](http://tools.wmflabs.org/geohack/geohack.php?pagename=Schladming¶ms=47_23_39_N_13_41_21_E_type:city(4565)_region:AT-6), +page for [Schladming](https://en.wikipedia.org/wiki/Schladming). In the top-right +corner there is a link to [GeoHack](https://geohack.toolforge.org/geohack.php?pagename=Schladming¶ms=47_23_39_N_13_41_21_E_type:city(4565)_region:AT-6), which effectively tells you the coordinates are: WGS84: diff --git a/doc/index.hbs b/doc/index.hbs index ba62116e51..b86373a90c 100644 --- a/doc/index.hbs +++ b/doc/index.hbs @@ -19,4 +19,4 @@ We have put together a document that lists [Frequently Asked Questions (FAQ)](fa # More questions? -If you cannot find an answer in the documentation or the FAQ, you can search [Stack Overflow](http://stackoverflow.com/questions/tagged/openlayers). If you cannot find an answer there, ask a new question there, using the tag 'openlayers'. +If you cannot find an answer in the documentation or the FAQ, you can search [Stack Overflow](https://stackoverflow.com/questions/tagged/openlayers). If you cannot find an answer there, ask a new question there, using the tag 'openlayers'. diff --git a/doc/quickstart.hbs b/doc/quickstart.hbs index e548fedb0f..66d6e42e0f 100644 --- a/doc/quickstart.hbs +++ b/doc/quickstart.hbs @@ -78,7 +78,7 @@ The first part is to include the JavaScript library. For the purpose of this tut
``` -The map in the application is contained in a [`
` HTML element](http://en.wikipedia.org/wiki/Span_and_div). Through this `
` the map properties like width, height and border can be controlled through CSS. Here's the CSS element used to make the map 400 pixels high and as wide as the browser window. +The map in the application is contained in a [`
` HTML element](https://en.wikipedia.org/wiki/Span_and_div). Through this `
` the map properties like width, height and border can be controlled through CSS. Here's the CSS element used to make the map 400 pixels high and as wide as the browser window. ```xml + + Alabama + empty + + +states.AREA: + 51715.786 + + +states.STATE_NAME: +Alabama + + +states.STATE_FIPS: +01 + + +states.SUB_REGION: +E S Cen + + +states.STATE_ABBR: +AL + + +states.POP2000: + 4447100 + + +states.POP2001: + 4478538 + + +states.POP00_SQMI: + 86 + + +states.DEN_0_100: + 92 + + +USStates.ID: + 22 + + +USStates.State_Name: +Alabama + + +USStates.Date_Entered: +Dec. 14 1819 + + +USStates.Year_Entered: +1819 + + +USStates.Year_Settled: +1702 + +]]> + #Style_5 + + + -86.8263454497332,32.7948233460272,0 + + + + + + -85.0700671081992,31.9807030736301,0 -85.0567002477577,32.0173765203509,0 -85.0620107617352,32.0500102920991,0 -85.0566549357244,32.0696439454843,0 -85.046187259254,32.0908949913561,0 -85.0533136579289,32.1266376448382,0 -85.0243823514691,32.1662750781008,0 -85.0078260926386,32.1788785384061,0 -84.9603852752889,32.1919284376309,0 -84.9757438025875,32.2122487204353,0 -84.9283716437355,32.2179784387895,0 -84.9160041260552,32.2285563686775,0 -84.92367962799079,32.2473889995768,0 -84.9053609608961,32.2495557759674,0 -84.8940158788823,32.2591761298648,0 -84.8946035025639,32.2687353881118,0 -84.92107090555641,32.2931369847317,0 -85.0053324510846,32.3295925258289,0 -85.0020899980221,32.3470785227396,0 -84.97166353138461,32.3715031963467,0 -84.9844889642181,32.3870933241337,0 -84.970961884914,32.3968128124947,0 -84.9653850518902,32.4294501858587,0 -84.9898150430422,32.4548361836926,0 -84.9956522169706,32.518928479096,0 -85.0707744216369,32.5812538387594,0 -85.0841493949267,32.603004344931,0 -85.0863240406897,32.6284512647951,0 -85.10380371878141,32.6459103823229,0 -85.0904749305908,32.6761523261383,0 -85.10773330416841,32.6899723746491,0 -85.1138678519411,32.7343891188468,0 -85.1248851250497,32.7443832224212,0 -85.1333007048373,32.7563151798039,0 -85.1280898176054,32.7770703815279,0 -85.1623013377526,32.8074457725548,0 -85.1807197284529,32.8718130182966,0 -85.2335028922441,33.1201394011529,0 -85.2338462673976,33.129237260647,0 -85.2938249844532,33.425875708363,0 -85.3049800767665,33.4905940310641,0 -85.33528685109771,33.6549230949434,0 -85.38401093584911,33.9054097874599,0 -85.3957377905852,33.9598292697156,0 -85.4165672299404,34.0869203579979,0 -85.46028592417321,34.2901615301398,0 -85.5118559301513,34.5230148510197,0 -85.52583413117669,34.5846856151065,0 -85.5346925955902,34.6224884025546,0 -85.5830580356282,34.8623226551191,0 -85.6089602162505,34.9901641616199,0 -85.86956755804469,34.992384535053,0 -86.3035004132153,34.9954638721614,0 -86.31305264552989,34.9952731531874,0 -86.7823722148413,34.9970753222994,0 -86.8334221243196,34.9982460560253,0 -87.2075884780608,35.0079603909194,0 -87.2227639290321,35.0073462053491,0 -87.6078130632206,35.010546624408,0 -87.9860782705711,35.016033638512,0 -88.19496238143979,35.013543867744,0 -88.1939935775637,35.0044536440488,0 -88.1431049406294,34.9303124572945,0 -88.10888651427,34.8999364686021,0 -88.09046867570861,34.8956296636558,0 -88.13640162363011,34.5804972978314,0 -88.15125641336159,34.4652732358205,0 -88.1676133199948,34.3241474912554,0 -88.19934924265689,34.0904480664289,0 -88.20264467082561,34.0591222846376,0 -88.24819560524909,33.7427263969428,0 -88.2745866910838,33.5388014650338,0 -88.3048295831961,33.2888943469818,0 -88.33946633175739,32.9874972113755,0 -88.3480414662251,32.9247582205318,0 -88.3938325168417,32.5804702260594,0 -88.4257919971009,32.3092243032455,0 -88.4377242279507,32.2277556143888,0 -88.4729519210596,31.8888768167036,0 -88.465096841429,31.7022450293789,0 -88.4508031165511,31.4356176907354,0 -88.4345631161403,31.1208794693781,0 -88.4291990018716,31.0006950876596,0 -88.41724262810349,30.7364571156747,0 -88.40141515368251,30.3935517804008,0 -88.3203266415596,30.4042935926262,0 -88.1356811752465,30.3371585569903,0 -88.01978886193341,30.7441900319034,0 -87.9133851540991,30.6211844071927,0 -87.9034657641113,30.421296093483,0 -87.7575029474381,30.2994222307247,0 -87.77994170607489,30.2726382606338,0 -88.00256050399911,30.2336042721855,0 -87.7953306244775,30.23393165256,0 -87.59340480705509,30.2784153722344,0 -87.5875683536562,30.3192543333282,0 -87.46644036038791,30.3597214406638,0 -87.40525082190879,30.4403600660175,0 -87.4188166507341,30.4817007831404,0 -87.4453529644246,30.5313897036451,0 -87.4220673638826,30.5564936086287,0 -87.3932809670146,30.6200982640176,0 -87.3986449174521,30.6680153313996,0 -87.4188942719987,30.6928101858547,0 -87.4601404897836,30.7058026368688,0 -87.5266028694286,30.7484916966577,0 -87.54190013706391,30.7856953414756,0 -87.6159151545761,30.8482964233535,0 -87.62571159139399,30.8769019951762,0 -87.58986722899169,30.954361030582,0 -87.59858025629001,31.0026307736,0 -87.16311759320681,31.0031572312178,0 -86.7793617052065,30.9981918115755,0 -86.70185248868481,30.9980924099155,0 -86.38391974363719,30.9915383065212,0 -86.1814761680363,30.9952251256207,0 -86.0318217926755,30.993327601114,0 -85.4865971253016,31.0009980072958,0 -85.4850102049851,31.0010018399978,0 -85.00160719763341,31.0012534003007,0 -85.01699565076569,31.0801028338282,0 -85.038068227176,31.1267131739262,0 -85.06866250314511,31.1623640897378,0 -85.0933668734253,31.1722112527352,0 -85.1029571297253,31.1969220462589,0 -85.09360326113141,31.2270745000222,0 -85.1033613685017,31.2714361848353,0 -85.0812280506442,31.3030803697052,0 -85.0825631900095,31.33233449639,0 -85.0879419916334,31.3672341961667,0 -85.0614062661802,31.4406634414676,0 -85.0663120282063,31.4760895555663,0 -85.0426984349451,31.5196599288858,0 -85.04272135787051,31.5543898029988,0 -85.0592853056629,31.6212651525335,0 -85.1112049587349,31.6842421102739,0 -85.11867442354141,31.7085715963854,0 -85.11528693111811,31.731565957183,0 -85.1301648712312,31.778853672117,0 -85.1315611123421,31.7838145657199,0 -85.1355669344631,31.8548844137198,0 -85.11515025581549,31.9074247500776,0 -85.0700671081992,31.9807030736301,0 + + + + + + + + Alaska + empty + + +states.AREA: + 576594.104 + + +states.STATE_NAME: +Alaska + + +states.STATE_FIPS: +02 + + +states.SUB_REGION: +Pacific + + +states.STATE_ABBR: +AK + + +states.POP2000: + 626932 + + +states.POP2001: + 632783 + + +states.POP00_SQMI: + 1 + + +states.DEN_0_100: + 100 + + +USStates.ID: + 49 + + +USStates.State_Name: +Alaska + + +USStates.Date_Entered: +Jan. 3 1959 + + +USStates.Year_Entered: +1959 + + +USStates.Year_Settled: +1784 + +]]> + #Style_5 + + + -152.571308132839,64.31717179291989,0 + + + + + + + -161.333785152503,58.73324809322381,0 -161.265686026239,58.7746349508974,0 -161.29973001177,58.8092078992406,0 -160.898880078262,58.8847743885185,0 -160.835706338137,58.8360566348485,0 -160.328871281117,59.0589472427445,0 -160.255289421572,58.9814391788959,0 -160.322214368411,58.94977595668139,0 -160.251928933333,58.8947750733089,0 -160.018038770945,58.8847826021977,0 -159.921353250021,58.7703335410918,0 -159.764983266222,58.85339732881441,0 -159.770814017585,58.9336678800203,0 -159.629389451621,58.951728817063,0 -159.652767383695,58.8356144431094,0 -159.431907396554,58.78200378727071,0 -159.058839790045,58.4242303462786,0 -158.840482035485,58.40172569768509,0 -158.706325553629,58.4914573031936,0 -158.914412274631,58.768124706742,0 -158.847732874479,58.8147881781941,0 -158.804120274768,58.79007643944839,0 -158.886637897011,58.7328457311724,0 -158.781626705695,58.7703465789124,0 -158.764699341806,58.9173004051305,0 -158.825525121968,58.9703482280997,0 -158.746636639026,58.992299469629,0 -158.790794838837,58.9609108289104,0 -158.72911244469,58.87285089191919,0 -158.448018866607,59.0539656031184,0 -158.539151744527,59.17452613590309,0 -158.425528178316,59.0761984218428,0 -158.131606098439,59.0275871389339,0 -157.994937811845,58.904249899836,0 -158.025789747621,58.8700843445155,0 -158.181898629942,59.0086957979644,0 -158.494678300986,58.9986887872383,0 -158.422196166983,58.9711854751204,0 -158.496903135941,58.9484099616525,0 -158.566903585087,58.81174047286289,0 -158.368259112377,58.7472974611246,0 -158.335782570428,58.65867989733821,0 -158.201041727574,58.60619016044859,0 -157.15562321674,58.863481676262,0 -157.114088794183,58.8737057915319,0 -156.885486385519,59.0087124811514,0 -156.86715047004,59.1028830583024,0 -156.781337077422,59.1506598829204,0 -156.857424505391,58.9970702811005,0 -156.948271114567,58.898965473525,0 -157.073799361921,58.7634294950003,0 -156.940465365975,58.73509549838399,0 -157.227146003726,58.6403703663092,0 -157.26552143945,58.61099989520881,0 -157.551293782504,58.39230935566729,0 -157.567122696749,58.3028631268522,0 -157.467383404756,58.21147284622099,0 -157.337107162871,58.2384214399498,0 -157.140723498892,58.1617563507581,0 -157.395729459446,58.2059194349044,0 -157.612095158083,58.0889724688187,0 -157.708762826285,57.642579814095,0 -157.602372111932,57.62118856016901,0 -157.594584559286,57.4884098545335,0 -157.422370568788,57.49257944137811,0 -157.451242831187,57.5445286801005,0 -157.399057835422,57.5592475782682,0 -157.394324661818,57.4942511106634,0 -157.659313790987,57.4739582789334,0 -157.680712071643,57.56674949709691,0 -157.940146338779,57.4911808741641,0 -158.057084658874,57.3628493580549,0 -158.287372349061,57.3234001444386,0 -158.650976582544,57.052545680881,0 -158.702058683987,56.9764328167148,0 -158.642626518403,56.7603290977313,0 -158.798407929269,56.80097196103009,0 -158.948176855863,56.84004339569309,0 -159.027642308589,56.7942118101975,0 -158.864012311658,56.8925432463471,0 -159.2376011964,56.727251651604,0 -159.266255938373,56.6969773995724,0 -159.211232058542,56.6933620466209,0 -159.839280009922,56.54002916803709,0 -160.369545562978,56.2691753616262,0 -160.571495574202,55.92889738004299,0 -160.240612175007,55.8452847206279,0 -160.316754865376,55.821402903935,0 -160.251747074441,55.76972980426541,0 -160.466201133531,55.7927898869082,0 -160.503162720311,55.8663904588052,0 -160.789543128523,55.8791647494381,0 -160.760665773692,55.77583190214499,0 -160.661480434371,55.7308353579732,0 -160.798136884243,55.7099971367895,0 -160.948139923201,55.8230554861109,0 -160.930382830279,55.87527146206789,0 -161.027888121243,55.8958312292401,0 -160.863155388513,55.9319441282278,0 -160.87646436338,55.9897218164889,0 -161.246184916394,55.9416568129955,0 -161.370088134206,55.9505502490315,0 -161.198703521823,56.00582894445199,0 -161.783999074871,55.891092733739,0 -162.612011328844,55.4266227275852,0 -162.503704052287,55.44384484323831,0 -162.490058524205,55.37356947755129,0 -162.892307267167,55.2652303796606,0 -162.834778744668,55.226336390692,0 -162.880614120962,55.1855020887533,0 -163.075072766862,55.1727266321509,0 -163.018985653155,55.2432779859019,0 -163.325067791767,55.120781676687,0 -163.240312596218,54.9566141906158,0 -163.337815758332,54.9579995076703,0 -163.354198710481,54.9182724565595,0 -163.276713380764,54.9118844503472,0 -163.387823291606,54.85577077085231,0 -163.362248453471,54.81104837868569,0 -163.046468053829,54.9366094396024,0 -163.210901063576,55.01466386830321,0 -163.241178591562,55.0968868621753,0 -163.186461496505,55.1388346767614,0 -162.91951622862,55.0185578001535,0 -162.97670554716,54.9941114885713,0 -162.879777735911,54.93105442482131,0 -162.737537176281,54.9471652996602,0 -162.654501254855,55.0496709305591,0 -162.564497469772,54.95439441058279,0 -162.650351300767,55.06634162353811,0 -162.60698925691,55.1616203136746,0 -162.723662744298,55.2185644807848,0 -162.64813559177,55.2944031175309,0 -162.564241723022,55.29245926729391,0 -162.600342732401,55.2688454079785,0 -162.363397597136,55.1019064144312,0 -162.526723907637,55.1069029544622,0 -162.43792192466,55.0336527695807,0 -162.226160106285,55.023841561213,0 -162.225086063802,55.11022986289451,0 -162.102015333028,55.1652243665891,0 -162.14096098133,55.1124473313382,0 -162.089794404917,55.0780070068784,0 -161.969778363407,55.1010735983281,0 -162.04425843462,55.2318999694405,0 -161.908136327499,55.2096901239275,0 -161.701174942482,55.40469908465581,0 -161.713417473843,55.5133125057309,0 -161.564524528208,55.6219224278555,0 -161.140619787914,55.5322194472926,0 -161.375889759647,55.5719308099382,0 -161.487550344253,55.4802589363229,0 -161.505093667031,55.35859055447419,0 -161.245606142834,55.34803673372501,0 -160.901450202665,55.5180571296746,0 -160.812282930602,55.4508344758896,0 -160.673678646028,55.4611128174626,0 -160.65869461044,55.5025023768326,0 -160.762026681564,55.5436149376,0 -160.594244378424,55.6075070391802,0 -160.509799239654,55.47722062139179,0 -160.367289822086,55.6016730144438,0 -160.435921567478,55.6452826356233,0 -160.150100463074,55.65806440819991,0 -160.156196639475,55.73028669280341,0 -160.067023580057,55.69584118132489,0 -160.041480059015,55.78723691352259,0 -159.865655546791,55.7828003051536,0 -159.843160184257,55.8502987828938,0 -159.623997571039,55.8130754392236,0 -159.68182740582,55.7372354944145,0 -159.633763521754,55.69418181050791,0 -159.709595206964,55.6608466266932,0 -159.617099863445,55.6341826757826,0 -159.757958323373,55.6016786017979,0 -159.625702753951,55.5725134117704,0 -159.56444722997,55.6675696119233,0 -159.505743092783,55.7586358496787,0 -159.545629195873,55.8803024719076,0 -159.468402315572,55.8961424500525,0 -159.426523393594,55.7855851946283,0 -159.361718537439,55.8744682212367,0 -158.929489375146,55.913649286065,0 -158.856707899204,56.0100395520857,0 -158.672026415509,55.9542091455648,0 -158.649812533647,56.017816276671,0 -158.738127459087,56.036155798871,0 -158.66229565743,56.0597624975191,0 -158.698401408561,56.1444864288357,0 -158.6578731072,56.10893405662701,0 -158.565933519365,56.1603198605422,0 -158.63062848199,56.19921337359591,0 -158.475910642966,56.1839349326357,0 -158.604501408417,56.09337098777039,0 -158.597299257073,56.0353265622513,0 -158.510949590254,56.056713105801,0 -158.568435275547,56.0230969994927,0 -158.442033154921,55.9928266933291,0 -158.503440813723,56.09392968219971,0 -158.418133643957,56.06198819300339,0 -158.412582158765,56.17198902397929,0 -158.359506001416,56.1242151806531,0 -158.122575442007,56.23283281910391,0 -158.339520178038,56.1722731135264,0 -158.401781776975,56.2333830676346,0 -158.209248110013,56.2825589305505,0 -158.459802906216,56.3403232775806,0 -158.56230826884,56.2936594813065,0 -158.539815059838,56.24643375235849,0 -158.652025808424,56.263658716432,0 -158.425109648428,56.44309990175461,0 -158.142882552712,56.4586613057075,0 -158.137331109151,56.51199829491119,0 -157.878969772984,56.4667230394565,0 -157.850930570702,56.5564451637043,0 -158.125368944743,56.52505247965081,0 -158.112310036865,56.56728172314899,0 -157.789291610641,56.6775641184919,0 -157.687049228321,56.6083990265527,0 -157.483154811739,56.6150734109705,0 -157.481753538524,56.6686855455315,0 -157.602332905389,56.7181215981928,0 -157.398444314694,56.76452066637489,0 -157.45234430765,56.8486816726827,0 -157.218693133921,56.7706297462374,0 -157.149023983421,56.8181418198582,0 -157.190102649761,56.8473004074459,0 -157.089544356612,56.8228663550548,0 -156.946204230785,56.90730550252469,0 -156.957316996187,56.9781375977643,0 -156.815676111883,56.8970385623057,0 -156.781778579615,57.0442657888193,0 -156.550662398262,56.9767574935604,0 -156.647895951436,57.0523176397596,0 -156.509283408839,57.04815480310441,0 -156.475383840147,57.1206504256663,0 -156.370374663586,57.1412137444124,0 -156.345108649058,57.17899543635921,0 -156.382157694384,57.19522642686001,0 -156.448444338671,57.22426674886219,0 -156.337058323783,57.28371786195311,0 -156.560112290231,57.2706517564981,0 -156.547908383125,57.3151012445201,0 -156.204013805649,57.4767689054821,0 -156.031252083175,57.4387154200719,0 -156.105139656814,57.5256676083383,0 -156.017096225347,57.5278889954359,0 -156.036264823039,57.57289458496021,0 -155.738761208247,57.5484491430015,0 -155.772116905032,57.6428964424694,0 -155.589863307336,57.6684495062979,0 -155.637654619084,57.71900364639491,0 -155.605424772626,57.7901269537674,0 -155.313209888872,57.7337300300885,0 -155.329864010455,57.8351196866473,0 -155.082392625678,57.8817919802853,0 -155.122076480031,57.9498466148949,0 -155.036263615044,58.01901651886061,0 -154.784915463434,58.0015242707294,0 -154.6693745043,58.06874860389601,0 -154.577475297862,58.02152097435891,0 -154.542736181707,58.06318608427399,0 -154.602683197036,58.1237428043424,0 -154.464687576786,58.0912394264893,0 -154.493467970366,58.195408792331,0 -154.335544467235,58.076521074806,0 -154.338858209779,58.1551303092309,0 -154.226332467918,58.139025874853,0 -154.303822766377,58.18846581873181,0 -154.208806500557,58.1895815991094,0 -154.155733688479,58.2226352017764,0 -154.245420814585,58.2551439894471,0 -154.114293382021,58.2806980425376,0 -154.356521446324,58.2870875115718,0 -154.002646725717,58.3773658722835,0 -154.105387027067,58.48125560259759,0 -153.932061858385,58.5045959892085,0 -153.972890504162,58.5284831785518,0 -153.898185310175,58.61348358666779,0 -153.61068326709,58.6340492543883,0 -153.44985398374,58.7137727795236,0 -153.364832539309,58.8429417107663,0 -153.273557746057,58.8554624066591,0 -153.261534242756,58.85711048010789,0 -153.362056111899,58.8676613660462,0 -153.292631360869,58.8782135819054,0 -153.429022087772,58.9818267000574,0 -153.704883939862,59.0684898098592,0 -154.042661381181,59.0787554970255,0 -154.157370965954,59.0231941221256,0 -154.173498514142,59.1218045137184,0 -154.262948809218,59.1415330158652,0 -154.128492709467,59.2018092726682,0 -154.114066158873,59.3032000988927,0 -153.949637554903,59.3582157497182,0 -154.144651043452,59.3768103802015,0 -153.749350608612,59.43515850431751,0 -153.76715342528,59.5198853480745,0 -153.876835256794,59.54460710609381,0 -153.591094337494,59.5554610435647,0 -153.56529052404,59.60742170564599,0 -153.7077677386,59.63212213906429,0 -153.593590561736,59.6932442855167,0 -153.558099389461,59.6279782410784,0 -153.490537875191,59.6429817146384,0 -153.451034011489,59.788514869163,0 -153.325474023388,59.7201833609921,0 -153.427468957573,59.6507468501349,0 -153.228261155999,59.64324974738111,0 -153.046678397772,59.7063277032092,0 -153.01027369159,59.8293809376473,0 -153.274125155891,59.8332414104575,0 -153.220254584942,59.8674197160735,0 -152.709383935819,59.9216072262671,0 -152.582127278814,60.0810565939181,0 -152.92390161202,60.23334805462,0 -152.94003873109,60.283835571813,0 -153.105318627738,60.2888209744272,0 -152.914498420316,60.3074426802667,0 -152.888672743247,60.24994871215711,0 -152.623566405179,60.21938531787029,0 -152.424485688679,60.2913482476289,0 -152.244741438209,60.3932989208154,0 -152.33336982315,60.4299649111308,0 -152.324187650344,60.4982963133817,0 -152.060879059337,60.6702568219423,0 -151.869752276787,60.7527600317616,0 -151.712241218462,60.7227533678662,0 -151.8069672633,60.8333167797258,0 -151.745283678886,60.9158263142677,0 -151.170299447225,61.0494362619038,0 -150.971803022971,61.19443514678041,0 -150.952789955596,61.20832902923419,0 -150.589996572722,61.2838898032493,0 -150.572785589509,61.3644498997296,0 -150.501098165034,61.2522262842029,0 -149.998044706153,61.23972433979731,0 -149.88219241844,61.38194178181671,0 -149.69833315027,61.4716711128427,0 -149.244431173874,61.4922294375812,0 -149.244690583337,61.4921722234404,0 -149.688899347697,61.3938950506461,0 -150.066392163155,61.1538821236082,0 -149.35355602292,60.9274961555537,0 -149.164131930274,60.94414391284911,0 -149.030233992719,60.84719412510259,0 -149.031256391296,60.8473581579819,0 -149.817460656137,60.9738753404146,0 -150.055802984252,60.9049820972072,0 -150.441125056703,61.029716422926,0 -151.054174381277,60.7872102685368,0 -151.411145577038,60.7269253434777,0 -151.277527954686,60.538589425392,0 -151.30610807234,60.3849681995543,0 -151.393906354096,60.35968671163809,0 -151.434168395526,60.2060742580971,0 -151.721073010356,60.02133213170561,0 -151.87130095749,59.7432697182973,0 -151.411020611746,59.6024407095216,0 -151.473222538545,59.6335528029021,0 -151.429615432973,59.6593798124915,0 -150.994891148765,59.7766160796313,0 -151.194325829894,59.644665262138,0 -151.172373755852,59.5971640167154,0 -151.440432999921,59.5332703268026,0 -151.373191005141,59.4404885512437,0 -151.68518619413,59.4763225888683,0 -151.901267887832,59.4074275234718,0 -151.814594874271,59.35269704310421,0 -151.939328637694,59.3435208087696,0 -151.974035802241,59.2704359809586,0 -151.76075037891,59.2209870235803,0 -151.725442401128,59.16014497139561,0 -151.416827511337,59.2579726347623,0 -151.113463885909,59.2132702949236,0 -151.257942518028,59.31354129712781,0 -151.046535944978,59.2968882192378,0 -150.959468408548,59.2017798893775,0 -150.882900422449,59.2566178352259,0 -150.92345880736,59.3168976512654,0 -150.601818750295,59.4332904901038,0 -150.637372846165,59.4591302876502,0 -150.573198696892,59.48801818871599,0 -150.656820527631,59.5455181462851,0 -150.492372464406,59.5966342854004,0 -150.554892203734,59.5207951642239,0 -150.483751946228,59.46108167276329,0 -150.234610434769,59.7174743922216,0 -150.375967886488,59.46496858220271,0 -150.177957168347,59.5299760545595,0 -150.186568178919,59.5913620600161,0 -150.089068344022,59.5874737531167,0 -150.131279158927,59.6944203512125,0 -150.026572805093,59.6283085711905,0 -149.958795645119,59.6663736669455,0 -149.917964701058,59.7141495203082,0 -150.036312057431,59.7958151910466,0 -149.745725653872,59.6580445615074,0 -149.76687375455,59.7794301535473,0 -149.865749098572,59.8455311572584,0 -149.761044038397,59.835258968484,0 -149.725733852783,59.9624799470071,0 -149.649654701483,59.8997048950508,0 -149.632413768566,59.7430521316596,0 -149.527979014918,59.7161061893766,0 -149.630184937389,59.8241558519239,0 -149.392427191978,59.99692500620601,0 -149.419106339128,60.1177625682853,0 -149.297425849991,60.0149872235935,0 -149.27742488256,59.86693539618939,0 -149.109889568055,60.0505445840998,0 -149.039909034559,60.0480501444573,0 -149.118525530796,59.9844388664724,0 -149.072686356652,59.961110755894,0 -148.645732735282,59.9205553455863,0 -148.584838780207,59.9443183635439,0 -148.545431978257,59.9596933140987,0 -148.543775431703,60.02856277454679,0 -148.432069759509,59.9521654982814,0 -148.443751827642,60.0265934350966,0 -148.327872827252,60.1737736367389,0 -148.20473061572,60.1285935563073,0 -148.112311189492,60.2274263163939,0 -148.207873142985,60.14961256234051,0 -148.181753673558,60.1962918011757,0 -148.261756888472,60.2240371956002,0 -148.213149526906,60.2548997880003,0 -148.437875688356,60.1765645984425,0 -148.360649912604,60.2312630697471,0 -148.391233023641,60.2834972169101,0 -148.315658112001,60.251265128508,0 -148.215358388159,60.3379605640224,0 -148.252033968825,60.3771146586788,0 -148.13848080643,60.35329041049031,0 -148.182048393761,60.41382466439471,0 -148.086522057206,60.3894257803973,0 -147.939038435394,60.4616800092346,0 -148.096202802999,60.6007917073021,0 -148.16901726638,60.49827278078261,0 -148.182625054263,60.5568821805977,0 -148.236481371513,60.51464411648529,0 -148.248407357397,60.4440664370318,0 -148.453728463385,60.5404772618764,0 -148.662370737089,60.4572230831064,0 -148.686252636282,60.44770064102191,0 -148.655870348742,60.46750311616861,0 -148.489839167264,60.5757594787753,0 -148.334269745155,60.5338072453025,0 -148.199562326405,60.6254816107083,0 -148.232351327792,60.76689064543021,0 -148.423189909456,60.62464590669959,0 -148.373729433633,60.7741100557936,0 -148.656393799296,60.6732030138355,0 -148.670173154824,60.66828501340499,0 -148.643795450459,60.7263816501015,0 -148.633222448721,60.74967814460919,0 -148.44960635712,60.8035643503037,0 -148.70186875851,60.7891472536526,0 -148.342354826261,60.81328428583921,0 -148.39515893567,60.85412255705851,0 -148.314306930357,60.84078402297321,0 -148.276250313012,60.9180191103731,0 -148.333206253881,60.9638636687654,0 -148.24621788915,60.950524631916,0 -148.150694574815,61.0658189481316,0 -148.419891159865,60.982475096544,0 -148.35876601599,61.045265507278,0 -148.406292409212,61.0538727742567,0 -148.152073881692,61.1174925099543,0 -148.058728074477,61.0180288282359,0 -147.727589369721,61.2769501718819,0 -147.762033891342,61.2119502260391,0 -147.701464454691,61.20362336129689,0 -148.05427032011,60.9491353609803,0 -147.86733694704,60.8319667058086,0 -147.751499090674,60.8369802363913,0 -147.810973218779,60.873353881162,0 -147.716791759145,60.94891017392889,0 -147.731235092843,60.8869808213403,0 -147.600404620288,60.864474159109,0 -147.610959532568,61.0050354080108,0 -147.669575457536,61.0183582983929,0 -147.597071375163,61.0230848553715,0 -147.548721557266,61.15390437906311,0 -147.481227993569,61.0736399741854,0 -147.546232330737,60.9102973905737,0 -147.433746261722,61.01141449110691,0 -147.456509137478,60.9550268901559,0 -147.380674906894,60.983631907419,0 -147.452354453026,60.9019624271688,0 -147.364825833686,60.88391033304149,0 -147.253739447425,60.9308410661136,0 -147.274590726064,61.0013889229548,0 -147.202899879317,61.0136078504404,0 -147.159279204397,60.945279594455,0 -147.099832210281,61.0108324265117,0 -146.987303498882,61.0027809241622,0 -147.032896212862,60.9527767239131,0 -146.96480793758,60.9397266125377,0 -146.587025468714,61.1308545406382,0 -146.302870653031,61.1303006103218,0 -146.245607696804,61.0850266206628,0 -146.645096824727,61.0680740681633,0 -146.563700432409,61.0333532654964,0 -146.66258226107,61.0355783966212,0 -146.704238180203,60.9747326576475,0 -146.585322998139,60.9369525778928,0 -146.7562168937,60.949184341708,0 -146.618399066796,60.87583490026579,0 -146.62588869526,60.8191742022643,0 -146.365278513723,60.8199981043257,0 -146.233084037149,60.89223480194439,0 -146.091857444634,60.833693045447,0 -146.688635158716,60.7445853086664,0 -146.655375405815,60.6991705496384,0 -146.487809366452,60.6780530191874,0 -146.304472221854,60.7733383190817,0 -146.268413160245,60.72194984233029,0 -146.04283298469,60.79808589117061,0 -146.018662897232,60.7428002103088,0 -146.25562426106,60.6377755739876,0 -145.92504969477,60.705840050816,0 -145.990873322739,60.6286083262344,0 -145.849200623326,60.6961056188291,0 -145.873343048254,60.6497147445425,0 -145.806403418073,60.6572171447883,0 -145.874197219193,60.6205455692455,0 -145.627771366174,60.67138695048881,0 -145.942281314296,60.4674984661902,0 -145.65561811283,60.466944019527,0 -145.351399838659,60.3516582766124,0 -145.225314668621,60.3683449430158,0 -144.826036159745,60.5929111703319,0 -144.760308369237,60.6790815080476,0 -144.613385843632,60.7150275209425,0 -144.763678839838,60.6627982972541,0 -144.884181006322,60.4780630494153,0 -144.788382984825,60.493062458805,0 -144.796437648474,60.4516699301247,0 -144.938378311657,60.3011193475292,0 -144.700846219873,60.276921132217,0 -144.576127090857,60.18526840806369,0 -144.189751593955,60.202513503567,0 -144.252554271713,60.1450107532353,0 -144.003095619119,60.0425179326562,0 -144.148602290858,60.0316537314516,0 -143.888930954422,59.9900121498977,0 -142.719050852584,60.1094910039893,0 -141.717587599628,59.9520616401243,0 -141.386792900144,60.023759031075,0 -141.479017872918,60.1162520487878,0 -141.392656822796,60.13820036432251,0 -141.281518868868,60.0712681733343,0 -141.260950985684,59.9765422987742,0 -141.450329121867,59.8809698429882,0 -141.001709257282,59.8023163528928,0 -140.405055993657,59.69771114038931,0 -139.836132734893,59.82301987154829,0 -139.589471632915,59.9485724375873,0 -139.515348897886,60.0505251414152,0 -139.233071735342,59.8691286469081,0 -138.894496190512,59.8063403069422,0 -139.280313455814,59.8299667944861,0 -139.226120251616,59.6157996927196,0 -139.287244089715,59.5710816495799,0 -139.342230474863,59.6046948540387,0 -139.263927331067,59.6224601202984,0 -139.341134941066,59.72384997636281,0 -139.294474503019,59.85468855666269,0 -139.487815713058,59.9846913591901,0 -139.619467019731,59.8849653387388,0 -139.471418166652,59.7074669601951,0 -139.572510583172,59.6099758949173,0 -139.837482979524,59.5330346061365,0 -139.30031473563,59.3435971805834,0 -139.226984728521,59.3774866299124,0 -139.115023715578,59.306932608997,0 -139.198087518419,59.3144316200442,0 -138.627559421752,59.1391476018072,0 -138.445338735773,59.1913655645444,0 -138.500061358955,59.11941992797591,0 -138.605070145945,59.1169216985396,0 -138.29814747493,59.0763641655449,0 -137.966817544318,58.9043972139786,0 -137.928513867343,58.7966276745584,0 -137.66945254236,58.6221403538231,0 -137.442485485931,58.6593486025529,0 -137.628327290225,58.5985226331721,0 -137.094416411605,58.38184837053421,0 -136.951883908997,58.3957406555413,0 -136.89468891615,58.3404646811455,0 -136.866886134745,58.3812984446125,0 -136.844937966734,58.3171315305511,0 -136.679360288633,58.2982379511224,0 -136.716046479212,58.2518487488786,0 -136.656043454623,58.21489693173361,0 -136.561587965299,58.2557320307773,0 -136.655491495902,58.3387900196198,0 -136.603238898985,58.3568494581747,0 -136.363780310359,58.2982440101744,0 -136.410746371687,58.37434783255579,0 -136.483236094748,58.3335105766018,0 -136.557975974697,58.3735129010878,0 -136.494888770296,58.38435455110609,0 -136.507118846123,58.44129144693201,0 -136.318242970392,58.39907769897481,0 -136.278233993266,58.3090737928317,0 -136.08514299961,58.3379763670886,0 -136.031004489378,58.3829837409208,0 -136.082680065021,58.5113093137749,0 -136.2107255606,58.5129687825506,0 -136.120431815536,58.55380061969949,0 -136.29407268799,58.6621169742219,0 -136.333493995151,58.5943420072906,0 -136.525718697156,58.6110055800168,0 -136.339329003016,58.6834993232732,0 -136.497113187255,58.749883803814,0 -136.438229911546,58.6648894748485,0 -136.524357189501,58.699329244748,0 -136.63741457713,58.8218274483055,0 -136.482958192163,58.79238071316011,0 -136.575464362967,58.8382088268226,0 -136.990189990781,58.89458978618709,0 -137.12743032072,58.82153237612071,0 -137.031879326265,58.9126397725486,0 -136.905778407043,58.926812355003,0 -137.056011817366,59.0639419933536,0 -136.661318388864,58.89098638570339,0 -136.610202059726,58.90737638810539,0 -136.70854399634,59.0184893501142,0 -136.582706428563,58.9154339412163,0 -136.490763094364,58.96515754558769,0 -136.484612282788,58.8390423598058,0 -136.26714738786,58.8221080732546,0 -136.385180003962,58.804050032587,0 -136.223774352415,58.7490551480308,0 -136.097421550472,58.8559972664872,0 -136.111863342191,58.92904052508089,0 -136.226576550769,58.9243174424854,0 -136.137164285104,58.9501477784295,0 -136.164118346043,59.0332071986449,0 -136.036058980683,58.9159917107924,0 -136.044109918623,58.8540536632563,0 -135.965502899901,58.9159955148241,0 -135.771340291466,58.8998984467766,0 -136.070198300687,58.8173893403661,0 -135.822138819143,58.5993615155143,0 -135.890772635366,58.5765863516842,0 -135.845710273191,58.4688072573549,0 -135.948217732642,58.4574219642019,0 -135.874610269222,58.4602008134349,0 -135.917383717431,58.3827046058588,0 -135.636006152498,58.4218810052194,0 -135.474039904979,58.3718793195977,0 -135.482922268447,58.4763209989525,0 -135.482266105207,58.47529863497879,0 -135.345954522573,58.26466178943679,0 -135.087344560568,58.2327100623319,0 -135.093479471139,58.4363199785056,0 -135.223182566531,58.59216050625211,0 -135.164589259234,58.63632787603429,0 -135.391034925742,58.9588383273772,0 -135.378475725941,59.0907811532229,0 -135.552399810315,59.2285461698137,0 -135.414058965412,59.1968867345814,0 -135.306546396798,59.0832766696795,0 -135.357082067385,59.2049429105833,0 -135.554624990701,59.3180010587432,0 -135.400998972006,59.3049402002886,0 -135.383161843017,59.3585289384977,0 -135.346557009105,59.4685532642299,0 -135.360411007386,59.3436974793189,0 -135.368222902154,59.27327850648509,0 -135.163500430068,58.9927202255354,0 -135.161777868188,58.9745121701904,0 -135.149071419803,58.8407709473337,0 -135.031254630839,58.736614051915,0 -134.949036811615,58.8143887158517,0 -134.912621058313,58.6560578826969,0 -134.990691092216,58.6696692775995,0 -134.777641849428,58.490775534021,0 -134.763203482944,58.3818793937694,0 -134.511786337846,58.353556200747,0 -134.176469810883,58.1963268059925,0 -133.980913251872,58.4938387505342,0 -133.77091007828,58.5180117548619,0 -133.922590710653,58.4974560491895,0 -134.011765799984,58.39717028706351,0 -133.977853715933,58.3177321691036,0 -134.068158032297,58.2766153296601,0 -134.066201117339,58.085492514722,0 -133.900088363535,57.9760430283545,0 -133.672571190215,58.1471659171099,0 -133.768155453362,58.05576798228,0 -133.670892347204,58.0135539809575,0 -133.682854190577,57.9377083749998,0 -133.774534185107,57.99132643628581,0 -133.857575173935,57.9535439821041,0 -133.693105012499,57.78716267005141,0 -133.568958353096,57.9224356117366,0 -133.525942304262,57.91613784130279,0 -133.123080113048,57.8571686423433,0 -133.547015241979,57.9104879379811,0 -133.547011345063,57.76549624512461,0 -133.004774352576,57.50938403516341,0 -133.643418684621,57.70465696636439,0 -133.663955741524,57.6327098175619,0 -133.585339067243,57.5679869556373,0 -133.312833293853,57.5893738493547,0 -133.49698377267,57.5376995498935,0 -133.470866589226,57.4371423353252,0 -133.3367048496,57.43491848802081,0 -133.433945230402,57.3465912995632,0 -133.225868279786,57.3129816576288,0 -133.0453128552,57.3668719324843,0 -133.244213062915,57.2749262353772,0 -133.473650022802,57.2790896729504,0 -133.554796111527,57.17881921334719,0 -133.528137746568,57.170251028798,0 -133.298114295831,57.0963158766088,0 -133.244768478878,57.17270872708861,0 -133.158950021709,57.16409641561199,0 -133.116163961892,57.1441004284371,0 -133.160081643089,57.0796546192494,0 -132.886179757038,57.0168734472833,0 -132.793097026481,57.0877059207201,0 -132.769781207377,56.9621561828107,0 -132.925060074322,56.9765975021592,0 -132.77060165749,56.8435404168285,0 -132.504506657573,56.7502120617999,0 -132.363909724204,56.8199394689082,0 -132.526143458526,56.7143759920697,0 -132.456682008304,56.67159813085879,0 -132.549488281624,56.627429941292,0 -132.312511499064,56.6374344564457,0 -132.347785944665,56.5271493911447,0 -132.190860649546,56.460486259835,0 -132.15918463566,56.3768754871059,0 -131.971963857806,56.3568773710179,0 -131.908639483814,56.2285236212952,0 -131.49196109642,56.2204678107347,0 -131.961956594766,56.1651919004793,0 -131.945847095563,55.9682473279259,0 -132.06281616002,55.9368652538066,0 -132.049477778082,55.8054682220347,0 -132.175848740147,55.7996382519413,0 -132.175024615534,55.7187928571858,0 -132.225653768625,55.7389522101563,0 -132.267798804903,55.75573975353461,0 -132.177525196271,55.5899085257854,0 -131.964175227892,55.4982422809801,0 -131.929477941262,55.5915718596293,0 -132.00559059502,55.66184618144071,0 -131.881107426912,55.5982402209747,0 -131.81696127044,55.66907850019471,0 -131.864722435898,55.7249016673099,0 -131.754190046919,55.8074038123661,0 -131.917246144437,55.8579672442893,0 -131.411424423709,56.0051871828046,0 -131.324207044163,55.9646304343716,0 -131.011992434462,56.1060238799091,0 -131.202812661678,55.9735113533014,0 -131.00057503828,55.79852982115491,0 -130.917813018449,55.8113108695306,0 -130.95864420197,55.77659000836881,0 -130.887538437933,55.7049239048227,0 -130.865859720611,55.3082667153901,0 -130.65586893889,55.34549300042141,0 -130.61558486786,55.2957733803602,0 -130.945569927982,55.279656185401,0 -131.067513808675,55.191041008103,0 -131.057806417561,55.12243213845139,0 -130.930300099946,55.0871625863252,0 -130.818097932271,55.1424400006887,0 -130.755593228493,55.09243220066681,0 -130.463362816131,55.32744919212371,0 -130.720280373612,55.0766054154367,0 -130.84113305224,55.1027194775792,0 -131.010309645102,55.0038344595815,0 -130.93806720518,54.9629911841008,0 -130.927769495423,54.8090995257054,0 -130.849153266784,54.7671595142445,0 -130.741094710924,54.81854519831811,0 -130.743025470057,54.9660362133392,0 -130.687783687023,54.7616034528696,0 -130.577500820198,54.8574294814757,0 -130.588607500443,54.79354482071981,0 -130.361386873815,54.9077118520726,0 -130.103073100881,55.22747708596741,0 -129.992235346908,55.2813822850679,0 -130.145588531923,55.54108278046449,0 -130.176414642352,55.75409457662871,0 -130.176414642935,55.7541365380658,0 -130.016778867682,55.90888763330291,0 -130.090297948784,56.1177520762836,0 -130.415891262238,56.12855400436249,0 -130.4636519955,56.2349444356491,0 -130.628905377559,56.2582721135475,0 -130.776152935708,56.365766108773,0 -131.05670022424,56.39770273986309,0 -131.074613949113,56.404973833375,0 -131.559476014298,56.6018977381094,0 -131.825838856788,56.59660996812799,0 -131.863077410462,56.7993988358277,0 -132.104748626929,56.8663312886794,0 -132.029189648689,57.0360613881056,0 -132.338641933596,57.0879948891874,0 -132.228348190178,57.2043854032423,0 -132.363616524798,57.34275120064831,0 -133.138683114325,58.13550523558779,0 -133.171048403061,58.1564024746048,0 -133.36284284141,58.28022951617441,0 -133.431726284404,58.4588465909242,0 -133.828692257681,58.72578943348999,0 -134.247322305508,58.8566295232279,0 -134.334593994792,58.9656607746833,0 -134.463191460983,59.12634237687829,0 -134.568204634564,59.1302303298755,0 -134.689857898817,59.24300575590409,0 -134.953748774754,59.2796634610668,0 -134.977219328446,59.3489913196536,0 -134.990984023358,59.3896633545353,0 -135.093498782177,59.4266123149411,0 -135.022939901321,59.47077179961029,0 -135.016295777664,59.5671728987803,0 -135.475441013568,59.8016131035917,0 -135.724887415548,59.7445303048924,0 -136.345727332791,59.6024571115741,0 -136.235738083604,59.5255080235504,0 -136.465487356768,59.4693774502392,0 -136.464644290639,59.2890793693772,0 -136.48764146439,59.2651414114248,0 -136.585774848831,59.1629442147388,0 -136.810786536833,59.1648781936228,0 -137.467432086905,58.9057221041175,0 -137.59264851127,59.2382530122083,0 -138.617535247197,59.7738592247734,0 -138.691994847808,59.9066259646792,0 -139.190602985604,60.088577403015,0 -139.069786821278,60.3519106988025,0 -139.678416008967,60.340234263451,0 -139.981175300005,60.187447543304,0 -140.452638339038,60.3093672718473,0 -140.523190558165,60.2218651470663,0 -140.997156001225,60.30679108033339,0 -140.997384898733,60.3068292096332,0 -140.9989122007,61.89454136467249,0 -141.002434696908,65.8400896453574,0 -141.004723298928,68.4279151682059,0 -141.005660000708,69.6421178479071,0 -141.005660054685,69.6421941494167,0 -141.308508849567,69.69091524212401,0 -141.223482726229,69.67231295411629,0 -141.262940481944,69.6342572443014,0 -141.390999396873,69.6409265677094,0 -141.733781846539,69.775376516245,0 -142.271869100894,69.84843781902801,0 -142.59550303389,70.0040058794748,0 -143.28334909463,70.1181529041699,0 -143.297226611948,70.0417650546672,0 -143.351374419714,70.1087065079648,0 -143.777962651497,70.0997576111421,0 -144.067797268631,70.078983836275,0 -144.026684208822,70.0461921309344,0 -144.071935092264,69.9842381704767,0 -144.116960880923,70.0642423510304,0 -144.970585790948,69.9686710645029,0 -145.610610756659,70.06477802243209,0 -145.842334173811,70.1703248895754,0 -147.692718680802,70.2088996362636,0 -147.861627347452,70.3097296297568,0 -148.225819398389,70.35888695351581,0 -148.5080501403,70.3111025083206,0 -148.610273870989,70.3983395352289,0 -149.497860633081,70.5224866335161,0 -149.891211839655,70.5147096692296,0 -150.406769425655,70.4091151139595,0 -150.372026620749,70.4857944334787,0 -150.783174336724,70.501895326016,0 -151.200682373447,70.4343755922789,0 -151.175949595517,70.3752007889311,0 -151.223434155667,70.370759102962,0 -151.969284739825,70.4432335360395,0 -151.769616151248,70.49879835066341,0 -151.869017761123,70.51269675957811,0 -151.744024642706,70.5596379842346,0 -152.626007780726,70.552398020968,0 -152.075734774532,70.5801986512998,0 -152.497116638279,70.6435141514856,0 -152.510768227234,70.6935034074429,0 -152.218820221629,70.8107476401635,0 -152.43856610095,70.8696291630003,0 -152.743570744621,70.8815709360742,0 -152.665255121422,70.856852202534,0 -152.704675599734,70.8101726258035,0 -152.813581486565,70.8862998754055,0 -153.225833323108,70.92822411535801,0 -153.918350223885,70.88878057125589,0 -154.197785594756,70.7759936984677,0 -154.808937289101,70.8776399320848,0 -154.657816158098,70.9170891747174,0 -154.605861549042,71.01432209967661,0 -155.003416303882,71.1166302754546,0 -155.020061871138,71.0187557924905,0 -155.095626178,71.0162676012733,0 -155.043154972335,71.1309733291761,0 -155.104806867176,71.1484896874106,0 -155.098416547665,71.0840345419312,0 -155.290653808329,71.0851439877854,0 -155.196179617947,70.98902796042751,0 -155.390649819624,71.0031985705146,0 -155.538682998327,70.9353992810117,0 -155.586701416711,70.83929608756201,0 -155.897862446572,70.827357706288,0 -155.904779715577,70.7667935280225,0 -155.97698363289,70.7554086466204,0 -155.986163211433,70.89818973904271,0 -156.185905347499,70.9179013999896,0 -155.739227458931,70.9995911222166,0 -155.550403076765,71.11735082169091,0 -155.647916214362,71.1854052383941,0 -155.949285999619,71.21930586841791,0 -156.112887679407,71.17151117493481,0 -156.046516394757,71.20930936863719,0 -156.104842049165,71.2412459026805,0 -156.450429420198,71.26319772006229,0 -156.604859516191,71.3495767225857,0 -156.379581349744,71.3723459699897,0 -156.485694400001,71.4062353532712,0 -156.819884507406,71.2998439493377,0 -157.278741542101,71.0484374781428,0 -157.883886562967,70.85589649114201,0 -158.511804547629,70.8484055225624,0 -158.342330031307,70.817020707034,0 -158.684558004233,70.7850606362618,0 -159.080935755644,70.8131144628078,0 -159.002863057983,70.77173338606291,0 -159.28124324675,70.7561613759444,0 -159.22065153977,70.6872671403236,0 -159.448456253376,70.7792138080213,0 -159.151250301507,70.8195062260266,0 -159.372601948199,70.8433812641851,0 -159.165422422068,70.8803293300863,0 -159.671512028802,70.7975342513034,0 -160.121176350152,70.604459835988,0 -159.941735264203,70.63223879878581,0 -159.733354947947,70.4928046445493,0 -159.288948712844,70.5300483049591,0 -159.677474486079,70.4663385653533,0 -159.817552164174,70.49501504962841,0 -159.890038016111,70.3911425060827,0 -159.773067099661,70.19167406783259,0 -159.944720780534,70.36362867405241,0 -160.132216169229,70.3178005323508,0 -159.923659721887,70.48307943154801,0 -160.202017902804,70.47110955595581,0 -159.923124669538,70.53807409893339,0 -159.940900953165,70.59280878985111,0 -160.153715245688,70.6041812181133,0 -160.979187665469,70.32388374303331,0 -160.952509305412,70.289429020032,0 -161.616647732875,70.2549933462936,0 -161.703611199213,70.19247557272701,0 -162.124125734446,70.15497812132131,0 -162.008672104119,70.1924326557067,0 -161.786011341545,70.2214812719788,0 -161.898898001357,70.25581190497731,0 -161.713053075455,70.2702654509241,0 -161.955819123057,70.3030222649161,0 -162.965996220551,69.77771713088769,0 -163.029340432513,69.7279840400027,0 -162.944311598629,69.6921422055064,0 -163.14848731547,69.60186060984169,0 -163.068463274222,69.5674362017848,0 -163.123421742913,69.38409029468591,0 -163.273711383295,69.2932346877846,0 -163.187333330638,69.41823992217771,0 -163.563939763235,69.1443452503092,0 -164.32779116985,68.92987632865641,0 -166.235010188035,68.8742810818968,0 -166.201384380437,68.6959334731385,0 -166.228862705966,68.5717843322166,0 -166.369652054535,68.4384315371569,0 -166.314958875026,68.3987130638853,0 -166.830795430101,68.3500887639276,0 -166.290774089908,68.2914877128256,0 -165.922125938821,68.13009959492131,0 -165.364345329511,68.0384502500519,0 -165.287453127133,68.013679439299,0 -164.709865423311,67.8276306400944,0 -164.022903697848,67.5462514378527,0 -163.825364804985,67.3540229613532,0 -163.724744086595,67.1101264345733,0 -162.570866422574,67.0082179740804,0 -162.379205716413,67.162948038495,0 -162.33171920958,67.1490632816262,0 -162.455020849002,66.98821564805471,0 -162.299201905027,67.0026685070435,0 -162.300338359452,67.0682214691147,0 -162.237252423427,67.00656059689329,0 -161.87059056378,67.0512766368782,0 -161.519779273364,66.9865525982117,0 -161.803101442714,66.89907014715401,0 -161.900587916144,66.7276658508876,0 -161.509423316888,66.533223963712,0 -161.252175794063,66.5482244018648,0 -161.143058547956,66.646845617712,0 -160.841360014732,66.66212477606091,0 -160.544990511938,66.58629215016791,0 -160.243021527644,66.6435210713741,0 -160.324133827121,66.6024107500147,0 -160.212460528904,66.5237978147196,0 -160.233292042291,66.3990837318227,0 -160.825243848046,66.3776636662334,0 -161.188882504675,66.53794068690409,0 -161.575248550639,66.44654976984479,0 -162.078064891665,66.6573740140031,0 -162.017532983974,66.77627520968289,0 -162.326967822522,66.9565549707677,0 -162.483368243038,66.95543859566639,0 -162.634175502752,66.8620956907683,0 -162.50391768729,66.7373704214385,0 -162.226660792759,66.7098777879464,0 -161.908889249811,66.53460415958369,0 -161.875246406787,66.43682356722481,0 -161.964680770585,66.33209767334481,0 -161.912733198035,66.2737622600538,0 -161.859115274984,66.28127055439531,0 -161.912469642065,66.36571466792449,0 -161.724119114883,66.40377371027991,0 -161.12938575545,66.33905389843891,0 -161.004972397821,66.2510107806911,0 -161.067169548589,66.1320953929197,0 -161.178554771955,66.1168195592756,0 -161.110472747436,66.1340632209611,0 -161.089951455798,66.24099946752921,0 -161.533306771184,66.2671017911169,0 -161.784662174653,66.07793027450261,0 -161.725763139689,66.0798847355501,0 -161.841022369825,66.01237625837091,0 -161.819106958783,65.9743202145317,0 -162.154654855389,66.0768103047635,0 -162.667167184634,65.9967980821213,0 -162.760224888464,66.1065266000829,0 -163.659125509688,66.0698442485925,0 -163.833571407683,66.1115000863937,0 -163.924675827194,66.20734351040581,0 -164.190246195612,66.19038718515981,0 -163.857173915847,66.2762405458659,0 -163.896916647977,66.3918002644392,0 -163.75748704699,66.5173713450736,0 -163.940815454602,66.5801455403949,0 -163.627760207836,66.5665362934503,0 -163.936621240652,66.60772658673049,0 -164.356385629336,66.5940265602447,0 -164.399507625099,66.5886547571376,0 -164.720280120565,66.5487323991711,0 -165.036099581348,66.3934497068404,0 -165.163914831425,66.4426128043321,0 -165.769199906905,66.3170488599045,0 -165.879146743545,66.2217682512115,0 -165.503613034373,66.14427269394371,0 -165.809430693031,66.10231965425319,0 -166.269744905172,66.1784253346552,0 -166.717496665643,66.0614562164868,0 -166.796378730793,65.9803519034601,0 -166.967770183703,65.972567007919,0 -166.87553964833,65.9336722397271,0 -167.048880086976,65.8753330638621,0 -167.35638581219,65.8867416084715,0 -167.574432868243,65.79588269710401,0 -167.520558325044,65.729503911859,0 -167.820009598595,65.7172766919645,0 -168.044468397191,65.63393934428029,0 -168.034737884617,65.6883706248357,0 -167.84915959275,65.7606133668335,0 -168.124431940435,65.6736433077164,0 -168.067504530249,65.57949304435201,0 -167.459919804786,65.418078455472,0 -166.629617280485,65.3633803841433,0 -166.054064725808,65.25117483745891,0 -166.376548389171,65.2683811362611,0 -166.487111618295,65.2339383119977,0 -166.467666552838,65.18532305262571,0 -166.545727571163,65.13115063139971,0 -166.687118303051,65.11587233754921,0 -166.926288874932,65.14504322984931,0 -166.858525678542,65.2830956002842,0 -166.961299804006,65.2097568742482,0 -166.921831709077,65.13084459946551,0 -166.7004420196,64.9922584742082,0 -166.389879198323,64.8905961323627,0 -166.492626707689,64.73420457751681,0 -166.239555912154,64.59532018133039,0 -165.031230833568,64.4431039957143,0 -164.76985730063,64.4745127817353,0 -164.922898307521,64.45673254184889,0 -164.930956929916,64.53311916006609,0 -164.892627858084,64.48505397767531,0 -164.667902409601,64.5222905226501,0 -164.72621893355,64.48423363991429,0 -164.360088149756,64.5789666182623,0 -163.566205696598,64.5656390411616,0 -163.178409373869,64.4067532494104,0 -163.039813776722,64.5153662552039,0 -163.390642041058,64.5923137088889,0 -163.157027775966,64.6559144969642,0 -163.053148111811,64.55119385660301,0 -162.829792557313,64.4950871737036,0 -162.872303089195,64.4573044554495,0 -162.780647472204,64.3361938504371,0 -162.634219114342,64.3867663256485,0 -162.578957927831,64.52010491152809,0 -162.116745192736,64.7151129311906,0 -161.890367664551,64.7106765685019,0 -161.717861085005,64.7876176880861,0 -161.803708732124,64.821231576543,0 -161.550378624726,64.7448356215443,0 -161.377588763895,64.7873520304165,0 -161.197322318621,64.93430012455281,0 -160.992851544901,64.9379048745032,0 -161.158167193538,64.92262779752031,0 -160.784237176078,64.7157025586849,0 -160.82005359384,64.61485314137271,0 -161.085041870117,64.54957365399611,0 -161.004773522896,64.5215267284232,0 -161.402863614838,64.53401847446931,0 -161.540884660164,64.3856755455374,0 -161.196146256275,64.4148451063664,0 -161.253122387503,64.3920614493081,0 -160.963908335204,64.23705723654,0 -160.943322605701,64.06705330425601,0 -160.774996013091,63.8542813723546,0 -160.788870091555,63.7401106020972,0 -161.154124810184,63.5117640424884,0 -162.157183462979,63.425080499019,0 -162.016926528706,63.4809181406135,0 -162.314404291311,63.5403637706865,0 -162.275536472848,63.4886843315758,0 -162.618589626534,63.270582943221,0 -162.682750159309,63.22978735772389,0 -163.063844348813,63.0592267591378,0 -163.344118130336,63.0211689103926,0 -163.541358158858,63.10533542529459,0 -163.80551615622,62.98283178376531,0 -163.542732163212,63.1219983002693,0 -163.664405424513,63.1111696615313,0 -163.634103094497,63.1425580550469,0 -163.727736186373,63.2139459812552,0 -164.14721335406,63.2595048353859,0 -164.383022810676,63.2197671295211,0 -164.590232105296,63.1328248381903,0 -164.316630993268,63.0106029483316,0 -164.711072054192,63.0142131598764,0 -164.880213279511,62.8347568861368,0 -164.766624119603,62.7886461303061,0 -164.889943380609,62.7805875451643,0 -164.794929376261,62.6108725134766,0 -164.48158838506,62.74504087577081,0 -164.857394583844,62.56447720976451,0 -164.793520287693,62.5403158955948,0 -164.835721145313,62.4808670435066,0 -164.636049158562,62.51059436681111,0 -164.680204128676,62.4642069664149,0 -164.576015154411,62.4244823987194,0 -164.754354205867,62.371142501804,0 -164.610744322152,62.43087532939461,0 -164.853511922844,62.47058236424961,0 -164.869904389072,62.5344782474273,0 -165.08324973359,62.5289209698671,0 -165.705716462815,62.1128041493008,0 -165.758778373867,61.9919605151816,0 -165.591807823504,61.850299198507,0 -166.100962949819,61.8152870680091,0 -166.00207820638,61.7263975023978,0 -165.764863681812,61.6877873499975,0 -166.139583558096,61.63390258333181,0 -166.164858999094,61.71306605020099,0 -166.200126830561,61.5880649141168,0 -166.130110379656,61.4966733252918,0 -165.893180807874,61.5538942669146,0 -165.795402010725,61.5188993667325,0 -165.77983361165,61.4566828273615,0 -165.923994530034,61.4127872061197,0 -165.870920146754,61.3264012743009,0 -165.611214257849,61.28001818518799,0 -165.64984598049,61.23696549771101,0 -165.601745182151,61.11225119317889,0 -165.375369666424,61.0694763303264,0 -165.343697931293,61.1564124226045,0 -165.40983068472,61.20752779114689,0 -165.224257314548,61.27391186012021,0 -165.289840371332,61.3330759916334,0 -165.162901144922,61.4310980300113,0 -164.718443656801,61.6247573719369,0 -164.847615655754,61.4936433189985,0 -165.15290599402,61.41613685729461,0 -165.157055466112,61.358359866418,0 -165.259291727062,61.3275297756185,0 -165.202894312212,61.3230822474369,0 -165.210097154275,61.26281146318839,0 -165.37232516251,61.2000286586147,0 -165.153453777898,61.1553005565385,0 -165.085096336351,61.2130854087809,0 -165.140944081154,61.2558618009692,0 -165.06483272744,61.2105833219074,0 -165.187326936505,61.1228071785489,0 -165.048439437497,61.05689162083421,0 -164.995647599745,61.1119760267926,0 -164.767896969102,61.1103155125245,0 -165.192871886297,60.9597531730246,0 -165.110565059716,60.9225569496261,0 -165.07424859671,60.9061427127989,0 -164.990022768122,60.9348339588457,0 -164.938343200375,60.9524393274619,0 -164.870976580056,60.94695444386939,0 -164.639288416719,60.92808884666271,0 -164.559818808553,60.85004112677449,0 -163.960091115681,60.8547780661213,0 -163.679543441808,60.9911680892823,0 -163.758186260635,60.9331065650752,0 -163.560091826547,60.8878389749158,0 -163.931220897812,60.8514449018976,0 -163.410944450434,60.7497858290327,0 -163.471461733857,60.7506246110248,0 -163.453697030097,60.67783940319959,0 -163.801752052696,60.5806142387469,0 -163.806764049117,60.7439433073368,0 -163.947331988722,60.7800494837044,0 -164.431486477628,60.5525429587347,0 -164.220647905353,60.6881022253774,0 -164.271799002803,60.78309928468549,0 -164.658173653634,60.8192025899417,0 -164.69983094827,60.8466982886337,0 -164.645391085253,60.90975539016381,0 -164.841492573628,60.8661441668259,0 -164.939272561548,60.9266977060696,0 -164.872313502606,60.8425310236634,0 -165.033714451763,60.784759655869,0 -165.006763232977,60.7003109599568,0 -165.427583525104,60.5544745099766,0 -165.250887228003,60.49642462085681,0 -164.985912947372,60.5433696750612,0 -165.027871168689,60.46531341536729,0 -165.146457812405,60.4447516184619,0 -165.078405077892,60.3908727048524,0 -164.77731726895,60.2905990696946,0 -164.650650277534,60.32699099060361,0 -164.663977793575,60.2592109393254,0 -164.427008523946,60.09059993582769,0 -164.113954784651,60.0017211890513,0 -164.22088721234,59.9450478607126,0 -164.110318707835,59.8347714876634,0 -163.366445849479,59.8189419280352,0 -162.816730979116,59.9347749053035,0 -162.753957281201,60.00200647936831,0 -162.511461550551,59.999505071439,0 -162.451713306386,60.1867259781643,0 -162.702266889887,60.260341661936,0 -162.558680320138,60.2564512687932,0 -162.60754168599,60.32756567715741,0 -162.423123890546,60.37617448125431,0 -162.442290876367,60.4256212540744,0 -162.270359992283,60.6120116986623,0 -162.12671403156,60.6492369503414,0 -162.162027301326,60.734794119445,0 -162.085912055504,60.6578433423369,0 -161.881718318846,60.7014627008903,0 -162.224215651641,60.58090649195119,0 -162.226714982077,60.5056260984554,0 -162.474513570136,60.29701025698749,0 -162.335044056392,60.2086692928946,0 -162.352559135282,60.1400645901276,0 -162.271443303682,60.1661733845831,0 -162.287284487017,60.2381196130613,0 -162.153676990213,60.2447813425049,0 -162.253682896918,60.1970044098747,0 -162.199786446445,60.14367446192579,0 -162.238388964912,60.0597798671927,0 -161.707506703828,59.4958853579321,0 -161.960588954752,59.37921114630569,0 -161.988049768588,59.2430992003208,0 -162.001388499591,59.3064322123546,0 -162.051834723767,59.2715496909202,0 -161.994462599361,59.1433746207894,0 -161.867522698748,59.060323156935,0 -161.855021766726,59.1133762929031,0 -161.568055385322,59.10282725569901,0 -161.857245772622,59.0280973607437,0 -161.790573224394,58.9683720926518,0 -161.772791932609,58.78226412509401,0 -161.657795664346,58.7997592139068,0 -161.893609429912,58.6519811349219,0 -162.17360984368,58.64892445768451,0 -161.766586616578,58.5982743359903,0 -161.75108494486,58.6430943044085,0 -161.712753303332,58.6125383333076,0 -161.765272176137,58.5516995163179,0 -161.349468993896,58.6650323643257,0 -161.382490679071,58.7036527879563,0 -161.333785152503,58.73324809322381,0 + + + + + + + + + -172.282642546092,60.3017596593185,0 -172.211808221282,60.316204875602,0 -172.390441016854,60.3928679156909,0 -172.847101990595,60.4839652430026,0 -172.919346731,60.6028543719093,0 -173.04685088018,60.5370151919399,0 -173.051029558487,60.4933969080509,0 -172.601782006627,60.32397371434931,0 -172.282642546092,60.3017596593185,0 + + + + + + + + + -166.111439828761,60.4094701923102,0 -166.398665903988,60.3400243984304,0 -166.498123499017,60.37807097764811,0 -166.810311289524,60.27945769150159,0 -166.84143544507,60.20390387913589,0 -167.453133884145,60.2066788672344,0 -167.318112198797,60.0708487760817,0 -167.128929292756,59.9963962534805,0 -166.104757036993,59.75724250197069,0 -166.118919817195,59.8105716573949,0 -166.267815168744,59.84307908422521,0 -165.61446894417,59.9014123587901,0 -165.542848138141,59.9786315042928,0 -165.727850407447,60.065580817836,0 -165.675056652553,60.09668666622531,0 -165.732830243117,60.1650296963098,0 -165.683703756673,60.29392106600451,0 -166.066483978932,60.3275313579641,0 -166.111439828761,60.4094701923102,0 + + + + + + + + + -164.178091402927,54.603270997621,0 -163.601959088346,54.6099352379761,0 -163.43838539692,54.6574383835051,0 -163.370852896965,54.7535535436431,0 -163.050602984856,54.6674425084057,0 -163.147018537937,54.7652157933741,0 -163.36197296569,54.7754956428998,0 -163.531996342121,55.045514546807,0 -163.770614294094,55.0552237012459,0 -164.137822791485,54.9649533186511,0 -164.221436864885,54.8866229773527,0 -164.490015256965,54.9155065870599,0 -164.706139301228,54.6674315593203,0 -164.953642102217,54.5863095660578,0 -164.855307710372,54.4243657690961,0 -164.647263067171,54.3899305443965,0 -164.388378042911,54.44186867091009,0 -164.178091402927,54.603270997621,0 + + + + + + + + + -166.645219344046,53.5227419042544,0 -166.665820621025,53.5924680707072,0 -166.592700000167,53.5344165169026,0 -166.540213650459,53.6269111248818,0 -166.279117480897,53.67774993367021,0 -166.333594474453,53.7780194934209,0 -166.373841186087,53.7144229393544,0 -166.417176046642,53.7555359837067,0 -166.485803072549,53.6888628054882,0 -166.572714324989,53.70942188291101,0 -166.490200645502,53.7716311101511,0 -166.539118186291,53.7819062132675,0 -166.216945166038,53.9274617985556,0 -166.266407760674,53.90801483494799,0 -166.266410352278,53.9732868625415,0 -166.370790122255,53.9441198424631,0 -166.375514279585,54.0013433143627,0 -166.45804324334,53.8843995619921,0 -166.601616839153,53.8274713387543,0 -166.639401183119,53.91801033072401,0 -166.592988957257,53.9652332845629,0 -166.752505025875,54.0082995250664,0 -167.16275140807,53.85275148133551,0 -167.031908976724,53.7508013086076,0 -166.708269394922,53.7166312270129,0 -166.827438556642,53.6996858085774,0 -166.803267702595,53.6246880539486,0 -166.902450167445,53.7071921802858,0 -167.031906139022,53.70107786412571,0 -167.06553686635,53.6649653853783,0 -166.99796392085,53.61467889916051,0 -167.161883196575,53.5924583162256,0 -166.964120558706,53.5252292023674,0 -167.184096530186,53.5188386147913,0 -167.162732206163,53.46523104854949,0 -167.304952222225,53.469386166693,0 -167.326071744867,53.40465833799181,0 -167.478546905675,53.4346668217079,0 -167.485228139008,53.3716032751956,0 -167.693324181004,53.3838297493527,0 -167.844705227807,53.3032517050091,0 -167.666947527379,53.2365820132873,0 -167.50075883473,53.2557524931209,0 -167.14356568794,53.4157821216489,0 -166.887459704763,53.4766226296513,0 -166.754708870895,53.4455208405156,0 -166.79105953231,53.5627419533506,0 -166.667708117587,53.48107647241581,0 -166.711318988549,53.5463545080555,0 -166.645219344046,53.5227419042544,0 + + + + + + + + + -166.221353590988,53.7038670268488,0 -166.091950914115,53.83858209335401,0 -166.295237063513,53.7922020429164,0 -166.221353590988,53.7038670268488,0 + + + + + + + + + -167.797253013127,53.4946538567842,0 -168.007523477049,53.5627120027018,0 -168.353939273597,53.4746486015871,0 -168.430644994273,53.3321403605258,0 -168.360903481553,53.2587999987857,0 -168.623432287093,53.2712942239251,0 -168.795959122905,53.1465255981845,0 -168.770404081785,53.0668018455063,0 -168.882379232022,52.9373238815457,0 -169.109577418591,52.8181231444897,0 -168.472312004377,53.0459813460606,0 -168.287531521535,53.23518696940251,0 -167.850843433793,53.37991964170511,0 -167.797253013127,53.4946538567842,0 + + + + + + + + + -174.161329564352,52.4173465495761,0 -174.448532942333,52.3117757493222,0 -174.234619962323,52.2417876137923,0 -174.551313477007,52.17566515917311,0 -174.499368319093,52.1392730972652,0 -174.579630620407,52.0995416658609,0 -174.906888865781,52.1103733142569,0 -175.024350680111,52.0206351056977,0 -175.338269544757,52.0128409429971,0 -174.722148470263,52.00092135872171,0 -174.704053619483,52.0495316507539,0 -174.487641711105,52.0337075891309,0 -174.523535983743,52.0892664372186,0 -174.416045351001,52.03621340759939,0 -174.377077745685,52.0967649619891,0 -174.434361749071,52.1059411985406,0 -174.100971365385,52.1026192836313,0 -174.196532097681,52.2217757888947,0 -174.06545658121,52.22233613257221,0 -173.991825554761,52.32012612452709,0 -174.161329564352,52.4173465495761,0 + + + + + + + + + -176.941084144749,51.58303266917,0 -176.828880061621,51.7127571182365,0 -176.80054534901,51.6027616434207,0 -176.50913716743,51.75194463371049,0 -176.432198194148,51.7288916531697,0 -176.428853207589,51.8350038304907,0 -176.644714643839,51.8558373729491,0 -176.548588214125,51.9086069184368,0 -176.558365467237,51.9822217718073,0 -176.774177292602,51.9438835749084,0 -176.703036371825,51.8513940493333,0 -176.781649967396,51.8233284222627,0 -176.704950850264,51.7819488934334,0 -176.90775033863,51.8049815558199,0 -176.81802202772,51.7685915080144,0 -176.974723222411,51.65635992622221,0 -176.941084144749,51.58303266917,0 + + + + + + + + + -177.910314852892,51.59047529544791,0 -177.799758165034,51.7874482254509,0 -177.621987815149,51.85079803240011,0 -177.836720859072,51.830775770348,0 -177.948676873884,51.9177288521087,0 -178.217598362366,51.8752203024868,0 -177.957791024222,51.7632712434191,0 -178.103365061432,51.66325899768641,0 -177.910314852892,51.59047529544791,0 + + + + + + + + + -171.086945737084,63.43185606043301,0 -170.859425829076,63.4610308912222,0 -170.239896450231,63.2816032134783,0 -169.980209408864,63.1419868776933,0 -169.807940259649,63.1243792330727,0 -169.656273367952,62.9432742913594,0 -169.32793382688,63.1821787502079,0 -168.85259065308,63.1544119515347,0 -168.692896091647,63.3021915417681,0 -169.179314089792,63.2980215630981,0 -170.086003347132,63.484942545381,0 -170.034399159545,63.5357720440057,0 -170.068799574734,63.59466343990179,0 -170.302739504128,63.6932683461877,0 -170.654413587459,63.6768770732034,0 -170.91723822281,63.5704749460102,0 -171.328094629021,63.6329635223434,0 -171.491400520964,63.5957339193976,0 -171.547252137932,63.61379136182811,0 -171.511699513821,63.644074144151,0 -171.405583835479,63.6421242323055,0 -171.637259441321,63.6935021952506,0 -171.681458732656,63.79212811046511,0 -171.739231322516,63.7887922470365,0 -171.743067518046,63.6665666609663,0 -171.853626683584,63.50767023031001,0 -171.733920088359,63.3696018328806,0 -171.451643060199,63.3135104295428,0 -171.086945737084,63.43185606043301,0 + + + + + + + + + -146.098975435796,60.3922217464441,0 -146.582871711614,60.48194370056039,0 -146.72619700343,60.37415032487709,0 -146.488146622944,60.3669390883601,0 -146.679533099071,60.2872162096262,0 -146.604255056572,60.2374977564608,0 -146.098975435796,60.3922217464441,0 + + + + + + + + + -146.939832810504,60.2858229675231,0 -147.100356897737,60.2702597192698,0 -147.01098950104,60.3419328800713,0 -147.195544669344,60.3527127132998,0 -147.194998285425,60.2449363025279,0 -147.698932462331,59.998238098762,0 -147.669518563288,59.9696421838658,0 -147.802841413459,59.9207286473767,0 -147.74309966167,59.8932473711633,0 -147.912320410482,59.7901783714493,0 -147.471865010115,59.8679943519137,0 -147.482391033304,59.9457652379755,0 -147.354015157706,59.974650830779,0 -147.367591626069,60.0260343344061,0 -147.240862729524,60.1285426220118,0 -146.939832810504,60.2858229675231,0 + + + + + + + + + -152.09321930733,58.35956229239359,0 -152.349651908204,58.42067094368999,0 -152.401326751095,58.31511136769269,0 -152.528560208508,58.4128994516293,0 -152.499106717963,58.46206747514319,0 -152.660222888777,58.4765153273738,0 -152.694131998042,58.4217940259965,0 -152.886646268354,58.40679710194,0 -152.765246889149,58.3609633745851,0 -152.762196842929,58.2573461953387,0 -153.01497633051,58.3029033891128,0 -153.108024530252,58.2637421959406,0 -152.906919833977,58.1645579744275,0 -153.183316807584,58.2159594395233,0 -153.233588133808,58.168458272326,0 -152.789154474044,57.9917682947861,0 -152.774714666422,58.0715024038826,0 -152.628558681113,58.0778847599668,0 -152.561621560459,58.2070538088212,0 -152.544962572967,58.08454184222259,0 -152.276595530102,58.1270458940323,0 -152.369647245639,58.1962174010661,0 -152.301313966041,58.18677251900979,0 -152.321883041595,58.24011254350389,0 -152.249365374023,58.2667794628279,0 -152.193822971476,58.1737168446606,0 -152.082424400617,58.1556536633958,0 -151.964615099064,58.2803878924463,0 -151.997120091597,58.34677679987671,0 -152.148252357122,58.23177150573871,0 -152.09321930733,58.35956229239359,0 + + + + + + + + + -133.957575208106,57.2999306224556,0 -133.865044260443,57.3535430899502,0 -133.883659310324,57.4152037032697,0 -133.997003573255,57.4077030325642,0 -133.972832785889,57.4438132059959,0 -134.100063600429,57.463542418998,0 -134.043695992172,57.4749257045984,0 -134.081447329487,57.5010488811349,0 -133.842001299067,57.46020926928861,0 -133.938402776506,57.6207637999747,0 -134.076167554834,57.64493342002491,0 -134.045344599571,57.6832638054914,0 -134.238687661874,57.8585502171943,0 -134.287579179307,57.8268805599159,0 -134.320085300446,57.98799082518951,0 -134.225353387768,57.974655325656,0 -134.321765037636,58.0282670179866,0 -134.263442785345,58.0279929756026,0 -134.311482378999,58.0916001544724,0 -134.157877156027,57.9941038157857,0 -134.233686754406,58.02632246772971,0 -133.961997380694,57.6840954506611,0 -133.792284314077,57.5977071056083,0 -133.877550939366,57.6724301802958,0 -133.89370299145,57.79688143577161,0 -134.179548731905,58.0832706323707,0 -134.170914309207,58.15938399141051,0 -134.687603911476,58.1624308447263,0 -134.805685382384,58.32327545263111,0 -134.958465128962,58.40743493356641,0 -134.947080132696,58.28160068388051,0 -134.881769380662,58.25410422823561,0 -134.914301082702,58.2049317077546,0 -134.790697082353,58.1043764412874,0 -134.730117514791,58.1810463868189,0 -134.805405439918,58.04382140950121,0 -134.662594352631,57.6071637849037,0 -134.575094292963,57.505495352616,0 -134.357859751532,57.5460510439591,0 -134.574269688607,57.489382091108,0 -134.470349504382,57.393274254956,0 -134.306461608469,57.3885481901683,0 -134.342838724527,57.3279942587899,0 -134.55760262103,57.3913290945105,0 -134.45423266739,57.3121574803351,0 -134.583416871363,57.2704935569177,0 -134.513710948128,57.2185443306901,0 -134.635937658008,57.2154927423764,0 -134.580636527385,57.1488262554466,0 -134.614235652727,57.0091002773006,0 -134.361998589183,57.0799386200839,0 -134.083949258277,57.2541004899156,0 -134.176451166759,57.3840975295037,0 -133.957575208106,57.2999306224556,0 + + + + + + + + + -134.517615393878,58.3377167502683,0 -134.684859712071,58.3027160402146,0 -134.609812412179,58.237437904568,0 -134.261496532951,58.194662482636,0 -134.517615393878,58.3377167502683,0 + + + + + + + + + -135.887790019534,57.9876824539146,0 -135.889331207095,57.9882430923176,0 -135.236212858121,57.7796493127647,0 -135.012335588828,57.77660026735799,0 -134.932075089584,57.8066000013056,0 -135.206500034818,57.9418740205317,0 -134.919014995813,57.8393759635417,0 -134.971782736525,57.884930765569,0 -134.907636351669,57.9288225682191,0 -134.943165148215,58.0354884497242,0 -135.4009750495,58.13909549198129,0 -135.649597129609,57.94464407268,0 -135.794325162033,57.98158060065,0 -135.624033073476,58.0093735808823,0 -135.782393411932,58.04575466122969,0 -135.605691580464,58.0435393225676,0 -135.484289639407,58.1552080978682,0 -135.796830557982,58.27714750536251,0 -135.967636201305,58.1596378528532,0 -136.110984291937,58.2188002395108,0 -136.182119004846,58.1774107225691,0 -136.10347341886,58.0568425538623,0 -136.195972322399,58.0804538025948,0 -136.277403970115,58.21851559324281,0 -136.356820128045,58.2123990302342,0 -136.272389453395,58.1043396175859,0 -136.434066033051,58.1073845387818,0 -136.03307863316,57.8429310463068,0 -136.03268191772,57.84267169883249,0 -136.033109150469,57.8428890842789,0 -136.033200700432,57.84292722053191,0 -136.328220829736,57.99072088064611,0 -136.409571703536,57.8334729109361,0 -136.416300816942,57.8204538078362,0 -136.229612994502,57.78378952641571,0 -136.090418506153,57.6823979921437,0 -136.12041269733,57.6168392873428,0 -135.953475811742,57.61602290495031,0 -136.067643439514,57.5954556677553,0 -135.781246849774,57.435464274054,0 -136.012363357593,57.51157079074861,0 -135.841787219458,57.387967670077,0 -135.689838145018,57.36241620095001,0 -135.548754104396,57.45908431950561,0 -135.557639337521,57.53853639185691,0 -135.658474437208,57.55103174644039,0 -135.57235134096,57.58824961560939,0 -135.805428946777,57.6393615053637,0 -135.704866827443,57.67381154319519,0 -135.805980468833,57.76297352330549,0 -134.990080642635,57.4502057541453,0 -134.813441652987,57.4810400866218,0 -134.917057769523,57.7529884536511,0 -135.358714614183,57.7201980945745,0 -135.317878474532,57.7546539201374,0 -135.361765050058,57.7968742744678,0 -135.887790019534,57.9876824539146,0 + + + + + + + + + -153.392819106123,57.1578150625529,0 -153.391170767535,57.20643145913531,0 -152.958362818028,57.2530915629434,0 -153.175313931231,57.2994862801629,0 -153.164205488345,57.3478215097467,0 -152.882211445405,57.34642605123581,0 -152.840561469611,57.2680901886602,0 -152.636131502789,57.31697797220669,0 -152.605271069444,57.3791982816532,0 -152.806662878321,57.4678164159662,0 -153.045573136149,57.43060417565031,0 -152.912502640705,57.4831028238115,0 -152.958891001931,57.5200573093257,0 -152.347467689563,57.4233725014462,0 -152.153561812383,57.60366359353611,0 -152.437464170093,57.60394449275871,0 -152.400805617759,57.68506087717071,0 -152.490505713086,57.6478409937506,0 -152.448292455169,57.72173096290851,0 -152.553037029926,57.69784114934561,0 -152.328554767562,57.8134062911078,0 -152.621331654067,57.927871962996,0 -152.622462543378,57.8556448591787,0 -152.853869887682,57.8348096724795,0 -152.878595074408,57.7261858090174,0 -152.913904236528,57.8287000634449,0 -152.81916240733,57.9162077894716,0 -153.278079373008,58.0045596220204,0 -153.050572070951,57.8306516807021,0 -153.241955697199,57.8956661240209,0 -153.178085376612,57.70342007427299,0 -153.21528625835,57.7875988573807,0 -153.474187509253,57.84176827497921,0 -153.317541094234,57.7250855112453,0 -153.500326749315,57.7670427602638,0 -153.437007068276,57.69926213577829,0 -153.528411518411,57.7156570294804,0 -153.507884215038,57.62536334597479,0 -153.643955782997,57.8892778626483,0 -153.930628240722,57.81039103529171,0 -153.908972766982,57.70705144195041,0 -153.583414253509,57.6117656896339,0 -153.882578113507,57.6423280764322,0 -153.683969758275,57.5439876013445,0 -153.853680824701,57.5667719048222,0 -153.810354333225,57.3998115924684,0 -153.630341204806,57.2686845023703,0 -153.888450770344,57.4042583245669,0 -153.950638769381,57.5412125247074,0 -154.110069105169,57.5378795347469,0 -153.978684337287,57.5634302022874,0 -153.998396328922,57.6345471718585,0 -154.218708248182,57.6676118739352,0 -154.350634759544,57.6445602786002,0 -154.448969719914,57.5790065670673,0 -154.400933151543,57.5637231142094,0 -154.519284391994,57.57789414293061,0 -154.514835023176,57.514284345739,0 -154.550658594089,57.5437295848112,0 -154.730113883423,57.4215049203949,0 -154.707047934222,57.3348240788941,0 -154.809272715575,57.33899206357219,0 -154.755970360023,57.3000986106446,0 -154.803445837976,57.2853800893029,0 -154.609528562857,57.2598123939076,0 -154.529534664763,57.1470105342916,0 -154.532311757881,56.9897688397956,0 -154.32950219126,56.9264276977374,0 -154.30008016783,56.84808676436531,0 -154.238681036045,56.8817013332706,0 -154.294251443901,56.8619803181055,0 -154.297029874472,56.9069791491293,0 -154.163438203307,56.95613855306939,0 -154.103417429726,57.11559563450091,0 -154.268951525716,57.11616265938829,0 -154.386759559577,57.04476898169479,0 -154.465931144176,57.0644946605757,0 -154.468707260557,57.1261689271771,0 -153.967058894421,57.1158684043447,0 -154.111749493078,57.0433557293103,0 -154.098691977589,56.96251930086,0 -153.806771410885,57.1506098413568,0 -153.740073526689,57.1300487421621,0 -153.965662315076,56.9880731527465,0 -153.775662001517,56.9894807020229,0 -154.151738603834,56.745306297826,0 -153.982008831554,56.7378049963996,0 -153.696434400411,56.8658703808307,0 -153.776740001015,56.8894815558602,0 -153.683134178599,56.96836624630329,0 -153.611709562203,56.93336978070661,0 -153.555612176043,56.9775359323464,0 -153.673398711418,57.0089331435034,0 -153.600323689505,57.0472645321852,0 -153.758996313479,57.0453212757416,0 -153.502258936786,57.06309389275109,0 -153.547005002935,57.1706020458441,0 -153.463926171818,57.1105958833284,0 -153.392819106123,57.1578150625529,0 + + + + + + + + + -134.655390098823,56.16266193516189,0 -134.618144450901,56.72075296783309,0 -134.836198024378,57.2477098984344,0 -134.985066734427,57.2943739834285,0 -134.94786612865,57.3204912317811,0 -135.00090756226,57.3424242205839,0 -134.9076129914,57.3293810392095,0 -135.003993227617,57.39937824634809,0 -135.202063988419,57.4243667978265,0 -135.167614227587,57.4782546176544,0 -135.399577332086,57.43853182026469,0 -135.282362988664,57.50353572125369,0 -135.314560394456,57.5324206439867,0 -135.515980155977,57.50686692896049,0 -135.526763730078,57.4355063346253,0 -135.608993614038,57.3915869239882,0 -135.471227782637,57.35048074915841,0 -135.674301743083,57.3460283249175,0 -135.533996348433,57.2293590299236,0 -135.339528178816,57.24797514037449,0 -135.407892185235,57.149359849847,0 -135.265949930375,57.1635212027263,0 -135.368705279018,57.13768568696531,0 -135.366754331069,57.0799148721586,0 -135.166222094001,57.03435932771279,0 -135.353146706062,56.9657378769552,0 -135.290095163457,56.8915651144635,0 -135.37063531312,56.8326799981141,0 -135.267052599399,56.7829503719904,0 -135.121759003476,56.8271083988409,0 -135.190087704398,56.6746065599045,0 -134.993985703814,56.7559900047218,0 -135.124259832988,56.6643189364556,0 -135.117028453893,56.5982112952072,0 -134.982325180215,56.7165374337488,0 -134.938986731009,56.70959462499059,0 -134.967306048374,56.6243134079946,0 -134.849536248518,56.6851559009392,0 -135.04843148949,56.5279410141079,0 -134.655390098823,56.16266193516189,0 + + + + + + + + + -135.702071692228,57.31658350148879,0 -135.848737784871,57.3162950258433,0 -135.819830984012,57.1724005616461,0 -135.710673710214,57.16101811328251,0 -135.825941290601,57.08296744204201,0 -135.839567402382,56.98768513709851,0 -135.630940067482,57.0040823307003,0 -135.547885999691,57.1290749917056,0 -135.626468170496,57.2313048151095,0 -135.557617899884,57.2288021287352,0 -135.702071692228,57.31658350148879,0 + + + + + + + + + -133.053390351289,56.97714702524889,0 -133.295335943079,57.0035431619298,0 -133.263967207313,56.921597824843,0 -133.327012360802,56.99660004634231,0 -133.874777973322,57.0857684838486,0 -134.019794733821,57.0143800263991,0 -133.737848765029,56.8927133973155,0 -133.892286836687,56.89660507320559,0 -133.758142051845,56.8032670452989,0 -133.674524574542,56.8588218466323,0 -133.708694348619,56.6774253399436,0 -133.636774891098,56.5935236773375,0 -133.691770840668,56.5688039494711,0 -133.64678569721,56.5632491498276,0 -133.649284380709,56.44324265313329,0 -133.577317500634,56.4332418446354,0 -133.420628593758,56.4543573216183,0 -133.430916371492,56.5015848315803,0 -133.165638033928,56.4532574359425,0 -133.083664796878,56.5235347698413,0 -133.16869155086,56.6018765654634,0 -133.099228250559,56.6154861711796,0 -133.240900578007,56.6313190633306,0 -133.213402182837,56.7085454496965,0 -133.307307907679,56.7310369094801,0 -133.353662566436,56.8382616228604,0 -133.023660190709,56.60158768688681,0 -132.933113453353,56.62963672016491,0 -132.991442138356,56.8068656402117,0 -132.929514313144,56.85993278567031,0 -133.053390351289,56.97714702524889,0 + + + + + + + + + -133.965053500888,56.0812846387448,0 -133.949532594346,56.1993380950511,0 -133.889538107293,56.2229461297938,0 -133.985913933344,56.2685074429714,0 -133.975081289917,56.3557286565983,0 -133.855639708513,56.2787890098363,0 -133.911217854205,56.4249043104871,0 -133.827331752229,56.4354582647604,0 -133.919269867011,56.5007461483316,0 -133.84536471409,56.5715815218498,0 -133.922319509601,56.61380613150769,0 -133.740357493661,56.5601902175525,0 -133.693143667676,56.5993612801202,0 -133.777599003147,56.68408751817189,0 -133.71950858496,56.76632429300031,0 -133.870588709108,56.80798733009279,0 -133.863944657176,56.7232586211923,0 -134.026461131389,56.6468690221748,0 -133.924249122697,56.7146518323975,0 -133.927565910471,56.8015933528073,0 -133.995314810369,56.8740975598163,0 -134.265369544411,56.9365981258875,0 -134.108653970181,56.8427125267546,0 -134.323113030551,56.89354402635881,0 -134.275073004361,56.7952062642112,0 -134.401488715667,56.8524345106823,0 -134.39507837938,56.721027401109,0 -134.319237656557,56.6571429239125,0 -134.21922545052,56.68936574637091,0 -134.25313312881,56.61241667872861,0 -134.087853561236,56.6415889087553,0 -134.308129021304,56.55991421694611,0 -134.136176047703,56.4865748914152,0 -134.070057576607,56.5549111134315,0 -134.030355630414,56.4779613707181,0 -134.051178620872,56.3590608770302,0 -134.109756002829,56.404893993373,0 -134.162003776525,56.3668357027912,0 -134.181166136765,56.4362848660458,0 -134.282583452658,56.35572867521411,0 -134.282858184556,56.29100338056829,0 -134.161737695775,56.3071164027922,0 -134.266469746057,56.2557221446709,0 -134.19396891759,56.1554373413353,0 -134.222558799251,56.0662779394883,0 -134.10838665314,55.99877467092719,0 -134.098392346662,56.13405286884341,0 -134.187285962481,56.1762738974224,0 -134.100896606441,56.1743295187135,0 -134.054234375292,56.3121155888509,0 -134.037872866435,56.1051697427204,0 -133.965053500888,56.0812846387448,0 + + + + + + + + + -132.803653271279,56.7860406631428,0 -132.965623026439,56.7960384089399,0 -132.883371065593,56.63658603825431,0 -132.958107536577,56.5938039676218,0 -132.941722525003,56.5093749050577,0 -132.77478501171,56.4943701849766,0 -132.720307664077,56.51104060003691,0 -132.751711841031,56.5524291958232,0 -132.532549684115,56.5774334872854,0 -132.803653271279,56.7860406631428,0 + + + + + + + + + -132.337804742749,56.4796479168462,0 -132.351410271693,56.2779733052681,0 -132.303891788458,56.23185224300391,0 -132.057810279652,56.1110312765749,0 -131.923350207348,56.1968613620864,0 -132.005320495176,56.3363150729862,0 -132.162510728277,56.35271056708941,0 -132.337804742749,56.4796479168462,0 + + + + + + + + + -132.704770567567,56.4557558769931,0 -132.94199544313,56.4474232469974,0 -133.058116273752,56.34186597005931,0 -132.846704640205,56.2313025143395,0 -132.678911140644,56.265194266468,0 -132.615862536329,56.3960369708995,0 -132.704770567567,56.4557558769931,0 + + + + + + + + + -132.473629816734,55.4956310263753,0 -132.679719350735,55.45241862597041,0 -132.511407662042,55.54434856852371,0 -132.564164976718,55.56740551658349,0 -132.54167897639,55.62267443054111,0 -132.170838611909,55.4462957108967,0 -132.145846340898,55.48018516651531,0 -132.292514962732,55.5362972126054,0 -132.381658844606,55.6690745363953,0 -132.43750143704,55.62295141204839,0 -132.494455201912,55.8137888383967,0 -132.727249633493,55.9896261855393,0 -133.07977593669,56.0521307665152,0 -133.139777228451,56.1165798525176,0 -133.02560945371,56.17630236381051,0 -133.062263586948,56.2415816619357,0 -133.19004887376,56.3299235454034,0 -133.315357554346,56.268800793561,0 -133.325614659178,56.3260292056157,0 -133.61228727968,56.347965527419,0 -133.567024527926,56.2965818491482,0 -133.634501861361,56.2762929803267,0 -133.618961621055,56.2071307850696,0 -133.260081564169,56.1521335393027,0 -133.243074688433,55.9040773845479,0 -133.138127044496,55.8860245400076,0 -133.23754189305,55.7465804895886,0 -133.37615160236,55.7226835545753,0 -133.354775293627,55.6096422847126,0 -133.255343820772,55.5732672002313,0 -132.910012881953,55.62767934202989,0 -133.070291462572,55.57381871290261,0 -133.129162418082,55.48909814092829,0 -132.978863011846,55.4471413353351,0 -133.066673173097,55.42687676268089,0 -132.996925024154,55.37548237298839,0 -132.849146903782,55.3513096666384,0 -133.195557926044,55.3843846854707,0 -133.262237187007,55.338542897477,0 -133.224168561559,55.28270625695009,0 -132.902215409303,55.27936613145881,0 -133.00445539989,55.2027070068706,0 -132.805813469614,55.2676990584202,0 -132.780003734642,55.18214560133369,0 -132.668314485378,55.1376954523282,0 -132.6108193845,55.16770051950649,0 -132.643042098791,55.2499234651439,0 -132.561385789951,55.1651892675163,0 -132.616375834907,55.06102783419279,0 -132.558333985001,55.121579846662,0 -132.460284625051,55.0432598989252,0 -132.574447864736,55.03686586037011,0 -132.533892510768,55.0157557734575,0 -132.599167402473,54.9682495266191,0 -132.532244803687,54.9324231053301,0 -132.454455006163,54.9849207048602,0 -132.468890169137,54.9021439129136,0 -132.380539086856,55.0160426535456,0 -132.38972563036,54.9238205404531,0 -132.267215000166,54.8390908310718,0 -132.354993457072,54.7990961593044,0 -132.216372992666,54.7935437432705,0 -132.290567059779,54.7143740502258,0 -132.005588168986,54.6902065830742,0 -132.00808092862,54.77937406180979,0 -131.951107308284,54.7879884436014,0 -132.053591791598,54.88964696896679,0 -131.973584427767,54.8946508448921,0 -132.012494945198,54.9677027506031,0 -131.964713272955,55.0254793599214,0 -132.220242594699,54.9921503362437,0 -132.074439530657,55.0388147632961,0 -132.09666166884,55.1032539199795,0 -131.998898502072,55.1004760308858,0 -131.970272255287,55.2260267816124,0 -132.012233665231,55.27241195988161,0 -132.089163684845,55.2007477996744,0 -132.240833958891,55.1926907080504,0 -132.24111473813,55.254356826834,0 -132.086939465791,55.262141472882,0 -132.155026728468,55.36296879775981,0 -132.254761054598,55.4099105863851,0 -132.470277519184,55.38435982041161,0 -132.261689745631,55.44212929019011,0 -132.473629816734,55.4956310263753,0 + + + + + + + + + -132.391971869653,56.335755916154,0 -132.517527648792,56.33824914076529,0 -132.605023777277,56.2310204946758,0 -132.696154225093,56.22185739992919,0 -132.697527893107,56.1074122964528,0 -132.636704224386,56.0488018182385,0 -132.381659614072,56.0260228574646,0 -132.427256528788,55.9557383376468,0 -132.340003253304,55.91351910572829,0 -132.181674158052,55.9657578776832,0 -132.129461406089,55.9279855386802,0 -132.20165657928,56.0851990051386,0 -132.108892738952,56.1154780279142,0 -132.351103317239,56.2163019256758,0 -132.480018741747,56.1896282759591,0 -132.396698920251,56.2215729603744,0 -132.391971869653,56.335755916154,0 + + + + + + + + + -133.287273107465,56.1285193821479,0 -133.619502154891,56.1304525817666,0 -133.48671406159,56.0857359491733,0 -133.681447788994,56.0660107829683,0 -133.791729083627,55.9207261405941,0 -133.620043513236,55.919061854864,0 -133.478932635933,56.0223882122985,0 -133.319218200846,55.9935160016486,0 -133.287273107465,56.1285193821479,0 + + + + + + + + + -131.606390952927,55.3196460287417,0 -131.523626715678,55.2927065288402,0 -131.468332286741,55.3554813742488,0 -131.52170762436,55.4760277540251,0 -131.445019503467,55.528250482074,0 -131.463631605047,55.3277029912542,0 -131.334456177303,55.4196456731968,0 -131.350571344767,55.64464241181071,0 -131.271713839534,55.4371488045966,0 -131.460852754343,55.2810343109492,0 -131.294748784321,55.2735377996958,0 -131.2275245322,55.40575586235,0 -131.217511188806,55.3052092167966,0 -131.30835800415,55.23465101592841,0 -131.144480086509,55.1966008747307,0 -131.049755471481,55.2671577795751,0 -131.028368522801,55.40548407558649,0 -130.968096037624,55.39104255594939,0 -130.936975175112,55.6418758266987,0 -131.233359128882,55.9535154492386,0 -131.573925118381,55.9060133913691,0 -131.436689960392,55.8399076996699,0 -131.685586778521,55.8329621887154,0 -131.482526533927,55.7868537297797,0 -131.711127678552,55.731844891488,0 -131.514751885925,55.72601811835991,0 -131.693639807928,55.67629611216431,0 -131.705845849057,55.61935110632449,0 -131.616399342546,55.5971281281129,0 -131.645025074528,55.544914787606,0 -131.825290358462,55.4549105391298,0 -131.606390952927,55.3196460287417,0 + + + + + + + + + -131.821140484584,55.4124099903551,0 -131.866945741921,55.3679685469814,0 -131.824461228231,55.2113141461293,0 -131.726683471567,55.1343743438445,0 -131.761688966383,55.247423370327,0 -131.61832179154,55.28326142836379,0 -131.821140484584,55.4124099903551,0 + + + + + + + + + -131.468907428577,55.2354796515061,0 -131.585300708148,55.2515918113963,0 -131.518646304163,55.1282585208495,0 -131.594176648462,55.1063159605734,0 -131.59972753219,54.9949305405507,0 -131.521695860182,55.0327112599271,0 -131.537505218119,55.0907610434156,0 -131.476956765629,55.0004939338339,0 -131.356659978778,55.0352158428158,0 -131.375005668955,55.1965953318301,0 -131.468907428577,55.2354796515061,0 + + + + + + + + + -133.103853177495,55.24520299191451,0 -133.215824492689,55.1696372711329,0 -133.118282231733,55.1015854493073,0 -133.215270801953,55.09463634472111,0 -133.150270403124,54.94379737397,0 -132.90693534583,54.83630882934499,0 -132.955276675812,54.7918753410748,0 -132.841932044642,54.6890880966602,0 -132.670272461523,54.6638099069197,0 -132.758897152011,54.7393706689813,0 -132.716661409724,54.7646540373054,0 -132.756667768137,54.8218741407807,0 -133.081358213392,55.0854740462953,0 -132.957493060247,55.061865465254,0 -133.103853177495,55.24520299191451,0 + + + + + + + + + Arizona + empty + + +states.AREA: + 113712.679 + + +states.STATE_NAME: +Arizona + + +states.STATE_FIPS: +04 + + +states.SUB_REGION: +Mtn + + +states.STATE_ABBR: +AZ + + +states.POP2000: + 5130632 + + +states.POP2001: + 5312024 + + +states.POP00_SQMI: + 45 + + +states.DEN_0_100: + 96 + + +USStates.ID: + 48 + + +USStates.State_Name: +Arizona + + +USStates.Date_Entered: +Feb. 14 1912 + + +USStates.Year_Entered: +1912 + + +USStates.Year_Settled: +1776 + +]]> + #Style_5 + + + -111.664591949232,34.2916834221835,0 + + + + + + -114.520627661734,33.0277074359678,0 -114.46838719789,32.9777894659032,0 -114.476443984447,32.9359088466692,0 -114.461436322021,32.8454225112401,0 -114.52621949202,32.8099123509472,0 -114.535077445153,32.7880470474354,0 -114.530095237266,32.7714115230303,0 -114.543187695964,32.7712322843312,0 -114.543004547133,32.7607497409074,0 -114.561582708233,32.7607536245719,0 -114.560751027253,32.7489359768297,0 -114.572210733513,32.7488292120028,0 -114.571958909536,32.7374388920444,0 -114.603522692176,32.7358864782619,0 -114.603942285241,32.7262851953269,0 -114.694040667724,32.7414255804573,0 -114.712695098447,32.7350133484495,0 -114.722048985451,32.7208574919907,0 -114.809393825306,32.6160446571158,0 -114.821761241294,32.4871692613767,0 -113.329111283827,32.0436210627154,0 -111.369520893713,31.4315316679729,0 -111.071964747137,31.335634013396,0 -110.45257840211,31.3376602308857,0 -109.045615049533,31.3434530504803,0 -109.049495308693,32.4420444958635,0 -109.051346155985,32.7795505537932,0 -109.050525833602,33.205164822801,0 -109.050349253456,33.7833019238717,0 -109.048652751175,34.5917805775226,0 -109.046640810431,34.9546462439613,0 -109.047846506598,35.9966639816639,0 -109.048480115363,36.9966409005893,0 -109.997076712711,36.9920675592929,0 -110.452235819472,36.9917463039985,0 -110.484088956249,37.0039260237973,0 -110.740062961138,37.002488042411,0 -111.356163994142,37.0017097524257,0 -112.2372578615,36.9954921751891,0 -112.542521578828,36.9979944864436,0 -112.899983474169,36.9962268765574,0 -114.043939384154,36.9965379371421,0 -114.043716435713,36.8418489458646,0 -114.037392074194,36.2160228969701,0 -114.045105557286,36.1939778840226,0 -114.107775185788,36.1210907070504,0 -114.12902308363,36.041730493896,0 -114.206768869568,36.0172554164833,0 -114.233472615347,36.0183310595898,0 -114.307587598189,36.0622330993642,0 -114.303857056018,36.0871084040611,0 -114.316095374696,36.1114380366653,0 -114.344233941709,36.1374802520567,0 -114.380803116644,36.1509912717764,0 -114.443945697733,36.1210532841896,0 -114.466613475422,36.1247112590538,0 -114.530573568745,36.1550902046726,0 -114.598935242024,36.1383354528833,0 -114.621610747198,36.1419666834504,0 -114.712761724737,36.1051810523675,0 -114.728150311069,36.0859627711603,0 -114.728966012834,36.0587530361082,0 -114.717673567756,36.0367580437019,0 -114.736212493583,35.9876483502758,0 -114.699275906446,35.9116119537411,0 -114.661600122152,35.8804735854241,0 -114.662462095522,35.870959907009,0 -114.689867343369,35.8474424944765,0 -114.682739704595,35.7647034175617,0 -114.688820027649,35.7325957399896,0 -114.665091345861,35.6930994107106,0 -114.668486064922,35.6563989882403,0 -114.654065925137,35.6465840800051,0 -114.6398667219,35.6113485698329,0 -114.653134321223,35.5848331056106,0 -114.649792053474,35.5466373866596,0 -114.672215155693,35.5157541647721,0 -114.645396168451,35.4507608261464,0 -114.589584275424,35.3583787306827,0 -114.587889840369,35.30476812919,0 -114.559583045727,35.2201828714608,0 -114.561039964055,35.1743461616312,0 -114.572255261053,35.1400677445931,0 -114.582616239058,35.1325604694084,0 -114.626440825485,35.1339067529871,0 -114.6359090842,35.1186557767895,0 -114.595631971944,35.0760579746697,0 -114.633779872695,35.0418633504303,0 -114.621068606189,34.9989144286133,0 -114.632276529502,34.9976517256292,0 -114.621007388662,34.9436098418844,0 -114.630475658748,34.9195012881626,0 -114.627263440015,34.8755338147028,0 -114.570216833129,34.8318604389449,0 -114.542040692552,34.7599586200401,0 -114.525553173554,34.7489115709666,0 -114.497804378448,34.744757644472,0 -114.465637688895,34.7098730189755,0 -114.422270356442,34.6108950917792,0 -114.434302240724,34.5989628909914,0 -114.409742349408,34.5837235617841,0 -114.376827822772,34.5365634767276,0 -114.38386203177,34.4770856153635,0 -114.376506947621,34.4596793685379,0 -114.332636412337,34.4548730796034,0 -114.302865366738,34.4357541377741,0 -114.283394304634,34.4120690064366,0 -114.257842521563,34.4054888215522,0 -114.182079822361,34.3652063649643,0 -114.153414997679,34.3364477645527,0 -114.134127057818,34.3145478754142,0 -114.125230507624,34.2726209662778,0 -114.149912368725,34.2669789901846,0 -114.235775821971,34.1862227475521,0 -114.285368523229,34.1712309584447,0 -114.322799430739,34.1412972664816,0 -114.410166357368,34.1026543641334,0 -114.424029195647,34.0783320579769,0 -114.428980324296,34.0298439872115,0 -114.518208552815,33.9650630904256,0 -114.525632127364,33.9524137553973,0 -114.49818809185,33.925036256846,0 -114.520962184241,33.8629263802443,0 -114.511722548733,33.84196501578,0 -114.521122162519,33.8260312846707,0 -114.504557871757,33.7717148133963,0 -114.510287510185,33.7432004976418,0 -114.49567644704,33.708369427689,0 -114.53643355935,33.6827352282095,0 -114.525263594507,33.6655047006994,0 -114.527170510583,33.6221365140121,0 -114.54024720611,33.5805077718081,0 -114.52942054662,33.5600729749772,0 -114.58706170624,33.5094455578288,0 -114.598086338819,33.4861269505736,0 -114.621089578986,33.4685989080523,0 -114.630573116436,33.4394249456214,0 -114.645092242143,33.4191160810556,0 -114.724936284952,33.4110596377436,0 -114.703603782165,33.3524180309387,0 -114.735426988668,33.3057084351637,0 -114.677693392037,33.2680165177413,0 -114.687711074888,33.2392582971895,0 -114.680050859029,33.2245949425206,0 -114.678120399612,33.1672499413879,0 -114.709463019649,33.122374935038,0 -114.711355133911,33.0953827798915,0 -114.663951695926,33.0389226888334,0 -114.645159759737,33.0444118730784,0 -114.633966945552,33.0335669165654,0 -114.609925720105,33.0270019226895,0 -114.559089057602,33.036782479158,0 -114.520627661734,33.0277074359678,0 + + + + + + + + Arkansas + empty + + +states.AREA: + 52913.232 + + +states.STATE_NAME: +Arkansas + + +states.STATE_FIPS: +05 + + +states.SUB_REGION: +W S Cen + + +states.STATE_ABBR: +AR + + +states.POP2000: + 2673400 + + +states.POP2001: + 2706444 + + +states.POP00_SQMI: + 51 + + +states.DEN_0_100: + 96 + + +USStates.ID: + 25 + + +USStates.State_Name: +Arkansas + + +USStates.Date_Entered: +June 15 1836 + + +USStates.Year_Entered: +1836 + + +USStates.Year_Settled: +1686 + +]]> + #Style_5 + + + -92.43380149123649,34.8979530772317,0 + + + + + + -94.4616914490383,34.1967651932869,0 -94.46858488730931,33.9393114556774,0 -94.4766912623089,33.6320818342933,0 -94.43611697644781,33.6365609097961,0 -94.43653636903311,33.6169611431123,0 -94.45175731380159,33.6044640316868,0 -94.4435324861232,33.5966212153736,0 -94.4286699913841,33.5972585244972,0 -94.4067726989127,33.573604181729,0 -94.39361925175989,33.5750768821217,0 -94.3793139265706,33.5934447272787,0 -94.3708297502542,33.5901604561683,0 -94.3725080674424,33.572780843886,0 -94.39546544841208,33.5604209193152,0 -94.37095896843239,33.5478024921997,0 -94.3289505742182,33.5732546607845,0 -94.3025824334982,33.5570543333588,0 -94.29901964868971,33.5799728047754,0 -94.2791827367037,33.5894525566594,0 -94.2722778801038,33.5847263352945,0 -94.2747420062796,33.5618574981634,0 -94.23743339566499,33.5925430254688,0 -94.22323450525521,33.5858408096426,0 -94.2355638087854,33.5616558979989,0 -94.21108015408862,33.5581084763103,0 -94.2055412868951,33.5852000838157,0 -94.15970992753351,33.5938939861439,0 -94.15536074810458,33.5672068241928,0 -94.0988935992895,33.5731199456262,0 -94.0868464522719,33.5840756635432,0 -94.06162268858441,33.5773354007315,0 -94.03611649002102,33.5560347014808,0 -94.0366915600887,33.2704528989066,0 -94.03893174127671,33.0234224077489,0 -93.80993110790152,33.0227288720053,0 -93.51191556362819,33.0212876651865,0 -93.47907035507552,33.0215281738969,0 -93.23254316119119,33.0193748877236,0 -92.9789895151482,33.018274750609,0 -92.7172364845049,33.0168395771589,0 -92.0634416757442,33.0101515495777,0 -91.45447032530612,33.0139992001305,0 -91.42764466910239,33.0135450807442,0 -91.25472755144671,33.0136011241739,0 -91.1622413295772,33.0131626211682,0 -91.16078409477549,33.0218332391698,0 -91.1567938514993,33.040555368368,0 -91.1240933135817,33.0473950555076,0 -91.1178981011678,33.0656937749518,0 -91.1468983565878,33.0907747749873,0 -91.19064668515279,33.1133457020205,0 -91.19561365046539,33.1405858277008,0 -91.1777374599034,33.1504085143774,0 -91.12143839042092,33.1311906845818,0 -91.09596309376539,33.1452056628518,0 -91.08642608991831,33.1617229779066,0 -91.09211028743471,33.2258161142148,0 -91.05464881790898,33.2459002185311,0 -91.0405340548071,33.2820400168761,0 -91.0539393519749,33.2936936328911,0 -91.07643152692042,33.2924766671242,0 -91.10301308177489,33.249329353099,0 -91.1226136683412,33.2686236274109,0 -91.1418557768241,33.3225012621225,0 -91.13053349445238,33.3595184071126,0 -91.107049532132,33.3935220665091,0 -91.0787969781513,33.4102951070005,0 -91.0616226774054,33.4319126666717,0 -91.0610886583117,33.4601256250454,0 -91.07386834518309,33.4663205040007,0 -91.08590793517429,33.4629711994008,0 -91.09923682479071,33.4150136902789,0 -91.13774359783101,33.3889939554845,0 -91.1850932093454,33.3919462343914,0 -91.2042742333541,33.414414252442,0 -91.19894113644132,33.4222266229444,0 -91.13062529226629,33.4432379167019,0 -91.11982172873771,33.4529461878788,0 -91.11906643910299,33.4697877493532,0 -91.12890876375178,33.4933048406628,0 -91.16508870848941,33.511893278083,0 -91.17429002799679,33.5044814214406,0 -91.1718407642763,33.4667586515282,0 -91.1818813238998,33.4475023901927,0 -91.23296184460889,33.4435578002255,0 -91.2272625589118,33.4595677906787,0 -91.20775358321031,33.4735103338542,0 -91.18051588058511,33.5121258753279,0 -91.1829574461633,33.5234628974492,0 -91.20421377208162,33.5386182116453,0 -91.21359825583821,33.539388695493,0 -91.2277437480702,33.5564627810534,0 -91.2268436629257,33.5905920919159,0 -91.18791706051998,33.5747923198036,0 -91.16813338054911,33.5773559141775,0 -91.15076092012042,33.6162728236941,0 -91.1545148512779,33.6371425699443,0 -91.20542010320271,33.670054473021,0 -91.21525485495199,33.690832533146,0 -91.2117911105934,33.7090740491267,0 -91.16341157255451,33.7184243604201,0 -91.1211582957132,33.6776390014341,0 -91.08387971624239,33.6626975706472,0 -91.03794174479148,33.6833276928149,0 -91.0389337685444,33.7056013490966,0 -91.0563218415079,33.7194673047115,0 -91.1046784705554,33.7083431494327,0 -91.129055226842,33.7125503367781,0 -91.1381116937944,33.7233341453239,0 -91.1430026284613,33.7719285490089,0 -91.1370973386382,33.7801949325541,0 -91.10552584181519,33.7765486562049,0 -91.06650027762299,33.7866351498749,0 -91.04351203531321,33.7696642449716,0 -91.01854016459431,33.7640838422967,0 -90.99548340691879,33.7716600260669,0 -90.9841458001964,33.7854500107548,0 -90.99047854078901,33.7990071442826,0 -91.0289626430975,33.8166950131436,0 -91.0549265134198,33.8436334807269,0 -91.06148054411389,33.8671886882777,0 -91.01857194440652,33.9364134475297,0 -91.075817398803,33.9747494464877,0 -91.08896340340431,33.9945738225001,0 -91.0698054890087,34.0062011888095,0 -91.03116883753491,33.9858050201095,0 -91.0096532951119,33.9906347187545,0 -91.0003678622968,33.9684795241317,0 -90.9869243510316,33.9609229307681,0 -90.96489758467079,33.9675683195034,0 -90.9612354430936,33.9789817484763,0 -90.9753809466784,33.9947130844006,0 -90.9734737113361,34.0111046201452,0 -90.95057738634012,34.0313950359426,0 -90.88645032093149,34.040818090639,0 -90.86643858092512,34.1010591014266,0 -90.90641792332421,34.1028552934255,0 -90.9423538254879,34.1260478667544,0 -90.9534553235284,34.1559087583442,0 -90.92902561447708,34.1857547898992,0 -90.84671660873281,34.1476512964452,0 -90.82897009057919,34.1487653755381,0 -90.80761499232,34.1662785963789,0 -90.8230272013098,34.1906501116551,0 -90.9215946009177,34.2049348828191,0 -90.93381765059741,34.2347805101336,0 -90.9285457793972,34.2502985218322,0 -90.86351805053698,34.2192670758548,0 -90.8314661258313,34.2296393889001,0 -90.82394433723711,34.277444457808,0 -90.80652652929172,34.2994512329978,0 -90.7926330280344,34.3000616903072,0 -90.75836020093259,34.2790815153021,0 -90.74786301501229,34.3178229839966,0 -90.7619638892818,34.364018026031,0 -90.75541794936311,34.3722691135712,0 -90.6875906711157,34.3779766258423,0 -90.6812424323426,34.3635040042302,0 -90.68948128142971,34.3202498232312,0 -90.6794406527353,34.3180794258637,0 -90.65791781402791,34.3301110369,0 -90.6573464859749,34.3660143325751,0 -90.60389412048508,34.4047029797656,0 -90.57922804447659,34.4331032095237,0 -90.57450570771368,34.4540494001334,0 -90.59015506208731,34.4966090201687,0 -90.5804501933474,34.5203246797393,0 -90.5657859528414,34.5326117672652,0 -90.53725095298539,34.5434303779675,0 -90.5307199720464,34.5557516818131,0 -90.5777188709607,34.6048453840045,0 -90.58809525009498,34.6279161438152,0 -90.57940507832259,34.6457114581828,0 -90.56116263432628,34.7003866360947,0 -90.53916630258439,34.6860476391663,0 -90.54765041882089,34.6519066940829,0 -90.5390670140484,34.6369954120314,0 -90.5089145701068,34.6381667803775,0 -90.4663261216033,34.6721400223716,0 -90.4700800044602,34.7043544473312,0 -90.5136680230595,34.702168426854,0 -90.53338308133611,34.7133527478315,0 -90.5478489155079,34.7904345448067,0 -90.5273632829947,34.8074211116658,0 -90.51614770215419,34.8057007952067,0 -90.5013843558158,34.7899313101001,0 -90.49883609775949,34.7658840525447,0 -90.5170709695817,34.7484702598375,0 -90.5045201438459,34.7299541802284,0 -90.48602595176961,34.7269330960027,0 -90.45153258063928,34.7412990973377,0 -90.4489690543041,34.7608489921917,0 -90.46680699538459,34.7997617150697,0 -90.45200553728539,34.8253158387959,0 -90.4748179857494,34.8578237977629,0 -90.47062930169579,34.8810204416072,0 -90.43818824405589,34.8862771531433,0 -90.4279417146019,34.8727391673229,0 -90.433648709805,34.83545134437,0 -90.4224103169264,34.8323653841601,0 -90.4040306027044,34.8411352642473,0 -90.34152127876421,34.8606740294564,0 -90.3229203349016,34.8503632334111,0 -90.30164901403768,34.851873932935,0 -90.2995432252211,34.8650572468814,0 -90.2963692858759,34.8827875862869,0 -90.2668045737091,34.8966081006537,0 -90.24293921036021,34.9208271417899,0 -90.24199312177619,34.9389999550718,0 -90.2482645856439,34.9498563938362,0 -90.2996040912406,34.9785763166455,0 -90.3054483329108,35.0007887668604,0 -90.2919059359036,35.0485515081083,0 -90.1958038569539,35.0409907485114,0 -90.16917671881551,35.077919742991,0 -90.17843898741448,35.1087380390639,0 -90.16456841965839,35.1297030327121,0 -90.1438236047204,35.1366264117644,0 -90.08301595591442,35.1251401960811,0 -90.0646285866633,35.1474746627476,0 -90.0625227286411,35.1670054991279,0 -90.07339477195561,35.1919226486873,0 -90.06905343928681,35.2128267350657,0 -90.09019489682149,35.2544862571621,0 -90.1060339420871,35.2639351079375,0 -90.15221595869851,35.2641450857902,0 -90.16984033490409,35.2826536313127,0 -90.15708359885721,35.3063308609086,0 -90.10643821193109,35.3147724206286,0 -90.0987932747814,35.3456783695846,0 -90.10571329777039,35.3660674829239,0 -90.08722669387278,35.3815928956868,0 -90.0755685711721,35.4066128988494,0 -90.0852505380296,35.4183657399664,0 -90.11233571142539,35.4177745418272,0 -90.1325618654474,35.4076849496077,0 -90.14026019209219,35.3831303299536,0 -90.16790994055501,35.3843396369312,0 -90.172769972754,35.423801771155,0 -90.1373684773254,35.4426077096675,0 -90.10205086268928,35.4736509299937,0 -90.0823206223606,35.4782894580097,0 -90.0749351519039,35.472426386111,0 -90.07402733802461,35.4265900144844,0 -90.06038559986169,35.4134944197412,0 -90.0468735226389,35.4171869306731,0 -89.9996536673638,35.4455370247156,0 -90.04190641166632,35.5125217072751,0 -90.0409909024943,35.5429279718505,0 -90.033140016861,35.5524950078149,0 -89.9896739843436,35.5617568588755,0 -89.96235991331029,35.5323728966608,0 -89.94763474177211,35.5269828473763,0 -89.9312615752134,35.5293135817598,0 -89.92174743757781,35.5461398658448,0 -89.95811786552559,35.5786747060615,0 -89.9571336550073,35.6031836149856,0 -89.8775260946092,35.6334146146124,0 -89.8639224643906,35.6298250835587,0 -89.84928118822251,35.6453010408611,0 -89.8573304296374,35.6711412777364,0 -89.8652652485346,35.6733842535304,0 -89.89348727560559,35.6560505384628,0 -89.92982722280721,35.6763442141411,0 -89.95212103232031,35.7125639320478,0 -89.9511215579288,35.7343453953471,0 -89.9098681003284,35.7549139790981,0 -89.8599549641379,35.7482691273072,0 -89.8271246329774,35.7583474945228,0 -89.7999860359764,35.7743003646228,0 -89.79046432453561,35.8056299093077,0 -89.7598771117723,35.817497369678,0 -89.7360192984694,35.807113985821,0 -89.70090799570041,35.8275908326828,0 -89.7015183934478,35.8421131136063,0 -89.757794357037,35.8714934051126,0 -89.7663548523295,35.8841769773396,0 -89.7629902111739,35.8968873309185,0 -89.7380566602412,35.9150869770193,0 -89.71476351078169,35.9115011809885,0 -89.6647286073305,35.8857218407663,0 -89.64941603650951,35.8943619363869,0 -89.6454792006079,35.9138737361357,0 -89.66427092678561,35.9378944702657,0 -89.71321482606381,35.9663974567816,0 -89.7218363447502,35.9999509241088,0 -89.9632916378976,35.9969088479974,0 -90.2835541915351,35.9912280026278,0 -90.3790621785177,35.9896564265848,0 -90.31533967165498,36.0917234028765,0 -90.284851770393,36.115972708427,0 -90.26380164514022,36.1188298079555,0 -90.2349388507527,36.1371551620637,0 -90.2323220265841,36.1612137930848,0 -90.219321206522,36.1726309521804,0 -90.16140488324341,36.1970066414864,0 -90.13131377418432,36.2121355814949,0 -90.1100122336982,36.2580597893355,0 -90.0661877402538,36.2723382893607,0 -90.04984511692381,36.3005360471466,0 -90.06772899503081,36.3253957469489,0 -90.05029531239092,36.3626684522717,0 -90.05215696164839,36.3826150505682,0 -90.08027223924928,36.397449931407,0 -90.1169251070973,36.4049759827803,0 -90.1239291860565,36.4226261953142,0 -90.1173219969686,36.4539556960145,0 -90.13737277191632,36.4574765175037,0 -90.15025942109908,36.4918729268599,0 -90.22447328203479,36.4928111285523,0 -90.5817321666723,36.4910222747631,0 -90.8044338516289,36.4892654684767,0 -91.13395636436511,36.4880156921504,0 -91.4117966736446,36.4911017707335,0 -91.4529890137038,36.4904380208107,0 -91.68856055219172,36.4910185604512,0 -92.1276422613294,36.4914354514783,0 -92.14631944771919,36.4916605516162,0 -92.52305071341618,36.4909213638459,0 -92.77763547121239,36.4899835156087,0 -92.8522757362601,36.4898845275616,0 -93.2973244136508,36.4906809019551,0 -93.32834621479771,36.4902614752819,0 -93.5964496696149,36.489958821283,0 -93.85751984136751,36.4897863700719,0 -94.08105216030801,36.4910242585195,0 -94.6172570958511,36.4894141614003,0 -94.60745283215459,36.4787903547,0 -94.55311361988042,36.1645252110653,0 -94.5424172738563,36.1068358038929,0 -94.48593482605899,35.7603104941298,0 -94.46848521103668,35.6410882624306,0 -94.4285520120899,35.4005462695086,0 -94.4393221493475,34.9291508772006,0 -94.44596107534362,34.7356081162875,0 -94.45262404592168,34.5084326818174,0 -94.4616914490383,34.1967651932869,0 + + + + + + + + California + empty + + +states.AREA: + 157776.31 + + +states.STATE_NAME: +California + + +states.STATE_FIPS: +06 + + +states.SUB_REGION: +Pacific + + +states.STATE_ABBR: +CA + + +states.POP2000: + 33871648 + + +states.POP2001: + 34516624 + + +states.POP00_SQMI: + 215 + + +states.DEN_0_100: + 81 + + +USStates.ID: + 31 + + +USStates.State_Name: +California + + +USStates.Date_Entered: +Sep. 9 1850 + + +USStates.Year_Entered: +1850 + + +USStates.Year_Settled: +1769 + +]]> + #Style_5 + + + -119.601147078817,37.2417411000423,0 + + + + + + + -121.66521992838,38.1692852818694,0 -121.659581042989,38.0964650614978,0 -121.554149383557,38.1373615489176,0 -121.57283385306,38.1137988310232,0 -121.54747307428,38.0634732081726,0 -121.56954517723,38.0636676710543,0 -121.576884968613,38.0941384853348,0 -121.657749868484,38.0861008670846,0 -121.69895609777,38.023495913425,0 -122.00062325051,38.0571514373297,0 -122.29552219684,38.0147955029917,0 -122.379683867535,37.9734454214081,0 -122.371497008527,37.9093451727425,0 -122.307553740948,37.8917635584725,0 -122.312413626844,37.7784626912758,0 -122.199732511343,37.7352008896292,0 -122.093023678359,37.4973135318613,0 -121.975337115714,37.4607202053584,0 -122.0893078249,37.4525414662326,0 -122.359671258087,37.6097867642997,0 -122.366331359286,37.7024501185469,0 -122.346471626615,37.725222881851,0 -122.400931117592,37.8086250993121,0 -122.498214530806,37.7829421062426,0 -122.498207824387,37.7002541028674,0 -122.505682180351,37.5229048519338,0 -122.441463098499,37.4794824747711,0 -122.389253147094,37.352412767888,0 -122.414637835197,37.2391263954339,0 -122.27463370965,37.1067818898449,0 -122.173442725658,37.000869414925,0 -122.061331831373,36.9475067701217,0 -121.883536569103,36.9620979743937,0 -121.791711902502,36.8503269997121,0 -121.761391229107,36.8189902052639,0 -121.808564715975,36.6482211428704,0 -121.867381727768,36.6077136052856,0 -121.911420522825,36.6404278449564,0 -121.955283154531,36.5827736715462,0 -121.882277424869,36.3069435009766,0 -121.689811557385,36.1811341987533,0 -121.445541577549,35.8798505213909,0 -121.329080662264,35.8010340350228,0 -121.270261538467,35.6635357486702,0 -121.146559303764,35.6293227396273,0 -120.991948024433,35.4565810726726,0 -120.875212388976,35.4277651422731,0 -120.849996140741,35.364537182949,0 -120.883597597517,35.259405384431,0 -120.861341970335,35.2092537379629,0 -120.638410219944,35.1400283496436,0 -120.61676526156,35.0748165782334,0 -120.644339564707,34.972636905425,0 -120.665946557296,34.9038095267432,0 -120.608158850435,34.8556158401941,0 -120.631673131148,34.7599067933633,0 -120.601627028389,34.7040225521134,0 -120.64129302919,34.5723378041175,0 -120.509405994936,34.5213738679268,0 -120.456202683517,34.4424994539303,0 -120.140162829175,34.4719023559641,0 -120.011495395442,34.4616616229627,0 -119.869433245661,34.4047962846548,0 -119.606293589682,34.4164349217076,0 -119.483009812349,34.3748618900045,0 -119.266767436277,34.2380982663749,0 -119.216334529765,34.1463406491736,0 -118.939360079521,34.0400813176585,0 -118.788115084851,34.0182570853964,0 -118.541854436649,34.0372517785732,0 -118.412110377564,33.8829675753282,0 -118.388175257182,33.8123248533334,0 -118.42895447882,33.7754482405051,0 -118.40508897256,33.7384507232421,0 -118.286892271712,33.7039074388935,0 -118.246616191662,33.7739249856028,0 -118.106717457478,33.7475645995891,0 -117.597331325999,33.3945339357493,0 -117.410144185265,33.2340894690021,0 -117.328439405751,33.1114819922089,0 -117.254867897998,32.8881728454755,0 -117.285325399413,32.8512204969457,0 -117.248206872978,32.6800939783651,0 -117.198774659986,32.7389343989236,0 -117.124529296561,32.6789314826057,0 -117.120606603881,32.6028724058295,0 -117.199812068273,32.7184424173816,0 -117.128098104758,32.5357813439163,0 -116.10697354631,32.6194706970554,0 -114.722048985451,32.7208574919907,0 -114.712695098447,32.7350133484495,0 -114.694040667724,32.7414255804573,0 -114.603942285241,32.7262851953269,0 -114.603522692176,32.7358864782619,0 -114.571958909536,32.7374388920444,0 -114.572210733513,32.7488292120028,0 -114.560751027253,32.7489359768297,0 -114.561582708233,32.7607536245719,0 -114.543004547133,32.7607497409074,0 -114.543187695964,32.7712322843312,0 -114.530095237266,32.7714115230303,0 -114.535077445153,32.7880470474354,0 -114.52621949202,32.8099123509472,0 -114.461436322021,32.8454225112401,0 -114.476443984447,32.9359088466692,0 -114.46838719789,32.9777894659032,0 -114.520627661734,33.0277074359678,0 -114.559089057602,33.036782479158,0 -114.609925720105,33.0270019226895,0 -114.633966945552,33.0335669165654,0 -114.645159759737,33.0444118730784,0 -114.663951695926,33.0389226888334,0 -114.711355133911,33.0953827798915,0 -114.709463019649,33.122374935038,0 -114.678120399612,33.1672499413879,0 -114.680050859029,33.2245949425206,0 -114.687711074888,33.2392582971895,0 -114.677693392037,33.2680165177413,0 -114.735426988668,33.3057084351637,0 -114.703603782165,33.3524180309387,0 -114.724936284952,33.4110596377436,0 -114.645092242143,33.4191160810556,0 -114.630573116436,33.4394249456214,0 -114.621089578986,33.4685989080523,0 -114.598086338819,33.4861269505736,0 -114.58706170624,33.5094455578288,0 -114.52942054662,33.5600729749772,0 -114.54024720611,33.5805077718081,0 -114.527170510583,33.6221365140121,0 -114.525263594507,33.6655047006994,0 -114.53643355935,33.6827352282095,0 -114.49567644704,33.708369427689,0 -114.510287510185,33.7432004976418,0 -114.504557871757,33.7717148133963,0 -114.521122162519,33.8260312846707,0 -114.511722548733,33.84196501578,0 -114.520962184241,33.8629263802443,0 -114.49818809185,33.925036256846,0 -114.525632127364,33.9524137553973,0 -114.518208552815,33.9650630904256,0 -114.428980324296,34.0298439872115,0 -114.424029195647,34.0783320579769,0 -114.410166357368,34.1026543641334,0 -114.322799430739,34.1412972664816,0 -114.285368523229,34.1712309584447,0 -114.235775821971,34.1862227475521,0 -114.149912368725,34.2669789901846,0 -114.125230507624,34.2726209662778,0 -114.134127057818,34.3145478754142,0 -114.153414997679,34.3364477645527,0 -114.182079822361,34.3652063649643,0 -114.257842521563,34.4054888215522,0 -114.283394304634,34.4120690064366,0 -114.302865366738,34.4357541377741,0 -114.332636412337,34.4548730796034,0 -114.376506947621,34.4596793685379,0 -114.38386203177,34.4770856153635,0 -114.376827822772,34.5365634767276,0 -114.409742349408,34.5837235617841,0 -114.434302240724,34.5989628909914,0 -114.422270356442,34.6108950917792,0 -114.465637688895,34.7098730189755,0 -114.497804378448,34.744757644472,0 -114.525553173554,34.7489115709666,0 -114.542040692552,34.7599586200401,0 -114.570216833129,34.8318604389449,0 -114.627263440015,34.8755338147028,0 -114.630475658748,34.9195012881626,0 -114.621007388662,34.9436098418844,0 -114.632276529502,34.9976517256292,0 -114.621068606189,34.9989144286133,0 -115.626197382816,35.7956983148418,0 -115.885769343921,36.0012259572722,0 -117.160423771838,36.9595941441766,0 -117.838686423167,37.4572982397149,0 -118.417419755966,37.886676748621,0 -119.152450421001,38.4118009590513,0 -119.318825070203,38.5271086243913,0 -119.575687062955,38.7029101298903,0 -119.8893416394,38.9222515603984,0 -119.995254694357,38.9941061536376,0 -119.995150114198,39.063491359469,0 -119.994541258334,39.1061318056706,0 -119.995527335641,39.1587132866354,0 -119.995304181493,39.3115454332125,0 -119.996011479298,39.443500976451,0 -119.996165311172,39.7206108077274,0 -119.996324660047,41.1775662656441,0 -119.993459369715,41.9892049531992,0 -120.871908519109,41.9876721779537,0 -121.441508911406,41.9943345308753,0 -122.284705082491,42.0007645525751,0 -123.222102653242,42.0021917751363,0 -123.513204633148,41.9978329178357,0 -123.819146438568,41.9929487728793,0 -124.206444444404,41.9976479131656,0 -124.207500961935,41.8483274144433,0 -124.243098913848,41.7767571816414,0 -124.144210356407,41.7271932569777,0 -124.057954769171,41.4581641678281,0 -124.071602469809,41.3138325813281,0 -124.149703258267,41.1288322470152,0 -124.109446186314,40.9782109511907,0 -124.39263784515,40.4352369107749,0 -124.336106834157,40.3275549107377,0 -124.34530627267,40.2524300107045,0 -124.094560484712,40.1003777878568,0 -124.007638557042,39.9985808401758,0 -123.83810841709,39.8263968822168,0 -123.783531916535,39.6871084901522,0 -123.754651576417,39.5518792569807,0 -123.813718039793,39.3478064499639,0 -123.68344758336,39.0418059048776,0 -123.721901388934,38.9247712251134,0 -123.523886601491,38.7576593190168,0 -123.297941065635,38.5473335471062,0 -123.121544682433,38.4335999361908,0 -123.048796644867,38.294141377341,0 -122.994649084682,38.2972271999883,0 -122.939271912039,38.1532649535683,0 -123.010730200117,37.9944662024876,0 -122.956597666482,37.9907574780998,0 -122.921180931798,38.0306229406578,0 -122.822193338167,38.0076725285282,0 -122.691723723162,37.894392667181,0 -122.666392804265,37.9069197438526,0 -122.515725410422,37.8221063020498,0 -122.45825944905,37.8342211915867,0 -122.490022339876,37.9317675511749,0 -122.441781116525,37.9829552338725,0 -122.506450380808,38.0186521772629,0 -122.474544986516,38.0854571240266,0 -122.528648754527,38.150671563432,0 -122.488935224967,38.1134142797201,0 -122.429202750633,38.1138071956154,0 -122.398463944831,38.1613370670847,0 -122.272771919253,38.0974845590887,0 -122.285354126349,38.1593115761927,0 -122.338907365688,38.1935818915881,0 -122.315759126632,38.2059335777619,0 -122.273001701246,38.1594183914711,0 -122.232243019261,38.0710797919834,0 -121.984548898952,38.1395004704755,0 -121.902765892076,38.0729095504444,0 -121.782362662585,38.066775850854,0 -121.66521992838,38.1692852818694,0 + + + + + + + + + -119.867823257171,34.0752286498425,0 -119.927690399321,34.0591802403193,0 -119.873986855978,34.0318755748591,0 -119.889061793831,34.004669718361,0 -119.847275401387,33.9684159348396,0 -119.712539718279,33.9652843614565,0 -119.539377455034,34.0064960649629,0 -119.523095554405,34.0345906142262,0 -119.572589325174,34.0557811654196,0 -119.667922334498,34.0213434372469,0 -119.867823257171,34.0752286498425,0 + + + + + + + + + -120.167386086026,33.9241621971016,0 -120.109179246126,33.8948139803303,0 -119.963385936243,33.9477631591643,0 -120.046801069367,34.0411052236375,0 -120.238548700773,34.0108852422559,0 -120.167386086026,33.9241621971016,0 + + + + + + + + + -118.594780502018,33.4808183566674,0 -118.556433880183,33.4344825457272,0 -118.481342626159,33.4195524387193,0 -118.455386785543,33.3247859794245,0 -118.304036434067,33.3074940443331,0 -118.294590834254,33.3344480915225,0 -118.362395805209,33.4110113285126,0 -118.594780502018,33.4808183566674,0 + + + + + + + + + -118.350958200555,32.8191952333517,0 -118.541585051028,32.9873842722853,0 -118.571485987943,33.0359715054548,0 -118.599517215117,33.0210219708047,0 -118.511676946737,32.8920762202556,0 -118.420105888582,32.8061145350339,0 -118.350958200555,32.8191952333517,0 + + + + + + + + + Colorado + empty + + +states.AREA: + 104101.231 + + +states.STATE_NAME: +Colorado + + +states.STATE_FIPS: +08 + + +states.SUB_REGION: +Mtn + + +states.STATE_ABBR: +CO + + +states.POP2000: + 4301261 + + +states.POP2001: + 4432642 + + +states.POP00_SQMI: + 41 + + +states.DEN_0_100: + 96 + + +USStates.ID: + 38 + + +USStates.State_Name: +Colorado + + +USStates.Date_Entered: +Aug. 1 1876 + + +USStates.Year_Entered: +1876 + + +USStates.Year_Settled: +1858 + +]]> + #Style_5 + + + -105.547857280633,38.9972631547834,0 + + + + + + -102.044455910114,37.6414742210535,0 -102.04397657417,37.7343986213713,0 -102.046060904132,38.2538220806459,0 -102.045549640322,38.2633436193344,0 -102.047584160548,38.6154993640496,0 -102.047568440936,38.6925505149901,0 -102.048972538957,39.0370029188915,0 -102.047874719263,39.1267534832,0 -102.048801584447,39.5628035180916,0 -102.049442507662,39.5686933622379,0 -102.051535596434,39.9989182728278,0 -102.047544994516,40.3426445008284,0 -102.047620488242,40.4310777832961,0 -102.046031374616,40.6973192828138,0 -102.046992332576,40.7431303349332,0 -102.047739314394,40.9980708667063,0 -102.621257047371,41.00021481921,0 -102.652271070342,40.9981241668543,0 -103.382956653967,41.0003163565243,0 -103.572316302435,40.9996484311393,0 -104.05170553525,41.00321132686,0 -104.934492922627,40.9942891435778,0 -105.278797604523,40.9963491628159,0 -106.203471481278,41.0000850018961,0 -106.329125682765,41.001288969127,0 -106.865438763821,40.9984573861084,0 -107.304051053295,41.0001333468858,0 -107.918671336725,41.0033751160193,0 -109.048314704754,40.9984333935171,0 -109.046155726194,40.6652909436328,0 -109.051263150153,40.2105113710392,0 -109.052551712149,39.6573824204021,0 -109.053528662287,39.5181701484933,0 -109.051416838185,39.3609660838809,0 -109.053948502328,38.4946509132439,0 -109.055861120835,38.2449201643366,0 -109.043464000061,38.1529336954503,0 -109.043206408646,37.8874200608917,0 -109.045602480021,37.6308206068713,0 -109.048480115363,36.9966409005893,0 -108.372472924296,36.999471575633,0 -107.472460293817,36.9987767566937,0 -107.410820543541,36.9975257849804,0 -106.89037023567,36.9990837907051,0 -106.86124887722,36.9895015941857,0 -106.472176939021,36.9915042439681,0 -105.992000086492,36.992289650437,0 -105.713459997846,36.9945603614965,0 -105.213091465415,36.992604521715,0 -105.146172547082,36.9932073726899,0 -103.993635035945,36.9944690622369,0 -103.07786588474,36.9997601837273,0 -102.997709442614,36.9985238353847,0 -102.037207602599,36.9889939197762,0 -102.042010650289,37.3862794433515,0 -102.044455910114,37.6414742210535,0 + + + + + + + + Connecticut + empty + + +states.AREA: + 4976.566 + + +states.STATE_NAME: +Connecticut + + +states.STATE_FIPS: +09 + + +states.SUB_REGION: +N Eng + + +states.STATE_ABBR: +CT + + +states.POP2000: + 3405565 + + +states.POP2001: + 3434012 + + +states.POP00_SQMI: + 684 + + +states.DEN_0_100: + 39 + + +USStates.ID: + 5 + + +USStates.State_Name: +Connecticut + + +USStates.Date_Entered: +Jan. 9 1788 + + +USStates.Year_Entered: +1788 + + +USStates.Year_Settled: +1634 + +]]> + #Style_5 + + + -72.7247699791,41.6180326565837,0 + + + + + + -73.5303920707175,41.5227455563004,0 -73.5442932536742,41.3652984767995,0 -73.5502596731917,41.2936207043954,0 -73.47812075689539,41.2107548889389,0 -73.72523765669671,41.1003542249946,0 -73.65372377552561,41.0126172825253,0 -73.65315146089949,40.9983924455247,0 -73.1044185740856,41.1610394427248,0 -72.906734323612,41.2700631991856,0 -72.5272448622889,41.2637025875984,0 -72.378152966058,41.2781022275496,0 -72.3784123498461,41.3583482711136,0 -72.3263548978381,41.2896412329135,0 -72.28141590252091,41.2811454708603,0 -71.86667844289499,41.3227696452715,0 -71.8477722040922,41.3253484832964,0 -71.8368696812943,41.3419614666217,0 -71.8459956537022,41.4038545416488,0 -71.80274343080561,41.4158290540058,0 -71.7901942031214,41.6013068793249,0 -71.792605218292,41.6417579304637,0 -71.78824886219491,41.7216033953237,0 -71.7978316087619,42.0042748046851,0 -71.80234071658769,42.0179769339478,0 -72.0949717608141,42.0257995069483,0 -72.1363467150764,42.0264020644269,0 -72.5075717905207,42.0307660006011,0 -72.57122589242989,42.0301249737628,0 -72.58190737022019,42.0216068944432,0 -72.60782527309461,42.0228008077559,0 -72.6095266969696,42.030536850941,0 -72.75589381790709,42.0338475230699,0 -72.7675750314897,42.0021671817802,0 -72.817679571843,41.9971850435429,0 -72.8164509949267,42.033507731778,0 -73.0060955098662,42.0360092024926,0 -73.0456324711282,42.0363103821922,0 -73.4842302844536,42.0474280500728,0 -73.51714741333279,41.6656861632365,0 -73.5303920707175,41.5227455563004,0 + + + + + + + + Delaware + empty + + +states.AREA: + 2054.586 + + +states.STATE_NAME: +Delaware + + +states.STATE_FIPS: +10 + + +states.SUB_REGION: +S Atl + + +states.STATE_ABBR: +DE + + +states.POP2000: + 783600 + + +states.POP2001: + 797556 + + +states.POP00_SQMI: + 381 + + +states.DEN_0_100: + 66 + + +USStates.ID: + 1 + + +USStates.State_Name: +Delaware + + +USStates.Date_Entered: +Dec. 7 1787 + + +USStates.Year_Entered: +1787 + + +USStates.Year_Settled: +1638 + +]]> + #Style_5 + + + -75.5005536711258,38.9951144260073,0 + + + + + + -75.70707355672541,38.5575913668919,0 -75.6988024422464,38.4631827108939,0 -75.3498423227975,38.4553227905156,0 -75.0927212334893,38.4505638472484,0 -75.0679246646819,38.4500753640855,0 -75.0456230125111,38.4496021608759,0 -75.0827624797042,38.7999244622257,0 -75.1905708548595,38.8087822508359,0 -75.3075352508581,38.946023931106,0 -75.32448866541441,39.0124989256203,0 -75.3973682707713,39.0731489592767,0 -75.4021224709428,39.2577500046037,0 -75.5152174265202,39.3670516712081,0 -75.5898358410183,39.4638799793316,0 -75.56264295943861,39.5668352599053,0 -75.6103745921791,39.6129053117614,0 -75.4892806606894,39.7148582186458,0 -75.4759742683691,39.7200843842213,0 -75.47476845721459,39.7418320932776,0 -75.46039411885541,39.7633620274566,0 -75.4276473042606,39.7782429030536,0 -75.4117545704202,39.7897707547806,0 -75.42046794786501,39.7989830990632,0 -75.4699861133481,39.8265474993808,0 -75.58344324964349,39.8401190417149,0 -75.6439943147472,39.8383065472094,0 -75.6947708516454,39.8204574523468,0 -75.7455920038355,39.7749293983367,0 -75.77492719598079,39.7245527846646,0 -75.7910945763195,39.7238660373362,0 -75.77235374667779,39.3831185391944,0 -75.7643192412212,39.2959598236098,0 -75.7613129328181,39.2478639325384,0 -75.7525764003551,39.1416603330929,0 -75.7245906263035,38.8302832999716,0 -75.7107127327496,38.6496658557662,0 -75.70707355672541,38.5575913668919,0 + + + + + + + + Florida + empty + + +states.AREA: + 55814.731 + + +states.STATE_NAME: +Florida + + +states.STATE_FIPS: +12 + + +states.SUB_REGION: +S Atl + + +states.STATE_ABBR: +FL + + +states.POP2000: + 15982378 + + +states.POP2001: + 16349220 + + +states.POP00_SQMI: + 286 + + +states.DEN_0_100: + 75 + + +USStates.ID: + 27 + + +USStates.State_Name: +Florida + + +USStates.Date_Entered: +Mar. 3 1845 + + +USStates.Year_Entered: +1845 + + +USStates.Year_Settled: +1565 + +]]> + #Style_5 + + + -82.4955741421186,28.6586764601475,0 + + + + + + + -80.7856624086309,28.7851940403771,0 -81.0970545706768,29.3517993174429,0 -81.1098802954354,29.4302392603555,0 -81.2337658332761,29.6690238932245,0 -81.2437844731636,29.7379431267216,0 -81.3164898837488,29.829240288196,0 -81.30275787447,29.9130520156593,0 -81.4327676635006,30.2467817590837,0 -81.4432599879591,30.3571873716918,0 -81.4807983040684,30.3805404131581,0 -81.4575287462075,30.4547642552716,0 -81.51811745977921,30.556212852111,0 -81.4987842593679,30.5986053568678,0 -81.52859548779161,30.7214526527694,0 -81.5365912711366,30.706577299159,0 -81.6011698908184,30.7248871300769,0 -81.6047710156425,30.7163212810582,0 -81.6279809976449,30.7317742622409,0 -81.64247751744411,30.7290809870991,0 -81.7167688183456,30.7453688965497,0 -81.7366750235978,30.7638888413088,0 -81.7577101754202,30.7696316702207,0 -81.77670793959879,30.7615846557533,0 -81.803198160572,30.7880849801985,0 -81.8730017876477,30.7990844044587,0 -81.899141093328,30.8283082947867,0 -81.9075183587545,30.8134750654558,0 -81.9438049950591,30.8242494271993,0 -81.95302920945851,30.8204309615747,0 -81.96155137217021,30.7960077712109,0 -81.9814798819521,30.7783517328393,0 -82.015538717102,30.7913192479577,0 -82.0129673359901,30.7642564144355,0 -82.0318811960902,30.75753276526,0 -82.044911618847,30.6509107642683,0 -82.0136526868731,30.5986905381626,0 -82.00580162815341,30.5709905104499,0 -82.0225094921996,30.4777178378262,0 -82.0351206760364,30.442878325233,0 -82.0460994945739,30.4340681576703,0 -82.0383547553639,30.3789045785554,0 -82.0527668135565,30.3637944548298,0 -82.1646391875519,30.3612918341259,0 -82.1802341078135,30.3686309203557,0 -82.2055648250395,30.4238531552503,0 -82.1991871719511,30.4900145014502,0 -82.2193674835883,30.5029705380916,0 -82.2383961480861,30.53144474306101,0 -82.2210395703097,30.5670760290347,0 -82.41209267091981,30.5773075208331,0 -82.46313488325031,30.5826898377285,0 -82.5829575782702,30.5890537915584,0 -82.6963559598951,30.5957200992445,0 -83.13244038033891,30.6213413987424,0 -83.30131548232799,30.6332849379512,0 -83.31060073866981,30.6343032375269,0 -83.6090560569222,30.6507845923385,0 -83.7378439398488,30.6604911909877,0 -84.00073015189621,30.6755376606981,0 -84.07556221707689,30.6785776000623,0 -84.2816633081929,30.6904191353307,0 -84.3744481609224,30.6940918759687,0 -84.8630037111776,30.7126645389724,0 -84.86458306959619,30.7145032030319,0 -84.8882887897453,30.7438893824889,0 -84.915343413445,30.7540898084089,0 -84.9268948431928,30.7760887042882,0 -84.93256395069341,30.802625045985,0 -84.9269262387193,30.8469221763844,0 -84.9377761495732,30.8949576392884,0 -84.9690122705718,30.9270937759378,0 -84.97356770002369,30.9636643794248,0 -85.0001419997276,30.9793194525836,0 -85.00160719763341,31.0012534003007,0 -85.4850102049851,31.0010018399978,0 -85.4865971253016,31.0009980072958,0 -86.0318217926755,30.993327601114,0 -86.1814761680363,30.9952251256207,0 -86.38391974363719,30.9915383065212,0 -86.70185248868481,30.9980924099155,0 -86.7793617052065,30.9981918115755,0 -87.16311759320681,31.0031572312178,0 -87.59858025629001,31.0026307736,0 -87.58986722899169,30.954361030582,0 -87.62571159139399,30.8769019951762,0 -87.6159151545761,30.8482964233535,0 -87.54190013706391,30.7856953414756,0 -87.5266028694286,30.7484916966577,0 -87.4601404897836,30.7058026368688,0 -87.4188942719987,30.6928101858547,0 -87.3986449174521,30.6680153313996,0 -87.3932809670146,30.6200982640176,0 -87.4220673638826,30.5564936086287,0 -87.4453529644246,30.5313897036451,0 -87.4188166507341,30.4817007831404,0 -87.34739512261361,30.45716912626,0 -87.3468074422634,30.4314987377927,0 -87.4092561498961,30.4022388615449,0 -87.42408011873,30.3236714953673,0 -87.27389760268,30.3573846203564,0 -87.160102583227,30.4650331854788,0 -87.17155505856,30.5577356138947,0 -87.12453365402951,30.5646667812171,0 -87.0692718433498,30.4505645464724,0 -87.0195804520243,30.5874666647957,0 -86.98619315326791,30.5904306090507,0 -87.01439989501139,30.5144345448102,0 -86.9325107849378,30.4635649387036,0 -87.1933820815507,30.3552218088262,0 -86.79034761148481,30.417963340528,0 -86.6102358163719,30.423651606622,0 -86.4526391026542,30.501237135688,0 -86.3878791046355,30.4621676047067,0 -86.21960829589411,30.4878542196163,0 -86.1229339842843,30.4264616798505,0 -86.114640755008,30.3858018718917,0 -86.24156647826339,30.4285277915735,0 -86.2400330396019,30.3998877870994,0 -86.38810807865301,30.4060128314707,0 -86.5053138173483,30.4099729095893,0 -86.38745959195791,30.3876588649199,0 -85.9870132562786,30.274430447424,0 -85.7263932601573,30.1288421882721,0 -85.7579191757177,30.228945499057,0 -85.8299426331719,30.2328139986745,0 -85.8504205348322,30.2803593792308,0 -85.752708285065,30.296929416945,0 -85.7171312674037,30.2650619320408,0 -85.5694755083714,30.3110040681735,0 -85.6001764366836,30.2511510570462,0 -85.6660583999623,30.2516894275641,0 -85.7098294679232,30.1787734448826,0 -85.5297167444586,30.1316864955678,0 -85.46431580583911,30.05116354875871,0 -85.39567230794491,30.0585673680019,0 -85.38265623679381,30.0362861989575,0 -85.3826943968843,30.0242701944309,0 -85.4323859451426,30.0457542840855,0 -85.41501336574611,30.0315524246978,0 -85.4713579556514,30.021863583452,0 -85.5685286533251,30.0982936773355,0 -85.6284974801284,30.092591247597,0 -85.3847925794656,29.9238014777072,0 -85.3005241314803,29.809796482644,0 -85.30658944207769,29.7017103324635,0 -85.358043047591,29.6912547238295,0 -85.4025465872846,29.7943649380265,0 -85.39299438160241,29.875413459683,0 -85.4140519942968,29.8630676261595,0 -85.4096039187485,29.7767663594786,0 -85.3648790697375,29.6830190693874,0 -85.2147599731812,29.7015576599036,0 -84.9882831153426,29.7199215009452,0 -84.9285133165353,29.7779718956361,0 -84.858030735784,29.746860644003,0 -84.4645378551553,29.9296272731811,0 -84.346911138444,29.9101687274893,0 -84.33893870217069,29.94714151388211,0 -84.4331041474675,29.9595452292823,0 -84.43769009148851,29.9917915151398,0 -84.3604166513926,29.9773907329364,0 -84.353924908203,30.0696244196511,0 -84.2330713099055,30.1081116975018,0 -84.1478548013806,30.0817249598013,0 -84.0746250590684,30.0999482141697,0 -83.9717383295973,30.0774831103292,0 -83.65418272250091,29.9109618275118,0 -83.5504482416698,29.7373231552771,0 -83.40497386127331,29.6696026010291,0 -83.38003129986259,29.5198747697928,0 -83.2343277851478,29.4339375053078,0 -83.17463281391611,29.3436792113098,0 -83.1089950735291,29.3281828439052,0 -83.1422065121976,29.2996514317714,0 -83.0739287228003,29.2656522892705,0 -83.0367477674175,29.17938775268111,0 -82.80215694869619,29.1551323838437,0 -82.7553222386037,29.008660342598,0 -82.63661917692581,28.8847079412874,0 -82.6365190150036,28.8142779635276,0 -82.68138067327411,28.8083822083402,0 -82.6360757732282,28.6927489136677,0 -82.6734759424042,28.4285106282973,0 -82.77914408680709,28.1730274345577,0 -82.8442855871409,27.8506413239551,0 -82.7410033447869,27.6858682776039,0 -82.72816288633671,27.71777322138721,0 -82.7938385725946,27.82965394385201,0 -82.6783265396172,27.7055878183437,0 -82.6446191370261,27.7157250804914,0 -82.623653104071,27.8485270486841,0 -82.5642645135043,27.8784619377409,0 -82.72548499781411,27.9405627845552,0 -82.6447412328194,27.9665839458658,0 -82.700665998164,27.9753535590083,0 -82.67271887892071,28.0105143110528,0 -82.6983389996622,28.0461689270521,0 -82.65068467202021,28.0071632485504,0 -82.6455652432514,28.0288470743089,0 -82.53899536357871,27.9357280906989,0 -82.5105981113627,27.8312320397799,0 -82.483131719607,27.821947512228,0 -82.4609984469958,27.9401552300599,0 -82.3988177254479,27.9062193926186,0 -82.4043795621193,27.7916278689045,0 -82.55249982929941,27.6440140810863,0 -82.5400408116316,27.6081060565737,0 -82.6263767381809,27.5551940586101,0 -82.55426231189991,27.5822396263396,0 -82.5696053404662,27.552713123606,0 -82.6387670919584,27.5366381336648,0 -82.5755716572461,27.5123247874474,0 -82.4271770498958,27.5228592370009,0 -82.5141997040709,27.5119896299127,0 -82.4882670113381,27.4780670468665,0 -82.6817060967643,27.5244293448953,0 -82.6658290426217,27.4935869887545,0 -82.638889133273,27.5034592572515,0 -82.6859253554227,27.4738446601839,0 -82.5655623022342,27.3866814664875,0 -82.5327402803326,27.3318018750555,0 -82.5699574997893,27.2742801857922,0 -82.514483358897,27.2104536946126,0 -82.53113078368141,27.260277268799,0 -82.5069299595387,27.2369915434566,0 -82.3800366684968,26.9472958619466,0 -82.3436286898397,26.9036327303149,0 -82.3686686110515,26.9479386066161,0 -82.39817177118719,26.9985156064124,0 -82.3554313078568,26.9488960497624,0 -82.2898406078895,26.8498858964476,0 -82.1538287055014,26.790128827623,0 -82.1764953546999,26.91369327650421,0 -82.2575818018979,26.997907071209,0 -82.2821793222444,27.0245573864093,0 -82.2574596818821,27.0044089537616,0 -82.1532097767663,26.937064868502,0 -82.0126882415853,26.9765506094598,0 -81.992851089122,27.0316764188246,0 -81.9791941742815,27.0316801758383,0 -81.9914399870855,26.9630565804492,0 -82.09787264732439,26.9217855253756,0 -82.0517675266414,26.8667090832592,0 -82.06827088488571,26.7669703280974,0 -82.08366009168979,26.7157906803202,0 -82.0214729222177,26.5246799114177,0 -81.94445196681861,26.5507196658666,0 -81.8971019671985,26.6637671605295,0 -81.77391439025691,26.7102658283511,0 -81.8842767455881,26.6429874247486,0 -81.9287732333451,26.5349808410994,0 -81.9681192314758,26.5173825540891,0 -81.9420187660068,26.4675625679953,0 -81.86421232186081,26.4395539803577,0 -81.8493509562169,26.3321969602063,0 -81.81385858095371,26.2844671116379,0 -81.79471711672559,26.1111624155724,0 -81.7056956434448,26.0001719707702,0 -81.7182927746014,25.9235815788374,0 -81.5307421662118,25.9146583461055,0 -81.2562071495919,25.803102822616,0 -81.1999471683642,25.7104222944241,0 -81.2583748028608,25.6811000537785,0 -81.14332280632461,25.3968273443257,0 -80.9742816356419,25.3224599988499,0 -80.9152746101809,25.246725347404,0 -80.9510271592913,25.2025375364347,0 -81.0115606647601,25.2144297033838,0 -81.1405692249725,25.3207650388025,0 -81.1837838752698,25.2688795915602,0 -81.14822996444551,25.164690234975,0 -81.119016169228,25.1341887870379,0 -80.9758769814422,25.1305013595143,0 -80.8568011499702,25.1856310402452,0 -80.69382490846441,25.1522990222937,0 -80.5518761310218,25.2123186665598,0 -80.4208071164753,25.1922194488631,0 -80.4168167134392,25.2499027837277,0 -80.30197564745031,25.4012007632131,0 -80.32999121816469,25.4900151159125,0 -80.3014558505665,25.6137517419595,0 -80.1930988333682,25.7600323804277,0 -80.1277808584683,25.9775364329027,0 -80.0846956378327,26.3263775730799,0 -80.0509107788816,26.79719774157,0 -80.1146101161258,26.973837535418,0 -80.0903632019365,26.9740436760055,0 -80.1479671747375,27.1090693324142,0 -80.2212733035668,27.2028422831826,0 -80.290420512647,27.2128533886563,0 -80.3267908949388,27.2482620290407,0 -80.28963484694501,27.2413386496822,0 -80.22398953706519,27.215066036106,0 -80.19009080193339,27.1856845506766,0 -80.2396382000622,27.2646476309897,0 -80.35737788115679,27.5556622412549,0 -80.4013770985618,27.7035855422849,0 -80.4818532136496,27.8457216392462,0 -80.5093579467615,27.8257087100619,0 -80.49224458768531,27.8701785816315,0 -80.7471898616394,28.3989923702075,0 -80.8507049706525,28.7856998655849,0 -80.8321039389462,28.7861861164729,0 -80.76241522498,28.73633464414,0 -80.7856624086309,28.7851940403771,0 + + + + + + + + + -86.8338822668909,30.3997351946409,0 -86.92912289596769,30.381394411765,0 -87.0476413823616,30.36940104488521,0 -87.13934916731981,30.3517658849312,0 -87.20214070012931,30.3348345829613,0 -87.2860896885903,30.3397725845478,0 -87.2903241050636,30.3327193793144,0 -87.2670458244246,30.3214318797522,0 -87.2423486031622,30.3214318477782,0 -86.8345841638274,30.3870382775534,0 -86.7929645335572,30.3905649446145,0 -86.73864164395199,30.4025581695707,0 -86.53264296831961,30.3933887813638,0 -86.522770294314,30.4011477363605,0 -86.5347563674129,30.4067913935205,0 -86.6208256693825,30.4145518175759,0 -86.7915530723426,30.4039694647944,0 -86.8338822668909,30.3997351946409,0 + + + + + + + + + -80.73583342138031,28.7888443728242,0 -80.8624380297225,28.9916256739697,0 -80.8990978307606,29.0615113380843,0 -80.9162872259714,29.0718222697753,0 -80.891079384763,29.0133938389067,0 -80.8171798101218,28.895390595308,0 -80.76333034164141,28.8220678253514,0 -80.73583342138031,28.7888443728242,0 + + + + + + + + + -80.7258997483759,28.7843659964936,0 -80.64119767311181,28.6573460126368,0 -80.7540684017207,28.7368838886358,0 -80.7349947909981,28.7066171587924,0 -80.7859302565314,28.6877162616962,0 -80.7804452685255,28.6189606122974,0 -80.6918815595558,28.5883502247698,0 -80.6600431301066,28.6186511090254,0 -80.5991290711823,28.6039228263252,0 -80.5774466899765,28.54865343771141,0 -80.6216302365325,28.4126591437007,0 -80.5876558561293,28.4092601916422,0 -80.5259480649338,28.4634626289081,0 -80.579689196541,28.5901540601732,0 -80.7258997483759,28.7843659964936,0 + + + + + + + + + -80.68862382465591,28.5817643631259,0 -80.7210434793205,28.3854010160234,0 -80.605571665409,28.14494461734,0 -80.66711056958739,28.301841271446,0 -80.6627305489283,28.4274102077487,0 -80.60919283666981,28.5735665270911,0 -80.6537947563473,28.6008904599418,0 -80.68862382465591,28.5817643631259,0 + + + + + + + + + -82.1019415480461,26.586077179011,0 -82.1286518307944,26.6936913317227,0 -82.1833101452127,26.6834323648282,0 -82.13570958489,26.6426298555739,0 -82.0974560861241,26.4939425477023,0 -82.06695301795411,26.4975643713843,0 -82.1019415480461,26.586077179011,0 + + + + + + + + + -80.24945367787321,25.354937643044,0 -80.3616011380102,25.2964992519179,0 -80.3302969914516,25.2679815350763,0 -80.3530636815586,25.2115321598761,0 -80.5878197219821,24.9563763998019,0 -80.355665273095,25.1582335995928,0 -80.24945367787321,25.354937643044,0 + + + + + + + + + Georgia + empty + + +states.AREA: + 58629.222 + + +states.STATE_NAME: +Georgia + + +states.STATE_FIPS: +13 + + +states.SUB_REGION: +S Atl + + +states.STATE_ABBR: +GA + + +states.POP2000: + 8186453 + + +states.POP2001: + 8423422 + + +states.POP00_SQMI: + 140 + + +states.DEN_0_100: + 88 + + +USStates.ID: + 4 + + +USStates.State_Name: +Georgia + + +USStates.Date_Entered: +Jan. 2 1788 + + +USStates.Year_Entered: +1788 + + +USStates.Year_Settled: +1733 + +]]> + #Style_5 + + + -83.4542258116492,32.6550957052741,0 + + + + + + + -85.1301648712312,31.778853672117,0 -85.11528693111811,31.731565957183,0 -85.11867442354141,31.7085715963854,0 -85.1112049587349,31.6842421102739,0 -85.0592853056629,31.6212651525335,0 -85.04272135787051,31.5543898029988,0 -85.0426984349451,31.5196599288858,0 -85.0663120282063,31.4760895555663,0 -85.0614062661802,31.4406634414676,0 -85.0879419916334,31.3672341961667,0 -85.0825631900095,31.33233449639,0 -85.0812280506442,31.3030803697052,0 -85.1033613685017,31.2714361848353,0 -85.09360326113141,31.2270745000222,0 -85.1029571297253,31.1969220462589,0 -85.0933668734253,31.1722112527352,0 -85.06866250314511,31.1623640897378,0 -85.038068227176,31.1267131739262,0 -85.01699565076569,31.0801028338282,0 -85.00160719763341,31.0012534003007,0 -85.0001419997276,30.9793194525836,0 -84.97356770002369,30.9636643794248,0 -84.9690122705718,30.9270937759378,0 -84.9377761495732,30.8949576392884,0 -84.9269262387193,30.8469221763844,0 -84.93256395069341,30.802625045985,0 -84.9268948431928,30.7760887042882,0 -84.915343413445,30.7540898084089,0 -84.8882887897453,30.7438893824889,0 -84.86458306959619,30.7145032030319,0 -84.8630037111776,30.7126645389724,0 -84.3744481609224,30.6940918759687,0 -84.2816633081929,30.6904191353307,0 -84.07556221707689,30.6785776000623,0 -84.00073015189621,30.6755376606981,0 -83.7378439398488,30.6604911909877,0 -83.6090560569222,30.6507845923385,0 -83.31060073866981,30.6343032375269,0 -83.30131548232799,30.6332849379512,0 -83.13244038033891,30.6213413987424,0 -82.6963559598951,30.5957200992445,0 -82.5829575782702,30.5890537915584,0 -82.46313488325031,30.5826898377285,0 -82.41209267091981,30.5773075208331,0 -82.2210395703097,30.5670760290347,0 -82.2383961480861,30.53144474306101,0 -82.2193674835883,30.5029705380916,0 -82.1991871719511,30.4900145014502,0 -82.2055648250395,30.4238531552503,0 -82.1802341078135,30.3686309203557,0 -82.1646391875519,30.3612918341259,0 -82.0527668135565,30.3637944548298,0 -82.0383547553639,30.3789045785554,0 -82.0460994945739,30.4340681576703,0 -82.0351206760364,30.442878325233,0 -82.0225094921996,30.4777178378262,0 -82.00580162815341,30.5709905104499,0 -82.0136526868731,30.5986905381626,0 -82.044911618847,30.6509107642683,0 -82.0318811960902,30.75753276526,0 -82.0129673359901,30.7642564144355,0 -82.015538717102,30.7913192479577,0 -81.9814798819521,30.7783517328393,0 -81.96155137217021,30.7960077712109,0 -81.95302920945851,30.8204309615747,0 -81.9438049950591,30.8242494271993,0 -81.9075183587545,30.8134750654558,0 -81.899141093328,30.8283082947867,0 -81.8730017876477,30.7990844044587,0 -81.803198160572,30.7880849801985,0 -81.77670793959879,30.7615846557533,0 -81.7577101754202,30.7696316702207,0 -81.7366750235978,30.7638888413088,0 -81.7167688183456,30.7453688965497,0 -81.64247751744411,30.7290809870991,0 -81.6279809976449,30.7317742622409,0 -81.6047710156425,30.7163212810582,0 -81.6011698908184,30.7248871300769,0 -81.5365912711366,30.706577299159,0 -81.52859548779161,30.7214526527694,0 -81.49838215972861,30.7575148369311,0 -81.529269052571,30.8647786931871,0 -81.4848273848571,30.9449000982573,0 -81.5285609645024,30.9621190260309,0 -81.4908554850397,30.9858121631104,0 -81.5354294328489,31.0767563036925,0 -81.4753376980902,31.0438233173066,0 -81.52525924876009,31.0865485378616,0 -81.52838810570471,31.1311281139373,0 -81.3810060604754,31.1489458440312,0 -81.31024963168881,31.2426949085912,0 -81.30083493289349,31.2758189009071,0 -81.3888131895834,31.2971490597463,0 -81.3947715908228,31.2640900090948,0 -81.4103443748257,31.3114801993601,0 -81.36558128684681,31.3445548526356,0 -81.3130659410716,31.3375975453654,0 -81.2085717415423,31.466897315876,0 -81.1947704996618,31.5051521393949,0 -81.23914509534541,31.5568831089359,0 -81.2407192840183,31.6401735904022,0 -81.1871897446126,31.5998982648136,0 -81.1349370156985,31.64607010904041,0 -81.2897291147454,31.799665157239,0 -81.1751775864286,31.7358025222833,0 -81.19636638291649,31.7848438785274,0 -81.1740127367476,31.7998108690079,0 -81.13682407277911,31.7270738398996,0 -81.06104273006601,31.7775429698153,0 -81.0390109744209,31.8233600040029,0 -81.1414678053095,31.8535166905114,0 -81.1802499193908,31.89767267427,0 -81.2201057693034,31.8931398643438,0 -81.2064883559565,31.9206507082445,0 -81.244947183707,31.8946916725745,0 -81.2842943640751,31.9494280109591,0 -81.23968322486699,31.9034156747495,0 -81.2039099248023,31.9284324409696,0 -81.19730252637351,31.9198956907679,0 -81.20725811895009,31.900120837565,0 -81.1799984795161,31.9058911046943,0 -81.13985081872011,31.8643404881217,0 -80.97087558424499,31.8903139501193,0 -80.9735561398863,31.9479287150516,0 -80.8947535795152,32.0059939238177,0 -81.10487575967311,32.1054460026813,0 -81.11911230742351,32.1176140300944,0 -81.1147177986615,32.1905932444351,0 -81.1476925517913,32.2244467846609,0 -81.1481731109993,32.2577131389355,0 -81.1240481751459,32.2766445515914,0 -81.131890044888,32.3326183284591,0 -81.1418842567213,32.348467456337,0 -81.15747907871371,32.3387404019195,0 -81.1791229158612,32.3717812943982,0 -81.17825274918771,32.3868294350367,0 -81.19992690502011,32.4203165559094,0 -81.19515724784431,32.4645607584348,0 -81.23623978837119,32.520613973536,0 -81.26798547886391,32.5339298482675,0 -81.2743023822226,32.5548140176008,0 -81.298983534041,32.567287009571,0 -81.3404038613665,32.5713602924434,0 -81.3514893657912,32.5835283490035,0 -81.36670254638879,32.5819794584472,0 -81.3662676134818,32.5883649179497,0 -81.3849063649096,32.5958830263814,0 -81.41210528286091,32.6256090136088,0 -81.3994783141749,32.6508153349079,0 -81.4071915250438,32.6867019963945,0 -81.4205354721022,32.7015669413645,0 -81.4076260787666,32.7418061601564,0 -81.4230377099309,32.7498126483616,0 -81.41607199831719,32.7567284399427,0 -81.4302403174263,32.7861535714108,0 -81.4208333313248,32.8094947304519,0 -81.4303092863297,32.8203050210012,0 -81.4239616394502,32.831771535068,0 -81.4323312938326,32.8416816085137,0 -81.4553190013329,32.8445766582975,0 -81.4585388413489,32.8714003875851,0 -81.4832049987009,32.876092075685,0 -81.4650317117614,32.8977282069894,0 -81.47704813306041,32.8975717263241,0 -81.5102366685686,32.9472214740899,0 -81.509839970123,32.9554188973732,0 -81.4978997781492,32.9596759183359,0 -81.49273484682441,33.0048133137248,0 -81.50874915476361,33.0127933490709,0 -81.5296007135576,33.0439278437875,0 -81.54765985031411,33.0436837254085,0 -81.56003498198071,33.0608149350319,0 -81.59582519226061,33.07079003117,0 -81.610962223749,33.087875452303,0 -81.7042792512713,33.1229388681766,0 -81.740374666284,33.1446970762157,0 -81.76340826403511,33.1698348857377,0 -81.7595935205582,33.1953809754874,0 -81.7698781322982,33.2138814847346,0 -81.7798346609471,33.2173679140961,0 -81.8015635396811,33.2079267401357,0 -81.8107647427681,33.2264425091539,0 -81.85396307448509,33.2435008646337,0 -81.83679654832591,33.2606131041944,0 -81.8398406003094,33.2733079499958,0 -81.826572899138,33.2694248257545,0 -81.86071475702811,33.2970915898305,0 -81.8401072844714,33.3083447178855,0 -81.86554408069119,33.3156684726899,0 -81.87687401673379,33.3068376679828,0 -81.893483278419,33.3352369460829,0 -81.9120917492517,33.3321965848843,0 -81.9114125905005,33.3494956248163,0 -81.9367121514194,33.3504376050416,0 -81.9450663328463,33.3771470802287,0 -81.9258093500634,33.3765598081382,0 -81.9403358095376,33.408163308089,0 -81.91356363208369,33.4154417359506,0 -81.9272738095671,33.4361432282633,0 -81.9166380824955,33.451332910189,0 -81.93638328061149,33.4710196640405,0 -81.9809170141647,33.4907366765445,0 -81.99653471071351,33.5204905181363,0 -82.02014061005811,33.5387321304637,0 -82.0385431417392,33.5475058176817,0 -82.0656815446151,33.5738649217255,0 -82.1164029880357,33.5947766297079,0 -82.1389789104035,33.5939068648655,0 -82.1671320836866,33.6152152043502,0 -82.1921876394497,33.6238399454958,0 -82.21420671543,33.6807345454544,0 -82.2348981721706,33.6903395482787,0 -82.2662179171499,33.7615957491367,0 -82.3055105866775,33.7826480434626,0 -82.3111185523946,33.8039143524229,0 -82.3513115818956,33.8353919365428,0 -82.3657086388162,33.8360097346945,0 -82.390596547794,33.8541402272832,0 -82.424525414299,33.8602546364245,0 -82.4566308989782,33.8782248379062,0 -82.51753847434971,33.931029734258,0 -82.576614784124,33.9592878315125,0 -82.5736087006275,33.9689044112754,0 -82.5961385808407,34.0134202383713,0 -82.6029437979289,34.0346366848087,0 -82.66035530356881,34.1083560439036,0 -82.73578078298991,34.1697961502507,0 -82.74259356012441,34.2055536194311,0 -82.7580279876581,34.2333729594522,0 -82.76416996771751,34.2809601537556,0 -82.78287043804779,34.2905157146731,0 -82.80858305350149,34.3398998890232,0 -82.8364394858077,34.3710462423795,0 -82.844092601526,34.4126753526629,0 -82.8680428963264,34.4575429723072,0 -82.9050550411483,34.4779853553029,0 -82.9819628115439,34.4764970914664,0 -83.0079495911058,34.4708283883787,0 -83.0549948395099,34.4900615932447,0 -83.0790212167266,34.5189724434825,0 -83.1081211059023,34.5350165151609,0 -83.13736602628759,34.5678676740658,0 -83.1589505272632,34.5768318282397,0 -83.1648789222652,34.5989373632901,0 -83.23698727342099,34.6133215989917,0 -83.29889480454101,34.6629454181783,0 -83.3397900149061,34.6776926363039,0 -83.3506851506329,34.7096474786312,0 -83.3503341394554,34.72738151575,0 -83.3234241306547,34.752233551772,0 -83.32269057154549,34.787244331982,0 -83.3027537558249,34.8055316318054,0 -83.2701139291264,34.8150795057964,0 -83.26777101073991,34.8392299311095,0 -83.25042127245131,34.8397104674801,0 -83.25030657832789,34.8501663657462,0 -83.23568791389251,34.8623846921569,0 -83.243073026274,34.8780818464701,0 -83.2328036461865,34.8738209511595,0 -83.21942855420581,34.8891824860544,0 -83.203513267742,34.8841701297206,0 -83.1821802554349,34.9106474165588,0 -83.1583528037159,34.9176510672928,0 -83.1550259840766,34.9322800740411,0 -83.13756183146759,34.9304757693624,0 -83.1256365359246,34.940790436291,0 -83.1131011728063,34.9361251832685,0 -83.1273147785663,34.9543742120639,0 -83.12140170134001,34.9608933437966,0 -83.1155422841629,34.9546869901268,0 -83.1004503495987,34.9841622888642,0 -83.1061569738507,35.000366708131,0 -83.5128876420542,34.9921157535224,0 -83.5492972918908,34.9896284845873,0 -83.93789913149431,34.9894775119032,0 -83.9884542500545,34.9891518047362,0 -84.118152397807,34.9883069959845,0 -84.3237734916339,34.989090556154,0 -84.61868470932861,34.9887597674461,0 -84.7711343281899,34.9907572255424,0 -84.8004169251833,34.9928322796908,0 -84.96785715657791,34.9926829480827,0 -84.97279353781779,34.9926295267483,0 -85.2677172911793,34.9891498087636,0 -85.3599438878245,34.9899781417047,0 -85.4673839007084,34.9901237462044,0 -85.6089602162505,34.9901641616199,0 -85.5830580356282,34.8623226551191,0 -85.5346925955902,34.6224884025546,0 -85.52583413117669,34.5846856151065,0 -85.5118559301513,34.5230148510197,0 -85.46028592417321,34.2901615301398,0 -85.4165672299404,34.0869203579979,0 -85.3957377905852,33.9598292697156,0 -85.38401093584911,33.9054097874599,0 -85.33528685109771,33.6549230949434,0 -85.3049800767665,33.4905940310641,0 -85.2938249844532,33.425875708363,0 -85.2338462673976,33.129237260647,0 -85.2335028922441,33.1201394011529,0 -85.1807197284529,32.8718130182966,0 -85.1623013377526,32.8074457725548,0 -85.1280898176054,32.7770703815279,0 -85.1333007048373,32.7563151798039,0 -85.1248851250497,32.7443832224212,0 -85.1138678519411,32.7343891188468,0 -85.10773330416841,32.6899723746491,0 -85.0904749305908,32.6761523261383,0 -85.10380371878141,32.6459103823229,0 -85.0863240406897,32.6284512647951,0 -85.0841493949267,32.603004344931,0 -85.0707744216369,32.5812538387594,0 -84.9956522169706,32.518928479096,0 -84.9898150430422,32.4548361836926,0 -84.9653850518902,32.4294501858587,0 -84.970961884914,32.3968128124947,0 -84.9844889642181,32.3870933241337,0 -84.97166353138461,32.3715031963467,0 -85.0020899980221,32.3470785227396,0 -85.0053324510846,32.3295925258289,0 -84.92107090555641,32.2931369847317,0 -84.8946035025639,32.2687353881118,0 -84.8940158788823,32.2591761298648,0 -84.9053609608961,32.2495557759674,0 -84.92367962799079,32.2473889995768,0 -84.9160041260552,32.2285563686775,0 -84.9283716437355,32.2179784387895,0 -84.9757438025875,32.2122487204353,0 -84.9603852752889,32.1919284376309,0 -85.0078260926386,32.1788785384061,0 -85.0243823514691,32.1662750781008,0 -85.0533136579289,32.1266376448382,0 -85.046187259254,32.0908949913561,0 -85.0566549357244,32.0696439454843,0 -85.0620107617352,32.0500102920991,0 -85.0567002477577,32.0173765203509,0 -85.0700671081992,31.9807030736301,0 -85.11515025581549,31.9074247500776,0 -85.1355669344631,31.8548844137198,0 -85.1315611123421,31.7838145657199,0 -85.1301648712312,31.778853672117,0 + + + + + + + + + -81.48505559674619,30.9038830704629,0 -81.50330537724329,30.8817350483411,0 -81.4698871419111,30.8602588644255,0 -81.4794603415988,30.7368833934474,0 -81.45571660482371,30.7164274298842,0 -81.4030527080982,30.9388031406114,0 -81.41640510474601,30.970600047506,0 -81.48505559674619,30.9038830704629,0 + + + + + + + + + Hawaii + empty + + +states.AREA: + 6380.614 + + +states.STATE_NAME: +Hawaii + + +states.STATE_FIPS: +15 + + +states.SUB_REGION: +Pacific + + +states.STATE_ABBR: +HI + + +states.POP2000: + 1211537 + + +states.POP2001: + 1211960 + + +states.POP00_SQMI: + 190 + + +states.DEN_0_100: + 83 + + +USStates.ID: + 50 + + +USStates.State_Name: +Hawaii + + +USStates.Date_Entered: +Aug. 21 1959 + + +USStates.Year_Entered: +1959 + + +USStates.Year_Settled: +1820 + +]]> + #Style_5 + + + -156.326917860547,20.2401578536914,0 + + + + + + + -159.335174733889,21.9483433404175,0 -159.327130348878,22.0446395507162,0 -159.295025589769,22.1248124949548,0 -159.343195828355,22.1970166285359,0 -159.391366885913,22.2291198667724,0 -159.576012589057,22.2131796383001,0 -159.712505933171,22.1490592515515,0 -159.800814224332,22.0366665967853,0 -159.736592652746,21.9644203111023,0 -159.640246973766,21.9483657695954,0 -159.576021285803,21.8841361312636,0 -159.439545188912,21.8680716835921,0 -159.335174733889,21.9483433404175,0 + + + + + + + + + -160.073803556017,22.0041773078075,0 -160.121962433575,21.9639787234984,0 -160.22633646805,21.8915919620539,0 -160.242406159206,21.8032804408925,0 -160.202259673133,21.7953086498352,0 -160.170137686564,21.8675963686431,0 -160.089858388217,21.9158698594272,0 -160.04970969565,21.9881641068501,0 -160.073803556017,22.0041773078075,0 + + + + + + + + + -157.673329876454,21.2980271804006,0 -157.713472767801,21.3863351682207,0 -157.761642948927,21.4585875674916,0 -157.809815119729,21.4345051589313,0 -157.849959026307,21.5067588029631,0 -157.914179741199,21.6352084806278,0 -157.986428112199,21.6994328594403,0 -158.042626247904,21.6753505680564,0 -158.114894071646,21.5790166217416,0 -158.267431808754,21.5870425200507,0 -158.243342775004,21.5388789757719,0 -158.235318726083,21.4746525812457,0 -158.130951115411,21.3542322862678,0 -158.098833012334,21.2900079773187,0 -157.946306402713,21.3060610107082,0 -157.898134535461,21.3301442923012,0 -157.825871692713,21.249863668784,0 -157.721501646872,21.2819711706226,0 -157.681371117927,21.2739428101649,0 -157.673329876454,21.2980271804006,0 + + + + + + + + + -156.717872676999,21.1374197607644,0 -156.942682512532,21.1615268671346,0 -156.958733487556,21.2096935134305,0 -157.006903742467,21.1856106379825,0 -157.167471487889,21.1936404563437,0 -157.23169415835,21.2337763231398,0 -157.247747506123,21.1615304515084,0 -157.303948796958,21.1374484326638,0 -157.287897522787,21.0812505718402,0 -157.071131928318,21.1053309568586,0 -156.886484099806,21.049134117125,0 -156.766048197649,21.0651768177371,0 -156.717872676999,21.1374197607644,0 + + + + + + + + + -156.196045412482,20.6316494073652,0 -156.131808903973,20.6236229186799,0 -156.043511542555,20.6557325999668,0 -155.98731705257,20.7520616316876,0 -156.011392452548,20.8002253216075,0 -156.260263363072,20.9286712687479,0 -156.356603503292,20.9447263610079,0 -156.477022052544,20.8965651391117,0 -156.525191645863,20.9848701637724,0 -156.597439619788,21.0410647054158,0 -156.653636007318,21.0169850495629,0 -156.693782634023,20.9126240100612,0 -156.637586604165,20.8082609120439,0 -156.525193571704,20.7761496574975,0 -156.493074740185,20.7922042815103,0 -156.460971893198,20.7279810872564,0 -156.436879230878,20.6236212173367,0 -156.396734942946,20.567426981473,0 -156.276317407393,20.5834838609152,0 -156.196045412482,20.6316494073652,0 + + + + + + + + + -157.039050670938,20.928706972385,0 -157.055098211979,20.880538425907,0 -156.982826322974,20.8323776268078,0 -156.990863465776,20.7922371514621,0 -156.96676559866,20.7280207316388,0 -156.886487178396,20.7360494091678,0 -156.814225697816,20.7922527172797,0 -156.806205341549,20.8404186121726,0 -156.910585845163,20.9287186176943,0 -157.039050670938,20.928706972385,0 + + + + + + + + + -155.666192321268,18.921786345087,0 -155.537729780537,19.0422106324423,0 -155.521678713445,19.1224845466533,0 -155.304899038619,19.234878398743,0 -155.152372136648,19.2669919638143,0 -155.015881706841,19.3312115354762,0 -154.927581824535,19.4195186485267,0 -154.815187460665,19.4596764207728,0 -154.791096018678,19.5399604106849,0 -154.975762475196,19.6523353631656,0 -154.975763078096,19.7406434419399,0 -155.072105964772,19.7245855257612,0 -155.096185006144,19.8771146284228,0 -155.200550212445,19.9975288183811,0 -155.561825953369,20.134006968001,0 -155.73844208468,20.2062567699811,0 -155.858857946276,20.2704795241864,0 -155.8909788308,20.1741490505645,0 -155.834786659291,20.0617574252623,0 -155.826761720261,20.0055628964617,0 -155.882958698574,19.9333119780873,0 -155.979300942813,19.8209225278706,0 -156.043524655521,19.7807832517673,0 -155.971258610598,19.6282527113542,0 -155.947178326912,19.4837502062815,0 -155.874927042962,19.3713586083673,0 -155.907031019716,19.1305132974745,0 -155.858861500485,19.0101009103203,0 -155.778585834471,19.01009268801,0 -155.666192321268,18.921786345087,0 + + + + + + + + + Idaho + empty + + +states.AREA: + 83343.643 + + +states.STATE_NAME: +Idaho + + +states.STATE_FIPS: +16 + + +states.SUB_REGION: +Mtn + + +states.STATE_ABBR: +ID + + +states.POP2000: + 1293953 + + +states.POP2001: + 1323472 + + +states.POP00_SQMI: + 16 + + +states.DEN_0_100: + 99 + + +USStates.ID: + 43 + + +USStates.State_Name: +Idaho + + +USStates.Date_Entered: +July 3 1890 + + +USStates.Year_Entered: +1890 + + +USStates.Year_Settled: +1842 + +]]> + #Style_5 + + + -114.661865415542,44.3858954726855,0 + + + + + + -117.026295220045,43.6790312226004,0 -117.018864363596,41.9947941808341,0 -116.992313337997,41.9947945094663,0 -115.947544658193,41.9945994628996,0 -115.024862911148,41.9965064559528,0 -114.269471632825,41.9959242345073,0 -114.039072662345,41.9953908974688,0 -112.989575449033,42.0011467864027,0 -112.147116504391,41.9990540573659,0 -112.100514491537,42.0023005848578,0 -111.494586313343,42.0001709690538,0 -111.04869741386,41.9962033494069,0 -111.046780328328,42.503251870505,0 -111.04921566545,43.0198830902658,0 -111.047498202203,43.2847346290475,0 -111.046771181184,43.5155282322774,0 -111.050405173289,43.9825533508377,0 -111.051560651262,44.4733232643312,0 -111.094630553034,44.4861244421476,0 -111.128918633835,44.5007569482957,0 -111.134358940584,44.5279024352059,0 -111.170241896337,44.5451861352417,0 -111.178764521847,44.5648509025126,0 -111.219507505818,44.5731699249139,0 -111.234233165171,44.6025621977815,0 -111.219797798385,44.6179816965382,0 -111.223971342305,44.6269081075219,0 -111.270665480153,44.6422120666433,0 -111.270207923466,44.6738019972086,0 -111.295668417103,44.6829380106443,0 -111.315475367488,44.7051930233212,0 -111.31922172667,44.7278640397875,0 -111.349977174405,44.7261775679182,0 -111.372309536392,44.7450870429474,0 -111.384959585063,44.7376939086963,0 -111.395084047622,44.7088695111883,0 -111.44363207933,44.7131796185895,0 -111.475425113078,44.7021622259545,0 -111.480804007084,44.6914159868954,0 -111.460691885141,44.6700230655225,0 -111.458265515114,44.6525553200246,0 -111.470167827235,44.6407103470055,0 -111.50769070953,44.6376885788042,0 -111.501747128314,44.6159712293443,0 -111.514526468783,44.5931969532598,0 -111.492903869929,44.5511890986189,0 -111.462827429646,44.5499420909707,0 -111.459325300921,44.5379218382476,0 -111.482573106114,44.536143833035,0 -111.490240946754,44.5286973145766,0 -111.56723085062,44.5528666934207,0 -111.605248563607,44.542989843785,0 -111.684862667357,44.5507519238675,0 -111.716997718561,44.5337606582907,0 -111.766918095449,44.5188253853155,0 -111.792608215621,44.5184627416638,0 -111.80783730012,44.5039818716956,0 -111.872502337514,44.5562658469912,0 -111.940385892152,44.5497266545093,0 -111.977818321591,44.5296761932588,0 -112.023613199364,44.5350432018407,0 -112.027077158683,44.5228438141025,0 -112.059366916596,44.5286115853182,0 -112.099896990645,44.5182317486371,0 -112.124190576071,44.5282529189526,0 -112.19965792462,44.5314495370004,0 -112.217763617989,44.538495263148,0 -112.230398525049,44.5594913548598,0 -112.256675563109,44.5599718966745,0 -112.282341327877,44.5417028629559,0 -112.342507416987,44.5251001904491,0 -112.34057705949,44.4971802630882,0 -112.367583641487,44.4492705303202,0 -112.420753287455,44.4492848652432,0 -112.458519702915,44.4688346426366,0 -112.501839547759,44.4629973763857,0 -112.539324359313,44.4774975037791,0 -112.653189032213,44.4808022867295,0 -112.714325884719,44.4969354760903,0 -112.733712266678,44.4843203521209,0 -112.779863145228,44.473921967913,0 -112.796227919073,44.4580108762872,0 -112.826691426867,44.4210844413589,0 -112.818709940506,44.3948197608762,0 -112.817396542611,44.3642025255851,0 -112.844275309657,44.353639685816,0 -112.870781128928,44.3699785388203,0 -112.887307562786,44.392852037925,0 -112.938281270743,44.407192303823,0 -112.985249652408,44.4355404997863,0 -113.012014532,44.4377151798982,0 -113.006658758598,44.4526157258091,0 -113.020309135991,44.4817760622967,0 -113.007713096479,44.5106119571576,0 -113.037821112649,44.5329591224566,0 -113.039660671342,44.5562941508867,0 -113.083036889648,44.5826813811508,0 -113.054289194175,44.6242889653874,0 -113.073143949778,44.6755255639002,0 -113.098955981719,44.6959159515966,0 -113.101703254015,44.7151730541415,0 -113.127431313459,44.7373793502759,0 -113.138273905949,44.7614392171565,0 -113.24033835154,44.8118408943235,0 -113.257154262582,44.810486836588,0 -113.318680101131,44.7802285072048,0 -113.340631071319,44.7790001716196,0 -113.350024223891,44.8075686572204,0 -113.42137886332,44.8336996325871,0 -113.445573357454,44.8512398138089,0 -113.496190944735,44.9306703825127,0 -113.487348245354,44.9395739483575,0 -113.463413760979,44.9407755008957,0 -113.448764850883,44.9495226314899,0 -113.44102942911,44.9981947865069,0 -113.458853128792,45.0274494937816,0 -113.455435394093,45.0433489576732,0 -113.486305515199,45.0583215917022,0 -113.490158803375,45.07121894252819,0 -113.520609069994,45.08206385133451,0 -113.510225662875,45.1078357229334,0 -113.552272678027,45.1075492325193,0 -113.574375982832,45.1177112498262,0 -113.571583860449,45.1345453195545,0 -113.594099232644,45.149742661863,0 -113.600928342409,45.1809921888967,0 -113.64559265708,45.2067902002949,0 -113.690120087671,45.262281529236,0 -113.68870893801,45.2777882479016,0 -113.739080720354,45.3215307727051,0 -113.741309985249,45.3823864841092,0 -113.775025938091,45.4101724087205,0 -113.785662417081,45.4456336800122,0 -113.769167956071,45.4777077122394,0 -113.772304324589,45.5070541264418,0 -113.780933520736,45.5168654883577,0 -113.833715005823,45.5149081483478,0 -113.803754486689,45.5837295106944,0 -113.822485335827,45.6006361604291,0 -113.852027200864,45.60956236649611,0 -113.903305686338,45.6134911520045,0 -113.902199681462,45.6372529821309,0 -113.923532205814,45.6551247458339,0 -113.926698671543,45.6712113532369,0 -113.964144746081,45.67937838995221,0 -113.971148905291,45.6973761439766,0 -114.009472169193,45.6863322994531,0 -114.019878777802,45.6723780179129,0 -114.010990085379,45.6525110636154,0 -114.018032071357,45.6407731495898,0 -114.05651557884,45.6251440063411,0 -114.082966989764,45.5863787056049,0 -114.118139289111,45.57112721879371,0 -114.132047849072,45.550382696738,0 -114.172667788196,45.54392407099141,0 -114.194808749935,45.5279173495385,0 -114.241997909503,45.5352908283129,0 -114.247880062291,45.5029457876717,0 -114.26223890106,45.4858597041806,0 -114.326434503356,45.4574246659907,0 -114.350246661543,45.4633830586196,0 -114.371457222895,45.485740801367,0 -114.419051016147,45.4990079989286,0 -114.433555120266,45.5276335826489,0 -114.462708066367,45.547847634842,0 -114.49659127146,45.5466496233752,0 -114.527392140633,45.5581929137358,0 -114.56092431692,45.5487399822622,0 -114.540957804767,45.59639733862921,0 -114.564678473634,45.624271464153,0 -114.501741735013,45.65239374591759,0 -114.510706655448,45.6740575393162,0 -114.497560885022,45.6944015040476,0 -114.534976768211,45.7229965521011,0 -114.541958001694,45.7459993063995,0 -114.563542382615,45.76239875426181,0 -114.517375770656,45.8100678088233,0 -114.499164076216,45.8426838388298,0 -114.473803267544,45.8394681128492,0 -114.443231585826,45.8526214179583,0 -114.407525017428,45.84645312785811,0 -114.392838283787,45.870886524333,0 -114.413530117056,45.9106511998636,0 -114.429460795441,45.9214773546562,0 -114.405290578501,45.9539789286456,0 -114.412447296507,45.971972990138,0 -114.484455408522,45.9898066653888,0 -114.474529639485,46.0097653411895,0 -114.494321056653,46.0234105503775,0 -114.465756583121,46.05081557880481,0 -114.456029627256,46.0822298311072,0 -114.477370071638,46.1073573510943,0 -114.506568594996,46.116142578097,0 -114.518944233429,46.13606300379761,0 -114.509613705042,46.1574178541686,0 -114.467017880608,46.1552626443821,0 -114.440879403543,46.1689689930953,0 -114.439553093386,46.2202541051873,0 -114.472833625773,46.2437832404928,0 -114.473795189375,46.25296144733741,0 -114.431795791851,46.2847113519319,0 -114.409796078984,46.3929118282104,0 -114.397016905685,46.39954564895069,0 -114.384024894777,46.4281789078305,0 -114.410714938833,46.4873716679663,0 -114.360467827582,46.5061249643996,0 -114.350115003954,46.51738981557321,0 -114.343319528083,46.58788169279891,0 -114.324712393283,46.6228397420843,0 -114.334685197666,46.6542270306183,0 -114.384017731174,46.6615966222723,0 -114.441535907613,46.64571558739091,0 -114.48471804306,46.6235748090716,0 -114.54039089668,46.63789093313041,0 -114.610825986771,46.6290480359896,0 -114.644740120825,46.6608240472296,0 -114.645038012873,46.6709214874172,0 -114.625926712927,46.6871072963735,0 -114.673887229565,46.73472166479179,0 -114.698431226356,46.73376015783131,0 -114.748105478154,46.695132417127,0 -114.782919473288,46.7030400738234,0 -114.777832199076,46.7557169515489,0 -114.794030033961,46.7665316733836,0 -114.840791891296,46.7755381340251,0 -114.866603242816,46.7970455479343,0 -114.902324956243,46.7994334872257,0 -114.948408839876,46.85244681299441,0 -114.940566557467,46.8908879547799,0 -114.92412521448,46.9071654671376,0 -114.964730239693,46.9252129542069,0 -115.001574268432,46.9588093410594,0 -115.037334581308,46.9630013040754,0 -115.055638385326,46.97335809520661,0 -115.081336055121,47.0265244081573,0 -115.135507084528,47.0635505060209,0 -115.148683842445,47.09174197245919,0 -115.172496072325,47.097570775052,0 -115.193073569516,47.1240264397241,0 -115.296234653795,47.179550129713,0 -115.325227834205,47.2451499352386,0 -115.343661098271,47.25502252875,0 -115.40820774964,47.2635936928256,0 -115.42664105155,47.2743741901806,0 -115.501930155564,47.2816443931147,0 -115.523064072441,47.2919825693658,0 -115.555520671095,47.3346132613456,0 -115.599535907233,47.3700033411226,0 -115.638782326482,47.3800438733229,0 -115.666477789603,47.3991675172781,0 -115.750326632884,47.4224758337817,0 -115.75010555794,47.4339660678209,0 -115.732481530032,47.4453037682126,0 -115.656087137581,47.449179888517,0 -115.643185737842,47.45779380748271,0 -115.64014181996,47.47523519828921,0 -115.692770525831,47.4895405775821,0 -115.701522643005,47.5208936310403,0 -115.742829391272,47.5336915052907,0 -115.69208790895,47.59072095328569,0 -115.698284137246,47.616080699199,0 -115.734067407585,47.6398797756934,0 -115.733665317341,47.6955544944202,0 -115.775727256626,47.7097326241589,0 -115.790537518206,47.74483840017609,0 -115.836742105247,47.75628147907741,0 -115.849323962062,47.8051824706779,0 -115.869809516855,47.82745247882439,0 -115.90392118837,47.841074097063,0 -115.937842286573,47.86712411466291,0 -115.998932367501,47.92514082913019,0 -116.025316086924,47.9649391580749,0 -116.053492448537,47.9761917715222,0 -116.055497508913,48.2084837718549,0 -116.05669220337,48.4986651887118,0 -116.063531289275,48.99995046269709,0 -117.032049523854,48.99993132673121,0 -117.029111695195,48.8380752730768,0 -117.038868452187,48.0461859667744,0 -117.037471831606,47.9710924196381,0 -117.04179475453,47.3614417250081,0 -117.042391922165,47.2585012691796,0 -117.040968412195,47.11931911025491,0 -117.04192619733,46.536601774571,0 -117.038558547134,46.4279805738524,0 -117.044470505763,46.3885739799344,0 -117.064184656311,46.3486979530599,0 -117.027973590879,46.3354269634861,0 -117.001642419838,46.3024487520609,0 -116.972724840347,46.24930935868821,0 -116.967490477604,46.1975539420731,0 -116.929426274379,46.165483265634,0 -116.961637658488,46.0972742225682,0 -116.987211805214,46.07850889735371,0 -116.957723390605,46.06568768466321,0 -116.919132428078,45.995175487463,0 -116.89819704847,45.98051594169479,0 -116.856471818728,45.9035973451801,0 -116.791262487748,45.84586710608541,0 -116.773707129394,45.8197636132853,0 -116.703180308495,45.8191692439007,0 -116.654397936737,45.7806301604239,0 -116.560631908125,45.7474245686917,0 -116.52827492994,45.7107280103095,0 -116.514915090692,45.6644908956717,0 -116.470418797949,45.6062572703347,0 -116.478551260109,45.566058496306,0 -116.554503319145,45.4936471953906,0 -116.565771964133,45.4598636753961,0 -116.672265496083,45.335410289815,0 -116.688813374421,45.2623508428019,0 -116.736585294563,45.1373070907968,0 -116.761268252635,45.1063007182859,0 -116.77809192451,45.0994801033861,0 -116.787210028569,45.075752513234,0 -116.807307341613,45.0497552840876,0 -116.854513190899,45.0169452945603,0 -116.848097045025,45.0000421568822,0 -116.855887624852,44.9799657227584,0 -116.848158998462,44.9717412377244,0 -116.831396506105,44.9726336704264,0 -116.847556799088,44.9548499437335,0 -116.835396183444,44.9201440913313,0 -116.867076347262,44.8686084474449,0 -116.897366859846,44.8485551014903,0 -116.909620757374,44.8289402518746,0 -116.951494105467,44.7760351265198,0 -117.039572246368,44.749115712801,0 -117.066513051783,44.6975569657362,0 -117.079353923671,44.6893364257274,0 -117.130503910469,44.5725238664124,0 -117.143939864097,44.5592869485007,0 -117.1451606624,44.5346556241885,0 -117.187391126196,44.5118056022903,0 -117.203962567437,44.4857855049483,0 -117.224409907123,44.4729870546087,0 -117.217221802736,44.4278552410788,0 -117.236920894466,44.3899826429371,0 -117.201602017039,44.3394380033709,0 -117.217455714498,44.3006651372011,0 -117.213571878683,44.2847196851647,0 -117.170722952687,44.2533327374994,0 -117.143278940324,44.2506322436234,0 -117.112691921322,44.2698052758843,0 -117.100560675447,44.2670779004604,0 -117.081386867577,44.2438466037113,0 -117.052027613364,44.2315559603412,0 -117.030352023293,44.2493365546444,0 -116.99270711064,44.2470633967105,0 -116.976127235356,44.225182362645,0 -116.981871729265,44.1978422986385,0 -116.913051097385,44.1773044506484,0 -116.902254132599,44.1463138321419,0 -116.946886686949,44.0930258111951,0 -116.963443200146,44.090298169114,0 -116.976817765704,44.0738948202899,0 -116.933593484224,44.0142025695716,0 -116.967956848099,43.9631956105834,0 -116.959715844454,43.9285769433414,0 -116.978141228786,43.9044410423274,0 -116.978148119756,43.8734692305504,0 -116.985769945695,43.8593508862889,0 -117.016220426787,43.8529724419634,0 -117.010505344258,43.8397697264411,0 -117.027626548295,43.8315678483138,0 -117.037117330473,43.800141963624,0 -117.023794477971,43.7537015926794,0 -117.026295220045,43.6790312226004,0 + + + + + + + + Illinois + empty + + +states.AREA: + 56299.387 + + +states.STATE_NAME: +Illinois + + +states.STATE_FIPS: +17 + + +states.SUB_REGION: +E N Cen + + +states.STATE_ABBR: +IL + + +states.POP2000: + 12419293 + + +states.POP2001: + 12520522 + + +states.POP00_SQMI: + 221 + + +states.DEN_0_100: + 80 + + +USStates.ID: + 21 + + +USStates.State_Name: +Illinois + + +USStates.Date_Entered: +Dec. 3 1818 + + +USStates.Year_Entered: +1818 + + +USStates.Year_Settled: +1720 + +]]> + #Style_5 + + + -89.20376782672931,40.0640001695085,0 + + + + + + -88.0715914713672,37.5110386032244,0 -88.134202057652,37.5836204217666,0 -88.15766418948979,37.628526559458,0 -88.159404386901,37.6607335395919,0 -88.1336703044624,37.7007907786447,0 -88.0725039638053,37.7354461998767,0 -88.0356073439534,37.8057279050194,0 -88.0860624224551,37.8176568675887,0 -88.0892974561442,37.8312944778462,0 -88.04216892231911,37.8275671956745,0 -88.03427224647881,37.8437911301456,0 -88.0757701619268,37.8678545841173,0 -88.101489939404,37.895351144247,0 -88.10011663858219,37.9062154284197,0 -88.04490053507431,37.8960489721139,0 -88.0266198217967,37.9058031174197,0 -88.0304728445231,37.9176363841544,0 -88.084033312787,37.9237058057134,0 -88.07897489688909,37.9440458253834,0 -88.0646539089454,37.9298283441586,0 -88.0418029841928,37.9345432471494,0 -88.0425431233507,37.9563100133668,0 -88.0217369738459,37.9751012485706,0 -88.0292447284786,38.0082816708523,0 -88.0217296742097,38.0335770457263,0 -88.04150591052481,38.0383492879413,0 -88.0431234631707,38.0451661890239,0 -88.03476137876019,38.0541307602029,0 -87.9753264381124,38.0733527756694,0 -87.96489699678421,38.0967941055912,0 -88.0123608797262,38.092392337746,0 -88.018579177984,38.1033482133547,0 -87.97353404593839,38.1318056958815,0 -87.9505995597833,38.1369591387537,0 -87.932021762155,38.1575737007801,0 -87.9323194769958,38.1711770029956,0 -87.9779598594692,38.2007606004592,0 -87.9860398723023,38.2348604423061,0 -87.98005073657551,38.241131787639,0 -87.92595000854421,38.3048183818949,0 -87.9136816882386,38.3023921025994,0 -87.91413936139951,38.2810944074491,0 -87.8884965521701,38.3007057736598,0 -87.8834763762205,38.3155984794844,0 -87.8740691509129,38.3168343756391,0 -87.8630366972759,38.2854084473723,0 -87.85011225303271,38.2861445830363,0 -87.834532977994,38.3525705303994,0 -87.78404833397759,38.3781708227389,0 -87.7484565770349,38.4180116772378,0 -87.7389806672907,38.4455273875839,0 -87.75868794190011,38.4571433599795,0 -87.7561244372712,38.4661728281435,0 -87.6928444866203,38.4815804420218,0 -87.6799352433336,38.504053007157,0 -87.65355967551621,38.5004900554631,0 -87.65141571258729,38.5154169292116,0 -87.6729692972829,38.547471787341,0 -87.6528804379318,38.5739189952751,0 -87.6406195798681,38.5932251150025,0 -87.61985172548459,38.5992561043613,0 -87.6286714982266,38.6229644058157,0 -87.6252152154989,38.642857998943,0 -87.588501337721,38.6722157708788,0 -87.5439137139998,38.6860210401793,0 -87.50833650081,38.7366800091112,0 -87.5080237439807,38.7697683547433,0 -87.5190486024822,38.7767453485141,0 -87.50790945748121,38.7956049059644,0 -87.5505288034456,38.8579361229776,0 -87.559081635284,38.869856862415,0 -87.5392219544495,38.9049057469745,0 -87.5302039208332,38.9319629772649,0 -87.533492428354,38.9637465338765,0 -87.5479276301993,38.9771206273788,0 -87.5918815898562,38.9941261861117,0 -87.581772429957,38.9957855730057,0 -87.58534329877401,39.062476908506,0 -87.6120316181093,39.0846475088299,0 -87.630891938142,39.0890152076407,0 -87.6316931128207,39.1039838431484,0 -87.66228775754109,39.1135088826113,0 -87.6594801644014,39.1306938293312,0 -87.6703524034648,39.1467190724917,0 -87.64428222970631,39.1685465310611,0 -87.60795025538761,39.196107453445,0 -87.5942322592859,39.1981674228522,0 -87.58861691821311,39.2085051229499,0 -87.5845886371286,39.2487915548446,0 -87.60692047638401,39.2582021441748,0 -87.6158242074897,39.2814561230773,0 -87.61064369979241,39.2976988710138,0 -87.62526201039,39.307441385019,0 -87.5976886138014,39.3383057314831,0 -87.540237703126,39.3505623907844,0 -87.5385896158313,39.4774828667869,0 -87.5355977432246,39.6093761467476,0 -87.5357932746107,39.8873391886275,0 -87.53535686974401,40.1662317074521,0 -87.5356953046261,40.4832822109023,0 -87.5371908503425,40.4946461888117,0 -87.5326961499881,40.7454479031807,0 -87.53205270695879,41.0099629234772,0 -87.5317652032273,41.1737899174832,0 -87.53248451078061,41.3013387221503,0 -87.5326861745456,41.4697503872218,0 -87.5299063108434,41.7236260875045,0 -87.6126760323676,41.8473653861124,0 -87.67060590164419,42.0598519291133,0 -87.7603024221355,42.1564820299593,0 -87.837014916084,42.3142352747747,0 -87.7973819562241,42.4891528495242,0 -88.1947902657089,42.4896315487889,0 -88.29798928423431,42.4919886619727,0 -88.7066230964608,42.4896714789996,0 -88.76505788322029,42.4909223638021,0 -88.93918704924511,42.4908797705788,0 -89.35955888342031,42.4979178413637,0 -89.4006131996787,42.4975019535639,0 -89.8347389483978,42.5034685663175,0 -89.92369141557219,42.5041158651446,0 -90.42010292616368,42.5083649645861,0 -90.6384560963599,42.5093636839918,0 -90.6518991107146,42.4947005718712,0 -90.64847377380832,42.475647019796,0 -90.60595537042839,42.4605645940667,0 -90.5637116510656,42.4218436822154,0 -90.4911711742602,42.3887914637005,0 -90.44172508028031,42.3600836299974,0 -90.4278091232618,42.340644954386,0 -90.4181124359413,42.2639391318113,0 -90.4073017721273,42.2426617515853,0 -90.3678582678001,42.2102266723886,0 -90.3237299895918,42.1973374145764,0 -90.23106311278499,42.1597414854526,0 -90.19170240605,42.1227099310285,0 -90.1762144636605,42.1205242372018,0 -90.1667767223318,42.1037669165116,0 -90.1682262959709,42.0610667627835,0 -90.1506630602384,42.0334532086115,0 -90.1427967503368,41.9839895278463,0 -90.15464484512322,41.9308021367651,0 -90.19596566516668,41.8061669912383,0 -90.2554387407709,41.7817690413387,0 -90.30501586217991,41.756497081381,0 -90.32615702333789,41.722767950897,0 -90.34126241056562,41.6491222689255,0 -90.3394762639213,41.6028314888971,0 -90.34849427679229,41.5868824103659,0 -90.42313526378251,41.5673054184025,0 -90.43509834614001,41.5436125873014,0 -90.45512615442569,41.5275795523085,0 -90.5409754772051,41.5260034668008,0 -90.6008378029169,41.5096188031289,0 -90.6589297375422,41.4623507046517,0 -90.708354613045,41.4500936593358,0 -90.78004268318989,41.44985255988,0 -90.84428378227449,41.4446525356188,0 -90.949800649924,41.4212638456605,0 -91.0008427707096,41.4311127421861,0 -91.02763777623071,41.4235364759013,0 -91.05593554169049,41.4014073054416,0 -91.07342897262021,41.3349253706845,0 -91.10249645615799,41.2678481882471,0 -91.10167201924359,41.2315519929841,0 -91.0564663602341,41.176290257977,0 -91.0184022505193,41.1658577458188,0 -90.9904854657331,41.1444046114074,0 -90.95792988917549,41.1043932523764,0 -90.95479391031741,41.0703973298849,0 -90.96085093423019,40.9505415875963,0 -90.98341896936651,40.9239649616112,0 -91.0493536735639,40.8796233416421,0 -91.08905026959479,40.8337674861069,0 -91.09289515262361,40.7615871092817,0 -91.12013244580791,40.7054430853053,0 -91.1293030749525,40.6821889727746,0 -91.16264440347912,40.6563523669938,0 -91.2150599786405,40.643859446667,0 -91.2622111209491,40.6395869370641,0 -91.3757627300253,40.6034802448646,0 -91.4112710901028,40.5730126128812,0 -91.41302597331141,40.5480345602038,0 -91.38225565222849,40.5285383313692,0 -91.37494647812029,40.5036976293474,0 -91.38555116553908,40.4472940413254,0 -91.3729083225561,40.4030325886378,0 -91.38590919839099,40.3924048874231,0 -91.41896859131511,40.3869192694689,0 -91.44874715640491,40.3719466182637,0 -91.486849457272,40.309668416,0 -91.4990871746939,40.2514224267414,0 -91.50670141476959,40.2005039120117,0 -91.51628405060909,40.1345898206457,0 -91.50416020997871,40.0667571230242,0 -91.4874432777371,40.0057984567776,0 -91.4473948316692,39.9461098791871,0 -91.43054077302692,39.9218827311204,0 -91.4342030257459,39.9018745899127,0 -91.4511409854999,39.885288198019,0 -91.4493403590742,39.8630942448561,0 -91.381863132745,39.8038177672296,0 -91.3735696173857,39.7613181753518,0 -91.3672369870804,39.7246854919977,0 -91.31781179944051,39.6859625802781,0 -91.2033893787345,39.6000674783423,0 -91.15632949744598,39.5526394130489,0 -91.09375072632439,39.5289731742514,0 -91.064521543479,39.4740300232192,0 -91.03647490820309,39.4444585084789,0 -90.94802423776449,39.4006319007784,0 -90.8506238710589,39.3504997276601,0 -90.77946911185738,39.2968502329079,0 -90.7382075249523,39.2478582113647,0 -90.73246246782379,39.2247947417977,0 -90.71831723958958,39.1959215056912,0 -90.7168599355041,39.1442594879132,0 -90.6905224771304,39.0937493584583,0 -90.7077119263589,39.0582272816598,0 -90.70619359871029,39.0378416951969,0 -90.66899973918559,38.9353034194491,0 -90.6273348623125,38.8808451829242,0 -90.57044835788962,38.8713768681923,0 -90.5305451069931,38.8916590934777,0 -90.4699576683671,38.9592275775329,0 -90.41318604000151,38.9623782480884,0 -90.31985371572098,38.9249561810614,0 -90.2790431101957,38.9247652789138,0 -90.2440385800512,38.9145571194291,0 -90.13292049439282,38.8530794199913,0 -90.1132283291809,38.8305155786969,0 -90.1218345138212,38.8005591450278,0 -90.13528557177762,38.7855333244896,0 -90.1635076675385,38.7731473780178,0 -90.19668164834522,38.7240148841336,0 -90.2023506849595,38.7004136293542,0 -90.1836888738229,38.6588222213685,0 -90.1838189833793,38.610322629253,0 -90.24105709170181,38.5628573013572,0 -90.2613445745186,38.532820806846,0 -90.2658995864079,38.5187409219187,0 -90.30195808265761,38.4274101853512,0 -90.3397250925035,38.3909000937545,0 -90.35880701471911,38.365383796682,0 -90.36946594646452,38.3236130942444,0 -90.36488893881901,38.2343531960061,0 -90.3368353674101,38.1887672607723,0 -90.2897533449443,38.1668707739162,0 -90.25417712909579,38.1222235068627,0 -90.20764422452261,38.0889589210515,0 -90.13482705649538,38.0540042508408,0 -90.1194535601973,38.0323252746278,0 -90.04203572235682,37.9932585919637,0 -90.01092211725509,37.9693709792311,0 -89.95833872049469,37.9636867798315,0 -89.97902314782711,37.9119372642027,0 -89.93798377619601,37.8780970980944,0 -89.900659718619,37.8759567792384,0 -89.8669213710244,37.8919285019704,0 -89.8611532194338,37.9055391707122,0 -89.8518221998746,37.9051156711928,0 -89.728551127852,37.8410437278203,0 -89.6911585166015,37.8048461895875,0 -89.6759604497414,37.784021807452,0 -89.6665610141995,37.7455048947008,0 -89.58153539397119,37.7061554249312,0 -89.5216197606815,37.6948481923868,0 -89.51347129814729,37.6798905957089,0 -89.51927739008779,37.6504256791403,0 -89.5134636137585,37.6159786570251,0 -89.52506805859341,37.5720063661821,0 -89.4948777729593,37.4917750136486,0 -89.4537142750772,37.4532354416246,0 -89.4276653438195,37.4110680347262,0 -89.43582789426451,37.3557666795513,0 -89.46883367402491,37.3394589952529,0 -89.5006722080316,37.329491318765,0 -89.5139774032488,37.3050126842203,0 -89.51397668384681,37.276452254325,0 -89.48968358551591,37.2560512507203,0 -89.46539822681051,37.2537814318187,0 -89.4683040002904,37.2243166291394,0 -89.44060600449021,37.165367829282,0 -89.42388077877629,37.1372534192951,0 -89.3800701656133,37.0991331193152,0 -89.3830287336186,37.0492635096727,0 -89.3110577890705,37.0097321155337,0 -89.28284342367,36.9992571418446,0 -89.26207602720631,37.0087367322465,0 -89.26431960659031,37.0277834462293,0 -89.3097775142834,37.0609596218128,0 -89.30336936544271,37.0854347008365,0 -89.28431079352841,37.0912941061444,0 -89.26413039669779,37.0871742876795,0 -89.2377536103058,37.0417835282019,0 -89.2101262118458,37.0290237051986,0 -89.1935842098097,36.9868222806571,0 -89.1299298602513,36.9881656914537,0 -89.1503164771803,36.9984916525611,0 -89.1744039557536,37.0257625307982,0 -89.16962098937491,37.0642870560925,0 -89.14641970199381,37.0932369170363,0 -89.1168931380891,37.1121885561653,0 -89.0651040416988,37.1859115907085,0 -88.99324011836519,37.2200879803029,0 -88.9325677662407,37.2184595035745,0 -88.8633498471503,37.2022475575954,0 -88.7465598581524,37.1521615318569,0 -88.73916655930481,37.1412363376799,0 -88.6884212086995,37.1354651044129,0 -88.6142679530367,37.1091025287746,0 -88.5593190002438,37.0728714131831,0 -88.5173176378463,37.0648267364289,0 -88.4907432667963,37.0682371308779,0 -88.4768417264925,37.0722004387704,0 -88.4505110390145,37.0987273102449,0 -88.42255499105021,37.1569654245737,0 -88.450738961298,37.205724438504,0 -88.50146891523821,37.2578364471264,0 -88.511365178177,37.2969057632051,0 -88.4676859561995,37.4008084371049,0 -88.419893554403,37.4203432412273,0 -88.3592141681292,37.4093610567464,0 -88.3117424820464,37.4429033025395,0 -88.0879105655745,37.4763216973515,0 -88.0715914713672,37.5110386032244,0 + + + + + + + + Indiana + empty + + +states.AREA: + 36400.304 + + +states.STATE_NAME: +Indiana + + +states.STATE_FIPS: +18 + + +states.SUB_REGION: +E N Cen + + +states.STATE_ABBR: +IN + + +states.POP2000: + 6080485 + + +states.POP2001: + 6138368 + + +states.POP00_SQMI: + 167 + + +states.DEN_0_100: + 85 + + +USStates.ID: + 19 + + +USStates.State_Name: +Indiana + + +USStates.Date_Entered: +Dec. 11 1816 + + +USStates.Year_Entered: +1816 + + +USStates.Year_Settled: +1733 + +]]> + #Style_5 + + + -86.27615732038611,39.9127401204667,0 + + + + + + -86.3416058899801,38.1772881494571,0 -86.29767433252459,38.1503040958879,0 -86.29144007500941,38.0784895277861,0 -86.277698957837,38.058172975235,0 -86.2521549356747,38.0407215021446,0 -86.1906216841403,38.0177584307759,0 -86.104986573394,38.0113361451773,0 -86.05271568926411,37.9667844806183,0 -86.0316198158307,37.9929506600364,0 -86.0066633201115,38.0017670737263,0 -85.9585820940509,38.0118406095775,0 -85.93087193559511,38.034048876233,0 -85.9147511151841,38.0648748591422,0 -85.9120745452086,38.1800014838715,0 -85.8523357521911,38.238561041348,0 -85.8399076966583,38.2762914813239,0 -85.8065513133062,38.2861792248908,0 -85.7862108031498,38.2823915940124,0 -85.7469260083932,38.2703150949771,0 -85.681388997794,38.3009537036963,0 -85.654228238662,38.3377528692459,0 -85.64359297482039,38.3836879378367,0 -85.6126402894388,38.446670375764,0 -85.50720002378741,38.471419551854,0 -85.4663821281019,38.5181753628103,0 -85.432369780701,38.5370160928693,0 -85.41746171924881,38.5614756142213,0 -85.4244045991195,38.5848401599215,0 -85.4536792483365,38.6946745390103,0 -85.4466906213012,38.7248406803013,0 -85.41818661626441,38.7384171670398,0 -85.33500919580089,38.7370064025018,0 -85.2713939330139,38.7443767592676,0 -85.2051618437764,38.6958170413595,0 -85.16093321350211,38.6951765052421,0 -85.1196570780868,38.7141393628001,0 -85.06845466106159,38.750424603378,0 -85.0250730726016,38.764291113864,0 -84.9756111877111,38.7806410183922,0 -84.8187802303235,38.7934099982582,0 -84.82442619105041,38.8344629497042,0 -84.78744612597821,38.8666434823042,0 -84.7886668678083,38.8843852980114,0 -84.8032240050715,38.8971908595052,0 -84.8597435114244,38.9020425223312,0 -84.8752543860379,38.9094313024092,0 -84.8758801493223,38.9276041700824,0 -84.846315847352,38.9546310780086,0 -84.83444439657789,38.98277550246,0 -84.8442256667783,39.0058310025456,0 -84.8762931465368,39.0328954474865,0 -84.8899961256038,39.0506485732317,0 -84.8867079668198,39.0650450015205,0 -84.8278613547987,39.1036877674048,0 -84.81148058301,39.1025855115064,0 -84.8120705333745,39.3030292262759,0 -84.8120249021854,39.3123331649208,0 -84.8111048340875,39.5131632038426,0 -84.8110367793544,39.5640506850582,0 -84.808696532672,39.7332992702085,0 -84.8061497587903,39.9171665438967,0 -84.8035641264148,40.013990635484,0 -84.79538778828569,40.3195005333353,0 -84.7945562939653,40.3530507566997,0 -84.7932521538178,40.5887382366961,0 -84.7930613218788,40.7288603729197,0 -84.79102327254211,40.9377084936207,0 -84.79052709599461,40.9883412320642,0 -84.79158626712351,41.2531325315222,0 -84.7909755666301,41.2838180261002,0 -84.7918972237936,41.4278994604409,0 -84.79136990395649,41.5304919381552,0 -84.79037747295131,41.6974947329852,0 -84.7884777858482,41.7609594561938,0 -84.8260080463026,41.7618751066694,0 -85.1931406144237,41.7628675471372,0 -85.29720963584781,41.7635810035748,0 -85.65945882918869,41.7626275140628,0 -85.79922697228621,41.7635349679273,0 -86.0683022053847,41.7646284325784,0 -86.2345652919433,41.7648642479853,0 -86.5251809764443,41.7655403363901,0 -86.8348296412819,41.7655047552312,0 -86.9424598927725,41.7165034838214,0 -87.2338545044322,41.6261887207928,0 -87.3947466651328,41.6341912134461,0 -87.4419740387024,41.6581129712715,0 -87.41930696191859,41.6763663513711,0 -87.46371089171021,41.671624547774,0 -87.5299063108434,41.7236260875045,0 -87.5326861745456,41.4697503872218,0 -87.53248451078061,41.3013387221503,0 -87.5317652032273,41.1737899174832,0 -87.53205270695879,41.0099629234772,0 -87.5326961499881,40.7454479031807,0 -87.5371908503425,40.4946461888117,0 -87.5356953046261,40.4832822109023,0 -87.53535686974401,40.1662317074521,0 -87.5357932746107,39.8873391886275,0 -87.5355977432246,39.6093761467476,0 -87.5385896158313,39.4774828667869,0 -87.540237703126,39.3505623907844,0 -87.5976886138014,39.3383057314831,0 -87.62526201039,39.307441385019,0 -87.61064369979241,39.2976988710138,0 -87.6158242074897,39.2814561230773,0 -87.60692047638401,39.2582021441748,0 -87.5845886371286,39.2487915548446,0 -87.58861691821311,39.2085051229499,0 -87.5942322592859,39.1981674228522,0 -87.60795025538761,39.196107453445,0 -87.64428222970631,39.1685465310611,0 -87.6703524034648,39.1467190724917,0 -87.6594801644014,39.1306938293312,0 -87.66228775754109,39.1135088826113,0 -87.6316931128207,39.1039838431484,0 -87.630891938142,39.0890152076407,0 -87.6120316181093,39.0846475088299,0 -87.58534329877401,39.062476908506,0 -87.581772429957,38.9957855730057,0 -87.5918815898562,38.9941261861117,0 -87.5479276301993,38.9771206273788,0 -87.533492428354,38.9637465338765,0 -87.5302039208332,38.9319629772649,0 -87.5392219544495,38.9049057469745,0 -87.559081635284,38.869856862415,0 -87.5505288034456,38.8579361229776,0 -87.50790945748121,38.7956049059644,0 -87.5190486024822,38.7767453485141,0 -87.5080237439807,38.7697683547433,0 -87.50833650081,38.7366800091112,0 -87.5439137139998,38.6860210401793,0 -87.588501337721,38.6722157708788,0 -87.6252152154989,38.642857998943,0 -87.6286714982266,38.6229644058157,0 -87.61985172548459,38.5992561043613,0 -87.6406195798681,38.5932251150025,0 -87.6528804379318,38.5739189952751,0 -87.6729692972829,38.547471787341,0 -87.65141571258729,38.5154169292116,0 -87.65355967551621,38.5004900554631,0 -87.6799352433336,38.504053007157,0 -87.6928444866203,38.4815804420218,0 -87.7561244372712,38.4661728281435,0 -87.75868794190011,38.4571433599795,0 -87.7389806672907,38.4455273875839,0 -87.7484565770349,38.4180116772378,0 -87.78404833397759,38.3781708227389,0 -87.834532977994,38.3525705303994,0 -87.85011225303271,38.2861445830363,0 -87.8630366972759,38.2854084473723,0 -87.8740691509129,38.3168343756391,0 -87.8834763762205,38.3155984794844,0 -87.8884965521701,38.3007057736598,0 -87.91413936139951,38.2810944074491,0 -87.9136816882386,38.3023921025994,0 -87.92595000854421,38.3048183818949,0 -87.98005073657551,38.241131787639,0 -87.9860398723023,38.2348604423061,0 -87.9779598594692,38.2007606004592,0 -87.9323194769958,38.1711770029956,0 -87.932021762155,38.1575737007801,0 -87.9505995597833,38.1369591387537,0 -87.97353404593839,38.1318056958815,0 -88.018579177984,38.1033482133547,0 -88.0123608797262,38.092392337746,0 -87.96489699678421,38.0967941055912,0 -87.9753264381124,38.0733527756694,0 -88.03476137876019,38.0541307602029,0 -88.0431234631707,38.0451661890239,0 -88.04150591052481,38.0383492879413,0 -88.0217296742097,38.0335770457263,0 -88.0292447284786,38.0082816708523,0 -88.0217369738459,37.9751012485706,0 -88.0425431233507,37.9563100133668,0 -88.0418029841928,37.9345432471494,0 -88.0646539089454,37.9298283441586,0 -88.07897489688909,37.9440458253834,0 -88.084033312787,37.9237058057134,0 -88.0304728445231,37.9176363841544,0 -88.0266198217967,37.9058031174197,0 -88.04490053507431,37.8960489721139,0 -88.10011663858219,37.9062154284197,0 -88.101489939404,37.895351144247,0 -88.0757701619268,37.8678545841173,0 -88.03427224647881,37.8437911301456,0 -88.04216892231911,37.8275671956745,0 -88.0892974561442,37.8312944778462,0 -88.0860624224551,37.8176568675887,0 -88.0356073439534,37.8057279050194,0 -88.0112228968478,37.8013522474257,0 -87.9587380494242,37.7762242517409,0 -87.9396104384072,37.7995510678409,0 -87.9201699786944,37.8097285459625,0 -87.9102286413016,37.8386134566058,0 -87.93684884849461,37.8752235361624,0 -87.9344837893137,37.904203896365,0 -87.92189490993729,37.9199089300241,0 -87.89903644654829,37.9245969463054,0 -87.85718741424731,37.8909469157228,0 -87.8236471993993,37.8782550216566,0 -87.7537824326935,37.8981288619025,0 -87.72820001539741,37.8945849893321,0 -87.7094081501652,37.8997539244585,0 -87.6797209569085,37.8970493378792,0 -87.68471741164321,37.8363728161595,0 -87.6516958656896,37.8281751349818,0 -87.60758877766089,37.8438192895582,0 -87.59363445095011,37.8649107154254,0 -87.5947183783029,37.8907666463449,0 -87.6271375737057,37.9234546658806,0 -87.6043257240091,37.9711573198373,0 -87.5048029485417,37.9156270031471,0 -87.4522884037149,37.9365207505541,0 -87.3875506289597,37.9349692155165,0 -87.3105589119421,37.8937184166169,0 -87.27274593889131,37.8708194103053,0 -87.22676182555399,37.8491183470039,0 -87.1757806882666,37.8386401947759,0 -87.1580798741816,37.826967486048,0 -87.13187941921321,37.7897363615659,0 -87.1064270674831,37.7842511762003,0 -87.0713083041007,37.8071361431403,0 -87.03648000837271,37.9080054345509,0 -87.0131563777109,37.9247639268183,0 -86.989031549046,37.9306161664831,0 -86.93157291368379,37.938040724569,0 -86.900077899892,37.9536969879516,0 -86.8632727013398,37.9869202326586,0 -86.8263071552482,37.9915597077091,0 -86.80281549728009,37.9787998846179,0 -86.7538255847893,37.8983593638332,0 -86.7288765680828,37.8946214413437,0 -86.6891259363411,37.9118535383339,0 -86.6686555016737,37.9131967871253,0 -86.66030864545441,37.9025728769351,0 -86.67066979692341,37.8606408643363,0 -86.66592415784319,37.8473808714035,0 -86.645568203442,37.8460003365155,0 -86.6147824607846,37.8579754898858,0 -86.59830982177959,37.9210720274265,0 -86.5817839150946,37.9256653787747,0 -86.5410872028347,37.9215158308346,0 -86.5227377872978,37.9278716585056,0 -86.516901010803,37.9422420486058,0 -86.5308478759636,37.9874773037153,0 -86.52783439059689,38.0186932030166,0 -86.51909122836111,38.0470479141293,0 -86.5031147440645,38.0516487974382,0 -86.4583673572556,38.0591608698586,0 -86.4424675823122,38.0759953511702,0 -86.4425211885206,38.0886981996705,0 -86.4743369239623,38.1117076402344,0 -86.46484600102311,38.1291561416585,0 -86.4525242238683,38.1297552896484,0 -86.40718125377769,38.1082185848164,0 -86.39367710683101,38.1232944153849,0 -86.3440391531709,38.1342701851064,0 -86.3354178455955,38.1440282528917,0 -86.34312388818169,38.1555598192453,0 -86.3871010468,38.1680214834694,0 -86.3883069100136,38.1948080328253,0 -86.3643499429474,38.1932902325194,0 -86.3416058899801,38.1772881494571,0 + + + + + + + + Iowa + empty + + +states.AREA: + 56257.965 + + +states.STATE_NAME: +Iowa + + +states.STATE_FIPS: +19 + + +states.SUB_REGION: +W N Cen + + +states.STATE_ABBR: +IA + + +states.POP2000: + 2926324 + + +states.POP2001: + 2941287 + + +states.POP00_SQMI: + 52 + + +states.DEN_0_100: + 95 + + +USStates.ID: + 29 + + +USStates.State_Name: +Iowa + + +USStates.Date_Entered: +Dec. 28 1846 + + +USStates.Year_Entered: +1846 + + +USStates.Year_Settled: +1788 + +]]> + #Style_5 + + + -93.5010908992209,42.0759891389773,0 + + + + + + -91.12013244580791,40.7054430853053,0 -91.09289515262361,40.7615871092817,0 -91.08905026959479,40.8337674861069,0 -91.0493536735639,40.8796233416421,0 -90.98341896936651,40.9239649616112,0 -90.96085093423019,40.9505415875963,0 -90.95479391031741,41.0703973298849,0 -90.95792988917549,41.1043932523764,0 -90.9904854657331,41.1444046114074,0 -91.0184022505193,41.1658577458188,0 -91.0564663602341,41.176290257977,0 -91.10167201924359,41.2315519929841,0 -91.10249645615799,41.2678481882471,0 -91.07342897262021,41.3349253706845,0 -91.05593554169049,41.4014073054416,0 -91.02763777623071,41.4235364759013,0 -91.0008427707096,41.4311127421861,0 -90.949800649924,41.4212638456605,0 -90.84428378227449,41.4446525356188,0 -90.78004268318989,41.44985255988,0 -90.708354613045,41.4500936593358,0 -90.6589297375422,41.4623507046517,0 -90.6008378029169,41.5096188031289,0 -90.5409754772051,41.5260034668008,0 -90.45512615442569,41.5275795523085,0 -90.43509834614001,41.5436125873014,0 -90.42313526378251,41.5673054184025,0 -90.34849427679229,41.5868824103659,0 -90.3394762639213,41.6028314888971,0 -90.34126241056562,41.6491222689255,0 -90.32615702333789,41.722767950897,0 -90.30501586217991,41.756497081381,0 -90.2554387407709,41.7817690413387,0 -90.19596566516668,41.8061669912383,0 -90.15464484512322,41.9308021367651,0 -90.1427967503368,41.9839895278463,0 -90.1506630602384,42.0334532086115,0 -90.1682262959709,42.0610667627835,0 -90.1667767223318,42.1037669165116,0 -90.1762144636605,42.1205242372018,0 -90.19170240605,42.1227099310285,0 -90.23106311278499,42.1597414854526,0 -90.3237299895918,42.1973374145764,0 -90.3678582678001,42.2102266723886,0 -90.4073017721273,42.2426617515853,0 -90.4181124359413,42.2639391318113,0 -90.4278091232618,42.340644954386,0 -90.44172508028031,42.3600836299974,0 -90.4911711742602,42.3887914637005,0 -90.5637116510656,42.4218436822154,0 -90.60595537042839,42.4605645940667,0 -90.64847377380832,42.475647019796,0 -90.6518991107146,42.4947005718712,0 -90.6384560963599,42.5093636839918,0 -90.62570743484611,42.5285622838299,0 -90.6392190290607,42.5557141169534,0 -90.66438062716411,42.5713918079808,0 -90.69479111313748,42.6379287671111,0 -90.74561006958859,42.6570014302673,0 -90.8925456651592,42.6782400547389,0 -90.9194089569959,42.6806774289755,0 -90.9991821130899,42.7070587627347,0 -91.06616869540581,42.7449138543659,0 -91.08203032553689,42.7833648801814,0 -91.09342868782861,42.8714402959622,0 -91.13912173775438,42.9258937074417,0 -91.15221381349258,43.0013164133112,0 -91.15975182052971,43.0811827642084,0 -91.16857153421861,43.0828878927565,0 -91.16135406498178,43.1475759290793,0 -91.06905228836891,43.2578982275476,0 -91.0664279003866,43.2806829026437,0 -91.0784980300101,43.3132978076873,0 -91.1770487337014,43.3539461618861,0 -91.1982436244129,43.3705129909022,0 -91.2109165788835,43.4240510516753,0 -91.2359034673886,43.4646842675378,0 -91.22356677965871,43.5008086595185,0 -91.61109897494811,43.5006261853338,0 -91.7303661652997,43.4995717605756,0 -92.07753252302631,43.499153513998,0 -92.4531691122113,43.4994619143947,0 -92.5580084257835,43.5002595022348,0 -93.0272108293768,43.5012788635835,0 -93.0543803044398,43.5014574340012,0 -93.5008302025135,43.5004884829356,0 -93.653699466766,43.5007626988541,0 -93.97394980408042,43.5002988511065,0 -94.2467873911458,43.4989484742926,0 -94.4552382894281,43.4981020923778,0 -94.859839276263,43.5000304051637,0 -94.9204646838526,43.4993712448179,0 -95.3965585901372,43.5003340364673,0 -95.46477535859469,43.4995410217166,0 -95.8669120002192,43.4989439769817,0 -96.0610395014389,43.498533697461,0 -96.4604547078315,43.4997184756898,0 -96.59831542821901,43.4998490975791,0 -96.5837958978062,43.4819205535996,0 -96.58911295055751,43.4355391262275,0 -96.55770871701321,43.4007272259127,0 -96.52505354128429,43.3842252910413,0 -96.52289387443082,43.3569663195107,0 -96.54056327347691,43.307659139748,0 -96.5791308298904,43.2900740306766,0 -96.5707224965755,43.2636122914599,0 -96.55956777208898,43.2532633182258,0 -96.5669911071477,43.2396337909954,0 -96.55860577021591,43.2254892270262,0 -96.48724516897552,43.2179092697119,0 -96.4731145701049,43.2090821295544,0 -96.45150508806921,43.1263087732519,0 -96.460804816306,43.0878728592997,0 -96.4620939419638,43.075582202376,0 -96.47957324789761,43.0618840567811,0 -96.52001038580228,43.051508664474,0 -96.4990199957611,43.0120501064927,0 -96.5171478195164,42.9864580906085,0 -96.51493505198688,42.9523820814978,0 -96.54426346173439,42.9138663406581,0 -96.53751108901589,42.8969064560324,0 -96.5562111991181,42.8466606609486,0 -96.57312614067021,42.8343473823113,0 -96.5876454371957,42.8353813945249,0 -96.60087506115062,42.7995586266164,0 -96.63298055975349,42.7768356021372,0 -96.640709192144,42.7486038180978,0 -96.6265407804251,42.70835472382,0 -96.56303923913002,42.6685130300247,0 -96.5411650971666,42.6624053661285,0 -96.5128440201087,42.6297550903686,0 -96.4884981845359,42.5804806539459,0 -96.50094203466421,42.5738851852149,0 -96.48933750112329,42.5640279717967,0 -96.48024324420059,42.5171303049452,0 -96.4393947509647,42.4892408377156,0 -96.39607423274411,42.4674012772387,0 -96.39789028299531,42.441793101272,0 -96.41762830756179,42.4147774592562,0 -96.41176144867778,42.3809179971184,0 -96.42417517629991,42.3492788847348,0 -96.3897808818021,42.3287896719748,0 -96.3687003210519,42.2980237265253,0 -96.34288156417431,42.2820816955037,0 -96.33265786107282,42.260307132502,0 -96.33770844290801,42.2295223162304,0 -96.3635118431292,42.2140424887771,0 -96.35216576154041,42.168185405895,0 -96.2851229976765,42.123452670924,0 -96.2654831160455,42.0488969554024,0 -96.2387254806183,42.0284381681892,0 -96.2360928599206,42.0012580980752,0 -96.2028425096417,41.9966156076483,0 -96.1852176902909,41.9806854764309,0 -96.14732844184438,41.9662545016057,0 -96.14587078481939,41.9249070891742,0 -96.15997022208892,41.9041513852191,0 -96.1356235834612,41.8626208316748,0 -96.07641711811041,41.7914690785526,0 -96.09932098309402,41.7529750937888,0 -96.09977118044269,41.7315636680423,0 -96.08555733965541,41.7049872846604,0 -96.1222023396997,41.6949130712865,0 -96.12026446185681,41.6840948569989,0 -96.09930606920538,41.654680377786,0 -96.11130763394991,41.5990063360194,0 -96.08083512543558,41.5760003085601,0 -96.0919362332193,41.5631451632737,0 -96.0858402888059,41.537522447069,0 -96.0501720028408,41.5243351452143,0 -96.0045927729456,41.536663666234,0 -95.99396487163098,41.5281036385833,0 -95.99668867363272,41.5115177407886,0 -96.01345100342439,41.492994088652,0 -96.0068973653038,41.4819545344805,0 -95.9531857305245,41.4723872072953,0 -95.93506577909901,41.4623813790665,0 -95.94005632056519,41.3948054356641,0 -95.9428952016611,41.3400771149559,0 -95.88910711764841,41.301389068661,0 -95.89759135908018,41.2868630350679,0 -95.91120231965681,41.308469075071,0 -95.93023057200192,41.3020567682491,0 -95.91098130119039,41.225245096276,0 -95.922249965015,41.2078539506329,0 -95.9161002851104,41.1940638351955,0 -95.85919843702339,41.1805368728058,0 -95.85980096123291,41.1668650456103,0 -95.8766852492484,41.1642024105376,0 -95.85827413141659,41.1091870222413,0 -95.87880474120411,41.0658712509288,0 -95.8595394801997,41.0350028595074,0 -95.86089704288879,41.0026505190073,0 -95.83760323158589,40.9742580400834,0 -95.8365411444113,40.9011080428442,0 -95.8343965593688,40.8703008088672,0 -95.84643563182461,40.8483322047714,0 -95.85179043528299,40.7926000253044,0 -95.87661608382331,40.7304362884448,0 -95.76799926230059,40.6431173260368,0 -95.7575462791966,40.6209044050126,0 -95.7674795852398,40.5890479952096,0 -95.382555095884,40.5843340093787,0 -95.21742841469741,40.5818925987708,0 -94.92061587223311,40.5772183148122,0 -94.639876320884,40.575744856122,0 -94.4852311155788,40.5742048680883,0 -94.23839179788078,40.5709661436833,0 -94.0180588623528,40.5740221097314,0 -93.78630370096001,40.5784484988924,0 -93.56291046102329,40.580813860252,0 -93.37027134829388,40.5804911252976,0 -93.10093859117031,40.5843472673901,0 -92.71781545755509,40.5896671790964,0 -92.6464324165599,40.5914619056485,0 -92.3615131092551,40.5995762450555,0 -92.1931744167433,40.6000887188336,0 -91.946370183648,40.6082666211982,0 -91.7417117785904,40.6097843674944,0 -91.71697640482071,40.5934354677793,0 -91.68995975604149,40.5812025311316,0 -91.6920809036743,40.5516776256622,0 -91.62253651310201,40.5329033163068,0 -91.61686016131831,40.5048738271577,0 -91.5860286246556,40.4845194169649,0 -91.5793830849706,40.4637602088021,0 -91.533208268896,40.4554411066996,0 -91.5388465218747,40.441288675833,0 -91.52960695321359,40.4350861780817,0 -91.5276917691468,40.4101689010293,0 -91.50037749543139,40.4051606084008,0 -91.49031385163261,40.3908061091367,0 -91.4770381934818,40.3910121558996,0 -91.44874715640491,40.3719466182637,0 -91.41896859131511,40.3869192694689,0 -91.38590919839099,40.3924048874231,0 -91.3729083225561,40.4030325886378,0 -91.38555116553908,40.4472940413254,0 -91.37494647812029,40.5036976293474,0 -91.38225565222849,40.5285383313692,0 -91.41302597331141,40.5480345602038,0 -91.4112710901028,40.5730126128812,0 -91.3757627300253,40.6034802448646,0 -91.2622111209491,40.6395869370641,0 -91.2150599786405,40.643859446667,0 -91.16264440347912,40.6563523669938,0 -91.1293030749525,40.6821889727746,0 -91.12013244580791,40.7054430853053,0 + + + + + + + + Kansas + empty + + +states.AREA: + 82196.955 + + +states.STATE_NAME: +Kansas + + +states.STATE_FIPS: +20 + + +states.SUB_REGION: +W N Cen + + +states.STATE_ABBR: +KS + + +states.POP2000: + 2688418 + + +states.POP2001: + 2709422 + + +states.POP00_SQMI: + 33 + + +states.DEN_0_100: + 97 + + +USStates.ID: + 34 + + +USStates.State_Name: +Kansas + + +USStates.Date_Entered: +Jan. 29 1861 + + +USStates.Year_Entered: +1861 + + +USStates.Year_Settled: +1727 + +]]> + #Style_5 + + + -98.38325723326818,38.4826574728393,0 + + + + + + -95.07193109811,37.0014780674299,0 -95.0327450815612,37.0007794392778,0 -94.6203796376912,36.9970468237132,0 -94.6206638676799,37.0601475533797,0 -94.6189775221893,37.3277322857884,0 -94.61876444142401,37.360766482215,0 -94.61899604293861,37.650374321953,0 -94.6192936785187,37.6798689280977,0 -94.6167353371693,38.0303877411189,0 -94.61733032638759,38.055784837357,0 -94.61905349915152,38.3920320272517,0 -94.6187177065389,38.4714737258641,0 -94.6131481947747,38.7372224308096,0 -94.6124696654656,38.8371089096843,0 -94.6092813424634,39.0446676651878,0 -94.60813678641638,39.1128009586178,0 -94.60122430937619,39.1412276647328,0 -94.6126534522095,39.1516492526966,0 -94.6464068497116,39.158427841948,0 -94.6755137983894,39.1749223276416,0 -94.7305309461746,39.171256416042,0 -94.7900492914923,39.1968829757069,0 -94.8208192842533,39.2110046505539,0 -94.8334765331867,39.2617660205541,0 -94.8811077732328,39.2860458708519,0 -94.9076813995049,39.3230284700345,0 -94.9113435368246,39.3401217508395,0 -94.8982816593786,39.3806406678593,0 -94.9257480001496,39.3812661376612,0 -94.9584938855715,39.4114472233923,0 -94.9862042598468,39.4394616215765,0 -95.04051146086052,39.4629407284024,0 -95.04759928388671,39.4853288064319,0 -95.1020369987408,39.5328485478957,0 -95.10898807297042,39.5606920176429,0 -95.0536130925577,39.5867761785005,0 -95.0560171833566,39.625689733093,0 -95.02829206736421,39.6619134718391,0 -94.978570591812,39.6849880529496,0 -94.96178638302391,39.7320382320422,0 -94.9531421136041,39.7365014323348,0 -94.9308558369552,39.727025905148,0 -94.90567811071121,39.726755181953,0 -94.87786073247868,39.7393055627822,0 -94.87118503155682,39.7541179695705,0 -94.87706755967508,39.7606792157561,0 -94.9217999904165,39.7578408910459,0 -94.93511392079802,39.7754266104547,0 -94.93326765322591,39.7827737328809,0 -94.8993236192415,39.7937754306095,0 -94.88850514062642,39.8173998679665,0 -94.89832461315601,39.8283327692328,0 -94.9238762802993,39.833131624215,0 -94.9365111558861,39.8493860544701,0 -94.9382437203224,39.8960818279774,0 -94.9650237551983,39.900823541003,0 -95.0217725502981,39.8969786850066,0 -95.03350651062659,39.8778442881217,0 -95.06324626966109,39.8665379740374,0 -95.1007225558306,39.8698649954976,0 -95.1505514013284,39.9080546761413,0 -95.19396340225789,39.9101800936863,0 -95.20759760966379,39.9381762630214,0 -95.2409615197206,39.9421058384133,0 -95.30869720973901,39.9994075748966,0 -95.3297013527267,39.9925950320474,0 -95.7807002239152,39.9934894834034,0 -96.0012537321721,39.995158941643,0 -96.2405985632704,39.9945031906408,0 -96.45403830193989,39.9941727522704,0 -96.8014203269346,39.9944759681187,0 -96.90828756776931,39.996154802955,0 -97.36191186281762,39.9973802328794,0 -97.8165893210891,39.9997291896237,0 -97.9295887050275,39.9984528583572,0 -98.264165776521,39.9984347815801,0 -98.5044791617254,39.9971296815045,0 -98.72063235128408,39.9984613082759,0 -99.06474699472069,39.9983379848291,0 -99.1782010360044,39.9995770488454,0 -99.6278593903364,40.0029878613976,0 -100.180910663243,40.0004787238625,0 -100.191111650703,40.0005855247365,0 -100.735049472397,39.9991723116564,0 -100.754855877507,40.000198282162,0 -101.32214863482,40.0018210447365,0 -101.407393337781,40.0010037120327,0 -102.051535596434,39.9989182728278,0 -102.049442507662,39.5686933622379,0 -102.048801584447,39.5628035180916,0 -102.047874719263,39.1267534832,0 -102.048972538957,39.0370029188915,0 -102.047568440936,38.6925505149901,0 -102.047584160548,38.6154993640496,0 -102.045549640322,38.2633436193344,0 -102.046060904132,38.2538220806459,0 -102.04397657417,37.7343986213713,0 -102.044455910114,37.6414742210535,0 -102.042010650289,37.3862794433515,0 -102.037207602599,36.9889939197762,0 -102.024519464501,36.9888757490654,0 -101.55367610944,36.9966930458734,0 -101.071604192395,36.9974667126978,0 -100.950586859868,36.996661689339,0 -100.634245618228,36.9978323335316,0 -100.088573981101,36.9976524956006,0 -99.99926174794319,36.9954175257409,0 -99.5446396923613,36.9954629108102,0 -99.43747360824931,36.9945583965996,0 -98.99951613987589,36.9980727934686,0 -98.54021961843299,36.9983759139801,0 -98.34714359763062,36.9990615091091,0 -98.1045290729196,36.998671345032,0 -97.8042499377042,36.9985676282825,0 -97.46540491812472,36.9964671394098,0 -97.137692826494,36.9998082437565,0 -96.74869619591919,37.0001660629802,0 -96.5191876912757,37.0005778020035,0 -96.00604971220072,36.9983338098062,0 -95.9579609448337,37.0000828949687,0 -95.78574861213642,36.9981139405669,0 -95.5260187862325,37.0010188368678,0 -95.40662244594169,37.0006155845495,0 -95.07193109811,37.0014780674299,0 + + + + + + + + Kentucky + empty + + +states.AREA: + 40319.791 + + +states.STATE_NAME: +Kentucky + + +states.STATE_FIPS: +21 + + +states.SUB_REGION: +E S Cen + + +states.STATE_ABBR: +KY + + +states.POP2000: + 4041769 + + +states.POP2001: + 4081550 + + +states.POP00_SQMI: + 100 + + +states.DEN_0_100: + 91 + + +USStates.ID: + 15 + + +USStates.State_Name: +Kentucky + + +USStates.Date_Entered: +June 1 1792 + + +USStates.Year_Entered: +1792 + + +USStates.Year_Settled: +1774 + +]]> + #Style_5 + + + -85.29036641996581,37.5265035728688,0 + + + + + + + -86.5106681729942,36.6550742141329,0 -86.4154436379233,36.6509321366908,0 -86.19899252719389,36.6432906639691,0 -85.9806106782448,36.633112657611,0 -85.78547638470199,36.62668526607,0 -85.43737461759029,36.6181989810276,0 -85.3000946381889,36.6261009236939,0 -85.27249827730731,36.6256168039722,0 -84.9984611962111,36.6209826428203,0 -84.7910568723549,36.6054383594152,0 -84.781870784101,36.6050761598833,0 -84.2567774582751,36.5954983253834,0 -84.2544885948187,36.5954525757939,0 -84.0067465715187,36.5920881162625,0 -83.93559984653869,36.5912908042263,0 -83.695608633552,36.5842494058307,0 -83.6751767779422,36.59870387507,0 -83.64680262239961,36.6169769718214,0 -83.5308949469604,36.6614809602143,0 -83.46022130755151,36.6618325651555,0 -83.4041505851927,36.6723273909237,0 -83.3858547999664,36.6882196347474,0 -83.32138369861531,36.7095329501122,0 -83.203656562889,36.7342606278109,0 -83.1385135640831,36.7400592608854,0 -83.124390864088,36.7511676478044,0 -83.1282206506728,36.7791526938786,0 -83.06795192812881,36.8509961538949,0 -83.0466341524314,36.8587935503694,0 -82.9508056915213,36.8640784586876,0 -82.87804287271091,36.893694238085,0 -82.8606320841382,36.9321623718302,0 -82.8665598432633,36.9745857651711,0 -82.81222270855579,37.0056007595079,0 -82.7235981560209,37.0339923682353,0 -82.7200576547545,37.0659298172553,0 -82.7091701311092,37.075482281352,0 -82.7213772601893,37.0931177496069,0 -82.7190958255562,37.1100172914789,0 -82.56802270094001,37.1939190518144,0 -82.5500399164933,37.1993783814184,0 -82.4058850037637,37.2507041975685,0 -82.35384234347519,37.260519600467,0 -82.288950934185,37.3048612192352,0 -81.95957525592971,37.5311726196289,0 -81.9765742755516,37.5432534483332,0 -82.0263511693733,37.5305195250327,0 -82.0491341809237,37.5514538202535,0 -82.05566534081019,37.5253425321624,0 -82.0843920504403,37.5483099090524,0 -82.1425091726566,37.5574524979734,0 -82.1465225053321,37.5659208983498,0 -82.13747341918131,37.5698959116523,0 -82.1317814946938,37.5905369780361,0 -82.15931021996209,37.5935690802839,0 -82.1855494012877,37.6406677677666,0 -82.20544059754749,37.6240165335496,0 -82.2383711562884,37.656775872237,0 -82.2956247745408,37.6690580326702,0 -82.3294012031438,37.7441714871732,0 -82.3194978866149,37.7584268520686,0 -82.33984657596631,37.7844003083255,0 -82.4058057432277,37.8117197137467,0 -82.4215083258885,37.8723565285176,0 -82.4376072765301,37.8948548600619,0 -82.50020946921541,37.9222618980716,0 -82.49339635192651,37.9425137288734,0 -82.480174161688,37.9543964226939,0 -82.4757796712415,37.9759070493071,0 -82.52467860529801,38.0156623478137,0 -82.5932086977126,38.1099625844435,0 -82.64612798319701,38.1463307005486,0 -82.6471582603252,38.1694356505033,0 -82.6137636388564,38.1780948680894,0 -82.6066454186315,38.1938262489827,0 -82.616228731902,38.2388116463152,0 -82.5891132321387,38.2453880857478,0 -82.574578950842,38.2559737163217,0 -82.5800496260145,38.2925104464826,0 -82.57229805473899,38.3078110430161,0 -82.59823915716601,38.3684639621207,0 -82.5866043088359,38.4125194224537,0 -82.6137433379651,38.4726688337026,0 -82.6697603574158,38.5021407722218,0 -82.6955793642933,38.5391428294601,0 -82.7419448162975,38.5530662073486,0 -82.8023639107609,38.5572886775579,0 -82.8269924854152,38.5716621183892,0 -82.85385666395931,38.6004587371503,0 -82.8600294858941,38.6523951466567,0 -82.880011744564,38.6833013226062,0 -82.8731911677823,38.7190064779649,0 -82.8903122480228,38.7427754690297,0 -82.9213038087217,38.7464144846546,0 -82.97248310332699,38.7196429959584,0 -83.0269434347116,38.7145119991138,0 -83.0608799170539,38.6857264630017,0 -83.11124311365749,38.6648333651597,0 -83.1431499750977,38.6193396966029,0 -83.1819390743195,38.6098410346599,0 -83.24501356062839,38.6241723630441,0 -83.2727548748104,38.6092569222626,0 -83.2900435785732,38.5966379602472,0 -83.3065312653877,38.5963174248036,0 -83.3203257653401,38.6065634765907,0 -83.33002325645781,38.6319880306114,0 -83.37142194898451,38.6549977034897,0 -83.45361629995431,38.6637746596862,0 -83.5000734679638,38.690137357128,0 -83.526555981969,38.696111041032,0 -83.6183785196076,38.6779722718334,0 -83.63324094665769,38.6649719664098,0 -83.64318975618861,38.6358624635654,0 -83.6557556666292,38.6238806809261,0 -83.6785301000227,38.6209281353376,0 -83.712825428618,38.6355534097723,0 -83.77022323291369,38.650819405338,0 -83.79046498152741,38.6938445378462,0 -83.8375322435588,38.7118799039528,0 -83.8575526890278,38.7449183938572,0 -83.9125395047095,38.7579603800755,0 -83.9621627892472,38.7776474056309,0 -84.05380160129811,38.7637349934305,0 -84.0888671071979,38.7655047394295,0 -84.17675226261351,38.7884985944901,0 -84.2287021102685,38.8126904458503,0 -84.2352944474892,38.8745556222277,0 -84.2615250982177,38.9174773125027,0 -84.29013610301691,38.9445378637403,0 -84.3133151278336,39.014074138235,0 -84.3457790116403,39.0378123176184,0 -84.39131227398291,39.0357444360707,0 -84.4197401104714,39.0473368904498,0 -84.425683749535,39.0847240819073,0 -84.444918075979,39.1118269376755,0 -84.4920536098813,39.1073635038858,0 -84.5153007968991,39.0941952341113,0 -84.5930686595367,39.070265611257,0 -84.6226484760206,39.0749345727981,0 -84.6674874871449,39.0896244882795,0 -84.7428755878621,39.1420637748434,0 -84.7899269988898,39.1070335912354,0 -84.81148058301,39.1025855115064,0 -84.8278613547987,39.1036877674048,0 -84.8867079668198,39.0650450015205,0 -84.8899961256038,39.0506485732317,0 -84.8762931465368,39.0328954474865,0 -84.8442256667783,39.0058310025456,0 -84.83444439657789,38.98277550246,0 -84.846315847352,38.9546310780086,0 -84.8758801493223,38.9276041700824,0 -84.8752543860379,38.9094313024092,0 -84.8597435114244,38.9020425223312,0 -84.8032240050715,38.8971908595052,0 -84.7886668678083,38.8843852980114,0 -84.78744612597821,38.8666434823042,0 -84.82442619105041,38.8344629497042,0 -84.8187802303235,38.7934099982582,0 -84.9756111877111,38.7806410183922,0 -85.0250730726016,38.764291113864,0 -85.06845466106159,38.750424603378,0 -85.1196570780868,38.7141393628001,0 -85.16093321350211,38.6951765052421,0 -85.2051618437764,38.6958170413595,0 -85.2713939330139,38.7443767592676,0 -85.33500919580089,38.7370064025018,0 -85.41818661626441,38.7384171670398,0 -85.4466906213012,38.7248406803013,0 -85.4536792483365,38.6946745390103,0 -85.4244045991195,38.5848401599215,0 -85.41746171924881,38.5614756142213,0 -85.432369780701,38.5370160928693,0 -85.4663821281019,38.5181753628103,0 -85.50720002378741,38.471419551854,0 -85.6126402894388,38.446670375764,0 -85.64359297482039,38.3836879378367,0 -85.654228238662,38.3377528692459,0 -85.681388997794,38.3009537036963,0 -85.7469260083932,38.2703150949771,0 -85.7862108031498,38.2823915940124,0 -85.8065513133062,38.2861792248908,0 -85.8399076966583,38.2762914813239,0 -85.8523357521911,38.238561041348,0 -85.9120745452086,38.1800014838715,0 -85.9147511151841,38.0648748591422,0 -85.93087193559511,38.034048876233,0 -85.9585820940509,38.0118406095775,0 -86.0066633201115,38.0017670737263,0 -86.0316198158307,37.9929506600364,0 -86.05271568926411,37.9667844806183,0 -86.104986573394,38.0113361451773,0 -86.1906216841403,38.0177584307759,0 -86.2521549356747,38.0407215021446,0 -86.277698957837,38.058172975235,0 -86.29144007500941,38.0784895277861,0 -86.29767433252459,38.1503040958879,0 -86.3416058899801,38.1772881494571,0 -86.3643499429474,38.1932902325194,0 -86.3883069100136,38.1948080328253,0 -86.3871010468,38.1680214834694,0 -86.34312388818169,38.1555598192453,0 -86.3354178455955,38.1440282528917,0 -86.3440391531709,38.1342701851064,0 -86.39367710683101,38.1232944153849,0 -86.40718125377769,38.1082185848164,0 -86.4525242238683,38.1297552896484,0 -86.46484600102311,38.1291561416585,0 -86.4743369239623,38.1117076402344,0 -86.4425211885206,38.0886981996705,0 -86.4424675823122,38.0759953511702,0 -86.4583673572556,38.0591608698586,0 -86.5031147440645,38.0516487974382,0 -86.51909122836111,38.0470479141293,0 -86.52783439059689,38.0186932030166,0 -86.5308478759636,37.9874773037153,0 -86.516901010803,37.9422420486058,0 -86.5227377872978,37.9278716585056,0 -86.5410872028347,37.9215158308346,0 -86.5817839150946,37.9256653787747,0 -86.59830982177959,37.9210720274265,0 -86.6147824607846,37.8579754898858,0 -86.645568203442,37.8460003365155,0 -86.66592415784319,37.8473808714035,0 -86.67066979692341,37.8606408643363,0 -86.66030864545441,37.9025728769351,0 -86.6686555016737,37.9131967871253,0 -86.6891259363411,37.9118535383339,0 -86.7288765680828,37.8946214413437,0 -86.7538255847893,37.8983593638332,0 -86.80281549728009,37.9787998846179,0 -86.8263071552482,37.9915597077091,0 -86.8632727013398,37.9869202326586,0 -86.900077899892,37.9536969879516,0 -86.93157291368379,37.938040724569,0 -86.989031549046,37.9306161664831,0 -87.0131563777109,37.9247639268183,0 -87.03648000837271,37.9080054345509,0 -87.0713083041007,37.8071361431403,0 -87.1064270674831,37.7842511762003,0 -87.13187941921321,37.7897363615659,0 -87.1580798741816,37.826967486048,0 -87.1757806882666,37.8386401947759,0 -87.22676182555399,37.8491183470039,0 -87.27274593889131,37.8708194103053,0 -87.3105589119421,37.8937184166169,0 -87.3875506289597,37.9349692155165,0 -87.4522884037149,37.9365207505541,0 -87.5048029485417,37.9156270031471,0 -87.6043257240091,37.9711573198373,0 -87.6271375737057,37.9234546658806,0 -87.5947183783029,37.8907666463449,0 -87.59363445095011,37.8649107154254,0 -87.60758877766089,37.8438192895582,0 -87.6516958656896,37.8281751349818,0 -87.68471741164321,37.8363728161595,0 -87.6797209569085,37.8970493378792,0 -87.7094081501652,37.8997539244585,0 -87.72820001539741,37.8945849893321,0 -87.7537824326935,37.8981288619025,0 -87.8236471993993,37.8782550216566,0 -87.85718741424731,37.8909469157228,0 -87.89903644654829,37.9245969463054,0 -87.92189490993729,37.9199089300241,0 -87.9344837893137,37.904203896365,0 -87.93684884849461,37.8752235361624,0 -87.9102286413016,37.8386134566058,0 -87.9201699786944,37.8097285459625,0 -87.9396104384072,37.7995510678409,0 -87.9587380494242,37.7762242517409,0 -88.0112228968478,37.8013522474257,0 -88.0356073439534,37.8057279050194,0 -88.0725039638053,37.7354461998767,0 -88.1336703044624,37.7007907786447,0 -88.159404386901,37.6607335395919,0 -88.15766418948979,37.628526559458,0 -88.134202057652,37.5836204217666,0 -88.0715914713672,37.5110386032244,0 -88.0879105655745,37.4763216973515,0 -88.3117424820464,37.4429033025395,0 -88.3592141681292,37.4093610567464,0 -88.419893554403,37.4203432412273,0 -88.4676859561995,37.4008084371049,0 -88.511365178177,37.2969057632051,0 -88.50146891523821,37.2578364471264,0 -88.450738961298,37.205724438504,0 -88.42255499105021,37.1569654245737,0 -88.4505110390145,37.0987273102449,0 -88.4768417264925,37.0722004387704,0 -88.4907432667963,37.0682371308779,0 -88.5173176378463,37.0648267364289,0 -88.5593190002438,37.0728714131831,0 -88.6142679530367,37.1091025287746,0 -88.6884212086995,37.1354651044129,0 -88.73916655930481,37.1412363376799,0 -88.7465598581524,37.1521615318569,0 -88.8633498471503,37.2022475575954,0 -88.9325677662407,37.2184595035745,0 -88.99324011836519,37.2200879803029,0 -89.0651040416988,37.1859115907085,0 -89.1168931380891,37.1121885561653,0 -89.14641970199381,37.0932369170363,0 -89.16962098937491,37.0642870560925,0 -89.1744039557536,37.0257625307982,0 -89.1503164771803,36.9984916525611,0 -89.1299298602513,36.9881656914537,0 -89.1072162055416,36.9775040571059,0 -89.1050338653654,36.9539220770253,0 -89.1296537695887,36.8664945361285,0 -89.166565665821,36.8434768543693,0 -89.1735313341446,36.8294390146117,0 -89.1644441219421,36.804476214643,0 -89.1259067613141,36.7924680183802,0 -89.12554025828931,36.7680887738915,0 -89.15143504916961,36.7590975830134,0 -89.1772689322554,36.7609818762401,0 -89.19636559962321,36.7274780703555,0 -89.19756338990609,36.7134250574374,0 -89.1678993468083,36.6716284847978,0 -89.1771616076676,36.6530627654874,0 -89.2001876332973,36.6313576237861,0 -89.2101287779705,36.5819546744135,0 -89.2416846800885,36.569328370687,0 -89.2834948717057,36.5753095893361,0 -89.3223449681677,36.6220764759103,0 -89.3423955613942,36.6289083710958,0 -89.3636210686995,36.6257612726571,0 -89.37395149637661,36.616247637228,0 -89.4182103731204,36.5106251110882,0 -89.41478465486919,36.5026793108435,0 -89.3466676017908,36.5026108089583,0 -88.83037252103129,36.4998546765866,0 -88.8263593294413,36.4999080492987,0 -88.81071857599009,36.4990458143214,0 -88.51268114387869,36.4995467004194,0 -88.4960256220043,36.4982076026975,0 -88.04276340428341,36.4965703400273,0 -88.0350796382961,36.5381999052039,0 -88.0410910767903,36.5827211925188,0 -88.0713410698433,36.6796832563404,0 -87.8707114200773,36.6694231918372,0 -87.8535374192374,36.6415224035434,0 -87.6935284355087,36.6444886692232,0 -87.6406553976253,36.6452169761114,0 -87.3466109435594,36.6492773804525,0 -87.11270271488,36.6513077660911,0 -87.06818400985961,36.6508112445931,0 -86.7705352136402,36.6521007800576,0 -86.5106681729942,36.6550742141329,0 + + + + + + + + + -89.53327228843381,36.4981701441748,0 -89.4758977248385,36.4986089858186,0 -89.4817572743346,36.5047581085309,0 -89.47144975338379,36.5256163547986,0 -89.4817497774818,36.5478363630808,0 -89.49320183399099,36.5591771346443,0 -89.5304419073772,36.5646166211264,0 -89.55621466216709,36.5578036567361,0 -89.5682312249958,36.5414695145559,0 -89.56706382630919,36.5187993771114,0 -89.53327228843381,36.4981701441748,0 + + + + + + + + + Louisiana + empty + + +states.AREA: + 45835.844 + + +states.STATE_NAME: +Louisiana + + +states.STATE_FIPS: +22 + + +states.SUB_REGION: +W S Cen + + +states.STATE_ABBR: +LA + + +states.POP2000: + 4468976 + + +states.POP2001: + 4484853 + + +states.POP00_SQMI: + 97 + + +states.DEN_0_100: + 91 + + +USStates.ID: + 18 + + +USStates.State_Name: +Louisiana + + +USStates.Date_Entered: +Apr. 30 1812 + + +USStates.Year_Entered: +1812 + + +USStates.Year_Settled: +1699 + +]]> + #Style_5 + + + -92.0291541159725,31.0957346447301,0 + + + + + + + -93.70752396935821,30.2395787754494,0 -93.71500869987879,30.2205134179473,0 -93.7045256592734,30.1810684459083,0 -93.6963314287414,30.1758843689492,0 -93.6998258674993,30.1510169781729,0 -93.6833076816481,30.1484401694217,0 -93.68612303875779,30.1414613621588,0 -93.69880351731489,30.1414346905316,0 -93.6970869015193,30.1181389021031,0 -93.70854664486501,30.1149499108334,0 -93.71602374974782,30.0958787991307,0 -93.71264390010309,30.0607310199356,0 -93.76036751582601,30.0061764030649,0 -93.7914543306868,29.8505201111635,0 -93.8999018634907,29.8099813696096,0 -93.80182075717751,29.7258651715405,0 -93.7219916871518,29.7587936044957,0 -93.2336572894734,29.7889934364029,0 -92.6074254936111,29.5886265164795,0 -92.29737403028059,29.5415715040527,0 -92.05975722161792,29.6070148319983,0 -92.19969864009239,29.7631205249394,0 -92.1301011969117,29.77352598548,0 -92.13715124533631,29.7307416030464,0 -91.9733277804057,29.8060573844959,0 -91.96708656404368,29.8418880532248,0 -91.82750348017601,29.83904163461,0 -91.8239331429008,29.7868920393355,0 -91.8466310090991,29.8083970322938,0 -91.8811779880636,29.7659557971969,0 -91.86325627234939,29.7258395444023,0 -91.61576780432881,29.7691380608199,0 -91.6435472720068,29.6439645252622,0 -91.548490473012,29.64212942148721,0 -91.54786531626041,29.5316859482091,0 -91.43302486062962,29.5525818802979,0 -91.26272515553339,29.4895876171466,0 -91.2137357284937,29.4059235875496,0 -91.1021904671519,29.3141341810657,0 -91.07838568592221,29.3600181552563,0 -90.93652761481459,29.34351696991,0 -90.89734933840761,29.267664524716,0 -90.81855013451751,29.2568023186879,0 -90.8142929990499,29.2210068232971,0 -90.9204134488967,29.1819095184181,0 -90.8826392886342,29.1374120250384,0 -90.83937946259708,29.1823403523227,0 -90.77268943028361,29.1606256340265,0 -90.7828982382631,29.126943134736,0 -90.67679427561049,29.1402773960277,0 -90.68385856633408,29.1819208280557,0 -90.63811998544371,29.1625715477047,0 -90.6500512905196,29.2542925609165,0 -90.6212655974503,29.2229656385145,0 -90.5831330588569,29.2609283902067,0 -90.6110951867158,29.3050359294473,0 -90.4764721853395,29.3039418023868,0 -90.4505160207755,29.352441970778,0 -90.40682895562621,29.3259917752097,0 -90.39642997502899,29.272347594428,0 -90.34764606577039,29.3129516272311,0 -90.2840991281077,29.245534761538,0 -90.27881935962628,29.2751587278655,0 -90.2429144207612,29.254741245923,0 -90.2639572212598,29.1846496769349,0 -90.22776265023229,29.0986741752039,0 -90.0778023855037,29.1764419417217,0 -90.0431106708545,29.2236763677282,0 -90.07787873037648,29.2145745251002,0 -90.11163968342949,29.3217254399766,0 -90.0330015414231,29.3088725943322,0 -90.05594370870118,29.3514313577963,0 -90.02994209083532,29.3742080212967,0 -90.05532571465039,29.4282829342296,0 -90.03608391703379,29.4471572638847,0 -90.17413347979719,29.4959418083355,0 -90.2081459533198,29.54473034288331,0 -90.1517936118825,29.5953076758409,0 -90.1372900800924,29.533810903071,0 -90.11308130873671,29.5538488149916,0 -90.0066947961478,29.4939367839004,0 -89.97192676202729,29.5035417528626,0 -89.9667386971404,29.472678264347,0 -89.8175270453019,29.4776253094833,0 -89.8217465705316,29.420912297011,0 -89.7537065743465,29.3742883056524,0 -89.7949446658458,29.3225401726376,0 -89.61071851100481,29.3317581333263,0 -89.61959210384499,29.2795749078674,0 -89.4931976224217,29.2349951688689,0 -89.45911683804491,29.2557362316092,0 -89.46707349611449,29.2163212037448,0 -89.3931341574949,29.1462653489502,0 -89.38866232003031,29.1003787711429,0 -89.3397347549283,29.1044955958688,0 -89.3190905090885,29.1801886436367,0 -89.2632880326299,29.1482125721001,0 -89.3948923970965,28.9396556719073,0 -89.2574966003837,29.0594633924233,0 -89.2411621878536,29.1211691198757,0 -89.1443950464412,29.0166783927302,0 -89.15402386274,29.0572176399904,0 -89.1114049392751,29.0830170799367,0 -89.126542405823,29.1353090259359,0 -89.057753441514,29.0852787510888,0 -89.02180295398399,29.1471183731581,0 -89.09827479284481,29.1634431581992,0 -89.03326302685041,29.2234135733299,0 -89.120225502644,29.2118843139178,0 -89.1299376964562,29.2908873400227,0 -89.19340037828211,29.3490477860047,0 -89.26255595190629,29.2978092984492,0 -89.2647756568613,29.3506636449461,0 -89.33705849744059,29.3408933300114,0 -89.3845219191646,29.3979385143756,0 -89.53707638096201,29.4014533166444,0 -89.5446296667905,29.4716853008017,0 -89.77177826661171,29.6102468453431,0 -89.7232081312626,29.6060275376081,0 -89.74854567342401,29.6373780616568,0 -89.7283193961219,29.6461761343614,0 -89.6352610582353,29.626531674004,0 -89.69532824384351,29.6940792569962,0 -89.6767042461412,29.7029612576638,0 -89.5979517797373,29.66515763608991,0 -89.4791891047166,29.6361710061209,0 -89.5119430643629,29.6646147842026,0 -89.6118373558959,29.6977477154707,0 -89.5928776464669,29.710863889814,0 -89.65058726846451,29.7669009624638,0 -89.5405000002626,29.7547308719091,0 -89.48223840044381,29.8309485334183,0 -89.4174250907105,29.7829370017962,0 -89.3640397237488,29.7967741977645,0 -89.4211550530889,29.8280985416313,0 -89.4022024925418,29.8459451898735,0 -89.43104835838651,29.9402776070809,0 -89.3777929103821,29.9512862860095,0 -89.4536236043748,29.9857329961405,0 -89.43585410143341,30.0444055970455,0 -89.5743783317747,30.0089600024186,0 -89.58586286631579,29.8981569870418,0 -89.62741431072681,29.8756795494176,0 -89.71220220875109,29.8975277712431,0 -89.7150166093631,29.9694037201455,0 -89.82084822206799,29.9512905424199,0 -89.8489633570991,30.0106855130634,0 -89.7168401832138,30.0552263064586,0 -89.6493943583523,30.1224267965133,0 -89.66920137542461,30.1633821794677,0 -89.7249282260786,30.1210949796266,0 -89.7400887426727,30.15892815372281,0 -89.79826483529951,30.1053714259199,0 -89.8912258795383,30.1560914176022,0 -89.9905483943748,30.05366400615,0 -90.11154650531552,30.0416103319555,0 -90.27598037046252,30.0620534035407,0 -90.39556746391192,30.0920800540751,0 -90.42453056069171,30.1858772168737,0 -90.30902717710622,30.30384607327681,0 -90.2397510159792,30.3809509083452,0 -90.07556112940209,30.3689787565007,0 -89.9435365430685,30.2698534912004,0 -89.75921705647311,30.2310929413416,0 -89.728560482135,30.1810129000889,0 -89.5738839850623,30.1949353118833,0 -89.6100033159566,30.2414198536792,0 -89.6063106026528,30.247828412852,0 -89.6216616714494,30.2569643699525,0 -89.6259425171347,30.2903558515233,0 -89.6391725011899,30.29582979652721,0 -89.6370822520275,30.3118436964481,0 -89.6185880809724,30.323760747644,0 -89.620198293058,30.343429054806,0 -89.633451292423,30.3553078019512,0 -89.64668882303469,30.3552905752797,0 -89.6546699231165,30.37906533290621,0 -89.67536970065041,30.4000744263161,0 -89.6754620986314,30.4453524057824,0 -89.6834507334724,30.4627185730285,0 -89.6945978512597,30.4681868413409,0 -89.695681461547,30.4782460714929,0 -89.7131840947211,30.48141599910741,0 -89.719059260721,30.4960375437604,0 -89.73231974937779,30.4978380271641,0 -89.75517865909291,30.5156218767139,0 -89.7727961225489,30.5512468627469,0 -89.7908478814126,30.5539438185454,0 -89.8203071285261,30.6242705431171,0 -89.8055366119584,30.6494567398327,0 -89.81935389911089,30.6512457789506,0 -89.8295245363783,30.6708739896173,0 -89.8454474865972,30.6662525153547,0 -89.8353918067202,30.675882597152,0 -89.8417854969649,30.6795198391887,0 -89.8413433452435,30.7005499465483,0 -89.83072296372239,30.7037809798175,0 -89.8440520689247,30.7124249093943,0 -89.83561400018191,30.7293619382654,0 -89.8233990376437,30.7330545562641,0 -89.8255660189393,30.74264836900471,0 -89.813351089932,30.7481682046961,0 -89.8246894189972,30.7897246849283,0 -89.8109335655279,30.8116989081619,0 -89.7965669822497,30.8126526475249,0 -89.79609421512551,30.8291051373468,0 -89.77479992387271,30.8305319403895,0 -89.7850241384817,30.8615791361643,0 -89.76585085732459,30.8620847088871,0 -89.76331078881169,30.9004713517936,0 -89.7468002599141,30.9027945578147,0 -89.7457551089107,30.910107202755,0 -89.75805428152501,30.9210436978628,0 -89.7404756300233,30.9261095623025,0 -89.7485405475115,30.9498480428011,0 -89.7395225295214,30.965400256862,0 -89.7198229059406,30.9754936822636,0 -89.726781296615,30.9846164008972,0 -89.7236228724726,31.0015247201013,0 -89.7327174808554,31.00744501459671,0 -89.83355873794839,31.0071848554001,0 -90.2593768226071,31.0073700245843,0 -90.3436602569889,31.0053899463824,0 -90.5426536021385,31.0023300433606,0 -90.56025489707021,31.0017063331187,0 -90.82971390290152,31.00154581229931,0 -91.05701216426981,31.0004181174657,0 -91.17920745434212,31.0004616671834,0 -91.6322974277285,31.00136500740931,0 -91.6277732104017,31.0119601110946,0 -91.57278761694658,31.032647877549,0 -91.552081308545,31.0581597906819,0 -91.56497527228081,31.0821350184803,0 -91.6201139178138,31.1276943834946,0 -91.5914883087676,31.1784818992551,0 -91.6009643646854,31.2139296737496,0 -91.636998739959,31.241104186479,0 -91.6436824254271,31.2711178839201,0 -91.634214237565,31.2776940549104,0 -91.55691947736142,31.2704690710127,0 -91.5170781714622,31.2830696578166,0 -91.5024753378186,31.2988580123244,0 -91.5057561590215,31.3234567034819,0 -91.54279004566349,31.3469862680809,0 -91.5444076356665,31.3688746277826,0 -91.53457323759901,31.3827500700431,0 -91.5593769120174,31.3882304242528,0 -91.56773147230381,31.4214064364688,0 -91.5524724466605,31.4330997709492,0 -91.53480241584072,31.434335247521,0 -91.53416902145848,31.4092388142744,0 -91.52301453224139,31.3920917852495,0 -91.49470875734109,31.37524960980541,0 -91.48083803831911,31.3777805832693,0 -91.46592215694071,31.4040690532825,0 -91.4732924895748,31.4203746865528,0 -91.50790071721922,31.4530834240658,0 -91.506481902402,31.5256872825259,0 -91.50295705582839,31.5348804964065,0 -91.46447302857931,31.5428664076677,0 -91.42357803613481,31.5627464662349,0 -91.40425216217201,31.5863534317346,0 -91.4153838994301,31.6025923876789,0 -91.49715101609371,31.6043585245596,0 -91.50887776268431,31.621946112804,0 -91.50780965753789,31.6438707722357,0 -91.4977690885564,31.6508953247071,0 -91.45737763016589,31.6269660621133,0 -91.4084028346628,31.6255298775261,0 -91.3891838304294,31.6546051479529,0 -91.38794806501321,31.716682847539,0 -91.3650745397498,31.7517413813867,0 -91.3704992222101,31.75347510581861,0 -91.3399120227254,31.7585428158009,0 -91.28262100699412,31.7498875713679,0 -91.2639894905689,31.7597635597382,0 -91.26268491650518,31.7739271210982,0 -91.3362574528706,31.7636219421964,0 -91.36713463540391,31.7708677200763,0 -91.3472366701502,31.7958323053943,0 -91.33484640167582,31.8434784170896,0 -91.30347348797039,31.863144546493,0 -91.2926470392426,31.8614928392569,0 -91.27680008896378,31.8275334941804,0 -91.25072958285951,31.8188210015347,0 -91.24138341450281,31.8353877405104,0 -91.26469211768119,31.8655859136312,0 -91.2444813396436,31.8786718608009,0 -91.20154214815391,31.914448862447,0 -91.16314291993849,31.9884481049272,0 -91.10811063502561,31.9919842773777,0 -91.07248812939382,32.0212135515791,0 -91.07324347350119,32.0321499472516,0 -91.08699202272901,32.0438110998955,0 -91.1431229851656,32.0662598368965,0 -91.1456941711085,32.085828620503,0 -91.125727524233,32.0883996668359,0 -91.08941061986668,32.0569980949997,0 -91.06511798689969,32.0587070505858,0 -91.0739225856783,32.0941482900527,0 -91.04119164865929,32.1078235881288,0 -91.0113905060031,32.1342128745109,0 -91.00393646145051,32.1694138145198,0 -91.0245210933432,32.1700508264511,0 -91.0545816942883,32.1846835164502,0 -91.04541852022901,32.1588244987585,0 -91.05415436554129,32.1345446969889,0 -91.0831163105895,32.148731083052,0 -91.10882038739021,32.1351435271569,0 -91.15665029978031,32.1449354980044,0 -91.1669578883395,32.1721410581455,0 -91.15737514242458,32.2060145228895,0 -91.1160609494648,32.225755012482,0 -91.1006796950342,32.2150360650047,0 -91.08802223200981,32.2325373651522,0 -91.06256993823,32.2328921503996,0 -91.0417564572334,32.249588584805,0 -90.97732476193758,32.2235541462358,0 -90.97112198627711,32.2692145344565,0 -90.98392428988359,32.2872802390738,0 -90.9808724634335,32.2978007782368,0 -90.9717628039961,32.3038468581634,0 -90.9293503055389,32.2975529103154,0 -90.9164792854551,32.3054643188479,0 -90.8754551600106,32.3797948696303,0 -90.8852590969197,32.3814999498488,0 -90.91502958658171,32.3460435683761,0 -90.98467186569272,32.3565410587047,0 -90.99896957955122,32.3663787517009,0 -91.0093152122207,32.3972270178482,0 -90.9700917310243,32.41916079336,0 -90.96559027073792,32.4401789961165,0 -90.987555664684,32.4531064313693,0 -91.027015703315,32.4425591367523,0 -91.0586173128584,32.4471403993983,0 -91.1177919517207,32.4987093128914,0 -91.11885237927079,32.524205893418,0 -91.08889104990392,32.5487755489391,0 -91.03730785093811,32.4970957768502,0 -91.01979041957442,32.4909543534273,0 -90.9921562021718,32.4954212340256,0 -90.9951774336628,32.511781889744,0 -91.0631947408495,32.5422984158072,0 -91.07337249217869,32.5617489074888,0 -91.05897546705708,32.5765265579993,0 -91.03243221757509,32.5828091644492,0 -90.99876283398881,32.6156030444933,0 -90.99623739617641,32.6261121948604,0 -91.0079868510271,32.6428085554835,0 -91.02757194109799,32.6416374743549,0 -91.0477369807394,32.6144891676735,0 -91.06391930560149,32.6065243385273,0 -91.1111005222843,32.5976630747531,0 -91.1463718367631,32.6449866188679,0 -91.1396654000576,32.663308001886,0 -91.05913512287872,32.7236507270734,0 -91.0978169539142,32.7495287526143,0 -91.1365751786759,32.751256737741,0 -91.1564502239537,32.7628111152121,0 -91.1422592525615,32.8413420630697,0 -91.0796355518755,32.8772908363965,0 -91.075698595519,32.9538382302101,0 -91.09278126642242,32.9877460881529,0 -91.1119239712728,32.9874752104853,0 -91.13246289263051,32.9753485871396,0 -91.13004429846551,32.9375917893587,0 -91.13728478778282,32.9179123119183,0 -91.16980976931431,32.9051486450656,0 -91.19842078694131,32.9142883501159,0 -91.20927012576061,32.935978073614,0 -91.16197425997009,33.0004180010727,0 -91.1622413295772,33.0131626211682,0 -91.25472755144671,33.0136011241739,0 -91.42764466910239,33.0135450807442,0 -91.45447032530612,33.0139992001305,0 -92.0634416757442,33.0101515495777,0 -92.7172364845049,33.0168395771589,0 -92.9789895151482,33.018274750609,0 -93.23254316119119,33.0193748877236,0 -93.47907035507552,33.0215281738969,0 -93.51191556362819,33.0212876651865,0 -93.80993110790152,33.0227288720053,0 -94.03893174127671,33.0234224077489,0 -94.0417854266628,32.88248532849,0 -94.04038263770489,32.6949577639329,0 -94.0354184994672,32.3893811626287,0 -94.034954991874,32.1996091989861,0 -94.0352556158215,31.9946792606335,0 -94.01007792557169,31.9893006514689,0 -94.00458470012971,31.9781086259495,0 -93.977400745224,31.9463271084149,0 -93.97017571506122,31.923332670499,0 -93.9359189554272,31.9096246079882,0 -93.9181114839259,31.9098704820605,0 -93.9236506911527,31.8927620881712,0 -93.8994496012559,31.8946233843507,0 -93.8927128271358,31.8702347315503,0 -93.88145152988172,31.8715888085537,0 -93.87759108418349,31.8502823749578,0 -93.8650100628645,31.8174424499476,0 -93.8345145984519,31.8021876362787,0 -93.82225394974822,31.7748083120293,0 -93.83134856148179,31.7534524078687,0 -93.8101762985126,31.7305247069651,0 -93.8151354745431,31.7125237592659,0 -93.8089554592767,31.7077383245665,0 -93.7924526022363,31.7115680299756,0 -93.81203005382371,31.6747403534088,0 -93.8066129278975,31.6539413361717,0 -93.814913937485,31.6481413307007,0 -93.81977388303059,31.6182675045639,0 -93.8357655763902,31.6153647157252,0 -93.83280517658469,31.5903601395257,0 -93.81650822499059,31.5772874839387,0 -93.81070199496421,31.5592406874184,0 -93.78031303899668,31.5339136421144,0 -93.7634896740234,31.5309019449363,0 -93.74772687918352,31.5378958623322,0 -93.7318419000288,31.5220556426776,0 -93.70597743151249,31.5207469124279,0 -93.71917654856812,31.4955823387378,0 -93.75061823711359,31.4907363154173,0 -93.7514269339373,31.4856800971189,0 -93.72696607966452,31.4596548516254,0 -93.6985991018577,31.4616380816002,0 -93.70210859382031,31.4464313212695,0 -93.6871849424459,31.4383118184741,0 -93.6963098944214,31.4279172119793,0 -93.6946236330265,31.41610345391331,0 -93.687672937394,31.4063113595588,0 -93.6641964541721,31.3985102835404,0 -93.6612511619287,31.3725768736666,0 -93.6350357193475,31.3740089507347,0 -93.6772195877398,31.3285702210106,0 -93.68176670818659,31.3128637606543,0 -93.65630632190602,31.2868557345123,0 -93.6457698113848,31.290447047048,0 -93.6310062786126,31.274088104753,0 -93.6166320369568,31.2759895241098,0 -93.61205418900251,31.2702180322556,0 -93.61117651049739,31.2423735819701,0 -93.590721311811,31.229873054352,0 -93.6030963428191,31.1992536873053,0 -93.59411608931301,31.1803867599593,0 -93.5771171728735,31.1723283005144,0 -93.55076452872321,31.19111664787181,0 -93.52909629329709,31.1859610191746,0 -93.5271048967346,31.1782631971006,0 -93.53719127433351,31.17652768282541,0 -93.52850100567309,31.16313081887,0 -93.5443630058743,31.1593545819132,0 -93.53767923010742,31.1326296405497,0 -93.52826420267931,31.1261142412602,0 -93.53526050690408,31.1162612988914,0 -93.5568523341309,31.1095326773987,0 -93.560155897223,31.1007267939647,0 -93.54329435054569,31.0949417830783,0 -93.5442784766347,31.0825635248279,0 -93.51717031814428,31.0748615453994,0 -93.52591374615082,31.0571716007113,0 -93.5073888583872,31.0390998146532,0 -93.54729164502071,31.0143343101026,0 -93.5651144950651,31.0182559489662,0 -93.5680671206996,31.0131177730676,0 -93.571019691156,30.9974647272144,0 -93.5611240812853,30.99188382509841,0 -93.57262960901809,30.9763719448991,0 -93.5488480918319,30.9703845889675,0 -93.53751052673201,30.95707912219491,0 -93.53236051643211,30.9609260649172,0 -93.5257915242765,30.9360147750055,0 -93.5301557030665,30.9271668885028,0 -93.5497943369345,30.9250805769799,0 -93.5466891601929,30.9055307409998,0 -93.56464927132871,30.9021283630613,0 -93.56867012587068,30.886431356764,0 -93.56101768200369,30.8720769365654,0 -93.55297612475269,30.8604804672822,0 -93.5666178980145,30.8453462320886,0 -93.55581440053979,30.8425404652408,0 -93.5508552163389,30.8285427515982,0 -93.5820450640059,30.8022395755774,0 -93.5853487574266,30.772384673359,0 -93.61862893538731,30.7459898029865,0 -93.6078251665993,30.7322109750573,0 -93.6179648833938,30.7327489593371,0 -93.61258556438951,30.7105301555471,0 -93.61778080972511,30.6870030300823,0 -93.6601628136184,30.6730608176726,0 -93.6781450325558,30.6398941531481,0 -93.6930532338358,30.6402433971316,0 -93.6847595364861,30.62362646596801,0 -93.69286961844639,30.6159971853325,0 -93.6717582009901,30.598033475394,0 -93.6935940747548,30.5990370562763,0 -93.7179855982276,30.5875818830799,0 -93.71805386498711,30.5683558276656,0 -93.73547935399731,30.5457197108965,0 -93.70563196785041,30.5230599502648,0 -93.71480998363299,30.5053160515853,0 -93.70744722226021,30.4964430039086,0 -93.7150231758618,30.4888310205347,0 -93.6981459876763,30.4702496513421,0 -93.70359329230058,30.4627158297037,0 -93.6967413311132,30.4428357517593,0 -93.7217050902489,30.4331831686188,0 -93.7427315855636,30.4090272375555,0 -93.7551137307405,30.3819930042287,0 -93.74800248894391,30.3676155313151,0 -93.75950766664521,30.3543502302936,0 -93.7593470787815,30.3410771727413,0 -93.72994140928799,30.3051219729382,0 -93.6993768807844,30.2975935292891,0 -93.70752396935821,30.2395787754494,0 + + + + + + + + + -92.01636774779772,29.5964783637641,0 -91.8490888327989,29.4870829559889,0 -91.7581129254523,29.4945134800923,0 -91.7649642707533,29.5342538256937,0 -91.7016159510209,29.5772668066965,0 -91.7698472437407,29.578615482821,0 -91.9025489396354,29.6509308946661,0 -92.01636774779772,29.5964783637641,0 + + + + + + + + + -91.34131892626149,29.3419108937759,0 -91.2761625423135,29.25402793048981,0 -91.1283068078309,29.2269993791403,0 -91.13469314485428,29.2599248605,0 -91.1636630060186,29.2452673853848,0 -91.15259233129218,29.2665337371954,0 -91.1950590671176,29.2736729306416,0 -91.20046067885291,29.3079853608587,0 -91.1880244437628,29.2847581611053,0 -91.17122390642319,29.2836766605259,0 -91.16156452373758,29.3237204954792,0 -91.18927563760259,29.2976114923275,0 -91.2265537135592,29.3813995046563,0 -91.30049299545411,29.3164578525778,0 -91.34131892626149,29.3419108937759,0 + + + + + + + + + -90.93457446121511,29.2590942309103,0 -90.99895334439211,29.3238000878402,0 -91.0073689638633,29.29754411189,0 -91.12751345160631,29.2935143884148,0 -91.1225616613936,29.2270851971627,0 -91.0555572747286,29.1909157285932,0 -91.06768935479481,29.2531193516372,0 -91.03310393919099,29.2756292528086,0 -91.04444877298839,29.2112586059428,0 -90.9945661692945,29.2248021337252,0 -91.00324045917338,29.1843167033403,0 -90.96202532966269,29.18579944909,0 -90.9449811331143,29.226391967718,0 -90.980382600158,29.219952293402,0 -90.9813824092254,29.2763485829958,0 -90.95362571609181,29.2730571631618,0 -90.97084581220372,29.2420957472829,0 -90.93457446121511,29.2590942309103,0 + + + + + + + + + Maine + empty + + +states.AREA: + 32161.925 + + +states.STATE_NAME: +Maine + + +states.STATE_FIPS: +23 + + +states.SUB_REGION: +N Eng + + +states.STATE_ABBR: +ME + + +states.POP2000: + 1274923 + + +states.POP2001: + 1284576 + + +states.POP00_SQMI: + 40 + + +states.DEN_0_100: + 97 + + +USStates.ID: + 23 + + +USStates.State_Name: +Maine + + +USStates.Date_Entered: +Mar. 15 1820 + + +USStates.Year_Entered: +1820 + + +USStates.Year_Settled: +1624 + +]]> + #Style_5 + + + -69.2342803140978,45.3894093487898,0 + + + + + + + -69.7772762645906,44.0741483198713,0 -69.76675520614469,44.0477322592984,0 -69.8000128595467,44.0268667288672,0 -69.7776729844266,43.7912707228193,0 -69.7503594273371,43.7617041140593,0 -69.724671298031,43.7844771657636,0 -69.7485283916032,43.8933754295128,0 -69.7206355796789,43.9379795478678,0 -69.6129323231589,44.0336128548498,0 -69.65524480155101,43.980249889013,0 -69.6644528704785,43.8522244586918,0 -69.5893265387295,43.844862803005,0 -69.48323307140311,43.8871600746258,0 -69.3944884505371,44.0251280788842,0 -69.3464537674589,44.0159695598265,0 -69.2936504808219,43.942190755563,0 -69.21914072354279,43.946787577244,0 -69.0744584304863,44.0690660136479,0 -69.02148227181431,44.2440933416922,0 -68.98502777494591,44.2711126004819,0 -68.9591794578908,44.430331837978,0 -68.8116777653337,44.4945934426597,0 -68.80790287781549,44.5696542069791,0 -68.8606089070208,44.6109704067522,0 -68.8238128460999,44.6640894736035,0 -68.8235520702076,44.6089068403569,0 -68.7452790256047,44.5523206373911,0 -68.7413487051019,44.5072848958119,0 -68.81376776419771,44.4139901814304,0 -68.81285168429019,44.3274322783305,0 -68.7403098752916,44.3463301473607,0 -68.55942677798301,44.2598872456427,0 -68.5300756616285,44.289836101881,0 -68.55218617390599,44.3990492489601,0 -68.4285712497143,44.46530639124,0 -68.36376573615171,44.4313868490081,0 -68.2456142631336,44.4906479970509,0 -68.1362647391276,44.4752371654176,0 -68.07437917140879,44.3813743661084,0 -68.016392981954,44.3849566034442,0 -67.9865237153801,44.484812336461,0 -67.963436756976,44.5053274248743,0 -67.9683422249939,44.4712284165698,0 -67.9000417769437,44.4523993525841,0 -67.8585605178656,44.5360772002757,0 -67.8112189343998,44.5540098374308,0 -67.6188382504584,44.5402396193185,0 -67.5709936023128,44.5983332155118,0 -67.3885104425158,44.6914001984435,0 -67.30846816150439,44.6535210401791,0 -67.20036458721739,44.6537812351816,0 -67.00771875956821,44.7806250078979,0 -66.9692710360024,44.8286551272807,0 -67.1467066767694,44.9045811973885,0 -67.0653586269938,44.959295663853,0 -67.1506607784721,45.1219898963224,0 -67.1659056389324,45.1562643764959,0 -67.27409523064929,45.1827832977016,0 -67.3456056673913,45.1222522184808,0 -67.43943485449461,45.1895839538421,0 -67.4779500648077,45.2802804372187,0 -67.4185550809287,45.3758523506007,0 -67.5041066775521,45.4858160063971,0 -67.4160842487578,45.5035545265692,0 -67.4393007667661,45.59256143000579,0 -67.6151403322051,45.6051988982084,0 -67.7180345966414,45.6812994578214,0 -67.75295517982291,45.65928919420249,0 -67.80343280585819,45.6781136054575,0 -67.80305340237,45.7945081513461,0 -67.7593671369616,45.8277986058452,0 -67.794570844796,45.87847571695521,0 -67.7556150798964,45.91658019879411,0 -67.7802895888027,45.94706274217331,0 -67.7910107659324,47.0610036074639,0 -68.2308067781327,47.3521481908886,0 -68.33481376042521,47.3573741052975,0 -68.3912568256045,47.2850971351555,0 -68.5146730447092,47.2969643156636,0 -68.89487201197031,47.18225650927629,0 -69.036714506994,47.2573616071401,0 -69.04697642788111,47.4220306555512,0 -69.2302960300003,47.453334503029,0 -69.984977566148,46.6913656777797,0 -70.01414471134019,46.5705982633135,0 -70.0466075241071,46.42611554377889,0 -70.1910585034955,46.3348397522369,0 -70.2834966429549,46.1902492629794,0 -70.229325409987,46.1374343941084,0 -70.30484962968779,46.0666583336474,0 -70.2800225675015,46.0531540673207,0 -70.3102952668023,45.96878225759991,0 -70.2474646921772,45.9446197500614,0 -70.2539641026553,45.8990048630746,0 -70.4162139203836,45.7903089854213,0 -70.39638312280751,45.7220459930229,0 -70.5522701315346,45.660664152262,0 -70.7199105999252,45.51295436047651,0 -70.6349296434642,45.3919670337142,0 -70.7969669129234,45.42517217072471,0 -70.82913206776721,45.3907261617344,0 -70.8126658344856,45.3546780200798,0 -70.8428755371108,45.2781374154307,0 -70.87644406148471,45.2254453802794,0 -70.9593819235283,45.33886576902731,0 -71.0875092473499,45.3014692052699,0 -71.0287261250693,44.6685380945196,0 -71.008596512061,44.2821463668217,0 -70.9844425613652,43.7911635520181,0 -70.973874166771,43.5718298935058,0 -70.9565244088141,43.5641434705,0 -70.9496195233573,43.5489536133091,0 -70.9642682587516,43.5319898518146,0 -70.9592784003468,43.5163880057296,0 -70.97079121747591,43.4702114970827,0 -70.9614829099438,43.4381263706902,0 -70.97909946378989,43.3961839179203,0 -70.9696996092209,43.3663799823752,0 -70.9058011398795,43.3020692769929,0 -70.90108590067651,43.281020042684,0 -70.8132073721395,43.235222695474,0 -70.8305481365302,43.1591741298583,0 -70.8186681583247,43.1218710916248,0 -70.66567210512321,43.091050561352,0 -70.538941073876,43.3357181684913,0 -70.4569767880509,43.3494706682902,0 -70.365925612365,43.4303037212258,0 -70.3416106101908,43.5349087014933,0 -70.222239251928,43.5772404279461,0 -70.2357978254955,43.685796426524,0 -70.1566285119637,43.7898104908998,0 -70.0264027843525,43.8456010551567,0 -69.9873704560013,43.8457387629637,0 -69.9995001025524,43.7862077545854,0 -69.9729033991696,43.7688475582739,0 -69.90313220107561,43.7907323183889,0 -69.8867908767136,43.8767134346018,0 -69.8461556590995,43.8423439660335,0 -69.8517853541081,43.7443279848531,0 -69.8303921849006,43.7279862438606,0 -69.79152799355209,43.7560849940079,0 -69.859928458154,44.0000010562904,0 -69.7772762645906,44.0741483198713,0 + + + + + + + + + -68.3879209893914,44.3772530708835,0 -68.4028903244654,44.2708014569031,0 -68.3207117037137,44.2250794730622,0 -68.3047050923042,44.2900314435771,0 -68.1647687868107,44.3344957275365,0 -68.238709216076,44.4375633361586,0 -68.35544950530149,44.4288577749373,0 -68.3502537650533,44.3989509513447,0 -68.3879209893914,44.3772530708835,0 + + + + + + + + + Maryland + empty + + +states.AREA: + 9739.872 + + +states.STATE_NAME: +Maryland + + +states.STATE_FIPS: +24 + + +states.SUB_REGION: +S Atl + + +states.STATE_ABBR: +MD + + +states.POP2000: + 5296486 + + +states.POP2001: + 5362491 + + +states.POP00_SQMI: + 544 + + +states.DEN_0_100: + 52 + + +USStates.ID: + 7 + + +USStates.State_Name: +Maryland + + +USStates.Date_Entered: +Apr. 28 1788 + + +USStates.Year_Entered: +1788 + + +USStates.Year_Settled: +1634 + +]]> + #Style_5 + + + -76.8193852682105,39.0640555384767,0 + + + + + + + -75.7107127327496,38.6496658557662,0 -75.7245906263035,38.8302832999716,0 -75.7525764003551,39.1416603330929,0 -75.7613129328181,39.2478639325384,0 -75.7643192412212,39.2959598236098,0 -75.77235374667779,39.3831185391944,0 -75.7910945763195,39.7238660373362,0 -76.1392231665553,39.7222292808326,0 -76.23312186464131,39.7218535861041,0 -76.56983441657761,39.7202653698966,0 -76.79049160379709,39.7212561436081,0 -76.99681222135089,39.7208916577077,0 -77.2210508745187,39.7206793349451,0 -77.46443302065821,39.7200734721353,0 -77.4757933985606,39.7196232012639,0 -78.0959483136605,39.7254610687401,0 -78.3345500729087,39.7240962157241,0 -78.384783030143,39.7237485696748,0 -78.81775834663399,39.7231158128337,0 -78.9301730523848,39.7223369261357,0 -79.39661009295681,39.7193136035322,0 -79.480971113096,39.720274058077,0 -79.48986479564221,39.1973957510982,0 -79.4611919892215,39.2132646214775,0 -79.4492818447752,39.2120934820003,0 -79.3848476494521,39.2693006300669,0 -79.3461946154148,39.2920920071237,0 -79.29527324453819,39.3005409622397,0 -79.27982260452779,39.3252435708184,0 -79.2601680465127,39.3486416544713,0 -79.16301834698341,39.3934958538665,0 -79.1581275486525,39.4139606424208,0 -79.1314006491727,39.4170311916524,0 -79.1040784853939,39.4473068185213,0 -79.0967157288178,39.4646284760702,0 -79.104597173003,39.4708728556173,0 -79.0706297593098,39.4708498495391,0 -79.0644114910497,39.4858256028263,0 -79.04885455275689,39.4838153049718,0 -78.970436606663,39.438525300318,0 -78.9553908044919,39.4604587300207,0 -78.8708155126305,39.5257902221119,0 -78.8381145866481,39.5633182054468,0 -78.80655063800541,39.5668238139764,0 -78.8224126817224,39.5856984808976,0 -78.7984707782291,39.6154181040351,0 -78.7981503202116,39.6308329361782,0 -78.7727054582047,39.6442413593536,0 -78.7676164768578,39.6266140472135,0 -78.73238303982021,39.6269651904324,0 -78.73049853216,39.6215446407261,0 -78.73625116835829,39.608792329934,0 -78.7737430747891,39.6016168803692,0 -78.7614516806553,39.5817923449266,0 -78.73271861228101,39.5766427925479,0 -78.7163150181332,39.5595725682967,0 -78.6664251857124,39.5369295856868,0 -78.6491442196502,39.5379978698818,0 -78.6370818045276,39.5299491862748,0 -78.604366257192,39.5356829078104,0 -78.5641887564812,39.521073443727,0 -78.50878283764369,39.525159517656,0 -78.4812781842694,39.5199376222576,0 -78.4558109647124,39.5337352582767,0 -78.4458699009632,39.5483185504429,0 -78.4208220953532,39.5494097703543,0 -78.4618162122069,39.5808339965825,0 -78.4506314866027,39.592705125494,0 -78.4039995740291,39.5876131045842,0 -78.431893779582,39.6209523855928,0 -78.3846362229595,39.6144947493043,0 -78.37767072595661,39.6313171842384,0 -78.3567810297593,39.6323702224905,0 -78.3479232590728,39.6405907650805,0 -78.27301593703299,39.6184096414251,0 -78.2577267039254,39.6411676777696,0 -78.22923031045851,39.6585663745485,0 -78.2275978107419,39.6739888201001,0 -78.2043044442965,39.6759383682958,0 -78.1829721387067,39.6946416432551,0 -78.0943379340484,39.6756002259056,0 -78.02641818067529,39.6228676658044,0 -77.995205151108,39.5989693016707,0 -77.96423675783581,39.6113249804037,0 -77.94497955111849,39.5860111667727,0 -77.93545786949809,39.5919391289044,0 -77.9475432559036,39.6150137753716,0 -77.9386090344815,39.6182180888264,0 -77.903253436057,39.5961238764369,0 -77.8907409489792,39.6007014665387,0 -77.88843689880569,39.6165703160658,0 -77.855522813824,39.6021663910764,0 -77.8424075807765,39.6053745299037,0 -77.8398667728917,39.572740433055,0 -77.85295909355961,39.5654544565677,0 -77.885171166646,39.5644510981679,0 -77.8899167307584,39.5580921006877,0 -77.8695609560795,39.5459120760673,0 -77.86463209209241,39.5146512457229,0 -77.8438492144584,39.5319315749014,0 -77.83546428030221,39.5256107761519,0 -77.828925751391,39.5292537667709,0 -77.8252634740426,39.5120383875386,0 -77.84787748402169,39.5020058349846,0 -77.82518711275171,39.4939074430119,0 -77.771551216988,39.4981152221263,0 -77.79949832671841,39.4808271058573,0 -77.78510893810591,39.459102708835,0 -77.8041904928873,39.4631385518333,0 -77.7957979551353,39.4509164333512,0 -77.8046940179175,39.4400179505449,0 -77.8022754371077,39.4323161756799,0 -77.75698633951841,39.4251637984679,0 -77.74083452238931,39.4034394054792,0 -77.7372333565171,39.3961953951361,0 -77.7562233700037,39.3784762226869,0 -77.7454504163582,39.3603718912509,0 -77.7543007117046,39.3385939912988,0 -77.7500891970593,39.3268181439956,0 -77.72746748091871,39.3177965867944,0 -77.6793019175109,39.3187810010414,0 -77.616235785843,39.2998185774258,0 -77.5686729648781,39.298495090027,0 -77.5419007825367,39.2690420737433,0 -77.4937734776117,39.2500146595609,0 -77.4646672485749,39.2291606204918,0 -77.4617071219601,39.2187353607732,0 -77.4783476432128,39.1770378462932,0 -77.5163278483541,39.1575488653215,0 -77.51275784419811,39.1167594573458,0 -77.47895899133,39.1040646528751,0 -77.459404555923,39.0809444981026,0 -77.4327467353536,39.0668840135464,0 -77.3462265685837,39.0686200582469,0 -77.3243065775866,39.0626960558372,0 -77.2556927153402,39.0276818620407,0 -77.2434318664787,38.9759898010602,0 -77.15174771824201,38.9648893335594,0 -77.12232830291251,38.9321712762375,0 -77.0420882700669,38.9935411597528,0 -77.00793074386711,38.9666671332517,0 -76.9109046912897,38.8901000805306,0 -77.04514742259011,38.7882339432299,0 -77.0461695666273,38.7188957809267,0 -77.0568205142596,38.7121363148863,0 -77.08157873831389,38.7153939181929,0 -77.0928476424555,38.7040989116303,0 -77.12481562054811,38.6779155452061,0 -77.1296906932316,38.6482418914715,0 -77.2774587919105,38.4872207930521,0 -77.2555770674964,38.41371718721,0 -77.2206258675067,38.3907877017763,0 -77.00209178315311,38.4269772011524,0 -76.9727248648513,38.3311549876724,0 -76.9082699582989,38.2999784778825,0 -76.86387331328881,38.3914714190274,0 -76.7599276109587,38.2344093308613,0 -76.5769505272031,38.222764311271,0 -76.3298385406414,38.045830240005,0 -76.3434505132736,38.2131869285095,0 -76.6469375997288,38.4505479866903,0 -76.5197569015984,38.4102610484431,0 -76.471598574103,38.3357833947148,0 -76.421135969123,38.3206235821057,0 -76.4051288342195,38.3461435452093,0 -76.38548233996821,38.3914043684505,0 -76.50857122280399,38.522220870784,0 -76.52493097705791,38.7097512630869,0 -76.5488052362963,38.7590892616049,0 -76.47171855918209,38.9083512988567,0 -76.42361665438941,39.1184647232768,0 -76.5636056235403,39.1963744261278,0 -76.59482606965,39.1587962366193,0 -76.6070184386023,39.1810927544493,0 -76.5766676572233,39.1982282762434,0 -76.5648189147791,39.2315530428342,0 -76.6037153612334,39.2594608609242,0 -76.530981239764,39.2427262967213,0 -76.3987214377801,39.23125237193,0 -76.36371048044749,39.393387950291,0 -76.2263383547627,39.3749983931238,0 -76.1541997728595,39.4020462004049,0 -76.07817856597509,39.542475359461,0 -76.03108047888399,39.5700410038864,0 -75.9744299206522,39.5241368727679,0 -75.9523031535122,39.4712951808406,0 -75.9784646617012,39.3946638351226,0 -75.84939918573831,39.3792510141722,0 -76.03709097678841,39.3584799261141,0 -76.1120448111742,39.3214068908311,0 -76.2181125034375,39.2049624205434,0 -76.2385676859932,39.1309353125061,0 -76.22144635528851,39.0930291937215,0 -76.1109520010634,39.1187058442236,0 -76.199341894342,38.9734670026609,0 -76.1135363312758,38.9208289937164,0 -76.0951642657932,38.9482447165723,0 -76.10256436980529,38.8981319074412,0 -76.07553203210389,38.8896633042527,0 -76.11403931382679,38.8855703797452,0 -76.16552288981249,38.7887251297383,0 -76.19484328035701,38.7653724001326,0 -76.27208777077171,38.8341158634797,0 -76.35020456068629,38.6991431917132,0 -76.3372950814248,38.6794939962041,0 -76.2667911199833,38.7700039380465,0 -76.2229814834233,38.7629085069421,0 -76.17370840256589,38.7092130303982,0 -76.123703577538,38.7080947052705,0 -76.0756590311907,38.6109007702122,0 -76.0465823676188,38.5919759809806,0 -76.0277220313837,38.6221228840739,0 -76.0315976662875,38.5720404826446,0 -76.25072102933051,38.5952017233529,0 -76.1918807885951,38.5434629709824,0 -76.29165294584,38.4788511852767,0 -76.29394177820269,38.4370577153623,0 -76.0651198948853,38.259057093733,0 -76.0204640236521,38.3220175737297,0 -75.994942456991,38.2826466356901,0 -75.94958453518571,38.2821771251992,0 -75.8864815116298,38.3755815466837,0 -75.8720918837096,38.3573513417761,0 -75.89461301257011,38.2589952816564,0 -75.7938261188739,38.2637247654706,0 -75.86132498504991,38.2401659678014,0 -75.8377266864712,38.2317163388415,0 -75.89745125560199,38.1750572625645,0 -75.769206402107,38.0973712697568,0 -75.86538493141229,37.9797804654786,0 -75.64786661285071,37.9702549087239,0 -75.62608404746069,37.9965412351653,0 -75.37242058358361,38.0168338616125,0 -75.3730687313232,38.0690409029093,0 -75.2624990292677,38.2015335967299,0 -75.1506169090142,38.2738812082701,0 -75.1548735291952,38.3697395682799,0 -75.0927212334893,38.4505638472484,0 -75.3498423227975,38.4553227905156,0 -75.6988024422464,38.4631827108939,0 -75.70707355672541,38.5575913668919,0 -75.7107127327496,38.6496658557662,0 + + + + + + + + + -76.2928041305598,38.9078367280903,0 -76.27318950163161,38.9493434073476,0 -76.246408808548,38.9236940972491,0 -76.2478217695177,38.9790095805696,0 -76.2994902315763,39.0407073059323,0 -76.3564746271561,38.958299911005,0 -76.37524061903341,38.8542185416326,0 -76.32938725969851,38.8760038237182,0 -76.3422215756121,38.9241707280608,0 -76.3223079602806,38.9122005623908,0 -76.31412982025771,38.9420383665643,0 -76.3387433583291,38.9567741081102,0 -76.2941866944134,38.9676801350473,0 -76.2928041305598,38.9078367280903,0 + + + + + + + + + -75.0679246646819,38.4500753640855,0 -75.0873204261931,38.3230592800575,0 -75.0456230125111,38.4496021608759,0 -75.0679246646819,38.4500753640855,0 + + + + + + + + + -75.2703576848931,38.0277091732938,0 -75.2422192799713,38.0286475070447,0 -75.17281187763599,38.1243063358622,0 -75.0940269654088,38.3203165911443,0 -75.164373449629,38.2049624515,0 -75.2093886849695,38.0942969089551,0 -75.2440961931471,38.0380238346228,0 -75.2703576848931,38.0277091732938,0 + + + + + + + + + Massachusetts + empty + + +states.AREA: + 8172.561 + + +states.STATE_NAME: +Massachusetts + + +states.STATE_FIPS: +25 + + +states.SUB_REGION: +N Eng + + +states.STATE_ABBR: +MA + + +states.POP2000: + 6349097 + + +states.POP2001: + 6406858 + + +states.POP00_SQMI: + 777 + + +states.DEN_0_100: + 31 + + +USStates.ID: + 6 + + +USStates.State_Name: +Massachusetts + + +USStates.Date_Entered: +Feb. 6 1788 + + +USStates.Year_Entered: +1788 + + +USStates.Year_Settled: +1620 + +]]> + #Style_5 + + + -71.80258992883,42.2568345174596,0 + + + + + + + -71.31932779027051,41.7721958646078,0 -71.2666285816007,41.7497430522047,0 -71.22897615917781,41.7076939683673,0 -71.1988086806704,41.6785003452843,0 -71.1412126344661,41.6552730544524,0 -71.1171327154705,41.4930619563068,0 -71.0011847867691,41.5201241035125,0 -70.8921284437165,41.6339125917583,0 -70.8394306808208,41.6266919415081,0 -70.6197608834614,41.7356361919149,0 -70.6648878020878,41.5561271066309,0 -70.6371390963447,41.5398046803128,0 -70.43291891916461,41.569755900056,0 -70.3976166138351,41.6125715907981,0 -69.9544232643854,41.6714951143766,0 -69.9177797984556,41.7676537960301,0 -69.9641706778297,41.9040941730569,0 -70.0504709879468,42.0262987126367,0 -70.13509049703229,42.0724940905303,0 -70.2551481598432,42.0601192659912,0 -70.1004972494064,42.0021938707637,0 -70.00044794743459,41.8563504070949,0 -70.0192146776447,41.7815193451751,0 -70.2052596214815,41.7125732892697,0 -70.3411271976759,41.7118130863329,0 -70.2738341329655,41.721663017485,0 -70.42351172103081,41.7436223850015,0 -70.5377048060198,41.8057620061259,0 -70.5403385173567,41.9309515217422,0 -70.6187030078313,41.9681898123452,0 -70.686037251662,42.1531665960055,0 -70.77459547590971,42.2486399423215,0 -70.8246609058028,42.2605069326982,0 -70.8926710305429,42.2657668652407,0 -70.9232041375729,42.2345170134159,0 -71.03416194900311,42.2856288096679,0 -70.9606220141229,42.4323935235108,0 -70.8936039190112,42.4480681190628,0 -70.81312837940889,42.5464364349616,0 -70.6334520465019,42.5826421345195,0 -70.59319925007451,42.6463050999637,0 -70.7396954300213,42.6635235535106,0 -70.8138807202681,42.8670649720671,0 -70.84973977624399,42.8634293009967,0 -70.8981116667382,42.8868774762984,0 -70.9213361332524,42.885149233192,0 -71.02542615731881,42.8511713651458,0 -71.065564728038,42.8043197291356,0 -71.12060440995749,42.8182808692669,0 -71.18106084331041,42.807317168902,0 -71.1863474665185,42.7387606265609,0 -71.24047922287529,42.7435552404171,0 -71.2524115796458,42.7260689220942,0 -71.287194447592,42.6986034465098,0 -71.90094191420261,42.7053786149513,0 -71.9302165845551,42.7072094199587,0 -72.2799169173511,42.720467037784,0 -72.4557700038868,42.7258525290855,0 -72.92299742922531,42.7373644761782,0 -73.0196951738304,42.7403966786337,0 -73.2580598287651,42.7460586400616,0 -73.35082423703111,42.5047557597646,0 -73.49884000273219,42.0774606830635,0 -73.4842302844536,42.0474280500728,0 -73.0456324711282,42.0363103821922,0 -73.0060955098662,42.0360092024926,0 -72.8164509949267,42.033507731778,0 -72.817679571843,41.9971850435429,0 -72.7675750314897,42.0021671817802,0 -72.75589381790709,42.0338475230699,0 -72.6095266969696,42.030536850941,0 -72.60782527309461,42.0228008077559,0 -72.58190737022019,42.0216068944432,0 -72.57122589242989,42.0301249737628,0 -72.5075717905207,42.0307660006011,0 -72.1363467150764,42.0264020644269,0 -72.0949717608141,42.0257995069483,0 -71.80234071658769,42.0179769339478,0 -71.7978316087619,42.0042748046851,0 -71.4974303691298,42.0092535031422,0 -71.3786442228911,42.0137133195162,0 -71.3824052822434,41.9792630768653,0 -71.38395315470341,41.8884397544727,0 -71.333085950288,41.8960311596525,0 -71.34249312021549,41.8757828914979,0 -71.3345427095385,41.8579036075383,0 -71.34548316624701,41.8131613833437,0 -71.33979862314,41.7844255626959,0 -71.31932779027051,41.7721958646078,0 + + + + + + + + + -70.6043308335024,41.4296630739879,0 -70.60584217854981,41.4746632583726,0 -70.66748797346899,41.4549372973785,0 -70.7517695470512,41.3821690323835,0 -70.77092662880651,41.3249804137282,0 -70.78252415013171,41.352517678155,0 -70.8439198398732,41.3485988852067,0 -70.7697130665689,41.298163904796,0 -70.7386765301454,41.3341551752324,0 -70.486141190082,41.3415610204116,0 -70.5151571489217,41.3986601230011,0 -70.575857359437,41.4102856936161,0 -70.5528317397027,41.4173887728697,0 -70.5676946736082,41.4645667099463,0 -70.6043308335024,41.4296630739879,0 + + + + + + + + + -70.03171640756911,41.3119311871487,0 -70.09787203770659,41.2776309471401,0 -70.2070964296735,41.2940877852649,0 -70.21326869354419,41.270204935144,0 -70.10310570522719,41.2382796862047,0 -69.96844433867869,41.2518167689829,0 -69.96598006456441,41.2948911801898,0 -70.04926441844221,41.3919612498596,0 -70.0344859690813,41.3497184956242,0 -70.0876332277476,41.2968486962802,0 -70.0266199082301,41.3372104301762,0 -70.00650844928499,41.3247747653595,0 -70.03171640756911,41.3119311871487,0 + + + + + + + + + Michigan + empty + + +states.AREA: + 57899.398 + + +states.STATE_NAME: +Michigan + + +states.STATE_FIPS: +26 + + +states.SUB_REGION: +E N Cen + + +states.STATE_ABBR: +MI + + +states.POP2000: + 9938444 + + +states.POP2001: + 9997284 + + +states.POP00_SQMI: + 172 + + +states.DEN_0_100: + 85 + + +USStates.ID: + 26 + + +USStates.State_Name: +Michigan + + +USStates.Date_Entered: +Jan. 26 1837 + + +USStates.Year_Entered: +1837 + + +USStates.Year_Settled: +1668 + +]]> + #Style_5 + + + -85.4386025294334,44.3365484429102,0 + + + + + + + -88.4975275282269,48.1737953051637,0 -89.1560989935608,47.93922809600121,0 -89.20178730153791,47.883856943529,0 -89.19291626356561,47.8446133573585,0 -89.1398848301356,47.8240760135492,0 -89.0286226647864,47.8506552310947,0 -88.9015476276433,47.9602485109714,0 -88.62532706800501,48.0331676704744,0 -88.4975275282269,48.1737953051637,0 + + + + + + + + + -88.50068113271711,47.2901802187495,0 -88.5956323026243,47.243592963422,0 -88.59426204335659,47.1347650286244,0 -88.47066419275591,47.1114725925833,0 -88.4128433970392,46.9880945574411,0 -88.2222796851962,47.20075228444591,0 -87.9170421798346,47.35800703474979,0 -87.73751047538521,47.3930248530549,0 -87.70438353060609,47.4159502393094,0 -87.78812041255949,47.4707930407946,0 -88.2113917997532,47.4478349809783,0 -88.43790109187169,47.35589615672669,0 -88.50068113271711,47.2901802187495,0 + + + + + + + + + -85.8598446689146,45.9694694332197,0 -85.6553812556068,45.9728707038144,0 -85.5095462997763,46.10191144051079,0 -85.378242862305,46.1000474968113,0 -85.0616297207559,46.0247516443713,0 -84.8510998289,45.8906367080231,0 -84.7317322269644,45.85567967180521,0 -84.68902263973691,46.0359181647936,0 -84.6168451285152,46.0382300997572,0 -84.50163489117131,45.9783426043905,0 -84.35448508342451,45.99919002614029,0 -84.1132725571978,45.97853868939439,0 -83.9064607016374,45.9602396119094,0 -83.9019522904123,46.0059021950587,0 -83.9895017437976,46.0259857516108,0 -84.0619810068951,46.0944707342467,0 -84.0295784705683,46.1289437813081,0 -84.1197351080435,46.1761086144177,0 -84.24703149238211,46.171447449818,0 -84.27313420703641,46.2073090320522,0 -84.181646508334,46.2487208573892,0 -84.3116140465187,46.4886691648575,0 -84.41596703992489,46.4806585984594,0 -84.57266689802989,46.40792634821091,0 -84.6298147995395,46.4829429912477,0 -84.80365300490671,46.4440542272806,0 -84.931320645464,46.4878435249077,0 -85.0166397498537,46.4764442097209,0 -85.051655182818,46.5055768367989,0 -85.0189754555566,46.5490241006878,0 -85.02697150185961,46.6943397781429,0 -84.9547594637199,46.7709512828567,0 -85.2300947338335,46.7567853203433,0 -85.5038505878416,46.674174579044,0 -85.8575364791034,46.6948151482157,0 -86.0967391005232,46.6552685367715,0 -86.1481090958201,46.6730530979662,0 -86.46239202904469,46.5610855335273,0 -86.6382203191924,46.42226370889561,0 -86.7594957088175,46.4866315025199,0 -86.8713826815009,46.4443597313603,0 -87.00640197649859,46.53629363488701,0 -87.1106791249956,46.5014733756769,0 -87.3715388665667,46.5079912016724,0 -87.6637661990473,46.83685158256339,0 -87.9006541308096,46.9097618467136,0 -88.0366849184073,46.9118654572711,0 -88.1891883816124,46.9009581842231,0 -88.17782681696821,46.945890272928,0 -88.4466168624265,46.7993967669245,0 -88.4765228993159,46.8551516596417,0 -88.44596477585399,46.92830447098779,0 -88.4411640771673,46.9907346098996,0 -88.5129949819838,47.032589654359,0 -88.5112154949687,47.1065061773656,0 -88.6181043741835,47.13111439065281,0 -88.62950007120951,47.2258127771419,0 -88.8848320236261,47.1045548203599,0 -88.9296883362077,47.0309261610721,0 -88.9948757098838,46.9971033190838,0 -89.1251876986471,46.9966066327594,0 -89.2145920401578,46.9233784671178,0 -89.3867180852705,46.85020839272341,0 -89.7912444026547,46.8247129534584,0 -89.8862519694252,46.7689352365095,0 -90.01886460043491,46.6786337680856,0 -90.4081998571279,46.5686106643971,0 -90.38552505384241,46.5396577407228,0 -90.3137081584288,46.5515632659266,0 -90.3023935803059,46.544296405249,0 -90.300181077668,46.5250515829943,0 -90.2697849871137,46.5224805256097,0 -90.2584017374293,46.5087897865362,0 -90.2115257849797,46.5062949924702,0 -90.1613911037779,46.4423800673451,0 -90.1417974652462,46.39389931520821,0 -90.11517713167859,46.3651557309551,0 -90.1116593658125,46.3404289934283,0 -89.925136091667,46.30402570041401,0 -89.0998061353819,46.14564279170131,0 -88.9853010679315,46.1003912267907,0 -88.92519544224371,46.07360150800961,0 -88.80439717033499,46.0268046239007,0 -88.7938153525548,46.0363602068919,0 -88.7774806211023,46.0326143605406,0 -88.7730171354202,46.021147746959,0 -88.7264096386053,46.029581736083,0 -88.7036055788856,46.01892364058919,0 -88.6773838648913,46.0201441283944,0 -88.6436694832571,45.9933882928391,0 -88.61550234597981,45.9941205068572,0 -88.5975360335339,46.0155164912387,0 -88.575357692098,46.0089590630598,0 -88.5483579419945,46.0193002259831,0 -88.5156131830942,46.01860956196891,0 -88.49408327895949,46.0129599627087,0 -88.483813961278,45.99915098858521,0 -88.4543189656679,46.0007603460834,0 -88.40352211244171,45.9834220708464,0 -88.3699382062343,45.9945870784701,0 -88.32132305028109,45.9667127656587,0 -88.2991520587513,45.9619441469833,0 -88.25716803963969,45.9670551908873,0 -88.2149918189356,45.9479016364541,0 -88.1801939444304,45.9535166684228,0 -88.15043842419399,45.93629352156811,0 -88.1113904221148,45.9262876744074,0 -88.093850061765,45.9206153043833,0 -88.0957641221132,45.8918035055568,0 -88.0654210733109,45.8736421368008,0 -88.121786443611,45.8348779040675,0 -88.12994949370579,45.8194019526506,0 -88.0887340937991,45.79153251888161,0 -88.0516393398365,45.7861121476097,0 -87.99006981134831,45.7950463354111,0 -87.9691796312807,45.7664485705759,0 -87.873628831766,45.7506993690495,0 -87.8423627328109,45.7224184643369,0 -87.8015528795181,45.71139103613621,0 -87.8011558298595,45.70132435444889,0 -87.7774737292068,45.6841018123955,0 -87.7809448308433,45.67591566979451,0 -87.81705427025651,45.6653907719653,0 -87.8199378153198,45.6544505099681,0 -87.7760447968861,45.61320014924521,0 -87.77507546391441,45.6003869719677,0 -87.78631248967309,45.5685197968153,0 -87.8286019788526,45.5685917608724,0 -87.8051409550811,45.5445258364016,0 -87.78938490783349,45.49906763103741,0 -87.8136146858711,45.4664604760223,0 -87.8602674034623,45.445098404767,0 -87.8495317013046,45.4061175328758,0 -87.8836106233029,45.36585448274341,0 -87.8739746664525,45.36208580082749,0 -87.86853527657431,45.3720723766891,0 -87.86209606573161,45.3701651658513,0 -87.84128251380081,45.3461489152026,0 -87.8280078733776,45.3583213196226,0 -87.76003806908641,45.3528977344774,0 -87.6895980065264,45.3912693654604,0 -87.6436840378919,45.3618558882988,0 -87.645362038293,45.34816920676,0 -87.7044714190303,45.2722051755656,0 -87.7051420461443,45.2470862859939,0 -87.71966802928161,45.23677159669181,0 -87.72162823196,45.2116719436728,0 -87.7361999812867,45.1990723551736,0 -87.72966881168701,45.1766048406442,0 -87.6728141404664,45.1406726367061,0 -87.5925143132007,45.1085018074312,0 -87.58386416098671,45.1627331960046,0 -87.33222680525159,45.42394270187959,0 -87.2607070334237,45.5548024600535,0 -87.12375941810291,45.6962467505129,0 -86.9016241205329,45.714778151079,0 -86.7614692096392,45.826067773125,0 -86.584735685807,45.8138796968306,0 -86.696919405518,45.69251111172819,0 -86.68505337036631,45.65004804099411,0 -86.629784386179,45.62123355870779,0 -86.57612474228731,45.7101740346977,0 -86.52201061737431,45.7240941649958,0 -86.52938982637311,45.74896120959101,0 -86.4582753564091,45.7627474587696,0 -86.34379558304561,45.83439616514829,0 -86.31563861501689,45.9056825648406,0 -86.2593192707417,45.9469296652713,0 -86.067891449499,45.9642103933668,0 -85.9171044674119,45.9181924006148,0 -85.9149553497885,45.95797817970151,0 -85.8598446689146,45.9694694332197,0 + + + + + + + + + -83.8546801700959,46.0140316422695,0 -83.8858916672003,45.9708524498185,0 -83.8528104836337,45.9974492109717,0 -83.804881070028,45.936764510125,0 -83.629704837753,45.9535961546271,0 -83.57981373770861,45.9175013541361,0 -83.5161593405338,45.9257147658035,0 -83.4731894201386,45.987547805609,0 -83.5339910274221,46.0117900707978,0 -83.58949805959941,46.0885184421793,0 -83.6498875534141,46.1039714892754,0 -83.732448534534,46.08410814655849,0 -83.68031444287379,46.07179455246539,0 -83.6735921422512,46.0361921724046,0 -83.7564199993262,46.0273380165628,0 -83.8011052680607,45.98841247488381,0 -83.8546801700959,46.0140316422695,0 + + + + + + + + + -86.8348296412819,41.7655047552312,0 -86.5251809764443,41.7655403363901,0 -86.2345652919433,41.7648642479853,0 -86.0683022053847,41.7646284325784,0 -85.79922697228621,41.7635349679273,0 -85.65945882918869,41.7626275140628,0 -85.29720963584781,41.7635810035748,0 -85.1931406144237,41.7628675471372,0 -84.8260080463026,41.7618751066694,0 -84.7884777858482,41.7609594561938,0 -84.79037747295131,41.6974947329852,0 -84.38439324270421,41.7071503370832,0 -84.35920849224161,41.7080391705922,0 -83.868639675225,41.7159933856432,0 -83.76395412119879,41.7170422186577,0 -83.4826910020175,41.7251299269076,0 -83.19006624457531,42.0339796563901,0 -83.19387310674711,42.1157494340736,0 -83.107588485427,42.2927057543585,0 -82.92938905928671,42.3630404584644,0 -82.87490709168991,42.4580671820726,0 -82.88813814869479,42.4957559768438,0 -82.802361560496,42.6129258784123,0 -82.8204067747469,42.6357945388927,0 -82.7298058507281,42.68122680411,0 -82.63401479868659,42.6693828613479,0 -82.6458773357857,42.6317284970443,0 -82.5181795398622,42.6340520555246,0 -82.4732382545008,42.7628960899223,0 -82.4719527162131,42.8986819969275,0 -82.4198358589283,42.9724650786066,0 -82.5038206240279,43.1722534988665,0 -82.6057380465658,43.6945684044879,0 -82.61848776538859,43.7878661020809,0 -82.72790219887359,43.972506277548,0 -82.8059778732508,44.0335645723623,0 -82.9401540705878,44.0699595149276,0 -83.32602585310789,43.9404594218171,0 -83.36716318794871,43.844452153086,0 -83.4664083716859,43.7457407367818,0 -83.4942480190406,43.7028415322697,0 -83.53090972920811,43.7259433589107,0 -83.6546148101736,43.6074199226765,0 -83.6991646571783,43.5996422574816,0 -83.9381217654628,43.698283731803,0 -83.918376196547,43.9169976606375,0 -83.8736148499472,43.9628422046614,0 -83.7048019672777,43.9971652266508,0 -83.5984044651608,44.070493356617,0 -83.5682369426092,44.1701180526948,0 -83.5291504874037,44.2612741330213,0 -83.356962952145,44.335133682907,0 -83.32003621808229,44.5154601725864,0 -83.280812186475,44.7031838105345,0 -83.3197243749479,44.860646589634,0 -83.42935572956959,44.9262969077196,0 -83.4649030258911,44.9978831954067,0 -83.4339724672792,45.0111281816831,0 -83.4444410041901,45.05277359214701,0 -83.3127074580252,45.0986201471471,0 -83.3986957035617,45.2136414467938,0 -83.4207614501791,45.25718269852389,0 -83.3940196634256,45.2729072818439,0 -83.48959802510289,45.3289374401826,0 -83.49583213180431,45.36080192486221,0 -83.592363108339,45.3495018817337,0 -83.71231863656089,45.41239441936009,0 -83.782809495878,45.4094489102236,0 -83.92289215949469,45.491773583756,0 -84.1059075983171,45.49874951213231,0 -84.13522881914039,45.5713432584365,0 -84.2055603253076,45.6309054506234,0 -84.3214583512467,45.665607571299,0 -84.46527503674039,45.6536374615858,0 -84.7241858039318,45.7803045686693,0 -84.9720378240667,45.73774518871549,0 -84.98341250400669,45.6837137292165,0 -85.0780197003353,45.6301851677823,0 -85.12044693558239,45.5697793498832,0 -85.0818156898282,45.464650463889,0 -84.92167403324559,45.4098990503169,0 -84.9858934396436,45.37317811148381,0 -85.0928627445342,45.3702250037919,0 -85.30547495309349,45.3203837985815,0 -85.373252794881,45.2735409266072,0 -85.39024477400371,45.211593083379,0 -85.3848695133689,45.0106032425427,0 -85.4513511003899,44.8605403796015,0 -85.5260810367145,44.76316233761,0 -85.6380395377647,44.7784356967099,0 -85.6530062666143,44.9583622397271,0 -85.56551465635459,45.18056026557281,0 -85.6102150946457,45.1965277092277,0 -85.7957565629422,44.9859748602387,0 -86.0674543490246,44.8982569078434,0 -86.09796468725619,44.8506123089817,0 -86.08291833647959,44.7779289033047,0 -86.1084845600375,44.7344420211888,0 -86.25862694050851,44.7007309766977,0 -86.23803830888259,44.5222735987814,0 -86.271954369493,44.3512284893904,0 -86.3864232316096,44.1832041325685,0 -86.5186023282979,44.053619224709,0 -86.4381471318946,43.9455921234144,0 -86.4595481972781,43.9501848083598,0 -86.42881418089701,43.8201238403686,0 -86.4341008938508,43.78145827444,0 -86.4043451853738,43.7666424042588,0 -86.4478111642203,43.7726653117644,0 -86.5413012212606,43.6631870809765,0 -86.4632010649154,43.4751666759798,0 -86.2738368374562,43.1210450506522,0 -86.2178547734773,42.7748252127058,0 -86.28498077199561,42.4223247647982,0 -86.3742778338012,42.2494214217998,0 -86.4988334182755,42.1264467479204,0 -86.6175922510584,41.9074480787407,0 -86.8348296412819,41.7655047552312,0 + + + + + + + + + Minnesota + empty + + +states.AREA: + 84520.49 + + +states.STATE_NAME: +Minnesota + + +states.STATE_FIPS: +27 + + +states.SUB_REGION: +W N Cen + + +states.STATE_ABBR: +MN + + +states.POP2000: + 4919479 + + +states.POP2001: + 4992492 + + +states.POP00_SQMI: + 58 + + +states.DEN_0_100: + 95 + + +USStates.ID: + 32 + + +USStates.State_Name: +Minnesota + + +USStates.Date_Entered: +May 11 1858 + + +USStates.Year_Entered: +1858 + + +USStates.Year_Settled: +1805 + +]]> + #Style_5 + + + -94.3059456842785,46.315646568988,0 + + + + + + -91.7303661652997,43.4995717605756,0 -91.61109897494811,43.5006261853338,0 -91.22356677965871,43.5008086595185,0 -91.2405580213774,43.5487125887566,0 -91.23298990442041,43.5988900700786,0 -91.25838918935199,43.6773222933277,0 -91.2589159418758,43.722395792303,0 -91.25110489264939,43.7880757984421,0 -91.2919479787799,43.8471907610578,0 -91.37335730440661,43.9471911008781,0 -91.42590181819401,43.9856198570706,0 -91.5284201557391,44.0342152895652,0 -91.5691620630017,44.0349552968239,0 -91.60178627007811,44.0408222716716,0 -91.65223360680488,44.0668957468858,0 -91.75321932280971,44.137227713274,0 -91.8487439445729,44.1911872320563,0 -91.8886943206616,44.2574949606432,0 -91.92234937163771,44.2883410303644,0 -91.92275412337878,44.3175199116197,0 -91.93886834504872,44.339111391384,0 -91.9723859734527,44.3644872200889,0 -92.09133339981391,44.4155898138742,0 -92.20613743547611,44.438394406506,0 -92.24910036010419,44.4562167874695,0 -92.2966874837295,44.4921818837451,0 -92.32047800875431,44.5404910618561,0 -92.3408725165741,44.552835394321,0 -92.50921485952681,44.5751591745776,0 -92.60897363372321,44.6102923158697,0 -92.6303675936169,44.6426524073846,0 -92.7371456955245,44.7135944805029,0 -92.8055846707726,44.7461605361291,0 -92.76102806028632,44.8353710549111,0 -92.7642634372038,44.8622340952332,0 -92.77187081519131,44.8994959546817,0 -92.75392579385328,44.9150027795129,0 -92.74976784308311,44.9356555439475,0 -92.76712645766899,45.00100490501169,0 -92.76299156220411,45.0221192057595,0 -92.7967618135124,45.06561027085739,0 -92.745422213769,45.1130040157029,0 -92.74493484528919,45.15642269767639,0 -92.76258304535911,45.1866121435376,0 -92.7554192919425,45.21237648106559,0 -92.7465933709999,45.2976031328022,0 -92.70738439950389,45.3182016620431,0 -92.6848697682278,45.3630764817203,0 -92.6487510358123,45.3954659291152,0 -92.64497507097812,45.4394520895191,0 -92.65481774623471,45.4552217732121,0 -92.6854210050266,45.47005330592301,0 -92.72815467639281,45.5472423195578,0 -92.7621749006385,45.5642634927727,0 -92.8350370161896,45.5634021889124,0 -92.87683120537091,45.5788365687146,0 -92.88539736667759,45.6449553564473,0 -92.86001973034908,45.7105625427853,0 -92.8336362361192,45.7308902363902,0 -92.7791069996475,45.7633404333685,0 -92.7487619268784,45.8373020678585,0 -92.73409766347459,45.8449807095829,0 -92.7062407667141,45.8909581511523,0 -92.66620788226589,45.9157031282064,0 -92.5526720844383,45.951269177817,0 -92.523976865602,45.9825831928093,0 -92.46234575772182,45.9811975360765,0 -92.424999275654,46.02550410046081,0 -92.36496279806639,46.0162488119767,0 -92.34622483014461,46.02259611620039,0 -92.3273726656403,46.05687820515121,0 -92.28937040263681,46.0732311286316,0 -92.2889439643788,46.1566006735494,0 -92.28868526089251,46.4159840674228,0 -92.2872715563534,46.6587860038615,0 -92.3031480663,46.6665757766645,0 -92.2146242678823,46.6682038862087,0 -92.08849202307899,46.7918972785432,0 -91.8009688624982,46.927086623484,0 -91.4686571836076,47.1249355556153,0 -91.0214756530082,47.4610588390706,0 -90.50963345452878,47.70993799650971,0 -89.9996777736217,47.8245648226691,0 -89.6363736107452,47.9593906700956,0 -89.6256450556299,47.9925618003996,0 -89.53067313598361,48.0016559923925,0 -89.7493099330168,48.0264846412458,0 -89.9003891418888,47.99250512067161,0 -89.9870207360302,48.0235567657025,0 -90.0267005742131,48.0860790014952,0 -90.14527002079679,48.11277085020891,0 -90.5568351655885,48.0927504182125,0 -90.5674552658806,48.1216998440229,0 -90.74336558712381,48.08844371515371,0 -90.8644947891665,48.2541980952133,0 -91.02714843931439,48.1953389259894,0 -91.2394466747146,48.0812981350086,0 -91.5715618830894,48.0435715472354,0 -91.5687753292567,48.1044577516695,0 -91.70373106504471,48.1148349055472,0 -91.71193784619291,48.196775109185,0 -91.7888148497142,48.20614520447209,0 -91.9795339629396,48.2503981435702,0 -92.03518366304429,48.35550878694159,0 -92.12596210613212,48.3667559539545,0 -92.276130881027,48.3523196851575,0 -92.3002722840632,48.2983114429892,0 -92.27691795711418,48.24434086906501,0 -92.37011602275121,48.2207790471373,0 -92.4733222786803,48.357498964433,0 -92.45634491288702,48.40216907873939,0 -92.497529244791,48.44007277128479,0 -92.7066429969655,48.4603699594979,0 -92.698821186614,48.4947209620297,0 -92.62637994133861,48.5028239458538,0 -92.64181991541932,48.5403493271395,0 -92.7290006435522,48.5402115541602,0 -92.94692624020411,48.6283554983948,0 -93.0914423831067,48.6265848629951,0 -93.30423676330351,48.6371629986434,0 -93.45776948562218,48.5927099128974,0 -93.46533944532861,48.5495199345034,0 -93.5141391057052,48.5342709597703,0 -93.7811059808909,48.511590153422,0 -93.81268540339329,48.5254079471682,0 -93.84390378713221,48.6247369771822,0 -94.2308273869122,48.6519875523433,0 -94.2923368906057,48.707711135665,0 -94.4306344734039,48.7107852810122,0 -94.5703127368143,48.71367626358171,0 -94.69443202241369,48.7776155300333,0 -94.6812499456836,48.8771613109608,0 -94.8320392613248,49.3308059165427,0 -95.1518673347569,49.3717301437862,0 -95.15774988936289,48.9999959148723,0 -95.2766571152867,48.99999121224381,0 -96.4069151843986,48.9999820713408,0 -97.22943644383329,48.9999877567165,0 -97.21636909583231,48.9318299182446,0 -97.17572751730749,48.87375778734761,0 -97.17120441179901,48.8359804803914,0 -97.180421855856,48.8155374993874,0 -97.1647124057145,48.81036830295489,0 -97.17394470123411,48.8015144641308,0 -97.14751600300801,48.7811701058176,0 -97.13924598743699,48.7635421115078,0 -97.14789838866929,48.7556533929197,0 -97.1325018005064,48.74721879009559,0 -97.13480616135631,48.72623793064931,0 -97.11010128165211,48.70858304519639,0 -97.1167392665872,48.6952431183753,0 -97.0971692767445,48.67452891358581,0 -97.1076300563642,48.6299465820435,0 -97.12744434552491,48.6297943394125,0 -97.1229581756859,48.62076865965261,0 -97.14471807468772,48.614024636853,0 -97.1408119037381,48.58690580615401,0 -97.1581923011142,48.5836407260616,0 -97.15212680110921,48.5728564381998,0 -97.16794315057858,48.5622632793582,0 -97.14661837238491,48.549537028086,0 -97.16043569382291,48.5450778855401,0 -97.15553751110001,48.5383982428954,0 -97.13938559124,48.53464808973769,0 -97.14832765896941,48.5179512756552,0 -97.13459432660341,48.5173139662426,0 -97.1436129528287,48.4381095940115,0 -97.11963315137211,48.4371020760904,0 -97.1226011810987,48.4161098774117,0 -97.1516469812462,48.4196122946538,0 -97.14982354769968,48.4099916056847,0 -97.12912451530391,48.40788551888869,0 -97.15881888906552,48.3882060567347,0 -97.13520540024382,48.3844100102639,0 -97.1337863598383,48.37245473762349,0 -97.1503959422882,48.3632158504957,0 -97.1311236997639,48.3614912628834,0 -97.1371359526577,48.325991839938,0 -97.11259178050868,48.3199260418033,0 -97.1326346023646,48.3109694998778,0 -97.11475103859129,48.3036182701977,0 -97.11372110772452,48.2948826063907,0 -97.13051368584328,48.2930404066961,0 -97.1126835485646,48.2861469425287,0 -97.1117146532382,48.2778766724222,0 -97.1366555811411,48.26448372514071,0 -97.12378464072812,48.2591734472995,0 -97.12755405772062,48.2335233812974,0 -97.1092357553089,48.2280489212221,0 -97.13975391723049,48.2217551769127,0 -97.1108994630634,48.2076058326789,0 -97.13082783294991,48.203741885664,0 -97.13727498096822,48.19506350874159,0 -97.13629125790619,48.1752269254696,0 -97.13744349769659,48.1677691625112,0 -97.1160657786151,48.15922376009381,0 -97.1365131689498,48.1483979760568,0 -97.12091854672551,48.1427747596289,0 -97.1218728658484,48.1163692500537,0 -97.09903037740141,48.10097253646661,0 -97.09272143407961,48.0703439518727,0 -97.06707134786728,48.048164548667,0 -97.04805316836101,47.9549243203709,0 -97.0153310859442,47.9178900732528,0 -97.02056624465818,47.8755694579146,0 -97.0003404808151,47.8701978669666,0 -96.9772315863069,47.82802938021419,0 -96.98389283615319,47.8096615237026,0 -96.95783043536861,47.7944403501783,0 -96.9320126704945,47.76350633439991,0 -96.92365919198331,47.7140944463104,0 -96.88942557471509,47.6739252332857,0 -96.8733355306381,47.61525494214149,0 -96.8522168516036,47.6011515774988,0 -96.85866448748919,47.5629780191413,0 -96.84918872371689,47.5445680596933,0 -96.86068697531159,47.521355890617,0 -96.8516156149426,47.5006189556105,0 -96.86668409504289,47.46153767201731,0 -96.8558270224376,47.4367532150799,0 -96.8672485372544,47.4130870926383,0 -96.85000552427368,47.40893619134631,0 -96.83982751825211,47.3841173886799,0 -96.8506310274787,47.3609547965118,0 -96.83846171594141,47.3422432670699,0 -96.84674742491131,47.3146021392787,0 -96.8377139015022,47.2938841531782,0 -96.84962364144019,47.2568437171683,0 -96.83706533207652,47.24045886252299,0 -96.8264910530645,47.1700638561564,0 -96.83916391918299,47.15188672447119,0 -96.8191517739067,47.092603946145,0 -96.82696455551869,47.0788327499143,0 -96.8226082854226,47.0339323228784,0 -96.83529642490029,47.010231336615,0 -96.8245311005541,47.0034368148568,0 -96.81677225710112,46.9697793204954,0 -96.7934256963282,46.9696412657999,0 -96.80188711680511,46.9558437462552,0 -96.78971039131831,46.9482025284177,0 -96.78792529587892,46.9321845446505,0 -96.7630680116614,46.9362617243826,0 -96.75691111938932,46.92278040676061,0 -96.77806115639289,46.86734962234851,0 -96.7682498142506,46.8448617179934,0 -96.79719698567129,46.8120331273937,0 -96.78038206028749,46.76231192357041,0 -96.7815566712509,46.70704424821519,0 -96.7936950250642,46.6788040267861,0 -96.79024584630611,46.6297732310646,0 -96.7843175742934,46.6241120798968,0 -96.77104176601431,46.599983727298,0 -96.7512275405111,46.5886193856906,0 -96.7403159762507,46.48943263621611,0 -96.7148938591495,46.4687184679509,0 -96.70968261750701,46.4271682580565,0 -96.68822802670302,46.4122182590646,0 -96.652101616659,46.359433744956,0 -96.6148614718026,46.3508125122489,0 -96.60207424773671,46.3363242033822,0 -96.59818306918299,46.2386825873787,0 -96.586456172813,46.2154130412247,0 -96.58789029848551,46.1919183501241,0 -96.5711660882375,46.1771746587376,0 -96.5519309951806,46.0955288981098,0 -96.57621526476891,46.0212796299197,0 -96.56180218014301,45.947683082204,0 -96.56692152993792,45.9341104552974,0 -96.5879553105857,45.81785439182519,0 -96.6046107059596,45.80826424845279,0 -96.6573917688784,45.7389705623089,0 -96.83279582155808,45.6506868841235,0 -96.8549898493374,45.6091221067738,0 -96.8430871871886,45.5840902909474,0 -96.7692462014101,45.5174788689806,0 -96.73803233417799,45.45819529036351,0 -96.6931692082715,45.41063812193121,0 -96.605084508902,45.39652440242141,0 -96.53254890239431,45.375132161552,0 -96.47759206506849,45.32850936575391,0 -96.45760224516572,45.29885024157079,0 -96.45449660823299,45.2751954302209,0 -96.45607982498672,44.9719948297018,0 -96.45521726388,44.801347584114,0 -96.4567178119828,44.6288086832266,0 -96.4551061874746,44.5383431654349,0 -96.4573975061948,44.1990613946085,0 -96.45660233944199,43.8487418284865,0 -96.4604547078315,43.4997184756898,0 -96.0610395014389,43.498533697461,0 -95.8669120002192,43.4989439769817,0 -95.46477535859469,43.4995410217166,0 -95.3965585901372,43.5003340364673,0 -94.9204646838526,43.4993712448179,0 -94.859839276263,43.5000304051637,0 -94.4552382894281,43.4981020923778,0 -94.2467873911458,43.4989484742926,0 -93.97394980408042,43.5002988511065,0 -93.653699466766,43.5007626988541,0 -93.5008302025135,43.5004884829356,0 -93.0543803044398,43.5014574340012,0 -93.0272108293768,43.5012788635835,0 -92.5580084257835,43.5002595022348,0 -92.4531691122113,43.4994619143947,0 -92.07753252302631,43.499153513998,0 -91.7303661652997,43.4995717605756,0 + + + + + + + + Mississippi + empty + + +states.AREA: + 47618.965 + + +states.STATE_NAME: +Mississippi + + +states.STATE_FIPS: +28 + + +states.SUB_REGION: +E S Cen + + +states.STATE_ABBR: +MS + + +states.POP2000: + 2844658 + + +states.POP2001: + 2871527 + + +states.POP00_SQMI: + 60 + + +states.DEN_0_100: + 95 + + +USStates.ID: + 20 + + +USStates.State_Name: +Mississippi + + +USStates.Date_Entered: +Dec. 10 1817 + + +USStates.Year_Entered: +1817 + + +USStates.Year_Settled: +1699 + +]]> + #Style_5 + + + -89.6640053796168,32.7591641085257,0 + + + + + + -88.4508031165511,31.4356176907354,0 -88.465096841429,31.7022450293789,0 -88.4729519210596,31.8888768167036,0 -88.4377242279507,32.2277556143888,0 -88.4257919971009,32.3092243032455,0 -88.3938325168417,32.5804702260594,0 -88.3480414662251,32.9247582205318,0 -88.33946633175739,32.9874972113755,0 -88.3048295831961,33.2888943469818,0 -88.2745866910838,33.5388014650338,0 -88.24819560524909,33.7427263969428,0 -88.20264467082561,34.0591222846376,0 -88.19934924265689,34.0904480664289,0 -88.1676133199948,34.3241474912554,0 -88.15125641336159,34.4652732358205,0 -88.13640162363011,34.5804972978314,0 -88.09046867570861,34.8956296636558,0 -88.10888651427,34.8999364686021,0 -88.1431049406294,34.9303124572945,0 -88.1939935775637,35.0044536440488,0 -88.3517277419525,35.0038322749094,0 -88.3831462732763,35.0050415368605,0 -88.7850433913526,35.0031823096823,0 -88.8125482768171,35.0024385995065,0 -89.0061963915943,35.0002347214314,0 -89.1981347323638,35.0008837887335,0 -89.3423729736416,34.9998048697839,0 -89.64655874084551,35.0007332954087,0 -89.7172700655279,34.9992611903073,0 -90.3054483329108,35.0007887668604,0 -90.2996040912406,34.9785763166455,0 -90.2482645856439,34.9498563938362,0 -90.24199312177619,34.9389999550718,0 -90.24293921036021,34.9208271417899,0 -90.2668045737091,34.8966081006537,0 -90.2963692858759,34.8827875862869,0 -90.2995432252211,34.8650572468814,0 -90.30164901403768,34.851873932935,0 -90.3229203349016,34.8503632334111,0 -90.34152127876421,34.8606740294564,0 -90.4040306027044,34.8411352642473,0 -90.4224103169264,34.8323653841601,0 -90.433648709805,34.83545134437,0 -90.4279417146019,34.8727391673229,0 -90.43818824405589,34.8862771531433,0 -90.47062930169579,34.8810204416072,0 -90.4748179857494,34.8578237977629,0 -90.45200553728539,34.8253158387959,0 -90.46680699538459,34.7997617150697,0 -90.4489690543041,34.7608489921917,0 -90.45153258063928,34.7412990973377,0 -90.48602595176961,34.7269330960027,0 -90.5045201438459,34.7299541802284,0 -90.5170709695817,34.7484702598375,0 -90.49883609775949,34.7658840525447,0 -90.5013843558158,34.7899313101001,0 -90.51614770215419,34.8057007952067,0 -90.5273632829947,34.8074211116658,0 -90.5478489155079,34.7904345448067,0 -90.53338308133611,34.7133527478315,0 -90.5136680230595,34.702168426854,0 -90.4700800044602,34.7043544473312,0 -90.4663261216033,34.6721400223716,0 -90.5089145701068,34.6381667803775,0 -90.5390670140484,34.6369954120314,0 -90.54765041882089,34.6519066940829,0 -90.53916630258439,34.6860476391663,0 -90.56116263432628,34.7003866360947,0 -90.57940507832259,34.6457114581828,0 -90.58809525009498,34.6279161438152,0 -90.5777188709607,34.6048453840045,0 -90.5307199720464,34.5557516818131,0 -90.53725095298539,34.5434303779675,0 -90.5657859528414,34.5326117672652,0 -90.5804501933474,34.5203246797393,0 -90.59015506208731,34.4966090201687,0 -90.57450570771368,34.4540494001334,0 -90.57922804447659,34.4331032095237,0 -90.60389412048508,34.4047029797656,0 -90.6573464859749,34.3660143325751,0 -90.65791781402791,34.3301110369,0 -90.6794406527353,34.3180794258637,0 -90.68948128142971,34.3202498232312,0 -90.6812424323426,34.3635040042302,0 -90.6875906711157,34.3779766258423,0 -90.75541794936311,34.3722691135712,0 -90.7619638892818,34.364018026031,0 -90.74786301501229,34.3178229839966,0 -90.75836020093259,34.2790815153021,0 -90.7926330280344,34.3000616903072,0 -90.80652652929172,34.2994512329978,0 -90.82394433723711,34.277444457808,0 -90.8314661258313,34.2296393889001,0 -90.86351805053698,34.2192670758548,0 -90.9285457793972,34.2502985218322,0 -90.93381765059741,34.2347805101336,0 -90.9215946009177,34.2049348828191,0 -90.8230272013098,34.1906501116551,0 -90.80761499232,34.1662785963789,0 -90.82897009057919,34.1487653755381,0 -90.84671660873281,34.1476512964452,0 -90.92902561447708,34.1857547898992,0 -90.9534553235284,34.1559087583442,0 -90.9423538254879,34.1260478667544,0 -90.90641792332421,34.1028552934255,0 -90.86643858092512,34.1010591014266,0 -90.88645032093149,34.040818090639,0 -90.95057738634012,34.0313950359426,0 -90.9734737113361,34.0111046201452,0 -90.9753809466784,33.9947130844006,0 -90.9612354430936,33.9789817484763,0 -90.96489758467079,33.9675683195034,0 -90.9869243510316,33.9609229307681,0 -91.0003678622968,33.9684795241317,0 -91.0096532951119,33.9906347187545,0 -91.03116883753491,33.9858050201095,0 -91.0698054890087,34.0062011888095,0 -91.08896340340431,33.9945738225001,0 -91.075817398803,33.9747494464877,0 -91.01857194440652,33.9364134475297,0 -91.06148054411389,33.8671886882777,0 -91.0549265134198,33.8436334807269,0 -91.0289626430975,33.8166950131436,0 -90.99047854078901,33.7990071442826,0 -90.9841458001964,33.7854500107548,0 -90.99548340691879,33.7716600260669,0 -91.01854016459431,33.7640838422967,0 -91.04351203531321,33.7696642449716,0 -91.06650027762299,33.7866351498749,0 -91.10552584181519,33.7765486562049,0 -91.1370973386382,33.7801949325541,0 -91.1430026284613,33.7719285490089,0 -91.1381116937944,33.7233341453239,0 -91.129055226842,33.7125503367781,0 -91.1046784705554,33.7083431494327,0 -91.0563218415079,33.7194673047115,0 -91.0389337685444,33.7056013490966,0 -91.03794174479148,33.6833276928149,0 -91.08387971624239,33.6626975706472,0 -91.1211582957132,33.6776390014341,0 -91.16341157255451,33.7184243604201,0 -91.2117911105934,33.7090740491267,0 -91.21525485495199,33.690832533146,0 -91.20542010320271,33.670054473021,0 -91.1545148512779,33.6371425699443,0 -91.15076092012042,33.6162728236941,0 -91.16813338054911,33.5773559141775,0 -91.18791706051998,33.5747923198036,0 -91.2268436629257,33.5905920919159,0 -91.2277437480702,33.5564627810534,0 -91.21359825583821,33.539388695493,0 -91.20421377208162,33.5386182116453,0 -91.1829574461633,33.5234628974492,0 -91.18051588058511,33.5121258753279,0 -91.20775358321031,33.4735103338542,0 -91.2272625589118,33.4595677906787,0 -91.23296184460889,33.4435578002255,0 -91.1818813238998,33.4475023901927,0 -91.1718407642763,33.4667586515282,0 -91.17429002799679,33.5044814214406,0 -91.16508870848941,33.511893278083,0 -91.12890876375178,33.4933048406628,0 -91.11906643910299,33.4697877493532,0 -91.11982172873771,33.4529461878788,0 -91.13062529226629,33.4432379167019,0 -91.19894113644132,33.4222266229444,0 -91.2042742333541,33.414414252442,0 -91.1850932093454,33.3919462343914,0 -91.13774359783101,33.3889939554845,0 -91.09923682479071,33.4150136902789,0 -91.08590793517429,33.4629711994008,0 -91.07386834518309,33.4663205040007,0 -91.0610886583117,33.4601256250454,0 -91.0616226774054,33.4319126666717,0 -91.0787969781513,33.4102951070005,0 -91.107049532132,33.3935220665091,0 -91.13053349445238,33.3595184071126,0 -91.1418557768241,33.3225012621225,0 -91.1226136683412,33.2686236274109,0 -91.10301308177489,33.249329353099,0 -91.07643152692042,33.2924766671242,0 -91.0539393519749,33.2936936328911,0 -91.0405340548071,33.2820400168761,0 -91.05464881790898,33.2459002185311,0 -91.09211028743471,33.2258161142148,0 -91.08642608991831,33.1617229779066,0 -91.09596309376539,33.1452056628518,0 -91.12143839042092,33.1311906845818,0 -91.1777374599034,33.1504085143774,0 -91.19561365046539,33.1405858277008,0 -91.19064668515279,33.1133457020205,0 -91.1468983565878,33.0907747749873,0 -91.1178981011678,33.0656937749518,0 -91.1240933135817,33.0473950555076,0 -91.1567938514993,33.040555368368,0 -91.16078409477549,33.0218332391698,0 -91.1622413295772,33.0131626211682,0 -91.16197425997009,33.0004180010727,0 -91.20927012576061,32.935978073614,0 -91.19842078694131,32.9142883501159,0 -91.16980976931431,32.9051486450656,0 -91.13728478778282,32.9179123119183,0 -91.13004429846551,32.9375917893587,0 -91.13246289263051,32.9753485871396,0 -91.1119239712728,32.9874752104853,0 -91.09278126642242,32.9877460881529,0 -91.075698595519,32.9538382302101,0 -91.0796355518755,32.8772908363965,0 -91.1422592525615,32.8413420630697,0 -91.1564502239537,32.7628111152121,0 -91.1365751786759,32.751256737741,0 -91.0978169539142,32.7495287526143,0 -91.05913512287872,32.7236507270734,0 -91.1396654000576,32.663308001886,0 -91.1463718367631,32.6449866188679,0 -91.1111005222843,32.5976630747531,0 -91.06391930560149,32.6065243385273,0 -91.0477369807394,32.6144891676735,0 -91.02757194109799,32.6416374743549,0 -91.0079868510271,32.6428085554835,0 -90.99623739617641,32.6261121948604,0 -90.99876283398881,32.6156030444933,0 -91.03243221757509,32.5828091644492,0 -91.05897546705708,32.5765265579993,0 -91.07337249217869,32.5617489074888,0 -91.0631947408495,32.5422984158072,0 -90.9951774336628,32.511781889744,0 -90.9921562021718,32.4954212340256,0 -91.01979041957442,32.4909543534273,0 -91.03730785093811,32.4970957768502,0 -91.08889104990392,32.5487755489391,0 -91.11885237927079,32.524205893418,0 -91.1177919517207,32.4987093128914,0 -91.0586173128584,32.4471403993983,0 -91.027015703315,32.4425591367523,0 -90.987555664684,32.4531064313693,0 -90.96559027073792,32.4401789961165,0 -90.9700917310243,32.41916079336,0 -91.0093152122207,32.3972270178482,0 -90.99896957955122,32.3663787517009,0 -90.98467186569272,32.3565410587047,0 -90.91502958658171,32.3460435683761,0 -90.8852590969197,32.3814999498488,0 -90.8754551600106,32.3797948696303,0 -90.9164792854551,32.3054643188479,0 -90.9293503055389,32.2975529103154,0 -90.9717628039961,32.3038468581634,0 -90.9808724634335,32.2978007782368,0 -90.98392428988359,32.2872802390738,0 -90.97112198627711,32.2692145344565,0 -90.97732476193758,32.2235541462358,0 -91.0417564572334,32.249588584805,0 -91.06256993823,32.2328921503996,0 -91.08802223200981,32.2325373651522,0 -91.1006796950342,32.2150360650047,0 -91.1160609494648,32.225755012482,0 -91.15737514242458,32.2060145228895,0 -91.1669578883395,32.1721410581455,0 -91.15665029978031,32.1449354980044,0 -91.10882038739021,32.1351435271569,0 -91.0831163105895,32.148731083052,0 -91.05415436554129,32.1345446969889,0 -91.04541852022901,32.1588244987585,0 -91.0545816942883,32.1846835164502,0 -91.0245210933432,32.1700508264511,0 -91.00393646145051,32.1694138145198,0 -91.0113905060031,32.1342128745109,0 -91.04119164865929,32.1078235881288,0 -91.0739225856783,32.0941482900527,0 -91.06511798689969,32.0587070505858,0 -91.08941061986668,32.0569980949997,0 -91.125727524233,32.0883996668359,0 -91.1456941711085,32.085828620503,0 -91.1431229851656,32.0662598368965,0 -91.08699202272901,32.0438110998955,0 -91.07324347350119,32.0321499472516,0 -91.07248812939382,32.0212135515791,0 -91.10811063502561,31.9919842773777,0 -91.16314291993849,31.9884481049272,0 -91.20154214815391,31.914448862447,0 -91.2444813396436,31.8786718608009,0 -91.26469211768119,31.8655859136312,0 -91.24138341450281,31.8353877405104,0 -91.25072958285951,31.8188210015347,0 -91.27680008896378,31.8275334941804,0 -91.2926470392426,31.8614928392569,0 -91.30347348797039,31.863144546493,0 -91.33484640167582,31.8434784170896,0 -91.3472366701502,31.7958323053943,0 -91.36713463540391,31.7708677200763,0 -91.3362574528706,31.7636219421964,0 -91.26268491650518,31.7739271210982,0 -91.2639894905689,31.7597635597382,0 -91.28262100699412,31.7498875713679,0 -91.3399120227254,31.7585428158009,0 -91.3704992222101,31.75347510581861,0 -91.3650745397498,31.7517413813867,0 -91.38794806501321,31.716682847539,0 -91.3891838304294,31.6546051479529,0 -91.4084028346628,31.6255298775261,0 -91.45737763016589,31.6269660621133,0 -91.4977690885564,31.6508953247071,0 -91.50780965753789,31.6438707722357,0 -91.50887776268431,31.621946112804,0 -91.49715101609371,31.6043585245596,0 -91.4153838994301,31.6025923876789,0 -91.40425216217201,31.5863534317346,0 -91.42357803613481,31.5627464662349,0 -91.46447302857931,31.5428664076677,0 -91.50295705582839,31.5348804964065,0 -91.506481902402,31.5256872825259,0 -91.50790071721922,31.4530834240658,0 -91.4732924895748,31.4203746865528,0 -91.46592215694071,31.4040690532825,0 -91.48083803831911,31.3777805832693,0 -91.49470875734109,31.37524960980541,0 -91.52301453224139,31.3920917852495,0 -91.53416902145848,31.4092388142744,0 -91.53480241584072,31.434335247521,0 -91.5524724466605,31.4330997709492,0 -91.56773147230381,31.4214064364688,0 -91.5593769120174,31.3882304242528,0 -91.53457323759901,31.3827500700431,0 -91.5444076356665,31.3688746277826,0 -91.54279004566349,31.3469862680809,0 -91.5057561590215,31.3234567034819,0 -91.5024753378186,31.2988580123244,0 -91.5170781714622,31.2830696578166,0 -91.55691947736142,31.2704690710127,0 -91.634214237565,31.2776940549104,0 -91.6436824254271,31.2711178839201,0 -91.636998739959,31.241104186479,0 -91.6009643646854,31.2139296737496,0 -91.5914883087676,31.1784818992551,0 -91.6201139178138,31.1276943834946,0 -91.56497527228081,31.0821350184803,0 -91.552081308545,31.0581597906819,0 -91.57278761694658,31.032647877549,0 -91.6277732104017,31.0119601110946,0 -91.6322974277285,31.00136500740931,0 -91.17920745434212,31.0004616671834,0 -91.05701216426981,31.0004181174657,0 -90.82971390290152,31.00154581229931,0 -90.56025489707021,31.0017063331187,0 -90.5426536021385,31.0023300433606,0 -90.3436602569889,31.0053899463824,0 -90.2593768226071,31.0073700245843,0 -89.83355873794839,31.0071848554001,0 -89.7327174808554,31.00744501459671,0 -89.7236228724726,31.0015247201013,0 -89.726781296615,30.9846164008972,0 -89.7198229059406,30.9754936822636,0 -89.7395225295214,30.965400256862,0 -89.7485405475115,30.9498480428011,0 -89.7404756300233,30.9261095623025,0 -89.75805428152501,30.9210436978628,0 -89.7457551089107,30.910107202755,0 -89.7468002599141,30.9027945578147,0 -89.76331078881169,30.9004713517936,0 -89.76585085732459,30.8620847088871,0 -89.7850241384817,30.8615791361643,0 -89.77479992387271,30.8305319403895,0 -89.79609421512551,30.8291051373468,0 -89.7965669822497,30.8126526475249,0 -89.8109335655279,30.8116989081619,0 -89.8246894189972,30.7897246849283,0 -89.813351089932,30.7481682046961,0 -89.8255660189393,30.74264836900471,0 -89.8233990376437,30.7330545562641,0 -89.83561400018191,30.7293619382654,0 -89.8440520689247,30.7124249093943,0 -89.83072296372239,30.7037809798175,0 -89.8413433452435,30.7005499465483,0 -89.8417854969649,30.6795198391887,0 -89.8353918067202,30.675882597152,0 -89.8454474865972,30.6662525153547,0 -89.8295245363783,30.6708739896173,0 -89.81935389911089,30.6512457789506,0 -89.8055366119584,30.6494567398327,0 -89.8203071285261,30.6242705431171,0 -89.7908478814126,30.5539438185454,0 -89.7727961225489,30.5512468627469,0 -89.75517865909291,30.5156218767139,0 -89.73231974937779,30.4978380271641,0 -89.719059260721,30.4960375437604,0 -89.7131840947211,30.48141599910741,0 -89.695681461547,30.4782460714929,0 -89.6945978512597,30.4681868413409,0 -89.6834507334724,30.4627185730285,0 -89.6754620986314,30.4453524057824,0 -89.67536970065041,30.4000744263161,0 -89.6546699231165,30.37906533290621,0 -89.64668882303469,30.3552905752797,0 -89.633451292423,30.3553078019512,0 -89.620198293058,30.343429054806,0 -89.6185880809724,30.323760747644,0 -89.6370822520275,30.3118436964481,0 -89.6391725011899,30.29582979652721,0 -89.6259425171347,30.2903558515233,0 -89.6216616714494,30.2569643699525,0 -89.6063106026528,30.247828412852,0 -89.6100033159566,30.2414198536792,0 -89.5738839850623,30.1949353118833,0 -89.4381213198934,30.2009670531795,0 -89.4156141811479,30.2564852330285,0 -89.3185425339085,30.3188533708312,0 -89.3575310460273,30.3652847342137,0 -89.335046582448,30.3804232519676,0 -89.27352821831209,30.3723862703524,0 -89.2761213477847,30.3148407273573,0 -88.8857264645103,30.3982888782491,0 -88.93022291070869,30.4168011352414,0 -88.873786281284,30.4302766265056,0 -88.68326442818061,30.3423228324023,0 -88.57776076825159,30.3807498514342,0 -88.4642372948552,30.3260764687888,0 -88.3992249519191,30.3528859313249,0 -88.40141515368251,30.3935517804008,0 -88.41724262810349,30.7364571156747,0 -88.4291990018716,31.0006950876596,0 -88.4345631161403,31.1208794693781,0 -88.4508031165511,31.4356176907354,0 + + + + + + + + Missouri + empty + + +states.AREA: + 69832.746 + + +states.STATE_NAME: +Missouri + + +states.STATE_FIPS: +29 + + +states.SUB_REGION: +W N Cen + + +states.STATE_ABBR: +MO + + +states.POP2000: + 5595211 + + +states.POP2001: + 5646796 + + +states.POP00_SQMI: + 80 + + +states.DEN_0_100: + 93 + + +USStates.ID: + 24 + + +USStates.State_Name: +Missouri + + +USStates.Date_Entered: +Aug. 10 1821 + + +USStates.Year_Entered: +1821 + + +USStates.Year_Settled: +1735 + +]]> + #Style_5 + + + -92.4801886377418,38.3639901274756,0 + + + + + + -89.1050338653654,36.9539220770253,0 -89.1072162055416,36.9775040571059,0 -89.1299298602513,36.9881656914537,0 -89.1935842098097,36.9868222806571,0 -89.2101262118458,37.0290237051986,0 -89.2377536103058,37.0417835282019,0 -89.26413039669779,37.0871742876795,0 -89.28431079352841,37.0912941061444,0 -89.30336936544271,37.0854347008365,0 -89.3097775142834,37.0609596218128,0 -89.26431960659031,37.0277834462293,0 -89.26207602720631,37.0087367322465,0 -89.28284342367,36.9992571418446,0 -89.3110577890705,37.0097321155337,0 -89.3830287336186,37.0492635096727,0 -89.3800701656133,37.0991331193152,0 -89.42388077877629,37.1372534192951,0 -89.44060600449021,37.165367829282,0 -89.4683040002904,37.2243166291394,0 -89.46539822681051,37.2537814318187,0 -89.48968358551591,37.2560512507203,0 -89.51397668384681,37.276452254325,0 -89.5139774032488,37.3050126842203,0 -89.5006722080316,37.329491318765,0 -89.46883367402491,37.3394589952529,0 -89.43582789426451,37.3557666795513,0 -89.4276653438195,37.4110680347262,0 -89.4537142750772,37.4532354416246,0 -89.4948777729593,37.4917750136486,0 -89.52506805859341,37.5720063661821,0 -89.5134636137585,37.6159786570251,0 -89.51927739008779,37.6504256791403,0 -89.51347129814729,37.6798905957089,0 -89.5216197606815,37.6948481923868,0 -89.58153539397119,37.7061554249312,0 -89.6665610141995,37.7455048947008,0 -89.6759604497414,37.784021807452,0 -89.6911585166015,37.8048461895875,0 -89.728551127852,37.8410437278203,0 -89.8518221998746,37.9051156711928,0 -89.8611532194338,37.9055391707122,0 -89.8669213710244,37.8919285019704,0 -89.900659718619,37.8759567792384,0 -89.93798377619601,37.8780970980944,0 -89.97902314782711,37.9119372642027,0 -89.95833872049469,37.9636867798315,0 -90.01092211725509,37.9693709792311,0 -90.04203572235682,37.9932585919637,0 -90.1194535601973,38.0323252746278,0 -90.13482705649538,38.0540042508408,0 -90.20764422452261,38.0889589210515,0 -90.25417712909579,38.1222235068627,0 -90.2897533449443,38.1668707739162,0 -90.3368353674101,38.1887672607723,0 -90.36488893881901,38.2343531960061,0 -90.36946594646452,38.3236130942444,0 -90.35880701471911,38.365383796682,0 -90.3397250925035,38.3909000937545,0 -90.30195808265761,38.4274101853512,0 -90.2658995864079,38.5187409219187,0 -90.2613445745186,38.532820806846,0 -90.24105709170181,38.5628573013572,0 -90.1838189833793,38.610322629253,0 -90.1836888738229,38.6588222213685,0 -90.2023506849595,38.7004136293542,0 -90.19668164834522,38.7240148841336,0 -90.1635076675385,38.7731473780178,0 -90.13528557177762,38.7855333244896,0 -90.1218345138212,38.8005591450278,0 -90.1132283291809,38.8305155786969,0 -90.13292049439282,38.8530794199913,0 -90.2440385800512,38.9145571194291,0 -90.2790431101957,38.9247652789138,0 -90.31985371572098,38.9249561810614,0 -90.41318604000151,38.9623782480884,0 -90.4699576683671,38.9592275775329,0 -90.5305451069931,38.8916590934777,0 -90.57044835788962,38.8713768681923,0 -90.6273348623125,38.8808451829242,0 -90.66899973918559,38.9353034194491,0 -90.70619359871029,39.0378416951969,0 -90.7077119263589,39.0582272816598,0 -90.6905224771304,39.0937493584583,0 -90.7168599355041,39.1442594879132,0 -90.71831723958958,39.1959215056912,0 -90.73246246782379,39.2247947417977,0 -90.7382075249523,39.2478582113647,0 -90.77946911185738,39.2968502329079,0 -90.8506238710589,39.3504997276601,0 -90.94802423776449,39.4006319007784,0 -91.03647490820309,39.4444585084789,0 -91.064521543479,39.4740300232192,0 -91.09375072632439,39.5289731742514,0 -91.15632949744598,39.5526394130489,0 -91.2033893787345,39.6000674783423,0 -91.31781179944051,39.6859625802781,0 -91.3672369870804,39.7246854919977,0 -91.3735696173857,39.7613181753518,0 -91.381863132745,39.8038177672296,0 -91.4493403590742,39.8630942448561,0 -91.4511409854999,39.885288198019,0 -91.4342030257459,39.9018745899127,0 -91.43054077302692,39.9218827311204,0 -91.4473948316692,39.9461098791871,0 -91.4874432777371,40.0057984567776,0 -91.50416020997871,40.0667571230242,0 -91.51628405060909,40.1345898206457,0 -91.50670141476959,40.2005039120117,0 -91.4990871746939,40.2514224267414,0 -91.486849457272,40.309668416,0 -91.44874715640491,40.3719466182637,0 -91.4770381934818,40.3910121558996,0 -91.49031385163261,40.3908061091367,0 -91.50037749543139,40.4051606084008,0 -91.5276917691468,40.4101689010293,0 -91.52960695321359,40.4350861780817,0 -91.5388465218747,40.441288675833,0 -91.533208268896,40.4554411066996,0 -91.5793830849706,40.4637602088021,0 -91.5860286246556,40.4845194169649,0 -91.61686016131831,40.5048738271577,0 -91.62253651310201,40.5329033163068,0 -91.6920809036743,40.5516776256622,0 -91.68995975604149,40.5812025311316,0 -91.71697640482071,40.5934354677793,0 -91.7417117785904,40.6097843674944,0 -91.946370183648,40.6082666211982,0 -92.1931744167433,40.6000887188336,0 -92.3615131092551,40.5995762450555,0 -92.6464324165599,40.5914619056485,0 -92.71781545755509,40.5896671790964,0 -93.10093859117031,40.5843472673901,0 -93.37027134829388,40.5804911252976,0 -93.56291046102329,40.580813860252,0 -93.78630370096001,40.5784484988924,0 -94.0180588623528,40.5740221097314,0 -94.23839179788078,40.5709661436833,0 -94.4852311155788,40.5742048680883,0 -94.639876320884,40.575744856122,0 -94.92061587223311,40.5772183148122,0 -95.21742841469741,40.5818925987708,0 -95.382555095884,40.5843340093787,0 -95.7674795852398,40.5890479952096,0 -95.76341234307618,40.5497071705548,0 -95.7370361745627,40.5323733110738,0 -95.692066374489,40.5241298458689,0 -95.68741294533601,40.5611703423814,0 -95.67569378233461,40.5658356928502,0 -95.6629443739739,40.5587289616856,0 -95.658060770915,40.5303325450494,0 -95.6849704910359,40.5122051824756,0 -95.6953617583717,40.4853382791873,0 -95.63681771614181,40.3963904531026,0 -95.63418502298551,40.3588001619374,0 -95.616201682126,40.3464975474771,0 -95.6179334555131,40.3314179459398,0 -95.6455528317303,40.3223467703869,0 -95.64682682752211,40.309109703192,0 -95.59553245637079,40.3097767867205,0 -95.547136994341,40.2662157738894,0 -95.47682209293809,40.2268548930392,0 -95.46663660597849,40.2132555431774,0 -95.46095261349171,40.173995249929,0 -95.4224766940803,40.1317436114368,0 -95.3928129218653,40.1154163675868,0 -95.3845425063415,40.0953626542358,0 -95.40378433048491,40.0803791707436,0 -95.41376387852371,40.0481113899446,0 -95.39053184305099,40.0437507559076,0 -95.37124432588999,40.0287511817595,0 -95.3450672839917,40.0249741114216,0 -95.30869720973901,39.9994075748966,0 -95.2409615197206,39.9421058384133,0 -95.20759760966379,39.9381762630214,0 -95.19396340225789,39.9101800936863,0 -95.1505514013284,39.9080546761413,0 -95.1007225558306,39.8698649954976,0 -95.06324626966109,39.8665379740374,0 -95.03350651062659,39.8778442881217,0 -95.0217725502981,39.8969786850066,0 -94.9650237551983,39.900823541003,0 -94.9382437203224,39.8960818279774,0 -94.9365111558861,39.8493860544701,0 -94.9238762802993,39.833131624215,0 -94.89832461315601,39.8283327692328,0 -94.88850514062642,39.8173998679665,0 -94.8993236192415,39.7937754306095,0 -94.93326765322591,39.7827737328809,0 -94.93511392079802,39.7754266104547,0 -94.9217999904165,39.7578408910459,0 -94.87706755967508,39.7606792157561,0 -94.87118503155682,39.7541179695705,0 -94.87786073247868,39.7393055627822,0 -94.90567811071121,39.726755181953,0 -94.9308558369552,39.727025905148,0 -94.9531421136041,39.7365014323348,0 -94.96178638302391,39.7320382320422,0 -94.978570591812,39.6849880529496,0 -95.02829206736421,39.6619134718391,0 -95.0560171833566,39.625689733093,0 -95.0536130925577,39.5867761785005,0 -95.10898807297042,39.5606920176429,0 -95.1020369987408,39.5328485478957,0 -95.04759928388671,39.4853288064319,0 -95.04051146086052,39.4629407284024,0 -94.9862042598468,39.4394616215765,0 -94.9584938855715,39.4114472233923,0 -94.9257480001496,39.3812661376612,0 -94.8982816593786,39.3806406678593,0 -94.9113435368246,39.3401217508395,0 -94.9076813995049,39.3230284700345,0 -94.8811077732328,39.2860458708519,0 -94.8334765331867,39.2617660205541,0 -94.8208192842533,39.2110046505539,0 -94.7900492914923,39.1968829757069,0 -94.7305309461746,39.171256416042,0 -94.6755137983894,39.1749223276416,0 -94.6464068497116,39.158427841948,0 -94.6126534522095,39.1516492526966,0 -94.60122430937619,39.1412276647328,0 -94.60813678641638,39.1128009586178,0 -94.6092813424634,39.0446676651878,0 -94.6124696654656,38.8371089096843,0 -94.6131481947747,38.7372224308096,0 -94.6187177065389,38.4714737258641,0 -94.61905349915152,38.3920320272517,0 -94.61733032638759,38.055784837357,0 -94.6167353371693,38.0303877411189,0 -94.6192936785187,37.6798689280977,0 -94.61899604293861,37.650374321953,0 -94.61876444142401,37.360766482215,0 -94.6189775221893,37.3277322857884,0 -94.6206638676799,37.0601475533797,0 -94.6203796376912,36.9970468237132,0 -94.6216844155007,36.7636077108139,0 -94.6210734035526,36.670542870082,0 -94.6172570958511,36.4894141614003,0 -94.08105216030801,36.4910242585195,0 -93.85751984136751,36.4897863700719,0 -93.5964496696149,36.489958821283,0 -93.32834621479771,36.4902614752819,0 -93.2973244136508,36.4906809019551,0 -92.8522757362601,36.4898845275616,0 -92.77763547121239,36.4899835156087,0 -92.52305071341618,36.4909213638459,0 -92.14631944771919,36.4916605516162,0 -92.1276422613294,36.4914354514783,0 -91.68856055219172,36.4910185604512,0 -91.4529890137038,36.4904380208107,0 -91.4117966736446,36.4911017707335,0 -91.13395636436511,36.4880156921504,0 -90.8044338516289,36.4892654684767,0 -90.5817321666723,36.4910222747631,0 -90.22447328203479,36.4928111285523,0 -90.15025942109908,36.4918729268599,0 -90.13737277191632,36.4574765175037,0 -90.1173219969686,36.4539556960145,0 -90.1239291860565,36.4226261953142,0 -90.1169251070973,36.4049759827803,0 -90.08027223924928,36.397449931407,0 -90.05215696164839,36.3826150505682,0 -90.05029531239092,36.3626684522717,0 -90.06772899503081,36.3253957469489,0 -90.04984511692381,36.3005360471466,0 -90.0661877402538,36.2723382893607,0 -90.1100122336982,36.2580597893355,0 -90.13131377418432,36.2121355814949,0 -90.16140488324341,36.1970066414864,0 -90.219321206522,36.1726309521804,0 -90.2323220265841,36.1612137930848,0 -90.2349388507527,36.1371551620637,0 -90.26380164514022,36.1188298079555,0 -90.284851770393,36.115972708427,0 -90.31533967165498,36.0917234028765,0 -90.3790621785177,35.9896564265848,0 -90.2835541915351,35.9912280026278,0 -89.9632916378976,35.9969088479974,0 -89.7218363447502,35.9999509241088,0 -89.68892242543529,36.0258673598517,0 -89.6782489583147,36.0830408331631,0 -89.66746841817241,36.0993864640091,0 -89.5895015750109,36.1298614413181,0 -89.58953219289479,36.1520892518256,0 -89.6186393373327,36.1838116382208,0 -89.67686882352049,36.2209354567989,0 -89.695737012858,36.2408629894403,0 -89.6946231434343,36.252203841158,0 -89.6706661075896,36.2549618456545,0 -89.61815895506329,36.2409661142144,0 -89.5417253888929,36.2573462150993,0 -89.53545385006311,36.2646054281745,0 -89.5423129180961,36.2809319420685,0 -89.6068443100135,36.3081032648945,0 -89.6228741596169,36.3348474435652,0 -89.6057685745547,36.3548169544064,0 -89.54463245289639,36.3457879205654,0 -89.51940896703729,36.3559958746976,0 -89.52008048276861,36.4011227040991,0 -89.54525826945699,36.4410234483941,0 -89.51609800414001,36.4718722794559,0 -89.53327228843381,36.4981701441748,0 -89.56706382630919,36.5187993771114,0 -89.5682312249958,36.5414695145559,0 -89.55621466216709,36.5578036567361,0 -89.5304419073772,36.5646166211264,0 -89.49320183399099,36.5591771346443,0 -89.4817497774818,36.5478363630808,0 -89.47144975338379,36.5256163547986,0 -89.4817572743346,36.5047581085309,0 -89.4758977248385,36.4986089858186,0 -89.4920647554293,36.4655248350446,0 -89.4709078461365,36.4460169670384,0 -89.4485913110412,36.4564423473599,0 -89.41478465486919,36.5026793108435,0 -89.4182103731204,36.5106251110882,0 -89.37395149637661,36.616247637228,0 -89.3636210686995,36.6257612726571,0 -89.3423955613942,36.6289083710958,0 -89.3223449681677,36.6220764759103,0 -89.2834948717057,36.5753095893361,0 -89.2416846800885,36.569328370687,0 -89.2101287779705,36.5819546744135,0 -89.2001876332973,36.6313576237861,0 -89.1771616076676,36.6530627654874,0 -89.1678993468083,36.6716284847978,0 -89.19756338990609,36.7134250574374,0 -89.19636559962321,36.7274780703555,0 -89.1772689322554,36.7609818762401,0 -89.15143504916961,36.7590975830134,0 -89.12554025828931,36.7680887738915,0 -89.1259067613141,36.7924680183802,0 -89.1644441219421,36.804476214643,0 -89.1735313341446,36.8294390146117,0 -89.166565665821,36.8434768543693,0 -89.1296537695887,36.8664945361285,0 -89.1050338653654,36.9539220770253,0 + + + + + + + + Montana + empty + + +states.AREA: + 147244.653 + + +states.STATE_NAME: +Montana + + +states.STATE_FIPS: +30 + + +states.SUB_REGION: +Mtn + + +states.STATE_ABBR: +MT + + +states.POP2000: + 902195 + + +states.POP2001: + 908325 + + +states.POP00_SQMI: + 6 + + +states.DEN_0_100: + 100 + + +USStates.ID: + 41 + + +USStates.State_Name: +Montana + + +USStates.Date_Entered: +Nov. 8 1889 + + +USStates.Year_Entered: +1889 + + +USStates.Year_Settled: +1809 + +]]> + #Style_5 + + + -109.652533686894,47.0322664572934,0 + + + + + + -111.475425113078,44.7021622259545,0 -111.44363207933,44.7131796185895,0 -111.395084047622,44.7088695111883,0 -111.384959585063,44.7376939086963,0 -111.372309536392,44.7450870429474,0 -111.349977174405,44.7261775679182,0 -111.31922172667,44.7278640397875,0 -111.315475367488,44.7051930233212,0 -111.295668417103,44.6829380106443,0 -111.270207923466,44.6738019972086,0 -111.270665480153,44.6422120666433,0 -111.223971342305,44.6269081075219,0 -111.219797798385,44.6179816965382,0 -111.234233165171,44.6025621977815,0 -111.219507505818,44.5731699249139,0 -111.178764521847,44.5648509025126,0 -111.170241896337,44.5451861352417,0 -111.134358940584,44.5279024352059,0 -111.128918633835,44.5007569482957,0 -111.094630553034,44.4861244421476,0 -111.051560651262,44.4733232643312,0 -111.051615814026,44.6644904630696,0 -111.053428630452,44.9956954937749,0 -110.429649489646,44.9922851168859,0 -110.392759905743,44.9986252880153,0 -109.99552921526,45.0027929256921,0 -109.799385375449,44.9995227676354,0 -108.625256221974,44.9975931654829,0 -108.259238500746,45.00011515017601,0 -107.894374357914,44.9997736986363,0 -106.259231717931,44.9961625110408,0 -106.021150701601,44.9972137020636,0 -105.08500310735,44.9998170469188,0 -105.041795987521,45.0010758746085,0 -104.059842395291,44.9973362616199,0 -104.043072277779,44.9978055394377,0 -104.043851417835,45.2128754685677,0 -104.049516843796,45.8830527625305,0 -104.048906344358,45.94299366714029,0 -104.04783642886,46.2808814764405,0 -104.046705569922,46.5425395197373,0 -104.047437491435,46.6429474765464,0 -104.045926505168,47.3338320293792,0 -104.047307659333,47.4000172886746,0 -104.048425167939,48.0000812793709,0 -104.052111483045,48.3910193593535,0 -104.052317635595,48.6458247340349,0 -104.062991101535,49.0000267486802,0 -105.063034487672,49.0000213453771,0 -106.125579640332,49.0000211878203,0 -107.188120870533,49.00001713961479,0 -108.250674874311,49.0000096254319,0 -109.500737045105,49.00000500413359,0 -110.750797309743,49.00000540611129,0 -111.282679441747,49.00001160223879,0 -112.188387420264,48.9999919367107,0 -114.063463510159,48.999977505695,0 -114.729325277653,48.9999701785569,0 -116.063531289275,48.99995046269709,0 -116.05669220337,48.4986651887118,0 -116.055497508913,48.2084837718549,0 -116.053492448537,47.9761917715222,0 -116.025316086924,47.9649391580749,0 -115.998932367501,47.92514082913019,0 -115.937842286573,47.86712411466291,0 -115.90392118837,47.841074097063,0 -115.869809516855,47.82745247882439,0 -115.849323962062,47.8051824706779,0 -115.836742105247,47.75628147907741,0 -115.790537518206,47.74483840017609,0 -115.775727256626,47.7097326241589,0 -115.733665317341,47.6955544944202,0 -115.734067407585,47.6398797756934,0 -115.698284137246,47.616080699199,0 -115.69208790895,47.59072095328569,0 -115.742829391272,47.5336915052907,0 -115.701522643005,47.5208936310403,0 -115.692770525831,47.4895405775821,0 -115.64014181996,47.47523519828921,0 -115.643185737842,47.45779380748271,0 -115.656087137581,47.449179888517,0 -115.732481530032,47.4453037682126,0 -115.75010555794,47.4339660678209,0 -115.750326632884,47.4224758337817,0 -115.666477789603,47.3991675172781,0 -115.638782326482,47.3800438733229,0 -115.599535907233,47.3700033411226,0 -115.555520671095,47.3346132613456,0 -115.523064072441,47.2919825693658,0 -115.501930155564,47.2816443931147,0 -115.42664105155,47.2743741901806,0 -115.40820774964,47.2635936928256,0 -115.343661098271,47.25502252875,0 -115.325227834205,47.2451499352386,0 -115.296234653795,47.179550129713,0 -115.193073569516,47.1240264397241,0 -115.172496072325,47.097570775052,0 -115.148683842445,47.09174197245919,0 -115.135507084528,47.0635505060209,0 -115.081336055121,47.0265244081573,0 -115.055638385326,46.97335809520661,0 -115.037334581308,46.9630013040754,0 -115.001574268432,46.9588093410594,0 -114.964730239693,46.9252129542069,0 -114.92412521448,46.9071654671376,0 -114.940566557467,46.8908879547799,0 -114.948408839876,46.85244681299441,0 -114.902324956243,46.7994334872257,0 -114.866603242816,46.7970455479343,0 -114.840791891296,46.7755381340251,0 -114.794030033961,46.7665316733836,0 -114.777832199076,46.7557169515489,0 -114.782919473288,46.7030400738234,0 -114.748105478154,46.695132417127,0 -114.698431226356,46.73376015783131,0 -114.673887229565,46.73472166479179,0 -114.625926712927,46.6871072963735,0 -114.645038012873,46.6709214874172,0 -114.644740120825,46.6608240472296,0 -114.610825986771,46.6290480359896,0 -114.54039089668,46.63789093313041,0 -114.48471804306,46.6235748090716,0 -114.441535907613,46.64571558739091,0 -114.384017731174,46.6615966222723,0 -114.334685197666,46.6542270306183,0 -114.324712393283,46.6228397420843,0 -114.343319528083,46.58788169279891,0 -114.350115003954,46.51738981557321,0 -114.360467827582,46.5061249643996,0 -114.410714938833,46.4873716679663,0 -114.384024894777,46.4281789078305,0 -114.397016905685,46.39954564895069,0 -114.409796078984,46.3929118282104,0 -114.431795791851,46.2847113519319,0 -114.473795189375,46.25296144733741,0 -114.472833625773,46.2437832404928,0 -114.439553093386,46.2202541051873,0 -114.440879403543,46.1689689930953,0 -114.467017880608,46.1552626443821,0 -114.509613705042,46.1574178541686,0 -114.518944233429,46.13606300379761,0 -114.506568594996,46.116142578097,0 -114.477370071638,46.1073573510943,0 -114.456029627256,46.0822298311072,0 -114.465756583121,46.05081557880481,0 -114.494321056653,46.0234105503775,0 -114.474529639485,46.0097653411895,0 -114.484455408522,45.9898066653888,0 -114.412447296507,45.971972990138,0 -114.405290578501,45.9539789286456,0 -114.429460795441,45.9214773546562,0 -114.413530117056,45.9106511998636,0 -114.392838283787,45.870886524333,0 -114.407525017428,45.84645312785811,0 -114.443231585826,45.8526214179583,0 -114.473803267544,45.8394681128492,0 -114.499164076216,45.8426838388298,0 -114.517375770656,45.8100678088233,0 -114.563542382615,45.76239875426181,0 -114.541958001694,45.7459993063995,0 -114.534976768211,45.7229965521011,0 -114.497560885022,45.6944015040476,0 -114.510706655448,45.6740575393162,0 -114.501741735013,45.65239374591759,0 -114.564678473634,45.624271464153,0 -114.540957804767,45.59639733862921,0 -114.56092431692,45.5487399822622,0 -114.527392140633,45.5581929137358,0 -114.49659127146,45.5466496233752,0 -114.462708066367,45.547847634842,0 -114.433555120266,45.5276335826489,0 -114.419051016147,45.4990079989286,0 -114.371457222895,45.485740801367,0 -114.350246661543,45.4633830586196,0 -114.326434503356,45.4574246659907,0 -114.26223890106,45.4858597041806,0 -114.247880062291,45.5029457876717,0 -114.241997909503,45.5352908283129,0 -114.194808749935,45.5279173495385,0 -114.172667788196,45.54392407099141,0 -114.132047849072,45.550382696738,0 -114.118139289111,45.57112721879371,0 -114.082966989764,45.5863787056049,0 -114.05651557884,45.6251440063411,0 -114.018032071357,45.6407731495898,0 -114.010990085379,45.6525110636154,0 -114.019878777802,45.6723780179129,0 -114.009472169193,45.6863322994531,0 -113.971148905291,45.6973761439766,0 -113.964144746081,45.67937838995221,0 -113.926698671543,45.6712113532369,0 -113.923532205814,45.6551247458339,0 -113.902199681462,45.6372529821309,0 -113.903305686338,45.6134911520045,0 -113.852027200864,45.60956236649611,0 -113.822485335827,45.6006361604291,0 -113.803754486689,45.5837295106944,0 -113.833715005823,45.5149081483478,0 -113.780933520736,45.5168654883577,0 -113.772304324589,45.5070541264418,0 -113.769167956071,45.4777077122394,0 -113.785662417081,45.4456336800122,0 -113.775025938091,45.4101724087205,0 -113.741309985249,45.3823864841092,0 -113.739080720354,45.3215307727051,0 -113.68870893801,45.2777882479016,0 -113.690120087671,45.262281529236,0 -113.64559265708,45.2067902002949,0 -113.600928342409,45.1809921888967,0 -113.594099232644,45.149742661863,0 -113.571583860449,45.1345453195545,0 -113.574375982832,45.1177112498262,0 -113.552272678027,45.1075492325193,0 -113.510225662875,45.1078357229334,0 -113.520609069994,45.08206385133451,0 -113.490158803375,45.07121894252819,0 -113.486305515199,45.0583215917022,0 -113.455435394093,45.0433489576732,0 -113.458853128792,45.0274494937816,0 -113.44102942911,44.9981947865069,0 -113.448764850883,44.9495226314899,0 -113.463413760979,44.9407755008957,0 -113.487348245354,44.9395739483575,0 -113.496190944735,44.9306703825127,0 -113.445573357454,44.8512398138089,0 -113.42137886332,44.8336996325871,0 -113.350024223891,44.8075686572204,0 -113.340631071319,44.7790001716196,0 -113.318680101131,44.7802285072048,0 -113.257154262582,44.810486836588,0 -113.24033835154,44.8118408943235,0 -113.138273905949,44.7614392171565,0 -113.127431313459,44.7373793502759,0 -113.101703254015,44.7151730541415,0 -113.098955981719,44.6959159515966,0 -113.073143949778,44.6755255639002,0 -113.054289194175,44.6242889653874,0 -113.083036889648,44.5826813811508,0 -113.039660671342,44.5562941508867,0 -113.037821112649,44.5329591224566,0 -113.007713096479,44.5106119571576,0 -113.020309135991,44.4817760622967,0 -113.006658758598,44.4526157258091,0 -113.012014532,44.4377151798982,0 -112.985249652408,44.4355404997863,0 -112.938281270743,44.407192303823,0 -112.887307562786,44.392852037925,0 -112.870781128928,44.3699785388203,0 -112.844275309657,44.353639685816,0 -112.817396542611,44.3642025255851,0 -112.818709940506,44.3948197608762,0 -112.826691426867,44.4210844413589,0 -112.796227919073,44.4580108762872,0 -112.779863145228,44.473921967913,0 -112.733712266678,44.4843203521209,0 -112.714325884719,44.4969354760903,0 -112.653189032213,44.4808022867295,0 -112.539324359313,44.4774975037791,0 -112.501839547759,44.4629973763857,0 -112.458519702915,44.4688346426366,0 -112.420753287455,44.4492848652432,0 -112.367583641487,44.4492705303202,0 -112.34057705949,44.4971802630882,0 -112.342507416987,44.5251001904491,0 -112.282341327877,44.5417028629559,0 -112.256675563109,44.5599718966745,0 -112.230398525049,44.5594913548598,0 -112.217763617989,44.538495263148,0 -112.19965792462,44.5314495370004,0 -112.124190576071,44.5282529189526,0 -112.099896990645,44.5182317486371,0 -112.059366916596,44.5286115853182,0 -112.027077158683,44.5228438141025,0 -112.023613199364,44.5350432018407,0 -111.977818321591,44.5296761932588,0 -111.940385892152,44.5497266545093,0 -111.872502337514,44.5562658469912,0 -111.80783730012,44.5039818716956,0 -111.792608215621,44.5184627416638,0 -111.766918095449,44.5188253853155,0 -111.716997718561,44.5337606582907,0 -111.684862667357,44.5507519238675,0 -111.605248563607,44.542989843785,0 -111.56723085062,44.5528666934207,0 -111.490240946754,44.5286973145766,0 -111.482573106114,44.536143833035,0 -111.459325300921,44.5379218382476,0 -111.462827429646,44.5499420909707,0 -111.492903869929,44.5511890986189,0 -111.514526468783,44.5931969532598,0 -111.501747128314,44.6159712293443,0 -111.50769070953,44.6376885788042,0 -111.470167827235,44.6407103470055,0 -111.458265515114,44.6525553200246,0 -111.460691885141,44.6700230655225,0 -111.480804007084,44.6914159868954,0 -111.475425113078,44.7021622259545,0 + + + + + + + + Nebraska + empty + + +states.AREA: + 77330.258 + + +states.STATE_NAME: +Nebraska + + +states.STATE_FIPS: +31 + + +states.SUB_REGION: +W N Cen + + +states.STATE_ABBR: +NE + + +states.POP2000: + 1711263 + + +states.POP2001: + 1722445 + + +states.POP00_SQMI: + 22 + + +states.DEN_0_100: + 98 + + +USStates.ID: + 37 + + +USStates.State_Name: +Nebraska + + +USStates.Date_Entered: +Mar. 1 1867 + + +USStates.Year_Entered: +1867 + + +USStates.Year_Settled: +1823 + +]]> + #Style_5 + + + -99.8078006001403,41.5231582790057,0 + + + + + + -101.407393337781,40.0010037120327,0 -101.32214863482,40.0018210447365,0 -100.754855877507,40.000198282162,0 -100.735049472397,39.9991723116564,0 -100.191111650703,40.0005855247365,0 -100.180910663243,40.0004787238625,0 -99.6278593903364,40.0029878613976,0 -99.1782010360044,39.9995770488454,0 -99.06474699472069,39.9983379848291,0 -98.72063235128408,39.9984613082759,0 -98.5044791617254,39.9971296815045,0 -98.264165776521,39.9984347815801,0 -97.9295887050275,39.9984528583572,0 -97.8165893210891,39.9997291896237,0 -97.36191186281762,39.9973802328794,0 -96.90828756776931,39.996154802955,0 -96.8014203269346,39.9944759681187,0 -96.45403830193989,39.9941727522704,0 -96.2405985632704,39.9945031906408,0 -96.0012537321721,39.995158941643,0 -95.7807002239152,39.9934894834034,0 -95.3297013527267,39.9925950320474,0 -95.30869720973901,39.9994075748966,0 -95.3450672839917,40.0249741114216,0 -95.37124432588999,40.0287511817595,0 -95.39053184305099,40.0437507559076,0 -95.41376387852371,40.0481113899446,0 -95.40378433048491,40.0803791707436,0 -95.3845425063415,40.0953626542358,0 -95.3928129218653,40.1154163675868,0 -95.4224766940803,40.1317436114368,0 -95.46095261349171,40.173995249929,0 -95.46663660597849,40.2132555431774,0 -95.47682209293809,40.2268548930392,0 -95.547136994341,40.2662157738894,0 -95.59553245637079,40.3097767867205,0 -95.64682682752211,40.309109703192,0 -95.6455528317303,40.3223467703869,0 -95.6179334555131,40.3314179459398,0 -95.616201682126,40.3464975474771,0 -95.63418502298551,40.3588001619374,0 -95.63681771614181,40.3963904531026,0 -95.6953617583717,40.4853382791873,0 -95.6849704910359,40.5122051824756,0 -95.658060770915,40.5303325450494,0 -95.6629443739739,40.5587289616856,0 -95.67569378233461,40.5658356928502,0 -95.68741294533601,40.5611703423814,0 -95.692066374489,40.5241298458689,0 -95.7370361745627,40.5323733110738,0 -95.76341234307618,40.5497071705548,0 -95.7674795852398,40.5890479952096,0 -95.7575462791966,40.6209044050126,0 -95.76799926230059,40.6431173260368,0 -95.87661608382331,40.7304362884448,0 -95.85179043528299,40.7926000253044,0 -95.84643563182461,40.8483322047714,0 -95.8343965593688,40.8703008088672,0 -95.8365411444113,40.9011080428442,0 -95.83760323158589,40.9742580400834,0 -95.86089704288879,41.0026505190073,0 -95.8595394801997,41.0350028595074,0 -95.87880474120411,41.0658712509288,0 -95.85827413141659,41.1091870222413,0 -95.8766852492484,41.1642024105376,0 -95.85980096123291,41.1668650456103,0 -95.85919843702339,41.1805368728058,0 -95.9161002851104,41.1940638351955,0 -95.922249965015,41.2078539506329,0 -95.91098130119039,41.225245096276,0 -95.93023057200192,41.3020567682491,0 -95.91120231965681,41.308469075071,0 -95.89759135908018,41.2868630350679,0 -95.88910711764841,41.301389068661,0 -95.9428952016611,41.3400771149559,0 -95.94005632056519,41.3948054356641,0 -95.93506577909901,41.4623813790665,0 -95.9531857305245,41.4723872072953,0 -96.0068973653038,41.4819545344805,0 -96.01345100342439,41.492994088652,0 -95.99668867363272,41.5115177407886,0 -95.99396487163098,41.5281036385833,0 -96.0045927729456,41.536663666234,0 -96.0501720028408,41.5243351452143,0 -96.0858402888059,41.537522447069,0 -96.0919362332193,41.5631451632737,0 -96.08083512543558,41.5760003085601,0 -96.11130763394991,41.5990063360194,0 -96.09930606920538,41.654680377786,0 -96.12026446185681,41.6840948569989,0 -96.1222023396997,41.6949130712865,0 -96.08555733965541,41.7049872846604,0 -96.09977118044269,41.7315636680423,0 -96.09932098309402,41.7529750937888,0 -96.07641711811041,41.7914690785526,0 -96.1356235834612,41.8626208316748,0 -96.15997022208892,41.9041513852191,0 -96.14587078481939,41.9249070891742,0 -96.14732844184438,41.9662545016057,0 -96.1852176902909,41.9806854764309,0 -96.2028425096417,41.9966156076483,0 -96.2360928599206,42.0012580980752,0 -96.2387254806183,42.0284381681892,0 -96.2654831160455,42.0488969554024,0 -96.2851229976765,42.123452670924,0 -96.35216576154041,42.168185405895,0 -96.3635118431292,42.2140424887771,0 -96.33770844290801,42.2295223162304,0 -96.33265786107282,42.260307132502,0 -96.34288156417431,42.2820816955037,0 -96.3687003210519,42.2980237265253,0 -96.3897808818021,42.3287896719748,0 -96.42417517629991,42.3492788847348,0 -96.41176144867778,42.3809179971184,0 -96.41762830756179,42.4147774592562,0 -96.39789028299531,42.441793101272,0 -96.39607423274411,42.4674012772387,0 -96.4393947509647,42.4892408377156,0 -96.49470151052741,42.4884592175071,0 -96.54721557271041,42.5204993234568,0 -96.58475304897098,42.5182872197448,0 -96.60546730406971,42.5072362916062,0 -96.6292944799537,42.5226936780003,0 -96.6366723762755,42.5507317592446,0 -96.714059707901,42.6123020324651,0 -96.7152728921436,42.6219074766425,0 -96.694596777315,42.641163786393,0 -96.69906022203101,42.6577158497403,0 -96.72265874758661,42.6685919557678,0 -96.79934397881981,42.6700191686323,0 -96.8104375000235,42.6813412142201,0 -96.81014011449622,42.704084462612,0 -96.9082338249473,42.7316989698022,0 -96.97077348180611,42.7211474962424,0 -96.9778689966012,42.727308194642,0 -96.97000293469461,42.752065431992,0 -96.97959336609789,42.7583137573091,0 -97.0151396700717,42.7595420464778,0 -97.13046924564861,42.7739233575094,0 -97.1614227617155,42.7986194059191,0 -97.21183172641902,42.81257352787,0 -97.2244435756681,42.8412025319938,0 -97.24318956492361,42.851826425825,0 -97.2714575353654,42.8500146366722,0 -97.31141433937481,42.8617716796293,0 -97.38930603349222,42.8674331659047,0 -97.45726378408931,42.8504431026505,0 -97.4831590291241,42.8571570898554,0 -97.5061318942665,42.8601364739438,0 -97.5706541404348,42.8479907365578,0 -97.63497050078551,42.8612849600302,0 -97.68575200130461,42.8368370186066,0 -97.72524981688051,42.8580083761152,0 -97.77218644667239,42.8461639819758,0 -97.79702832835281,42.8495971363047,0 -97.8186429929595,42.8665874779999,0 -97.88865941868959,42.8558072875283,0 -97.8899410388902,42.8312716359345,0 -97.9294772231674,42.7923243687957,0 -97.96355840050168,42.7736899920002,0 -97.9951447789843,42.766812278154,0 -98.03314038302951,42.7691923357945,0 -98.12181986030079,42.8083601338589,0 -98.12311692331768,42.8202235933653,0 -98.14486904619621,42.8357947189847,0 -98.16782662350252,42.839571032558,0 -98.31033957471961,42.881794760613,0 -98.39120469509791,42.9201358627386,0 -98.45744405402161,42.9371607787996,0 -98.49765138471959,42.9917787984063,0 -99.2539717111969,42.9923894733936,0 -99.5327903284941,42.9923349632849,0 -100.198142131775,42.9910950186342,0 -101.231737199277,42.986842959129,0 -102.086700926634,42.9898870255377,0 -102.788384569614,42.9953035756879,0 -103.005875236663,42.9993539301105,0 -103.501463853421,42.9986188303099,0 -104.056198856311,43.0030623563908,0 -104.056219380476,42.6146696865973,0 -104.053513414154,41.9998153422964,0 -104.053615199998,41.698218257724,0 -104.055500519791,41.5642223678205,0 -104.054012364451,41.3880858190034,0 -104.05170553525,41.00321132686,0 -103.572316302435,40.9996484311393,0 -103.382956653967,41.0003163565243,0 -102.652271070342,40.9981241668543,0 -102.621257047371,41.00021481921,0 -102.047739314394,40.9980708667063,0 -102.046992332576,40.7431303349332,0 -102.046031374616,40.6973192828138,0 -102.047620488242,40.4310777832961,0 -102.047544994516,40.3426445008284,0 -102.051535596434,39.9989182728278,0 -101.407393337781,40.0010037120327,0 + + + + + + + + Nevada + empty + + +states.AREA: + 110669.975 + + +states.STATE_NAME: +Nevada + + +states.STATE_FIPS: +32 + + +states.SUB_REGION: +Mtn + + +states.STATE_ABBR: +NV + + +states.POP2000: + 1998257 + + +states.POP2001: + 2112980 + + +states.POP00_SQMI: + 18 + + +states.DEN_0_100: + 98 + + +USStates.ID: + 36 + + +USStates.State_Name: +Nevada + + +USStates.Date_Entered: +Oct. 31 1864 + + +USStates.Year_Entered: +1864 + + +USStates.Year_Settled: +1849 + +]]> + #Style_5 + + + -116.650735151808,39.3520158009473,0 + + + + + + -119.152450421001,38.4118009590513,0 -118.417419755966,37.886676748621,0 -117.838686423167,37.4572982397149,0 -117.160423771838,36.9595941441766,0 -115.885769343921,36.0012259572722,0 -115.626197382816,35.7956983148418,0 -114.621068606189,34.9989144286133,0 -114.633779872695,35.0418633504303,0 -114.595631971944,35.0760579746697,0 -114.6359090842,35.1186557767895,0 -114.626440825485,35.1339067529871,0 -114.582616239058,35.1325604694084,0 -114.572255261053,35.1400677445931,0 -114.561039964055,35.1743461616312,0 -114.559583045727,35.2201828714608,0 -114.587889840369,35.30476812919,0 -114.589584275424,35.3583787306827,0 -114.645396168451,35.4507608261464,0 -114.672215155693,35.5157541647721,0 -114.649792053474,35.5466373866596,0 -114.653134321223,35.5848331056106,0 -114.6398667219,35.6113485698329,0 -114.654065925137,35.6465840800051,0 -114.668486064922,35.6563989882403,0 -114.665091345861,35.6930994107106,0 -114.688820027649,35.7325957399896,0 -114.682739704595,35.7647034175617,0 -114.689867343369,35.8474424944765,0 -114.662462095522,35.870959907009,0 -114.661600122152,35.8804735854241,0 -114.699275906446,35.9116119537411,0 -114.736212493583,35.9876483502758,0 -114.717673567756,36.0367580437019,0 -114.728966012834,36.0587530361082,0 -114.728150311069,36.0859627711603,0 -114.712761724737,36.1051810523675,0 -114.621610747198,36.1419666834504,0 -114.598935242024,36.1383354528833,0 -114.530573568745,36.1550902046726,0 -114.466613475422,36.1247112590538,0 -114.443945697733,36.1210532841896,0 -114.380803116644,36.1509912717764,0 -114.344233941709,36.1374802520567,0 -114.316095374696,36.1114380366653,0 -114.303857056018,36.0871084040611,0 -114.307587598189,36.0622330993642,0 -114.233472615347,36.0183310595898,0 -114.206768869568,36.0172554164833,0 -114.12902308363,36.041730493896,0 -114.107775185788,36.1210907070504,0 -114.045105557286,36.1939778840226,0 -114.037392074194,36.2160228969701,0 -114.043716435713,36.8418489458646,0 -114.043939384154,36.9965379371421,0 -114.047260595159,37.5984784866001,0 -114.047272999176,38.1376524399918,0 -114.045090206154,38.5710950539538,0 -114.044267501155,38.678995881588,0 -114.040105338584,39.5386849268843,0 -114.039844684228,39.9087788600022,0 -114.038108189376,40.1110466529553,0 -114.038151248682,40.9976868405942,0 -114.039072662345,41.9953908974688,0 -114.269471632825,41.9959242345073,0 -115.024862911148,41.9965064559528,0 -115.947544658193,41.9945994628996,0 -116.992313337997,41.9947945094663,0 -117.018864363596,41.9947941808341,0 -118.185316829038,41.9966370981387,0 -119.3109421304,41.989135387281,0 -119.351692186077,41.9888529749781,0 -119.993459369715,41.9892049531992,0 -119.996324660047,41.1775662656441,0 -119.996165311172,39.7206108077274,0 -119.996011479298,39.443500976451,0 -119.995304181493,39.3115454332125,0 -119.995527335641,39.1587132866354,0 -119.994541258334,39.1061318056706,0 -119.995150114198,39.063491359469,0 -119.995254694357,38.9941061536376,0 -119.8893416394,38.9222515603984,0 -119.575687062955,38.7029101298903,0 -119.318825070203,38.5271086243913,0 -119.152450421001,38.4118009590513,0 + + + + + + + + New Hampshire + empty + + +states.AREA: + 9259.527 + + +states.STATE_NAME: +New Hampshire + + +states.STATE_FIPS: +33 + + +states.SUB_REGION: +N Eng + + +states.STATE_ABBR: +NH + + +states.POP2000: + 1235786 + + +states.POP2001: + 1258315 + + +states.POP00_SQMI: + 133 + + +states.DEN_0_100: + 88 + + +USStates.ID: + 9 + + +USStates.State_Name: +New Hampshire + + +USStates.Date_Entered: +June 21 1788 + + +USStates.Year_Entered: +1788 + + +USStates.Year_Settled: +1623 + +]]> + #Style_5 + + + -71.577769589032,43.6851910338169,0 + + + + + + -72.2799169173511,42.720467037784,0 -71.9302165845551,42.7072094199587,0 -71.90094191420261,42.7053786149513,0 -71.287194447592,42.6986034465098,0 -71.2524115796458,42.7260689220942,0 -71.24047922287529,42.7435552404171,0 -71.1863474665185,42.7387606265609,0 -71.18106084331041,42.807317168902,0 -71.12060440995749,42.8182808692669,0 -71.065564728038,42.8043197291356,0 -71.02542615731881,42.8511713651458,0 -70.9213361332524,42.885149233192,0 -70.8981116667382,42.8868774762984,0 -70.84973977624399,42.8634293009967,0 -70.8138807202681,42.8670649720671,0 -70.73413885860251,43.0587629299348,0 -70.8104276107829,43.0897406234761,0 -70.8864941746843,43.0588832353252,0 -70.9054160761297,43.0840213409417,0 -70.8746309579401,43.1015270060657,0 -70.88474831938861,43.1277066080614,0 -70.8186681583247,43.1218710916248,0 -70.8305481365302,43.1591741298583,0 -70.8132073721395,43.235222695474,0 -70.90108590067651,43.281020042684,0 -70.9058011398795,43.3020692769929,0 -70.9696996092209,43.3663799823752,0 -70.97909946378989,43.3961839179203,0 -70.9614829099438,43.4381263706902,0 -70.97079121747591,43.4702114970827,0 -70.9592784003468,43.5163880057296,0 -70.9642682587516,43.5319898518146,0 -70.9496195233573,43.5489536133091,0 -70.9565244088141,43.5641434705,0 -70.973874166771,43.5718298935058,0 -70.9844425613652,43.7911635520181,0 -71.008596512061,44.2821463668217,0 -71.0287261250693,44.6685380945196,0 -71.0875092473499,45.3014692052699,0 -71.15308937571361,45.2379692350016,0 -71.29723573798741,45.29349393594989,0 -71.38637797418291,45.2349303642414,0 -71.4465600756494,45.2360819406036,0 -71.4025225843513,45.202803185745,0 -71.43040988152841,45.1169922971266,0 -71.50299876376251,45.05989045439361,0 -71.50537230062881,45.01335171632249,0 -71.54092709673419,44.976563206227,0 -71.5169776077169,44.9436961331563,0 -71.50636496059011,44.8996711859758,0 -71.575100912366,44.816019797627,0 -71.58350120905909,44.7791969958657,0 -71.6311328527305,44.7417107606939,0 -71.6076787297884,44.6778622938609,0 -71.588749347522,44.6505994869908,0 -71.5680271516494,44.6374468081647,0 -71.5541026351831,44.5965889130359,0 -71.5367908177937,44.5789312630586,0 -71.59228841131031,44.5512031068487,0 -71.59144138862121,44.5388744007981,0 -71.5752435447921,44.525805689154,0 -71.58661898076009,44.4945375694188,0 -71.6142227691162,44.474507042735,0 -71.6365547217831,44.4767309013867,0 -71.64770916138809,44.4691741459763,0 -71.6563990024127,44.4401373612429,0 -71.67688436321281,44.4213427403398,0 -71.7665702593918,44.3982488046656,0 -71.7977291908463,44.384172813001,0 -71.8211973083551,44.3503600453545,0 -71.83481598035139,44.3441994129001,0 -71.928361752714,44.3361121851128,0 -71.93890565797921,44.3257860034123,0 -71.99443351087029,44.3275482023457,0 -72.03549537537759,44.2994343131496,0 -72.0595660047421,44.2614940911529,0 -72.0443903804218,44.2343798441303,0 -72.05928224606249,44.1821766291115,0 -72.0447245537617,44.1564355666157,0 -72.0349198523751,44.1207459288224,0 -72.0495148341974,44.1004520944909,0 -72.0324473746587,44.0960996192238,0 -72.0347283650036,44.0833740182688,0 -72.07691904412221,44.0320405986226,0 -72.0852043813774,44.008923986175,0 -72.109908766997,43.9892291134731,0 -72.1128078470404,43.9765149671875,0 -72.0917117306645,43.9579911279463,0 -72.1132040793555,43.9391659598857,0 -72.1216496397887,43.9092173247049,0 -72.1700895247441,43.8789176964689,0 -72.1848363730122,43.8016904606597,0 -72.2060918209679,43.7646350589211,0 -72.21912292133609,43.750692528435,0 -72.2600555952028,43.7353001230663,0 -72.3040399378543,43.6985301192071,0 -72.33308519415699,43.5973647921877,0 -72.3734983899537,43.5723746289271,0 -72.39499776821209,43.5175538931662,0 -72.3825156946813,43.4846296935804,0 -72.3962478080997,43.4101565518931,0 -72.4121395531363,43.3771255999362,0 -72.39762805437751,43.3510068532964,0 -72.4102315830492,43.3234041461301,0 -72.4024188454007,43.3073827061473,0 -72.4355986440693,43.2322535514022,0 -72.45239855285131,43.1560221784817,0 -72.43760490206709,43.1162700005073,0 -72.44346425788849,43.0790393128299,0 -72.4617520870041,43.0465044640798,0 -72.4571590376321,42.9996036974292,0 -72.47334119749689,42.9761435837691,0 -72.5042636319545,42.9655846501003,0 -72.5202170578448,42.9516725271887,0 -72.5248100213574,42.9126141761107,0 -72.5534284639708,42.8606431711067,0 -72.538916970841,42.8077338159119,0 -72.5130680088012,42.7892594013534,0 -72.50726952905301,42.7687326904009,0 -72.4793225257782,42.7615879021402,0 -72.4621713056893,42.7468405310802,0 -72.4557700038868,42.7258525290855,0 -72.2799169173511,42.720467037784,0 + + + + + + + + New Jersey + empty + + +states.AREA: + 7507.502 + + +states.STATE_NAME: +New Jersey + + +states.STATE_FIPS: +34 + + +states.SUB_REGION: +Mid Atl + + +states.STATE_ABBR: +NJ + + +states.POP2000: + 8414350 + + +states.POP2001: + 8504437 + + +states.POP00_SQMI: + 1121 + + +states.DEN_0_100: + 0 + + +USStates.ID: + 3 + + +USStates.State_Name: +New Jersey + + +USStates.Date_Entered: +Dec. 18 1787 + + +USStates.Year_Entered: +1787 + + +USStates.Year_Settled: +1660 + +]]> + #Style_5 + + + -74.6766277762304,40.1983130309155,0 + + + + + + -75.4892806606894,39.7148582186458,0 -75.5702341870436,39.6177349634268,0 -75.516688883565,39.5665684164947,0 -75.55276304016741,39.4905143065581,0 -75.4156722746602,39.3749718418896,0 -75.11995811220299,39.1846917807584,0 -75.0144070769606,39.1983638371173,0 -74.91665434173351,39.1706385416843,0 -74.8902020440427,39.1138602238713,0 -74.9681254179213,38.9717387716416,0 -74.87630095715041,38.956682397615,0 -74.8792536134529,38.9898436138584,0 -74.80229182967069,39.026373568453,0 -74.62458701838401,39.2508285381619,0 -74.6225269989005,39.281632454135,0 -74.6582341619692,39.2872514059591,0 -74.44750084319659,39.3810753138002,0 -74.4604179591324,39.4267565970433,0 -74.40111961067601,39.5026276432354,0 -74.4123886264147,39.5426212120384,0 -74.3288507438233,39.5236277328274,0 -74.3233420491384,39.572086212049,0 -74.2376755899413,39.6240467628644,0 -74.1714269184866,39.7182746749744,0 -74.1592285187117,39.8786054163902,0 -74.0773330835351,40.042272933577,0 -74.122180536689,40.0515614321764,0 -74.04979004684979,40.0568562355852,0 -74.0342945636626,40.091367053998,0 -74.0837730430801,40.088181749894,0 -74.0914259126674,40.1160856009488,0 -74.0392310981979,40.1018419664211,0 -73.97844056947299,40.3236160007761,0 -74.1218854792839,40.4514585866034,0 -74.2245034553239,40.4435848021689,0 -74.26891543553739,40.4637486117681,0 -74.2789103473592,40.5143036462751,0 -74.20825296046981,40.5911877065288,0 -74.1468580427043,40.6754795974611,0 -74.1155310062388,40.7056266447954,0 -74.1290580537768,40.6470721875068,0 -74.0061834375163,40.7040019887126,0 -74.00625978512571,40.7377308394608,0 -73.9770610560785,40.7974870925618,0 -73.92239451154271,40.8860400786778,0 -73.9089662304774,40.9273144200758,0 -73.8961483545214,40.9608717551544,0 -73.8966975351822,40.9985298010922,0 -74.21303867812691,41.1236116400331,0 -74.24235951786601,41.1376265983194,0 -74.37198081595101,41.1958499552554,0 -74.700062439729,41.3505731173044,0 -74.7916634911863,41.3119646486324,0 -74.7941432935133,41.2952145361236,0 -74.8251959144138,41.2827060427999,0 -74.8664114931874,41.2268173199683,0 -74.8628866488672,41.2067713675358,0 -74.91476830628049,41.1411056945383,0 -74.9499944822667,41.1118548355739,0 -74.9845949956578,41.0993808071368,0 -74.98888296567171,41.0817609886453,0 -74.9662915599138,41.0826765927628,0 -75.00115157189779,41.0624855771134,0 -75.03525634669791,41.0282029114312,0 -75.0699790173252,41.0107160473555,0 -75.1166191635571,41.0002479024639,0 -75.1393018121957,40.9775274861343,0 -75.1355249350063,40.9629365183948,0 -75.0797362757265,40.9033486382513,0 -75.0736857645488,40.884626384264,0 -75.0564884580085,40.8720458535526,0 -75.0546190233306,40.8556733594649,0 -75.0995419880564,40.8392851002474,0 -75.0892112792862,40.8213906687984,0 -75.1005408698709,40.7916591517333,0 -75.13031892785111,40.7727077092163,0 -75.1703132780782,40.7748092438347,0 -75.1936441590094,40.7480035802995,0 -75.18775390484051,40.7238570177578,0 -75.20535502856001,40.6860615374668,0 -75.1840607041906,40.6697922959704,0 -75.2089177365681,40.6507380422203,0 -75.1979386117749,40.6342055156311,0 -75.20038753873099,40.6147432578734,0 -75.1935130035322,40.5837685125831,0 -75.19757183103521,40.570684304811,0 -75.1822820039866,40.5567991566105,0 -75.1245260580076,40.5647988294484,0 -75.0797859423332,40.5453559585684,0 -75.0636796381505,40.5210034591816,0 -75.07011862395299,40.4562539259114,0 -75.0574533454579,40.4201714565405,0 -75.02126612533969,40.4013236035019,0 -75.00047552385639,40.4086211095812,0 -74.97284102604201,40.4044479567097,0 -74.95018846398411,40.3454738484253,0 -74.93250296210471,40.3337744130392,0 -74.9211500156386,40.3140337315445,0 -74.88065957300969,40.2995916131031,0 -74.8427630831946,40.2484527598366,0 -74.7388247265733,40.1777256441007,0 -74.72548046618491,40.1493066691812,0 -74.74629414856111,40.1243586916003,0 -74.82902245973639,40.1161609854809,0 -74.8719241363401,40.0780565429363,0 -74.9562015034126,40.0580144791932,0 -74.9834853663626,40.0340738445933,0 -75.0456754051916,40.0076347106729,0 -75.068045752986,39.9853915213067,0 -75.0845869855288,39.9757328153928,0 -75.1109630715591,39.9766903310886,0 -75.1398645870707,39.9559194804779,0 -75.1471586589936,39.9347404217525,0 -75.13580547674989,39.896887437334,0 -75.14290121504629,39.8816020366923,0 -75.18560547799029,39.8774058180612,0 -75.24699556467731,39.8504053640948,0 -75.2537404363575,39.8455377977782,0 -75.3459322944925,39.8485165819253,0 -75.42046794786501,39.7989830990632,0 -75.4117545704202,39.7897707547806,0 -75.4276473042606,39.7782429030536,0 -75.46039411885541,39.7633620274566,0 -75.47476845721459,39.7418320932776,0 -75.4759742683691,39.7200843842213,0 -75.4892806606894,39.7148582186458,0 + + + + + + + + New Mexico + empty + + +states.AREA: + 121757.343 + + +states.STATE_NAME: +New Mexico + + +states.STATE_FIPS: +35 + + +states.SUB_REGION: +Mtn + + +states.STATE_ABBR: +NM + + +states.POP2000: + 1819046 + + +states.POP2001: + 1839139 + + +states.POP00_SQMI: + 15 + + +states.DEN_0_100: + 99 + + +USStates.ID: + 47 + + +USStates.State_Name: +New Mexico + + +USStates.Date_Entered: +Jan. 6 1912 + + +USStates.Year_Entered: +1912 + + +USStates.Year_Settled: +1610 + +]]> + #Style_5 + + + -106.102403151381,34.4234110071301,0 + + + + + + -109.049495308693,32.4420444958635,0 -109.045615049533,31.3434530504803,0 -108.210647795015,31.3438536159949,0 -108.203254915468,31.7869032382901,0 -107.283567177026,31.7850830856735,0 -106.539514775671,31.7863052774039,0 -106.614986549809,31.8178343839605,0 -106.61612370633,31.8447405331725,0 -106.64407909206,31.8952054369513,0 -106.633748923526,31.9141010099202,0 -106.632605287073,31.97221998842531,0 -106.650061890884,31.9803297275266,0 -106.623625658904,32.0010887853062,0 -106.378387283311,32.0007470652221,0 -106.00324037618,32.0016580242852,0 -104.922304814538,32.004382108736,0 -104.85106805229,32.0032650272727,0 -104.019296949948,32.0074034895819,0 -103.981377077849,32.0060152222294,0 -103.729444279739,32.0062289025373,0 -103.332549418381,32.0042814747499,0 -103.058413767661,32.0020227787787,0 -103.055640531826,32.0851168230641,0 -103.060018185604,32.5155455179839,0 -103.049330863501,32.9536389141087,0 -103.043100992793,33.3778314740626,0 -103.038736452727,33.5658431867775,0 -103.033258497866,33.8261815911813,0 -103.029645833697,34.3078204763021,0 -103.022657024631,34.7453327558501,0 -103.025251273923,34.9647798759331,0 -103.026151164684,35.1772655150643,0 -103.02229404801,35.6236480179456,0 -103.022612263713,35.742327299615,0 -103.024047954518,36.0560618512093,0 -103.027286789536,36.4915918464103,0 -102.997400999016,36.4923701848871,0 -102.997709442614,36.9985238353847,0 -103.07786588474,36.9997601837273,0 -103.993635035945,36.9944690622369,0 -105.146172547082,36.9932073726899,0 -105.213091465415,36.992604521715,0 -105.713459997846,36.9945603614965,0 -105.992000086492,36.992289650437,0 -106.472176939021,36.9915042439681,0 -106.86124887722,36.9895015941857,0 -106.89037023567,36.9990837907051,0 -107.410820543541,36.9975257849804,0 -107.472460293817,36.9987767566937,0 -108.372472924296,36.999471575633,0 -109.048480115363,36.9966409005893,0 -109.047846506598,35.9966639816639,0 -109.046640810431,34.9546462439613,0 -109.048652751175,34.5917805775226,0 -109.050349253456,33.7833019238717,0 -109.050525833602,33.205164822801,0 -109.051346155985,32.7795505537932,0 -109.049495308693,32.4420444958635,0 + + + + + + + + New York + empty + + +states.AREA: + 48561.751 + + +states.STATE_NAME: +New York + + +states.STATE_FIPS: +36 + + +states.SUB_REGION: +Mid Atl + + +states.STATE_ABBR: +NY + + +states.POP2000: + 18976457 + + +states.POP2001: + 19123358 + + +states.POP00_SQMI: + 391 + + +states.DEN_0_100: + 65 + + +USStates.ID: + 11 + + +USStates.State_Name: +New York + + +USStates.Date_Entered: +July 26 1788 + + +USStates.Year_Entered: +1788 + + +USStates.Year_Settled: +1614 + +]]> + #Style_5 + + + -75.51225742270179,42.9466608265549,0 + + + + + + + -79.7632349654056,42.2673270883975,0 -79.76165964707261,42.0031057341519,0 -79.6123674903386,42.0005849142235,0 -79.0594888967335,42.0011576593905,0 -78.9185382675857,41.999846787447,0 -78.3050882311977,41.999420608423,0 -78.2042620524614,41.9982004349665,0 -77.745007937534,41.9973331826449,0 -77.6128475772834,41.9988295851283,0 -76.96857370314299,42.0029809748211,0 -76.92839533835389,42.0025345979743,0 -76.5639147893755,42.0030114109064,0 -76.1450203202792,42.0006545080767,0 -76.1048345309617,41.9994987458506,0 -75.47973225649039,41.9963677005791,0 -75.38281319593381,41.9983566083877,0 -75.3456570669365,41.9928449489974,0 -75.3240658004094,41.9612749921534,0 -75.2836900262962,41.9476038545852,0 -75.25451546272871,41.8688733616359,0 -75.1712837916533,41.8678398536526,0 -75.148280568261,41.8557893317759,0 -75.1247508265953,41.8491823474776,0 -75.11777744299,41.8369868194197,0 -75.07984301881911,41.8141483463494,0 -75.09682675506321,41.7972073179534,0 -75.0971549734922,41.7790417898653,0 -75.0613185051632,41.7702603750835,0 -75.0569699647963,41.7267080970937,0 -75.065400870215,41.7148368016377,0 -75.0513249551697,41.6373147729593,0 -75.0724517137798,41.6130800694112,0 -75.0698653499134,41.6044779552895,0 -75.0250873678455,41.565800906359,0 -75.0148868316079,41.5395558959306,0 -74.9717879994631,41.4836026231296,0 -74.9325644004893,41.484350685956,0 -74.8985597400598,41.4618942446762,0 -74.8952792585073,41.4446711797979,0 -74.8640666499364,41.4471548184687,0 -74.792799015071,41.4299171588691,0 -74.7548266211957,41.4301464096857,0 -74.7400406430903,41.4220594630718,0 -74.7404375695009,41.4016358612695,0 -74.7052732398395,41.3750593363948,0 -74.700062439729,41.3505731173044,0 -74.37198081595101,41.1958499552554,0 -74.24235951786601,41.1376265983194,0 -74.21303867812691,41.1236116400331,0 -73.8966975351822,40.9985298010922,0 -73.8961483545214,40.9608717551544,0 -73.9089662304774,40.9273144200758,0 -73.92239451154271,40.8860400786778,0 -73.9770610560785,40.7974870925618,0 -74.00625978512571,40.7377308394608,0 -74.0061834375163,40.7040019887126,0 -73.91986182481109,40.802804804545,0 -73.7963459186446,40.8323341007837,0 -73.7800412528382,40.8866887918692,0 -73.65315146089949,40.9983924455247,0 -73.65372377552561,41.0126172825253,0 -73.72523765669671,41.1003542249946,0 -73.47812075689539,41.2107548889389,0 -73.5502596731917,41.2936207043954,0 -73.5442932536742,41.3652984767995,0 -73.5303920707175,41.5227455563004,0 -73.51714741333279,41.6656861632365,0 -73.4842302844536,42.0474280500728,0 -73.49884000273219,42.0774606830635,0 -73.35082423703111,42.5047557597646,0 -73.2580598287651,42.7460586400616,0 -73.26927531690011,42.747481432998,0 -73.2961697572315,42.8035493647588,0 -73.27958319993191,42.83710332748,0 -73.27600528901171,42.9402941192889,0 -73.2500714436229,43.310853990742,0 -73.2383913589494,43.5128328494142,0 -73.25998379380719,43.5593823395157,0 -73.2914024969013,43.5750335705375,0 -73.28173626823219,43.5931872495766,0 -73.2941043006647,43.6196528756937,0 -73.303534516911,43.62471481285,0 -73.36368556156729,43.6149988679744,0 -73.3881142192301,43.5691436583008,0 -73.4183198417113,43.582479385998,0 -73.4229598542953,43.6321147289764,0 -73.3709893845574,43.7142811167277,0 -73.3566696765928,43.756558340599,0 -73.35899716813,43.7784275686932,0 -73.3847399017654,43.804507971731,0 -73.3751207851314,43.8859769501205,0 -73.4053345287369,43.9148075869022,0 -73.4174061301202,43.9881969457528,0 -73.4082513023357,44.0182219013784,0 -73.43600071127899,44.0456791904389,0 -73.4352152780239,44.0638978024282,0 -73.408756830709,44.1066103535606,0 -73.40786483046161,44.1362270392695,0 -73.38206233640641,44.1721076120788,0 -73.37733262552911,44.2012475171296,0 -73.3053256664729,44.2601422576285,0 -73.32978809302909,44.3673904680866,0 -73.2999951630005,44.4055331645407,0 -73.2933197444993,44.4328535783624,0 -73.3344524939975,44.544328246301,0 -73.34781198402661,44.5539715457199,0 -73.3712960298213,44.5791669569442,0 -73.3818251037206,44.619807725515,0 -73.3701366913554,44.6343490646182,0 -73.3730971364166,44.6612763562517,0 -73.3581509561494,44.680368564481,0 -73.373158575022,44.724236436747,0 -73.3267863194035,44.799293570954,0 -73.36905412807261,44.8191179021751,0 -73.3823067594393,44.8479336187606,0 -73.3364146788922,44.9326039308497,0 -73.3507583871195,44.9819729513451,0 -73.3447234868807,45.0061387945904,0 -74.0215389337819,44.9908473700023,0 -74.7361076285261,44.9929162059365,0 -74.96846961727719,44.9486251336596,0 -75.328862374301,44.8106292000334,0 -75.75865750281371,44.5175335377769,0 -75.8480298249662,44.3902626942885,0 -76.3628809771691,44.098354795451,0 -76.2968829355811,44.0420171276421,0 -76.2015425385076,44.065598108465,0 -76.13452232320979,44.0132289276425,0 -76.12906593405761,43.9322080498527,0 -76.1937184572916,43.9124903482975,0 -76.23999177645069,43.8351272651759,0 -76.2056663591305,43.682700033073,0 -76.1845704121246,43.6331973667822,0 -76.2227647111352,43.5541537826913,0 -76.45465571373001,43.5007209976012,0 -76.6196279680242,43.4141527458186,0 -76.7184716226022,43.3234424252336,0 -76.7368294931217,43.3427331717123,0 -76.9145275090108,43.27859600965,0 -77.37731588740429,43.2757129012853,0 -77.57571151646241,43.2415476718162,0 -77.7450074302451,43.3351700802958,0 -77.9920093179894,43.3655716261253,0 -78.464653717302,43.3719935588723,0 -79.06223899261261,43.2682161630262,0 -79.0393253199349,43.1447391584938,0 -79.0611147555518,43.0906050224616,0 -78.9255963639699,43.0666266953168,0 -78.8827932399727,43.0223576321954,0 -78.93655137597069,42.974231439434,0 -78.8591998233946,42.792745144536,0 -79.04375196053699,42.6992467780984,0 -79.1422333021515,42.5746167483925,0 -79.3548838534991,42.4934618207762,0 -79.44402037006211,42.4193614595174,0 -79.7632349654056,42.2673270883975,0 + + + + + + + + + -73.7522089773056,40.5945872168727,0 -73.4225260722185,40.6613251474997,0 -72.5211641762305,40.8150415787904,0 -71.9187022869602,41.0305740631358,0 -71.869986721423,41.0745076818864,0 -71.92370021338689,41.084871803273,0 -72.07701114487909,41.0005742896832,0 -72.20335052497531,41.0353739275596,0 -72.29308242777471,41.0240174407749,0 -72.4761091088628,40.9201483179884,0 -72.60481541607391,40.9053005940406,0 -72.5509712260717,40.9661799196018,0 -72.4163456562061,41.0260401128234,0 -72.3542793156581,41.1102027831546,0 -72.2811492371991,41.1425353132104,0 -72.3170314447005,41.1493333683696,0 -72.6315724125195,40.9812851867213,0 -73.02126964947119,40.9684330814817,0 -73.1409796858424,40.9513960080037,0 -73.2145230963623,40.9010417299256,0 -73.4306478224206,40.9225566298747,0 -73.4780896515487,40.879744720266,0 -73.5982719298698,40.9031443913556,0 -73.7494771719183,40.8449987554869,0 -73.7539177904555,40.7888512181378,0 -73.89901774530181,40.7971172294422,0 -73.95560677739191,40.7393826803867,0 -74.0277216950731,40.6393365084359,0 -74.00403933590199,40.5812590385622,0 -73.87981412654141,40.5902691191329,0 -73.91573433661991,40.63113138266,0 -73.8460607625491,40.6526001201263,0 -73.7649351380376,40.6369334656098,0 -73.7613950097786,40.6182379482267,0 -73.9275906880242,40.5576503077215,0 -73.7522089773056,40.5945872168727,0 + + + + + + + + + -73.2930589706138,40.6263822132856,0 -73.2490511730599,40.6254244342199,0 -73.03093394571719,40.6713410120228,0 -72.9563156920831,40.7000387409497,0 -72.7640253118572,40.7583922849051,0 -72.7573264947801,40.7679595170533,0 -72.7821991206641,40.7641333101321,0 -72.8769060551186,40.7373463357701,0 -73.05102282397201,40.6751671223298,0 -73.240437212291,40.6330765843302,0 -73.2911438669417,40.6330768861726,0 -73.2930589706138,40.6263822132856,0 + + + + + + + + + -74.23693964924441,40.5060032905632,0 -74.1936418338484,40.510561942058,0 -74.12299972778629,40.5447412254891,0 -74.0591936862929,40.6017089956228,0 -74.07286605953171,40.6495633368533,0 -74.1662980145054,40.6244971306027,0 -74.2369398627783,40.5379049676837,0 -74.23693964924441,40.5060032905632,0 + + + + + + + + + North Carolina + empty + + +states.AREA: + 49048.024 + + +states.STATE_NAME: +North Carolina + + +states.STATE_FIPS: +37 + + +states.SUB_REGION: +S Atl + + +states.STATE_ABBR: +NC + + +states.POP2000: + 8049313 + + +states.POP2001: + 8225753 + + +states.POP00_SQMI: + 164 + + +states.DEN_0_100: + 85 + + +USStates.ID: + 12 + + +USStates.State_Name: +North Carolina + + +USStates.Date_Entered: +Nov. 21 1789 + + +USStates.Year_Entered: +1789 + + +USStates.Year_Settled: +1660 + +]]> + #Style_5 + + + -79.4013155346895,35.5472650672799,0 + + + + + + + -83.9884542500545,34.9891518047362,0 -83.93789913149431,34.9894775119032,0 -83.5492972918908,34.9896284845873,0 -83.5128876420542,34.9921157535224,0 -83.1061569738507,35.000366708131,0 -83.0071465788827,35.0242932065357,0 -82.8875562556649,35.055473206413,0 -82.7712011457841,35.0855376628965,0 -82.6972082635003,35.0913494747721,0 -82.6878846328013,35.0979182706584,0 -82.6859002249553,35.1215804311176,0 -82.65434412549401,35.1195740504075,0 -82.5698759075391,35.1496073738685,0 -82.524479651378,35.1546774490548,0 -82.4665859914405,35.1736172290209,0 -82.43776138231119,35.1696762171977,0 -82.38945068539501,35.2083565365976,0 -82.3712159851947,35.1828397610023,0 -82.3599623343986,35.1830646579415,0 -82.3507000333949,35.1927881586207,0 -82.3206088962679,35.1843038355905,0 -82.27816557714399,35.1951216082193,0 -82.2100104423684,35.1932410593964,0 -81.9712727030758,35.1884000260399,0 -81.87041657119239,35.1832378034331,0 -81.76518108877021,35.1825960728566,0 -81.36198018686321,35.1629867122026,0 -81.3226257414279,35.1638918108331,0 -81.04909901663881,35.1516727757939,0 -81.04883974027349,35.1321534001715,0 -81.02824058884551,35.1055509640026,0 -81.0653500212191,35.0666253067042,0 -81.0396852000525,35.0373453689435,0 -80.9275918870396,35.1013947091143,0 -80.8945103715547,35.0598808081622,0 -80.8399590540857,35.0021664433249,0 -80.785444630059,34.940788108541,0 -80.79985577870811,34.8162600736923,0 -80.5613348947421,34.815379673307,0 -80.3250654065352,34.8149167168925,0 -79.9197366317695,34.8080740704278,0 -79.685738680014,34.8054127206548,0 -79.6672823384891,34.8008202005653,0 -79.4557408419562,34.6342519700477,0 -79.4469133528043,34.6192221953644,0 -79.0742575899197,34.3047384944277,0 -78.6554531485329,33.9488449988485,0 -78.57945349610721,33.8821646134616,0 -78.0345179035716,33.9144655035987,0 -77.95823664379429,33.9927535951154,0 -77.9604422302876,34.1894138394024,0 -77.9264668205974,34.0622068781286,0 -77.89410931317229,34.0693517444618,0 -77.864094387908,34.1929080636859,0 -77.7502285952169,34.3052152556069,0 -77.6023097576188,34.4127961619157,0 -77.6094206317085,34.4352111182146,0 -77.58645506568941,34.4211044558942,0 -77.53832636635519,34.4571757451115,0 -77.1562743412922,34.6607994551356,0 -77.1290670525932,34.6850758053643,0 -77.1486300958301,34.7644928793749,0 -77.0501990668688,34.6990792872107,0 -76.6249630133433,34.7199152319966,0 -76.46954580418669,34.7852234003552,0 -76.3143487428846,34.9489790362954,0 -76.3290439177373,34.9761204263875,0 -76.3636527631416,34.9432753199548,0 -76.4236996410833,34.9464101060141,0 -76.4446746901305,35.016821613356,0 -76.5294259321625,34.9747977981923,0 -76.66971229425271,34.9701586610467,0 -76.6467009989299,34.9064952538138,0 -76.91277290524469,34.9366300082455,0 -77.0008586302893,35.0530463230032,0 -77.11026055452381,35.0661954508922,0 -77.1043475272177,35.0881454936049,0 -77.0475521473705,35.0923150966989,0 -76.94291003878649,35.0701945880484,0 -76.9411555433733,35.0275875339288,0 -76.8491252863471,34.982379921273,0 -76.6776621128775,35.0242480871668,0 -76.6238729550724,35.0645133662679,0 -76.60487483157399,35.1387263355658,0 -76.6397413585737,35.1726863005469,0 -76.5067751417852,35.2489330964746,0 -76.5406269919479,35.3038542452018,0 -76.5908594670962,35.3122475613847,0 -76.6141670362876,35.2730867333754,0 -76.6945524996528,35.3505941243399,0 -76.98285399044831,35.4366636706378,0 -77.1034438790242,35.5503488031328,0 -76.7050292785914,35.4121010752802,0 -76.6284211127021,35.4380631232604,0 -76.6378528390625,35.5205015679941,0 -76.4921880342737,35.541952401491,0 -76.5185953789444,35.5778101645251,0 -76.4461736845969,35.5510316355737,0 -76.458082231863,35.504591725145,0 -76.53340213378431,35.450365283595,0 -76.4984509695288,35.4163837561328,0 -76.18125223736131,35.3417018841534,0 -76.05260831544901,35.4147748843318,0 -75.89112185475111,35.6314373307933,0 -75.77867286687371,35.5788596630665,0 -75.72898900662339,35.665346355358,0 -75.7485844806443,35.8695079102707,0 -75.8176810806274,35.9236843388724,0 -75.9874915558738,35.8928678030293,0 -76.02084452400339,35.6692594940877,0 -76.1043820216892,35.6638050456577,0 -76.1669465551588,35.6970078077113,0 -76.0427040337583,35.684014363844,0 -76.07555189097479,35.7569647798523,0 -76.0256869103623,35.9205848840211,0 -76.0892822391223,35.9630733048323,0 -76.21341991434009,35.9770370290936,0 -76.371139191748,35.932505477407,0 -76.4091283531839,35.9776289262675,0 -76.6968862093037,35.9417048325409,0 -76.7407945732609,35.9367873881772,0 -76.693430938163,35.993130374768,0 -76.7603450631722,36.1447501886056,0 -76.7447362584297,36.2340736323403,0 -76.7071685217467,36.2662883637951,0 -76.74102237740409,36.3153219069784,0 -76.9237608844299,36.3925988375605,0 -76.7763179923306,36.3584847061625,0 -76.68840787204771,36.294673224779,0 -76.7261797744452,36.1569800114938,0 -76.6898230006157,36.0497700530899,0 -76.6328753964642,36.037277484565,0 -76.6486843529633,36.0658679998712,0 -76.59366647335681,36.0102930907247,0 -76.5226729428308,36.0073295870634,0 -76.4200856773769,36.0587660161274,0 -76.4801920625066,36.0799523645649,0 -76.2751614487396,36.1105304965543,0 -76.29858527945861,36.2143873673267,0 -76.2346329999873,36.1635194405906,0 -76.1415877116506,36.1478486946883,0 -76.1123584511714,36.1745780626302,0 -76.2185584113341,36.2967645788658,0 -76.1828209798244,36.3153954875583,0 -75.9809812344828,36.1698863401472,0 -75.9568257994211,36.1939309437328,0 -76.0086191458258,36.3197530400297,0 -75.9415760202413,36.2944972863716,0 -75.9571554546035,36.2596123902831,0 -75.9134059470765,36.2449609601768,0 -75.8547970349572,36.1058289194759,0 -75.7984798262459,36.0729822151271,0 -75.799686786926,36.1129789671118,0 -75.9242345411069,36.3511064253818,0 -75.92776837905591,36.4234009903646,0 -75.9509007725851,36.3656283397926,0 -76.00125787767401,36.4190705700709,0 -75.9694113211707,36.4152753792118,0 -75.97572143414359,36.436370152828,0 -76.0907173497589,36.503720365701,0 -76.0328614410073,36.5145275392771,0 -76.0456111690205,36.5571064340655,0 -76.1270505006232,36.5573157649444,0 -76.3299165778101,36.5562088358656,0 -76.4972285279305,36.555964754875,0 -76.5632556818254,36.5554041975692,0 -76.92131386587209,36.554309439951,0 -76.92381636627491,36.5542979883089,0 -77.1770420007847,36.5564375496145,0 -77.3197463656757,36.5540684074889,0 -77.7636386364742,36.5535891128352,0 -77.89856872882319,36.553092111532,0 -78.05138167562831,36.5526213891494,0 -78.320969632811,36.5456755672774,0 -78.45852951752001,36.5416234739225,0 -78.73711601969831,36.5462146723402,0 -78.7964284068279,36.5436739120265,0 -79.1440627705841,36.5461983712091,0 -79.21680327614961,36.5499213192211,0 -79.5100477812088,36.5477956232117,0 -79.7172016388076,36.5480278701673,0 -80.0238223180659,36.5451630012943,0 -80.04786338901999,36.5472724746821,0 -80.4350919823622,36.5511811239687,0 -80.61084107895191,36.557430438888,0 -80.8379531599861,36.5635684825855,0 -80.90324049840061,36.5653420877066,0 -81.3451210093901,36.5729883010435,0 -81.669835031007,36.5897678106349,0 -81.7026326964311,36.5194602645637,0 -81.6981148990988,36.4718999796584,0 -81.7409080103685,36.3919078496119,0 -81.7402131763359,36.36198253433,0 -81.70928987932049,36.3338502743492,0 -81.7303246226996,36.329467183951,0 -81.8304104053052,36.3347789811478,0 -81.9109940382706,36.2908752993263,0 -81.93295169915611,36.2634442248774,0 -82.02029495982831,36.1298343126582,0 -82.07760212353961,36.1002602555009,0 -82.1179256052358,36.0963748384003,0 -82.1539009606375,36.1397376377449,0 -82.2075845767752,36.1471275332235,0 -82.2621599370151,36.1204875660764,0 -82.31178368636429,36.1222605725301,0 -82.373713428402,36.0988071608409,0 -82.4082829106663,36.075426604695,0 -82.4750552128438,35.9932844245825,0 -82.50679391974769,35.9726503280575,0 -82.5540052334424,35.9562159294434,0 -82.59916490143139,35.9634057475641,0 -82.6056664709886,36.0036541966122,0 -82.59209423820271,36.0225560968714,0 -82.60426425649671,36.0430940692888,0 -82.627908811062,36.0544461489244,0 -82.6437553482122,36.0518290360149,0 -82.7630949285561,35.999650015691,0 -82.7734633268223,35.9876068957838,0 -82.776308441769,35.9566773412235,0 -82.808535161382,35.9209751642818,0 -82.85613712216021,35.9475285534576,0 -82.8958417812556,35.9484625785516,0 -82.91393874467821,35.9279697450405,0 -82.90668913774699,35.8723171942072,0 -82.9626197710807,35.7919519408503,0 -82.9868738379453,35.7740910698457,0 -83.0598287433232,35.7826768094939,0 -83.1180576454199,35.7639076045034,0 -83.14353299786571,35.762781885683,0 -83.1852205412256,35.7289833858793,0 -83.2437245319139,35.7183129960111,0 -83.25317743900131,35.7008036610277,0 -83.25899879194441,35.6911067450186,0 -83.2982915815667,35.6564233114235,0 -83.34290282423361,35.6533554944088,0 -83.38697214372481,35.625313192169,0 -83.4581731409302,35.5973733030352,0 -83.5056836752714,35.5596454175324,0 -83.56092262748621,35.5552687853695,0 -83.6137506282731,35.5718308753539,0 -83.6727662732265,35.5650623686071,0 -83.77577472166,35.5526929432439,0 -83.8300980940741,35.519149329024,0 -83.88112540362761,35.5106719867731,0 -83.9099126259032,35.4765642431448,0 -83.9546078411811,35.4555443092538,0 -84.01255674537021,35.4077068120234,0 -84.00621731838029,35.3729437031099,0 -84.02911525821651,35.3253739821258,0 -84.03077168910571,35.2926057594707,0 -84.0426897213918,35.2726584543483,0 -84.10156069006141,35.2456337418504,0 -84.1796426644509,35.2410694819878,0 -84.22586311709139,35.2616828718238,0 -84.2909595168732,35.210622280084,0 -84.3237734916339,34.989090556154,0 -84.118152397807,34.9883069959845,0 -83.9884542500545,34.9891518047362,0 + + + + + + + + + -76.0268192353758,36.5568700359695,0 -75.97593627376701,36.5180793801967,0 -75.9769275698946,36.4781707412753,0 -75.92445033891821,36.4741316082296,0 -75.9115647487463,36.5426843995728,0 -75.9983147031585,36.5568053577451,0 -76.0268192353758,36.5568700359695,0 + + + + + + + + + -75.90163103703659,36.5563523255124,0 -75.7828060806813,36.2253555177264,0 -75.7404920642807,36.0504887346377,0 -75.7023588136975,36.050028033628,0 -75.5445786711917,35.7885380495047,0 -75.77278830494819,36.2294182919327,0 -75.877811084643,36.5560283058652,0 -75.90163103703659,36.5563523255124,0 + + + + + + + + + -75.4908240267188,35.6706779442836,0 -75.4750201903482,35.5646750837636,0 -75.52108025462761,35.2815348139534,0 -75.6911717207235,35.2351648510944,0 -75.7488987595512,35.1900017864003,0 -75.52589357232451,35.2280944215419,0 -75.4565804266586,35.6175774238916,0 -75.5332327857941,35.7690344819007,0 -75.4908240267188,35.6706779442836,0 + + + + + + + + + -76.0166279556301,35.0696051226092,0 -76.0024976111832,35.0696053699945,0 -75.90356247916451,35.1326642006003,0 -75.811150308907,35.1641942791106,0 -75.76331155591871,35.1924582338,0 -75.85354935458651,35.1674551809437,0 -75.97531321026131,35.1163551414779,0 -76.0166279556301,35.0696051226092,0 + + + + + + + + + -76.5439188750827,34.5879943309158,0 -76.4689040756159,34.6934466158692,0 -76.2873389732944,34.8771752332838,0 -76.37431856243209,34.8130336904105,0 -76.43193837858991,34.7608479437727,0 -76.484125508936,34.697795135324,0 -76.53739566964271,34.6140864557391,0 -76.5547914497339,34.6108248279411,0 -76.5439188750827,34.5879943309158,0 + + + + + + + + + North Dakota + empty + + +states.AREA: + 70812.056 + + +states.STATE_NAME: +North Dakota + + +states.STATE_FIPS: +38 + + +states.SUB_REGION: +W N Cen + + +states.STATE_ABBR: +ND + + +states.POP2000: + 642200 + + +states.POP2001: + 639099 + + +states.POP00_SQMI: + 9 + + +states.DEN_0_100: + 99 + + +USStates.ID: + 39 + + +USStates.State_Name: +North Dakota + + +USStates.Date_Entered: +Nov. 2 1889 + + +USStates.Year_Entered: +1889 + + +USStates.Year_Settled: +1812 + +]]> + #Style_5 + + + -100.470755004497,47.44607757471681,0 + + + + + + -98.7304369014178,45.938271038568,0 -98.0147097100399,45.9314979679384,0 -97.97872180427929,45.9308221521123,0 -97.2333099148663,45.9365026737778,0 -96.56692152993792,45.9341104552974,0 -96.56180218014301,45.947683082204,0 -96.57621526476891,46.0212796299197,0 -96.5519309951806,46.0955288981098,0 -96.5711660882375,46.1771746587376,0 -96.58789029848551,46.1919183501241,0 -96.586456172813,46.2154130412247,0 -96.59818306918299,46.2386825873787,0 -96.60207424773671,46.3363242033822,0 -96.6148614718026,46.3508125122489,0 -96.652101616659,46.359433744956,0 -96.68822802670302,46.4122182590646,0 -96.70968261750701,46.4271682580565,0 -96.7148938591495,46.4687184679509,0 -96.7403159762507,46.48943263621611,0 -96.7512275405111,46.5886193856906,0 -96.77104176601431,46.599983727298,0 -96.7843175742934,46.6241120798968,0 -96.79024584630611,46.6297732310646,0 -96.7936950250642,46.6788040267861,0 -96.7815566712509,46.70704424821519,0 -96.78038206028749,46.76231192357041,0 -96.79719698567129,46.8120331273937,0 -96.7682498142506,46.8448617179934,0 -96.77806115639289,46.86734962234851,0 -96.75691111938932,46.92278040676061,0 -96.7630680116614,46.9362617243826,0 -96.78792529587892,46.9321845446505,0 -96.78971039131831,46.9482025284177,0 -96.80188711680511,46.9558437462552,0 -96.7934256963282,46.9696412657999,0 -96.81677225710112,46.9697793204954,0 -96.8245311005541,47.0034368148568,0 -96.83529642490029,47.010231336615,0 -96.8226082854226,47.0339323228784,0 -96.82696455551869,47.0788327499143,0 -96.8191517739067,47.092603946145,0 -96.83916391918299,47.15188672447119,0 -96.8264910530645,47.1700638561564,0 -96.83706533207652,47.24045886252299,0 -96.84962364144019,47.2568437171683,0 -96.8377139015022,47.2938841531782,0 -96.84674742491131,47.3146021392787,0 -96.83846171594141,47.3422432670699,0 -96.8506310274787,47.3609547965118,0 -96.83982751825211,47.3841173886799,0 -96.85000552427368,47.40893619134631,0 -96.8672485372544,47.4130870926383,0 -96.8558270224376,47.4367532150799,0 -96.86668409504289,47.46153767201731,0 -96.8516156149426,47.5006189556105,0 -96.86068697531159,47.521355890617,0 -96.84918872371689,47.5445680596933,0 -96.85866448748919,47.5629780191413,0 -96.8522168516036,47.6011515774988,0 -96.8733355306381,47.61525494214149,0 -96.88942557471509,47.6739252332857,0 -96.92365919198331,47.7140944463104,0 -96.9320126704945,47.76350633439991,0 -96.95783043536861,47.7944403501783,0 -96.98389283615319,47.8096615237026,0 -96.9772315863069,47.82802938021419,0 -97.0003404808151,47.8701978669666,0 -97.02056624465818,47.8755694579146,0 -97.0153310859442,47.9178900732528,0 -97.04805316836101,47.9549243203709,0 -97.06707134786728,48.048164548667,0 -97.09272143407961,48.0703439518727,0 -97.09903037740141,48.10097253646661,0 -97.1218728658484,48.1163692500537,0 -97.12091854672551,48.1427747596289,0 -97.1365131689498,48.1483979760568,0 -97.1160657786151,48.15922376009381,0 -97.13744349769659,48.1677691625112,0 -97.13629125790619,48.1752269254696,0 -97.13727498096822,48.19506350874159,0 -97.13082783294991,48.203741885664,0 -97.1108994630634,48.2076058326789,0 -97.13975391723049,48.2217551769127,0 -97.1092357553089,48.2280489212221,0 -97.12755405772062,48.2335233812974,0 -97.12378464072812,48.2591734472995,0 -97.1366555811411,48.26448372514071,0 -97.1117146532382,48.2778766724222,0 -97.1126835485646,48.2861469425287,0 -97.13051368584328,48.2930404066961,0 -97.11372110772452,48.2948826063907,0 -97.11475103859129,48.3036182701977,0 -97.1326346023646,48.3109694998778,0 -97.11259178050868,48.3199260418033,0 -97.1371359526577,48.325991839938,0 -97.1311236997639,48.3614912628834,0 -97.1503959422882,48.3632158504957,0 -97.1337863598383,48.37245473762349,0 -97.13520540024382,48.3844100102639,0 -97.15881888906552,48.3882060567347,0 -97.12912451530391,48.40788551888869,0 -97.14982354769968,48.4099916056847,0 -97.1516469812462,48.4196122946538,0 -97.1226011810987,48.4161098774117,0 -97.11963315137211,48.4371020760904,0 -97.1436129528287,48.4381095940115,0 -97.13459432660341,48.5173139662426,0 -97.14832765896941,48.5179512756552,0 -97.13938559124,48.53464808973769,0 -97.15553751110001,48.5383982428954,0 -97.16043569382291,48.5450778855401,0 -97.14661837238491,48.549537028086,0 -97.16794315057858,48.5622632793582,0 -97.15212680110921,48.5728564381998,0 -97.1581923011142,48.5836407260616,0 -97.1408119037381,48.58690580615401,0 -97.14471807468772,48.614024636853,0 -97.1229581756859,48.62076865965261,0 -97.12744434552491,48.6297943394125,0 -97.1076300563642,48.6299465820435,0 -97.0971692767445,48.67452891358581,0 -97.1167392665872,48.6952431183753,0 -97.11010128165211,48.70858304519639,0 -97.13480616135631,48.72623793064931,0 -97.1325018005064,48.74721879009559,0 -97.14789838866929,48.7556533929197,0 -97.13924598743699,48.7635421115078,0 -97.14751600300801,48.7811701058176,0 -97.17394470123411,48.8015144641308,0 -97.1647124057145,48.81036830295489,0 -97.180421855856,48.8155374993874,0 -97.17120441179901,48.8359804803914,0 -97.17572751730749,48.87375778734761,0 -97.21636909583231,48.9318299182446,0 -97.22943644383329,48.9999877567165,0 -97.93786778438729,48.9999918937478,0 -99.0004034005602,49.0000065174999,0 -99.5335659929558,49.000008633611,0 -100.18790828563,49.00000221473371,0 -101.50043742862,49.00002009555491,0 -102.022264422813,49.0000152771341,0 -102.937958808257,49.0000261991575,0 -104.062991101535,49.0000267486802,0 -104.052317635595,48.6458247340349,0 -104.052111483045,48.3910193593535,0 -104.048425167939,48.0000812793709,0 -104.047307659333,47.4000172886746,0 -104.045926505168,47.3338320293792,0 -104.047437491435,46.6429474765464,0 -104.046705569922,46.5425395197373,0 -104.04783642886,46.2808814764405,0 -104.048906344358,45.94299366714029,0 -102.994822935958,45.9411156292139,0 -102.94639700191,45.9416652376318,0 -102.002775042851,45.9425053768471,0 -100.514406747246,45.9403879984664,0 -99.8757832426344,45.9435473182577,0 -99.7173457378766,45.9427610350303,0 -99.0068328335466,45.939555550557,0 -98.7304369014178,45.938271038568,0 + + + + + + + + Ohio + empty + + +states.AREA: + 41193.957 + + +states.STATE_NAME: +Ohio + + +states.STATE_FIPS: +39 + + +states.SUB_REGION: +E N Cen + + +states.STATE_ABBR: +OH + + +states.POP2000: + 11353140 + + +states.POP2001: + 11381725 + + +states.POP00_SQMI: + 276 + + +states.DEN_0_100: + 75 + + +USStates.ID: + 17 + + +USStates.State_Name: +Ohio + + +USStates.Date_Entered: +Mar. 1 1803 + + +USStates.Year_Entered: +1803 + + +USStates.Year_Settled: +1788 + +]]> + #Style_5 + + + -82.78739067313241,40.2875354201742,0 + + + + + + -83.2727548748104,38.6092569222626,0 -83.24501356062839,38.6241723630441,0 -83.1819390743195,38.6098410346599,0 -83.1431499750977,38.6193396966029,0 -83.11124311365749,38.6648333651597,0 -83.0608799170539,38.6857264630017,0 -83.0269434347116,38.7145119991138,0 -82.97248310332699,38.7196429959584,0 -82.9213038087217,38.7464144846546,0 -82.8903122480228,38.7427754690297,0 -82.8731911677823,38.7190064779649,0 -82.880011744564,38.6833013226062,0 -82.8600294858941,38.6523951466567,0 -82.85385666395931,38.6004587371503,0 -82.8269924854152,38.5716621183892,0 -82.8023639107609,38.5572886775579,0 -82.7419448162975,38.5530662073486,0 -82.6955793642933,38.5391428294601,0 -82.6697603574158,38.5021407722218,0 -82.6137433379651,38.4726688337026,0 -82.5866043088359,38.4125194224537,0 -82.5754192239026,38.4039021444586,0 -82.5475481992093,38.4005109785092,0 -82.4949877236084,38.405832597411,0 -82.41489129697651,38.4303925893994,0 -82.39476414185761,38.4284703243087,0 -82.32917938871179,38.4419523430973,0 -82.3142406687043,38.4652295850629,0 -82.2899713540982,38.5800813546872,0 -82.2708972021513,38.5948900812008,0 -82.2136592450116,38.5848354166427,0 -82.1842468602663,38.5950322865397,0 -82.17365706195611,38.6321907721309,0 -82.18897770390291,38.6778937710105,0 -82.1839728099084,38.710302969121,0 -82.2167502305976,38.7789394330115,0 -82.1977219453354,38.8046196832205,0 -82.14609966838241,38.8387877142417,0 -82.13931709213161,38.8993984229593,0 -82.1012069170005,38.9520939616579,0 -82.0850167494239,38.9771981320238,0 -82.0585035436315,38.9890655972236,0 -82.0428855933127,39.0141392723836,0 -81.999678576611,39.0152610363642,0 -81.9751873204589,38.9930065533181,0 -81.9377333601398,38.9911756913507,0 -81.92783006842539,38.9842712717174,0 -81.89860847229041,38.9322247653254,0 -81.9318508422449,38.8947421272096,0 -81.91524871422909,38.884446578043,0 -81.8926954574516,38.8734530024849,0 -81.8668004270512,38.8857095354934,0 -81.8409130504285,38.9378897832025,0 -81.8237768593835,38.948467790736,0 -81.7832252461068,38.9235624308806,0 -81.7622971158526,38.9301808907728,0 -81.7817298618878,38.9685290255312,0 -81.7756796380037,39.0168297231883,0 -81.8134617903382,39.0441080346264,0 -81.824273103509,39.0664159845432,0 -81.8195656534392,39.077016873553,0 -81.78636140597079,39.0772573104027,0 -81.7535616017454,39.0947208175577,0 -81.74470368597029,39.1258749496768,0 -81.758910326595,39.1757512549241,0 -81.7230738622105,39.2132681698618,0 -81.6979035279936,39.220020030992,0 -81.6895262667326,39.2602262835757,0 -81.6675222725862,39.2704953128172,0 -81.5726851110575,39.2659175355733,0 -81.55738794827489,39.3326551943737,0 -81.54064851311919,39.3527089235402,0 -81.4650081513692,39.4068583282204,0 -81.4479558561434,39.4110278039673,0 -81.4339782748136,39.4060229813656,0 -81.3759162878324,39.3456902660112,0 -81.3388361554473,39.3536439576398,0 -81.2840170696265,39.387072038012,0 -81.2376212801085,39.388472233438,0 -81.2249486327778,39.4083582071948,0 -81.20030524610981,39.4158962250483,0 -81.180567643956,39.437800182641,0 -81.11708991317241,39.467783911079,0 -81.09824494329121,39.4964511389157,0 -81.03738319915119,39.5326641774228,0 -81.03256860915231,39.544142538686,0 -80.9836464085096,39.5818052379779,0 -80.9326107962525,39.6069409720762,0 -80.91259057006261,39.6073533140813,0 -80.8811098930273,39.6240811641343,0 -80.87274608454371,39.6624110188142,0 -80.8634141639951,39.6803515272318,0 -80.832787434305,39.7034002259532,0 -80.8322983936779,39.7188343443337,0 -80.8564533163278,39.7363355934909,0 -80.87072776135891,39.7599938351988,0 -80.8191038347973,39.8090013333355,0 -80.8259165835688,39.8396671142989,0 -80.7985253362877,39.8567227242363,0 -80.7908494426605,39.8723475673467,0 -80.8121358445091,39.9049014113291,0 -80.8078400413376,39.9159028725421,0 -80.7960214112815,39.9198397078312,0 -80.7681270403387,39.9133131812296,0 -80.7588871844105,39.9212667893345,0 -80.76306009947351,39.947015501453,0 -80.7388880114803,39.9834759440017,0 -80.73823885471551,40.0356640607266,0 -80.7020651116698,40.1540899859456,0 -80.7008900358822,40.1681812950244,0 -80.67855741943301,40.194151495489,0 -80.6501132136987,40.2456798126148,0 -80.6146878118885,40.2765021361522,0 -80.60451708240841,40.3062448322667,0 -80.6092470800706,40.3732754647517,0 -80.6292446110196,40.3886635709611,0 -80.6278482893771,40.3982268491052,0 -80.6018302001708,40.4805390518844,0 -80.6252533727438,40.5044642482608,0 -80.63343988239519,40.5392040647419,0 -80.6686204246359,40.5682789021601,0 -80.6677276496391,40.5821374643692,0 -80.63733821934061,40.613982302321,0 -80.6115497018059,40.6200630858018,0 -80.5744158355721,40.6159741619192,0 -80.52199952847749,40.6372031779131,0 -80.520306111211,40.8541688223624,0 -80.52092443011161,40.8972705158399,0 -80.5229326934644,41.1296278146841,0 -80.51999623496189,41.4892885705201,0 -80.52392556258459,41.4951021493305,0 -80.5226439573086,41.8507747576586,0 -80.5205925694563,41.9868721098151,0 -80.9997726749621,41.8502571698917,0 -81.3622646287273,41.7242834716563,0 -81.4782631842651,41.6317160085966,0 -81.7385026273233,41.4911547362108,0 -81.9619077841044,41.5019186194452,0 -82.01560565326599,41.5153101427099,0 -82.3413826182513,41.4315011278012,0 -82.5488376780322,41.3913376118913,0 -82.7169465507165,41.4505247784283,0 -82.9089321846262,41.4294685839921,0 -83.07039839197181,41.4561099314841,0 -82.7847067738454,41.5074172813269,0 -82.7958306404585,41.5376483368901,0 -83.0034334958447,41.5381937701371,0 -83.153746401703,41.6260898051711,0 -83.4826910020175,41.7251299269076,0 -83.76395412119879,41.7170422186577,0 -83.868639675225,41.7159933856432,0 -84.35920849224161,41.7080391705922,0 -84.38439324270421,41.7071503370832,0 -84.79037747295131,41.6974947329852,0 -84.79136990395649,41.5304919381552,0 -84.7918972237936,41.4278994604409,0 -84.7909755666301,41.2838180261002,0 -84.79158626712351,41.2531325315222,0 -84.79052709599461,40.9883412320642,0 -84.79102327254211,40.9377084936207,0 -84.7930613218788,40.7288603729197,0 -84.7932521538178,40.5887382366961,0 -84.7945562939653,40.3530507566997,0 -84.79538778828569,40.3195005333353,0 -84.8035641264148,40.013990635484,0 -84.8061497587903,39.9171665438967,0 -84.808696532672,39.7332992702085,0 -84.8110367793544,39.5640506850582,0 -84.8111048340875,39.5131632038426,0 -84.8120249021854,39.3123331649208,0 -84.8120705333745,39.3030292262759,0 -84.81148058301,39.1025855115064,0 -84.7899269988898,39.1070335912354,0 -84.7428755878621,39.1420637748434,0 -84.6674874871449,39.0896244882795,0 -84.6226484760206,39.0749345727981,0 -84.5930686595367,39.070265611257,0 -84.5153007968991,39.0941952341113,0 -84.4920536098813,39.1073635038858,0 -84.444918075979,39.1118269376755,0 -84.425683749535,39.0847240819073,0 -84.4197401104714,39.0473368904498,0 -84.39131227398291,39.0357444360707,0 -84.3457790116403,39.0378123176184,0 -84.3133151278336,39.014074138235,0 -84.29013610301691,38.9445378637403,0 -84.2615250982177,38.9174773125027,0 -84.2352944474892,38.8745556222277,0 -84.2287021102685,38.8126904458503,0 -84.17675226261351,38.7884985944901,0 -84.0888671071979,38.7655047394295,0 -84.05380160129811,38.7637349934305,0 -83.9621627892472,38.7776474056309,0 -83.9125395047095,38.7579603800755,0 -83.8575526890278,38.7449183938572,0 -83.8375322435588,38.7118799039528,0 -83.79046498152741,38.6938445378462,0 -83.77022323291369,38.650819405338,0 -83.712825428618,38.6355534097723,0 -83.6785301000227,38.6209281353376,0 -83.6557556666292,38.6238806809261,0 -83.64318975618861,38.6358624635654,0 -83.63324094665769,38.6649719664098,0 -83.6183785196076,38.6779722718334,0 -83.526555981969,38.696111041032,0 -83.5000734679638,38.690137357128,0 -83.45361629995431,38.6637746596862,0 -83.37142194898451,38.6549977034897,0 -83.33002325645781,38.6319880306114,0 -83.3203257653401,38.6065634765907,0 -83.3065312653877,38.5963174248036,0 -83.2900435785732,38.5966379602472,0 -83.2727548748104,38.6092569222626,0 + + + + + + + + Oklahoma + empty + + +states.AREA: + 70003.325 + + +states.STATE_NAME: +Oklahoma + + +states.STATE_FIPS: +40 + + +states.SUB_REGION: +W S Cen + + +states.STATE_ABBR: +OK + + +states.POP2000: + 3450654 + + +states.POP2001: + 3477711 + + +states.POP00_SQMI: + 49 + + +states.DEN_0_100: + 96 + + +USStates.ID: + 46 + + +USStates.State_Name: +Oklahoma + + +USStates.Date_Entered: +Nov. 16 1907 + + +USStates.Year_Entered: +1907 + + +USStates.Year_Settled: +1889 + +]]> + #Style_5 + + + -97.50945859429611,35.583978004302,0 + + + + + + -94.4393221493475,34.9291508772006,0 -94.4285520120899,35.4005462695086,0 -94.46848521103668,35.6410882624306,0 -94.48593482605899,35.7603104941298,0 -94.5424172738563,36.1068358038929,0 -94.55311361988042,36.1645252110653,0 -94.60745283215459,36.4787903547,0 -94.6172570958511,36.4894141614003,0 -94.6210734035526,36.670542870082,0 -94.6216844155007,36.7636077108139,0 -94.6203796376912,36.9970468237132,0 -95.0327450815612,37.0007794392778,0 -95.07193109811,37.0014780674299,0 -95.40662244594169,37.0006155845495,0 -95.5260187862325,37.0010188368678,0 -95.78574861213642,36.9981139405669,0 -95.9579609448337,37.0000828949687,0 -96.00604971220072,36.9983338098062,0 -96.5191876912757,37.0005778020035,0 -96.74869619591919,37.0001660629802,0 -97.137692826494,36.9998082437565,0 -97.46540491812472,36.9964671394098,0 -97.8042499377042,36.9985676282825,0 -98.1045290729196,36.998671345032,0 -98.34714359763062,36.9990615091091,0 -98.54021961843299,36.9983759139801,0 -98.99951613987589,36.9980727934686,0 -99.43747360824931,36.9945583965996,0 -99.5446396923613,36.9954629108102,0 -99.99926174794319,36.9954175257409,0 -100.088573981101,36.9976524956006,0 -100.634245618228,36.9978323335316,0 -100.950586859868,36.996661689339,0 -101.071604192395,36.9974667126978,0 -101.55367610944,36.9966930458734,0 -102.024519464501,36.9888757490654,0 -102.037207602599,36.9889939197762,0 -102.997709442614,36.9985238353847,0 -102.997400999016,36.4923701848871,0 -102.165673606983,36.4902341370994,0 -102.034658387679,36.4929809605896,0 -101.62075555527,36.4920314454728,0 -101.090102366885,36.4880502722289,0 -100.957341408628,36.4896376715563,0 -100.549839323196,36.4894790903428,0 -100.007272948555,36.493912716666,0 -100.001550693503,36.4925547831533,0 -99.99755361874209,36.0575913818302,0 -99.9981231250644,35.8838375261918,0 -100.000392481852,35.6188562203977,0 -99.99474342059961,35.4246221647218,0 -99.9975702180927,35.1822350834532,0 -99.99645505791619,35.0310510336069,0 -99.9992599692516,34.7472433686446,0 -99.9964752628992,34.5623839445524,0 -99.9724799649576,34.5619266989846,0 -99.9451200138402,34.5796346298626,0 -99.93228692511291,34.5791733267958,0 -99.88097732527548,34.5482418940255,0 -99.86094928508588,34.5186945590413,0 -99.83030837990161,34.501846255188,0 -99.77806025861618,34.4440642714861,0 -99.6852769049209,34.3775206620374,0 -99.601817403152,34.3686339710267,0 -99.58558947886991,34.3849338835776,0 -99.5782194991147,34.4089886853491,0 -99.5542323165501,34.4152563856433,0 -99.5025040549412,34.4041453149585,0 -99.4798058594252,34.3836002544386,0 -99.43874320793192,34.3647833428937,0 -99.4103230107381,34.3691856116386,0 -99.3945224149831,34.3968223241289,0 -99.3931570632619,34.429070725134,0 -99.3645692443735,34.4502723758117,0 -99.32365897051331,34.4127869472387,0 -99.26753552999141,34.3983645544,0 -99.25446563782602,34.3682943923503,0 -99.20584919432768,34.3320754835343,0 -99.19666281278209,34.3052057476053,0 -99.20495561666171,34.2557306955242,0 -99.19084035753009,34.2238215675651,0 -99.17651178434171,34.2128165213261,0 -99.12830013933699,34.2015562705675,0 -99.07878412614019,34.2084460436583,0 -99.03556990100751,34.1990091275048,0 -98.99654461650539,34.2095837062186,0 -98.9528568855168,34.1946535863845,0 -98.8916893852997,34.1609098971274,0 -98.8114099222656,34.146025924858,0 -98.77887692432012,34.1320532580559,0 -98.70563225966779,34.1308063642615,0 -98.68255276049912,34.1500893803379,0 -98.66205950085499,34.147129344828,0 -98.6263299881177,34.158527616426,0 -98.6075838723519,34.1514897431627,0 -98.5766684370536,34.1420220197199,0 -98.5579143286446,34.1054284628805,0 -98.4998521726901,34.066508171909,0 -98.4485195081449,34.0544693031052,0 -98.4216707502906,34.0659246412843,0 -98.4074643999688,34.0825487630451,0 -98.39128184930269,34.087324681805,0 -98.3845831608253,34.115873277508,0 -98.35073026318848,34.1422132177566,0 -98.3208141218597,34.1395124845584,0 -98.277324712945,34.1229647210219,0 -98.1731642842845,34.1154615363479,0 -98.137182702728,34.1385247073243,0 -98.11518632903911,34.1490797537232,0 -98.09444127427528,34.1346491348156,0 -98.11100543330518,34.0699152608686,0 -98.08652197109261,34.0054103575962,0 -98.0558736752466,33.9898964139123,0 -98.0238062114244,33.9870813155941,0 -97.982995159825,34.0013824361846,0 -97.9505389343141,33.9712584919282,0 -97.94806700069491,33.9598489691416,0 -97.9633110473011,33.9487483818417,0 -97.95099692709511,33.9326163854516,0 -97.9764418443808,33.9121508879515,0 -97.97669367876701,33.9026028951239,0 -97.95504853378348,33.8835794315438,0 -97.90937762069478,33.8741230741104,0 -97.8700622202223,33.8552140577552,0 -97.8528573913232,33.857170989043,0 -97.79051555721509,33.8905567127498,0 -97.75667040704261,33.932197269678,0 -97.72932581317978,33.9393918135487,0 -97.7045675638129,33.9716446286772,0 -97.6713709731313,33.9887114388077,0 -97.6004841716436,33.9695357487998,0 -97.5926564722634,33.9179850917189,0 -97.57597058455282,33.9026313915672,0 -97.55488993784371,33.9040048081949,0 -97.51850418970599,33.91687174991,0 -97.47783082980909,33.9078083743386,0 -97.4630599713817,33.9024831837152,0 -97.45736073930121,33.890532021605,0 -97.45303509112971,33.8363150195283,0 -97.41041616291049,33.8208124550832,0 -97.36361607593869,33.8311271478817,0 -97.3421004874611,33.8620178329205,0 -97.31525189418009,33.8704938884378,0 -97.3143820721958,33.8959411317283,0 -97.27257189808169,33.8726758421186,0 -97.26420222924099,33.8588326323233,0 -97.25098012527539,33.8730725605007,0 -97.24635658905748,33.8943389990746,0 -97.21162664947801,33.905790476719,0 -97.1880588051263,33.899305664185,0 -97.1644603868134,33.8632500271984,0 -97.16888553387221,33.8478962336794,0 -97.19530685545391,33.8362616577426,0 -97.2086128811281,33.8197520263932,0 -97.1894548414756,33.7528743688857,0 -97.1527639551762,33.7287737567957,0 -97.1158518152657,33.7260387447849,0 -97.09078850752719,33.7317759436109,0 -97.0837540270329,33.7425178691231,0 -97.087958150994,33.8076751203943,0 -97.0503136942646,33.8235515468502,0 -97.0785356759137,33.8379135029825,0 -97.08246496741261,33.8512035820318,0 -97.0711884256134,33.8568301349417,0 -97.0258837487447,33.8406638868468,0 -97.00613836455501,33.8506162080499,0 -96.9879951562104,33.876524993445,0 -96.9881480778014,33.9443028760324,0 -96.9684711058252,33.9374213261378,0 -96.9364875549014,33.9479496295896,0 -96.92984981386039,33.9618729385895,0 -96.8987359278797,33.9501277640988,0 -96.88313308270391,33.9246919643211,0 -96.8792188051043,33.8841045463944,0 -96.86129653634301,33.8617814536899,0 -96.84428994427481,33.8581346758361,0 -96.81439693387631,33.8718710579623,0 -96.7978710251696,33.8700514781673,0 -96.7491017928465,33.8318404880575,0 -96.7119531575884,33.8339726711759,0 -96.6936574485524,33.8480065285136,0 -96.67797914648511,33.9044245192975,0 -96.66651194068848,33.9136443690811,0 -96.58476047125609,33.8962455118061,0 -96.61443925387489,33.8630013562452,0 -96.6014686489895,33.8430585200471,0 -96.56240472874201,33.8255225751035,0 -96.5108435468467,33.8157874455655,0 -96.50101614488641,33.7881925349614,0 -96.48764129273351,33.7782325064272,0 -96.41973038217169,33.7884284828286,0 -96.3710832530533,33.7404975591171,0 -96.34785055840121,33.705631801563,0 -96.31653860767391,33.701904716619,0 -96.3010507089615,33.7141533419418,0 -96.28994278991731,33.7620342928024,0 -96.27833836590121,33.7734894901909,0 -96.21280716638501,33.7567925567755,0 -96.18728601066199,33.758684486151,0 -96.1690742422207,33.769456890815,0 -96.16157487608,33.7983297326873,0 -96.1416772177066,33.8204201506892,0 -96.15477738441462,33.824044081131,0 -96.1809848937133,33.8085339108482,0 -96.18338837503551,33.8158923202814,0 -96.16946454166531,33.8290832377136,0 -96.1492232448427,33.83569011079,0 -96.10970158601782,33.8293577291253,0 -96.09177990185232,33.8446772338064,0 -96.04822986488121,33.8413774764797,0 -96.0270045674164,33.8561209977346,0 -96.0143238316783,33.8443070387318,0 -96.0020480603943,33.8570784239774,0 -96.0028724620981,33.8734890044101,0 -95.99446458602881,33.8754764816195,0 -95.9776482488988,33.8580513457492,0 -95.959016632946,33.8651391176183,0 -95.94332288009811,33.8900718041244,0 -95.93332795033651,33.8906288422977,0 -95.8468057390447,33.8411382296162,0 -95.82622079304791,33.8431258316945,0 -95.7957252595447,33.8647743475285,0 -95.7687615327479,33.8515033166903,0 -95.7644970987573,33.8791063735621,0 -95.76094194954548,33.8935411571276,0 -95.7471094802783,33.9034976338912,0 -95.699950264818,33.8949267760162,0 -95.63373271524731,33.9202077191712,0 -95.6132241254837,33.9203415546903,0 -95.6150707735962,33.9367942616433,0 -95.60631201461909,33.944656465691,0 -95.5630133970639,33.9361771034426,0 -95.5465557208432,33.9041378125257,0 -95.51981372505441,33.9067474752702,0 -95.52697025126849,33.8979201785035,0 -95.54773054262731,33.8932621235845,0 -95.5442741981764,33.8858464269672,0 -95.5131223838212,33.8978402854978,0 -95.49909123242928,33.881822624598,0 -95.46835947773379,33.8865378582277,0 -95.4518412564926,33.8658586121364,0 -95.33027212314218,33.8710248450986,0 -95.3364600240519,33.8972201452204,0 -95.30218796775361,33.8867301071625,0 -95.2866618452793,33.8870087194903,0 -95.27758309673119,33.9180449387556,0 -95.26384964793752,33.8979074295118,0 -95.2512228467789,33.9051287029656,0 -95.2515208198696,33.9365500995153,0 -95.2342706406141,33.9649694417437,0 -95.14854400728719,33.9436534386509,0 -95.12819579812822,33.9409756193022,0 -95.12690617519908,33.9172521426231,0 -95.11945200414949,33.9123884529818,0 -95.09558666926452,33.9218451265293,0 -95.08249423367511,33.918560731634,0 -95.0899405612146,33.8970230129184,0 -95.0838291836962,33.8885696946472,0 -95.063702501233,33.9177558985992,0 -95.06336665131251,33.8968018383347,0 -95.04308708832051,33.884552938792,0 -95.0375860361542,33.8665590741676,0 -95.0129958687657,33.8700533810898,0 -94.9895041088505,33.8562900729299,0 -94.96892682868412,33.8663228494762,0 -94.9601296578001,33.8481840346416,0 -94.94010923140679,33.8409324203509,0 -94.94062024969412,33.8159156370392,0 -94.9184559016621,33.816304855563,0 -94.90876604933241,33.8035866991384,0 -94.9140991208061,33.7897049819208,0 -94.8818557435802,33.7750719362582,0 -94.8580964984281,33.7494296047539,0 -94.81937555938541,33.7495136716343,0 -94.80343699443648,33.7396910082834,0 -94.7837218171255,33.7533704682922,0 -94.76438804719702,33.7529509233106,0 -94.782241592951,33.742376603757,0 -94.7833707776319,33.7337745678945,0 -94.74998307234321,33.7368149801429,0 -94.762930719398,33.7169062835784,0 -94.74232301585609,33.719157166445,0 -94.7546906224197,33.7078808674656,0 -94.7418652471894,33.7013771094591,0 -94.69119732857141,33.6903997057713,0 -94.66866725489341,33.6966486225785,0 -94.65568935572141,33.6924032061402,0 -94.6445348646206,33.6777628005194,0 -94.6681636112439,33.671571088102,0 -94.6696360986615,33.6661733181553,0 -94.65874868980602,33.663850430669,0 -94.63897287047551,33.6702175285534,0 -94.63194611400361,33.6840114940994,0 -94.60115305801639,33.6657208732496,0 -94.5853141750945,33.6790954380738,0 -94.578714527779,33.6705850642858,0 -94.5609300134862,33.672027401142,0 -94.5654161185401,33.6631276811661,0 -94.58536744514042,33.6622460583057,0 -94.58859470157501,33.6555626943339,0 -94.57666964564912,33.6522708940353,0 -94.54562499154091,33.6617357579767,0 -94.54213813675099,33.6483615972293,0 -94.5624022483444,33.6429443355883,0 -94.56235640260989,33.6356506902792,0 -94.55040081551948,33.632809011294,0 -94.51819645594929,33.6431245606389,0 -94.5252611988716,33.6211366353993,0 -94.51076509594741,33.6309253877013,0 -94.50081601724669,33.6231627285535,0 -94.4766912623089,33.6320818342933,0 -94.46858488730931,33.9393114556774,0 -94.4616914490383,34.1967651932869,0 -94.45262404592168,34.5084326818174,0 -94.44596107534362,34.7356081162875,0 -94.4393221493475,34.9291508772006,0 + + + + + + + + Oregon + empty + + +states.AREA: + 97073.594 + + +states.STATE_NAME: +Oregon + + +states.STATE_FIPS: +41 + + +states.SUB_REGION: +Pacific + + +states.STATE_ABBR: +OR + + +states.POP2000: + 3421399 + + +states.POP2001: + 3470714 + + +states.POP00_SQMI: + 35 + + +states.DEN_0_100: + 97 + + +USStates.ID: + 33 + + +USStates.State_Name: +Oregon + + +USStates.Date_Entered: +Feb. 14 1859 + + +USStates.Year_Entered: +1859 + + +USStates.Year_Settled: +1811 + +]]> + #Style_5 + + + -120.55462738557,43.9315095486322,0 + + + + + + -121.441508911406,41.9943345308753,0 -120.871908519109,41.9876721779537,0 -119.993459369715,41.9892049531992,0 -119.351692186077,41.9888529749781,0 -119.3109421304,41.989135387281,0 -118.185316829038,41.9966370981387,0 -117.018864363596,41.9947941808341,0 -117.026295220045,43.6790312226004,0 -117.023794477971,43.7537015926794,0 -117.037117330473,43.800141963624,0 -117.027626548295,43.8315678483138,0 -117.010505344258,43.8397697264411,0 -117.016220426787,43.8529724419634,0 -116.985769945695,43.8593508862889,0 -116.978148119756,43.8734692305504,0 -116.978141228786,43.9044410423274,0 -116.959715844454,43.9285769433414,0 -116.967956848099,43.9631956105834,0 -116.933593484224,44.0142025695716,0 -116.976817765704,44.0738948202899,0 -116.963443200146,44.090298169114,0 -116.946886686949,44.0930258111951,0 -116.902254132599,44.1463138321419,0 -116.913051097385,44.1773044506484,0 -116.981871729265,44.1978422986385,0 -116.976127235356,44.225182362645,0 -116.99270711064,44.2470633967105,0 -117.030352023293,44.2493365546444,0 -117.052027613364,44.2315559603412,0 -117.081386867577,44.2438466037113,0 -117.100560675447,44.2670779004604,0 -117.112691921322,44.2698052758843,0 -117.143278940324,44.2506322436234,0 -117.170722952687,44.2533327374994,0 -117.213571878683,44.2847196851647,0 -117.217455714498,44.3006651372011,0 -117.201602017039,44.3394380033709,0 -117.236920894466,44.3899826429371,0 -117.217221802736,44.4278552410788,0 -117.224409907123,44.4729870546087,0 -117.203962567437,44.4857855049483,0 -117.187391126196,44.5118056022903,0 -117.1451606624,44.5346556241885,0 -117.143939864097,44.5592869485007,0 -117.130503910469,44.5725238664124,0 -117.079353923671,44.6893364257274,0 -117.066513051783,44.6975569657362,0 -117.039572246368,44.749115712801,0 -116.951494105467,44.7760351265198,0 -116.909620757374,44.8289402518746,0 -116.897366859846,44.8485551014903,0 -116.867076347262,44.8686084474449,0 -116.835396183444,44.9201440913313,0 -116.847556799088,44.9548499437335,0 -116.831396506105,44.9726336704264,0 -116.848158998462,44.9717412377244,0 -116.855887624852,44.9799657227584,0 -116.848097045025,45.0000421568822,0 -116.854513190899,45.0169452945603,0 -116.807307341613,45.0497552840876,0 -116.787210028569,45.075752513234,0 -116.77809192451,45.0994801033861,0 -116.761268252635,45.1063007182859,0 -116.736585294563,45.1373070907968,0 -116.688813374421,45.2623508428019,0 -116.672265496083,45.335410289815,0 -116.565771964133,45.4598636753961,0 -116.554503319145,45.4936471953906,0 -116.478551260109,45.566058496306,0 -116.470418797949,45.6062572703347,0 -116.514915090692,45.6644908956717,0 -116.52827492994,45.7107280103095,0 -116.560631908125,45.7474245686917,0 -116.654397936737,45.7806301604239,0 -116.703180308495,45.8191692439007,0 -116.773707129394,45.8197636132853,0 -116.791262487748,45.84586710608541,0 -116.856471818728,45.9035973451801,0 -116.89819704847,45.98051594169479,0 -116.919132428078,45.995175487463,0 -117.481663000967,45.9998347138602,0 -117.602826163512,46.00026815862021,0 -117.982677428834,45.9998805158959,0 -117.992527778446,46.0016389052483,0 -118.982132819163,45.9990583744824,0 -119.03222168131,45.9662745814382,0 -119.140250599579,45.9257086397924,0 -119.178742642589,45.922351608477,0 -119.302763509833,45.932662726596,0 -119.379441421397,45.9176100650698,0 -119.43886108987,45.9142685232279,0 -119.512220001301,45.8992005968695,0 -119.589294282545,45.9133149491969,0 -119.622116728299,45.8994103389685,0 -119.678445663881,45.8525390300795,0 -119.833555881044,45.8416093443199,0 -119.869735634541,45.8316985251524,0 -119.994320160406,45.8111403450749,0 -120.06864786541,45.780202445303,0 -120.155907860861,45.7612616683351,0 -120.207445390097,45.7197840646162,0 -120.283634874867,45.71658287339311,0 -120.443383762852,45.6892797229393,0 -120.499156501925,45.6956306780396,0 -120.570082462284,45.7409179414327,0 -120.623757205266,45.7436105722949,0 -120.658403368137,45.73261248754,0 -120.696993903513,45.7105098195153,0 -120.861419667766,45.6651862544925,0 -120.907937250867,45.63547710694449,0 -120.948572830946,45.650315967172,0 -120.968478511648,45.6451545411606,0 -121.03348258367,45.652844415437,0 -121.073529928592,45.6466107733405,0 -121.125204665552,45.6070590988379,0 -121.174316011579,45.6005161602332,0 -121.192054666449,45.6132419265196,0 -121.203308118047,45.65728693477031,0 -121.214271714275,45.6656449638228,0 -121.276390902266,45.67833997203109,0 -121.319977744287,45.6966428366174,0 -121.367814251197,45.6996865954037,0 -121.422029028765,45.69060318812019,0 -121.442552169491,45.6949670880414,0 -121.529054611543,45.7195676794317,0 -121.706416861345,45.6887931706508,0 -121.758694096887,45.6897160514309,0 -121.81104103467,45.70068308952361,0 -121.888283498804,45.6768563701943,0 -121.926820689078,45.64202837395181,0 -121.972659451544,45.63577608415601,0 -122.000011553714,45.6178242910982,0 -122.082037518263,45.59050401243609,0 -122.244922293538,45.5481128647605,0 -122.303150328761,45.54309283450319,0 -122.356457483648,45.56617124306739,0 -122.437154197887,45.5647789119432,0 -122.565429806458,45.5948187685695,0 -122.651209200341,45.6068304566963,0 -122.696323093542,45.6310455505125,0 -122.760541289247,45.6493974102277,0 -122.772551033013,45.7276855424654,0 -122.764288518601,45.7605680280893,0 -122.788009565757,45.80034359183911,0 -122.784515918404,45.85044951848901,0 -122.784073650236,45.867886451725,0 -122.80622291556,45.90407242954801,0 -122.807741767287,45.9438901212784,0 -122.875417724143,46.0271833271028,0 -122.899757285914,46.0793296870295,0 -122.974169260528,46.11048344369091,0 -123.050596211575,46.1557362282158,0 -123.118554158558,46.1793104942643,0 -123.176196406189,46.18358645541681,0 -123.212437026773,46.1700060595961,0 -123.2487994158,46.1440203375679,0 -123.304717085176,46.1447375703216,0 -123.363556869282,46.1441540217556,0 -123.517029327465,46.2360915816934,0 -123.670246414445,46.1744984869019,0 -123.717160979572,46.1698937903229,0 -123.761414136743,46.20993937364921,0 -123.820978312563,46.1936496044227,0 -123.777083420864,46.1444302589353,0 -123.79409646853,46.1114485870021,0 -123.977340685096,46.2027060092254,0 -123.921187205303,46.0123233522242,0 -123.99650569635,45.941921948877,0 -123.956273973105,45.8710413769648,0 -123.976629080128,45.77548238687779,0 -123.936075916583,45.7028352141538,0 -123.953415554061,45.56852871598869,0 -123.859507215328,45.4990826750735,0 -123.892107877309,45.47405016149519,0 -123.936674662283,45.5079659141045,0 -123.980559908989,45.4850845032037,0 -123.956606852952,45.2929657161069,0 -124.007572643304,45.0361029238999,0 -124.075568095063,44.8147385261456,0 -124.054404868681,44.6621389771171,0 -124.118319319116,44.269515003332,0 -124.158325577179,43.8571182351837,0 -124.226004804165,43.6050048583583,0 -124.273993988679,43.4591053966655,0 -124.406076259743,43.3001978559795,0 -124.386772400864,43.2615889154952,0 -124.48534658488,42.9554539412089,0 -124.55961690573,42.8324573979919,0 -124.401078665635,42.6226992449568,0 -124.391763163986,42.5530276648599,0 -124.43781879263,42.4296087430031,0 -124.41506199748,42.2458945392605,0 -124.352246780966,42.0986772615023,0 -124.206444444404,41.9976479131656,0 -123.819146438568,41.9929487728793,0 -123.513204633148,41.9978329178357,0 -123.222102653242,42.0021917751363,0 -122.284705082491,42.0007645525751,0 -121.441508911406,41.9943345308753,0 + + + + + + + + Pennsylvania + empty + + +states.AREA: + 45360.118 + + +states.STATE_NAME: +Pennsylvania + + +states.STATE_FIPS: +42 + + +states.SUB_REGION: +Mid Atl + + +states.STATE_ABBR: +PA + + +states.POP2000: + 12281054 + + +states.POP2001: + 12295580 + + +states.POP00_SQMI: + 271 + + +states.DEN_0_100: + 76 + + +USStates.ID: + 2 + + +USStates.State_Name: +Pennsylvania + + +USStates.Date_Entered: +Dec. 12 1787 + + +USStates.Year_Entered: +1787 + + +USStates.Year_Settled: +1682 + +]]> + #Style_5 + + + -77.80284541879691,40.8748890585198,0 + + + + + + -77.4757933985606,39.7196232012639,0 -77.46443302065821,39.7200734721353,0 -77.2210508745187,39.7206793349451,0 -76.99681222135089,39.7208916577077,0 -76.79049160379709,39.7212561436081,0 -76.56983441657761,39.7202653698966,0 -76.23312186464131,39.7218535861041,0 -76.1392231665553,39.7222292808326,0 -75.7910945763195,39.7238660373362,0 -75.77492719598079,39.7245527846646,0 -75.7455920038355,39.7749293983367,0 -75.6947708516454,39.8204574523468,0 -75.6439943147472,39.8383065472094,0 -75.58344324964349,39.8401190417149,0 -75.4699861133481,39.8265474993808,0 -75.42046794786501,39.7989830990632,0 -75.3459322944925,39.8485165819253,0 -75.2537404363575,39.8455377977782,0 -75.24699556467731,39.8504053640948,0 -75.18560547799029,39.8774058180612,0 -75.14290121504629,39.8816020366923,0 -75.13580547674989,39.896887437334,0 -75.1471586589936,39.9347404217525,0 -75.1398645870707,39.9559194804779,0 -75.1109630715591,39.9766903310886,0 -75.0845869855288,39.9757328153928,0 -75.068045752986,39.9853915213067,0 -75.0456754051916,40.0076347106729,0 -74.9834853663626,40.0340738445933,0 -74.9562015034126,40.0580144791932,0 -74.8719241363401,40.0780565429363,0 -74.82902245973639,40.1161609854809,0 -74.74629414856111,40.1243586916003,0 -74.72548046618491,40.1493066691812,0 -74.7388247265733,40.1777256441007,0 -74.8427630831946,40.2484527598366,0 -74.88065957300969,40.2995916131031,0 -74.9211500156386,40.3140337315445,0 -74.93250296210471,40.3337744130392,0 -74.95018846398411,40.3454738484253,0 -74.97284102604201,40.4044479567097,0 -75.00047552385639,40.4086211095812,0 -75.02126612533969,40.4013236035019,0 -75.0574533454579,40.4201714565405,0 -75.07011862395299,40.4562539259114,0 -75.0636796381505,40.5210034591816,0 -75.0797859423332,40.5453559585684,0 -75.1245260580076,40.5647988294484,0 -75.1822820039866,40.5567991566105,0 -75.19757183103521,40.570684304811,0 -75.1935130035322,40.5837685125831,0 -75.20038753873099,40.6147432578734,0 -75.1979386117749,40.6342055156311,0 -75.2089177365681,40.6507380422203,0 -75.1840607041906,40.6697922959704,0 -75.20535502856001,40.6860615374668,0 -75.18775390484051,40.7238570177578,0 -75.1936441590094,40.7480035802995,0 -75.1703132780782,40.7748092438347,0 -75.13031892785111,40.7727077092163,0 -75.1005408698709,40.7916591517333,0 -75.0892112792862,40.8213906687984,0 -75.0995419880564,40.8392851002474,0 -75.0546190233306,40.8556733594649,0 -75.0564884580085,40.8720458535526,0 -75.0736857645488,40.884626384264,0 -75.0797362757265,40.9033486382513,0 -75.1355249350063,40.9629365183948,0 -75.1393018121957,40.9775274861343,0 -75.1166191635571,41.0002479024639,0 -75.0699790173252,41.0107160473555,0 -75.03525634669791,41.0282029114312,0 -75.00115157189779,41.0624855771134,0 -74.9662915599138,41.0826765927628,0 -74.98888296567171,41.0817609886453,0 -74.9845949956578,41.0993808071368,0 -74.9499944822667,41.1118548355739,0 -74.91476830628049,41.1411056945383,0 -74.8628866488672,41.2067713675358,0 -74.8664114931874,41.2268173199683,0 -74.8251959144138,41.2827060427999,0 -74.7941432935133,41.2952145361236,0 -74.7916634911863,41.3119646486324,0 -74.700062439729,41.3505731173044,0 -74.7052732398395,41.3750593363948,0 -74.7404375695009,41.4016358612695,0 -74.7400406430903,41.4220594630718,0 -74.7548266211957,41.4301464096857,0 -74.792799015071,41.4299171588691,0 -74.8640666499364,41.4471548184687,0 -74.8952792585073,41.4446711797979,0 -74.8985597400598,41.4618942446762,0 -74.9325644004893,41.484350685956,0 -74.9717879994631,41.4836026231296,0 -75.0148868316079,41.5395558959306,0 -75.0250873678455,41.565800906359,0 -75.0698653499134,41.6044779552895,0 -75.0724517137798,41.6130800694112,0 -75.0513249551697,41.6373147729593,0 -75.065400870215,41.7148368016377,0 -75.0569699647963,41.7267080970937,0 -75.0613185051632,41.7702603750835,0 -75.0971549734922,41.7790417898653,0 -75.09682675506321,41.7972073179534,0 -75.07984301881911,41.8141483463494,0 -75.11777744299,41.8369868194197,0 -75.1247508265953,41.8491823474776,0 -75.148280568261,41.8557893317759,0 -75.1712837916533,41.8678398536526,0 -75.25451546272871,41.8688733616359,0 -75.2836900262962,41.9476038545852,0 -75.3240658004094,41.9612749921534,0 -75.3456570669365,41.9928449489974,0 -75.38281319593381,41.9983566083877,0 -75.47973225649039,41.9963677005791,0 -76.1048345309617,41.9994987458506,0 -76.1450203202792,42.0006545080767,0 -76.5639147893755,42.0030114109064,0 -76.92839533835389,42.0025345979743,0 -76.96857370314299,42.0029809748211,0 -77.6128475772834,41.9988295851283,0 -77.745007937534,41.9973331826449,0 -78.2042620524614,41.9982004349665,0 -78.3050882311977,41.999420608423,0 -78.9185382675857,41.999846787447,0 -79.0594888967335,42.0011576593905,0 -79.6123674903386,42.0005849142235,0 -79.76165964707261,42.0031057341519,0 -79.7632349654056,42.2673270883975,0 -80.5205925694563,41.9868721098151,0 -80.5226439573086,41.8507747576586,0 -80.52392556258459,41.4951021493305,0 -80.51999623496189,41.4892885705201,0 -80.5229326934644,41.1296278146841,0 -80.52092443011161,40.8972705158399,0 -80.520306111211,40.8541688223624,0 -80.52199952847749,40.6372031779131,0 -80.52435768303791,40.4787848369009,0 -80.5235645344163,40.403033850236,0 -80.52604519018939,40.1625211281631,0 -80.52496218534981,40.0228253262192,0 -80.5246506803543,39.9584195634812,0 -80.5242694740401,39.7212089909504,0 -80.4290823326108,39.7198426041628,0 -79.9182684921867,39.7216669674993,0 -79.7651323185042,39.7218070815944,0 -79.480971113096,39.720274058077,0 -79.39661009295681,39.7193136035322,0 -78.9301730523848,39.7223369261357,0 -78.81775834663399,39.7231158128337,0 -78.384783030143,39.7237485696748,0 -78.3345500729087,39.7240962157241,0 -78.0959483136605,39.7254610687401,0 -77.4757933985606,39.7196232012639,0 + + + + + + + + Rhode Island + empty + + +states.AREA: + 1044.881 + + +states.STATE_NAME: +Rhode Island + + +states.STATE_FIPS: +44 + + +states.SUB_REGION: +N Eng + + +states.STATE_ABBR: +RI + + +states.POP2000: + 1048319 + + +states.POP2001: + 1060126 + + +states.POP00_SQMI: + 1003 + + +states.DEN_0_100: + 11 + + +USStates.ID: + 13 + + +USStates.State_Name: +Rhode Island + + +USStates.Date_Entered: +May 29 1790 + + +USStates.Year_Entered: +1790 + + +USStates.Year_Settled: +1636 + +]]> + #Style_5 + + + -71.5610444257682,41.6817724921721,0 + + + + + + + -71.7901942031214,41.6013068793249,0 -71.80274343080561,41.4158290540058,0 -71.8459956537022,41.4038545416488,0 -71.8368696812943,41.3419614666217,0 -71.8477722040922,41.3253484832964,0 -71.86667844289499,41.3227696452715,0 -71.7222643227053,41.3272643121839,0 -71.4898880400565,41.3920853196251,0 -71.427318519639,41.4866893796323,0 -71.4192468515383,41.652212232924,0 -71.3690125475302,41.703291101903,0 -71.39358059765451,41.7611558353253,0 -71.3673874451962,41.7413502009833,0 -71.28400165201541,41.6795489704362,0 -71.22897615917781,41.7076939683673,0 -71.2666285816007,41.7497430522047,0 -71.31932779027051,41.7721958646078,0 -71.33979862314,41.7844255626959,0 -71.34548316624701,41.8131613833437,0 -71.3345427095385,41.8579036075383,0 -71.34249312021549,41.8757828914979,0 -71.333085950288,41.8960311596525,0 -71.38395315470341,41.8884397544727,0 -71.3824052822434,41.9792630768653,0 -71.3786442228911,42.0137133195162,0 -71.4974303691298,42.0092535031422,0 -71.7978316087619,42.0042748046851,0 -71.78824886219491,41.7216033953237,0 -71.792605218292,41.6417579304637,0 -71.7901942031214,41.6013068793249,0 + + + + + + + + + -71.1988086806704,41.6785003452843,0 -71.19993716526071,41.4633184834306,0 -71.1171327154705,41.4930619563068,0 -71.1412126344661,41.6552730544524,0 -71.1988086806704,41.6785003452843,0 + + + + + + + + + -71.26916945491151,41.6212683171833,0 -71.34952503325521,41.4458577414548,0 -71.2880071528611,41.4836193369166,0 -71.23867323404551,41.4748497781272,0 -71.219446800556,41.635642312712,0 -71.26916945491151,41.6212683171833,0 + + + + + + + + + South Carolina + empty + + +states.AREA: + 30867.398 + + +states.STATE_NAME: +South Carolina + + +states.STATE_FIPS: +45 + + +states.SUB_REGION: +S Atl + + +states.STATE_ABBR: +SC + + +states.POP2000: + 4012012 + + +states.POP2001: + 4077608 + + +states.POP00_SQMI: + 130 + + +states.DEN_0_100: + 88 + + +USStates.ID: + 8 + + +USStates.State_Name: +South Carolina + + +USStates.Date_Entered: +May 23 1788 + + +USStates.Year_Entered: +1788 + + +USStates.Year_Settled: +1670 + +]]> + #Style_5 + + + -80.9010200865815,33.9187422703577,0 + + + + + + + -81.7595935205582,33.1953809754874,0 -81.76340826403511,33.1698348857377,0 -81.740374666284,33.1446970762157,0 -81.7042792512713,33.1229388681766,0 -81.610962223749,33.087875452303,0 -81.59582519226061,33.07079003117,0 -81.56003498198071,33.0608149350319,0 -81.54765985031411,33.0436837254085,0 -81.5296007135576,33.0439278437875,0 -81.50874915476361,33.0127933490709,0 -81.49273484682441,33.0048133137248,0 -81.4978997781492,32.9596759183359,0 -81.509839970123,32.9554188973732,0 -81.5102366685686,32.9472214740899,0 -81.47704813306041,32.8975717263241,0 -81.4650317117614,32.8977282069894,0 -81.4832049987009,32.876092075685,0 -81.4585388413489,32.8714003875851,0 -81.4553190013329,32.8445766582975,0 -81.4323312938326,32.8416816085137,0 -81.4239616394502,32.831771535068,0 -81.4303092863297,32.8203050210012,0 -81.4208333313248,32.8094947304519,0 -81.4302403174263,32.7861535714108,0 -81.41607199831719,32.7567284399427,0 -81.4230377099309,32.7498126483616,0 -81.4076260787666,32.7418061601564,0 -81.4205354721022,32.7015669413645,0 -81.4071915250438,32.6867019963945,0 -81.3994783141749,32.6508153349079,0 -81.41210528286091,32.6256090136088,0 -81.3849063649096,32.5958830263814,0 -81.3662676134818,32.5883649179497,0 -81.36670254638879,32.5819794584472,0 -81.3514893657912,32.5835283490035,0 -81.3404038613665,32.5713602924434,0 -81.298983534041,32.567287009571,0 -81.2743023822226,32.5548140176008,0 -81.26798547886391,32.5339298482675,0 -81.23623978837119,32.520613973536,0 -81.19515724784431,32.4645607584348,0 -81.19992690502011,32.4203165559094,0 -81.17825274918771,32.3868294350367,0 -81.1791229158612,32.3717812943982,0 -81.15747907871371,32.3387404019195,0 -81.1418842567213,32.348467456337,0 -81.131890044888,32.3326183284591,0 -81.1240481751459,32.2766445515914,0 -81.1481731109993,32.2577131389355,0 -81.1476925517913,32.2244467846609,0 -81.1147177986615,32.1905932444351,0 -81.11911230742351,32.1176140300944,0 -81.10487575967311,32.1054460026813,0 -80.8929144216763,32.0681738057597,0 -80.78056151062511,32.2481238083211,0 -80.8218663898145,32.4007102648342,0 -80.86717706748961,32.5326950263867,0 -80.8305175056732,32.5162815805464,0 -80.7847865192432,32.505052086999,0 -80.79938185606611,32.4733077955364,0 -80.7419633539854,32.3602127098571,0 -80.67801448594059,32.2856655575355,0 -80.6260281028646,32.2728215099914,0 -80.4603924051366,32.3186854171277,0 -80.4427976569234,32.3735076541569,0 -80.4860719548133,32.4310310010487,0 -80.643557949165,32.4984607119708,0 -80.646411318821,32.5188798556612,0 -80.5388820475867,32.509865961027,0 -80.55039472026679,32.5578414282125,0 -80.4807072022539,32.5104341662154,0 -80.3998030228987,32.5049598760522,0 -80.4159926698028,32.6691608173312,0 -80.3908685404661,32.6554016082511,0 -80.3471740900825,32.5119554753402,0 -80.2906540711458,32.5040705242083,0 -80.21080292321901,32.5616008756391,0 -79.996617577777,32.6057873204983,0 -79.8963932808549,32.6774213766553,0 -79.89165509300059,32.7340299637097,0 -79.9479839110447,32.8107992428057,0 -79.9621193329391,32.9044100579085,0 -79.9302501550122,32.9142211471988,0 -79.9071411647255,32.8593897322583,0 -79.7998597618185,32.9299559811019,0 -79.90748591880571,32.7907075188098,0 -79.75232055781299,32.7942355699465,0 -79.60681206777061,32.8992437057638,0 -79.58764581861649,32.9251067078811,0 -79.617233758083,32.9809680557659,0 -79.5823576143392,33.0160128900269,0 -79.41061869513879,33.013868133398,0 -79.28787746034691,33.1046981970444,0 -79.2978339955968,33.1389615091697,0 -79.34875511220361,33.1549947700894,0 -79.2295625305206,33.1415057897189,0 -79.20191167318011,33.1836884836365,0 -79.2708459617929,33.2970378799416,0 -79.1581153144963,33.3424334672148,0 -79.1501499541409,33.3172563456719,0 -79.1208659857076,33.4307786153619,0 -79.0006955038877,33.5726293077796,0 -78.8548808347264,33.7163622029531,0 -78.58593108880341,33.8535316857414,0 -78.62259189772951,33.865708046154,0 -78.57945349610721,33.8821646134616,0 -78.6554531485329,33.9488449988485,0 -79.0742575899197,34.3047384944277,0 -79.4469133528043,34.6192221953644,0 -79.4557408419562,34.6342519700477,0 -79.6672823384891,34.8008202005653,0 -79.685738680014,34.8054127206548,0 -79.9197366317695,34.8080740704278,0 -80.3250654065352,34.8149167168925,0 -80.5613348947421,34.815379673307,0 -80.79985577870811,34.8162600736923,0 -80.785444630059,34.940788108541,0 -80.8399590540857,35.0021664433249,0 -80.8945103715547,35.0598808081622,0 -80.9275918870396,35.1013947091143,0 -81.0396852000525,35.0373453689435,0 -81.0653500212191,35.0666253067042,0 -81.02824058884551,35.1055509640026,0 -81.04883974027349,35.1321534001715,0 -81.04909901663881,35.1516727757939,0 -81.3226257414279,35.1638918108331,0 -81.36198018686321,35.1629867122026,0 -81.76518108877021,35.1825960728566,0 -81.87041657119239,35.1832378034331,0 -81.9712727030758,35.1884000260399,0 -82.2100104423684,35.1932410593964,0 -82.27816557714399,35.1951216082193,0 -82.3206088962679,35.1843038355905,0 -82.3507000333949,35.1927881586207,0 -82.3599623343986,35.1830646579415,0 -82.3712159851947,35.1828397610023,0 -82.38945068539501,35.2083565365976,0 -82.43776138231119,35.1696762171977,0 -82.4665859914405,35.1736172290209,0 -82.524479651378,35.1546774490548,0 -82.5698759075391,35.1496073738685,0 -82.65434412549401,35.1195740504075,0 -82.6859002249553,35.1215804311176,0 -82.6878846328013,35.0979182706584,0 -82.6972082635003,35.0913494747721,0 -82.7712011457841,35.0855376628965,0 -82.8875562556649,35.055473206413,0 -83.0071465788827,35.0242932065357,0 -83.1061569738507,35.000366708131,0 -83.1004503495987,34.9841622888642,0 -83.1155422841629,34.9546869901268,0 -83.12140170134001,34.9608933437966,0 -83.1273147785663,34.9543742120639,0 -83.1131011728063,34.9361251832685,0 -83.1256365359246,34.940790436291,0 -83.13756183146759,34.9304757693624,0 -83.1550259840766,34.9322800740411,0 -83.1583528037159,34.9176510672928,0 -83.1821802554349,34.9106474165588,0 -83.203513267742,34.8841701297206,0 -83.21942855420581,34.8891824860544,0 -83.2328036461865,34.8738209511595,0 -83.243073026274,34.8780818464701,0 -83.23568791389251,34.8623846921569,0 -83.25030657832789,34.8501663657462,0 -83.25042127245131,34.8397104674801,0 -83.26777101073991,34.8392299311095,0 -83.2701139291264,34.8150795057964,0 -83.3027537558249,34.8055316318054,0 -83.32269057154549,34.787244331982,0 -83.3234241306547,34.752233551772,0 -83.3503341394554,34.72738151575,0 -83.3506851506329,34.7096474786312,0 -83.3397900149061,34.6776926363039,0 -83.29889480454101,34.6629454181783,0 -83.23698727342099,34.6133215989917,0 -83.1648789222652,34.5989373632901,0 -83.1589505272632,34.5768318282397,0 -83.13736602628759,34.5678676740658,0 -83.1081211059023,34.5350165151609,0 -83.0790212167266,34.5189724434825,0 -83.0549948395099,34.4900615932447,0 -83.0079495911058,34.4708283883787,0 -82.9819628115439,34.4764970914664,0 -82.9050550411483,34.4779853553029,0 -82.8680428963264,34.4575429723072,0 -82.844092601526,34.4126753526629,0 -82.8364394858077,34.3710462423795,0 -82.80858305350149,34.3398998890232,0 -82.78287043804779,34.2905157146731,0 -82.76416996771751,34.2809601537556,0 -82.7580279876581,34.2333729594522,0 -82.74259356012441,34.2055536194311,0 -82.73578078298991,34.1697961502507,0 -82.66035530356881,34.1083560439036,0 -82.6029437979289,34.0346366848087,0 -82.5961385808407,34.0134202383713,0 -82.5736087006275,33.9689044112754,0 -82.576614784124,33.9592878315125,0 -82.51753847434971,33.931029734258,0 -82.4566308989782,33.8782248379062,0 -82.424525414299,33.8602546364245,0 -82.390596547794,33.8541402272832,0 -82.3657086388162,33.8360097346945,0 -82.3513115818956,33.8353919365428,0 -82.3111185523946,33.8039143524229,0 -82.3055105866775,33.7826480434626,0 -82.2662179171499,33.7615957491367,0 -82.2348981721706,33.6903395482787,0 -82.21420671543,33.6807345454544,0 -82.1921876394497,33.6238399454958,0 -82.1671320836866,33.6152152043502,0 -82.1389789104035,33.5939068648655,0 -82.1164029880357,33.5947766297079,0 -82.0656815446151,33.5738649217255,0 -82.0385431417392,33.5475058176817,0 -82.02014061005811,33.5387321304637,0 -81.99653471071351,33.5204905181363,0 -81.9809170141647,33.4907366765445,0 -81.93638328061149,33.4710196640405,0 -81.9166380824955,33.451332910189,0 -81.9272738095671,33.4361432282633,0 -81.91356363208369,33.4154417359506,0 -81.9403358095376,33.408163308089,0 -81.9258093500634,33.3765598081382,0 -81.9450663328463,33.3771470802287,0 -81.9367121514194,33.3504376050416,0 -81.9114125905005,33.3494956248163,0 -81.9120917492517,33.3321965848843,0 -81.893483278419,33.3352369460829,0 -81.87687401673379,33.3068376679828,0 -81.86554408069119,33.3156684726899,0 -81.8401072844714,33.3083447178855,0 -81.86071475702811,33.2970915898305,0 -81.826572899138,33.2694248257545,0 -81.8398406003094,33.2733079499958,0 -81.83679654832591,33.2606131041944,0 -81.85396307448509,33.2435008646337,0 -81.8107647427681,33.2264425091539,0 -81.8015635396811,33.2079267401357,0 -81.7798346609471,33.2173679140961,0 -81.7698781322982,33.2138814847346,0 -81.7595935205582,33.1953809754874,0 + + + + + + + + + -80.76780496320789,32.2586481788875,0 -80.81926682117491,32.1046981906837,0 -80.6666165553831,32.2201132440769,0 -80.7190834927722,32.2722047351394,0 -80.76780496320789,32.2586481788875,0 + + + + + + + + + South Dakota + empty + + +states.AREA: + 77195.055 + + +states.STATE_NAME: +South Dakota + + +states.STATE_FIPS: +46 + + +states.SUB_REGION: +W N Cen + + +states.STATE_ABBR: +SD + + +states.POP2000: + 754844 + + +states.POP2001: + 761023 + + +states.POP00_SQMI: + 10 + + +states.DEN_0_100: + 99 + + +USStates.ID: + 40 + + +USStates.State_Name: +South Dakota + + +USStates.Date_Entered: +Nov. 2 1889 + + +USStates.Year_Entered: +1889 + + +USStates.Year_Settled: +1859 + +]]> + #Style_5 + + + -100.235288914651,44.4333181443813,0 + + + + + + -102.788384569614,42.9953035756879,0 -102.086700926634,42.9898870255377,0 -101.231737199277,42.986842959129,0 -100.198142131775,42.9910950186342,0 -99.5327903284941,42.9923349632849,0 -99.2539717111969,42.9923894733936,0 -98.49765138471959,42.9917787984063,0 -98.45744405402161,42.9371607787996,0 -98.39120469509791,42.9201358627386,0 -98.31033957471961,42.881794760613,0 -98.16782662350252,42.839571032558,0 -98.14486904619621,42.8357947189847,0 -98.12311692331768,42.8202235933653,0 -98.12181986030079,42.8083601338589,0 -98.03314038302951,42.7691923357945,0 -97.9951447789843,42.766812278154,0 -97.96355840050168,42.7736899920002,0 -97.9294772231674,42.7923243687957,0 -97.8899410388902,42.8312716359345,0 -97.88865941868959,42.8558072875283,0 -97.8186429929595,42.8665874779999,0 -97.79702832835281,42.8495971363047,0 -97.77218644667239,42.8461639819758,0 -97.72524981688051,42.8580083761152,0 -97.68575200130461,42.8368370186066,0 -97.63497050078551,42.8612849600302,0 -97.5706541404348,42.8479907365578,0 -97.5061318942665,42.8601364739438,0 -97.4831590291241,42.8571570898554,0 -97.45726378408931,42.8504431026505,0 -97.38930603349222,42.8674331659047,0 -97.31141433937481,42.8617716796293,0 -97.2714575353654,42.8500146366722,0 -97.24318956492361,42.851826425825,0 -97.2244435756681,42.8412025319938,0 -97.21183172641902,42.81257352787,0 -97.1614227617155,42.7986194059191,0 -97.13046924564861,42.7739233575094,0 -97.0151396700717,42.7595420464778,0 -96.97959336609789,42.7583137573091,0 -96.97000293469461,42.752065431992,0 -96.9778689966012,42.727308194642,0 -96.97077348180611,42.7211474962424,0 -96.9082338249473,42.7316989698022,0 -96.81014011449622,42.704084462612,0 -96.8104375000235,42.6813412142201,0 -96.79934397881981,42.6700191686323,0 -96.72265874758661,42.6685919557678,0 -96.69906022203101,42.6577158497403,0 -96.694596777315,42.641163786393,0 -96.7152728921436,42.6219074766425,0 -96.714059707901,42.6123020324651,0 -96.6366723762755,42.5507317592446,0 -96.6292944799537,42.5226936780003,0 -96.60546730406971,42.5072362916062,0 -96.58475304897098,42.5182872197448,0 -96.54721557271041,42.5204993234568,0 -96.49470151052741,42.4884592175071,0 -96.4393947509647,42.4892408377156,0 -96.48024324420059,42.5171303049452,0 -96.48933750112329,42.5640279717967,0 -96.50094203466421,42.5738851852149,0 -96.4884981845359,42.5804806539459,0 -96.5128440201087,42.6297550903686,0 -96.5411650971666,42.6624053661285,0 -96.56303923913002,42.6685130300247,0 -96.6265407804251,42.70835472382,0 -96.640709192144,42.7486038180978,0 -96.63298055975349,42.7768356021372,0 -96.60087506115062,42.7995586266164,0 -96.5876454371957,42.8353813945249,0 -96.57312614067021,42.8343473823113,0 -96.5562111991181,42.8466606609486,0 -96.53751108901589,42.8969064560324,0 -96.54426346173439,42.9138663406581,0 -96.51493505198688,42.9523820814978,0 -96.5171478195164,42.9864580906085,0 -96.4990199957611,43.0120501064927,0 -96.52001038580228,43.051508664474,0 -96.47957324789761,43.0618840567811,0 -96.4620939419638,43.075582202376,0 -96.460804816306,43.0878728592997,0 -96.45150508806921,43.1263087732519,0 -96.4731145701049,43.2090821295544,0 -96.48724516897552,43.2179092697119,0 -96.55860577021591,43.2254892270262,0 -96.5669911071477,43.2396337909954,0 -96.55956777208898,43.2532633182258,0 -96.5707224965755,43.2636122914599,0 -96.5791308298904,43.2900740306766,0 -96.54056327347691,43.307659139748,0 -96.52289387443082,43.3569663195107,0 -96.52505354128429,43.3842252910413,0 -96.55770871701321,43.4007272259127,0 -96.58911295055751,43.4355391262275,0 -96.5837958978062,43.4819205535996,0 -96.59831542821901,43.4998490975791,0 -96.4604547078315,43.4997184756898,0 -96.45660233944199,43.8487418284865,0 -96.4573975061948,44.1990613946085,0 -96.4551061874746,44.5383431654349,0 -96.4567178119828,44.6288086832266,0 -96.45521726388,44.801347584114,0 -96.45607982498672,44.9719948297018,0 -96.45449660823299,45.2751954302209,0 -96.45760224516572,45.29885024157079,0 -96.47759206506849,45.32850936575391,0 -96.53254890239431,45.375132161552,0 -96.605084508902,45.39652440242141,0 -96.6931692082715,45.41063812193121,0 -96.73803233417799,45.45819529036351,0 -96.7692462014101,45.5174788689806,0 -96.8430871871886,45.5840902909474,0 -96.8549898493374,45.6091221067738,0 -96.83279582155808,45.6506868841235,0 -96.6573917688784,45.7389705623089,0 -96.6046107059596,45.80826424845279,0 -96.5879553105857,45.81785439182519,0 -96.56692152993792,45.9341104552974,0 -97.2333099148663,45.9365026737778,0 -97.97872180427929,45.9308221521123,0 -98.0147097100399,45.9314979679384,0 -98.7304369014178,45.938271038568,0 -99.0068328335466,45.939555550557,0 -99.7173457378766,45.9427610350303,0 -99.8757832426344,45.9435473182577,0 -100.514406747246,45.9403879984664,0 -102.002775042851,45.9425053768471,0 -102.94639700191,45.9416652376318,0 -102.994822935958,45.9411156292139,0 -104.048906344358,45.94299366714029,0 -104.049516843796,45.8830527625305,0 -104.043851417835,45.2128754685677,0 -104.043072277779,44.9978055394377,0 -104.059842395291,44.9973362616199,0 -104.059465130268,44.5743526100096,0 -104.061036140765,44.1818252843501,0 -104.059731381692,44.1458254687842,0 -104.059479420181,43.8529065675403,0 -104.057913943497,43.5037122621461,0 -104.059157507468,43.4791339417582,0 -104.056198856311,43.0030623563908,0 -103.501463853421,42.9986188303099,0 -103.005875236663,42.9993539301105,0 -102.788384569614,42.9953035756879,0 + + + + + + + + Tennessee + empty + + +states.AREA: + 42091.813 + + +states.STATE_NAME: +Tennessee + + +states.STATE_FIPS: +47 + + +states.SUB_REGION: +E S Cen + + +states.STATE_ABBR: +TN + + +states.POP2000: + 5689283 + + +states.POP2001: + 5773929 + + +states.POP00_SQMI: + 135 + + +states.DEN_0_100: + 88 + + +USStates.ID: + 16 + + +USStates.State_Name: +Tennessee + + +USStates.Date_Entered: +June 1 1796 + + +USStates.Year_Entered: +1796 + + +USStates.Year_Settled: +1769 + +]]> + #Style_5 + + + -86.33406700652679,35.8467078879312,0 + + + + + + -83.9546078411811,35.4555443092538,0 -83.9099126259032,35.4765642431448,0 -83.88112540362761,35.5106719867731,0 -83.8300980940741,35.519149329024,0 -83.77577472166,35.5526929432439,0 -83.6727662732265,35.5650623686071,0 -83.6137506282731,35.5718308753539,0 -83.56092262748621,35.5552687853695,0 -83.5056836752714,35.5596454175324,0 -83.4581731409302,35.5973733030352,0 -83.38697214372481,35.625313192169,0 -83.34290282423361,35.6533554944088,0 -83.2982915815667,35.6564233114235,0 -83.25899879194441,35.6911067450186,0 -83.25317743900131,35.7008036610277,0 -83.2437245319139,35.7183129960111,0 -83.1852205412256,35.7289833858793,0 -83.14353299786571,35.762781885683,0 -83.1180576454199,35.7639076045034,0 -83.0598287433232,35.7826768094939,0 -82.9868738379453,35.7740910698457,0 -82.9626197710807,35.7919519408503,0 -82.90668913774699,35.8723171942072,0 -82.91393874467821,35.9279697450405,0 -82.8958417812556,35.9484625785516,0 -82.85613712216021,35.9475285534576,0 -82.808535161382,35.9209751642818,0 -82.776308441769,35.9566773412235,0 -82.7734633268223,35.9876068957838,0 -82.7630949285561,35.999650015691,0 -82.6437553482122,36.0518290360149,0 -82.627908811062,36.0544461489244,0 -82.60426425649671,36.0430940692888,0 -82.59209423820271,36.0225560968714,0 -82.6056664709886,36.0036541966122,0 -82.59916490143139,35.9634057475641,0 -82.5540052334424,35.9562159294434,0 -82.50679391974769,35.9726503280575,0 -82.4750552128438,35.9932844245825,0 -82.4082829106663,36.075426604695,0 -82.373713428402,36.0988071608409,0 -82.31178368636429,36.1222605725301,0 -82.2621599370151,36.1204875660764,0 -82.2075845767752,36.1471275332235,0 -82.1539009606375,36.1397376377449,0 -82.1179256052358,36.0963748384003,0 -82.07760212353961,36.1002602555009,0 -82.02029495982831,36.1298343126582,0 -81.93295169915611,36.2634442248774,0 -81.9109940382706,36.2908752993263,0 -81.8304104053052,36.3347789811478,0 -81.7303246226996,36.329467183951,0 -81.70928987932049,36.3338502743492,0 -81.7402131763359,36.36198253433,0 -81.7409080103685,36.3919078496119,0 -81.6981148990988,36.4718999796584,0 -81.7026326964311,36.5194602645637,0 -81.669835031007,36.5897678106349,0 -81.6522721813828,36.6076738087692,0 -81.82889791679381,36.6115963662572,0 -81.9182941426859,36.613608797075,0 -81.9293033061132,36.5959506538262,0 -82.1541813077551,36.5951503366296,0 -82.2166613034295,36.5940723596186,0 -82.2968580172995,36.591800946144,0 -82.610838912091,36.5915455448388,0 -82.8498226210789,36.5910413307673,0 -82.98669718999391,36.5912897002248,0 -83.21092650566941,36.5880896531906,0 -83.2483883995918,36.5899354199083,0 -83.2750314351304,36.6004674572198,0 -83.4642098601591,36.5988401279562,0 -83.6751767779422,36.59870387507,0 -83.695608633552,36.5842494058307,0 -83.93559984653869,36.5912908042263,0 -84.0067465715187,36.5920881162625,0 -84.2544885948187,36.5954525757939,0 -84.2567774582751,36.5954983253834,0 -84.781870784101,36.6050761598833,0 -84.7910568723549,36.6054383594152,0 -84.9984611962111,36.6209826428203,0 -85.27249827730731,36.6256168039722,0 -85.3000946381889,36.6261009236939,0 -85.43737461759029,36.6181989810276,0 -85.78547638470199,36.62668526607,0 -85.9806106782448,36.633112657611,0 -86.19899252719389,36.6432906639691,0 -86.4154436379233,36.6509321366908,0 -86.5106681729942,36.6550742141329,0 -86.7705352136402,36.6521007800576,0 -87.06818400985961,36.6508112445931,0 -87.11270271488,36.6513077660911,0 -87.3466109435594,36.6492773804525,0 -87.6406553976253,36.6452169761114,0 -87.6935284355087,36.6444886692232,0 -87.8535374192374,36.6415224035434,0 -87.8707114200773,36.6694231918372,0 -88.0713410698433,36.6796832563404,0 -88.0410910767903,36.5827211925188,0 -88.0350796382961,36.5381999052039,0 -88.04276340428341,36.4965703400273,0 -88.4960256220043,36.4982076026975,0 -88.51268114387869,36.4995467004194,0 -88.81071857599009,36.4990458143214,0 -88.8263593294413,36.4999080492987,0 -88.83037252103129,36.4998546765866,0 -89.3466676017908,36.5026108089583,0 -89.41478465486919,36.5026793108435,0 -89.4485913110412,36.4564423473599,0 -89.4709078461365,36.4460169670384,0 -89.4920647554293,36.4655248350446,0 -89.4758977248385,36.4986089858186,0 -89.53327228843381,36.4981701441748,0 -89.51609800414001,36.4718722794559,0 -89.54525826945699,36.4410234483941,0 -89.52008048276861,36.4011227040991,0 -89.51940896703729,36.3559958746976,0 -89.54463245289639,36.3457879205654,0 -89.6057685745547,36.3548169544064,0 -89.6228741596169,36.3348474435652,0 -89.6068443100135,36.3081032648945,0 -89.5423129180961,36.2809319420685,0 -89.53545385006311,36.2646054281745,0 -89.5417253888929,36.2573462150993,0 -89.61815895506329,36.2409661142144,0 -89.6706661075896,36.2549618456545,0 -89.6946231434343,36.252203841158,0 -89.695737012858,36.2408629894403,0 -89.67686882352049,36.2209354567989,0 -89.6186393373327,36.1838116382208,0 -89.58953219289479,36.1520892518256,0 -89.5895015750109,36.1298614413181,0 -89.66746841817241,36.0993864640091,0 -89.6782489583147,36.0830408331631,0 -89.68892242543529,36.0258673598517,0 -89.7218363447502,35.9999509241088,0 -89.71321482606381,35.9663974567816,0 -89.66427092678561,35.9378944702657,0 -89.6454792006079,35.9138737361357,0 -89.64941603650951,35.8943619363869,0 -89.6647286073305,35.8857218407663,0 -89.71476351078169,35.9115011809885,0 -89.7380566602412,35.9150869770193,0 -89.7629902111739,35.8968873309185,0 -89.7663548523295,35.8841769773396,0 -89.757794357037,35.8714934051126,0 -89.7015183934478,35.8421131136063,0 -89.70090799570041,35.8275908326828,0 -89.7360192984694,35.807113985821,0 -89.7598771117723,35.817497369678,0 -89.79046432453561,35.8056299093077,0 -89.7999860359764,35.7743003646228,0 -89.8271246329774,35.7583474945228,0 -89.8599549641379,35.7482691273072,0 -89.9098681003284,35.7549139790981,0 -89.9511215579288,35.7343453953471,0 -89.95212103232031,35.7125639320478,0 -89.92982722280721,35.6763442141411,0 -89.89348727560559,35.6560505384628,0 -89.8652652485346,35.6733842535304,0 -89.8573304296374,35.6711412777364,0 -89.84928118822251,35.6453010408611,0 -89.8639224643906,35.6298250835587,0 -89.8775260946092,35.6334146146124,0 -89.9571336550073,35.6031836149856,0 -89.95811786552559,35.5786747060615,0 -89.92174743757781,35.5461398658448,0 -89.9312615752134,35.5293135817598,0 -89.94763474177211,35.5269828473763,0 -89.96235991331029,35.5323728966608,0 -89.9896739843436,35.5617568588755,0 -90.033140016861,35.5524950078149,0 -90.0409909024943,35.5429279718505,0 -90.04190641166632,35.5125217072751,0 -89.9996536673638,35.4455370247156,0 -90.0468735226389,35.4171869306731,0 -90.06038559986169,35.4134944197412,0 -90.07402733802461,35.4265900144844,0 -90.0749351519039,35.472426386111,0 -90.0823206223606,35.4782894580097,0 -90.10205086268928,35.4736509299937,0 -90.1373684773254,35.4426077096675,0 -90.172769972754,35.423801771155,0 -90.16790994055501,35.3843396369312,0 -90.14026019209219,35.3831303299536,0 -90.1325618654474,35.4076849496077,0 -90.11233571142539,35.4177745418272,0 -90.0852505380296,35.4183657399664,0 -90.0755685711721,35.4066128988494,0 -90.08722669387278,35.3815928956868,0 -90.10571329777039,35.3660674829239,0 -90.0987932747814,35.3456783695846,0 -90.10643821193109,35.3147724206286,0 -90.15708359885721,35.3063308609086,0 -90.16984033490409,35.2826536313127,0 -90.15221595869851,35.2641450857902,0 -90.1060339420871,35.2639351079375,0 -90.09019489682149,35.2544862571621,0 -90.06905343928681,35.2128267350657,0 -90.07339477195561,35.1919226486873,0 -90.0625227286411,35.1670054991279,0 -90.0646285866633,35.1474746627476,0 -90.08301595591442,35.1251401960811,0 -90.1438236047204,35.1366264117644,0 -90.16456841965839,35.1297030327121,0 -90.17843898741448,35.1087380390639,0 -90.16917671881551,35.077919742991,0 -90.1958038569539,35.0409907485114,0 -90.2919059359036,35.0485515081083,0 -90.3054483329108,35.0007887668604,0 -89.7172700655279,34.9992611903073,0 -89.64655874084551,35.0007332954087,0 -89.3423729736416,34.9998048697839,0 -89.1981347323638,35.0008837887335,0 -89.0061963915943,35.0002347214314,0 -88.8125482768171,35.0024385995065,0 -88.7850433913526,35.0031823096823,0 -88.3831462732763,35.0050415368605,0 -88.3517277419525,35.0038322749094,0 -88.1939935775637,35.0044536440488,0 -88.19496238143979,35.013543867744,0 -87.9860782705711,35.016033638512,0 -87.6078130632206,35.010546624408,0 -87.2227639290321,35.0073462053491,0 -87.2075884780608,35.0079603909194,0 -86.8334221243196,34.9982460560253,0 -86.7823722148413,34.9970753222994,0 -86.31305264552989,34.9952731531874,0 -86.3035004132153,34.9954638721614,0 -85.86956755804469,34.992384535053,0 -85.6089602162505,34.9901641616199,0 -85.4673839007084,34.9901237462044,0 -85.3599438878245,34.9899781417047,0 -85.2677172911793,34.9891498087636,0 -84.97279353781779,34.9926295267483,0 -84.96785715657791,34.9926829480827,0 -84.8004169251833,34.9928322796908,0 -84.7711343281899,34.9907572255424,0 -84.61868470932861,34.9887597674461,0 -84.3237734916339,34.989090556154,0 -84.2909595168732,35.210622280084,0 -84.22586311709139,35.2616828718238,0 -84.1796426644509,35.2410694819878,0 -84.10156069006141,35.2456337418504,0 -84.0426897213918,35.2726584543483,0 -84.03077168910571,35.2926057594707,0 -84.02911525821651,35.3253739821258,0 -84.00621731838029,35.3729437031099,0 -84.01255674537021,35.4077068120234,0 -83.9546078411811,35.4555443092538,0 + + + + + + + + Texas + empty + + +states.AREA: + 264435.873 + + +states.STATE_NAME: +Texas + + +states.STATE_FIPS: +48 + + +states.SUB_REGION: +W S Cen + + +states.STATE_ABBR: +TX + + +states.POP2000: + 20851820 + + +states.POP2001: + 21355648 + + +states.POP00_SQMI: + 79 + + +states.DEN_0_100: + 93 + + +USStates.ID: + 28 + + +USStates.State_Name: +Texas + + +USStates.Date_Entered: +Dec. 29 1845 + + +USStates.Year_Entered: +1845 + + +USStates.Year_Settled: +1682 + +]]> + #Style_5 + + + -99.35209639268049,31.4911603586956,0 + + + + + + + -105.998886788462,31.3939400532755,0 -105.770249888887,31.1709088557221,0 -105.603733779011,31.0865586055778,0 -105.554896847903,30.9984186198314,0 -105.409575297759,30.9026451075813,0 -105.390821398517,30.8532172879141,0 -105.314288579451,30.8166446407658,0 -105.288103873955,30.8320861368967,0 -105.258691517007,30.7977908877393,0 -105.214844038146,30.8122235644227,0 -105.061059930982,30.6880108106866,0 -104.99803900743,30.6844748196833,0 -104.98742571177,30.6414670328309,0 -104.891169172066,30.57070041737,0 -104.8534855959,30.3924114324589,0 -104.806959955043,30.3765961237763,0 -104.814444569323,30.3506186956335,0 -104.703097368089,30.2386416361776,0 -104.675240765519,30.1491204273314,0 -104.696977256685,30.0574625424375,0 -104.674852032393,29.9094488587845,0 -104.578041188337,29.8081070626151,0 -104.535729710531,29.6796427818002,0 -104.378073901927,29.550794562609,0 -104.205212134968,29.484228655677,0 -104.164858917236,29.4009054696296,0 -104.046105172216,29.3283134853617,0 -103.787463066664,29.2674577249596,0 -103.768229005879,29.2814382191825,0 -103.782625402505,29.2299947219666,0 -103.740319535336,29.2305480722655,0 -103.720779184638,29.1908323650897,0 -103.526696559056,29.1468485175655,0 -103.474531520355,29.0723381982261,0 -103.375903493966,29.0323145912752,0 -103.335970609727,29.0505449586515,0 -103.280800498472,28.986582581697,0 -103.267037226116,29.0076621436612,0 -103.153911459774,28.9788916377662,0 -102.988539685125,29.1910675704443,0 -102.866609489705,29.2292413619301,0 -102.908763863716,29.2694066686299,0 -102.883448659687,29.3535723996355,0 -102.822639900114,29.4120451183749,0 -102.805160372829,29.5303438337622,0 -102.676790491312,29.7444187937638,0 -102.638039455764,29.7325326198343,0 -102.576926007302,29.7784417359023,0 -102.552373669738,29.7496948486705,0 -102.503521154951,29.7856497327394,0 -102.385215376362,29.7681417980141,0 -102.36798040149,29.84548330596,0 -102.32475091159,29.8803092257321,0 -102.06440276136,29.7847688600544,0 -101.973724344483,29.8189713656394,0 -101.924627338118,29.7887011469021,0 -101.819498685539,29.8143248505936,0 -101.805604731495,29.7801996565594,0 -101.759491213846,29.7873677525572,0 -101.640064539983,29.7571633637573,0 -101.581881251252,29.7653539748678,0 -101.54434416232,29.8103225598584,0 -101.538735789529,29.7632221477057,0 -101.470855805519,29.7888951834932,0 -101.44881372174,29.7607917300542,0 -101.401663348137,29.7701115332373,0 -101.416487229422,29.7456408609946,0 -101.368786706054,29.6573728602722,0 -101.306247295965,29.6526439704618,0 -101.309313731437,29.5811248028441,0 -101.254968894261,29.6289641670434,0 -101.261811592181,29.5266920080284,0 -101.067737701075,29.4737763187657,0 -101.009431431376,29.3734824994166,0 -100.797357397044,29.242736284625,0 -100.768974533432,29.166807434011,0 -100.669132304446,29.0803127270354,0 -100.647584957274,28.9225956252143,0 -100.590148889683,28.8944694499509,0 -100.498264037925,28.6612437055942,0 -100.403526636741,28.58999176333471,0 -100.419884477811,28.5444513151021,0 -100.346151756506,28.5010724482254,0 -100.377120196208,28.4789132908516,0 -100.351918855023,28.3944470556125,0 -100.293238864271,28.3206276118098,0 -100.298266448713,28.2806220934998,0 -100.223808569714,28.2417272280185,0 -100.214416160267,28.2022063344331,0 -100.097262502277,28.1545554784828,0 -99.9936434835125,28.0037396210839,0 -99.9421891234519,27.9871619266799,0 -99.87506302163409,27.7979720547546,0 -99.81605543330491,27.780394853251,0 -99.71481792474481,27.6618491136167,0 -99.5495069890073,27.6129196537058,0 -99.52706143498681,27.5045797789624,0 -99.49081318260561,27.4910514590438,0 -99.5439078647283,27.3189538622377,0 -99.4655901429547,27.2701865593849,0 -99.4374750068324,27.1995024660583,0 -99.45538138266301,27.02895816072,0 -99.39303262279272,26.9958615454895,0 -99.3908350467963,26.946943736737,0 -99.28583699475381,26.8576787339843,0 -99.166128451557,26.5802207110304,0 -99.1689892572283,26.546061522653,0 -99.1017807615211,26.4886767225061,0 -99.10703648935828,26.4198691472919,0 -98.93957665579281,26.395650906325,0 -98.9092032001293,26.3606715040819,0 -98.82013643841999,26.3754137550411,0 -98.6782190476933,26.2424046870249,0 -98.60026833967811,26.26080290009291,0 -98.4888153488358,26.20189486402211,0 -98.45368891498261,26.2212616175586,0 -98.3848156511224,26.1563832689147,0 -98.34748407648098,26.1590326088229,0 -98.3282265328466,26.1120007731281,0 -98.2925660443962,26.1331622891806,0 -98.27164562872692,26.1212494310257,0 -98.2922376888539,26.0984591491757,0 -98.2009795725821,26.0557321449947,0 -98.0834982466193,26.0661133226933,0 -98.076631552846,26.0349824709946,0 -98.0403525736578,26.05975051536,0 -97.86770787691731,26.060496076676,0 -97.64824031176831,26.0238010583669,0 -97.613189147238,25.9623589352769,0 -97.5752010185558,25.9545294009988,0 -97.59035311096469,25.93358905995,0 -97.43460696534029,25.8455574212196,0 -97.38589888751351,25.8457216612063,0 -97.381246025134,25.9173794523292,0 -97.3046898126925,25.9390222061254,0 -97.30739881105831,25.9654823876793,0 -97.1724747739236,25.9549273692482,0 -97.21334788232899,26.0094252639667,0 -97.27657531882151,26.0026333041195,0 -97.253373235331,26.0686720122691,0 -97.3536197117772,26.1828026418389,0 -97.36895489793881,26.3594093860221,0 -97.421446845874,26.3854076588257,0 -97.47496824481961,26.4771508314201,0 -97.4261157816407,26.5185697635011,0 -97.45195800721,26.6013268690884,0 -97.4958376530227,26.7941173175194,0 -97.5583173258959,26.8463868636367,0 -97.5688317865217,26.9781886133612,0 -97.47926025139741,26.9968380423725,0 -97.50376733150851,27.0818686103316,0 -97.4274812696915,27.2654551025798,0 -97.5484245684469,27.2305300181157,0 -97.785017752344,27.2880402911338,0 -97.680279172266,27.2946930806235,0 -97.7503494379711,27.41998295344001,0 -97.60038270114281,27.3004551454618,0 -97.52865055517302,27.3444204003037,0 -97.50780849161589,27.4395317363744,0 -97.50070316236901,27.31998796117,0 -97.4125283681046,27.3213449992806,0 -97.3317271301908,27.5626365036553,0 -97.2500614178358,27.6891429260905,0 -97.3094801183865,27.7081729278505,0 -97.34777231556089,27.631751940673,0 -97.3994852497549,27.6334982918403,0 -97.3536318222789,27.6411127473255,0 -97.32028341001322,27.6909444328169,0 -97.34977916611901,27.7156375087417,0 -97.31806332761479,27.7125347515202,0 -97.3968304284502,27.771146058486,0 -97.3888121386094,27.8317301437746,0 -97.48008361430421,27.8205851258607,0 -97.4998059418148,27.843544507544,0 -97.52196970271932,27.8639272343414,0 -97.49695266683359,27.875769577501,0 -97.4796260008364,27.8532640938896,0 -97.34588886647171,27.8734803945651,0 -97.36131551744769,27.8402577581927,0 -97.2837543356676,27.871447851614,0 -97.21360863775901,27.831414891185,0 -97.247292773262,27.8226243834861,0 -97.19573263835041,27.8125254347352,0 -97.11489131329812,27.9156868650475,0 -97.0240708445034,28.0205324937316,0 -97.0266730261927,28.1080412994183,0 -97.1233456677049,28.0545599929136,0 -97.2364829550522,28.0408144571822,0 -97.2705637411735,28.026227534241,0 -97.2415031844307,28.0489470441677,0 -97.26055404702331,28.0650176013673,0 -97.15732764553079,28.1166719542078,0 -97.1682608968738,28.1597494288829,0 -97.1356831071198,28.16209906940311,0 -97.13210471600911,28.1307169703604,0 -97.02383542777901,28.200083644241,0 -97.0338830492678,28.1376877357,0 -96.97537228865649,28.1153365454804,0 -96.94133722044512,28.1870591366451,0 -96.97557119097891,28.2110370456823,0 -96.9129859808147,28.2570826042713,0 -96.9511713661577,28.1146461634749,0 -96.80395175524539,28.2117340429668,0 -96.77819434955541,28.2296358081918,0 -96.79359828581748,28.2716569135883,0 -96.7865329456052,28.3131424085737,0 -96.78849341263761,28.3527529951086,0 -96.85375652074021,28.4052778154343,0 -96.7756219578977,28.3919115743004,0 -96.75936312199468,28.4111923622987,0 -96.7885994327517,28.4465344336046,0 -96.8241380852668,28.4499199129354,0 -96.78735554254018,28.4777853740781,0 -96.7410292653767,28.4037386946306,0 -96.70407154978371,28.3961667887133,0 -96.7026224627333,28.340479673374,0 -96.66156794524581,28.3065470479745,0 -96.39097558609291,28.4343391365105,0 -96.4767541355929,28.4997330365345,0 -96.51875543375361,28.461106535662,0 -96.56344956637381,28.4699067019672,0 -96.48683274231161,28.5065001250736,0 -96.5669583702508,28.5743745840578,0 -96.61059981859901,28.559217321823,0 -96.60696006493581,28.623908697185,0 -96.66026772909071,28.679347884998,0 -96.64677072215611,28.7144133763303,0 -96.59175364451042,28.7176308540699,0 -96.5767387632856,28.6909612420408,0 -96.5724654190595,28.8084420119664,0 -96.57081055481881,28.6921132334215,0 -96.57065069493361,28.6365406498669,0 -96.511986586175,28.6498153227204,0 -96.51214706660439,28.6084558879438,0 -96.48352091748379,28.5983299965887,0 -96.45463494593901,28.6562061770284,0 -96.4374077744685,28.5972653712369,0 -96.49145593618438,28.5572205009388,0 -96.3756462595652,28.6103621446828,0 -96.4190354461777,28.6389373387445,0 -96.40364595833511,28.7197637757365,0 -96.4325088576923,28.6975195233914,0 -96.44992679444501,28.7553045499191,0 -96.42733588908899,28.7122837074932,0 -96.3929797404207,28.7262979792536,0 -96.39202648343499,28.6705234915587,0 -96.3644078276204,28.6182543536492,0 -96.32640475868951,28.6343609440377,0 -96.2706241672889,28.7092493537704,0 -96.286219499452,28.6619950140313,0 -96.21241845685462,28.686989060082,0 -96.15130480526069,28.762937961925,0 -96.2407017376168,28.6351307032347,0 -96.1577155429507,28.6115026697808,0 -96.2392754088593,28.597389673791,0 -96.2378336984528,28.5715957691863,0 -95.9839904637619,28.6534017453567,0 -95.9918879041054,28.5966948669979,0 -96.20682817950151,28.4886634867042,0 -95.702384532802,28.7192477688994,0 -95.956387443742,28.6229421712341,0 -95.93754933918578,28.6907206174074,0 -95.78659263162341,28.7391325634167,0 -95.6715524880469,28.7529411275506,0 -95.68326432879918,28.7272140994852,0 -95.526807295461,28.8034966858832,0 -95.2486180989702,28.9786376443803,0 -95.1975516120674,29.1054653592137,0 -95.1649880473308,29.1177902182052,0 -95.1607301284392,29.200271435455,0 -95.0665723369123,29.1961168125456,0 -94.9513347743744,29.3261575810117,0 -94.89898762873821,29.3090112320655,0 -94.89167182115079,29.3940648612642,0 -94.8155505841499,29.3711662202519,0 -94.8913361818901,29.399557852187,0 -94.917193668702,29.448054371758,0 -94.9136455345915,29.4203453053088,0 -94.95270941314649,29.4244668140235,0 -94.94395872879551,29.4649127898122,0 -94.98301490427208,29.4607585716531,0 -94.9113576255404,29.500563943061,0 -95.014327744272,29.5594945471536,0 -94.9895394805847,29.6799286340995,0 -95.0406046189096,29.7118061561835,0 -95.0884725306271,29.8042054500491,0 -94.93279015255001,29.6824361137282,0 -94.88736314892159,29.6687658980771,0 -94.82961479354709,29.7600810982356,0 -94.7359230458939,29.7932076306622,0 -94.700475733541,29.7547908848552,0 -94.7066170212868,29.6587417934681,0 -94.78828370369661,29.5387865888792,0 -94.56463023087891,29.579227539862,0 -94.53389063357039,29.5542136466136,0 -94.51100191502849,29.54537730386861,0 -94.4699853511928,29.5570096005195,0 -94.5014725492762,29.5177541844844,0 -94.57288529817171,29.5332829576669,0 -94.6821097599082,29.4753428732052,0 -94.7854441234656,29.3834950378891,0 -94.76674368431119,29.3642276698397,0 -94.6827121202049,29.4331383341323,0 -94.3771944609298,29.5521986283419,0 -94.35718211256631,29.5601289522835,0 -94.0655815212201,29.6742968900915,0 -93.8351251032903,29.6747919644726,0 -93.9519366253128,29.8185790610628,0 -93.8565002359247,29.9648149949583,0 -93.85744694552959,29.9908668928178,0 -93.76036751582601,30.0061764030649,0 -93.71264390010309,30.0607310199356,0 -93.71602374974782,30.0958787991307,0 -93.70854664486501,30.1149499108334,0 -93.6970869015193,30.1181389021031,0 -93.69880351731489,30.1414346905316,0 -93.68612303875779,30.1414613621588,0 -93.6833076816481,30.1484401694217,0 -93.6998258674993,30.1510169781729,0 -93.6963314287414,30.1758843689492,0 -93.7045256592734,30.1810684459083,0 -93.71500869987879,30.2205134179473,0 -93.70752396935821,30.2395787754494,0 -93.6993768807844,30.2975935292891,0 -93.72994140928799,30.3051219729382,0 -93.7593470787815,30.3410771727413,0 -93.75950766664521,30.3543502302936,0 -93.74800248894391,30.3676155313151,0 -93.7551137307405,30.3819930042287,0 -93.7427315855636,30.4090272375555,0 -93.7217050902489,30.4331831686188,0 -93.6967413311132,30.4428357517593,0 -93.70359329230058,30.4627158297037,0 -93.6981459876763,30.4702496513421,0 -93.7150231758618,30.4888310205347,0 -93.70744722226021,30.4964430039086,0 -93.71480998363299,30.5053160515853,0 -93.70563196785041,30.5230599502648,0 -93.73547935399731,30.5457197108965,0 -93.71805386498711,30.5683558276656,0 -93.7179855982276,30.5875818830799,0 -93.6935940747548,30.5990370562763,0 -93.6717582009901,30.598033475394,0 -93.69286961844639,30.6159971853325,0 -93.6847595364861,30.62362646596801,0 -93.6930532338358,30.6402433971316,0 -93.6781450325558,30.6398941531481,0 -93.6601628136184,30.6730608176726,0 -93.61778080972511,30.6870030300823,0 -93.61258556438951,30.7105301555471,0 -93.6179648833938,30.7327489593371,0 -93.6078251665993,30.7322109750573,0 -93.61862893538731,30.7459898029865,0 -93.5853487574266,30.772384673359,0 -93.5820450640059,30.8022395755774,0 -93.5508552163389,30.8285427515982,0 -93.55581440053979,30.8425404652408,0 -93.5666178980145,30.8453462320886,0 -93.55297612475269,30.8604804672822,0 -93.56101768200369,30.8720769365654,0 -93.56867012587068,30.886431356764,0 -93.56464927132871,30.9021283630613,0 -93.5466891601929,30.9055307409998,0 -93.5497943369345,30.9250805769799,0 -93.5301557030665,30.9271668885028,0 -93.5257915242765,30.9360147750055,0 -93.53236051643211,30.9609260649172,0 -93.53751052673201,30.95707912219491,0 -93.5488480918319,30.9703845889675,0 -93.57262960901809,30.9763719448991,0 -93.5611240812853,30.99188382509841,0 -93.571019691156,30.9974647272144,0 -93.5680671206996,31.0131177730676,0 -93.5651144950651,31.0182559489662,0 -93.54729164502071,31.0143343101026,0 -93.5073888583872,31.0390998146532,0 -93.52591374615082,31.0571716007113,0 -93.51717031814428,31.0748615453994,0 -93.5442784766347,31.0825635248279,0 -93.54329435054569,31.0949417830783,0 -93.560155897223,31.1007267939647,0 -93.5568523341309,31.1095326773987,0 -93.53526050690408,31.1162612988914,0 -93.52826420267931,31.1261142412602,0 -93.53767923010742,31.1326296405497,0 -93.5443630058743,31.1593545819132,0 -93.52850100567309,31.16313081887,0 -93.53719127433351,31.17652768282541,0 -93.5271048967346,31.1782631971006,0 -93.52909629329709,31.1859610191746,0 -93.55076452872321,31.19111664787181,0 -93.5771171728735,31.1723283005144,0 -93.59411608931301,31.1803867599593,0 -93.6030963428191,31.1992536873053,0 -93.590721311811,31.229873054352,0 -93.61117651049739,31.2423735819701,0 -93.61205418900251,31.2702180322556,0 -93.6166320369568,31.2759895241098,0 -93.6310062786126,31.274088104753,0 -93.6457698113848,31.290447047048,0 -93.65630632190602,31.2868557345123,0 -93.68176670818659,31.3128637606543,0 -93.6772195877398,31.3285702210106,0 -93.6350357193475,31.3740089507347,0 -93.6612511619287,31.3725768736666,0 -93.6641964541721,31.3985102835404,0 -93.687672937394,31.4063113595588,0 -93.6946236330265,31.41610345391331,0 -93.6963098944214,31.4279172119793,0 -93.6871849424459,31.4383118184741,0 -93.70210859382031,31.4464313212695,0 -93.6985991018577,31.4616380816002,0 -93.72696607966452,31.4596548516254,0 -93.7514269339373,31.4856800971189,0 -93.75061823711359,31.4907363154173,0 -93.71917654856812,31.4955823387378,0 -93.70597743151249,31.5207469124279,0 -93.7318419000288,31.5220556426776,0 -93.74772687918352,31.5378958623322,0 -93.7634896740234,31.5309019449363,0 -93.78031303899668,31.5339136421144,0 -93.81070199496421,31.5592406874184,0 -93.81650822499059,31.5772874839387,0 -93.83280517658469,31.5903601395257,0 -93.8357655763902,31.6153647157252,0 -93.81977388303059,31.6182675045639,0 -93.814913937485,31.6481413307007,0 -93.8066129278975,31.6539413361717,0 -93.81203005382371,31.6747403534088,0 -93.7924526022363,31.7115680299756,0 -93.8089554592767,31.7077383245665,0 -93.8151354745431,31.7125237592659,0 -93.8101762985126,31.7305247069651,0 -93.83134856148179,31.7534524078687,0 -93.82225394974822,31.7748083120293,0 -93.8345145984519,31.8021876362787,0 -93.8650100628645,31.8174424499476,0 -93.87759108418349,31.8502823749578,0 -93.88145152988172,31.8715888085537,0 -93.8927128271358,31.8702347315503,0 -93.8994496012559,31.8946233843507,0 -93.9236506911527,31.8927620881712,0 -93.9181114839259,31.9098704820605,0 -93.9359189554272,31.9096246079882,0 -93.97017571506122,31.923332670499,0 -93.977400745224,31.9463271084149,0 -94.00458470012971,31.9781086259495,0 -94.01007792557169,31.9893006514689,0 -94.0352556158215,31.9946792606335,0 -94.034954991874,32.1996091989861,0 -94.0354184994672,32.3893811626287,0 -94.04038263770489,32.6949577639329,0 -94.0417854266628,32.88248532849,0 -94.03893174127671,33.0234224077489,0 -94.0366915600887,33.2704528989066,0 -94.03611649002102,33.5560347014808,0 -94.06162268858441,33.5773354007315,0 -94.0868464522719,33.5840756635432,0 -94.0988935992895,33.5731199456262,0 -94.15536074810458,33.5672068241928,0 -94.15970992753351,33.5938939861439,0 -94.2055412868951,33.5852000838157,0 -94.21108015408862,33.5581084763103,0 -94.2355638087854,33.5616558979989,0 -94.22323450525521,33.5858408096426,0 -94.23743339566499,33.5925430254688,0 -94.2747420062796,33.5618574981634,0 -94.2722778801038,33.5847263352945,0 -94.2791827367037,33.5894525566594,0 -94.29901964868971,33.5799728047754,0 -94.3025824334982,33.5570543333588,0 -94.3289505742182,33.5732546607845,0 -94.37095896843239,33.5478024921997,0 -94.39546544841208,33.5604209193152,0 -94.3725080674424,33.572780843886,0 -94.3708297502542,33.5901604561683,0 -94.3793139265706,33.5934447272787,0 -94.39361925175989,33.5750768821217,0 -94.4067726989127,33.573604181729,0 -94.4286699913841,33.5972585244972,0 -94.4435324861232,33.5966212153736,0 -94.45175731380159,33.6044640316868,0 -94.43653636903311,33.6169611431123,0 -94.43611697644781,33.6365609097961,0 -94.4766912623089,33.6320818342933,0 -94.50081601724669,33.6231627285535,0 -94.51076509594741,33.6309253877013,0 -94.5252611988716,33.6211366353993,0 -94.51819645594929,33.6431245606389,0 -94.55040081551948,33.632809011294,0 -94.56235640260989,33.6356506902792,0 -94.5624022483444,33.6429443355883,0 -94.54213813675099,33.6483615972293,0 -94.54562499154091,33.6617357579767,0 -94.57666964564912,33.6522708940353,0 -94.58859470157501,33.6555626943339,0 -94.58536744514042,33.6622460583057,0 -94.5654161185401,33.6631276811661,0 -94.5609300134862,33.672027401142,0 -94.578714527779,33.6705850642858,0 -94.5853141750945,33.6790954380738,0 -94.60115305801639,33.6657208732496,0 -94.63194611400361,33.6840114940994,0 -94.63897287047551,33.6702175285534,0 -94.65874868980602,33.663850430669,0 -94.6696360986615,33.6661733181553,0 -94.6681636112439,33.671571088102,0 -94.6445348646206,33.6777628005194,0 -94.65568935572141,33.6924032061402,0 -94.66866725489341,33.6966486225785,0 -94.69119732857141,33.6903997057713,0 -94.7418652471894,33.7013771094591,0 -94.7546906224197,33.7078808674656,0 -94.74232301585609,33.719157166445,0 -94.762930719398,33.7169062835784,0 -94.74998307234321,33.7368149801429,0 -94.7833707776319,33.7337745678945,0 -94.782241592951,33.742376603757,0 -94.76438804719702,33.7529509233106,0 -94.7837218171255,33.7533704682922,0 -94.80343699443648,33.7396910082834,0 -94.81937555938541,33.7495136716343,0 -94.8580964984281,33.7494296047539,0 -94.8818557435802,33.7750719362582,0 -94.9140991208061,33.7897049819208,0 -94.90876604933241,33.8035866991384,0 -94.9184559016621,33.816304855563,0 -94.94062024969412,33.8159156370392,0 -94.94010923140679,33.8409324203509,0 -94.9601296578001,33.8481840346416,0 -94.96892682868412,33.8663228494762,0 -94.9895041088505,33.8562900729299,0 -95.0129958687657,33.8700533810898,0 -95.0375860361542,33.8665590741676,0 -95.04308708832051,33.884552938792,0 -95.06336665131251,33.8968018383347,0 -95.063702501233,33.9177558985992,0 -95.0838291836962,33.8885696946472,0 -95.0899405612146,33.8970230129184,0 -95.08249423367511,33.918560731634,0 -95.09558666926452,33.9218451265293,0 -95.11945200414949,33.9123884529818,0 -95.12690617519908,33.9172521426231,0 -95.12819579812822,33.9409756193022,0 -95.14854400728719,33.9436534386509,0 -95.2342706406141,33.9649694417437,0 -95.2515208198696,33.9365500995153,0 -95.2512228467789,33.9051287029656,0 -95.26384964793752,33.8979074295118,0 -95.27758309673119,33.9180449387556,0 -95.2866618452793,33.8870087194903,0 -95.30218796775361,33.8867301071625,0 -95.3364600240519,33.8972201452204,0 -95.33027212314218,33.8710248450986,0 -95.4518412564926,33.8658586121364,0 -95.46835947773379,33.8865378582277,0 -95.49909123242928,33.881822624598,0 -95.5131223838212,33.8978402854978,0 -95.5442741981764,33.8858464269672,0 -95.54773054262731,33.8932621235845,0 -95.52697025126849,33.8979201785035,0 -95.51981372505441,33.9067474752702,0 -95.5465557208432,33.9041378125257,0 -95.5630133970639,33.9361771034426,0 -95.60631201461909,33.944656465691,0 -95.6150707735962,33.9367942616433,0 -95.6132241254837,33.9203415546903,0 -95.63373271524731,33.9202077191712,0 -95.699950264818,33.8949267760162,0 -95.7471094802783,33.9034976338912,0 -95.76094194954548,33.8935411571276,0 -95.7644970987573,33.8791063735621,0 -95.7687615327479,33.8515033166903,0 -95.7957252595447,33.8647743475285,0 -95.82622079304791,33.8431258316945,0 -95.8468057390447,33.8411382296162,0 -95.93332795033651,33.8906288422977,0 -95.94332288009811,33.8900718041244,0 -95.959016632946,33.8651391176183,0 -95.9776482488988,33.8580513457492,0 -95.99446458602881,33.8754764816195,0 -96.0028724620981,33.8734890044101,0 -96.0020480603943,33.8570784239774,0 -96.0143238316783,33.8443070387318,0 -96.0270045674164,33.8561209977346,0 -96.04822986488121,33.8413774764797,0 -96.09177990185232,33.8446772338064,0 -96.10970158601782,33.8293577291253,0 -96.1492232448427,33.83569011079,0 -96.16946454166531,33.8290832377136,0 -96.18338837503551,33.8158923202814,0 -96.1809848937133,33.8085339108482,0 -96.15477738441462,33.824044081131,0 -96.1416772177066,33.8204201506892,0 -96.16157487608,33.7983297326873,0 -96.1690742422207,33.769456890815,0 -96.18728601066199,33.758684486151,0 -96.21280716638501,33.7567925567755,0 -96.27833836590121,33.7734894901909,0 -96.28994278991731,33.7620342928024,0 -96.3010507089615,33.7141533419418,0 -96.31653860767391,33.701904716619,0 -96.34785055840121,33.705631801563,0 -96.3710832530533,33.7404975591171,0 -96.41973038217169,33.7884284828286,0 -96.48764129273351,33.7782325064272,0 -96.50101614488641,33.7881925349614,0 -96.5108435468467,33.8157874455655,0 -96.56240472874201,33.8255225751035,0 -96.6014686489895,33.8430585200471,0 -96.61443925387489,33.8630013562452,0 -96.58476047125609,33.8962455118061,0 -96.66651194068848,33.9136443690811,0 -96.67797914648511,33.9044245192975,0 -96.6936574485524,33.8480065285136,0 -96.7119531575884,33.8339726711759,0 -96.7491017928465,33.8318404880575,0 -96.7978710251696,33.8700514781673,0 -96.81439693387631,33.8718710579623,0 -96.84428994427481,33.8581346758361,0 -96.86129653634301,33.8617814536899,0 -96.8792188051043,33.8841045463944,0 -96.88313308270391,33.9246919643211,0 -96.8987359278797,33.9501277640988,0 -96.92984981386039,33.9618729385895,0 -96.9364875549014,33.9479496295896,0 -96.9684711058252,33.9374213261378,0 -96.9881480778014,33.9443028760324,0 -96.9879951562104,33.876524993445,0 -97.00613836455501,33.8506162080499,0 -97.0258837487447,33.8406638868468,0 -97.0711884256134,33.8568301349417,0 -97.08246496741261,33.8512035820318,0 -97.0785356759137,33.8379135029825,0 -97.0503136942646,33.8235515468502,0 -97.087958150994,33.8076751203943,0 -97.0837540270329,33.7425178691231,0 -97.09078850752719,33.7317759436109,0 -97.1158518152657,33.7260387447849,0 -97.1527639551762,33.7287737567957,0 -97.1894548414756,33.7528743688857,0 -97.2086128811281,33.8197520263932,0 -97.19530685545391,33.8362616577426,0 -97.16888553387221,33.8478962336794,0 -97.1644603868134,33.8632500271984,0 -97.1880588051263,33.899305664185,0 -97.21162664947801,33.905790476719,0 -97.24635658905748,33.8943389990746,0 -97.25098012527539,33.8730725605007,0 -97.26420222924099,33.8588326323233,0 -97.27257189808169,33.8726758421186,0 -97.3143820721958,33.8959411317283,0 -97.31525189418009,33.8704938884378,0 -97.3421004874611,33.8620178329205,0 -97.36361607593869,33.8311271478817,0 -97.41041616291049,33.8208124550832,0 -97.45303509112971,33.8363150195283,0 -97.45736073930121,33.890532021605,0 -97.4630599713817,33.9024831837152,0 -97.47783082980909,33.9078083743386,0 -97.51850418970599,33.91687174991,0 -97.55488993784371,33.9040048081949,0 -97.57597058455282,33.9026313915672,0 -97.5926564722634,33.9179850917189,0 -97.6004841716436,33.9695357487998,0 -97.6713709731313,33.9887114388077,0 -97.7045675638129,33.9716446286772,0 -97.72932581317978,33.9393918135487,0 -97.75667040704261,33.932197269678,0 -97.79051555721509,33.8905567127498,0 -97.8528573913232,33.857170989043,0 -97.8700622202223,33.8552140577552,0 -97.90937762069478,33.8741230741104,0 -97.95504853378348,33.8835794315438,0 -97.97669367876701,33.9026028951239,0 -97.9764418443808,33.9121508879515,0 -97.95099692709511,33.9326163854516,0 -97.9633110473011,33.9487483818417,0 -97.94806700069491,33.9598489691416,0 -97.9505389343141,33.9712584919282,0 -97.982995159825,34.0013824361846,0 -98.0238062114244,33.9870813155941,0 -98.0558736752466,33.9898964139123,0 -98.08652197109261,34.0054103575962,0 -98.11100543330518,34.0699152608686,0 -98.09444127427528,34.1346491348156,0 -98.11518632903911,34.1490797537232,0 -98.137182702728,34.1385247073243,0 -98.1731642842845,34.1154615363479,0 -98.277324712945,34.1229647210219,0 -98.3208141218597,34.1395124845584,0 -98.35073026318848,34.1422132177566,0 -98.3845831608253,34.115873277508,0 -98.39128184930269,34.087324681805,0 -98.4074643999688,34.0825487630451,0 -98.4216707502906,34.0659246412843,0 -98.4485195081449,34.0544693031052,0 -98.4998521726901,34.066508171909,0 -98.5579143286446,34.1054284628805,0 -98.5766684370536,34.1420220197199,0 -98.6075838723519,34.1514897431627,0 -98.6263299881177,34.158527616426,0 -98.66205950085499,34.147129344828,0 -98.68255276049912,34.1500893803379,0 -98.70563225966779,34.1308063642615,0 -98.77887692432012,34.1320532580559,0 -98.8114099222656,34.146025924858,0 -98.8916893852997,34.1609098971274,0 -98.9528568855168,34.1946535863845,0 -98.99654461650539,34.2095837062186,0 -99.03556990100751,34.1990091275048,0 -99.07878412614019,34.2084460436583,0 -99.12830013933699,34.2015562705675,0 -99.17651178434171,34.2128165213261,0 -99.19084035753009,34.2238215675651,0 -99.20495561666171,34.2557306955242,0 -99.19666281278209,34.3052057476053,0 -99.20584919432768,34.3320754835343,0 -99.25446563782602,34.3682943923503,0 -99.26753552999141,34.3983645544,0 -99.32365897051331,34.4127869472387,0 -99.3645692443735,34.4502723758117,0 -99.3931570632619,34.429070725134,0 -99.3945224149831,34.3968223241289,0 -99.4103230107381,34.3691856116386,0 -99.43874320793192,34.3647833428937,0 -99.4798058594252,34.3836002544386,0 -99.5025040549412,34.4041453149585,0 -99.5542323165501,34.4152563856433,0 -99.5782194991147,34.4089886853491,0 -99.58558947886991,34.3849338835776,0 -99.601817403152,34.3686339710267,0 -99.6852769049209,34.3775206620374,0 -99.77806025861618,34.4440642714861,0 -99.83030837990161,34.501846255188,0 -99.86094928508588,34.5186945590413,0 -99.88097732527548,34.5482418940255,0 -99.93228692511291,34.5791733267958,0 -99.9451200138402,34.5796346298626,0 -99.9724799649576,34.5619266989846,0 -99.9964752628992,34.5623839445524,0 -99.9992599692516,34.7472433686446,0 -99.99645505791619,35.0310510336069,0 -99.9975702180927,35.1822350834532,0 -99.99474342059961,35.4246221647218,0 -100.000392481852,35.6188562203977,0 -99.9981231250644,35.8838375261918,0 -99.99755361874209,36.0575913818302,0 -100.001550693503,36.4925547831533,0 -100.007272948555,36.493912716666,0 -100.549839323196,36.4894790903428,0 -100.957341408628,36.4896376715563,0 -101.090102366885,36.4880502722289,0 -101.62075555527,36.4920314454728,0 -102.034658387679,36.4929809605896,0 -102.165673606983,36.4902341370994,0 -102.997400999016,36.4923701848871,0 -103.027286789536,36.4915918464103,0 -103.024047954518,36.0560618512093,0 -103.022612263713,35.742327299615,0 -103.02229404801,35.6236480179456,0 -103.026151164684,35.1772655150643,0 -103.025251273923,34.9647798759331,0 -103.022657024631,34.7453327558501,0 -103.029645833697,34.3078204763021,0 -103.033258497866,33.8261815911813,0 -103.038736452727,33.5658431867775,0 -103.043100992793,33.3778314740626,0 -103.049330863501,32.9536389141087,0 -103.060018185604,32.5155455179839,0 -103.055640531826,32.0851168230641,0 -103.058413767661,32.0020227787787,0 -103.332549418381,32.0042814747499,0 -103.729444279739,32.0062289025373,0 -103.981377077849,32.0060152222294,0 -104.019296949948,32.0074034895819,0 -104.85106805229,32.0032650272727,0 -104.922304814538,32.004382108736,0 -106.00324037618,32.0016580242852,0 -106.378387283311,32.0007470652221,0 -106.623625658904,32.0010887853062,0 -106.650061890884,31.9803297275266,0 -106.632605287073,31.97221998842531,0 -106.633748923526,31.9141010099202,0 -106.64407909206,31.8952054369513,0 -106.61612370633,31.8447405331725,0 -106.614986549809,31.8178343839605,0 -106.539514775671,31.7863052774039,0 -106.383581210566,31.73387271848,0 -106.21328556164,31.4782464382134,0 -105.998886788462,31.3939400532755,0 + + + + + + + + + -94.9136282621775,29.2578100398598,0 -95.1056216301692,29.097200689859,0 -94.7486000214909,29.3197268614603,0 -94.76757511948669,29.3426867459739,0 -94.9136282621775,29.2578100398598,0 + + + + + + + + + -96.3981329846783,28.3461287087049,0 -96.4228065972943,28.3917207565152,0 -96.46330511935079,28.3261156347832,0 -96.5323911551759,28.3185285307139,0 -96.73916908683449,28.1838232573772,0 -96.80410430551582,28.1724500303063,0 -96.8348893723486,28.0666156829267,0 -96.3981329846783,28.3461287087049,0 + + + + + + + + + -96.9402302798725,28.0462270302125,0 -96.9732659036783,28.0011489857445,0 -96.9496523808798,27.984822817519,0 -97.0246956229941,27.9146817066477,0 -97.04987231164419,27.8412581171011,0 -96.85406998557561,28.0496963225627,0 -96.8376894806861,28.102132800665,0 -96.87268627929731,28.1316953484598,0 -96.9402302798725,28.0462270302125,0 + + + + + + + + + -97.35938018577079,27.2840405219699,0 -97.22398277664181,27.5743234820277,0 -97.0538319312447,27.8307777532106,0 -97.11330369706262,27.8195211793271,0 -97.07556056160431,27.8115793410343,0 -97.1704476930157,27.7077710590242,0 -97.20384878985288,27.6123791179091,0 -97.258949516966,27.6520617389151,0 -97.24893903086139,27.5814491265614,0 -97.3357694916682,27.4411382648402,0 -97.3763559674414,27.2849654048289,0 -97.37964318959401,27.2107771788891,0 -97.35938018577079,27.2840405219699,0 + + + + + + + + + -97.3013873602593,26.6013653134077,0 -97.278803221449,26.54030732592871,0 -97.26750343475641,26.4792510973309,0 -97.2515039997564,26.419651853089,0 -97.2265626157341,26.3489005354442,0 -97.2091667971749,26.2508939353731,0 -97.1795864974542,26.0722765736308,0 -97.17204837189529,26.0780766616552,0 -97.1952427262928,26.2595930779644,0 -97.2323612890346,26.4184902532441,0 -97.29609239794908,26.60101247555321,0 -97.35828321012912,26.8029999986179,0 -97.38159323348002,26.9493542503129,0 -97.38718744567349,27.0975717971982,0 -97.37879623372501,27.2047730330479,0 -97.38905033290529,27.2019749640613,0 -97.40117263721351,27.1115540764165,0 -97.3955703997656,26.9223202268071,0 -97.38159189969601,26.8207110644821,0 -97.35828230324178,26.7069850574477,0 -97.3013873602593,26.6013653134077,0 + + + + + + + + + Utah + empty + + +states.AREA: + 84871.909 + + +states.STATE_NAME: +Utah + + +states.STATE_FIPS: +49 + + +states.SUB_REGION: +Mtn + + +states.STATE_ABBR: +UT + + +states.POP2000: + 2233169 + + +states.POP2001: + 2282755 + + +states.POP00_SQMI: + 26 + + +states.DEN_0_100: + 98 + + +USStates.ID: + 45 + + +USStates.State_Name: +Utah + + +USStates.Date_Entered: +Jan. 4 1896 + + +USStates.Year_Entered: +1896 + + +USStates.Year_Settled: +1847 + +]]> + #Style_5 + + + -111.676053595522,39.3225122931614,0 + + + + + + -114.047272999176,38.1376524399918,0 -114.047260595159,37.5984784866001,0 -114.043939384154,36.9965379371421,0 -112.899983474169,36.9962268765574,0 -112.542521578828,36.9979944864436,0 -112.2372578615,36.9954921751891,0 -111.356163994142,37.0017097524257,0 -110.740062961138,37.002488042411,0 -110.484088956249,37.0039260237973,0 -110.452235819472,36.9917463039985,0 -109.997076712711,36.9920675592929,0 -109.048480115363,36.9966409005893,0 -109.045602480021,37.6308206068713,0 -109.043206408646,37.8874200608917,0 -109.043464000061,38.1529336954503,0 -109.055861120835,38.2449201643366,0 -109.053948502328,38.4946509132439,0 -109.051416838185,39.3609660838809,0 -109.053528662287,39.5181701484933,0 -109.052551712149,39.6573824204021,0 -109.051263150153,40.2105113710392,0 -109.046155726194,40.6652909436328,0 -109.048314704754,40.9984333935171,0 -110.002165480573,40.9975995171866,0 -110.06318573561,40.9978919528284,0 -111.05102250907,40.9965835985974,0 -111.051651122482,41.2584254005779,0 -111.051068773655,41.578592411864,0 -111.04869741386,41.9962033494069,0 -111.494586313343,42.0001709690538,0 -112.100514491537,42.0023005848578,0 -112.147116504391,41.9990540573659,0 -112.989575449033,42.0011467864027,0 -114.039072662345,41.9953908974688,0 -114.038151248682,40.9976868405942,0 -114.038108189376,40.1110466529553,0 -114.039844684228,39.9087788600022,0 -114.040105338584,39.5386849268843,0 -114.044267501155,38.678995881588,0 -114.045090206154,38.5710950539538,0 -114.047272999176,38.1376524399918,0 + + + + + + + + Vermont + empty + + +states.AREA: + 9603.272 + + +states.STATE_NAME: +Vermont + + +states.STATE_FIPS: +50 + + +states.SUB_REGION: +N Eng + + +states.STATE_ABBR: +VT + + +states.POP2000: + 608827 + + +states.POP2001: + 615035 + + +states.POP00_SQMI: + 63 + + +states.DEN_0_100: + 94 + + +USStates.ID: + 14 + + +USStates.State_Name: +Vermont + + +USStates.Date_Entered: +Mar. 4 1791 + + +USStates.Year_Entered: +1791 + + +USStates.Year_Settled: +1724 + +]]> + #Style_5 + + + -72.660656242184,44.072240587832,0 + + + + + + -73.2580598287651,42.7460586400616,0 -73.0196951738304,42.7403966786337,0 -72.92299742922531,42.7373644761782,0 -72.4557700038868,42.7258525290855,0 -72.4621713056893,42.7468405310802,0 -72.4793225257782,42.7615879021402,0 -72.50726952905301,42.7687326904009,0 -72.5130680088012,42.7892594013534,0 -72.538916970841,42.8077338159119,0 -72.5534284639708,42.8606431711067,0 -72.5248100213574,42.9126141761107,0 -72.5202170578448,42.9516725271887,0 -72.5042636319545,42.9655846501003,0 -72.47334119749689,42.9761435837691,0 -72.4571590376321,42.9996036974292,0 -72.4617520870041,43.0465044640798,0 -72.44346425788849,43.0790393128299,0 -72.43760490206709,43.1162700005073,0 -72.45239855285131,43.1560221784817,0 -72.4355986440693,43.2322535514022,0 -72.4024188454007,43.3073827061473,0 -72.4102315830492,43.3234041461301,0 -72.39762805437751,43.3510068532964,0 -72.4121395531363,43.3771255999362,0 -72.3962478080997,43.4101565518931,0 -72.3825156946813,43.4846296935804,0 -72.39499776821209,43.5175538931662,0 -72.3734983899537,43.5723746289271,0 -72.33308519415699,43.5973647921877,0 -72.3040399378543,43.6985301192071,0 -72.2600555952028,43.7353001230663,0 -72.21912292133609,43.750692528435,0 -72.2060918209679,43.7646350589211,0 -72.1848363730122,43.8016904606597,0 -72.1700895247441,43.8789176964689,0 -72.1216496397887,43.9092173247049,0 -72.1132040793555,43.9391659598857,0 -72.0917117306645,43.9579911279463,0 -72.1128078470404,43.9765149671875,0 -72.109908766997,43.9892291134731,0 -72.0852043813774,44.008923986175,0 -72.07691904412221,44.0320405986226,0 -72.0347283650036,44.0833740182688,0 -72.0324473746587,44.0960996192238,0 -72.0495148341974,44.1004520944909,0 -72.0349198523751,44.1207459288224,0 -72.0447245537617,44.1564355666157,0 -72.05928224606249,44.1821766291115,0 -72.0443903804218,44.2343798441303,0 -72.0595660047421,44.2614940911529,0 -72.03549537537759,44.2994343131496,0 -71.99443351087029,44.3275482023457,0 -71.93890565797921,44.3257860034123,0 -71.928361752714,44.3361121851128,0 -71.83481598035139,44.3441994129001,0 -71.8211973083551,44.3503600453545,0 -71.7977291908463,44.384172813001,0 -71.7665702593918,44.3982488046656,0 -71.67688436321281,44.4213427403398,0 -71.6563990024127,44.4401373612429,0 -71.64770916138809,44.4691741459763,0 -71.6365547217831,44.4767309013867,0 -71.6142227691162,44.474507042735,0 -71.58661898076009,44.4945375694188,0 -71.5752435447921,44.525805689154,0 -71.59144138862121,44.5388744007981,0 -71.59228841131031,44.5512031068487,0 -71.5367908177937,44.5789312630586,0 -71.5541026351831,44.5965889130359,0 -71.5680271516494,44.6374468081647,0 -71.588749347522,44.6505994869908,0 -71.6076787297884,44.6778622938609,0 -71.6311328527305,44.7417107606939,0 -71.58350120905909,44.7791969958657,0 -71.575100912366,44.816019797627,0 -71.50636496059011,44.8996711859758,0 -71.5169776077169,44.9436961331563,0 -71.54092709673419,44.976563206227,0 -71.50537230062881,45.01335171632249,0 -71.9018687560565,45.00733987375971,0 -72.547231170846,45.0053701041523,0 -73.1885457846919,45.0084861445144,0 -73.3447234868807,45.0061387945904,0 -73.3507583871195,44.9819729513451,0 -73.3364146788922,44.9326039308497,0 -73.3823067594393,44.8479336187606,0 -73.36905412807261,44.8191179021751,0 -73.3267863194035,44.799293570954,0 -73.373158575022,44.724236436747,0 -73.3581509561494,44.680368564481,0 -73.3730971364166,44.6612763562517,0 -73.3701366913554,44.6343490646182,0 -73.3818251037206,44.619807725515,0 -73.3712960298213,44.5791669569442,0 -73.34781198402661,44.5539715457199,0 -73.3344524939975,44.544328246301,0 -73.2933197444993,44.4328535783624,0 -73.2999951630005,44.4055331645407,0 -73.32978809302909,44.3673904680866,0 -73.3053256664729,44.2601422576285,0 -73.37733262552911,44.2012475171296,0 -73.38206233640641,44.1721076120788,0 -73.40786483046161,44.1362270392695,0 -73.408756830709,44.1066103535606,0 -73.4352152780239,44.0638978024282,0 -73.43600071127899,44.0456791904389,0 -73.4082513023357,44.0182219013784,0 -73.4174061301202,43.9881969457528,0 -73.4053345287369,43.9148075869022,0 -73.3751207851314,43.8859769501205,0 -73.3847399017654,43.804507971731,0 -73.35899716813,43.7784275686932,0 -73.3566696765928,43.756558340599,0 -73.3709893845574,43.7142811167277,0 -73.4229598542953,43.6321147289764,0 -73.4183198417113,43.582479385998,0 -73.3881142192301,43.5691436583008,0 -73.36368556156729,43.6149988679744,0 -73.303534516911,43.62471481285,0 -73.2941043006647,43.6196528756937,0 -73.28173626823219,43.5931872495766,0 -73.2914024969013,43.5750335705375,0 -73.25998379380719,43.5593823395157,0 -73.2383913589494,43.5128328494142,0 -73.2500714436229,43.310853990742,0 -73.27600528901171,42.9402941192889,0 -73.27958319993191,42.83710332748,0 -73.2961697572315,42.8035493647588,0 -73.26927531690011,42.747481432998,0 -73.2580598287651,42.7460586400616,0 + + + + + + + + Virginia + empty + + +states.AREA: + 39819.882 + + +states.STATE_NAME: +Virginia + + +states.STATE_FIPS: +51 + + +states.SUB_REGION: +S Atl + + +states.STATE_ABBR: +VA + + +states.POP2000: + 7078515 + + +states.POP2001: + 7203904 + + +states.POP00_SQMI: + 178 + + +states.DEN_0_100: + 84 + + +USStates.ID: + 10 + + +USStates.State_Name: +Virginia + + +USStates.Date_Entered: +June 25 1788 + + +USStates.Year_Entered: +1788 + + +USStates.Year_Settled: +1607 + +]]> + #Style_5 + + + -78.85159444011779,37.5186355576459,0 + + + + + + + -79.1440627705841,36.5461983712091,0 -78.7964284068279,36.5436739120265,0 -78.73711601969831,36.5462146723402,0 -78.45852951752001,36.5416234739225,0 -78.320969632811,36.5456755672774,0 -78.05138167562831,36.5526213891494,0 -77.89856872882319,36.553092111532,0 -77.7636386364742,36.5535891128352,0 -77.3197463656757,36.5540684074889,0 -77.1770420007847,36.5564375496145,0 -76.92381636627491,36.5542979883089,0 -76.92131386587209,36.554309439951,0 -76.5632556818254,36.5554041975692,0 -76.4972285279305,36.555964754875,0 -76.3299165778101,36.5562088358656,0 -76.1270505006232,36.5573157649444,0 -76.0456111690205,36.5571064340655,0 -76.0615119712046,36.6037440715536,0 -76.0268192353758,36.5568700359695,0 -75.9983147031585,36.5568053577451,0 -75.95044799302779,36.7217163055738,0 -75.8924987970746,36.5991754803558,0 -75.90163103703659,36.5563523255124,0 -75.877811084643,36.5560283058652,0 -75.9950139733037,36.9232809961133,0 -76.1180881453835,36.9317648123223,0 -76.1913251743424,36.9045892249893,0 -76.20199158108591,36.935217163218,0 -76.2838887925512,36.9628813743534,0 -76.3072813727656,36.9421487258181,0 -76.29236454702701,36.8284904672678,0 -76.31710011796309,36.8459922903136,0 -76.4008510377479,36.8262860262004,0 -76.3937555260047,36.8360744516116,0 -76.3415839123642,36.8603355643402,0 -76.3478101840232,36.9134892559702,0 -76.4104728537632,36.9015610356255,0 -76.5068660992915,36.8696211637204,0 -76.56152429279599,36.7957653750683,0 -76.5601896240839,36.841949682548,0 -76.4862891586355,36.8957172739011,0 -76.4818489715291,36.9192347267962,0 -76.5168462700177,36.9123341285658,0 -76.48918167769079,36.9618713816853,0 -76.55472096576371,37.0063431659281,0 -76.6130495959479,36.9949910493193,0 -76.5775030626028,37.0246421685746,0 -76.6653202221915,37.0542826183327,0 -76.6712176684662,37.1478600912415,0 -76.68564516136701,37.1981336635524,0 -76.72889009061009,37.1508170290717,0 -76.7970759024728,37.2074500591909,0 -76.9005488474757,37.201202170108,0 -76.9411772790768,37.2367588456444,0 -76.8781107307919,37.2595740295398,0 -76.8751735425528,37.3230918648515,0 -76.8568543846098,37.2440482634497,0 -76.7956110737283,37.2405346631412,0 -76.7457819523891,37.1935376737801,0 -76.6968300960669,37.2326679371395,0 -76.6477715853183,37.2259840464616,0 -76.6097074589246,37.1787238415066,0 -76.62459298866951,37.1324217211094,0 -76.5681184950179,37.0803207193791,0 -76.5641662731184,37.1179178590847,0 -76.51493987185231,37.088514152489,0 -76.5307942986433,37.0677893193211,0 -76.4257863680259,36.9654073083815,0 -76.3842198846788,36.9905610883342,0 -76.29300653598671,37.0206351268799,0 -76.2785939416313,37.0744893907584,0 -76.3953592865513,37.1078530847975,0 -76.2853385910049,37.1222404792061,0 -76.3369841802955,37.1771522953961,0 -76.363451729894,37.1465709966311,0 -76.3965418363444,37.173174579979,0 -76.412663469669,37.1525377346611,0 -76.4243369011667,37.2074417607397,0 -76.5947150535785,37.2914425548303,0 -76.6696613320707,37.371791537835,0 -76.7043613440258,37.4186361406359,0 -76.65316606911691,37.4123446475274,0 -76.4608069287775,37.2555753805253,0 -76.392406354854,37.2935674534887,0 -76.4552214637676,37.3776312056936,0 -76.4034234546658,37.3731670284824,0 -76.4167524203358,37.4122746360477,0 -76.4636063203256,37.4190312999933,0 -76.4465385536332,37.4581039398615,0 -76.3386854412128,37.3936844160004,0 -76.3006361353978,37.334709868146,0 -76.2748553487943,37.3304598673598,0 -76.25425523474939,37.3903257815922,0 -76.3553334504997,37.5158897727623,0 -76.4338503734437,37.5153384215489,0 -76.51252787654241,37.5527130415872,0 -76.348306615496,37.5252852030122,0 -76.314309077826,37.5513349088903,0 -76.5691713435974,37.6420468415128,0 -76.68141185641581,37.7748929688243,0 -76.7320343979588,37.7986197228433,0 -76.81818811699171,37.9196415616303,0 -76.77153220520729,37.9168107039808,0 -76.6314529213585,37.7964870429673,0 -76.5801358444963,37.7702542208492,0 -76.5067605515534,37.656522918715,0 -76.3445385066165,37.6230595013925,0 -76.3227258669536,37.6779484318836,0 -76.3566703951832,37.700265457817,0 -76.309610919197,37.7192458083256,0 -76.3242069148735,37.7989453158794,0 -76.2515877836626,37.8503067866281,0 -76.25886650737461,37.8901582041921,0 -76.3674146087621,37.9570799400083,0 -76.5242205629273,38.0128744660371,0 -76.5733697756541,38.0033002605649,0 -76.5577218576977,38.0254593389845,0 -76.5487117333011,38.0742408555528,0 -76.5952833745998,38.1203528497159,0 -76.9361551677171,38.2026030889371,0 -76.99905430235459,38.2804019549924,0 -77.054232080337,38.3754764029036,0 -77.240401498791,38.3314974517303,0 -77.3215266297094,38.3441089374341,0 -77.28918500851221,38.3627964278078,0 -77.3381896271496,38.4369487883222,0 -77.3033228724405,38.5020331248717,0 -77.227296542712,38.650839442127,0 -77.1944511107853,38.6608832985541,0 -77.1969608195312,38.622817575713,0 -77.1296906932316,38.6482418914715,0 -77.12481562054811,38.6779155452061,0 -77.0928476424555,38.7040989116303,0 -77.08157873831389,38.7153939181929,0 -77.0568205142596,38.7121363148863,0 -77.0461695666273,38.7188957809267,0 -77.04514742259011,38.7882339432299,0 -77.03494665070259,38.8140284925431,0 -77.0448880739541,38.8294777256462,0 -77.0401043199647,38.8385260372666,0 -77.03877681158821,38.8625429508758,0 -77.067586179778,38.8862126841237,0 -77.0786490583631,38.9157112061101,0 -77.12232830291251,38.9321712762375,0 -77.15174771824201,38.9648893335594,0 -77.2434318664787,38.9759898010602,0 -77.2556927153402,39.0276818620407,0 -77.3243065775866,39.0626960558372,0 -77.3462265685837,39.0686200582469,0 -77.4327467353536,39.0668840135464,0 -77.459404555923,39.0809444981026,0 -77.47895899133,39.1040646528751,0 -77.51275784419811,39.1167594573458,0 -77.5163278483541,39.1575488653215,0 -77.4783476432128,39.1770378462932,0 -77.4617071219601,39.2187353607732,0 -77.4646672485749,39.2291606204918,0 -77.4937734776117,39.2500146595609,0 -77.5419007825367,39.2690420737433,0 -77.5686729648781,39.298495090027,0 -77.616235785843,39.2998185774258,0 -77.6793019175109,39.3187810010414,0 -77.72746748091871,39.3177965867944,0 -77.7594582704378,39.2846433153217,0 -77.76823224563999,39.2465502522476,0 -77.8054492814302,39.1966059388555,0 -77.8200446831256,39.1417254469273,0 -77.83068022894911,39.1321813411354,0 -78.03332834358871,39.2656393181314,0 -78.2295086253954,39.39111326311,0 -78.2768810730911,39.4234646371798,0 -78.3475464813471,39.4569981748093,0 -78.350231122076,39.380828452912,0 -78.3654747496783,39.3616867684635,0 -78.3439287233565,39.3509564427898,0 -78.3408462579967,39.3414581302015,0 -78.4135473819813,39.257540835225,0 -78.3991273957871,39.2449527077307,0 -78.4230690017269,39.2121432300896,0 -78.4240684786694,39.1976286478836,0 -78.40236228262261,39.1705945616413,0 -78.4305689043273,39.1486261929033,0 -78.4479796847525,39.1190362574345,0 -78.4852503468901,39.111944844534,0 -78.5016006690667,39.0936843045982,0 -78.536651424857,39.0571328491656,0 -78.5641793194809,39.0351455339644,0 -78.5492023399753,39.0234880477595,0 -78.5532079497434,39.0139362816423,0 -78.59869613846099,38.967306737806,0 -78.6308475438714,38.9797118741506,0 -78.6469691460415,38.9505530737122,0 -78.6802270507461,38.9216841449691,0 -78.7189859527938,38.9049913858346,0 -78.72414346436901,38.9303242424267,0 -78.73773193671219,38.9292828544161,0 -78.7492528843455,38.9114914729758,0 -78.7930553345461,38.8802192733,0 -78.81586084106471,38.8337457622327,0 -78.86656063074361,38.7634041325478,0 -78.9874530865749,38.8467613817813,0 -79.03374251686721,38.7999596842489,0 -79.05480043932219,38.7906328948264,0 -79.0565552787527,38.7620536715536,0 -79.0872342316746,38.7072686901771,0 -79.088546586161,38.6592052271367,0 -79.1210641516119,38.6637673801701,0 -79.1274272802501,38.6582438834526,0 -79.2316628792895,38.4804961745132,0 -79.27235884061081,38.4373067075038,0 -79.3169995976733,38.4126332297745,0 -79.48634757115821,38.4621448879803,0 -79.5365137543052,38.5538055741145,0 -79.642406563286,38.5923552608138,0 -79.6694300335236,38.5501770266588,0 -79.6656146350943,38.5207779063414,0 -79.6926537316952,38.50035433771,0 -79.6840924127456,38.4302381558023,0 -79.7200352271452,38.3946858203824,0 -79.7328295907797,38.35184011756,0 -79.7640044528342,38.3539913109909,0 -79.80032894262899,38.3143267172637,0 -79.80277785836461,38.2988699252702,0 -79.786511146829,38.2851184419634,0 -79.79362179587,38.2686659933911,0 -79.8311519954685,38.2502792510352,0 -79.9161615169419,38.1792648616985,0 -79.9103399375918,38.1626063325108,0 -79.9353269126111,38.1213086373625,0 -79.9282922008952,38.1033111780769,0 -79.9575137202729,38.0673653777199,0 -79.9664936918756,38.0386218574803,0 -80.0004989600932,37.9898701188515,0 -80.0548072329966,37.955647953318,0 -80.10649074189941,37.9146585972358,0 -80.1185073346708,37.8912782976758,0 -80.16000537205031,37.8772283214768,0 -80.17222039082991,37.860184199113,0 -80.1715945425769,37.842968579238,0 -80.2237356887328,37.8023645289771,0 -80.2205461556516,37.7788585452909,0 -80.25468885608571,37.7572327793138,0 -80.2500331441419,37.7260519868,0 -80.3031097192157,37.6826718540633,0 -80.29570065300371,37.6715026681154,0 -80.30486267871009,37.6522463839109,0 -80.3009326903108,37.6405469490757,0 -80.2544222998619,37.6407036415196,0 -80.2189280037138,37.624266818855,0 -80.2463930602341,37.5968966073136,0 -80.3167216376968,37.5667185420532,0 -80.32590580737531,37.5334014957793,0 -80.3083037500729,37.5283701687601,0 -80.280730446809,37.5362590748033,0 -80.2879160750838,37.5111511482082,0 -80.3475109001899,37.49117712186,0 -80.35215686057209,37.4761016187768,0 -80.3883061551325,37.4657253807092,0 -80.4253779088728,37.4349064012949,0 -80.47476472988301,37.4228209443336,0 -80.48679721638899,37.4338604042898,0 -80.4878816034022,37.4605973242368,0 -80.5087647901173,37.4750470031664,0 -80.5427553820369,37.469210153305,0 -80.5974908951866,37.4460544156491,0 -80.7052070760613,37.388378738728,0 -80.72973711165071,37.3927194823309,0 -80.7463242442421,37.3877372428011,0 -80.7476897645342,37.3790816832203,0 -80.7629949670439,37.3714139772316,0 -80.7700223818732,37.3861958412097,0 -80.7992446500301,37.3917535437627,0 -80.7996113856773,37.4130624215657,0 -80.8505252286955,37.4234607507886,0 -80.8773584695865,37.3886971542785,0 -80.8484178042257,37.3509434223474,0 -80.8554293470925,37.3394115247051,0 -80.9341835390029,37.3013705325277,0 -80.96789191929319,37.2917914637641,0 -80.9785356077377,37.2964757957825,0 -80.98593670753679,37.3062413397341,0 -81.0249323590475,37.2860611989419,0 -81.1407375754125,37.2749250164035,0 -81.2229334626078,37.2402144799779,0 -81.31187279010121,37.2937070121271,0 -81.3587948024103,37.3389525257717,0 -81.3909459604383,37.3111547685878,0 -81.4033441778724,37.2826247386467,0 -81.4753603327483,37.2544223575295,0 -81.4955330784661,37.2528505720872,0 -81.5055358933554,37.2343721078399,0 -81.5566542800284,37.2063527636759,0 -81.66588576064321,37.2049100156006,0 -81.7017283392091,37.2354348394887,0 -81.7384563680184,37.2504910806821,0 -81.7518541120478,37.2722574759975,0 -81.7926591382367,37.2871534702189,0 -81.81538106528591,37.2795392280236,0 -81.83888889774509,37.2855052037829,0 -81.8586808412616,37.307031242764,0 -81.8638156687728,37.3254560597623,0 -81.8971581362481,37.3405886156486,0 -81.9268226400485,37.3717275503644,0 -81.9207334341144,37.4155161841344,0 -81.98820252937991,37.4665864944032,0 -81.9764218630945,37.4829057344135,0 -81.94799334305409,37.4930262563355,0 -81.9354500215799,37.5066446664438,0 -81.95957525592971,37.5311726196289,0 -82.288950934185,37.3048612192352,0 -82.35384234347519,37.260519600467,0 -82.4058850037637,37.2507041975685,0 -82.5500399164933,37.1993783814184,0 -82.56802270094001,37.1939190518144,0 -82.7190958255562,37.1100172914789,0 -82.7213772601893,37.0931177496069,0 -82.7091701311092,37.075482281352,0 -82.7200576547545,37.0659298172553,0 -82.7235981560209,37.0339923682353,0 -82.81222270855579,37.0056007595079,0 -82.8665598432633,36.9745857651711,0 -82.8606320841382,36.9321623718302,0 -82.87804287271091,36.893694238085,0 -82.9508056915213,36.8640784586876,0 -83.0466341524314,36.8587935503694,0 -83.06795192812881,36.8509961538949,0 -83.1282206506728,36.7791526938786,0 -83.124390864088,36.7511676478044,0 -83.1385135640831,36.7400592608854,0 -83.203656562889,36.7342606278109,0 -83.32138369861531,36.7095329501122,0 -83.3858547999664,36.6882196347474,0 -83.4041505851927,36.6723273909237,0 -83.46022130755151,36.6618325651555,0 -83.5308949469604,36.6614809602143,0 -83.64680262239961,36.6169769718214,0 -83.6751767779422,36.59870387507,0 -83.4642098601591,36.5988401279562,0 -83.2750314351304,36.6004674572198,0 -83.2483883995918,36.5899354199083,0 -83.21092650566941,36.5880896531906,0 -82.98669718999391,36.5912897002248,0 -82.8498226210789,36.5910413307673,0 -82.610838912091,36.5915455448388,0 -82.2968580172995,36.591800946144,0 -82.2166613034295,36.5940723596186,0 -82.1541813077551,36.5951503366296,0 -81.9293033061132,36.5959506538262,0 -81.9182941426859,36.613608797075,0 -81.82889791679381,36.6115963662572,0 -81.6522721813828,36.6076738087692,0 -81.669835031007,36.5897678106349,0 -81.3451210093901,36.5729883010435,0 -80.90324049840061,36.5653420877066,0 -80.8379531599861,36.5635684825855,0 -80.61084107895191,36.557430438888,0 -80.4350919823622,36.5511811239687,0 -80.04786338901999,36.5472724746821,0 -80.0238223180659,36.5451630012943,0 -79.7172016388076,36.5480278701673,0 -79.5100477812088,36.5477956232117,0 -79.21680327614961,36.5499213192211,0 -79.1440627705841,36.5461983712091,0 + + + + + + + + + -75.2703576848931,38.0277091732938,0 -75.346327896565,37.918920332121,0 -75.378212765399,37.9010985070504,0 -75.3444511672005,37.9020368659196,0 -75.385720705723,37.8757771334347,0 -75.33882056571559,37.8889069720989,0 -75.2984965865935,37.9629981027088,0 -75.2422192799713,38.0286475070447,0 -75.2703576848931,38.0277091732938,0 + + + + + + + + + -75.86702474819541,37.5523144055129,0 -75.9304116573134,37.5570210112286,0 -75.9543606031818,37.5219645287005,0 -75.9651025972256,37.4794849231046,0 -75.934103509734,37.4847761076545,0 -76.0181268821546,37.3089179962228,0 -75.9706381994593,37.126374539951,0 -75.9310399788387,37.1426441413889,0 -75.89676220343181,37.3675306353841,0 -75.8263260377899,37.4182847768698,0 -75.79042061875479,37.4082451150763,0 -75.8201385645026,37.4263412953845,0 -75.81267774258821,37.4691794212934,0 -75.7049180567879,37.493609154607,0 -75.7561507588602,37.5106752855114,0 -75.7271741932358,37.5583160220225,0 -75.6499176016541,37.5598879682547,0 -75.69914364059819,37.5896453879802,0 -75.5895543292298,37.6773235333573,0 -75.6175701346023,37.6972623777481,0 -75.37242058358361,38.0168338616125,0 -75.62608404746069,37.9965412351653,0 -75.64786661285071,37.9702549087239,0 -75.65809797640431,37.9413058795763,0 -75.7336306466578,37.9306942135493,0 -75.6863580737178,37.8582504730951,0 -75.6957348357321,37.8246437728104,0 -75.7822539886663,37.7899613984561,0 -75.79937456348389,37.7119219127267,0 -75.9056463246888,37.5923063660501,0 -75.8869307337319,37.5804774495128,0 -75.9292141475101,37.5860158544498,0 -75.9407574732188,37.5616861757273,0 -75.86702474819541,37.5523144055129,0 + + + + + + + + + Washington + empty + + +states.AREA: + 67290.061 + + +states.STATE_NAME: +Washington + + +states.STATE_FIPS: +53 + + +states.SUB_REGION: +Pacific + + +states.STATE_ABBR: +WA + + +states.POP2000: + 5894121 + + +states.POP2001: + 5984144 + + +states.POP00_SQMI: + 88 + + +states.DEN_0_100: + 92 + + +USStates.ID: + 42 + + +USStates.State_Name: +Washington + + +USStates.Date_Entered: +Nov. 11 1889 + + +USStates.Year_Entered: +1889 + + +USStates.Year_Settled: +1811 + +]]> + #Style_5 + + + -120.428027450366,47.3767619529735,0 + + + + + + + -122.402015585862,48.22521655119059,0 -122.368333031748,48.1281417374007,0 -122.216991980112,48.0074395523983,0 -122.230120864997,47.9691133009971,0 -122.302922293019,47.9502148146411,0 -122.394492319816,47.7741760704507,0 -122.414815251142,47.6641799154458,0 -122.382220450337,47.59540904242241,0 -122.392633724016,47.510242430349,0 -122.319738644767,47.3901148739843,0 -122.325376306437,47.34432342914171,0 -122.420837154063,47.3188444009071,0 -122.44160451791,47.30112502870991,0 -122.392843589784,47.27772237272379,0 -122.424093930825,47.2594726643245,0 -122.546588119889,47.3162759041886,0 -122.530763579572,47.2874561757674,0 -122.591806795064,47.18006043271391,0 -122.700078972928,47.0983257639744,0 -122.728186706349,47.0824411560979,0 -122.790048807191,47.12585976612701,0 -122.923149828379,47.0479638034112,0 -123.031348160183,47.10077406605479,0 -123.08119986877,47.0900584211916,0 -123.115436362362,47.2079808770198,0 -122.880373328755,47.29923301071809,0 -122.80218419102,47.36074081061499,0 -122.773334917144,47.3373608176988,0 -122.825108465453,47.23482629704449,0 -122.761238576791,47.16249609705,0 -122.719801685966,47.2231309613462,0 -122.769708287471,47.2661563733799,0 -122.741549305237,47.3414503076915,0 -122.63743668533,47.3985801503896,0 -122.628754107704,47.3985535711269,0 -122.699744809759,47.2920852599988,0 -122.606914471404,47.2705715630047,0 -122.611546281747,47.2933985199593,0 -122.580530737959,47.2513878417299,0 -122.553156448554,47.28333225295779,0 -122.588254069729,47.3339297206403,0 -122.544125105865,47.3739271979736,0 -122.558446593662,47.39836383670511,0 -122.504461251459,47.5072166170591,0 -122.542701892959,47.5227341115826,0 -122.555262191616,47.5835056437302,0 -122.58646032245,47.5711913307815,0 -122.621509737099,47.6969685926778,0 -122.473587970933,47.754980421427,0 -122.531888262165,47.9094610402373,0 -122.613217685631,47.9361891106489,0 -122.611161831324,47.8500088568397,0 -122.723062245298,47.756899497954,0 -122.752942725853,47.6606888662813,0 -122.916969634781,47.6146067598098,0 -123.026336409535,47.5159360344848,0 -123.112685319492,47.3715690549333,0 -123.036205853039,47.3560517908336,0 -122.833247627681,47.4384644854025,0 -123.010471142541,47.3530270312954,0 -123.154060208246,47.34854709581659,0 -123.113915354148,47.4562737478478,0 -122.982744610097,47.605474180815,0 -122.899363646417,47.6725174181428,0 -122.858803869367,47.8273283820717,0 -122.809517476022,47.8570752456124,0 -122.789801306075,47.80254870561371,0 -122.745869964426,47.8089881012059,0 -122.65358555422,47.8644314081443,0 -122.661560699934,47.91715724086411,0 -122.802931474221,48.0853214885644,0 -122.768882581909,48.14399396683261,0 -122.841111108511,48.1331364028468,0 -122.924844380244,48.0667963906842,0 -122.921594579239,48.0941790601655,0 -123.123222071728,48.14873346132511,0 -123.396857191675,48.1110305596467,0 -123.99121575548,48.1591616473782,0 -124.563547200382,48.3572788215719,0 -124.717175724384,48.3775576295928,0 -124.705209619396,48.2319958728397,0 -124.732769782406,48.14998906746659,0 -124.606685175962,47.8737351045468,0 -124.4840349709,47.80825508475839,0 -124.373605760641,47.6387635571163,0 -124.34908012,47.5269100987395,0 -124.319426936677,47.349238221659,0 -124.231425333655,47.2750705461574,0 -124.192733694907,47.1669824551465,0 -124.16203636006,46.9296126446967,0 -124.11236154808,47.0426750048332,0 -124.034394754879,47.0310336101115,0 -123.995864776759,46.9763856970925,0 -123.812655744537,46.9639649518924,0 -124.046929052757,46.8872532153114,0 -124.028808615981,46.82376724520079,0 -124.104738049925,46.87414536541461,0 -124.105760621107,46.9081486902197,0 -124.138827038961,46.8999849517573,0 -124.102067189448,46.7894689338948,0 -124.091049313876,46.729022769244,0 -124.043158405537,46.71585552661,0 -123.895541984289,46.74498612304211,0 -123.840966602211,46.7182880521381,0 -123.926470343453,46.6730606753881,0 -123.957711888544,46.6172253735281,0 -123.893566870933,46.5110798696875,0 -123.940693474701,46.4811152076399,0 -123.84145135609,46.4043430463786,0 -124.013002080972,46.3836800183619,0 -124.023042910864,46.5835411596631,0 -124.065510643968,46.6397453463799,0 -124.079107527965,46.2672592577036,0 -123.99332948614,46.31027473949201,0 -123.885770921618,46.24043841752359,0 -123.725458920321,46.28542385217391,0 -123.620076470538,46.2586654836991,0 -123.470772999092,46.2750238188183,0 -123.304717085176,46.1447375703216,0 -123.2487994158,46.1440203375679,0 -123.212437026773,46.1700060595961,0 -123.176196406189,46.18358645541681,0 -123.118554158558,46.1793104942643,0 -123.050596211575,46.1557362282158,0 -122.974169260528,46.11048344369091,0 -122.899757285914,46.0793296870295,0 -122.875417724143,46.0271833271028,0 -122.807741767287,45.9438901212784,0 -122.80622291556,45.90407242954801,0 -122.784073650236,45.867886451725,0 -122.784515918404,45.85044951848901,0 -122.788009565757,45.80034359183911,0 -122.764288518601,45.7605680280893,0 -122.772551033013,45.7276855424654,0 -122.760541289247,45.6493974102277,0 -122.696323093542,45.6310455505125,0 -122.651209200341,45.6068304566963,0 -122.565429806458,45.5948187685695,0 -122.437154197887,45.5647789119432,0 -122.356457483648,45.56617124306739,0 -122.303150328761,45.54309283450319,0 -122.244922293538,45.5481128647605,0 -122.082037518263,45.59050401243609,0 -122.000011553714,45.6178242910982,0 -121.972659451544,45.63577608415601,0 -121.926820689078,45.64202837395181,0 -121.888283498804,45.6768563701943,0 -121.81104103467,45.70068308952361,0 -121.758694096887,45.6897160514309,0 -121.706416861345,45.6887931706508,0 -121.529054611543,45.7195676794317,0 -121.442552169491,45.6949670880414,0 -121.422029028765,45.69060318812019,0 -121.367814251197,45.6996865954037,0 -121.319977744287,45.6966428366174,0 -121.276390902266,45.67833997203109,0 -121.214271714275,45.6656449638228,0 -121.203308118047,45.65728693477031,0 -121.192054666449,45.6132419265196,0 -121.174316011579,45.6005161602332,0 -121.125204665552,45.6070590988379,0 -121.073529928592,45.6466107733405,0 -121.03348258367,45.652844415437,0 -120.968478511648,45.6451545411606,0 -120.948572830946,45.650315967172,0 -120.907937250867,45.63547710694449,0 -120.861419667766,45.6651862544925,0 -120.696993903513,45.7105098195153,0 -120.658403368137,45.73261248754,0 -120.623757205266,45.7436105722949,0 -120.570082462284,45.7409179414327,0 -120.499156501925,45.6956306780396,0 -120.443383762852,45.6892797229393,0 -120.283634874867,45.71658287339311,0 -120.207445390097,45.7197840646162,0 -120.155907860861,45.7612616683351,0 -120.06864786541,45.780202445303,0 -119.994320160406,45.8111403450749,0 -119.869735634541,45.8316985251524,0 -119.833555881044,45.8416093443199,0 -119.678445663881,45.8525390300795,0 -119.622116728299,45.8994103389685,0 -119.589294282545,45.9133149491969,0 -119.512220001301,45.8992005968695,0 -119.43886108987,45.9142685232279,0 -119.379441421397,45.9176100650698,0 -119.302763509833,45.932662726596,0 -119.178742642589,45.922351608477,0 -119.140250599579,45.9257086397924,0 -119.03222168131,45.9662745814382,0 -118.982132819163,45.9990583744824,0 -117.992527778446,46.0016389052483,0 -117.982677428834,45.9998805158959,0 -117.602826163512,46.00026815862021,0 -117.481663000967,45.9998347138602,0 -116.919132428078,45.995175487463,0 -116.957723390605,46.06568768466321,0 -116.987211805214,46.07850889735371,0 -116.961637658488,46.0972742225682,0 -116.929426274379,46.165483265634,0 -116.967490477604,46.1975539420731,0 -116.972724840347,46.24930935868821,0 -117.001642419838,46.3024487520609,0 -117.027973590879,46.3354269634861,0 -117.064184656311,46.3486979530599,0 -117.044470505763,46.3885739799344,0 -117.038558547134,46.4279805738524,0 -117.04192619733,46.536601774571,0 -117.040968412195,47.11931911025491,0 -117.042391922165,47.2585012691796,0 -117.04179475453,47.3614417250081,0 -117.037471831606,47.9710924196381,0 -117.038868452187,48.0461859667744,0 -117.029111695195,48.8380752730768,0 -117.032049523854,48.99993132673121,0 -117.438580412623,48.99991850566829,0 -118.200354738532,48.9999088414174,0 -118.843602807356,48.9998984346033,0 -120.857059496563,48.9998306577208,0 -122.765118968837,48.99974623444891,0 -122.743940024614,48.95580806740179,0 -122.822421272766,48.9507251599099,0 -122.754241982126,48.9099886147134,0 -122.697404043551,48.8030150496753,0 -122.516853490647,48.757921319943,0 -122.526558319548,48.7117247063083,0 -122.487798210295,48.6385700564281,0 -122.429545051156,48.5993973238636,0 -122.505299782151,48.5594447659792,0 -122.473833244864,48.46219546816361,0 -122.523227847995,48.4584031117488,0 -122.608178294452,48.5188240727562,0 -122.699413806973,48.4943282053316,0 -122.667031965175,48.4128950743055,0 -122.564366308901,48.4142464891235,0 -122.378320027898,48.2897210809664,0 -122.404404795763,48.2465946390423,0 -122.509130728878,48.25379287826151,0 -122.542074086652,48.2104605027962,0 -122.514511175848,48.13397370495419,0 -122.361333117765,48.0600974008547,0 -122.454419044314,48.12849218337681,0 -122.462855148154,48.2283635421487,0 -122.402015585862,48.22521655119059,0 + + + + + + + + + -122.967978342058,48.44379450851021,0 -123.018882894721,48.489605170453,0 -123.022271121816,48.513359682583,0 -122.967980000613,48.52693332233629,0 -123.008698759605,48.5337193215567,0 -123.01209491531,48.5574777421133,0 -123.103721392859,48.6083771191688,0 -123.141053808089,48.6236471212389,0 -123.169899337157,48.5625647146223,0 -123.159719925101,48.52184222365381,0 -123.09523286813,48.479422815339,0 -122.967978342058,48.44379450851021,0 + + + + + + + + + -122.733187500894,48.27664717795621,0 -122.768778263979,48.218818397347,0 -122.695554282422,48.1811852523447,0 -122.608628397127,48.0314307595447,0 -122.544961263666,47.9675310410809,0 -122.471616565863,47.9875090940392,0 -122.442787963967,47.9180562701758,0 -122.386960910805,47.9045490614351,0 -122.355399949048,47.9638860565509,0 -122.379993925152,48.0321462908929,0 -122.49621274531,48.0940709834622,0 -122.546202729793,48.0768581941955,0 -122.610925345361,48.2063213486201,0 -122.732034133066,48.22541451834621,0 -122.623509745109,48.2963505236561,0 -122.528648438563,48.2835101194884,0 -122.525750015179,48.32104386187421,0 -122.604384066189,48.4047892820013,0 -122.665612560098,48.3967777389214,0 -122.733187500894,48.27664717795621,0 + + + + + + + + + West Virginia + empty + + +states.AREA: + 24228.552 + + +states.STATE_NAME: +West Virginia + + +states.STATE_FIPS: +54 + + +states.SUB_REGION: +S Atl + + +states.STATE_ABBR: +WV + + +states.POP2000: + 1808344 + + +states.POP2001: + 1802611 + + +states.POP00_SQMI: + 75 + + +states.DEN_0_100: + 93 + + +USStates.ID: + 35 + + +USStates.State_Name: +West Virginia + + +USStates.Date_Entered: +June 20 1863 + + +USStates.Year_Entered: +1863 + + +USStates.Year_Settled: +1727 + +]]> + #Style_5 + + + -80.614059565661,38.6412110051568,0 + + + + + + -79.2316628792895,38.4804961745132,0 -79.1274272802501,38.6582438834526,0 -79.1210641516119,38.6637673801701,0 -79.088546586161,38.6592052271367,0 -79.0872342316746,38.7072686901771,0 -79.0565552787527,38.7620536715536,0 -79.05480043932219,38.7906328948264,0 -79.03374251686721,38.7999596842489,0 -78.9874530865749,38.8467613817813,0 -78.86656063074361,38.7634041325478,0 -78.81586084106471,38.8337457622327,0 -78.7930553345461,38.8802192733,0 -78.7492528843455,38.9114914729758,0 -78.73773193671219,38.9292828544161,0 -78.72414346436901,38.9303242424267,0 -78.7189859527938,38.9049913858346,0 -78.6802270507461,38.9216841449691,0 -78.6469691460415,38.9505530737122,0 -78.6308475438714,38.9797118741506,0 -78.59869613846099,38.967306737806,0 -78.5532079497434,39.0139362816423,0 -78.5492023399753,39.0234880477595,0 -78.5641793194809,39.0351455339644,0 -78.536651424857,39.0571328491656,0 -78.5016006690667,39.0936843045982,0 -78.4852503468901,39.111944844534,0 -78.4479796847525,39.1190362574345,0 -78.4305689043273,39.1486261929033,0 -78.40236228262261,39.1705945616413,0 -78.4240684786694,39.1976286478836,0 -78.4230690017269,39.2121432300896,0 -78.3991273957871,39.2449527077307,0 -78.4135473819813,39.257540835225,0 -78.3408462579967,39.3414581302015,0 -78.3439287233565,39.3509564427898,0 -78.3654747496783,39.3616867684635,0 -78.350231122076,39.380828452912,0 -78.3475464813471,39.4569981748093,0 -78.2768810730911,39.4234646371798,0 -78.2295086253954,39.39111326311,0 -78.03332834358871,39.2656393181314,0 -77.83068022894911,39.1321813411354,0 -77.8200446831256,39.1417254469273,0 -77.8054492814302,39.1966059388555,0 -77.76823224563999,39.2465502522476,0 -77.7594582704378,39.2846433153217,0 -77.72746748091871,39.3177965867944,0 -77.7500891970593,39.3268181439956,0 -77.7543007117046,39.3385939912988,0 -77.7454504163582,39.3603718912509,0 -77.7562233700037,39.3784762226869,0 -77.7372333565171,39.3961953951361,0 -77.74083452238931,39.4034394054792,0 -77.75698633951841,39.4251637984679,0 -77.8022754371077,39.4323161756799,0 -77.8046940179175,39.4400179505449,0 -77.7957979551353,39.4509164333512,0 -77.8041904928873,39.4631385518333,0 -77.78510893810591,39.459102708835,0 -77.79949832671841,39.4808271058573,0 -77.771551216988,39.4981152221263,0 -77.82518711275171,39.4939074430119,0 -77.84787748402169,39.5020058349846,0 -77.8252634740426,39.5120383875386,0 -77.828925751391,39.5292537667709,0 -77.83546428030221,39.5256107761519,0 -77.8438492144584,39.5319315749014,0 -77.86463209209241,39.5146512457229,0 -77.8695609560795,39.5459120760673,0 -77.8899167307584,39.5580921006877,0 -77.885171166646,39.5644510981679,0 -77.85295909355961,39.5654544565677,0 -77.8398667728917,39.572740433055,0 -77.8424075807765,39.6053745299037,0 -77.855522813824,39.6021663910764,0 -77.88843689880569,39.6165703160658,0 -77.8907409489792,39.6007014665387,0 -77.903253436057,39.5961238764369,0 -77.9386090344815,39.6182180888264,0 -77.9475432559036,39.6150137753716,0 -77.93545786949809,39.5919391289044,0 -77.94497955111849,39.5860111667727,0 -77.96423675783581,39.6113249804037,0 -77.995205151108,39.5989693016707,0 -78.02641818067529,39.6228676658044,0 -78.0943379340484,39.6756002259056,0 -78.1829721387067,39.6946416432551,0 -78.2043044442965,39.6759383682958,0 -78.2275978107419,39.6739888201001,0 -78.22923031045851,39.6585663745485,0 -78.2577267039254,39.6411676777696,0 -78.27301593703299,39.6184096414251,0 -78.3479232590728,39.6405907650805,0 -78.3567810297593,39.6323702224905,0 -78.37767072595661,39.6313171842384,0 -78.3846362229595,39.6144947493043,0 -78.431893779582,39.6209523855928,0 -78.4039995740291,39.5876131045842,0 -78.4506314866027,39.592705125494,0 -78.4618162122069,39.5808339965825,0 -78.4208220953532,39.5494097703543,0 -78.4458699009632,39.5483185504429,0 -78.4558109647124,39.5337352582767,0 -78.4812781842694,39.5199376222576,0 -78.50878283764369,39.525159517656,0 -78.5641887564812,39.521073443727,0 -78.604366257192,39.5356829078104,0 -78.6370818045276,39.5299491862748,0 -78.6491442196502,39.5379978698818,0 -78.6664251857124,39.5369295856868,0 -78.7163150181332,39.5595725682967,0 -78.73271861228101,39.5766427925479,0 -78.7614516806553,39.5817923449266,0 -78.7737430747891,39.6016168803692,0 -78.73625116835829,39.608792329934,0 -78.73049853216,39.6215446407261,0 -78.73238303982021,39.6269651904324,0 -78.7676164768578,39.6266140472135,0 -78.7727054582047,39.6442413593536,0 -78.7981503202116,39.6308329361782,0 -78.7984707782291,39.6154181040351,0 -78.8224126817224,39.5856984808976,0 -78.80655063800541,39.5668238139764,0 -78.8381145866481,39.5633182054468,0 -78.8708155126305,39.5257902221119,0 -78.9553908044919,39.4604587300207,0 -78.970436606663,39.438525300318,0 -79.04885455275689,39.4838153049718,0 -79.0644114910497,39.4858256028263,0 -79.0706297593098,39.4708498495391,0 -79.104597173003,39.4708728556173,0 -79.0967157288178,39.4646284760702,0 -79.1040784853939,39.4473068185213,0 -79.1314006491727,39.4170311916524,0 -79.1581275486525,39.4139606424208,0 -79.16301834698341,39.3934958538665,0 -79.2601680465127,39.3486416544713,0 -79.27982260452779,39.3252435708184,0 -79.29527324453819,39.3005409622397,0 -79.3461946154148,39.2920920071237,0 -79.3848476494521,39.2693006300669,0 -79.4492818447752,39.2120934820003,0 -79.4611919892215,39.2132646214775,0 -79.48986479564221,39.1973957510982,0 -79.480971113096,39.720274058077,0 -79.7651323185042,39.7218070815944,0 -79.9182684921867,39.7216669674993,0 -80.4290823326108,39.7198426041628,0 -80.5242694740401,39.7212089909504,0 -80.5246506803543,39.9584195634812,0 -80.52496218534981,40.0228253262192,0 -80.52604519018939,40.1625211281631,0 -80.5235645344163,40.403033850236,0 -80.52435768303791,40.4787848369009,0 -80.52199952847749,40.6372031779131,0 -80.5744158355721,40.6159741619192,0 -80.6115497018059,40.6200630858018,0 -80.63733821934061,40.613982302321,0 -80.6677276496391,40.5821374643692,0 -80.6686204246359,40.5682789021601,0 -80.63343988239519,40.5392040647419,0 -80.6252533727438,40.5044642482608,0 -80.6018302001708,40.4805390518844,0 -80.6278482893771,40.3982268491052,0 -80.6292446110196,40.3886635709611,0 -80.6092470800706,40.3732754647517,0 -80.60451708240841,40.3062448322667,0 -80.6146878118885,40.2765021361522,0 -80.6501132136987,40.2456798126148,0 -80.67855741943301,40.194151495489,0 -80.7008900358822,40.1681812950244,0 -80.7020651116698,40.1540899859456,0 -80.73823885471551,40.0356640607266,0 -80.7388880114803,39.9834759440017,0 -80.76306009947351,39.947015501453,0 -80.7588871844105,39.9212667893345,0 -80.7681270403387,39.9133131812296,0 -80.7960214112815,39.9198397078312,0 -80.8078400413376,39.9159028725421,0 -80.8121358445091,39.9049014113291,0 -80.7908494426605,39.8723475673467,0 -80.7985253362877,39.8567227242363,0 -80.8259165835688,39.8396671142989,0 -80.8191038347973,39.8090013333355,0 -80.87072776135891,39.7599938351988,0 -80.8564533163278,39.7363355934909,0 -80.8322983936779,39.7188343443337,0 -80.832787434305,39.7034002259532,0 -80.8634141639951,39.6803515272318,0 -80.87274608454371,39.6624110188142,0 -80.8811098930273,39.6240811641343,0 -80.91259057006261,39.6073533140813,0 -80.9326107962525,39.6069409720762,0 -80.9836464085096,39.5818052379779,0 -81.03256860915231,39.544142538686,0 -81.03738319915119,39.5326641774228,0 -81.09824494329121,39.4964511389157,0 -81.11708991317241,39.467783911079,0 -81.180567643956,39.437800182641,0 -81.20030524610981,39.4158962250483,0 -81.2249486327778,39.4083582071948,0 -81.2376212801085,39.388472233438,0 -81.2840170696265,39.387072038012,0 -81.3388361554473,39.3536439576398,0 -81.3759162878324,39.3456902660112,0 -81.4339782748136,39.4060229813656,0 -81.4479558561434,39.4110278039673,0 -81.4650081513692,39.4068583282204,0 -81.54064851311919,39.3527089235402,0 -81.55738794827489,39.3326551943737,0 -81.5726851110575,39.2659175355733,0 -81.6675222725862,39.2704953128172,0 -81.6895262667326,39.2602262835757,0 -81.6979035279936,39.220020030992,0 -81.7230738622105,39.2132681698618,0 -81.758910326595,39.1757512549241,0 -81.74470368597029,39.1258749496768,0 -81.7535616017454,39.0947208175577,0 -81.78636140597079,39.0772573104027,0 -81.8195656534392,39.077016873553,0 -81.824273103509,39.0664159845432,0 -81.8134617903382,39.0441080346264,0 -81.7756796380037,39.0168297231883,0 -81.7817298618878,38.9685290255312,0 -81.7622971158526,38.9301808907728,0 -81.7832252461068,38.9235624308806,0 -81.8237768593835,38.948467790736,0 -81.8409130504285,38.9378897832025,0 -81.8668004270512,38.8857095354934,0 -81.8926954574516,38.8734530024849,0 -81.91524871422909,38.884446578043,0 -81.9318508422449,38.8947421272096,0 -81.89860847229041,38.9322247653254,0 -81.92783006842539,38.9842712717174,0 -81.9377333601398,38.9911756913507,0 -81.9751873204589,38.9930065533181,0 -81.999678576611,39.0152610363642,0 -82.0428855933127,39.0141392723836,0 -82.0585035436315,38.9890655972236,0 -82.0850167494239,38.9771981320238,0 -82.1012069170005,38.9520939616579,0 -82.13931709213161,38.8993984229593,0 -82.14609966838241,38.8387877142417,0 -82.1977219453354,38.8046196832205,0 -82.2167502305976,38.7789394330115,0 -82.1839728099084,38.710302969121,0 -82.18897770390291,38.6778937710105,0 -82.17365706195611,38.6321907721309,0 -82.1842468602663,38.5950322865397,0 -82.2136592450116,38.5848354166427,0 -82.2708972021513,38.5948900812008,0 -82.2899713540982,38.5800813546872,0 -82.3142406687043,38.4652295850629,0 -82.32917938871179,38.4419523430973,0 -82.39476414185761,38.4284703243087,0 -82.41489129697651,38.4303925893994,0 -82.4949877236084,38.405832597411,0 -82.5475481992093,38.4005109785092,0 -82.5754192239026,38.4039021444586,0 -82.5866043088359,38.4125194224537,0 -82.59823915716601,38.3684639621207,0 -82.57229805473899,38.3078110430161,0 -82.5800496260145,38.2925104464826,0 -82.574578950842,38.2559737163217,0 -82.5891132321387,38.2453880857478,0 -82.616228731902,38.2388116463152,0 -82.6066454186315,38.1938262489827,0 -82.6137636388564,38.1780948680894,0 -82.6471582603252,38.1694356505033,0 -82.64612798319701,38.1463307005486,0 -82.5932086977126,38.1099625844435,0 -82.52467860529801,38.0156623478137,0 -82.4757796712415,37.9759070493071,0 -82.480174161688,37.9543964226939,0 -82.49339635192651,37.9425137288734,0 -82.50020946921541,37.9222618980716,0 -82.4376072765301,37.8948548600619,0 -82.4215083258885,37.8723565285176,0 -82.4058057432277,37.8117197137467,0 -82.33984657596631,37.7844003083255,0 -82.3194978866149,37.7584268520686,0 -82.3294012031438,37.7441714871732,0 -82.2956247745408,37.6690580326702,0 -82.2383711562884,37.656775872237,0 -82.20544059754749,37.6240165335496,0 -82.1855494012877,37.6406677677666,0 -82.15931021996209,37.5935690802839,0 -82.1317814946938,37.5905369780361,0 -82.13747341918131,37.5698959116523,0 -82.1465225053321,37.5659208983498,0 -82.1425091726566,37.5574524979734,0 -82.0843920504403,37.5483099090524,0 -82.05566534081019,37.5253425321624,0 -82.0491341809237,37.5514538202535,0 -82.0263511693733,37.5305195250327,0 -81.9765742755516,37.5432534483332,0 -81.95957525592971,37.5311726196289,0 -81.9354500215799,37.5066446664438,0 -81.94799334305409,37.4930262563355,0 -81.9764218630945,37.4829057344135,0 -81.98820252937991,37.4665864944032,0 -81.9207334341144,37.4155161841344,0 -81.9268226400485,37.3717275503644,0 -81.8971581362481,37.3405886156486,0 -81.8638156687728,37.3254560597623,0 -81.8586808412616,37.307031242764,0 -81.83888889774509,37.2855052037829,0 -81.81538106528591,37.2795392280236,0 -81.7926591382367,37.2871534702189,0 -81.7518541120478,37.2722574759975,0 -81.7384563680184,37.2504910806821,0 -81.7017283392091,37.2354348394887,0 -81.66588576064321,37.2049100156006,0 -81.5566542800284,37.2063527636759,0 -81.5055358933554,37.2343721078399,0 -81.4955330784661,37.2528505720872,0 -81.4753603327483,37.2544223575295,0 -81.4033441778724,37.2826247386467,0 -81.3909459604383,37.3111547685878,0 -81.3587948024103,37.3389525257717,0 -81.31187279010121,37.2937070121271,0 -81.2229334626078,37.2402144799779,0 -81.1407375754125,37.2749250164035,0 -81.0249323590475,37.2860611989419,0 -80.98593670753679,37.3062413397341,0 -80.9785356077377,37.2964757957825,0 -80.96789191929319,37.2917914637641,0 -80.9341835390029,37.3013705325277,0 -80.8554293470925,37.3394115247051,0 -80.8484178042257,37.3509434223474,0 -80.8773584695865,37.3886971542785,0 -80.8505252286955,37.4234607507886,0 -80.7996113856773,37.4130624215657,0 -80.7992446500301,37.3917535437627,0 -80.7700223818732,37.3861958412097,0 -80.7629949670439,37.3714139772316,0 -80.7476897645342,37.3790816832203,0 -80.7463242442421,37.3877372428011,0 -80.72973711165071,37.3927194823309,0 -80.7052070760613,37.388378738728,0 -80.5974908951866,37.4460544156491,0 -80.5427553820369,37.469210153305,0 -80.5087647901173,37.4750470031664,0 -80.4878816034022,37.4605973242368,0 -80.48679721638899,37.4338604042898,0 -80.47476472988301,37.4228209443336,0 -80.4253779088728,37.4349064012949,0 -80.3883061551325,37.4657253807092,0 -80.35215686057209,37.4761016187768,0 -80.3475109001899,37.49117712186,0 -80.2879160750838,37.5111511482082,0 -80.280730446809,37.5362590748033,0 -80.3083037500729,37.5283701687601,0 -80.32590580737531,37.5334014957793,0 -80.3167216376968,37.5667185420532,0 -80.2463930602341,37.5968966073136,0 -80.2189280037138,37.624266818855,0 -80.2544222998619,37.6407036415196,0 -80.3009326903108,37.6405469490757,0 -80.30486267871009,37.6522463839109,0 -80.29570065300371,37.6715026681154,0 -80.3031097192157,37.6826718540633,0 -80.2500331441419,37.7260519868,0 -80.25468885608571,37.7572327793138,0 -80.2205461556516,37.7788585452909,0 -80.2237356887328,37.8023645289771,0 -80.1715945425769,37.842968579238,0 -80.17222039082991,37.860184199113,0 -80.16000537205031,37.8772283214768,0 -80.1185073346708,37.8912782976758,0 -80.10649074189941,37.9146585972358,0 -80.0548072329966,37.955647953318,0 -80.0004989600932,37.9898701188515,0 -79.9664936918756,38.0386218574803,0 -79.9575137202729,38.0673653777199,0 -79.9282922008952,38.1033111780769,0 -79.9353269126111,38.1213086373625,0 -79.9103399375918,38.1626063325108,0 -79.9161615169419,38.1792648616985,0 -79.8311519954685,38.2502792510352,0 -79.79362179587,38.2686659933911,0 -79.786511146829,38.2851184419634,0 -79.80277785836461,38.2988699252702,0 -79.80032894262899,38.3143267172637,0 -79.7640044528342,38.3539913109909,0 -79.7328295907797,38.35184011756,0 -79.7200352271452,38.3946858203824,0 -79.6840924127456,38.4302381558023,0 -79.6926537316952,38.50035433771,0 -79.6656146350943,38.5207779063414,0 -79.6694300335236,38.5501770266588,0 -79.642406563286,38.5923552608138,0 -79.5365137543052,38.5538055741145,0 -79.48634757115821,38.4621448879803,0 -79.3169995976733,38.4126332297745,0 -79.27235884061081,38.4373067075038,0 -79.2316628792895,38.4804961745132,0 + + + + + + + + Wisconsin + empty + + +states.AREA: + 56088.178 + + +states.STATE_NAME: +Wisconsin + + +states.STATE_FIPS: +55 + + +states.SUB_REGION: +E N Cen + + +states.STATE_ABBR: +WI + + +states.POP2000: + 5363675 + + +states.POP2001: + 5408886 + + +states.POP00_SQMI: + 96 + + +states.DEN_0_100: + 92 + + +USStates.ID: + 30 + + +USStates.State_Name: +Wisconsin + + +USStates.Date_Entered: +May 29 1848 + + +USStates.Year_Entered: +1848 + + +USStates.Year_Settled: +1766 + +]]> + #Style_5 + + + -90.006191227598,44.6331178864174,0 + + + + + + + -87.74855485166989,44.9616167936432,0 -87.6203354938252,44.9919977731043,0 -87.6185214385406,45.0568068963915,0 -87.58127586164061,45.0946399102465,0 -87.6648864796573,45.1090540526029,0 -87.6728141404664,45.1406726367061,0 -87.72966881168701,45.1766048406442,0 -87.7361999812867,45.1990723551736,0 -87.72162823196,45.2116719436728,0 -87.71966802928161,45.23677159669181,0 -87.7051420461443,45.2470862859939,0 -87.7044714190303,45.2722051755656,0 -87.645362038293,45.34816920676,0 -87.6436840378919,45.3618558882988,0 -87.6895980065264,45.3912693654604,0 -87.76003806908641,45.3528977344774,0 -87.8280078733776,45.3583213196226,0 -87.84128251380081,45.3461489152026,0 -87.86209606573161,45.3701651658513,0 -87.86853527657431,45.3720723766891,0 -87.8739746664525,45.36208580082749,0 -87.8836106233029,45.36585448274341,0 -87.8495317013046,45.4061175328758,0 -87.8602674034623,45.445098404767,0 -87.8136146858711,45.4664604760223,0 -87.78938490783349,45.49906763103741,0 -87.8051409550811,45.5445258364016,0 -87.8286019788526,45.5685917608724,0 -87.78631248967309,45.5685197968153,0 -87.77507546391441,45.6003869719677,0 -87.7760447968861,45.61320014924521,0 -87.8199378153198,45.6544505099681,0 -87.81705427025651,45.6653907719653,0 -87.7809448308433,45.67591566979451,0 -87.7774737292068,45.6841018123955,0 -87.8011558298595,45.70132435444889,0 -87.8015528795181,45.71139103613621,0 -87.8423627328109,45.7224184643369,0 -87.873628831766,45.7506993690495,0 -87.9691796312807,45.7664485705759,0 -87.99006981134831,45.7950463354111,0 -88.0516393398365,45.7861121476097,0 -88.0887340937991,45.79153251888161,0 -88.12994949370579,45.8194019526506,0 -88.121786443611,45.8348779040675,0 -88.0654210733109,45.8736421368008,0 -88.0957641221132,45.8918035055568,0 -88.093850061765,45.9206153043833,0 -88.1113904221148,45.9262876744074,0 -88.15043842419399,45.93629352156811,0 -88.1801939444304,45.9535166684228,0 -88.2149918189356,45.9479016364541,0 -88.25716803963969,45.9670551908873,0 -88.2991520587513,45.9619441469833,0 -88.32132305028109,45.9667127656587,0 -88.3699382062343,45.9945870784701,0 -88.40352211244171,45.9834220708464,0 -88.4543189656679,46.0007603460834,0 -88.483813961278,45.99915098858521,0 -88.49408327895949,46.0129599627087,0 -88.5156131830942,46.01860956196891,0 -88.5483579419945,46.0193002259831,0 -88.575357692098,46.0089590630598,0 -88.5975360335339,46.0155164912387,0 -88.61550234597981,45.9941205068572,0 -88.6436694832571,45.9933882928391,0 -88.6773838648913,46.0201441283944,0 -88.7036055788856,46.01892364058919,0 -88.7264096386053,46.029581736083,0 -88.7730171354202,46.021147746959,0 -88.7774806211023,46.0326143605406,0 -88.7938153525548,46.0363602068919,0 -88.80439717033499,46.0268046239007,0 -88.92519544224371,46.07360150800961,0 -88.9853010679315,46.1003912267907,0 -89.0998061353819,46.14564279170131,0 -89.925136091667,46.30402570041401,0 -90.1116593658125,46.3404289934283,0 -90.11517713167859,46.3651557309551,0 -90.1417974652462,46.39389931520821,0 -90.1613911037779,46.4423800673451,0 -90.2115257849797,46.5062949924702,0 -90.2584017374293,46.5087897865362,0 -90.2697849871137,46.5224805256097,0 -90.300181077668,46.5250515829943,0 -90.3023935803059,46.544296405249,0 -90.3137081584288,46.5515632659266,0 -90.38552505384241,46.5396577407228,0 -90.4081998571279,46.5686106643971,0 -90.54087719523838,46.587526707927,0 -90.73071390600759,46.6456961932741,0 -90.92624380194491,46.5855029087847,0 -90.77744559539779,46.8831225522614,0 -90.77448622396531,46.920235051196,0 -90.86173042389699,46.95247952331161,0 -91.55577281851249,46.7568600006141,0 -91.9214609310238,46.68013425257289,0 -92.0041571605491,46.6838004124073,0 -92.0959698317733,46.742627480002,0 -92.20915417453909,46.6468720259673,0 -92.2872715563534,46.6587860038615,0 -92.28868526089251,46.4159840674228,0 -92.2889439643788,46.1566006735494,0 -92.28937040263681,46.0732311286316,0 -92.3273726656403,46.05687820515121,0 -92.34622483014461,46.02259611620039,0 -92.36496279806639,46.0162488119767,0 -92.424999275654,46.02550410046081,0 -92.46234575772182,45.9811975360765,0 -92.523976865602,45.9825831928093,0 -92.5526720844383,45.951269177817,0 -92.66620788226589,45.9157031282064,0 -92.7062407667141,45.8909581511523,0 -92.73409766347459,45.8449807095829,0 -92.7487619268784,45.8373020678585,0 -92.7791069996475,45.7633404333685,0 -92.8336362361192,45.7308902363902,0 -92.86001973034908,45.7105625427853,0 -92.88539736667759,45.6449553564473,0 -92.87683120537091,45.5788365687146,0 -92.8350370161896,45.5634021889124,0 -92.7621749006385,45.5642634927727,0 -92.72815467639281,45.5472423195578,0 -92.6854210050266,45.47005330592301,0 -92.65481774623471,45.4552217732121,0 -92.64497507097812,45.4394520895191,0 -92.6487510358123,45.3954659291152,0 -92.6848697682278,45.3630764817203,0 -92.70738439950389,45.3182016620431,0 -92.7465933709999,45.2976031328022,0 -92.7554192919425,45.21237648106559,0 -92.76258304535911,45.1866121435376,0 -92.74493484528919,45.15642269767639,0 -92.745422213769,45.1130040157029,0 -92.7967618135124,45.06561027085739,0 -92.76299156220411,45.0221192057595,0 -92.76712645766899,45.00100490501169,0 -92.74976784308311,44.9356555439475,0 -92.75392579385328,44.9150027795129,0 -92.77187081519131,44.8994959546817,0 -92.7642634372038,44.8622340952332,0 -92.76102806028632,44.8353710549111,0 -92.8055846707726,44.7461605361291,0 -92.7371456955245,44.7135944805029,0 -92.6303675936169,44.6426524073846,0 -92.60897363372321,44.6102923158697,0 -92.50921485952681,44.5751591745776,0 -92.3408725165741,44.552835394321,0 -92.32047800875431,44.5404910618561,0 -92.2966874837295,44.4921818837451,0 -92.24910036010419,44.4562167874695,0 -92.20613743547611,44.438394406506,0 -92.09133339981391,44.4155898138742,0 -91.9723859734527,44.3644872200889,0 -91.93886834504872,44.339111391384,0 -91.92275412337878,44.3175199116197,0 -91.92234937163771,44.2883410303644,0 -91.8886943206616,44.2574949606432,0 -91.8487439445729,44.1911872320563,0 -91.75321932280971,44.137227713274,0 -91.65223360680488,44.0668957468858,0 -91.60178627007811,44.0408222716716,0 -91.5691620630017,44.0349552968239,0 -91.5284201557391,44.0342152895652,0 -91.42590181819401,43.9856198570706,0 -91.37335730440661,43.9471911008781,0 -91.2919479787799,43.8471907610578,0 -91.25110489264939,43.7880757984421,0 -91.2589159418758,43.722395792303,0 -91.25838918935199,43.6773222933277,0 -91.23298990442041,43.5988900700786,0 -91.2405580213774,43.5487125887566,0 -91.22356677965871,43.5008086595185,0 -91.2359034673886,43.4646842675378,0 -91.2109165788835,43.4240510516753,0 -91.1982436244129,43.3705129909022,0 -91.1770487337014,43.3539461618861,0 -91.0784980300101,43.3132978076873,0 -91.0664279003866,43.2806829026437,0 -91.06905228836891,43.2578982275476,0 -91.16135406498178,43.1475759290793,0 -91.16857153421861,43.0828878927565,0 -91.15975182052971,43.0811827642084,0 -91.15221381349258,43.0013164133112,0 -91.13912173775438,42.9258937074417,0 -91.09342868782861,42.8714402959622,0 -91.08203032553689,42.7833648801814,0 -91.06616869540581,42.7449138543659,0 -90.9991821130899,42.7070587627347,0 -90.9194089569959,42.6806774289755,0 -90.8925456651592,42.6782400547389,0 -90.74561006958859,42.6570014302673,0 -90.69479111313748,42.6379287671111,0 -90.66438062716411,42.5713918079808,0 -90.6392190290607,42.5557141169534,0 -90.62570743484611,42.5285622838299,0 -90.6384560963599,42.5093636839918,0 -90.42010292616368,42.5083649645861,0 -89.92369141557219,42.5041158651446,0 -89.8347389483978,42.5034685663175,0 -89.4006131996787,42.4975019535639,0 -89.35955888342031,42.4979178413637,0 -88.93918704924511,42.4908797705788,0 -88.76505788322029,42.4909223638021,0 -88.7066230964608,42.4896714789996,0 -88.29798928423431,42.4919886619727,0 -88.1947902657089,42.4896315487889,0 -87.7973819562241,42.4891528495242,0 -87.7915093421034,42.6666421877559,0 -87.75680359819531,42.7775461743457,0 -87.8198490647725,42.8415630287346,0 -87.83643858345231,42.9645925117624,0 -87.8919832366482,43.025774767081,0 -87.8600693594594,43.0758754737799,0 -87.8898341046723,43.1972168501054,0 -87.875332265271,43.3585925444523,0 -87.8029594309868,43.4587140200272,0 -87.78604512144111,43.5462973726183,0 -87.70272990708931,43.673176184158,0 -87.72612185690799,43.8939039013687,0 -87.6443707723702,44.0978304833909,0 -87.517321870142,44.1757544438288,0 -87.5374888264266,44.327851040331,0 -87.47352841738911,44.533946428449,0 -87.3730698286243,44.6769179257202,0 -87.3144651480241,44.7947187667926,0 -87.3674596241917,44.8115671454801,0 -87.4337469078088,44.8910966193734,0 -87.55167267236649,44.823023674588,0 -87.552787538369,44.851335539726,0 -87.61446385443389,44.8330474436257,0 -87.723821711772,44.6892873054325,0 -87.76422675186269,44.6440484536295,0 -87.86878274845451,44.6169062804272,0 -87.9264086419018,44.5391395831433,0 -87.9662280659456,44.5354962244836,0 -88.0404176211491,44.5714491701447,0 -88.0130207863445,44.6222344891289,0 -87.9757579463198,44.5958140991105,0 -88.0132878703546,44.6391183587922,0 -87.9831820526739,44.6772654177868,0 -87.9857916005318,44.7204744571881,0 -87.8310199470414,44.8733464383329,0 -87.83999268056699,44.9273231952437,0 -87.74855485166989,44.9616167936432,0 + + + + + + + + + -87.0345243941477,45.29040569681539,0 -87.0660643522929,45.29646276758369,0 -87.17791321565861,45.1549729181694,0 -87.2309150393896,45.1750634565753,0 -87.28348460482739,45.05261932024141,0 -87.3421608618244,45.0152129710161,0 -87.4054197495813,44.9111998705663,0 -87.3787368982934,44.8377427071621,0 -87.3111236315354,44.7987737179537,0 -87.2056505657533,44.8732394343083,0 -87.168787947216,44.9333234999383,0 -87.1786927530738,44.9828064333324,0 -87.1125569146153,45.0647632237614,0 -87.08390064938131,45.0532855496328,0 -87.087678597292,45.0921787982349,0 -87.0449009447467,45.0955132700304,0 -87.0798757822438,45.14730698190781,0 -87.025448092593,45.1499741010013,0 -87.0451125513507,45.2490190549771,0 -86.9957342551258,45.2184117241819,0 -86.9677122639217,45.2402774692093,0 -86.9862536657799,45.29865699129501,0 -87.0345243941477,45.29040569681539,0 + + + + + + + + + Wyoming + empty + + +states.AREA: + 97803.199 + + +states.STATE_NAME: +Wyoming + + +states.STATE_FIPS: +56 + + +states.SUB_REGION: +Mtn + + +states.STATE_ABBR: +WY + + +states.POP2000: + 493782 + + +states.POP2001: + 495345 + + +states.POP00_SQMI: + 5 + + +states.DEN_0_100: + 100 + + +USStates.ID: + 44 + + +USStates.State_Name: +Wyoming + + +USStates.Date_Entered: +July 10 1890 + + +USStates.Year_Entered: +1890 + + +USStates.Year_Settled: +1834 + +]]> + #Style_5 + + + -107.553081008537,42.9982837598069,0 + + + + + + -104.053615199998,41.698218257724,0 -104.053513414154,41.9998153422964,0 -104.056219380476,42.6146696865973,0 -104.056198856311,43.0030623563908,0 -104.059157507468,43.4791339417582,0 -104.057913943497,43.5037122621461,0 -104.059479420181,43.8529065675403,0 -104.059731381692,44.1458254687842,0 -104.061036140765,44.1818252843501,0 -104.059465130268,44.5743526100096,0 -104.059842395291,44.9973362616199,0 -105.041795987521,45.0010758746085,0 -105.08500310735,44.9998170469188,0 -106.021150701601,44.9972137020636,0 -106.259231717931,44.9961625110408,0 -107.894374357914,44.9997736986363,0 -108.259238500746,45.00011515017601,0 -108.625256221974,44.9975931654829,0 -109.799385375449,44.9995227676354,0 -109.99552921526,45.0027929256921,0 -110.392759905743,44.9986252880153,0 -110.429649489646,44.9922851168859,0 -111.053428630452,44.9956954937749,0 -111.051615814026,44.6644904630696,0 -111.051560651262,44.4733232643312,0 -111.050405173289,43.9825533508377,0 -111.046771181184,43.5155282322774,0 -111.047498202203,43.2847346290475,0 -111.04921566545,43.0198830902658,0 -111.046780328328,42.503251870505,0 -111.04869741386,41.9962033494069,0 -111.051068773655,41.578592411864,0 -111.051651122482,41.2584254005779,0 -111.05102250907,40.9965835985974,0 -110.06318573561,40.9978919528284,0 -110.002165480573,40.9975995171866,0 -109.048314704754,40.9984333935171,0 -107.918671336725,41.0033751160193,0 -107.304051053295,41.0001333468858,0 -106.865438763821,40.9984573861084,0 -106.329125682765,41.001288969127,0 -106.203471481278,41.0000850018961,0 -105.278797604523,40.9963491628159,0 -104.934492922627,40.9942891435778,0 -104.05170553525,41.00321132686,0 -104.054012364451,41.3880858190034,0 -104.055500519791,41.5642223678205,0 -104.053615199998,41.698218257724,0 + + + + + + + + diff --git a/examples/data/kmz/iceland.kmz b/examples/data/kmz/iceland.kmz new file mode 100644 index 0000000000..ab7a1392c9 Binary files /dev/null and b/examples/data/kmz/iceland.kmz differ diff --git a/examples/data/polyline/route.json b/examples/data/polyline/route.json new file mode 100644 index 0000000000..731242ae53 --- /dev/null +++ b/examples/data/polyline/route.json @@ -0,0 +1 @@ +{"routes":[{"geometry":"hldhx@lnau`BCG_EaC??cFjAwDjF??uBlKMd@}@z@??aC^yk@z_@se@b[wFdE??wFfE}NfIoGxB_I\\gG}@eHoCyTmPqGaBaHOoD\\??yVrGotA|N??o[N_STiwAtEmHGeHcAkiA}^aMyBiHOkFNoI`CcVvM??gG^gF_@iJwC??eCcA]OoL}DwFyCaCgCcCwDcGwHsSoX??wI_EkUFmq@hBiOqBgTwS??iYse@gYq\\cp@ce@{vA}s@csJqaE}{@iRaqE{lBeRoIwd@_T{]_Ngn@{PmhEwaA{SeF_u@kQuyAw]wQeEgtAsZ}LiCarAkVwI}D??_}RcjEinPspDwSqCgs@sPua@_OkXaMeT_Nwk@ob@gV}TiYs[uTwXoNmT{Uyb@wNg]{Nqa@oDgNeJu_@_G}YsFw]kDuZyDmm@i_@uyIJe~@jCg|@nGiv@zUi_BfNqaAvIow@dEed@dCcf@r@qz@Egs@{Acu@mCum@yIey@gGig@cK_m@aSku@qRil@we@{mAeTej@}Tkz@cLgr@aHko@qOmcEaJw~C{w@kai@qBchBq@kmBS{kDnBscBnFu_Dbc@_~QHeU`IuyDrC_}@bByp@fCyoA?qMbD}{AIkeAgBk_A_A{UsDke@gFej@qH{o@qGgb@qH{`@mMgm@uQus@kL{_@yOmd@ymBgwE}x@ouBwtA__DuhEgaKuWct@gp@cnBii@mlBa_@}|Asj@qrCg^eaC}L{dAaJ_aAiOyjByH{nAuYu`GsAwXyn@ywMyOyqD{_@cfIcDe}@y@aeBJmwA`CkiAbFkhBlTgdDdPyiB`W}xDnSa}DbJyhCrXitAhT}x@bE}Z_@qW_Kwv@qKaaAiBgXvIm}A~JovAxCqW~WanB`XewBbK{_A`K}fBvAmi@xBycBeCauBoF}}@qJioAww@gjHaPopA_NurAyJku@uGmi@cDs[eRaiBkQstAsQkcByNmaCsK_uBcJgbEw@gkB_@ypEqDoqSm@eZcDwjBoGw`BoMegBaU_`Ce_@_uBqb@ytBwkFqiT_fAqfEwe@mfCka@_eC_UmlB}MmaBeWkkDeHwqAoX}~DcBsZmLcxBqOwqE_DkyAuJmrJ\\o~CfIewG|YibQxBssB?es@qGciA}RorAoVajA_nAodD{[y`AgPqp@mKwr@ms@umEaW{dAmb@umAw|@ojBwzDaaJsmBwbEgdCsrFqhAihDquAi`Fux@}_Dui@_eB_u@guCuyAuiHukA_lKszAu|OmaA{wKm}@clHs_A_rEahCssKo\\sgBsSglAqk@yvDcS_wAyTwpBmPc|BwZknFoFscB_GsaDiZmyMyLgtHgQonHqT{hKaPg}Dqq@m~Hym@c`EuiBudIabB{hF{pWifx@snAw`GkFyVqf@y~BkoAi}Lel@wtc@}`@oaXi_C}pZsi@eqGsSuqJ|Lqeb@e]kgPcaAu}SkDwzGhn@gjYh\\qlNZovJieBqja@ed@siO{[ol\\kCmjMe\\isHorCmec@uLebB}EqiBaCg}@m@qwHrT_vFps@kkI`uAszIrpHuzYxx@e{Crw@kpDhN{wBtQarDy@knFgP_yCu\\wyCwyA{kHo~@omEoYmoDaEcPiuAosDagD}rO{{AsyEihCayFilLaiUqm@_bAumFo}DgqA_uByi@swC~AkzDlhA}xEvcBa}Cxk@ql@`rAo|@~bBq{@``Bye@djDww@z_C_cAtn@ye@nfC_eC|gGahH~s@w}@``Fi~FpnAooC|u@wlEaEedRlYkrPvKerBfYs}Arg@m}AtrCkzElw@gjBbh@woBhR{gCwGkgCc[wtCuOapAcFoh@uBy[yBgr@c@iq@o@wvEv@sp@`FajBfCaq@fIipAdy@ewJlUc`ExGuaBdEmbBpBssArAuqBBg}@s@g{AkB{bBif@_bYmC}r@kDgm@sPq_BuJ_s@{X_{AsK_d@eM{d@wVgx@oWcu@??aDmOkNia@wFoSmDyMyCkPiBePwAob@XcQ|@oNdCoSfFwXhEmOnLi\\lbAulB`X_d@|k@au@bc@oc@bqC}{BhwDgcD`l@ed@??bL{G|a@eTje@oS~]cLr~Bgh@|b@}Jv}EieAlv@sPluD{z@nzA_]`|KchCtd@sPvb@wSb{@ko@f`RooQ~e[upZbuIolI|gFafFzu@iq@nMmJ|OeJn^{Qjh@yQhc@uJ~j@iGdd@kAp~BkBxO{@|QsAfYgEtYiGd]}Jpd@wRhVoNzNeK`j@ce@vgK}cJnSoSzQkVvUm^rSgc@`Uql@xIq\\vIgg@~kDyq[nIir@jNoq@xNwc@fYik@tk@su@neB}uBhqEesFjoGeyHtCoD|D}Ed|@ctAbIuOzqB_}D~NgY`\\um@v[gm@v{Cw`G`w@o{AdjAwzBh{C}`Gpp@ypAxn@}mAfz@{bBbNia@??jIab@`CuOlC}YnAcV`@_^m@aeB}@yk@YuTuBg^uCkZiGk\\yGeY}Lu_@oOsZiTe[uWi[sl@mo@soAauAsrBgzBqgAglAyd@ig@asAcyAklA}qAwHkGi{@s~@goAmsAyDeEirB_{B}IsJuEeFymAssAkdAmhAyTcVkFeEoKiH}l@kp@wg@sj@ku@ey@uh@kj@}EsFmG}Jk^_r@_f@m~@ym@yjA??a@cFd@kBrCgDbAUnAcBhAyAdk@et@??kF}D??OL"}]} diff --git a/examples/data/topojson/fr-departments.json b/examples/data/topojson/fr-departments.json new file mode 100644 index 0000000000..1ceda832ce --- /dev/null +++ b/examples/data/topojson/fr-departments.json @@ -0,0 +1 @@ +{"type":"Topology","transform":{"scale":[0.0012781599895488503,0.0008731329749103904],"translate":[-5.115416999999923,41.349029000000144]},"arcs":[[[9931,7737],[-56,53],[-26,62],[-96,43],[-64,87],[-51,9]],[[9638,7991],[-83,37],[15,78],[-13,81]],[[9557,8187],[9,41]],[[9566,8228],[73,3],[63,110],[12,169],[-39,31],[-93,24],[-120,64],[-13,47],[54,53],[15,69],[45,-9],[56,-52],[96,-28],[203,8],[62,114]],[[9980,8831],[178,-25],[46,14],[111,-44],[100,-63],[-42,-66],[-33,-99],[-100,-59],[-3,-38],[-93,-88],[-35,-75],[1,-75],[-28,-27],[-29,-108],[11,-78],[-37,-29],[-22,-95],[-57,-83],[-17,-56]],[[9588,7050],[-12,85],[-76,55],[28,94],[-133,55],[-35,49]],[[9360,7388],[82,211],[78,97],[18,100],[60,70],[40,125]],[[9931,7737],[1,-85],[31,-79],[-50,-96],[-25,-249],[53,-56],[-6,-34],[-65,-44],[9,-49],[-100,-74],[-168,16],[-23,63]],[[4973,4689],[47,-100],[-43,-63],[46,-50],[-17,-127],[59,18],[50,-144]],[[5115,4223],[1,-166],[-54,-45],[-11,-83],[-39,-47],[-74,-41],[-82,-118]],[[4856,3723],[-87,62],[-101,-47],[-8,94],[-46,14],[-72,-34],[-37,40],[-132,-25],[-42,-39],[-62,-9],[-26,60],[28,50],[-41,59]],[[4230,3948],[16,96],[-46,11],[-102,-44],[-87,35],[-6,94],[27,65],[18,103],[-76,39]],[[3974,4347],[72,99]],[[4046,4446],[72,4],[91,103],[7,120],[146,127],[56,125],[64,41]],[[4482,4966],[41,16],[69,-54],[-6,-47],[78,-21],[22,30],[106,12],[38,-59],[54,-33],[-25,-65],[21,-30],[93,-26]],[[3443,4550],[115,43],[20,-45],[108,-80],[3,-88],[43,18],[105,-87],[137,36]],[[4230,3948],[-74,-45],[-49,17],[-35,-44],[73,-46],[-22,-90],[-60,0],[-83,-134],[6,-97],[28,-48],[-73,-17],[15,-61],[-32,-66],[-45,-33]],[[3879,3284],[-49,16],[-53,-40],[-45,5],[-25,79],[-97,103],[-92,56],[-56,53],[-116,-35],[-81,35],[-89,-10],[35,98],[-71,17],[-69,-49],[-47,-8]],[[3024,3604],[-1,59],[47,130],[84,-20],[31,63],[-85,78],[-77,-61],[22,169],[48,505],[8,212],[65,40],[208,-202],[33,-78],[13,-91],[58,-35],[-35,177]],[[3879,3284],[43,-75],[74,5],[106,-24],[-35,-79],[2,-62]],[[4069,3049],[-27,-16],[1,-81],[-65,8],[-17,87],[-48,-59],[-59,0],[-38,-45],[23,-85],[-4,-111],[-25,-81],[-35,-38],[21,-61]],[[3796,2567],[-43,-42],[-74,7],[-41,30],[-84,-53],[-60,21],[-73,-8],[-21,29],[-117,-4],[-62,-57],[-58,-10],[-87,21],[-30,34],[-98,-50],[-87,-7],[-45,30]],[[2816,2508],[53,116],[8,72],[53,261],[47,256],[47,391]],[[4856,3723],[-41,-31],[-46,8],[5,-93],[35,-60],[-4,-67]],[[4805,3480],[-126,-58],[45,-37],[3,-78],[-43,-23],[0,-63],[-45,6],[-53,-84]],[[4586,3143],[-67,-16],[-43,28],[-86,-34],[-41,-45],[-101,-35],[-59,7],[-60,-31],[-60,32]],[[3882,2560],[64,-93],[60,-136],[-41,-39],[-5,-98],[-56,-97],[-76,-90],[-7,-48],[-75,-46],[18,-61],[-59,-56],[12,-115]],[[3717,1681],[-63,-24],[-44,36],[-52,-52],[-27,57],[-102,76],[-15,79],[-45,-18],[-106,3],[-49,42],[-98,20],[-90,40],[-77,55],[-6,-72],[-69,21],[-23,52],[44,42],[24,71],[0,72],[-95,46],[-127,24],[-47,-21],[-32,89],[81,29],[52,38],[65,122]],[[3796,2567],[86,-7]],[[3919,2350],[-28,-81],[53,5],[-25,76]],[[3865,2241],[13,-84],[42,27],[-55,57]],[[6831,6163],[61,-132],[27,-96],[173,-72],[34,-199],[-59,-47]],[[7067,5617],[-116,-24],[38,-262],[-78,-26],[-29,-33]],[[6882,5272],[-86,68],[-46,0],[-76,53],[-59,6],[-143,-15],[-46,10],[-22,55],[-80,10],[-49,60],[18,98],[-65,9],[-79,-55],[-77,-100],[-77,2]],[[5995,5473],[-30,88],[-66,71],[-35,64],[-46,-4],[-27,81]],[[5791,5773],[5,62],[83,97],[141,9],[14,33],[-16,96],[36,65],[61,23],[60,-25],[104,76],[100,40]],[[6379,6249],[4,-68],[107,-79],[53,38],[63,-18],[45,27],[59,-68],[121,82]],[[6413,4612],[5,-78],[94,-13],[56,-87],[31,-121],[-1,-97],[33,-58]],[[6631,4158],[-70,-41],[-36,-50],[-75,2],[-69,-111],[-16,-79],[-47,-95]],[[6318,3784],[-34,46],[-10,124],[-61,66],[-82,25],[5,63],[-46,19],[-33,-55],[-59,-155],[-76,-121],[-196,17],[-20,-52]],[[5706,3761],[-42,82],[21,133],[-67,155],[0,44]],[[5618,4175],[44,10],[-14,77],[48,85],[8,64],[46,78],[96,108],[97,38],[30,90]],[[5973,4725],[93,-22],[67,-62],[76,-7],[84,-89],[47,-22],[73,89]],[[7024,4597],[64,6],[40,-26],[149,51],[53,-47],[67,-10],[22,-93],[73,-12]],[[7492,4466],[-9,-79],[-72,-138],[-74,-116],[-68,-69],[-92,-36],[-103,-99],[-44,-21],[16,-78]],[[7046,3830],[-50,38],[-3,63],[-40,29],[-69,3],[-157,-28],[-96,223]],[[6413,4612],[163,60],[74,-33],[59,35],[132,-96],[46,40],[51,-51],[40,43],[46,-13]],[[6882,5272],[36,-60],[-27,-115],[64,-137],[115,-113],[44,-92],[-4,-47],[-56,-44],[-30,-67]],[[5973,4725],[0,97],[-36,92],[36,58],[-45,82]],[[5928,5054],[-47,107],[86,43],[11,64],[44,31],[12,51],[-39,123]],[[3103,9177],[-1,0]],[[3102,9177],[1,0]],[[3103,9178],[0,-1]],[[3103,9177],[0,1]],[[4258,9265],[-13,-133],[94,-98],[19,-92],[-1,-97],[18,-80]],[[4375,8765],[-72,-25],[-99,13],[-26,-34],[-64,1],[-137,-123],[-13,-33],[-84,33],[-81,11],[-24,-52],[-88,72],[-79,-23],[-97,6],[-103,-96],[-45,2]],[[3363,8517],[-32,-6],[-86,47],[-46,-24],[-87,60],[84,81],[-44,20],[19,59],[110,27],[41,45],[18,68],[-58,57],[38,63],[-88,4],[-68,49],[-49,104]],[[3115,9171],[49,39],[97,6],[91,-43],[185,-21],[143,-5],[90,-45],[112,-11],[139,58],[82,75],[127,39]],[[4230,9263],[28,2]],[[3103,9178],[12,-7]],[[3363,8517],[97,-97],[-13,-86],[-84,-112]],[[3363,8222],[-34,-10],[-145,35]],[[3184,8247],[-117,37],[-64,-60],[-75,-43],[-52,7],[-77,104],[24,48]],[[2823,8340],[2,61],[-55,82],[-7,108],[17,90],[-38,170],[14,68],[-90,208],[-79,61],[-34,158],[9,74],[-27,97],[-50,14],[13,64],[76,-41],[153,-36],[96,3],[55,43],[116,-8],[46,-83],[-59,-54],[2,-45],[95,-127],[24,-70]],[[4660,8401],[1,-47],[57,-101],[34,-22],[-8,-98],[-34,-81],[-77,-29],[-16,-80],[8,-80]],[[4625,7863],[-76,-7],[-47,59],[-97,16],[-74,75],[-19,127],[-152,45],[-85,-77],[-83,27]],[[3992,8128],[-9,31],[-80,-2],[-53,139],[-49,-55],[-76,-39],[-162,19],[-45,-30],[-139,-21],[-16,52]],[[4375,8765],[-19,-80],[76,-53],[47,20],[41,-62],[88,-77],[-1,-63],[53,-49]],[[7713,7626],[46,-4],[33,-46],[-14,-47],[98,-81],[-1,-65],[-34,-20],[52,-120],[167,-20],[155,-57]],[[8215,7166],[61,-4],[24,-78],[-29,-60],[-47,-11],[57,-117],[31,-2],[-3,-87]],[[8309,6807],[-77,-160],[-26,-79],[-92,-43],[-13,-66]],[[8101,6459],[-101,-41],[-51,23],[-169,-41],[-125,-55],[-65,63],[-33,61],[-152,60],[-21,49],[-99,64],[-59,-15]],[[7226,6627],[67,50],[-66,128],[-16,81]],[[7211,6886],[17,176],[45,39],[74,176],[-29,77],[39,51],[-34,55],[10,104]],[[7333,7564],[19,29],[79,-9],[126,8],[41,77],[115,-43]],[[7226,6627],[-49,-18],[-8,-91],[-32,-46],[65,-134],[-34,-133],[-60,-25],[-41,-49],[-92,-21],[-37,46],[-107,7]],[[6379,6249],[18,64],[-1,122],[-39,132],[-29,171],[-80,120],[12,173],[-22,37]],[[6238,7068],[115,75]],[[6353,7143],[77,24],[40,-76],[142,-73],[44,46],[76,-5],[119,-47],[28,-64],[95,-14],[59,-57],[46,18],[73,-78],[59,69]],[[8101,6459],[57,-117],[110,-56],[-61,-37],[34,-214],[-34,-102],[35,-36],[-77,-57]],[[8165,5840],[-55,-32],[-83,72],[-61,-2],[-78,29],[-57,-37],[-30,-126],[-63,-200]],[[7738,5544],[-48,-8],[-36,121],[-199,-12],[-36,-96]],[[7419,5549],[-7,-44],[-110,-2],[-17,46],[-111,-5],[-60,-22],[-76,53],[29,42]],[[6641,8067],[89,-42],[81,-99],[-29,-98],[139,-56],[50,-41],[59,-91],[52,-28],[-19,-64],[36,-23],[94,14],[77,31],[63,-6]],[[6353,7143],[-53,44],[0,50],[-45,69],[-10,56],[78,11],[33,40],[21,117],[73,45],[-32,111],[-16,114],[-28,46],[-51,3]],[[6323,7849],[31,55],[36,146],[50,9],[170,-9],[31,17]],[[2317,8321],[113,-101],[18,28]],[[2448,8248],[18,6]],[[2466,8254],[51,-27],[6,-52],[-46,-37],[6,-153],[-45,-27],[-83,21],[-61,-42],[-64,-130]],[[2230,7807],[-62,-17],[-44,70],[-75,-38],[-24,-82],[-40,-37],[-56,9],[-30,84],[-124,19],[-121,41],[-47,41],[-40,-81],[-35,17],[-175,-11],[-38,42],[-61,1]],[[1258,7865],[-28,66],[44,28],[-44,82],[-21,117],[6,73],[46,63],[-111,89]],[[1150,8383],[51,2],[-6,116],[17,43],[70,34],[39,-46],[105,37],[72,8],[84,37],[15,-57],[49,2],[-1,-63],[48,-2],[19,-64],[85,-68],[-1,-64],[84,-48],[86,2],[84,63],[130,74],[33,-6],[66,-97],[38,35]],[[1258,7865],[-138,-44],[-28,-45],[19,-45],[91,-94],[62,8],[52,-24],[45,16],[15,-61],[-19,-66],[-109,-118]],[[1248,7392],[-10,-42],[-112,10],[-137,28],[-45,74],[-104,-20],[-56,28],[-38,-25],[-23,-62],[-81,-4],[-40,50],[-13,61],[-48,85],[-227,80],[33,33],[232,56],[54,-24],[28,52],[-36,79],[-103,36],[-89,1],[8,66],[111,-21],[79,25],[-1,47],[-102,-14],[-29,65],[-102,-52],[-120,40],[-27,49],[24,60],[-9,59],[56,59],[72,3],[37,56],[69,2],[120,61],[38,-31],[67,39],[168,17],[21,-53],[65,20],[18,43],[82,2],[72,-47]],[[2317,8321],[77,30],[54,-103]],[[3184,8247],[12,-190],[-38,-89],[12,-84],[56,-123],[-5,-126],[-77,-27],[-58,-160]],[[3086,7448],[-33,-42]],[[3053,7406],[-83,0],[-36,40],[-64,2],[-133,-87],[-50,-59],[-152,4],[-159,-48]],[[2376,7258],[-41,77],[29,66],[56,64],[-37,118],[-74,57],[-80,3],[23,94],[-22,70]],[[2466,8254],[-50,97],[31,50],[98,20],[-4,-69],[69,-41],[110,14],[66,31],[37,-16]],[[1458,6920],[75,-33],[64,-87],[-113,8],[-36,67],[10,45]],[[2376,7258],[13,-27],[-24,-138],[-32,2],[-155,-73],[-66,17],[-38,-53]],[[2074,6986],[-44,89],[-111,-8],[-118,-39],[-5,66],[62,1],[13,58],[-45,30],[-268,-62],[-128,152],[-68,24],[-62,-28],[-37,40],[-15,83]],[[5791,5773],[-101,42]],[[5690,5815],[18,48],[-20,68],[-4,225],[-45,116],[57,67],[-54,59],[-2,81],[-66,133],[-76,-30],[-83,25],[-36,31],[59,80]],[[5438,6718],[48,-12],[13,83],[63,-15],[108,24],[7,163],[79,37],[-10,97],[-53,5],[-5,59],[74,28]],[[5762,7187],[110,-37],[45,25],[76,-54],[65,-87],[70,39],[65,-24],[45,19]],[[5515,8143],[29,-7],[33,-105],[4,-76]],[[5581,7955],[-27,-75],[1,-63],[-36,-65],[-128,-41],[-47,3],[-132,-111]],[[5212,7603],[-65,30],[-35,-40],[-80,12],[-66,-15],[-70,123],[-53,21],[-23,45],[-60,-40],[-86,2]],[[4674,7741],[33,60],[-82,62]],[[4660,8401],[111,50],[117,29],[13,32],[83,-24],[79,9],[25,52],[72,59],[-3,84]],[[5157,8692],[50,-21],[56,-102],[18,-96],[-19,-52],[67,-151],[52,-49],[27,-61],[50,-28],[57,11]],[[5690,5815],[-86,-13],[-110,36],[-33,-18],[-63,23],[-34,-46],[-184,-11],[-80,-35]],[[5100,5751],[-33,25],[-56,-29],[-94,20]],[[4917,5767],[-1,47],[45,54],[-97,92],[-127,30],[-20,61],[21,118]],[[4738,6169],[73,47],[-17,52],[51,218],[79,25],[48,-15],[49,83],[46,16],[9,79]],[[5076,6674],[82,63],[169,51],[46,1],[65,-71]],[[4487,7280],[57,-42],[132,-26],[33,-54],[118,23],[55,-209],[-1,-97],[-21,-49],[41,-41],[62,9],[33,-60],[80,-60]],[[4738,6169],[-58,23],[-15,62],[-96,101],[-44,109],[-79,50],[15,-93],[-100,0],[-60,-28],[-65,29],[-23,45],[2,82],[-169,103]],[[4046,6652],[35,151],[65,141],[38,227],[-11,24]],[[4173,7195],[86,-49],[15,49],[169,46],[44,39]],[[5904,7963],[69,-114],[-28,-65],[82,-26],[161,54],[120,11],[15,26]],[[5762,7187],[-15,33],[-103,24],[-93,-13],[-81,25],[-26,-33],[-68,26],[-43,63],[-86,18],[-42,91],[21,52],[-35,44],[21,86]],[[5581,7955],[91,11],[61,33],[44,-35],[46,19],[81,-20]],[[4487,7280],[43,82],[76,29],[0,116],[65,18],[-8,125],[-34,22],[45,69]],[[8205,9477],[-51,-87],[-78,7],[-54,36],[-55,-99],[22,-61],[0,-82],[-34,-44],[-8,-72],[-47,-36]],[[7900,9039],[-30,27],[-57,-40],[-50,30],[-145,-15],[-47,42],[-80,-10],[-48,57],[-66,16],[-41,45],[-158,37]],[[7178,9228],[11,116],[36,186],[48,20],[62,84],[-32,46],[42,145],[-41,39]],[[7304,9864],[82,5],[108,-35],[98,49],[66,8],[15,110],[100,89],[40,-60],[-36,-45],[-9,-90],[56,-102],[-24,-41],[49,-84],[54,16],[86,-52],[59,-71],[75,-2],[82,-82]],[[7636,8220],[1,-87],[101,-74],[82,-125],[7,-112],[-16,-82],[-111,8],[25,-71],[-12,-51]],[[6641,8067],[-2,97],[40,77],[87,111]],[[6766,8352],[115,-116],[133,-37],[130,147],[178,99],[40,-27],[4,-96],[130,-114],[140,12]],[[8253,8113],[-24,-41],[37,-58],[80,-19],[119,-156],[-31,-20],[-55,-101],[110,-72],[43,-87],[76,21]],[[8608,7580],[21,-68],[-52,-67],[-64,1],[-43,-41],[-27,-136],[-68,-42],[-48,24],[-66,-6],[-46,-79]],[[7636,8220],[106,-17],[44,42],[-9,59],[64,-10],[-18,68],[102,16]],[[7925,8378],[17,-43],[139,-36],[99,-100],[65,-39],[8,-47]],[[7900,9039],[-32,-98],[26,-77],[-11,-69],[56,-30],[-19,-81],[-64,-24],[-35,-83],[42,-92],[48,-11],[14,-96]],[[6766,8352],[-70,43],[-31,92],[33,37],[-18,45],[36,40]],[[6716,8609],[76,82],[37,83],[-31,51],[33,46],[-16,46],[98,42],[-58,119],[32,71],[54,24],[65,-12],[60,43],[88,-21],[24,45]],[[10712,1179],[142,-83],[44,7],[20,-63],[129,-71],[85,-171],[57,-32],[19,-99],[-7,-81],[66,-50],[88,51]],[[11355,587],[8,-109],[-17,-121],[-52,-64],[-25,-136],[-35,-45],[10,-41],[-33,-49],[-96,41],[11,28],[-88,63],[-55,13],[-106,72],[13,88],[53,13],[5,57],[-71,14],[-58,60],[45,57],[25,92],[-141,41],[26,96],[67,35],[-41,80],[-51,14],[-43,52],[4,82],[90,27],[-88,132]],[[10712,1179],[59,41],[13,118],[48,53],[58,7],[5,41],[54,27],[111,16],[80,103],[104,-16],[23,-50],[47,69],[-2,70],[-26,42],[35,95],[-9,96],[92,-14],[24,-222],[-16,-29],[-17,-127],[61,-107],[11,-124],[-7,-98],[22,-102],[-4,-180],[-116,-201],[-7,-100]],[[9351,7104],[66,-24],[32,-44],[-11,-64]],[[9438,6972],[-47,-66],[40,-21],[82,15],[10,-43],[-82,-47],[5,-57],[-82,-96],[-88,-57],[-83,-132],[-103,-27],[-39,-45],[16,-88],[-7,-81],[-155,-131],[-112,-118]],[[8793,5978],[-48,39],[-6,97],[77,52],[-2,65],[-94,45],[-63,174],[-65,17],[-70,70],[27,26],[4,94],[-42,33],[-8,72]],[[8503,6762],[173,82],[62,8],[158,100],[52,73],[93,36],[22,-30],[94,4],[87,86],[63,-40],[44,23]],[[9360,7388],[-62,-72],[42,-109],[-12,-57],[23,-46]],[[8503,6762],[-134,-4],[-60,49]],[[8608,7580],[66,-11],[78,52],[58,-14],[30,-78],[32,-12],[128,34],[49,-58],[47,-12],[98,33],[102,-102],[64,-24]],[[8793,5978],[24,-35],[-62,-81],[-3,-50]],[[8752,5812],[-131,-183],[-30,-13],[-123,22],[-4,31],[-75,45],[-87,-75],[-126,118],[-11,83]],[[9588,7050],[-120,-11],[-30,-67]],[[5358,9257],[59,-173],[-80,-49]],[[5337,9035],[-21,-78],[-43,-62]],[[5273,8895],[-97,-48],[-15,-48],[16,-84],[-20,-23]],[[4258,9265],[131,27],[94,-57],[134,-1],[81,-34],[-3,-44],[102,-83],[50,61],[159,37],[69,109],[283,-23]],[[5367,9671],[-35,-94],[17,-48],[-18,-67],[30,-79],[56,-56],[-59,-70]],[[4230,9263],[-106,23],[-69,75],[108,220],[89,31],[196,123],[153,26],[199,50],[146,66],[165,131]],[[5111,10008],[244,-229],[12,-108]],[[5831,8472],[80,-42],[31,17],[95,-37]],[[6037,8410],[-9,-57],[-50,-60],[-50,-166],[56,-65],[-69,-61],[-11,-38]],[[5515,8143],[44,91],[62,73],[-37,60],[7,47],[57,10],[96,91]],[[5744,8515],[87,-43]],[[5744,8515],[-38,39],[1,68]],[[5707,8622],[85,75]],[[5792,8697],[-3,-60]],[[5789,8637],[-9,-41],[58,-40]],[[5838,8556],[-7,-84]],[[6037,8410],[22,54],[-2,88]],[[6057,8552],[-29,89],[36,49],[-3,87],[-33,7]],[[6028,8784],[-19,87]],[[6009,8871],[64,16],[35,-45],[49,0],[29,43],[115,-31],[133,40]],[[6434,8894],[40,-14],[82,-171],[89,-45],[71,-55]],[[6057,8552],[-81,54],[-68,5]],[[5908,8611],[-22,30],[-97,-4]],[[5792,8697],[77,49],[66,-21],[64,11],[29,48]],[[5838,8556],[90,-3],[-20,58]],[[5337,9035],[36,-52],[121,-22],[146,51],[120,-48],[65,35],[84,-41],[100,-87]],[[5707,8622],[17,127],[-55,46],[-48,-13],[-99,28],[-66,-21],[-98,15],[-18,64],[-67,27]],[[6001,2387],[11,-34],[-27,-81],[82,-3],[23,-49],[60,-24],[71,127],[30,-60],[73,4],[17,-46],[107,-30],[78,-66]],[[6526,2125],[-113,-147],[-59,45],[-32,-52],[75,-70],[-23,-53],[23,-49],[-83,-88]],[[6314,1711],[-22,46],[-72,39],[-141,-110],[-161,30],[-102,2],[8,-81],[-33,-78],[-119,-72]],[[5672,1487],[-87,94],[-68,-22],[-18,93],[-49,75],[71,30],[16,65],[-4,93],[-49,125],[-173,52],[10,145]],[[5321,2237],[14,49],[57,26],[44,82],[61,-33],[96,7]],[[5593,2368],[46,-30],[72,9],[44,53],[104,-36],[142,23]],[[7619,3362],[46,-117],[1,-97],[52,-54],[29,-61],[-39,-80]],[[7708,2953],[-72,-28],[-40,-40],[12,-78],[-29,-95],[-84,-22],[-51,-47],[6,-78],[-70,-66],[-72,-31],[-24,-45]],[[7284,2423],[-64,49],[-27,56]],[[7193,2528],[51,49],[16,51],[-45,95],[-89,77],[-59,10],[0,47],[-51,38],[-58,-25],[10,94],[-46,35],[-75,-23],[-18,-63],[-44,-6],[-13,-82],[-71,65],[-96,28]],[[6605,2918],[55,132],[-103,101],[79,83]],[[6636,3234],[58,-34],[107,-19],[58,25],[5,79],[74,-9],[67,-90],[98,61],[-28,21],[-16,99],[8,66],[-29,55],[44,18],[29,97]],[[7111,3603],[41,-62],[-14,-95],[122,-69],[140,60],[17,-62],[51,59],[75,-22],[76,-50]],[[7193,2528],[-62,-7],[-89,-50],[-66,-73],[-113,-60],[-110,-133],[-65,18],[-50,-12],[-112,-86]],[[6001,2387],[57,26],[12,47],[-38,92],[18,48],[103,-5],[86,37],[8,51]],[[6247,2683],[102,-25],[27,93],[-15,61],[30,37],[76,-39],[71,48],[-9,46],[76,14]],[[7046,3830],[1,-97],[51,-57],[13,-73]],[[6636,3234],[-44,44],[-89,-5],[-11,46],[-84,64],[46,131],[-45,123],[-1,63],[-90,84]],[[6314,1711],[16,-44],[50,12],[-4,-202],[18,-117],[63,-23],[20,-59],[-53,-46],[-48,57],[-91,-21],[-61,4],[-32,-47],[-64,3],[-36,-39],[3,-51],[-81,18],[-69,-21],[-54,60],[-124,53],[-99,-28],[-10,-35],[-82,-35],[-75,107],[-87,50],[-58,3],[7,83],[40,15]],[[5403,1408],[84,30],[69,46],[103,-14],[13,17]],[[5618,4175],[-116,-15],[-32,17],[-61,-68],[-47,25],[-71,72],[-100,42],[-76,-25]],[[4973,4689],[126,60],[17,49],[51,42],[90,17],[146,90],[75,8],[-14,53]],[[5464,5008],[92,7],[54,57],[159,-98],[59,29],[12,48],[88,3]],[[5464,5008],[15,67],[-49,40],[-52,90],[-43,-44],[-93,18],[-59,95],[25,27],[6,83],[-28,44],[-22,124],[-85,34],[35,66],[-14,99]],[[4482,4966],[11,51],[66,113],[32,-19],[74,100],[-2,63],[62,-13],[24,43],[-28,44],[-64,26],[-22,45],[13,64]],[[4648,5483],[-19,111],[97,88],[47,-9],[50,70],[62,-4],[32,28]],[[8640,9332],[32,-205],[63,-74],[-38,-160],[-31,-47],[97,-138],[48,-24],[113,2],[33,-18],[-21,-91],[36,-52],[65,-12],[39,-39],[100,-30],[110,-70],[23,-50],[67,-24],[48,23],[64,-31],[78,-64]],[[9557,8187],[-124,-76],[-64,-14],[-47,-38],[-48,9],[-97,95],[-28,-47],[-79,-45],[-102,4],[-48,21],[-88,-39],[-31,-48],[-134,-12],[-103,175],[-60,-7]],[[8504,8165],[8,50],[-25,93],[28,32],[-25,102],[33,85],[-10,125],[50,54],[1,78],[-22,93],[-36,43],[-12,78],[13,100],[-41,83],[-8,68],[-82,17],[-74,-21],[4,102]],[[8306,9347],[116,46],[139,2],[14,-36],[65,-27]],[[8504,8165],[-203,-59],[-48,7]],[[8205,9477],[40,-26],[61,-104]],[[8640,9332],[38,-48],[117,13],[38,42],[53,6],[77,-51],[62,21],[91,-55],[50,-84],[-19,-24],[64,-62],[16,-65],[49,-63],[74,-6],[7,56],[85,-1],[82,-42],[14,-52],[179,-7],[95,68],[91,-105],[77,-42]],[[5403,1408],[-76,51],[-69,0],[-42,34],[-57,-20],[-24,-40],[-70,138],[-151,-13],[-44,71],[-116,39],[-27,-18],[-97,58]],[[4630,1708],[-10,94],[37,47],[72,16],[66,119],[34,85],[58,8],[85,-83],[34,47],[-55,33],[19,52],[59,-8],[52,55],[50,-14],[59,36],[75,-25],[56,67]],[[6247,2683],[-10,30],[-90,19],[-60,-16],[-113,111],[13,82],[-45,54],[14,63],[-115,127],[-112,89],[-80,32],[-85,-44],[-45,2]],[[5519,3232],[-35,76],[33,75],[-66,7],[6,54]],[[5457,3444],[-6,119],[71,56],[43,66],[136,23],[5,53]],[[4586,3143],[60,-1],[-6,-72],[-51,-99],[19,-24],[89,5],[21,-45],[-23,-112],[29,-4]],[[4724,2791],[56,-67],[24,-76],[61,-26],[32,-76],[-86,-33],[-24,-131],[-23,-49],[-58,-5],[-119,26],[-92,-96]],[[4495,2258],[-76,-1],[-208,70],[-85,7],[-26,92],[-65,72],[-53,89],[-71,8],[-29,-35]],[[4630,1708],[-74,24],[-44,-109],[19,-86],[-118,13],[-45,-9]],[[4368,1541],[-27,127],[22,90],[72,-3],[42,99],[-13,49],[-49,-11],[-4,116],[-58,38],[22,49],[55,37],[65,126]],[[4724,2791],[171,38],[60,-45],[114,44],[-1,94],[64,-29],[80,45]],[[5212,2938],[40,-66],[84,-185],[-19,-58],[93,-74],[64,-73],[87,7],[32,-121]],[[4368,1541],[-56,-1],[-28,34],[-51,-57],[-28,49],[-59,22],[-143,-58],[-84,41],[-42,69],[-115,69],[-45,-28]],[[5457,3444],[-26,-24],[-133,-1],[-43,-29],[-112,-9],[-23,-49],[-67,-50],[-47,25],[-26,63],[-41,-35],[-76,56],[-58,89]],[[5212,2938],[105,137],[-31,101],[43,16],[76,-25],[69,68],[45,-3]],[[7251,9908],[-89,-32],[-46,76],[-81,-26],[-39,48],[-69,6],[-53,-52],[-148,-14],[-50,19],[-81,-20],[-50,16],[-72,-19]],[[6473,9910],[-27,70]],[[6446,9980],[25,129],[38,87],[-156,162],[61,32],[-61,118],[-82,-20],[-62,40],[-13,92],[-106,-12],[-117,11],[-52,31],[-60,140],[-89,25],[-127,253]],[[5645,11068],[179,46],[29,-12],[151,58],[17,-103],[39,-60],[-25,-36],[23,-121],[71,-3],[53,-95],[84,-33],[41,55],[79,30],[79,5],[43,-71],[56,-139],[6,-77],[66,-43],[76,35],[110,-36],[40,-50],[1,-99],[72,-20],[71,6],[56,-29],[95,37],[37,-47],[106,-71],[-44,-48],[-3,-53],[55,-105],[-49,-28],[-8,-53]],[[6446,9980],[-98,35],[-51,-75],[-66,53],[-125,-5],[-130,70],[-94,32],[56,47],[-14,49],[-130,-33],[-67,14],[-81,-12],[-32,64],[-120,57],[-64,52],[-113,-33],[-61,38]],[[5256,10333],[-37,35],[18,142],[-15,200],[37,77],[-22,99],[112,93],[170,75],[126,14]],[[3053,7406],[-20,-109],[83,-32],[84,-75],[-3,-29],[-96,-14],[-3,-31],[59,-47],[97,-24],[22,-114],[-120,-26],[-97,-1],[-78,-31],[113,-170],[-54,-53],[27,-44],[48,-4],[7,-62]],[[3122,6540],[-34,-10],[-59,53],[-99,-34],[4,-94],[-62,-32],[-33,125],[-44,-24],[10,-84],[27,-44],[-34,-89],[-80,19],[-66,84],[-50,0],[-150,94]],[[2452,6504],[-56,75],[-150,42],[53,31],[4,125],[-94,-37],[-107,68],[-97,88],[69,90]],[[3705,7350],[4,-41],[96,-9],[39,-71],[65,-19],[88,37],[52,-45],[78,-27],[46,20]],[[4046,6652],[-64,-50],[-48,4]],[[3934,6606],[-36,-47],[-42,52],[-113,1],[-59,-34],[-34,25],[-80,-15],[-1,-47],[-72,-58],[-108,-15],[-74,18],[-74,48]],[[3241,6534],[-65,-32],[-54,38]],[[3086,7448],[1,-41],[162,-30],[118,-6],[65,-40],[142,2],[34,38],[97,-21]],[[3992,8128],[-74,-54],[-48,-158],[-63,-101],[2,-119],[-46,-11],[30,-81],[-94,-44],[20,-64],[-43,-46],[41,-64],[-12,-36]],[[3241,6534],[61,-100],[81,-51],[3,-66],[62,-56],[-9,-33],[40,-108],[51,-77],[-20,-131],[11,-80],[43,-59],[-82,-68],[-77,4]],[[3405,5709],[-55,19],[-79,-18],[-42,49],[-96,-69]],[[3133,5690],[-79,-44],[-66,13],[-49,61],[-85,-1],[-28,64],[-96,16],[-149,99],[-29,119],[-71,104],[-155,143],[11,86],[55,66],[23,67],[37,21]],[[7251,9908],[53,-44]],[[6434,8894],[36,51],[-42,57],[-47,-18],[4,94],[-51,28],[56,44],[23,51],[-2,81],[50,-16],[-27,111],[-2,200]],[[6432,9577],[-2,84],[-33,4],[-12,90],[88,155]],[[5367,9671],[75,-82],[80,30],[110,-30],[179,-22],[50,-19],[53,-59],[65,8],[29,-36],[103,22],[66,-12],[26,49],[144,58],[85,-1]],[[5111,10008],[29,26],[70,174],[7,115],[39,10]],[[4046,4446],[-143,13],[-10,65],[-149,98],[45,43],[-14,48],[34,83],[-98,99],[-21,64],[2,126],[104,36],[25,-41],[75,17],[21,65],[20,144]],[[3937,5306],[38,113],[62,0],[57,41],[49,1]],[[4143,5461],[78,-46],[298,31],[63,53],[66,-16]],[[2902,5383],[71,-63],[52,-4],[16,-83],[32,-37],[-6,-64],[-39,-23],[-18,80],[-94,84],[-14,110]],[[2819,5624],[64,-61],[107,-20],[-15,-54],[-117,70],[-58,-2],[19,67]],[[3405,5709],[-7,-61],[99,-115],[24,-57],[45,14],[34,-37],[169,2],[69,-49],[35,-75],[64,-25]],[[3443,4550],[-27,88],[-63,104],[-67,70],[-253,187],[-5,79],[70,22],[59,113],[-1,111],[23,16],[-38,94],[-102,65],[25,72],[59,58],[10,61]],[[3934,6606],[8,-106],[32,-9],[27,-92],[3,-119],[-16,-67],[-2,-167],[49,2],[-20,-109],[-45,-49],[37,-125],[36,-56],[59,0],[-42,-146],[95,-32],[-12,-70]],[[9401,3455],[-79,-37],[-43,-82],[-41,-32],[-16,-116],[45,-96],[16,-78],[104,-52],[18,-62],[-203,-19],[-27,-104]],[[9175,2777],[-159,-16],[-25,-47],[-44,2],[-60,52],[-44,-10],[-141,-120],[-30,12],[-52,93],[-128,-13]],[[8492,2730],[-115,97],[-44,1],[36,99],[-58,51],[7,79],[-27,30],[1,75]],[[8292,3162],[40,30],[7,62],[83,19]],[[8422,3273],[169,-14],[-37,55],[4,63],[78,-14],[-7,47],[57,80],[73,55],[126,-76],[2,69],[59,14],[38,57],[108,-85],[104,2],[37,100],[127,112],[84,43]],[[9444,3781],[-11,-85],[-58,-52],[31,-127],[-5,-62]],[[9414,2404],[-33,26],[17,109],[-118,55],[-7,78],[-39,46],[-59,15],[0,44]],[[9401,3455],[80,-99],[16,-64],[40,9],[95,-38],[66,-67],[118,-29],[59,36],[85,10],[78,-76],[-11,-49],[-59,-94],[-105,-116],[27,-89],[-42,-37],[-51,7],[-28,-40],[-96,-37],[-28,-49],[-61,-22],[-6,-63],[-58,-31],[-48,3],[-42,-40],[-16,-76]],[[8492,2730],[31,-81],[-58,-36],[-18,-79],[21,-46],[16,-156],[-55,-11],[-13,-82],[51,-55],[-43,-26],[-17,-54]],[[8407,2104],[-23,-29],[-54,59],[-149,0],[31,56],[-17,64],[-51,49],[-54,-37],[-152,6],[-49,107],[-35,7],[-57,-40],[12,-62],[-162,3],[-62,19],[0,82],[-64,26],[-53,-9],[-184,18]],[[7708,2953],[140,-35],[73,-57],[37,-77],[46,-33],[102,4],[135,-83],[74,-20],[134,36],[43,42]],[[9190,4306],[44,-101],[41,3],[18,-125],[49,-48],[69,-31],[28,21],[57,-46],[2,-87],[-54,-111]],[[8422,3273],[-8,62],[-46,68],[-62,-18],[-82,54],[4,78],[42,95],[61,-42],[59,-7],[26,51],[-61,39],[38,126],[105,-3],[45,81]],[[8543,3857],[18,30],[104,22],[-13,46],[89,12],[59,39],[75,-27],[42,33],[60,-2],[1,62],[-47,109],[-60,11],[34,120]],[[8905,4312],[51,1],[31,-78],[61,-14],[20,47],[59,33],[63,5]],[[9414,2404],[-52,-43],[-99,-16],[-7,-57],[-103,-80],[82,-5],[-18,-71],[-232,-84],[-3,-59],[-69,40],[-75,-14],[-24,-51],[-112,46],[-56,2],[-83,-65],[-12,65],[-93,43],[-51,49]],[[7619,3362],[6,70]],[[7625,3432],[116,-2],[40,-108],[131,52],[57,-19],[61,-64],[59,8],[119,-17],[5,-66],[79,-54]],[[7928,3447],[-34,-48],[-74,-22],[-1,125],[73,31],[46,-54],[-10,-32]],[[8752,5812],[78,-63],[-35,-56],[-1,-77],[-81,-24],[-28,-101]],[[8685,5491],[-65,-75],[-49,21],[-20,-66],[3,-103]],[[8554,5268],[-46,-240],[-41,-45],[-31,-79],[-30,-19]],[[8406,4885],[-19,2],[-127,200],[-20,62],[-59,32],[-79,-99],[-45,-5],[-96,34]],[[7961,5111],[-122,27],[-24,77],[-46,2],[-66,53],[8,113],[36,99],[-9,62]],[[7492,4466],[107,26],[19,55],[102,31]],[[7720,4578],[14,-49]],[[7734,4529],[19,-40],[-2,-188],[32,-61],[-6,-63],[35,-77],[-24,-63],[-71,-113],[-7,-125],[-71,-100],[9,-157],[-23,-110]],[[7734,4529],[72,3],[89,48],[58,-23],[29,-43],[88,-47],[-39,-183],[110,-50],[134,30],[41,29],[-34,-279],[6,-79],[59,12],[83,-79],[75,-23],[38,12]],[[9333,5070],[-65,-41],[-44,50],[-55,17],[-69,127],[-56,-113],[-56,-51],[-26,-104],[-63,-17],[-133,103],[-39,-19],[-47,77],[-62,20],[-14,94],[-50,55]],[[8685,5491],[150,18],[103,98],[-51,30],[-16,48],[88,104],[81,18],[60,42],[120,1],[120,-32],[-35,-85],[67,-69],[-53,-152],[21,-33],[63,-7],[1,-41],[108,-181],[-28,-66],[-102,-59],[-49,-55]],[[8406,4885],[14,-69],[69,-123],[138,-59],[10,82],[70,-14],[92,-48],[60,-2],[16,-46],[-32,-79],[-55,-86],[32,-78],[85,-51]],[[7720,4578],[-7,113]],[[7713,4691],[77,29],[14,31],[-57,73],[70,3],[139,93],[43,64],[-9,78],[-29,49]],[[7419,5549],[55,-54],[-14,-35],[-91,-16],[-19,-67],[-49,-71],[152,-109],[2,-141],[-20,-82],[102,-118],[60,-7],[68,-109],[48,-49]],[[9333,5070],[8,-62],[126,-114],[17,-128],[37,-12],[53,-71],[45,-28],[-52,-105],[12,-75],[-39,-39],[-80,-16],[-17,-37],[-74,-49],[-68,24],[-111,-52]]],"objects":{"FRA_adm2":{"type":"GeometryCollection","geometries":[{"arcs":[[0,1,2,3,4]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":989,"NAME_1":"Alsace","ID_2":13755,"NAME_2":"Bas-Rhin","VARNAME_2":"Unterelsaá","HASC_2":"FR.BR","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[5,6,-1,7]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":989,"NAME_1":"Alsace","ID_2":13756,"NAME_2":"Haut-Rhin","VARNAME_2":"Oberelsaá","HASC_2":"FR.HR","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[8,9,10,11,12,13,14]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":990,"NAME_1":"Aquitaine","ID_2":13757,"NAME_2":"Dordogne","VARNAME_2":"","HASC_2":"FR.DD","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[15,-12,16,17,18]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":990,"NAME_1":"Aquitaine","ID_2":13758,"NAME_2":"Gironde","VARNAME_2":"Bec-D'Ambes","HASC_2":"FR.GI","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[19,20,21,22,-18]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":990,"NAME_1":"Aquitaine","ID_2":13759,"NAME_2":"Landes","VARNAME_2":"Landas","HASC_2":"FR.LD","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-11,23,24,25,-20,-17]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":990,"NAME_1":"Aquitaine","ID_2":13760,"NAME_2":"Lot-Et-Garonne","VARNAME_2":"","HASC_2":"FR.LG","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[26,27,-22,28],[29],[30]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":990,"NAME_1":"Aquitaine","ID_2":13761,"NAME_2":"Pyrénées-Atlantiques","VARNAME_2":"Basses-Pyrénées|Pirinio Atlantiarrak","HASC_2":"FR.PA","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[31,32,33,34,35,36]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":991,"NAME_1":"Auvergne","ID_2":13762,"NAME_2":"Allier","VARNAME_2":"Basses-Alpes","HASC_2":"FR.AL","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[37,38,39,40,41,42]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":991,"NAME_1":"Auvergne","ID_2":13763,"NAME_2":"Cantal","VARNAME_2":"","HASC_2":"FR.CL","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[43,44,45,-38,46]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":991,"NAME_1":"Auvergne","ID_2":13764,"NAME_2":"Haute-Loire","VARNAME_2":"","HASC_2":"FR.HL","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[47,-47,-43,48,49,-34]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":991,"NAME_1":"Auvergne","ID_2":13765,"NAME_2":"Puy-De-Dôme","VARNAME_2":"","HASC_2":"FR.PD","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[54,55,56,57,58]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":992,"NAME_1":"Basse-Normandie","ID_2":13766,"NAME_2":"Calvados","VARNAME_2":"","HASC_2":"FR.CV","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-51,-53,59,-57,60,61,62,63]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":992,"NAME_1":"Basse-Normandie","ID_2":13767,"NAME_2":"Manche","VARNAME_2":"","HASC_2":"FR.MH","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[64,65,66,-61,-56,67]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":992,"NAME_1":"Basse-Normandie","ID_2":13768,"NAME_2":"Orne","VARNAME_2":"","HASC_2":"FR.OR","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[68,69,70,71,72,73,74]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":993,"NAME_1":"Bourgogne","ID_2":13769,"NAME_2":"Côte-d'Or","VARNAME_2":"","HASC_2":"FR.CO","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-73,75,-37,76,77,78]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":993,"NAME_1":"Bourgogne","ID_2":13770,"NAME_2":"Nièvre","VARNAME_2":"","HASC_2":"FR.NI","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[79,80,81,82,-32,-76,-72]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":993,"NAME_1":"Bourgogne","ID_2":13771,"NAME_2":"Saône-et-Loire","VARNAME_2":"","HASC_2":"FR.SL","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[83,-74,-79,84,85]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":993,"NAME_1":"Bourgogne","ID_2":13772,"NAME_2":"Yonne","VARNAME_2":"","HASC_2":"FR.YO","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[86,87,88,89,90,91]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":994,"NAME_1":"Bretagne","ID_2":13773,"NAME_2":"Côtes-d'Armor","VARNAME_2":"Cotes-Du-Nord","HASC_2":"FR.CA","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-91,92,93]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":994,"NAME_1":"Bretagne","ID_2":13774,"NAME_2":"Finistère","VARNAME_2":"","HASC_2":"FR.FI","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[[-87,94]],[[-63,95,96,97,98,-89,99]]],"type":"MultiPolygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":994,"NAME_1":"Bretagne","ID_2":13775,"NAME_2":"Ille-Et-Vilaine","VARNAME_2":"","HASC_2":"FR.IV","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[[100]],[[-99,101,102,-93,-90]]],"type":"MultiPolygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":994,"NAME_1":"Bretagne","ID_2":13776,"NAME_2":"Morbihan","VARNAME_2":"","HASC_2":"FR.MB","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-77,-36,103,104,105,106]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":995,"NAME_1":"Centre","ID_2":13777,"NAME_2":"Cher","VARNAME_2":"","HASC_2":"FR.CH","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[107,108,109,110,-65,111,112]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":995,"NAME_1":"Centre","ID_2":13778,"NAME_2":"Eure-Et-Loir","VARNAME_2":"","HASC_2":"FR.EL","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[113,114,115,116,117,-105]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":995,"NAME_1":"Centre","ID_2":13779,"NAME_2":"Indre","VARNAME_2":"","HASC_2":"FR.IN","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[118,-117,119,120,121]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":995,"NAME_1":"Centre","ID_2":13780,"NAME_2":"Indre-Et-Loire","VARNAME_2":"","HASC_2":"FR.IL","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[122,-85,-78,-107,123,-109,124]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":995,"NAME_1":"Centre","ID_2":13781,"NAME_2":"Loiret","VARNAME_2":"","HASC_2":"FR.LT","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-124,-106,-118,-119,125,-110]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":995,"NAME_1":"Centre","ID_2":13782,"NAME_2":"Loir-Et-Cher","VARNAME_2":"","HASC_2":"FR.LC","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[126,127,128,129]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":996,"NAME_1":"Champagne-Ardenne","ID_2":13783,"NAME_2":"Ardennes","VARNAME_2":"","HASC_2":"FR.AN","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[130,-75,-84,131,132]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":996,"NAME_1":"Champagne-Ardenne","ID_2":13784,"NAME_2":"Aube","VARNAME_2":"","HASC_2":"FR.AB","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[133,134,-69,-131,135,136]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":996,"NAME_1":"Champagne-Ardenne","ID_2":13785,"NAME_2":"Haute-Marne","VARNAME_2":"","HASC_2":"FR.HM","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-128,137,-136,-133,138,139]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":996,"NAME_1":"Champagne-Ardenne","ID_2":13786,"NAME_2":"Marne","VARNAME_2":"","HASC_2":"FR.MR","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[140,141]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":997,"NAME_1":"Corse","ID_2":13787,"NAME_2":"Corse-Du-Sud","VARNAME_2":"Corse Du Sud","HASC_2":"FR.CS","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-141,142]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":997,"NAME_1":"Corse","ID_2":13788,"NAME_2":"Haute-Corse","VARNAME_2":"","HASC_2":"FR.HC","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[143,144,145,146]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":998,"NAME_1":"Franche-Comté","ID_2":13789,"NAME_2":"Doubs","VARNAME_2":"","HASC_2":"FR.DB","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[147,-147,148,-70,-135,149]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":998,"NAME_1":"Franche-Comté","ID_2":13790,"NAME_2":"Haute-Saône","VARNAME_2":"","HASC_2":"FR.HN","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-146,150,151,-80,-71,-149]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":998,"NAME_1":"Franche-Comté","ID_2":13791,"NAME_2":"Jura","VARNAME_2":"","HASC_2":"FR.JU","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[152,-144,-148,-6]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":998,"NAME_1":"Franche-Comté","ID_2":13792,"NAME_2":"Territoire de Belfort","VARNAME_2":"","HASC_2":"FR.TB","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[153,154,155,-112,-68,-55,156]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":999,"NAME_1":"Haute-Normandie","ID_2":13793,"NAME_2":"Eure","VARNAME_2":"","HASC_2":"FR.EU","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[157,-157,-59,158,159]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":999,"NAME_1":"Haute-Normandie","ID_2":13794,"NAME_2":"Seine-Maritime","VARNAME_2":"Seine-Inférieure","HASC_2":"FR.SM","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[160,161,-125,-108,162,163]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1000,"NAME_1":"Île-de-France","ID_2":13795,"NAME_2":"Essonne","VARNAME_2":"","HASC_2":"FR.ES","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-164,164,165,166,167,168]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1000,"NAME_1":"Île-de-France","ID_2":13796,"NAME_2":"Hauts-De-Seine","VARNAME_2":"","HASC_2":"FR.HD","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-139,-132,-86,-123,-162,169,170,171,172,173]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1000,"NAME_1":"Île-de-France","ID_2":13797,"NAME_2":"Seine-Et-Marne","VARNAME_2":"","HASC_2":"FR.SE","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[174,175,-167,176,-171]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1000,"NAME_1":"Île-de-France","ID_2":13798,"NAME_2":"Seine-Saint-Denis","VARNAME_2":"","HASC_2":"FR.SS","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-170,-161,-169,177,-175]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1000,"NAME_1":"Île-de-France","ID_2":13799,"NAME_2":"Val-De-Marne","VARNAME_2":"","HASC_2":"FR.VM","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[178,-172,-177,-166,179,-155]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1000,"NAME_1":"Île-de-France","ID_2":13800,"NAME_2":"Val-D'Oise","VARNAME_2":"","HASC_2":"FR.VO","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-178,-168,-176]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1000,"NAME_1":"Île-de-France","ID_2":13801,"NAME_2":"Ville de Paris","VARNAME_2":"Paris|Siene","HASC_2":"FR.VP","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-165,-163,-113,-156,-180]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1000,"NAME_1":"Île-de-France","ID_2":13802,"NAME_2":"Yvelines","VARNAME_2":"","HASC_2":"FR.YV","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[180,181,182,183,184,185]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1001,"NAME_1":"Languedoc-Roussillon","ID_2":13803,"NAME_2":"Aude","VARNAME_2":"","HASC_2":"FR.AD","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[186,187,188,189,190,191,192]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1001,"NAME_1":"Languedoc-Roussillon","ID_2":13804,"NAME_2":"Gard","VARNAME_2":"","HASC_2":"FR.GA","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[193,-181,194,195,-190]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1001,"NAME_1":"Languedoc-Roussillon","ID_2":13805,"NAME_2":"Hérault","VARNAME_2":"","HASC_2":"FR.HE","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[196,-192,197,-39,-46]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1001,"NAME_1":"Languedoc-Roussillon","ID_2":13806,"NAME_2":"Lozère","VARNAME_2":"","HASC_2":"FR.LZ","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[198,199,-183]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1001,"NAME_1":"Languedoc-Roussillon","ID_2":13807,"NAME_2":"Pyrénées-Orientales","VARNAME_2":"","HASC_2":"FR.PO","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-49,-42,200,-9,201,202]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1002,"NAME_1":"Limousin","ID_2":13808,"NAME_2":"Corrèze","VARNAME_2":"","HASC_2":"FR.CZ","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-104,-35,-50,-203,203,-114]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1002,"NAME_1":"Limousin","ID_2":13809,"NAME_2":"Creuse","VARNAME_2":"","HASC_2":"FR.CR","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-204,-202,-15,204,205,-115]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1002,"NAME_1":"Limousin","ID_2":13810,"NAME_2":"Haute-Vienne","VARNAME_2":"","HASC_2":"FR.HV","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[206,-3,207,208,209]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1003,"NAME_1":"Lorraine","ID_2":13811,"NAME_2":"Meurthe-Et-Moselle","VARNAME_2":"","HASC_2":"FR.MM","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-209,210,-137,-138,-127,211]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1003,"NAME_1":"Lorraine","ID_2":13812,"NAME_2":"Meuse","VARNAME_2":"","HASC_2":"FR.MS","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-4,-207,212]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1003,"NAME_1":"Lorraine","ID_2":13813,"NAME_2":"Moselle","VARNAME_2":"Lothringen","HASC_2":"FR.MO","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-7,-150,-134,-211,-208,-2]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1003,"NAME_1":"Lorraine","ID_2":13814,"NAME_2":"Vosges","VARNAME_2":"","HASC_2":"FR.VG","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-184,-200,213,214]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1004,"NAME_1":"Midi-Pyrénées","ID_2":13815,"NAME_2":"Ariège","VARNAME_2":"","HASC_2":"FR.AG","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-198,-191,-196,215,216,217,-40]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1004,"NAME_1":"Midi-Pyrénées","ID_2":13816,"NAME_2":"Aveyron","VARNAME_2":"","HASC_2":"FR.AV","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[218,219,220,-29,-21,-26]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1004,"NAME_1":"Midi-Pyrénées","ID_2":13817,"NAME_2":"Gers","VARNAME_2":"","HASC_2":"FR.GE","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-185,-215,221,222,-220,223,224]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1004,"NAME_1":"Midi-Pyrénées","ID_2":13818,"NAME_2":"Haute-Garonne","VARNAME_2":"Alto Garona","HASC_2":"FR.HG","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[[-31]],[[-30]],[[-223,225,-27,-221]]],"type":"MultiPolygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1004,"NAME_1":"Midi-Pyrénées","ID_2":13819,"NAME_2":"Hautes-Pyrénées","VARNAME_2":"Altos Pirineos","HASC_2":"FR.HP","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-41,-218,226,-24,-10,-201]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1004,"NAME_1":"Midi-Pyrénées","ID_2":13820,"NAME_2":"Lot","VARNAME_2":"","HASC_2":"FR.LO","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-195,-186,-225,227,-216]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1004,"NAME_1":"Midi-Pyrénées","ID_2":13821,"NAME_2":"Tarn","VARNAME_2":"","HASC_2":"FR.TA","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-217,-228,-224,-219,-25,-227]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1004,"NAME_1":"Midi-Pyrénées","ID_2":13822,"NAME_2":"Tarn-Et-Garonne","VARNAME_2":"","HASC_2":"FR.TG","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[228,229,230,231]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1005,"NAME_1":"Nord-Pas-de-Calais","ID_2":13823,"NAME_2":"Nord","VARNAME_2":"","HASC_2":"FR.NO","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-231,232,233]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1005,"NAME_1":"Nord-Pas-de-Calais","ID_2":13824,"NAME_2":"Pas-De-Calais","VARNAME_2":"","HASC_2":"FR.PC","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[234,235,236,-102,-98]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1006,"NAME_1":"Pays de la Loire","ID_2":13825,"NAME_2":"Loire-Atlantique","VARNAME_2":"Loire-Inferieure","HASC_2":"FR.LA","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[237,-121,238,239,240,-235,-97,241]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1006,"NAME_1":"Pays de la Loire","ID_2":13826,"NAME_2":"Maine-Et-Loire","VARNAME_2":"Mayne Et Loire","HASC_2":"FR.ML","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[242,-242,-96,-62,-67]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1006,"NAME_1":"Pays de la Loire","ID_2":13827,"NAME_2":"Mayenne","VARNAME_2":"","HASC_2":"FR.MY","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-111,-126,-122,-238,-243,-66]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1006,"NAME_1":"Pays de la Loire","ID_2":13828,"NAME_2":"Sarthe","VARNAME_2":"","HASC_2":"FR.ST","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-241,243,244,245,-236]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1006,"NAME_1":"Pays de la Loire","ID_2":13829,"NAME_2":"Vendée","VARNAME_2":"Vendéia","HASC_2":"FR.VD","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[246,-129,-140,-174,247,248,-229]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1007,"NAME_1":"Picardie","ID_2":13830,"NAME_2":"Aisne","VARNAME_2":"","HASC_2":"FR.AS","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-248,-173,-179,-154,-158,249]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1007,"NAME_1":"Picardie","ID_2":13831,"NAME_2":"Oise","VARNAME_2":"","HASC_2":"FR.OI","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-230,-249,-250,-160,250,-233]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1007,"NAME_1":"Picardie","ID_2":13832,"NAME_2":"Somme","VARNAME_2":"","HASC_2":"FR.SO","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-14,251,252,253,-205]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1008,"NAME_1":"Poitou-Charentes","ID_2":13833,"NAME_2":"Charente","VARNAME_2":"","HASC_2":"FR.CT","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[[254]],[[255]],[[256,-252,-13,-16,257,-245]]],"type":"MultiPolygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1008,"NAME_1":"Poitou-Charentes","ID_2":13834,"NAME_2":"Charente-Maritime","VARNAME_2":"Charente-Inférieure","HASC_2":"FR.CM","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[258,-253,-257,-244,-240]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1008,"NAME_1":"Poitou-Charentes","ID_2":13835,"NAME_2":"Deux-Sèvres","VARNAME_2":"","HASC_2":"FR.DS","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-116,-206,-254,-259,-239,-120]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1008,"NAME_1":"Poitou-Charentes","ID_2":13836,"NAME_2":"Vienne","VARNAME_2":"","HASC_2":"FR.VN","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[259,260,261,262,263,264]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1009,"NAME_1":"Provence-Alpes-Côte-d'Azur","ID_2":13837,"NAME_2":"Alpes-De-Haute-Provence","VARNAME_2":"Alpes Da Alta Provença|Basses-Alpes","HASC_2":"FR.AP","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[265,-260,266]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1009,"NAME_1":"Provence-Alpes-Côte-d'Azur","ID_2":13838,"NAME_2":"Alpes-Maritimes","VARNAME_2":"","HASC_2":"FR.AM","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[267,268,-188,269]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1009,"NAME_1":"Provence-Alpes-Côte-d'Azur","ID_2":13839,"NAME_2":"Bouches-Du-Rhône","VARNAME_2":"","HASC_2":"FR.BD","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[270,-264,271,272,273]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1009,"NAME_1":"Provence-Alpes-Côte-d'Azur","ID_2":13840,"NAME_2":"Hautes-Alpes","VARNAME_2":"","HASC_2":"FR.HA","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[274,-268,-261,-266]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1009,"NAME_1":"Provence-Alpes-Côte-d'Azur","ID_2":13841,"NAME_2":"Var","VARNAME_2":"","HASC_2":"FR.VR","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[[-262,-270,-187,275,276]],[[277]]],"type":"MultiPolygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1009,"NAME_1":"Provence-Alpes-Côte-d'Azur","ID_2":13842,"NAME_2":"Vaucluse","VARNAME_2":"","HASC_2":"FR.VC","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-152,278,279,280,281,282,-81]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1010,"NAME_1":"Rhône-Alpes","ID_2":13843,"NAME_2":"Ain","VARNAME_2":"","HASC_2":"FR.AI","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-276,-193,-197,-45,283,284,285]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1010,"NAME_1":"Rhône-Alpes","ID_2":13844,"NAME_2":"Ardèche","VARNAME_2":"","HASC_2":"FR.AH","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-272,-263,-277,-286,286],[-278]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1010,"NAME_1":"Rhône-Alpes","ID_2":13845,"NAME_2":"Drôme","VARNAME_2":"","HASC_2":"FR.DM","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[287,-280,288]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1010,"NAME_1":"Rhône-Alpes","ID_2":13846,"NAME_2":"Haute-Savoie","VARNAME_2":"","HASC_2":"FR.HS","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[289,-273,-287,-285,290,291,-282]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1010,"NAME_1":"Rhône-Alpes","ID_2":13847,"NAME_2":"Isère","VARNAME_2":"","HASC_2":"FR.IS","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-83,292,-291,-284,-44,-48,-33]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1010,"NAME_1":"Rhône-Alpes","ID_2":13848,"NAME_2":"Loire","VARNAME_2":"","HASC_2":"FR.LR","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[-283,-292,-293,-82]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1010,"NAME_1":"Rhône-Alpes","ID_2":13849,"NAME_2":"Rhône","VARNAME_2":"","HASC_2":"FR.RH","TYPE_2":"Département","ENGTYPE_2":"Department"}},{"arcs":[[293,-274,-290,-281,-288]],"type":"Polygon","properties":{"ISO":"FRA","NAME_0":"France","ID_1":1010,"NAME_1":"Rhône-Alpes","ID_2":13850,"NAME_2":"Savoie","VARNAME_2":"Sabóia|Savoia","HASC_2":"FR.SV","TYPE_2":"Département","ENGTYPE_2":"Department"}}]}}} \ No newline at end of file diff --git a/examples/drag-and-drop-custom-kmz.css b/examples/drag-and-drop-custom-kmz.css new file mode 100644 index 0000000000..020e8f7a78 --- /dev/null +++ b/examples/drag-and-drop-custom-kmz.css @@ -0,0 +1,9 @@ +#info { + width: 100%; + height: 24rem; + overflow: scroll; + display: flex; + align-items: baseline; + border: 1px solid black; + justify-content: flex-start; +} diff --git a/examples/drag-and-drop-custom-kmz.html b/examples/drag-and-drop-custom-kmz.html new file mode 100644 index 0000000000..2e2396695d --- /dev/null +++ b/examples/drag-and-drop-custom-kmz.html @@ -0,0 +1,22 @@ +--- +layout: example.html +title: Custom Drag-and-Drop (KMZ) +shortdesc: Example of using the drag-and-drop interaction with a custom format to handle KMZ files. +docs: > + Example of using the drag-and-drop interaction with a custom format to handle KMZ files. + In addition to the formats used in the [Drag-and-Drop](drag-and-drop.html) example a custom format (subclassing KML) is used to handle KMZ files. + KML and icons must be extracted from the KMZ array buffer synchronously. + JSZip 2.x is used as it has better browser compatibility and is simpler to code than the more recent JSZip-sync. + There is no projection transform support, so this will only work with data in EPSG:4326 and EPSG:3857. +tags: "drag-and-drop, kml, kmz" +resources: + - https://cdnjs.cloudflare.com/ajax/libs/jszip/2.6.1/jszip.min.js +--- +
+
+
+ + +
+
+
 
diff --git a/examples/drag-and-drop-custom-kmz.js b/examples/drag-and-drop-custom-kmz.js new file mode 100644 index 0000000000..41b7b3e8c5 --- /dev/null +++ b/examples/drag-and-drop-custom-kmz.js @@ -0,0 +1,155 @@ +import Map from '../src/ol/Map.js'; +import View from '../src/ol/View.js'; +import { + DragAndDrop, + defaults as defaultInteractions, +} from '../src/ol/interaction.js'; +import {GPX, GeoJSON, IGC, KML, TopoJSON} from '../src/ol/format.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; +import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; + +// Create functions to extract KML and icons from KMZ array buffer, +// which must be done synchronously. + +const zip = new JSZip(); + +function getKMLData(buffer) { + let kmlData; + zip.load(buffer); + const kmlFile = zip.file(/.kml$/i)[0]; + if (kmlFile) { + kmlData = kmlFile.asText(); + } + return kmlData; +} + +function getKMLImage(href) { + let url = href; + let path = window.location.href; + path = path.slice(0, path.lastIndexOf('/') + 1); + if (href.indexOf(path) === 0) { + const regexp = new RegExp(href.replace(path, '') + '$', 'i'); + const kmlFile = zip.file(regexp)[0]; + if (kmlFile) { + url = URL.createObjectURL(new Blob([kmlFile.asArrayBuffer()])); + } + } + return url; +} + +// Define a KMZ format class by subclassing ol/format/KML + +class KMZ extends KML { + constructor(opt_options) { + const options = opt_options || {}; + options.iconUrlFunction = getKMLImage; + super(options); + } + + getType() { + return 'arraybuffer'; + } + + readFeature(source, options) { + const kmlData = getKMLData(source); + return super.readFeature(kmlData, options); + } + + readFeatures(source, options) { + const kmlData = getKMLData(source); + return super.readFeatures(kmlData, options); + } +} + +// Set up map with Drag and Drop interaction + +const dragAndDropInteraction = new DragAndDrop({ + formatConstructors: [KMZ, GPX, GeoJSON, IGC, KML, TopoJSON], +}); + +const map = new Map({ + interactions: defaultInteractions().extend([dragAndDropInteraction]), + layers: [ + new TileLayer({ + source: new OSM(), + }), + ], + target: 'map', + view: new View({ + center: [0, 0], + zoom: 2, + }), +}); + +dragAndDropInteraction.on('addfeatures', function (event) { + const vectorSource = new VectorSource({ + features: event.features, + }); + map.addLayer( + new VectorLayer({ + source: vectorSource, + }) + ); + map.getView().fit(vectorSource.getExtent()); +}); + +const displayFeatureInfo = function (pixel) { + const features = []; + map.forEachFeatureAtPixel(pixel, function (feature) { + features.push(feature); + }); + if (features.length > 0) { + const info = []; + let i, ii; + for (i = 0, ii = features.length; i < ii; ++i) { + const description = + features[i].get('description') || + features[i].get('name') || + features[i].get('_name') || + features[i].get('layer'); + if (description) { + info.push(description); + } + } + document.getElementById('info').innerHTML = info.join('
') || ' '; + } else { + document.getElementById('info').innerHTML = ' '; + } +}; + +map.on('pointermove', function (evt) { + if (evt.dragging) { + return; + } + const pixel = map.getEventPixel(evt.originalEvent); + displayFeatureInfo(pixel); +}); + +map.on('click', function (evt) { + displayFeatureInfo(evt.pixel); +}); + +// Sample data download + +const link = document.getElementById('download'); + +function download(fullpath, filename) { + fetch(fullpath) + .then(function (response) { + return response.blob(); + }) + .then(function (blob) { + if (navigator.msSaveBlob) { + // link download attribuute does not work on MS browsers + navigator.msSaveBlob(blob, filename); + } else { + link.href = URL.createObjectURL(blob); + link.download = filename; + link.click(); + } + }); +} + +document.getElementById('download-kmz').addEventListener('click', function () { + download('data/kmz/iceland.kmz', 'iceland.kmz'); +}); diff --git a/examples/drag-and-drop-custom-mvt.css b/examples/drag-and-drop-custom-mvt.css new file mode 100644 index 0000000000..98084d7230 --- /dev/null +++ b/examples/drag-and-drop-custom-mvt.css @@ -0,0 +1,3 @@ +.tileCoord input { + width: 60px; +} diff --git a/examples/drag-and-drop-custom-mvt.html b/examples/drag-and-drop-custom-mvt.html new file mode 100644 index 0000000000..6c92b4caef --- /dev/null +++ b/examples/drag-and-drop-custom-mvt.html @@ -0,0 +1,23 @@ +--- +layout: example.html +title: Custom Drag-and-Drop (MVT preview) +shortdesc: Example of using the drag-and-drop interaction with a custom format to preview MVT tiles. +docs: > + Example of using the drag-and-drop interaction with a custom format to preview MVT tiles. + In addition to the formats used in the [Drag-and-Drop](drag-and-drop.html) example individual MVT tiles can be previewed. + There is no projection transform support, so this will only work with data in EPSG:4326 and EPSG:3857. +tags: "drag-and-drop, mvt" +--- +
+
+
+ + Tile coordinate   +  z: +  x: +  y: +    + +
+
+
 
diff --git a/examples/drag-and-drop-custom-mvt.js b/examples/drag-and-drop-custom-mvt.js new file mode 100644 index 0000000000..5ac2740ad6 --- /dev/null +++ b/examples/drag-and-drop-custom-mvt.js @@ -0,0 +1,133 @@ +import Feature from '../src/ol/Feature.js'; +import Map from '../src/ol/Map.js'; +import View from '../src/ol/View.js'; +import { + DragAndDrop, + defaults as defaultInteractions, +} from '../src/ol/interaction.js'; +import {GPX, GeoJSON, IGC, KML, MVT, TopoJSON} from '../src/ol/format.js'; +import {OSM, Vector as VectorSource} from '../src/ol/source.js'; +import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; +import {createXYZ} from '../src/ol/tilegrid.js'; + +// Define a custom MVT format as ol/format/MVT requires an extent + +const tileCoordZ = document.getElementById('tileCoordZ'); +const tileCoordX = document.getElementById('tileCoordX'); +const tileCoordY = document.getElementById('tileCoordY'); + +class customMVT extends MVT { + constructor() { + super({featureClass: Feature}); + } + readFeatures(source, options) { + options.extent = createXYZ().getTileCoordExtent([ + parseInt(tileCoordZ.value), + parseInt(tileCoordX.value), + parseInt(tileCoordY.value), + ]); + return super.readFeatures(source, options); + } +} + +// Set up map with Drag and Drop interaction + +const dragAndDropInteraction = new DragAndDrop({ + formatConstructors: [customMVT, GPX, GeoJSON, IGC, KML, TopoJSON], +}); + +const map = new Map({ + interactions: defaultInteractions().extend([dragAndDropInteraction]), + layers: [ + new TileLayer({ + source: new OSM(), + }), + ], + target: 'map', + view: new View({ + center: [0, 0], + zoom: 2, + }), +}); + +dragAndDropInteraction.on('addfeatures', function (event) { + const vectorSource = new VectorSource({ + features: event.features, + }); + map.addLayer( + new VectorLayer({ + source: vectorSource, + }) + ); + map.getView().fit(vectorSource.getExtent()); +}); + +const displayFeatureInfo = function (pixel) { + const features = []; + map.forEachFeatureAtPixel(pixel, function (feature) { + features.push(feature); + }); + if (features.length > 0) { + const info = []; + let i, ii; + for (i = 0, ii = features.length; i < ii; ++i) { + const description = + features[i].get('name') || + features[i].get('_name') || + features[i].get('layer'); + if (description) { + info.push(description); + } + } + document.getElementById('info').innerHTML = info.join(', ') || ' '; + } else { + document.getElementById('info').innerHTML = ' '; + } +}; + +map.on('pointermove', function (evt) { + if (evt.dragging) { + return; + } + const pixel = map.getEventPixel(evt.originalEvent); + displayFeatureInfo(pixel); +}); + +map.on('click', function (evt) { + displayFeatureInfo(evt.pixel); +}); + +// Sample data download + +const link = document.getElementById('download'); + +function download(fullpath, filename) { + fetch(fullpath) + .then(function (response) { + return response.blob(); + }) + .then(function (blob) { + if (navigator.msSaveBlob) { + // link download attribuute does not work on MS browsers + navigator.msSaveBlob(blob, filename); + } else { + link.href = URL.createObjectURL(blob); + link.download = filename; + link.click(); + } + }); +} + +document.getElementById('download-mvt').addEventListener('click', function () { + const fullpath = + 'https://basemaps.arcgis.com/v1/arcgis/rest/services/World_Basemap/VectorTileServer/tile/' + + tileCoordZ.value + + '/' + + tileCoordY.value + + '/' + + tileCoordX.value + + '.pbf'; + const filename = + tileCoordZ.value + '-' + tileCoordX.value + '-' + tileCoordY.value + '.mvt'; + download(fullpath, filename); +}); diff --git a/examples/drag-and-drop.html b/examples/drag-and-drop.html index c8f0772329..da82535fdc 100644 --- a/examples/drag-and-drop.html +++ b/examples/drag-and-drop.html @@ -10,4 +10,20 @@ cloak: value: Get your own API key at https://www.maptiler.com/cloud/ ---
+
+
+
+ + Download samples:   + +   + +   + +   + +   + +
+
 
diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js index 04ba089aee..b37ee3cf26 100644 --- a/examples/drag-and-drop.js +++ b/examples/drag-and-drop.js @@ -1,24 +1,16 @@ +import DragAndDrop from '../src/ol/interaction/DragAndDrop.js'; import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import { - DragAndDrop, - defaults as defaultInteractions, -} from '../src/ol/interaction.js'; import {GPX, GeoJSON, IGC, KML, TopoJSON} from '../src/ol/format.js'; import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js'; import {Vector as VectorSource, XYZ} from '../src/ol/source.js'; -const dragAndDropInteraction = new DragAndDrop({ - formatConstructors: [GPX, GeoJSON, IGC, KML, TopoJSON], -}); - const key = 'get_your_own_D6rA4zTHduk6KOKTXzGB'; const attributions = '© MapTiler ' + '© OpenStreetMap contributors'; const map = new Map({ - interactions: defaultInteractions().extend([dragAndDropInteraction]), layers: [ new TileLayer({ source: new XYZ({ @@ -36,17 +28,39 @@ const map = new Map({ }), }); -dragAndDropInteraction.on('addfeatures', function (event) { - const vectorSource = new VectorSource({ - features: event.features, +const extractStyles = document.getElementById('extractstyles'); +let dragAndDropInteraction; + +function setInteraction() { + if (dragAndDropInteraction) { + map.removeInteraction(dragAndDropInteraction); + } + dragAndDropInteraction = new DragAndDrop({ + formatConstructors: [ + GPX, + GeoJSON, + IGC, + // use constructed format to set options + new KML({extractStyles: extractStyles.checked}), + TopoJSON, + ], }); - map.addLayer( - new VectorLayer({ - source: vectorSource, - }) - ); - map.getView().fit(vectorSource.getExtent()); -}); + dragAndDropInteraction.on('addfeatures', function (event) { + const vectorSource = new VectorSource({ + features: event.features, + }); + map.addLayer( + new VectorLayer({ + source: vectorSource, + }) + ); + map.getView().fit(vectorSource.getExtent()); + }); + map.addInteraction(dragAndDropInteraction); +} +setInteraction(); + +extractStyles.addEventListener('change', setInteraction); const displayFeatureInfo = function (pixel) { const features = []; @@ -76,3 +90,48 @@ map.on('pointermove', function (evt) { map.on('click', function (evt) { displayFeatureInfo(evt.pixel); }); + +// Sample data downloads + +const link = document.getElementById('download'); + +function download(fullpath, filename) { + fetch(fullpath) + .then(function (response) { + return response.blob(); + }) + .then(function (blob) { + if (navigator.msSaveBlob) { + // link download attribuute does not work on MS browsers + navigator.msSaveBlob(blob, filename); + } else { + link.href = URL.createObjectURL(blob); + link.download = filename; + link.click(); + } + }); +} + +document.getElementById('download-gpx').addEventListener('click', function () { + download('data/gpx/fells_loop.gpx', 'fells_loop.gpx'); +}); + +document + .getElementById('download-geojson') + .addEventListener('click', function () { + download('data/geojson/roads-seoul.geojson', 'roads-seoul.geojson'); + }); + +document.getElementById('download-igc').addEventListener('click', function () { + download('data/igc/Ulrich-Prinz.igc', 'Ulrich-Prinz.igc'); +}); + +document.getElementById('download-kml').addEventListener('click', function () { + download('data/kml/states.kml', 'states.kml'); +}); + +document + .getElementById('download-topojson') + .addEventListener('click', function () { + download('data/topojson/fr-departments.json', 'fr-departments.json'); + }); diff --git a/examples/draw-and-modify-features.html b/examples/draw-and-modify-features.html index bf3ff2e7a4..9be38fc551 100644 --- a/examples/draw-and-modify-features.html +++ b/examples/draw-and-modify-features.html @@ -8,7 +8,7 @@ tags: "draw, edit, modify, vector, featureoverlay" ---
- + + + +
diff --git a/examples/draw-features.js b/examples/draw-features.js index cefff36c35..fdac072ede 100644 --- a/examples/draw-features.js +++ b/examples/draw-features.js @@ -45,4 +45,8 @@ typeSelect.onchange = function () { addInteraction(); }; +document.getElementById('undo').addEventListener('click', function () { + draw.removeLastPoint(); +}); + addInteraction(); diff --git a/examples/draw-freehand.html b/examples/draw-freehand.html index 8f6767a8a8..d6d84ccc5c 100644 --- a/examples/draw-freehand.html +++ b/examples/draw-freehand.html @@ -12,7 +12,7 @@ tags: "draw, edit, freehand, vector" ---
- + + + +
diff --git a/examples/draw-shapes.js b/examples/draw-shapes.js index f02fba2ac8..d652d81765 100644 --- a/examples/draw-shapes.js +++ b/examples/draw-shapes.js @@ -44,7 +44,7 @@ function addInteraction() { value = 'Circle'; geometryFunction = function (coordinates, geometry) { const center = coordinates[0]; - const last = coordinates[1]; + const last = coordinates[coordinates.length - 1]; const dx = center[0] - last[0]; const dy = center[1] - last[1]; const radius = Math.sqrt(dx * dx + dy * dy); @@ -84,4 +84,8 @@ typeSelect.onchange = function () { addInteraction(); }; +document.getElementById('undo').addEventListener('click', function () { + draw.removeLastPoint(); +}); + addInteraction(); diff --git a/examples/export-pdf.html b/examples/export-pdf.html index fa20f86069..00f92fa728 100644 --- a/examples/export-pdf.html +++ b/examples/export-pdf.html @@ -14,7 +14,7 @@ resources:
- + - + - +
diff --git a/examples/flight-animation.html b/examples/flight-animation.html index 0b7952ce40..d70974c41b 100644 --- a/examples/flight-animation.html +++ b/examples/flight-animation.html @@ -7,8 +7,8 @@ docs: > animate flights. A great circle arc between two airports is calculated using arc.js and then the flight paths are animated with postrender. The flight data is provided by - OpenFlights (a simplified data - set from the + OpenFlights (a simplified data + set from the Mapbox.js documentation is used). tags: "animation, vector, feature, flights, arc" resources: diff --git a/examples/flight-animation.js b/examples/flight-animation.js index 932c579108..8948b4a438 100644 --- a/examples/flight-animation.js +++ b/examples/flight-animation.js @@ -34,7 +34,7 @@ const flightsSource = new VectorSource({ wrapX: false, attributions: 'Flight data by ' + - 'OpenFlights,', + 'OpenFlights,', loader: function () { const url = 'data/openflights/flights.json'; fetch(url) diff --git a/examples/full-screen-drag-rotate-and-zoom.html b/examples/full-screen-drag-rotate-and-zoom.html index cdf9b0e004..749c520974 100644 --- a/examples/full-screen-drag-rotate-and-zoom.html +++ b/examples/full-screen-drag-rotate-and-zoom.html @@ -4,7 +4,7 @@ title: Full Screen Drag, Rotate, and Zoom shortdesc: Example of drag rotate and zoom control with full screen effect. docs: >

Hold down Shift+Drag to rotate and zoom. Click the button in the top right corner to go full screen. Then do the Shift+Drag thing again.

-

If there is no button on the map, your browser does not support the Full Screen API.

+

If there is no button on the map, your browser does not support the Full Screen API.

tags: "full-screen, drag, rotate, zoom, xyz, maptiler" cloak: - key: get_your_own_D6rA4zTHduk6KOKTXzGB diff --git a/examples/full-screen-source.html b/examples/full-screen-source.html index 01e1449eb9..bd3b3ed357 100644 --- a/examples/full-screen-source.html +++ b/examples/full-screen-source.html @@ -4,7 +4,7 @@ title: Full Screen Control with extended source element shortdesc: Example of a full screen control with a source option definition. docs: >

Click the control in the top right corner to go full screen. Click it again to exit full screen.

-

If there is no button on the map, your browser does not support the Full Screen API.

+

If there is no button on the map, your browser does not support the Full Screen API.

tags: "full-screen, source, fullScreenSource, osm, osm-maps" ---
diff --git a/examples/full-screen.html b/examples/full-screen.html index a68fddceac..bd47165e5d 100644 --- a/examples/full-screen.html +++ b/examples/full-screen.html @@ -4,7 +4,7 @@ title: Full Screen Control shortdesc: Example of a full screen control. docs: >

Click the control in the top right corner to go full screen. Click it again to exit full screen.

-

If there is no button on the map, your browser does not support the Full Screen API.

+

If there is no button on the map, your browser does not support the Full Screen API.

tags: "full-screen, xyz, maptiler" cloak: - key: get_your_own_D6rA4zTHduk6KOKTXzGB diff --git a/examples/geojson.js b/examples/geojson.js index 19d4b46f87..e0bed90d11 100644 --- a/examples/geojson.js +++ b/examples/geojson.js @@ -125,8 +125,9 @@ const geojsonObject = { 'coordinates': [ [ [-5e6, -1e6], - [-4e6, 1e6], [-3e6, -1e6], + [-4e6, 1e6], + [-5e6, -1e6], ], ], }, @@ -163,25 +164,28 @@ const geojsonObject = { [ [ [-5e6, 6e6], - [-5e6, 8e6], - [-3e6, 8e6], [-3e6, 6e6], + [-3e6, 8e6], + [-5e6, 8e6], + [-5e6, 6e6], ], ], [ [ [-2e6, 6e6], - [-2e6, 8e6], - [0, 8e6], [0, 6e6], + [0, 8e6], + [-2e6, 8e6], + [-2e6, 6e6], ], ], [ [ [1e6, 6e6], - [1e6, 8e6], - [3e6, 8e6], [3e6, 6e6], + [3e6, 8e6], + [1e6, 8e6], + [1e6, 6e6], ], ], ], @@ -208,8 +212,9 @@ const geojsonObject = { 'coordinates': [ [ [1e6, -6e6], - [2e6, -4e6], [3e6, -6e6], + [2e6, -4e6], + [1e6, -6e6], ], ], }, diff --git a/examples/heatmap-earthquakes.html b/examples/heatmap-earthquakes.html index e20d7f58b0..becc60145a 100644 --- a/examples/heatmap-earthquakes.html +++ b/examples/heatmap-earthquakes.html @@ -8,8 +8,8 @@ tags: "heatmap, kml, vector, style, webgl" ---
- + - +
diff --git a/examples/here-maps.html b/examples/here-maps.html index 61df8fa4d2..7cbce3c68d 100644 --- a/examples/here-maps.html +++ b/examples/here-maps.html @@ -3,14 +3,12 @@ layout: example.html title: HERE Map Tile API shortdesc: Example of a map with map tiles from HERE. docs: > -

HERE Map Tile API used with ol/source/XYZ.

-

Be sure to respect the HERE Service Terms when using their tile API.

+

HERE Map Tile API used with ol/source/XYZ.

+

Be sure to respect the HERE Service Terms when using their tile API.

tags: "here, here-maps, here-tile-api" cloak: - - key: kDm0Jq1K4Ak7Bwtn8uvk - value: Your HERE Maps appId from https://developer.here.com/ - - key: xnmvc4dKZrDfGlvQHXSvwQ - value: Your HERE Maps appCode from https://developer.here.com/ + - key: x13yMxvFSo8FIKFDDTnQaJ57Gakt11ZaIyqIctoSD3Y + value: Your HERE Maps API key from https://developer.here.com/ ---
-
- Area:   +   Area:   + diff --git a/examples/hit-tolerance.js b/examples/hit-tolerance.js index 443abb7ee5..e3cd1c3cea 100644 --- a/examples/hit-tolerance.js +++ b/examples/hit-tolerance.js @@ -57,10 +57,10 @@ map.on('singleclick', function (e) { ); if (hit) { style.getStroke().setColor('green'); - statusElement.innerHTML = ' A feature got hit!'; + statusElement.innerHTML = 'A feature got hit!'; } else { style.getStroke().setColor('black'); - statusElement.innerHTML = ' No feature got hit.'; + statusElement.innerHTML = 'No feature got hit.'; } feature.changed(); }); diff --git a/examples/icon-color.js b/examples/icon-color.js index e5c583097c..cfbb28d1dc 100644 --- a/examples/icon-color.js +++ b/examples/icon-color.js @@ -41,7 +41,7 @@ rome.setStyle( london.setStyle( new Style({ image: new Icon({ - color: '#4271AE', + color: 'rgba(255, 0, 0, .5)', crossOrigin: 'anonymous', src: 'data/bigdot.png', scale: 0.2, diff --git a/examples/icon-scale.js b/examples/icon-scale.js index d783b300b7..3d079fc0ba 100644 --- a/examples/icon-scale.js +++ b/examples/icon-scale.js @@ -98,7 +98,6 @@ const popup = new Overlay({ element: element, positioning: 'bottom-center', stopEvent: false, - offset: [0, -50], }); map.addOverlay(popup); @@ -109,8 +108,7 @@ map.on('click', function (evt) { }); $(element).popover('dispose'); if (feature) { - const coordinates = feature.getGeometry().getCoordinates(); - popup.setPosition(coordinates); + popup.setPosition(evt.coordinate); $(element).popover({ placement: 'top', html: true, @@ -123,11 +121,11 @@ map.on('click', function (evt) { // change mouse cursor when over marker map.on('pointermove', function (e) { - if (e.dragging) { - $(element).popover('dispose'); - return; - } const pixel = map.getEventPixel(e.originalEvent); const hit = map.hasFeatureAtPixel(pixel); map.getTarget().style.cursor = hit ? 'pointer' : ''; }); +// Close the popup when the map is moved +map.on('movestart', function () { + $(element).popover('dispose'); +}); diff --git a/examples/icon-sprite-webgl.html b/examples/icon-sprite-webgl.html index 66e83e231e..7930218863 100644 --- a/examples/icon-sprite-webgl.html +++ b/examples/icon-sprite-webgl.html @@ -21,6 +21,6 @@ cloak:
Current sighting:
- Filter by UFO shape: +
diff --git a/examples/icon.js b/examples/icon.js index 62e8a40e67..123049ed8a 100644 --- a/examples/icon.js +++ b/examples/icon.js @@ -56,7 +56,6 @@ const popup = new Overlay({ element: element, positioning: 'bottom-center', stopEvent: false, - offset: [0, -50], }); map.addOverlay(popup); @@ -66,8 +65,7 @@ map.on('click', function (evt) { return feature; }); if (feature) { - const coordinates = feature.getGeometry().getCoordinates(); - popup.setPosition(coordinates); + popup.setPosition(evt.coordinate); $(element).popover({ placement: 'top', html: true, @@ -81,11 +79,11 @@ map.on('click', function (evt) { // change mouse cursor when over marker map.on('pointermove', function (e) { - if (e.dragging) { - $(element).popover('dispose'); - return; - } const pixel = map.getEventPixel(e.originalEvent); const hit = map.hasFeatureAtPixel(pixel); map.getTarget().style.cursor = hit ? 'pointer' : ''; }); +// Close the popup when the map is moved +map.on('movestart', function () { + $(element).popover('dispose'); +}); diff --git a/examples/igc.html b/examples/igc.html index e55edecb42..3f5bab37ee 100644 --- a/examples/igc.html +++ b/examples/igc.html @@ -7,7 +7,7 @@ docs: > tags: "complex-geometry, closest-feature, igc, opencyclemap" cloak: - key: 0e6fc415256d4fbb9b5166a718591d71 - value: Your API key from http://www.thunderforest.com/docs/apikeys/ here + value: Your API key from https://www.thunderforest.com/docs/apikeys/ here ---
diff --git a/examples/iiif.html b/examples/iiif.html index 8d8fadcad9..061c23309c 100644 --- a/examples/iiif.html +++ b/examples/iiif.html @@ -10,7 +10,7 @@ tags: "IIIF, IIIF Image API, tile source"
 
- Enter info.json URL: +
diff --git a/examples/image-load-events.js b/examples/image-load-events.js index 7bc8725591..cdfa74eda2 100644 --- a/examples/image-load-events.js +++ b/examples/image-load-events.js @@ -6,7 +6,7 @@ import View from '../src/ol/View.js'; /** * Renders a progress bar. * @param {HTMLElement} el The target element. - * @constructor + * @class */ function Progress(el) { this.el = el; diff --git a/examples/index.html b/examples/index.html index c2359c350e..be31b4b36f 100644 --- a/examples/index.html +++ b/examples/index.html @@ -28,29 +28,6 @@ .example:hover { background-color: #F5F5F5; } - - ::-webkit-scrollbar { - width: 8px; - } - - ::-webkit-scrollbar-button { - width: 0; - height: 0; - display: none; - } - - ::-webkit-scrollbar-thumb { - background-color: rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.10),inset 0 -1px 0 rgba(0, 0, 0, 0.07); - } - - ::-webkit-scrollbar-thumb:hover { - background-color: rgba(0, 0, 0, 0.4); - } - - ::-webkit-scrollbar-corner { - background-color: transparent; - } diff --git a/examples/index.js b/examples/index.js index 5392a59964..fcee11c512 100644 --- a/examples/index.js +++ b/examples/index.js @@ -72,7 +72,7 @@ // sort examples, first by number of words matched, then // by word frequency examples.sort(function (a, b) { - return a.score - b.score || a.words - b.words; + return b.score - a.score || b.words - a.words; }); return examples; } diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js index 497cf87c47..a2b708abb5 100644 --- a/examples/kml-timezones.js +++ b/examples/kml-timezones.js @@ -82,11 +82,7 @@ const displayFeatureInfo = function (pixel) { return feature; }); if (feature) { - info - .tooltip('hide') - .attr('data-original-title', feature.get('name')) - .tooltip('fixTitle') - .tooltip('show'); + info.attr('data-original-title', feature.get('name')).tooltip('show'); } else { info.tooltip('hide'); } diff --git a/examples/layer-group.css b/examples/layer-group.css index 31cb3e6cf1..7018b0e597 100644 --- a/examples/layer-group.css +++ b/examples/layer-group.css @@ -1,3 +1,6 @@ #layertree li > span { cursor: pointer; -} \ No newline at end of file +} +#layertree label { + display: block; +} diff --git a/examples/layer-group.html b/examples/layer-group.html index 405bea1737..2083f1eda7 100644 --- a/examples/layer-group.html +++ b/examples/layer-group.html @@ -18,37 +18,44 @@ cloak:
  • OSM layer
    + - -
    • -
  • Layer group +
  • + Layer group
    + - -
      -
    • Food insecurity layer +
    • + Food insecurity layer
      + - -
      • -
    • World borders layer +
    • + World borders layer
      + - -
    diff --git a/examples/layer-group.js b/examples/layer-group.js index c6fd6b524b..c85ad3f72d 100644 --- a/examples/layer-group.js +++ b/examples/layer-group.js @@ -49,19 +49,21 @@ function bindInputs(layerid, layer) { visibilityInput.prop('checked', layer.getVisible()); const opacityInput = $(layerid + ' input.opacity'); - opacityInput.on('input change', function () { + opacityInput.on('input', function () { layer.setOpacity(parseFloat(this.value)); }); opacityInput.val(String(layer.getOpacity())); } -map.getLayers().forEach(function (layer, i) { - bindInputs('#layer' + i, layer); - if (layer instanceof LayerGroup) { - layer.getLayers().forEach(function (sublayer, j) { - bindInputs('#layer' + i + j, sublayer); - }); - } -}); +function setup(id, group) { + group.getLayers().forEach(function (layer, i) { + const layerid = id + i; + bindInputs(layerid, layer); + if (layer instanceof LayerGroup) { + setup(layerid, layer); + } + }); +} +setup('#layer', map.getLayerGroup()); $('#layertree li > span') .click(function () { diff --git a/examples/layer-z-index.js b/examples/layer-z-index.js index 8e967a30e5..aa21808066 100644 --- a/examples/layer-z-index.js +++ b/examples/layer-z-index.js @@ -56,7 +56,7 @@ function createLayer(coordinates, style, zIndex) { return vectorLayer; } -const layer0 = createLayer([40, 40], styles['star'], 0); +const layer0 = createLayer([40, 40], styles['star']); const layer1 = createLayer([0, 0], styles['square'], 1); const layer2 = createLayer([0, 40], styles['triangle'], 0); diff --git a/examples/localized-openstreetmap.html b/examples/localized-openstreetmap.html index dbefe03f24..46d391301e 100644 --- a/examples/localized-openstreetmap.html +++ b/examples/localized-openstreetmap.html @@ -3,11 +3,11 @@ layout: example.html title: Localized OpenStreetMap shortdesc: Example of a localized OpenStreetMap map with a custom tile server and a custom attribution. docs: > -

    The base layer is OpenCycleMap with an overlay from OpenSeaMap. +

    The base layer is OpenCycleMap with an overlay from OpenSeaMap. tags: "localized-openstreetmap, openseamap, openstreetmap" cloak: - key: 0e6fc415256d4fbb9b5166a718591d71 - value: Your API key from http://www.thunderforest.com/docs/apikeys/ here + value: Your API key from https://www.thunderforest.com/docs/apikeys/ here ---

    diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js index 2da7932a7e..5d00470a76 100644 --- a/examples/localized-openstreetmap.js +++ b/examples/localized-openstreetmap.js @@ -18,7 +18,7 @@ const openCycleMapLayer = new TileLayer({ const openSeaMapLayer = new TileLayer({ source: new OSM({ attributions: [ - 'All maps © OpenSeaMap', + 'All maps © OpenSeaMap', ATTRIBUTION, ], opaque: false, diff --git a/examples/mapbox-layer.html b/examples/mapbox-layer.html index bd8bfa7ec6..4680cb56ef 100644 --- a/examples/mapbox-layer.html +++ b/examples/mapbox-layer.html @@ -3,12 +3,14 @@ layout: example.html title: Mapbox-gl Layer shortdesc: Example of a Mapbox-gl-js layer integration. docs: > - Show how to add a mapbox-gl-js layer in an openlayers map. **Note**: Make sure to get your own API key at https://www.maptiler.com/cloud/ when using this example. No map will be visible when the API key has expired. + Show how to add a mapbox-gl-js layer in an OpenLayers map. + **Note**: Make sure to get your own API key at https://www.maptiler.com/cloud/ when using this example. No map will be visible when the API key has expired. + mapbox-gl-js version 1.13.0 is used in this example as later versions require a Mapbox access token and are not compatible with older browsers. tags: "simple, mapbox, vector, tiles, maptiler" experimental: true resources: - - https://unpkg.com/mapbox-gl@1.11.1/dist/mapbox-gl.js - - https://unpkg.com/mapbox-gl@1.11.1/dist/mapbox-gl.css + - https://cdnjs.cloudflare.com/ajax/libs/mapbox-gl/1.13.0/mapbox-gl.js + - https://cdnjs.cloudflare.com/ajax/libs/mapbox-gl/1.13.0/mapbox-gl.css cloak: - key: get_your_own_D6rA4zTHduk6KOKTXzGB value: Get your own API key at https://www.maptiler.com/cloud/ diff --git a/examples/measure.css b/examples/measure.css index d7cff60da3..d4bd28c6ce 100644 --- a/examples/measure.css +++ b/examples/measure.css @@ -7,6 +7,8 @@ opacity: 0.7; white-space: nowrap; font-size: 12px; + cursor: default; + user-select: none; } .ol-tooltip-measure { opacity: 1; diff --git a/examples/measure.html b/examples/measure.html index b5a4f60a40..0cc627a964 100644 --- a/examples/measure.html +++ b/examples/measure.html @@ -16,7 +16,7 @@ tags: "draw, edit, measure, vector" ---
    - + - +
    diff --git a/examples/moveend.html b/examples/moveend.html index 8ecf4c4a03..ee2f9cee3d 100644 --- a/examples/moveend.html +++ b/examples/moveend.html @@ -3,11 +3,15 @@ layout: example.html title: Moveend Event shortdesc: Use of the moveend event. docs: > -

    In this example, a listener is registered for the map's moveend event. Whenever this listener is called, it updates the inputs below with the map extent in decimal degrees.

    +

    + In this example, a listener is registered for the map's + moveend event. Whenever this listener is called, + it updates the inputs below with the map extent in decimal degrees. +

    tags: "moveend, map, event" ---
    - -
    - - + + + + diff --git a/examples/offscreen-canvas.worker.js b/examples/offscreen-canvas.worker.js index ce33a656c5..5adec394e5 100644 --- a/examples/offscreen-canvas.worker.js +++ b/examples/offscreen-canvas.worker.js @@ -6,7 +6,6 @@ import stringify from 'json-stringify-safe'; import styleFunction from 'ol-mapbox-style/dist/stylefunction.js'; import {Projection} from '../src/ol/proj.js'; import {inView} from '../src/ol/layer/Layer.js'; -import {renderDeclutterItems} from '../src/ol/render.js'; import {getTilePriority as tilePriorityFunction} from '../src/ol/TileQueue.js'; /** @type {any} */ @@ -145,7 +144,7 @@ worker.addEventListener('message', (event) => { renderer.renderFrame(frameState, canvas); } }); - renderDeclutterItems(frameState, null); + layers.forEach((layer) => layer.renderDeclutter(frameState)); if (tileQueue.getTilesLoading() < maxTotalLoading) { tileQueue.reprioritize(); tileQueue.loadMoreTiles(maxTotalLoading, maxNewLoads); diff --git a/examples/overlay.html b/examples/overlay.html index 73a2596af8..15ad8a43e5 100644 --- a/examples/overlay.html +++ b/examples/overlay.html @@ -13,7 +13,7 @@ resources:
    - Vienna + Vienna
    diff --git a/examples/overviewmap-custom.html b/examples/overviewmap-custom.html index 8b06bd2132..979280d8a3 100644 --- a/examples/overviewmap-custom.html +++ b/examples/overviewmap-custom.html @@ -7,8 +7,8 @@ docs: > tags: "overview, overviewmap" cloak: - key: 0e6fc415256d4fbb9b5166a718591d71 - value: Your API key from http://www.thunderforest.com/docs/apikeys/ here + value: Your API key from https://www.thunderforest.com/docs/apikeys/ here ---
    -
    Rotate with view
    +
    diff --git a/examples/permalink.html b/examples/permalink.html index 59969f0cf5..4d93bbfb30 100644 --- a/examples/permalink.html +++ b/examples/permalink.html @@ -6,7 +6,7 @@ docs: > In this example the HTML 5 History API is used to update the browser URL with the current zoom-level, center and rotation when the map is moved. - Note that the History API is not supported in all browsers, one might consider to use a a polyfill. diff --git a/examples/permalink.js b/examples/permalink.js index c62ee3e4f7..db1bd360d8 100644 --- a/examples/permalink.js +++ b/examples/permalink.js @@ -13,7 +13,7 @@ if (window.location.hash !== '') { const hash = window.location.hash.replace('#map=', ''); const parts = hash.split('/'); if (parts.length === 4) { - zoom = parseInt(parts[0], 10); + zoom = parseFloat(parts[0]); center = [parseFloat(parts[1]), parseFloat(parts[2])]; rotation = parseFloat(parts[3]); } @@ -45,11 +45,11 @@ const updatePermalink = function () { const center = view.getCenter(); const hash = '#map=' + - view.getZoom() + + view.getZoom().toFixed(2) + '/' + - Math.round(center[0] * 100) / 100 + + center[0].toFixed(2) + '/' + - Math.round(center[1] * 100) / 100 + + center[1].toFixed(2) + '/' + view.getRotation(); const state = { diff --git a/examples/preload.html b/examples/preload.html index 193a6bd0ec..3e44decec1 100644 --- a/examples/preload.html +++ b/examples/preload.html @@ -7,7 +7,7 @@ docs: > tags: "preload, bing" cloak: - key: ApTJzdkyN1DdFKkRAE6QIDtzihNaf6IWJsT-nQ_2eMoO4PN__0Tzhl2-WgJtXFSp - value: Your Bing Maps Key from http://www.bingmapsportal.com/ here + value: Your Bing Maps Key from https://www.bingmapsportal.com/ here ---
    diff --git a/examples/print-to-scale.html b/examples/print-to-scale.html index 54d88db427..00875383f3 100644 --- a/examples/print-to-scale.html +++ b/examples/print-to-scale.html @@ -18,7 +18,7 @@ resources:
    - + - + - + - - +
    +
    + +
    diff --git a/examples/regularshape.html b/examples/regularshape.html index 990a9ec148..59cbf4b762 100644 --- a/examples/regularshape.html +++ b/examples/regularshape.html @@ -6,8 +6,9 @@ docs: > This example shows how several regular shapes or symbols (representing `x`, `cross`, `star`, `triangle`, `square` and `stacked`) can be created. + A `rectangle` is produced by scaling a square created without rotation. Style `stacked` represents possility to stack multiple shapes with offset -tags: "vector, symbol, regularshape, style, square, cross, star, triangle, x" +tags: "vector, symbol, regularshape, style, square, rectangle, cross, star, triangle, x" ---
    diff --git a/examples/regularshape.js b/examples/regularshape.js index 83eab335d1..91279aea76 100644 --- a/examples/regularshape.js +++ b/examples/regularshape.js @@ -19,6 +19,17 @@ const styles = { angle: Math.PI / 4, }), }), + 'rectangle': new Style({ + image: new RegularShape({ + fill: fill, + stroke: stroke, + radius: 10 / Math.SQRT2, + radius2: 10, + points: 4, + angle: 0, + scale: [1, 0.5], + }), + }), 'triangle': new Style({ image: new RegularShape({ fill: fill, @@ -82,14 +93,24 @@ const styles = { ], }; -const styleKeys = ['x', 'cross', 'star', 'triangle', 'square', 'stacked']; +const styleKeys = [ + 'x', + 'cross', + 'star', + 'triangle', + 'square', + 'rectangle', + 'stacked', +]; const count = 250; const features = new Array(count); const e = 4500000; for (let i = 0; i < count; ++i) { const coordinates = [2 * e * Math.random() - e, 2 * e * Math.random() - e]; features[i] = new Feature(new Point(coordinates)); - features[i].setStyle(styles[styleKeys[Math.floor(Math.random() * 6)]]); + features[i].setStyle( + styles[styleKeys[Math.floor(Math.random() * styleKeys.length)]] + ); } const source = new VectorSource({ diff --git a/examples/reprojection-image.html b/examples/reprojection-image.html index 5a3aa14249..c4bb7cfa0b 100644 --- a/examples/reprojection-image.html +++ b/examples/reprojection-image.html @@ -7,4 +7,7 @@ docs: > tags: "reprojection, projection, proj4js, image, imagestatic" ---
    -
    Image smoothing
    +
    + + +
    diff --git a/examples/reprojection.html b/examples/reprojection.html index 5ad6a2da47..cf83a1eebc 100644 --- a/examples/reprojection.html +++ b/examples/reprojection.html @@ -9,14 +9,14 @@ tags: "reprojection, projection, proj4js, osm, wms, wmts, hidpi"
    - +
    - +
    - + diff --git a/examples/sea-level.html b/examples/sea-level.html index 147b6021f7..ec30c85ba2 100644 --- a/examples/sea-level.html +++ b/examples/sea-level.html @@ -5,7 +5,7 @@ shortdesc: Render sea level at different elevations docs: >

    This example uses a ol/source/Raster with - Mapbox Terrain-RGB tiles + Mapbox Terrain-RGB tiles to "flood" areas below the elevation shown on the sea level slider.

    diff --git a/examples/select-features.html b/examples/select-features.html index c7640d8514..9fd1180239 100644 --- a/examples/select-features.html +++ b/examples/select-features.html @@ -10,13 +10,13 @@ tags: "select, vector" ---

    - - + +  0 selected features diff --git a/examples/shaded-relief.css b/examples/shaded-relief.css index f829965da2..71748fd2dc 100644 --- a/examples/shaded-relief.css +++ b/examples/shaded-relief.css @@ -1,4 +1,7 @@ table.controls td { - text-align: center; padding: 2px 5px; } +table.controls td:nth-child(3) { + text-align: right; + min-width: 3em; +} diff --git a/examples/shaded-relief.html b/examples/shaded-relief.html index 116040ccb8..4872f10e15 100644 --- a/examples/shaded-relief.html +++ b/examples/shaded-relief.html @@ -28,15 +28,18 @@ tags: "raster, shaded relief"
    - + + - + + - + +
    vertical exaggeration: x x
    sun elevation: ° °
    sun azimuth: ° °
    diff --git a/examples/snap.html b/examples/snap.html index 409f09491d..3827370d60 100644 --- a/examples/snap.html +++ b/examples/snap.html @@ -24,7 +24,7 @@ tags: "draw, edit, modify, vector, snap"
    - + diff --git a/examples/turf.html b/examples/turf.html index 5caf484622..8e399abb9e 100644 --- a/examples/turf.html +++ b/examples/turf.html @@ -3,7 +3,7 @@ layout: example.html title: turf.js shortdesc: Example on how to use turf.js with OpenLayers. docs: > - Example showing the integration of turf.js + Example showing the integration of turf.js with OpenLayers. The turf.js function along is used to display a marker every 200 meters along a street. tags: "vector, turfjs, along, distance" diff --git a/examples/utfgrid.html b/examples/utfgrid.html index 03879e83f3..4e888b09b4 100644 --- a/examples/utfgrid.html +++ b/examples/utfgrid.html @@ -4,7 +4,7 @@ title: UTFGrid shortdesc: This example shows how to read data from a UTFGrid source. docs: >

    Point to a country to see its name and flag.

    - Tiles made with TileMill. Hosting on mapbox.com or with open-source TileServer. + Tiles made with TileMill. Hosting on mapbox.com or with open-source TileServer. tags: "utfgrid, tilejson" cloak: - key: pk.eyJ1IjoiYWhvY2V2YXIiLCJhIjoiY2pzbmg0Nmk5MGF5NzQzbzRnbDNoeHJrbiJ9.7_-_gL8ur7ZtEiNwRfCy7Q diff --git a/examples/vector-esri-edit.html b/examples/vector-esri-edit.html index ac9ac5cad7..8856e8895b 100644 --- a/examples/vector-esri-edit.html +++ b/examples/vector-esri-edit.html @@ -10,7 +10,7 @@ resources: ---
    - +

    Points

    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -127,7 +127,7 @@ tags: "geojson, vector, openstreetmap, label"

    Lines

    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    • @@ -239,7 +239,7 @@ tags: "geojson, vector, openstreetmap, label"

    Polygons

    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    -
    diff --git a/examples/vector-labels.js b/examples/vector-labels.js index 2ee2625054..17f0614d0e 100644 --- a/examples/vector-labels.js +++ b/examples/vector-labels.js @@ -234,7 +234,7 @@ String.prototype.trunc = return this.length > n ? this.substr(0, n - 1) + '...' : this.substr(0); }; -// http://stackoverflow.com/questions/14484787/wrap-text-in-javascript +// https://stackoverflow.com/questions/14484787/wrap-text-in-javascript function stringDivider(str, width, spaceReplacer) { if (str.length > width) { let p = width; diff --git a/examples/vector-osm.html b/examples/vector-osm.html index 0bdaf67045..e96498eaea 100644 --- a/examples/vector-osm.html +++ b/examples/vector-osm.html @@ -3,7 +3,7 @@ layout: example.html title: OSM XML shortdesc: Example of using the OSM XML source. docs: > - OSM XML vector data is loaded dynamically from a the [Overpass API](http://overpass-api.de) using a bbox strategy. Note that panning and zooming will eventually lead to "Too many requests" errors from the Overpass API. + OSM XML vector data is loaded dynamically from a the [Overpass API](https://overpass-api.de/) using a bbox strategy. Note that panning and zooming will eventually lead to "Too many requests" errors from the Overpass API. tags: "vector, osmxml, loading, server, strategy, bbox, maptiler" cloak: - key: get_your_own_D6rA4zTHduk6KOKTXzGB diff --git a/examples/vector-osm.js b/examples/vector-osm.js index a5ad295b26..3b9b4faf80 100644 --- a/examples/vector-osm.js +++ b/examples/vector-osm.js @@ -74,7 +74,7 @@ const styles = { const vectorSource = new VectorSource({ format: new OSMXML(), - loader: function (extent, resolution, projection) { + loader: function (extent, resolution, projection, success, failure) { const epsg4326Extent = transformExtent(extent, projection, 'EPSG:4326'); const client = new XMLHttpRequest(); client.open('POST', 'https://overpass-api.de/api/interpreter'); @@ -83,7 +83,9 @@ const vectorSource = new VectorSource({ featureProjection: map.getView().getProjection(), }); vectorSource.addFeatures(features); + success(features); }); + client.addEventListener('error', failure); const query = '(node(' + epsg4326Extent[1] + diff --git a/examples/vector-tile-selection.html b/examples/vector-tile-selection.html index ba352f8c6d..4d5689c8a0 100644 --- a/examples/vector-tile-selection.html +++ b/examples/vector-tile-selection.html @@ -15,7 +15,7 @@ tags: "vector tiles, selection" ---
    - + diff --git a/examples/webpack/config.js b/examples/webpack/config.js index 3a88540c38..8e2efac50e 100644 --- a/examples/webpack/config.js +++ b/examples/webpack/config.js @@ -27,18 +27,31 @@ module.exports = { test: /^((?!es2015-)[\s\S])*\.js$/, use: { loader: 'buble-loader', + options: { + transforms: { + dangerousForOf: true, + }, + }, }, include: [ path.join(__dirname, '..', '..', 'src'), path.join(__dirname, '..'), + path.join( + __dirname, + '..', + '..', + 'node_modules', + '@mapbox', + 'mapbox-gl-style-spec' + ), ], }, { test: /\.js$/, use: { - loader: path.join(__dirname, './worker-loader.js'), + loader: path.join(__dirname, 'worker-loader.js'), }, - include: [path.join(__dirname, '../../src/ol/worker')], + include: [path.join(__dirname, '..', '..', 'src', 'ol', 'worker')], }, ], }, diff --git a/examples/webpack/example-builder.js b/examples/webpack/example-builder.js index 93ae36cb88..716b5f4712 100644 --- a/examples/webpack/example-builder.js +++ b/examples/webpack/example-builder.js @@ -332,12 +332,11 @@ class ExampleBuilder { jsSource + (workerSource ? `\n${workerSource}` : '') ), devDependencies: { - parcel: '1.11.0', + parcel: '^2.0.0-beta.1', }, scripts: { start: 'parcel index.html', - build: - 'parcel build --experimental-scope-hoisting --public-url . index.html', + build: 'parcel build --public-url . index.html', }, }, null, diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index 21f5611400..4835719e58 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -53,8 +53,8 @@ const layers = [ url: 'https://wms.geo.admin.ch/', crossOrigin: 'anonymous', attributions: - '© Pixelmap 1:1000000 / geo.admin.ch', + '© Pixelmap 1:1000000 / geo.admin.ch', params: { 'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale', 'FORMAT': 'image/jpeg', @@ -68,9 +68,9 @@ const layers = [ url: 'https://wms.geo.admin.ch/', crossOrigin: 'anonymous', attributions: - '© National parks / geo.admin.ch', - params: {'LAYERS': 'ch.bafu.schutzgebiete-paerke_nationaler_bedeutung'}, + '© Flood Alert / geo.admin.ch', + params: {'LAYERS': 'ch.bafu.hydroweb-warnkarte_national'}, serverType: 'mapserver', }), }), @@ -94,7 +94,7 @@ const map = new Map({ /* * Swiss projection transform functions downloaded from - * http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/products/skripts.html + * https://www.swisstopo.admin.ch/en/knowledge-facts/surveying-geodesy/reference-systems/map-projections.html */ // Convert WGS lat/long (° dec) to CH y @@ -107,7 +107,7 @@ function WGStoCHy(lat, lng) { lat = DEGtoSEC(lat); lng = DEGtoSEC(lng); - // Axiliary values (% Bern) + // Axillary values (% Bern) const lat_aux = (lat - 169028.66) / 10000; const lng_aux = (lng - 26782.5) / 10000; @@ -132,7 +132,7 @@ function WGStoCHx(lat, lng) { lat = DEGtoSEC(lat); lng = DEGtoSEC(lng); - // Axiliary values (% Bern) + // Axillary values (% Bern) const lat_aux = (lat - 169028.66) / 10000; const lng_aux = (lng - 26782.5) / 10000; @@ -150,8 +150,8 @@ function WGStoCHx(lat, lng) { // Convert CH y/x to WGS lat function CHtoWGSlat(y, x) { - // Converts militar to civil and to unit = 1000km - // Axiliary values (% Bern) + // Converts military to civil and to unit = 1000km + // Axillary values (% Bern) const y_aux = (y - 600000) / 1000000; const x_aux = (x - 200000) / 1000000; @@ -172,8 +172,8 @@ function CHtoWGSlat(y, x) { // Convert CH y/x to WGS long function CHtoWGSlng(y, x) { - // Converts militar to civil and to unit = 1000km - // Axiliary values (% Bern) + // Converts military to civil and to unit = 1000km + // Axillary values (% Bern) const y_aux = (y - 600000) / 1000000; const x_aux = (x - 200000) / 1000000; diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js index a52125d80a..da59b0fbd2 100644 --- a/examples/wms-image-custom-proj.js +++ b/examples/wms-image-custom-proj.js @@ -42,8 +42,8 @@ const layers = [ url: 'https://wms.geo.admin.ch/', crossOrigin: 'anonymous', attributions: - '© Pixelmap 1:1000000 / geo.admin.ch', + '© Pixelmap 1:1000000 / geo.admin.ch', params: { 'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale', 'FORMAT': 'image/jpeg', @@ -57,9 +57,9 @@ const layers = [ url: 'https://wms.geo.admin.ch/', crossOrigin: 'anonymous', attributions: - '© National parks / geo.admin.ch', - params: {'LAYERS': 'ch.bafu.schutzgebiete-paerke_nationaler_bedeutung'}, + '© Flood Alert / geo.admin.ch', + params: {'LAYERS': 'ch.bafu.hydroweb-warnkarte_national'}, serverType: 'mapserver', }), }), diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js index 2f515f8d3d..578dfdd7eb 100644 --- a/examples/wms-no-proj.js +++ b/examples/wms-no-proj.js @@ -4,13 +4,14 @@ import Projection from '../src/ol/proj/Projection.js'; import TileWMS from '../src/ol/source/TileWMS.js'; import View from '../src/ol/View.js'; import {Image as ImageLayer, Tile as TileLayer} from '../src/ol/layer.js'; +import {ScaleLine, defaults as defaultControls} from '../src/ol/control.js'; const layers = [ new TileLayer({ source: new TileWMS({ attributions: - '© Pixelmap 1:1000000 / geo.admin.ch', + '© Pixelmap 1:1000000 / geo.admin.ch', crossOrigin: 'anonymous', params: { 'LAYERS': 'ch.swisstopo.pixelkarte-farbe-pk1000.noscale', @@ -22,10 +23,10 @@ const layers = [ new ImageLayer({ source: new ImageWMS({ attributions: - '© National parks / geo.admin.ch', + '© Flood Alert / geo.admin.ch', crossOrigin: 'anonymous', - params: {'LAYERS': 'ch.bafu.schutzgebiete-paerke_nationaler_bedeutung'}, + params: {'LAYERS': 'ch.bafu.hydroweb-warnkarte_national'}, serverType: 'mapserver', url: 'https://wms.geo.admin.ch/', }), @@ -37,12 +38,18 @@ const layers = [ // projection object. Requesting tiles only needs the code together with a // tile grid of Cartesian coordinates; it does not matter how those // coordinates relate to latitude or longitude. +// +// With no transforms available projection units must be assumed to represent +// true distances. In the case of local projections this may be a sufficiently +// close approximation for a meaningful (if not 100% accurate) ScaleLine control. + const projection = new Projection({ code: 'EPSG:21781', units: 'm', }); const map = new Map({ + controls: defaultControls().extend([new ScaleLine()]), layers: layers, target: 'map', view: new View({ diff --git a/examples/wmts-dimensions.html b/examples/wmts-dimensions.html index 191646b52a..2cb384b0c4 100644 --- a/examples/wmts-dimensions.html +++ b/examples/wmts-dimensions.html @@ -3,7 +3,7 @@ layout: example.html title: WMTS Tile Transitions shortdesc: Example of smooth tile transitions when changing the dimension of a WMTS layer. docs: > - Demonstrates smooth reloading of layers when changing a dimension continuously. The demonstration layer is a global sea-level computation (flooding computation from SCALGO, underlying data from CGIAR-CSI SRTM) where cells that are flooded if the sea-level rises to more than x m are colored blue. The user selects the sea-level dimension using a slider. + Demonstrates smooth reloading of layers when changing a dimension continuously. The demonstration layer is a global sea-level computation (flooding computation from SCALGO, underlying data from CGIAR-CSI SRTM) where cells that are flooded if the sea-level rises to more than x m are colored blue. The user selects the sea-level dimension using a slider. tags: "wmts, parameter, transition" ---
    diff --git a/examples/wmts-dimensions.js b/examples/wmts-dimensions.js index 6e1afc9e75..5a363475e6 100644 --- a/examples/wmts-dimensions.js +++ b/examples/wmts-dimensions.js @@ -26,14 +26,15 @@ const tileGrid = new WMTSTileGrid({ const scalgoToken = 'CC5BF28A7D96B320C7DFBFD1236B5BEB'; const wmtsSource = new WMTS({ - url: 'http://ts2.scalgo.com/olpatch/wmts?token=' + scalgoToken, + url: 'https://ts2.scalgo.com/olpatch/wmts?token=' + scalgoToken, layer: 'SRTM_4_1:SRTM_4_1_flooded_sealevels', format: 'image/png', matrixSet: 'EPSG:3857', attributions: [ - 'SCALGO', + 'SCALGO', 'CGIAR-CSI SRTM', + 'srtm-90m-digital-elevation-database-v4-1"' + + ' target="_blank">CGIAR-CSI SRTM', ], tileGrid: tileGrid, style: 'default', diff --git a/examples/wmts-hidpi.js b/examples/wmts-hidpi.js index 535fd8d0c0..f3b4cddb88 100644 --- a/examples/wmts-hidpi.js +++ b/examples/wmts-hidpi.js @@ -5,8 +5,7 @@ import WMTS, {optionsFromCapabilities} from '../src/ol/source/WMTS.js'; import WMTSCapabilities from '../src/ol/format/WMTSCapabilities.js'; import {DEVICE_PIXEL_RATIO} from '../src/ol/has.js'; -const capabilitiesUrl = - 'https://www.basemap.at/wmts/1.0.0/WMTSCapabilities.xml'; +const capabilitiesUrl = 'https://basemap.at/wmts/1.0.0/WMTSCapabilities.xml'; // HiDPI support: // * Use 'bmaphidpi' layer (pixel ratio 2) for device pixel ratio > 1 @@ -35,6 +34,8 @@ fetch(capabilitiesUrl) style: 'normal', }); options.tilePixelRatio = tilePixelRatio; + options.attributions = + 'Grundkarte: basemap.at'; map.addLayer( new TileLayer({ source: new WMTS(options), diff --git a/examples/wmts-ign.js b/examples/wmts-ign.js index 6445d200b1..4efe4e3929 100644 --- a/examples/wmts-ign.js +++ b/examples/wmts-ign.js @@ -19,7 +19,7 @@ const matrixIds = []; const proj3857 = getProjection('EPSG:3857'); const maxResolution = getWidth(proj3857.getExtent()) / 256; -for (let i = 0; i < 18; i++) { +for (let i = 0; i < 20; i++) { matrixIds[i] = i.toString(); resolutions[i] = maxResolution / Math.pow(2, i); } @@ -31,18 +31,18 @@ const tileGrid = new WMTSTileGrid({ }); // For more information about the IGN API key see -// https://geoservices.ign.fr/blog/2017/06/28/geoportail_sans_compte.html +// https://geoservices.ign.fr/blog/2021/01/29/Maj_Cles_Geoservices.html const ign_source = new WMTS({ - url: 'https://wxs.ign.fr/pratique/geoportail/wmts', - layer: 'GEOGRAPHICALGRIDSYSTEMS.MAPS', + url: 'https://wxs.ign.fr/choisirgeoportail/geoportail/wmts', + layer: 'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2', matrixSet: 'PM', - format: 'image/jpeg', + format: 'image/png', projection: 'EPSG:3857', tileGrid: tileGrid, style: 'normal', attributions: - '' + + '' + 'IGN', }); diff --git a/examples/xyz.html b/examples/xyz.html index 72d3c3d6af..5aac8b8d4e 100644 --- a/examples/xyz.html +++ b/examples/xyz.html @@ -7,7 +7,7 @@ docs: > tags: "xyz" cloak: - key: 0e6fc415256d4fbb9b5166a718591d71 - value: Your API key from http://www.thunderforest.com/docs/apikeys/ here + value: Your API key from https://www.thunderforest.com/docs/apikeys/ here ---
    diff --git a/package-lock.json b/package-lock.json index 30c7d83bb5..aabbdcaa38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ol", - "version": "6.4.4-dev", + "version": "6.5.1-dev", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -14,133 +14,171 @@ } }, "@babel/compat-data": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz", - "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==", - "dev": true, - "requires": { - "browserslist": "^4.12.0", - "invariant": "^2.2.4", - "semver": "^5.5.0" - } + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz", + "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==", + "dev": true }, "@babel/core": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.0.tgz", - "integrity": "sha512-mkLq8nwaXmDtFmRkQ8ED/eA2CnVw4zr7dCztKalZXBvdK5EeNUAesrrwUqjQEzFgomJssayzB0aqlOsP1vGLqg==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz", + "integrity": "sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.0", - "@babel/helper-module-transforms": "^7.11.0", - "@babel/helpers": "^7.10.4", - "@babel/parser": "^7.11.0", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.11.0", - "@babel/types": "^7.11.0", + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-compilation-targets": "^7.13.8", + "@babel/helper-module-transforms": "^7.13.0", + "@babel/helpers": "^7.13.0", + "@babel/parser": "^7.13.4", + "@babel/template": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", + "gensync": "^1.0.0-beta.2", "json5": "^2.1.2", "lodash": "^4.17.19", - "resolve": "^1.3.2", - "semver": "^5.4.1", + "semver": "^6.3.0", "source-map": "^0.5.0" }, "dependencies": { "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", "dev": true, "requires": { - "@babel/highlight": "^7.10.4" + "@babel/highlight": "^7.12.13" } }, + "@babel/compat-data": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz", + "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==", + "dev": true + }, "@babel/generator": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz", - "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz", + "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==", "dev": true, "requires": { - "@babel/types": "^7.11.0", + "@babel/types": "^7.13.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" } }, - "@babel/helper-module-imports": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", - "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "@babel/helper-compilation-targets": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz", + "integrity": "sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/compat-data": "^7.13.8", + "@babel/helper-validator-option": "^7.12.17", + "browserslist": "^4.14.5", + "semver": "^6.3.0" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz", + "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0" + } + }, + "@babel/helper-module-imports": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz", + "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==", + "dev": true, + "requires": { + "@babel/types": "^7.12.13" } }, "@babel/helper-module-transforms": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz", - "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz", + "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", - "@babel/helper-simple-access": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/template": "^7.10.4", - "@babel/types": "^7.11.0", + "@babel/helper-module-imports": "^7.12.13", + "@babel/helper-replace-supers": "^7.13.0", + "@babel/helper-simple-access": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/helper-validator-identifier": "^7.12.11", + "@babel/template": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0", "lodash": "^4.17.19" } }, - "@babel/helper-split-export-declaration": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", - "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", + "@babel/helper-replace-supers": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz", + "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==", "dev": true, "requires": { - "@babel/types": "^7.11.0" + "@babel/helper-member-expression-to-functions": "^7.13.0", + "@babel/helper-optimise-call-expression": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0" } }, "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", "dev": true }, "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", + "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/helper-validator-identifier": "^7.12.11", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz", - "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==", + "version": "7.13.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz", + "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==", "dev": true }, "@babel/traverse": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz", - "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.0", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.11.0", - "@babel/types": "^7.11.0", + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" } }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, "convert-source-map": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", @@ -157,14 +195,20 @@ "dev": true }, "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", "dev": true, "requires": { "minimist": "^1.2.5" } }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -174,29 +218,170 @@ } }, "@babel/generator": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.5.tgz", - "integrity": "sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz", + "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==", "dev": true, "requires": { - "@babel/types": "^7.10.5", + "@babel/types": "^7.12.13", "jsesc": "^2.5.1", "source-map": "^0.5.0" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-annotate-as-pure": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz", + "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==", + "dev": true, + "requires": { + "@babel/types": "^7.12.13" + } + }, + "@babel/helper-builder-binary-assignment-operator-visitor": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz", + "integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==", + "dev": true, + "requires": { + "@babel/helper-explode-assignable-expression": "^7.12.13", + "@babel/types": "^7.12.13" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz", + "integrity": "sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.13.8", + "@babel/helper-validator-option": "^7.12.17", + "browserslist": "^4.14.5", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "@babel/helper-create-class-features-plugin": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz", + "integrity": "sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-member-expression-to-functions": "^7.13.0", + "@babel/helper-optimise-call-expression": "^7.12.13", + "@babel/helper-replace-supers": "^7.13.0", + "@babel/helper-split-export-declaration": "^7.12.13" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/highlight": "^7.12.13" + } + }, + "@babel/generator": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz", + "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz", + "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0" + } + }, + "@babel/helper-replace-supers": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz", + "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.13.0", + "@babel/helper-optimise-call-expression": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", + "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.13.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz", + "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==", + "dev": true + }, + "@babel/traverse": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" } @@ -215,67 +400,20 @@ } } }, - "@babel/helper-annotate-as-pure": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz", - "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==", - "dev": true, - "requires": { - "@babel/types": "^7.10.4" - } - }, - "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz", - "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==", - "dev": true, - "requires": { - "@babel/helper-explode-assignable-expression": "^7.10.4", - "@babel/types": "^7.10.4" - } - }, - "@babel/helper-compilation-targets": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz", - "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.10.4", - "browserslist": "^4.12.0", - "invariant": "^2.2.4", - "levenary": "^1.1.1", - "semver": "^5.5.0" - } - }, - "@babel/helper-create-class-features-plugin": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz", - "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-member-expression-to-functions": "^7.10.5", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.10.4" - } - }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz", - "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==", + "version": "7.12.17", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz", + "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-regex": "^7.10.4", - "regexpu-core": "^4.7.0" + "@babel/helper-annotate-as-pure": "^7.12.13", + "regexpu-core": "^4.7.1" }, "dependencies": { "regexpu-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", - "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", + "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", "dev": true, "requires": { "regenerate": "^1.4.0", @@ -288,122 +426,299 @@ } } }, - "@babel/helper-define-map": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz", - "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==", + "@babel/helper-define-polyfill-provider": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.4.tgz", + "integrity": "sha512-K5V2GaQZ1gpB+FTXM4AFVG2p1zzhm67n9wrQCJYNzvuLzQybhJyftW7qeDd2uUxPDNdl5Rkon1rOAeUeNDZ28Q==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/types": "^7.10.5", - "lodash": "^4.17.19" + "@babel/helper-compilation-targets": "^7.13.0", + "@babel/helper-module-imports": "^7.12.13", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/traverse": "^7.13.0", + "debug": "^4.1.1", + "lodash.debounce": "^4.0.8", + "resolve": "^1.14.2", + "semver": "^6.1.2" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.12.13" + } + }, + "@babel/generator": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz", + "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-module-imports": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz", + "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==", + "dev": true, + "requires": { + "@babel/types": "^7.12.13" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", + "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.13.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz", + "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==", + "dev": true + }, + "@babel/traverse": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + }, + "dependencies": { + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "dev": true, + "requires": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } }, "@babel/helper-explode-assignable-expression": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz", - "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz", + "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==", "dev": true, "requires": { - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/types": "^7.13.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-function-name": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", - "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz", + "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - } + "@babel/helper-get-function-arity": "^7.12.13", + "@babel/template": "^7.12.13", + "@babel/types": "^7.12.13" } }, "@babel/helper-get-function-arity": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", - "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz", + "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==", "dev": true, "requires": { - "@babel/types": "^7.10.4" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - } + "@babel/types": "^7.12.13" } }, "@babel/helper-hoist-variables": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz", - "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz", + "integrity": "sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==", "dev": true, "requires": { - "@babel/types": "^7.10.4" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz", - "integrity": "sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA==", - "dev": true, - "requires": { - "@babel/types": "^7.10.5" + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", + "@babel/code-frame": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/highlight": "^7.12.13" + } + }, + "@babel/generator": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz", + "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", + "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.13.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz", + "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==", + "dev": true + }, + "@babel/traverse": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, + "@babel/helper-member-expression-to-functions": { + "version": "7.12.16", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz", + "integrity": "sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ==", + "dev": true, + "requires": { + "@babel/types": "^7.12.13" + } + }, "@babel/helper-module-imports": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", @@ -427,199 +742,219 @@ } }, "@babel/helper-module-transforms": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz", - "integrity": "sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz", + "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", - "@babel/helper-simple-access": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.5", + "@babel/helper-module-imports": "^7.12.13", + "@babel/helper-replace-supers": "^7.13.0", + "@babel/helper-simple-access": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/helper-validator-identifier": "^7.12.11", + "@babel/template": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0", "lodash": "^4.17.19" }, "dependencies": { - "@babel/helper-module-imports": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", - "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "@babel/code-frame": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/highlight": "^7.12.13" + } + }, + "@babel/generator": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz", + "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz", + "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0" + } + }, + "@babel/helper-module-imports": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz", + "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==", + "dev": true, + "requires": { + "@babel/types": "^7.12.13" + } + }, + "@babel/helper-replace-supers": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz", + "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.13.0", + "@babel/helper-optimise-call-expression": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0" } }, "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", "dev": true }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", + "@babel/highlight": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", + "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/helper-validator-identifier": "^7.12.11", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.13.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz", + "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==", + "dev": true + }, + "@babel/traverse": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true } } }, "@babel/helper-optimise-call-expression": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", - "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz", + "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==", "dev": true, "requires": { - "@babel/types": "^7.10.4" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - } + "@babel/types": "^7.12.13" } }, "@babel/helper-plugin-utils": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", - "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz", + "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==", "dev": true }, - "@babel/helper-regex": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz", - "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==", - "dev": true, - "requires": { - "lodash": "^4.17.19" - } - }, "@babel/helper-remap-async-to-generator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz", - "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz", + "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-wrap-function": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-annotate-as-pure": "^7.12.13", + "@babel/helper-wrap-function": "^7.13.0", + "@babel/types": "^7.13.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-replace-supers": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", - "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz", + "integrity": "sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.10.4", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - } + "@babel/helper-member-expression-to-functions": "^7.12.13", + "@babel/helper-optimise-call-expression": "^7.12.13", + "@babel/traverse": "^7.12.13", + "@babel/types": "^7.12.13" } }, "@babel/helper-simple-access": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz", - "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz", + "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==", "dev": true, "requires": { - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - } + "@babel/types": "^7.12.13" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz", - "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz", + "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==", "dev": true, "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "^7.12.1" } }, "@babel/helper-split-export-declaration": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz", - "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz", + "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==", "dev": true, "requires": { - "@babel/types": "^7.10.4" - }, - "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - } + "@babel/types": "^7.12.13" } }, "@babel/helper-validator-identifier": { @@ -628,27 +963,203 @@ "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==", "dev": true }, + "@babel/helper-validator-option": { + "version": "7.12.17", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz", + "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==", + "dev": true + }, "@babel/helper-wrap-function": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz", - "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz", + "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-function-name": "^7.12.13", + "@babel/template": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.12.13" + } + }, + "@babel/generator": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz", + "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", + "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.13.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz", + "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==", + "dev": true + }, + "@babel/traverse": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } }, "@babel/helpers": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz", - "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz", + "integrity": "sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==", "dev": true, "requires": { - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/template": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.12.13" + } + }, + "@babel/generator": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz", + "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", + "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.13.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz", + "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==", + "dev": true + }, + "@babel/traverse": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } }, "@babel/highlight": { @@ -669,136 +1180,138 @@ "dev": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz", - "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz", + "integrity": "sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.10.4", - "@babel/plugin-syntax-async-generators": "^7.8.0" + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-remap-async-to-generator": "^7.13.0", + "@babel/plugin-syntax-async-generators": "^7.8.4" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz", - "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz", + "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-class-features-plugin": "^7.13.0", + "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz", - "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz", + "integrity": "sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-dynamic-import": "^7.8.0" + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" } }, "@babel/plugin-proposal-export-namespace-from": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz", - "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz", + "integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-plugin-utils": "^7.12.13", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz", - "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz", + "integrity": "sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.0" + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/plugin-syntax-json-strings": "^7.8.3" } }, "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz", - "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz", + "integrity": "sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-plugin-utils": "^7.13.0", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" } }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz", - "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz", + "integrity": "sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0" + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz", - "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz", + "integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-plugin-utils": "^7.12.13", "@babel/plugin-syntax-numeric-separator": "^7.10.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz", - "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz", + "integrity": "sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.10.4" + "@babel/compat-data": "^7.13.8", + "@babel/helper-compilation-targets": "^7.13.8", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.13.0" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz", - "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz", + "integrity": "sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz", - "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz", + "integrity": "sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0" + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" } }, "@babel/plugin-proposal-private-methods": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz", - "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz", + "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-class-features-plugin": "^7.13.0", + "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz", - "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz", + "integrity": "sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.12.13", + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-syntax-async-generators": { @@ -811,12 +1324,12 @@ } }, "@babel/plugin-syntax-class-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz", - "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-syntax-dynamic-import": { @@ -901,431 +1414,556 @@ } }, "@babel/plugin-syntax-top-level-await": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz", - "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz", + "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz", - "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz", + "integrity": "sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz", - "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz", + "integrity": "sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.10.4" + "@babel/helper-module-imports": "^7.12.13", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-remap-async-to-generator": "^7.13.0" }, "dependencies": { "@babel/helper-module-imports": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", - "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz", + "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "^7.12.13" } } } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz", - "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz", + "integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.5.tgz", - "integrity": "sha512-6Ycw3hjpQti0qssQcA6AMSFDHeNJ++R6dIMnpRqUjFeBBTmTDPa8zgF90OVfTvAo11mXZTlVUViY1g8ffrURLg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz", + "integrity": "sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-classes": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz", - "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz", + "integrity": "sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-define-map": "^7.10.4", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.10.4", + "@babel/helper-annotate-as-pure": "^7.12.13", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-optimise-call-expression": "^7.12.13", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-replace-supers": "^7.13.0", + "@babel/helper-split-export-declaration": "^7.12.13", "globals": "^11.1.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.12.13" + } + }, + "@babel/generator": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz", + "integrity": "sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz", + "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==", + "dev": true, + "requires": { + "@babel/types": "^7.13.0" + } + }, + "@babel/helper-replace-supers": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz", + "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.13.0", + "@babel/helper-optimise-call-expression": "^7.12.13", + "@babel/traverse": "^7.13.0", + "@babel/types": "^7.13.0" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", + "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.13.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz", + "integrity": "sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA==", + "dev": true + }, + "@babel/traverse": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz", + "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.13.0", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.13.0", + "@babel/types": "^7.13.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } }, "@babel/plugin-transform-computed-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz", - "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz", + "integrity": "sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-transform-destructuring": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz", - "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz", + "integrity": "sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz", - "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz", + "integrity": "sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.12.13", + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz", - "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz", + "integrity": "sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz", - "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz", + "integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13", + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-for-of": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz", - "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz", + "integrity": "sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-transform-function-name": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz", - "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz", + "integrity": "sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-literals": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz", - "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz", + "integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz", - "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz", + "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz", - "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz", + "integrity": "sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.5", - "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-module-transforms": "^7.13.0", + "@babel/helper-plugin-utils": "^7.13.0", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz", - "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz", + "integrity": "sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-simple-access": "^7.10.4", + "@babel/helper-module-transforms": "^7.13.0", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-simple-access": "^7.12.13", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz", - "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz", + "integrity": "sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.10.4", - "@babel/helper-module-transforms": "^7.10.5", - "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-hoist-variables": "^7.13.0", + "@babel/helper-module-transforms": "^7.13.0", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-validator-identifier": "^7.12.11", "babel-plugin-dynamic-import-node": "^2.3.3" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + } } }, "@babel/plugin-transform-modules-umd": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz", - "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz", + "integrity": "sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-module-transforms": "^7.13.0", + "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz", - "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz", + "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.12.13" } }, "@babel/plugin-transform-new-target": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz", - "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz", + "integrity": "sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-object-super": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz", - "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz", + "integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13", + "@babel/helper-replace-supers": "^7.12.13" } }, "@babel/plugin-transform-parameters": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz", - "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz", + "integrity": "sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-transform-property-literals": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz", - "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz", + "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-regenerator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz", - "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz", + "integrity": "sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==", "dev": true, "requires": { "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz", - "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz", + "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz", - "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz", + "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-spread": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz", - "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz", + "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0" + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz", - "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz", + "integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-regex": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-template-literals": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz", - "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz", + "integrity": "sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.13.0" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz", - "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz", + "integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz", - "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz", + "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz", - "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz", + "integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.12.13", + "@babel/helper-plugin-utils": "^7.12.13" } }, "@babel/preset-env": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz", - "integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.8.tgz", + "integrity": "sha512-Sso1xOpV4S3ofnxW2DsWTE5ziRk62jEAKLGuQ+EJHC+YHTbFG38QUTixO3JVa1cYET9gkJhO1pMu+/+2dDhKvw==", "dev": true, "requires": { - "@babel/compat-data": "^7.11.0", - "@babel/helper-compilation-targets": "^7.10.4", - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-proposal-async-generator-functions": "^7.10.4", - "@babel/plugin-proposal-class-properties": "^7.10.4", - "@babel/plugin-proposal-dynamic-import": "^7.10.4", - "@babel/plugin-proposal-export-namespace-from": "^7.10.4", - "@babel/plugin-proposal-json-strings": "^7.10.4", - "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4", - "@babel/plugin-proposal-numeric-separator": "^7.10.4", - "@babel/plugin-proposal-object-rest-spread": "^7.11.0", - "@babel/plugin-proposal-optional-catch-binding": "^7.10.4", - "@babel/plugin-proposal-optional-chaining": "^7.11.0", - "@babel/plugin-proposal-private-methods": "^7.10.4", - "@babel/plugin-proposal-unicode-property-regex": "^7.10.4", - "@babel/plugin-syntax-async-generators": "^7.8.0", - "@babel/plugin-syntax-class-properties": "^7.10.4", - "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "@babel/compat-data": "^7.13.8", + "@babel/helper-compilation-targets": "^7.13.8", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-validator-option": "^7.12.17", + "@babel/plugin-proposal-async-generator-functions": "^7.13.8", + "@babel/plugin-proposal-class-properties": "^7.13.0", + "@babel/plugin-proposal-dynamic-import": "^7.13.8", + "@babel/plugin-proposal-export-namespace-from": "^7.12.13", + "@babel/plugin-proposal-json-strings": "^7.13.8", + "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8", + "@babel/plugin-proposal-numeric-separator": "^7.12.13", + "@babel/plugin-proposal-object-rest-spread": "^7.13.8", + "@babel/plugin-proposal-optional-catch-binding": "^7.13.8", + "@babel/plugin-proposal-optional-chaining": "^7.13.8", + "@babel/plugin-proposal-private-methods": "^7.13.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.12.13", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.10.4", - "@babel/plugin-transform-arrow-functions": "^7.10.4", - "@babel/plugin-transform-async-to-generator": "^7.10.4", - "@babel/plugin-transform-block-scoped-functions": "^7.10.4", - "@babel/plugin-transform-block-scoping": "^7.10.4", - "@babel/plugin-transform-classes": "^7.10.4", - "@babel/plugin-transform-computed-properties": "^7.10.4", - "@babel/plugin-transform-destructuring": "^7.10.4", - "@babel/plugin-transform-dotall-regex": "^7.10.4", - "@babel/plugin-transform-duplicate-keys": "^7.10.4", - "@babel/plugin-transform-exponentiation-operator": "^7.10.4", - "@babel/plugin-transform-for-of": "^7.10.4", - "@babel/plugin-transform-function-name": "^7.10.4", - "@babel/plugin-transform-literals": "^7.10.4", - "@babel/plugin-transform-member-expression-literals": "^7.10.4", - "@babel/plugin-transform-modules-amd": "^7.10.4", - "@babel/plugin-transform-modules-commonjs": "^7.10.4", - "@babel/plugin-transform-modules-systemjs": "^7.10.4", - "@babel/plugin-transform-modules-umd": "^7.10.4", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4", - "@babel/plugin-transform-new-target": "^7.10.4", - "@babel/plugin-transform-object-super": "^7.10.4", - "@babel/plugin-transform-parameters": "^7.10.4", - "@babel/plugin-transform-property-literals": "^7.10.4", - "@babel/plugin-transform-regenerator": "^7.10.4", - "@babel/plugin-transform-reserved-words": "^7.10.4", - "@babel/plugin-transform-shorthand-properties": "^7.10.4", - "@babel/plugin-transform-spread": "^7.11.0", - "@babel/plugin-transform-sticky-regex": "^7.10.4", - "@babel/plugin-transform-template-literals": "^7.10.4", - "@babel/plugin-transform-typeof-symbol": "^7.10.4", - "@babel/plugin-transform-unicode-escapes": "^7.10.4", - "@babel/plugin-transform-unicode-regex": "^7.10.4", - "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.11.0", - "browserslist": "^4.12.0", - "core-js-compat": "^3.6.2", - "invariant": "^2.2.2", - "levenary": "^1.1.1", - "semver": "^5.5.0" + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.12.13", + "@babel/plugin-transform-arrow-functions": "^7.13.0", + "@babel/plugin-transform-async-to-generator": "^7.13.0", + "@babel/plugin-transform-block-scoped-functions": "^7.12.13", + "@babel/plugin-transform-block-scoping": "^7.12.13", + "@babel/plugin-transform-classes": "^7.13.0", + "@babel/plugin-transform-computed-properties": "^7.13.0", + "@babel/plugin-transform-destructuring": "^7.13.0", + "@babel/plugin-transform-dotall-regex": "^7.12.13", + "@babel/plugin-transform-duplicate-keys": "^7.12.13", + "@babel/plugin-transform-exponentiation-operator": "^7.12.13", + "@babel/plugin-transform-for-of": "^7.13.0", + "@babel/plugin-transform-function-name": "^7.12.13", + "@babel/plugin-transform-literals": "^7.12.13", + "@babel/plugin-transform-member-expression-literals": "^7.12.13", + "@babel/plugin-transform-modules-amd": "^7.13.0", + "@babel/plugin-transform-modules-commonjs": "^7.13.8", + "@babel/plugin-transform-modules-systemjs": "^7.13.8", + "@babel/plugin-transform-modules-umd": "^7.13.0", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13", + "@babel/plugin-transform-new-target": "^7.12.13", + "@babel/plugin-transform-object-super": "^7.12.13", + "@babel/plugin-transform-parameters": "^7.13.0", + "@babel/plugin-transform-property-literals": "^7.12.13", + "@babel/plugin-transform-regenerator": "^7.12.13", + "@babel/plugin-transform-reserved-words": "^7.12.13", + "@babel/plugin-transform-shorthand-properties": "^7.12.13", + "@babel/plugin-transform-spread": "^7.13.0", + "@babel/plugin-transform-sticky-regex": "^7.12.13", + "@babel/plugin-transform-template-literals": "^7.13.0", + "@babel/plugin-transform-typeof-symbol": "^7.12.13", + "@babel/plugin-transform-unicode-escapes": "^7.12.13", + "@babel/plugin-transform-unicode-regex": "^7.12.13", + "@babel/preset-modules": "^0.1.4", + "@babel/types": "^7.13.0", + "babel-plugin-polyfill-corejs2": "^0.1.4", + "babel-plugin-polyfill-corejs3": "^0.1.3", + "babel-plugin-polyfill-regenerator": "^0.1.2", + "core-js-compat": "^3.9.0", + "semver": "^6.3.0" }, "dependencies": { - "@babel/helper-module-imports": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", - "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/types": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", + "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true } } }, "@babel/preset-modules": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz", - "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz", + "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -1336,9 +1974,9 @@ } }, "@babel/runtime": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.0.tgz", - "integrity": "sha512-qArkXsjJq7H+T86WrIFV0Fnu/tNOkZ4cgXmjkzAu3b/58D5mFIO8JH/y77t7C9q0OdDRdh9s7Ue5GasYssxtXw==", + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.8.tgz", + "integrity": "sha512-CwQljpw6qSayc0fRG1soxHAKs1CnQMOChm4mlQP6My0kf9upVGizj/KhlTTgyUnETmHpcUXjaluNAkteRFuafg==", "dev": true, "requires": { "regenerator-runtime": "^0.13.4" @@ -1353,139 +1991,181 @@ } }, "@babel/template": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", - "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz", + "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/parser": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/code-frame": "^7.12.13", + "@babel/parser": "^7.12.13", + "@babel/types": "^7.12.13" }, "dependencies": { "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", "dev": true, "requires": { - "@babel/highlight": "^7.10.4" + "@babel/highlight": "^7.12.13" } }, "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", "dev": true }, "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz", + "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/helper-validator-identifier": "^7.12.11", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } + "@babel/parser": { + "version": "7.12.16", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz", + "integrity": "sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw==", + "dev": true } } }, "@babel/traverse": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.5.tgz", - "integrity": "sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz", + "integrity": "sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.10.5", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.10.4", - "@babel/parser": "^7.10.5", - "@babel/types": "^7.10.5", + "@babel/code-frame": "^7.12.13", + "@babel/generator": "^7.12.13", + "@babel/helper-function-name": "^7.12.13", + "@babel/helper-split-export-declaration": "^7.12.13", + "@babel/parser": "^7.12.13", + "@babel/types": "^7.12.13", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" }, "dependencies": { "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz", + "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==", "dev": true, "requires": { - "@babel/highlight": "^7.10.4" + "@babel/highlight": "^7.12.13" } }, "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", "dev": true }, "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz", + "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/helper-validator-identifier": "^7.12.11", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, - "@babel/types": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz", - "integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } + "@babel/parser": { + "version": "7.12.16", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz", + "integrity": "sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw==", + "dev": true } } }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz", + "integrity": "sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/helper-validator-identifier": "^7.12.11", "lodash": "^4.17.19", "to-fast-properties": "^2.0.0" }, "dependencies": { "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", "dev": true } } }, + "@discoveryjs/json-ext": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz", + "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==", + "dev": true + }, + "@eslint/eslintrc": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz", + "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + } + } + }, "@mapbox/jsonlint-lines-primitives": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz", "integrity": "sha1-zlblOfg1UrWNENZy6k1vya3HsjQ=" }, "@mapbox/mapbox-gl-style-spec": { - "version": "13.15.0", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.15.0.tgz", - "integrity": "sha512-RjAPWJDsGj4zDzgl0UDpDPUssv7LHwP0jYjchk3GxMtlomYzy2RrHEJvKmuni1lf4d2C12I6FWHPvejc3+rs8w==", + "version": "13.18.1", + "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.18.1.tgz", + "integrity": "sha512-By+CufXEpba7sIUfnpbtVzy5tqrCyFDNssq1k7psxzCL1Xr0y916OSkEH0j7fFilhalVExjoh/mYtxH32tOYqw==", "requires": { "@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/point-geometry": "^0.1.0", @@ -1570,9 +2250,9 @@ } }, "@sinonjs/commons": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.2.tgz", - "integrity": "sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz", + "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==", "dev": true, "requires": { "type-detect": "4.0.8" @@ -1587,20 +2267,10 @@ "@sinonjs/commons": "^1.7.0" } }, - "@sinonjs/formatio": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz", - "integrity": "sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1", - "@sinonjs/samsam": "^5.0.2" - } - }, "@sinonjs/samsam": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.0.3.tgz", - "integrity": "sha512-QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz", + "integrity": "sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==", "dev": true, "requires": { "@sinonjs/commons": "^1.6.0", @@ -1626,18 +2296,30 @@ "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", "dev": true }, + "@types/component-emitter": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz", + "integrity": "sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==", + "dev": true + }, + "@types/cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==", + "dev": true + }, + "@types/cors": { + "version": "2.8.10", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz", + "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==", + "dev": true + }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true }, - "@types/events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", - "dev": true - }, "@types/geojson": { "version": "7946.0.7", "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz", @@ -1645,20 +2327,19 @@ "dev": true }, "@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", "dev": true, "requires": { - "@types/events": "*", "@types/minimatch": "*", "@types/node": "*" } }, "@types/json-schema": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz", - "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz", + "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==", "dev": true }, "@types/minimatch": { @@ -1707,6 +2388,12 @@ "@types/node": "*" } }, + "@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true + }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -1882,6 +2569,27 @@ "@xtuc/long": "4.2.2" } }, + "@webpack-cli/configtest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.1.tgz", + "integrity": "sha512-B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ==", + "dev": true + }, + "@webpack-cli/info": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.2.tgz", + "integrity": "sha512-5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ==", + "dev": true, + "requires": { + "envinfo": "^7.7.3" + } + }, + "@webpack-cli/serve": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.0.tgz", + "integrity": "sha512-k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw==", + "dev": true + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -1928,17 +2636,14 @@ "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==", "dev": true }, - "after": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", - "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", - "dev": true - }, "agent-base": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", - "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", - "dev": true + "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, + "requires": { + "debug": "4" + } }, "aggregate-error": { "version": "3.0.1", @@ -2127,24 +2832,6 @@ "es-abstract": "^1.17.0-next.1" } }, - "array.prototype.map": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz", - "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "es-array-method-boxes-properly": "^1.0.0", - "is-string": "^1.0.4" - } - }, - "arraybuffer.slice": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", - "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", - "dev": true - }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -2155,14 +2842,15 @@ } }, "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "dev": true, "requires": { "bn.js": "^4.0.0", "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" }, "dependencies": { "bn.js": { @@ -2356,22 +3044,21 @@ } }, "babel-loader": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz", - "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz", + "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==", "dev": true, "requires": { - "find-cache-dir": "^2.1.0", + "find-cache-dir": "^3.3.1", "loader-utils": "^1.4.0", - "mkdirp": "^0.5.3", - "pify": "^4.0.1", + "make-dir": "^3.1.0", "schema-utils": "^2.6.5" }, "dependencies": { "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -2381,9 +3068,9 @@ } }, "ajv-keywords": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", - "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true }, "emojis-list": { @@ -2393,11 +3080,32 @@ "dev": true }, "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, "loader-utils": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", @@ -2409,30 +3117,64 @@ "json5": "^1.0.1" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "mkdirp": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", - "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "minimist": "^1.2.5" + "p-locate": "^4.1.0" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" } }, "schema-utils": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz", - "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", "dev": true, "requires": { - "ajv": "^6.12.0", - "ajv-keywords": "^3.4.1" + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true } } }, @@ -2454,6 +3196,44 @@ "object.assign": "^4.1.0" } }, + "babel-plugin-polyfill-corejs2": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.8.tgz", + "integrity": "sha512-kB5/xNR9GYDuRmVlL9EGfdKBSUVI/9xAU7PCahA/1hbC2Jbmks9dlBBYjHF9IHMNY2jV/G2lIG7z0tJIW27Rog==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.13.0", + "@babel/helper-define-polyfill-provider": "^0.1.4", + "semver": "^6.1.1" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, + "babel-plugin-polyfill-corejs3": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.6.tgz", + "integrity": "sha512-IkYhCxPrjrUWigEmkMDXYzM5iblzKCdCD8cZrSAkQOyhhJm26DcG+Mxbx13QT//Olkpkg/AlRdT2L+Ww4Ciphw==", + "dev": true, + "requires": { + "@babel/helper-define-polyfill-provider": "^0.1.4", + "core-js-compat": "^3.8.1" + } + }, + "babel-plugin-polyfill-regenerator": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.5.tgz", + "integrity": "sha512-EyhBA6uN94W97lR7ecQVTvH9F5tIIdEw3ZqHuU4zekMlW82k5cXNXniiB7PRxQm06BqAjVr4sDT1mOy4RcphIA==", + "dev": true, + "requires": { + "@babel/helper-define-polyfill-provider": "^0.1.4" + } + }, "babel-runtime": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", @@ -2543,12 +3323,6 @@ "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", "dev": true }, - "backo2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", - "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", - "dev": true - }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -2611,9 +3385,9 @@ } }, "base64-arraybuffer": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", - "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", + "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=", "dev": true }, "base64-js": { @@ -2643,15 +3417,6 @@ "tweetnacl": "^0.14.3" } }, - "better-assert": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", - "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", - "dev": true, - "requires": { - "callsite": "1.0.0" - } - }, "big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", @@ -2675,9 +3440,9 @@ } }, "bl": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz", - "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dev": true, "requires": { "buffer": "^5.5.0", @@ -2686,13 +3451,13 @@ }, "dependencies": { "buffer": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", - "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4" + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" } }, "inherits": { @@ -2714,12 +3479,6 @@ } } }, - "blob": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", - "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==", - "dev": true - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -2727,9 +3486,9 @@ "dev": true }, "bn.js": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz", - "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", + "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==", "dev": true }, "body-parser": { @@ -2876,34 +3635,26 @@ } }, "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", + "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", "dev": true, "requires": { - "bn.js": "^4.1.0", + "bn.js": "^5.0.0", "randombytes": "^2.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", - "dev": true - } } }, "browserify-sign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz", - "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dev": true, "requires": { "bn.js": "^5.1.1", "browserify-rsa": "^4.0.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.2", + "elliptic": "^6.5.3", "inherits": "^2.0.4", "parse-asn1": "^5.1.5", "readable-stream": "^3.6.0", @@ -2945,15 +3696,16 @@ } }, "browserslist": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz", - "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==", + "version": "4.16.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz", + "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001093", - "electron-to-chromium": "^1.3.488", - "escalade": "^3.0.1", - "node-releases": "^1.1.58" + "caniuse-lite": "^1.0.30001181", + "colorette": "^1.2.1", + "electron-to-chromium": "^1.3.649", + "escalade": "^3.1.1", + "node-releases": "^1.1.70" } }, "buble": { @@ -3090,11 +3842,15 @@ "unset-value": "^1.0.0" } }, - "callsite": { + "call-bind": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", - "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", - "dev": true + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz", + "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.0" + } }, "callsites": { "version": "3.1.0", @@ -3109,9 +3865,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001109", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz", - "integrity": "sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ==", + "version": "1.0.30001192", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001192.tgz", + "integrity": "sha512-63OrUnwJj5T1rUmoyqYTdRWBqFFxZFlyZnRRjDR8NSUQFB6A+j/uBORU/SyJ5WzDLg4SPiZH40hQCBNdZ/jmAw==", "dev": true }, "caseless": { @@ -3224,23 +3980,31 @@ } }, "clean-css": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", - "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.0.tgz", + "integrity": "sha512-98ALLW4NOhZpvUEoSc2dJO23xE4S4SXc4mLieCVFGo8DNLTFQ3gzi7msW1lqSYJeGZSF5r5+W3KF6cEnkILnFQ==", "dev": true, "requires": { "source-map": "~0.6.0" } }, "clean-css-cli": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-4.3.0.tgz", - "integrity": "sha512-8GHZfr+mG3zB/Lgqrr27qHBFsPSn0fyEI3f2rIZpxPxUbn2J6A8xyyeBRVTW8duDuXigN0s80vsXiXJOEFIO5Q==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.0.tgz", + "integrity": "sha512-c7TQ+Lq8azYtThXtWlf0m9Iw66wBLQ0LPUJIEKHWTn8HB2tQlbqY6BMoKdgW4NJVZOYquwQrrRszTqH8NjHgTg==", "dev": true, "requires": { - "clean-css": "^4.2.1", - "commander": "2.x", - "glob": "7.x" + "clean-css": "^5.1.0", + "commander": "7.x", + "glob": "^7.1.6" + }, + "dependencies": { + "commander": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", + "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==", + "dev": true + } } }, "clean-stack": { @@ -3345,6 +4109,12 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, + "colorette": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", + "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==", + "dev": true + }, "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", @@ -3372,24 +4142,12 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, - "component-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", - "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", - "dev": true - }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", "dev": true }, - "component-inherit": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", - "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", - "dev": true - }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -3400,9 +4158,9 @@ }, "dependencies": { "mime-db": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", - "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", + "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==", "dev": true } } @@ -3541,9 +4299,9 @@ } }, "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", "dev": true }, "cookie-signature": { @@ -3573,28 +4331,28 @@ "dev": true }, "copy-webpack-plugin": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz", - "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz", + "integrity": "sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==", "dev": true, "requires": { - "cacache": "^15.0.4", + "cacache": "^15.0.5", "fast-glob": "^3.2.4", "find-cache-dir": "^3.3.1", "glob-parent": "^5.1.1", "globby": "^11.0.1", "loader-utils": "^2.0.0", "normalize-path": "^3.0.0", - "p-limit": "^3.0.1", - "schema-utils": "^2.7.0", - "serialize-javascript": "^4.0.0", + "p-limit": "^3.0.2", + "schema-utils": "^3.0.0", + "serialize-javascript": "^5.0.1", "webpack-sources": "^1.4.3" }, "dependencies": { "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -3604,9 +4362,9 @@ } }, "ajv-keywords": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.0.tgz", - "integrity": "sha512-eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true }, "braces": { @@ -3619,9 +4377,9 @@ } }, "cacache": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.4.tgz", - "integrity": "sha512-YlnKQqTbD/6iyoJvEY3KJftjrdBYroCbxxYXzhOzsFLWlp6KX4BOlEf4mTx0cMUfVaTS3ENL2QtDWeRYoGLkkw==", + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz", + "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==", "dev": true, "requires": { "@npmcli/move-file": "^1.0.1", @@ -3629,7 +4387,7 @@ "fs-minipass": "^2.0.0", "glob": "^7.1.4", "infer-owner": "^1.0.4", - "lru-cache": "^5.1.1", + "lru-cache": "^6.0.0", "minipass": "^3.1.1", "minipass-collect": "^1.0.2", "minipass-flush": "^1.0.5", @@ -3749,6 +4507,15 @@ "p-locate": "^4.1.0" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -3775,12 +4542,12 @@ "dev": true }, "p-limit": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.1.tgz", - "integrity": "sha512-mw/p92EyOzl2MhauKodw54Rx5ZK4624rNfgNaBguFZkHzyUG9WsDzFF5/yQVEJinbJDdP4jEfMN+uBquiGnaLg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "requires": { - "p-try": "^2.0.0" + "yocto-queue": "^0.1.0" } }, "p-locate": { @@ -3843,14 +4610,14 @@ } }, "schema-utils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", - "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", + "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", "dev": true, "requires": { - "@types/json-schema": "^7.0.4", - "ajv": "^6.12.2", - "ajv-keywords": "^3.4.1" + "@types/json-schema": "^7.0.6", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" } }, "semver": { @@ -3860,9 +4627,9 @@ "dev": true }, "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -3885,6 +4652,12 @@ "requires": { "is-number": "^7.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, @@ -3895,12 +4668,12 @@ "dev": true }, "core-js-compat": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz", - "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.1.tgz", + "integrity": "sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA==", "dev": true, "requires": { - "browserslist": "^4.8.5", + "browserslist": "^4.16.3", "semver": "7.0.0" }, "dependencies": { @@ -3918,6 +4691,16 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dev": true, + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "coveralls": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.0.tgz", @@ -3932,13 +4715,13 @@ } }, "create-ecdh": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", - "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", + "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "dev": true, "requires": { "bn.js": "^4.1.0", - "elliptic": "^6.0.0" + "elliptic": "^6.5.3" }, "dependencies": { "bn.js": { @@ -4207,12 +4990,6 @@ "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", "dev": true }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", - "dev": true - }, "detect-indent": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", @@ -4229,9 +5006,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.781568", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.781568.tgz", - "integrity": "sha512-9Uqnzy6m6zEStluH9iyJ3iHyaQziFnMnLeC8vK0eN6smiJmIx7+yB64d67C2lH/LZra+5cGscJAJsNXO+MdPMg==", + "version": "0.0.854822", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.854822.tgz", + "integrity": "sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg==", "dev": true }, "di": { @@ -4355,9 +5132,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.516", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.516.tgz", - "integrity": "sha512-WDM5AAQdOrvLqSX8g3Zd5AujBXfMxf96oeZkff0U2HF5op3tjShE+on2yay3r1UD4M9I3p0iHpAS4+yV8U8A9A==", + "version": "1.3.675", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.675.tgz", + "integrity": "sha512-GEQw+6dNWjueXGkGfjgm7dAMtXfEqrfDG3uWcZdeaD4cZ3dKYdPRQVruVXQRXtPLtOr5GNVVlNLRMChOZ611pQ==", "dev": true }, "elliptic": { @@ -4411,66 +5188,50 @@ } }, "engine.io": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.2.tgz", - "integrity": "sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-4.1.1.tgz", + "integrity": "sha512-t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w==", "dev": true, "requires": { "accepts": "~1.3.4", "base64id": "2.0.0", - "cookie": "0.3.1", - "debug": "~4.1.0", - "engine.io-parser": "~2.2.0", - "ws": "^7.1.2" - } - }, - "engine.io-client": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.3.tgz", - "integrity": "sha512-0NGY+9hioejTEJCaSJZfWZLk4FPI9dN+1H1C4+wj2iuFba47UgZbJzfWs4aNFajnX/qAaYKbe2lLTfEEWzCmcw==", - "dev": true, - "requires": { - "component-emitter": "~1.3.0", - "component-inherit": "0.0.3", - "debug": "~4.1.0", - "engine.io-parser": "~2.2.0", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "ws": "~6.1.0", - "xmlhttprequest-ssl": "~1.5.4", - "yeast": "0.1.2" + "cookie": "~0.4.1", + "cors": "~2.8.5", + "debug": "~4.3.1", + "engine.io-parser": "~4.0.0", + "ws": "~7.4.2" }, "dependencies": { - "ws": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz", - "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==", + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "async-limiter": "~1.0.0" + "ms": "2.1.2" } + }, + "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 } } }, "engine.io-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz", - "integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz", + "integrity": "sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg==", "dev": true, "requires": { - "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.5", - "blob": "0.0.5", - "has-binary2": "~1.0.2" + "base64-arraybuffer": "0.1.4" } }, "enhanced-resolve": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz", - "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz", + "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -4519,6 +5280,12 @@ "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==", "dev": true }, + "envinfo": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.4.tgz", + "integrity": "sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ==", + "dev": true + }, "errno": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", @@ -4618,45 +5385,10 @@ } } }, - "es-array-method-boxes-properly": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", - "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", - "dev": true - }, - "es-get-iterator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz", - "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==", - "dev": true, - "requires": { - "es-abstract": "^1.17.4", - "has-symbols": "^1.0.1", - "is-arguments": "^1.0.4", - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-string": "^1.0.5", - "isarray": "^2.0.5" - }, - "dependencies": { - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - } - } - }, "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { "is-callable": "^1.1.4", @@ -4664,16 +5396,10 @@ "is-symbol": "^1.0.2" } }, - "es6-object-assign": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", - "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=", - "dev": true - }, "escalade": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz", - "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true }, "escape-html": { @@ -4726,25 +5452,26 @@ } }, "eslint": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz", - "integrity": "sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz", + "integrity": "sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.0", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.0.1", "doctrine": "^3.0.0", "enquirer": "^2.3.5", - "eslint-scope": "^5.1.0", + "eslint-scope": "^5.1.1", "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^1.3.0", - "espree": "^7.2.0", - "esquery": "^1.2.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", + "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", "glob-parent": "^5.0.0", "globals": "^12.1.0", @@ -4755,7 +5482,7 @@ "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", - "lodash": "^4.17.19", + "lodash": "^4.17.20", "minimatch": "^3.0.4", "natural-compare": "^1.4.0", "optionator": "^0.9.1", @@ -4764,26 +5491,61 @@ "semver": "^7.2.1", "strip-ansi": "^6.0.0", "strip-json-comments": "^3.1.0", - "table": "^5.2.3", + "table": "^6.0.4", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, "dependencies": { + "@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", + "dev": true + }, + "@babel/highlight": { + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", + "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "chalk": { + "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", + "supports-color": "^5.3.0" + } + } + } + }, "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } + "astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true }, "chalk": { "version": "4.1.0", @@ -4793,6 +5555,26 @@ "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" + }, + "dependencies": { + "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" + } + }, + "supports-color": { + "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" + } + } } }, "color-convert": { @@ -4821,20 +5603,91 @@ "which": "^2.0.1" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "eslint-scope": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz", - "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "^4.1.0", + "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", + "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "dev": true + }, + "esquery": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "dev": true, + "requires": { + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } + }, + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "requires": { + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "requires": { + "flat-cache": "^3.0.4" + } + }, + "flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, + "requires": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + } + }, + "flatted": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", + "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", "dev": true }, "glob-parent": { @@ -4861,6 +5714,18 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, "levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -4871,6 +5736,21 @@ "type-check": "~0.4.0" } }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -4897,11 +5777,23 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, + "rimraf": { + "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" + } + }, "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } }, "shebang-command": { "version": "2.0.0", @@ -4918,6 +5810,39 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "dependencies": { + "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" + } + } + } + }, + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, "strip-ansi": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", @@ -4927,19 +5852,30 @@ "ansi-regex": "^5.0.0" } }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "table": { + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/table/-/table-6.0.7.tgz", + "integrity": "sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==", "dev": true, "requires": { - "has-flag": "^4.0.0" + "ajv": "^7.0.2", + "lodash": "^4.17.20", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.0" + }, + "dependencies": { + "ajv": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.1.1.tgz", + "integrity": "sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + } } }, "type-check": { @@ -4959,6 +5895,12 @@ "requires": { "isexe": "^2.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, @@ -5347,20 +6289,26 @@ "dev": true }, "espree": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz", - "integrity": "sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", "dev": true, "requires": { - "acorn": "^7.3.1", - "acorn-jsx": "^5.2.0", + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", "eslint-visitor-keys": "^1.3.0" }, "dependencies": { "acorn": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", - "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + }, + "acorn-jsx": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", + "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", "dev": true }, "eslint-visitor-keys": { @@ -5427,12 +6375,6 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, - "eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==", - "dev": true - }, "events": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", @@ -5523,15 +6465,6 @@ } } }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, "expect.js": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz", @@ -5733,9 +6666,9 @@ }, "dependencies": { "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "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, "requires": { "pump": "^3.0.0" @@ -5762,9 +6695,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz", - "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", + "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -5847,6 +6780,12 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, + "fastest-levenshtein": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", + "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", + "dev": true + }, "fastq": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz", @@ -5857,9 +6796,9 @@ } }, "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", + "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", "dev": true, "requires": { "websocket-driver": ">=0.5.1" @@ -5980,34 +6919,11 @@ "locate-path": "^3.0.0" } }, - "findup-sync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", - "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - } - }, "flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", - "dev": true, - "requires": { - "is-buffer": "~2.0.3" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", - "dev": true - } - } + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true }, "flat-cache": { "version": "2.0.1", @@ -6132,15 +7048,15 @@ "dev": true }, "fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, "requires": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", - "universalify": "^1.0.0" + "universalify": "^2.0.0" }, "dependencies": { "graceful-fs": { @@ -6150,19 +7066,19 @@ "dev": true }, "jsonfile": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", - "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, "requires": { "graceful-fs": "^4.1.6", - "universalify": "^1.0.0" + "universalify": "^2.0.0" } }, "universalify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", - "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true } } @@ -6176,6 +7092,12 @@ "minipass": "^3.0.0" } }, + "fs-monkey": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.1.tgz", + "integrity": "sha512-fcSa+wyTqZa46iWweI7/ZiUfegOZl0SG8+dltIwFXo7+zYU9J9kpS3NB6pZcSlJdhvIwp81Adx2XhZorncxiaA==", + "dev": true + }, "fs-write-stream-atomic": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", @@ -6392,12 +7314,6 @@ "dev": true, "optional": true }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, @@ -6758,9 +7674,9 @@ "dev": true }, "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==", + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true }, "get-caller-file": { @@ -6769,6 +7685,25 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-intrinsic": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", + "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + } + } + }, "get-stdin": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", @@ -6834,41 +7769,6 @@ } } }, - "global-modules": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", - "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", - "dev": true, - "requires": { - "global-prefix": "^3.0.0" - }, - "dependencies": { - "global-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", - "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", - "dev": true, - "requires": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", - "which": "^1.3.1" - } - } - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -6876,9 +7776,9 @@ "dev": true }, "globby": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz", - "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz", + "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==", "dev": true, "requires": { "array-union": "^2.1.0", @@ -6922,9 +7822,9 @@ "dev": true }, "handlebars": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", - "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", "dev": true, "requires": { "minimist": "^1.2.5", @@ -6976,29 +7876,6 @@ } } }, - "has-binary2": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", - "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", - "dev": true, - "requires": { - "isarray": "2.0.1" - }, - "dependencies": { - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", - "dev": true - } - } - }, - "has-cors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", - "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", - "dev": true - }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -7106,15 +7983,6 @@ "minimalistic-crypto-utils": "^1.0.1" } }, - "homedir-polyfill": { - "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" - } - }, "hosted-git-info": { "version": "2.8.8", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", @@ -7134,9 +8002,9 @@ } }, "html-entities": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz", - "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz", + "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==", "dev": true }, "html-escaper": { @@ -7164,15 +8032,29 @@ "toidentifier": "1.0.0" } }, + "http-parser-js": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", + "dev": true + }, "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { - "eventemitter3": "^3.0.0", + "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", "requires-port": "^1.0.0" + }, + "dependencies": { + "eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true + } } }, "http-proxy-middleware": { @@ -7205,15 +8087,21 @@ "dev": true }, "https-proxy-agent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", - "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", "dev": true, "requires": { - "agent-base": "5", + "agent-base": "6", "debug": "4" } }, + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -7272,12 +8160,6 @@ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true - }, "infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", @@ -7301,10 +8183,11 @@ "dev": true }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz", + "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==", + "dev": true, + "optional": true }, "inquirer": { "version": "7.1.0", @@ -7427,6 +8310,17 @@ "ipaddr.js": "^1.9.0" } }, + "internal-slot": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.2.tgz", + "integrity": "sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==", + "dev": true, + "requires": { + "es-abstract": "^1.17.0-next.1", + "has": "^1.0.3", + "side-channel": "^1.0.2" + } + }, "interpret": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", @@ -7487,10 +8381,13 @@ } }, "is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz", + "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==", + "dev": true, + "requires": { + "call-bind": "^1.0.0" + } }, "is-arrayish": { "version": "0.2.1", @@ -7514,11 +8411,20 @@ "dev": true }, "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", "dev": true }, + "is-core-module": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", + "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "is-data-descriptor": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", @@ -7564,6 +8470,12 @@ } } }, + "is-docker": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz", + "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==", + "dev": true + }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -7600,18 +8512,18 @@ "is-extglob": "^2.1.1" } }, - "is-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz", - "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==", - "dev": true - }, "is-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", "dev": true }, + "is-negative-zero": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", + "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", + "dev": true + }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -7657,9 +8569,9 @@ } }, "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true }, "is-plain-object": { @@ -7681,20 +8593,22 @@ } }, "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "dev": true, "requires": { - "has": "^1.0.1" + "has-symbols": "^1.0.1" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + } } }, - "is-set": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz", - "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==", - "dev": true - }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -7976,28 +8890,13 @@ "istanbul-lib-report": "^3.0.0" } }, - "iterate-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz", - "integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==", - "dev": true - }, - "iterate-value": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz", - "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==", - "dev": true, - "requires": { - "es-get-iterator": "^1.0.2", - "iterate-iterator": "^1.0.1" - } - }, "jest-worker": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz", - "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==", + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz", + "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==", "dev": true, "requires": { + "@types/node": "*", "merge-stream": "^2.0.0", "supports-color": "^7.0.0" }, @@ -8009,9 +8908,9 @@ "dev": true }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "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" @@ -8057,9 +8956,9 @@ "dev": true }, "jsdoc": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.5.tgz", - "integrity": "sha512-SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ==", + "version": "3.6.6", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz", + "integrity": "sha512-znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ==", "dev": true, "requires": { "@babel/parser": "^7.9.4", @@ -8105,9 +9004,9 @@ } }, "jsdoc-plugin-typescript": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jsdoc-plugin-typescript/-/jsdoc-plugin-typescript-2.0.5.tgz", - "integrity": "sha512-LK33RCeid7CeAgqz9kh1shcgKOF3EqkzzGUIFImuiZpRMWiS4c5siM04K7hG4TDPaixsRdJV87Dzw6jayMUI5g==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/jsdoc-plugin-typescript/-/jsdoc-plugin-typescript-2.0.6.tgz", + "integrity": "sha512-5L9XBEocaM5/33+heqOy9WF/zLHNfPvkxsqVom1lF1FSVlx0PdV/rr5XRz7WrHJgI2PLvycE7P18nVNFelf3nw==", "dev": true, "requires": { "string.prototype.matchall": "^4.0.0" @@ -8191,41 +9090,40 @@ } }, "just-extend": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz", - "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", + "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", "dev": true }, "karma": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/karma/-/karma-5.1.1.tgz", - "integrity": "sha512-xAlOr5PMqUbiKXSv5PCniHWV3aiwj6wIZ0gUVcwpTCPVQm/qH2WAMFWxtnpM6KJqhkRWrIpovR4Rb0rn8GtJzQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.1.1.tgz", + "integrity": "sha512-vVDFxFGAsclgmFjZA/qGw5xqWdZIWxVD7xLyCukYUYd5xs/uGzYbXGOT5zOruVBQleKEmXIr4H2hzGCTn+M9Cg==", "dev": true, "requires": { "body-parser": "^1.19.0", "braces": "^3.0.2", - "chokidar": "^3.0.0", + "chokidar": "^3.4.2", "colors": "^1.4.0", "connect": "^3.7.0", "di": "^0.0.1", "dom-serialize": "^2.2.1", - "flatted": "^2.0.2", "glob": "^7.1.6", "graceful-fs": "^4.2.4", "http-proxy": "^1.18.1", "isbinaryfile": "^4.0.6", - "lodash": "^4.17.15", + "lodash": "^4.17.19", "log4js": "^6.2.1", "mime": "^2.4.5", "minimatch": "^3.0.4", "qjobs": "^1.2.0", "range-parser": "^1.2.1", "rimraf": "^3.0.2", - "socket.io": "^2.3.0", + "socket.io": "^3.1.0", "source-map": "^0.6.1", "tmp": "0.2.1", - "ua-parser-js": "0.7.21", - "yargs": "^15.3.1" + "ua-parser-js": "^0.7.23", + "yargs": "^16.1.1" }, "dependencies": { "anymatch": { @@ -8239,9 +9137,9 @@ } }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "braces": { @@ -8254,27 +9152,21 @@ } }, "chokidar": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz", - "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", "dev": true, "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.5.0" } }, - "eventemitter3": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", - "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==", - "dev": true - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -8285,9 +9177,9 @@ } }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true }, @@ -8301,22 +9193,11 @@ } }, "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", "dev": true }, - "http-proxy": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", - "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", - "dev": true, - "requires": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" - } - }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -8333,9 +9214,9 @@ "dev": true }, "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -8409,19 +9290,32 @@ } }, "karma-firefox-launcher": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.3.0.tgz", - "integrity": "sha512-Fi7xPhwrRgr+94BnHX0F5dCl1miIW4RHnzjIGxF8GaIEp7rNqX7LSi7ok63VXs3PS/5MQaQMhGxw+bvD+pibBQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.0.tgz", + "integrity": "sha512-dkiyqN2R6fCWt78rciOXJLFDWcQ7QEQi++HgebPJlw1y0ycDjGNDHuSrhdh48QG02fzZKK20WHFWVyBZ6CPngg==", "dev": true, "requires": { - "is-wsl": "^2.1.0" + "is-wsl": "^2.2.0", + "which": "^2.0.1" }, "dependencies": { "is-wsl": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz", - "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==", - "dev": true + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "requires": { + "is-docker": "^2.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } } } }, @@ -8435,9 +9329,9 @@ } }, "karma-sourcemap-loader": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz", - "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=", + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz", + "integrity": "sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g==", "dev": true, "requires": { "graceful-fs": "^4.1.2" @@ -8523,21 +9417,6 @@ "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=", "dev": true }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "levenary": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz", - "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==", - "dev": true, - "requires": { - "leven": "^3.1.0" - } - }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -8610,6 +9489,12 @@ "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", "dev": true }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", + "dev": true + }, "lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", @@ -8623,12 +9508,63 @@ "dev": true }, "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", + "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", "dev": true, "requires": { - "chalk": "^2.4.2" + "chalk": "^4.0.0" + }, + "dependencies": { + "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" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "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" + } + }, + "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 + }, + "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 + }, + "supports-color": { + "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" + } + } } }, "log4js": { @@ -8645,9 +9581,9 @@ } }, "loglevel": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz", - "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", + "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==", "dev": true }, "loglevelnext": { @@ -8693,6 +9629,15 @@ "semver": "^5.6.0" } }, + "map-age-cleaner": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", + "dev": true, + "requires": { + "p-defer": "^1.0.0" + } + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -8733,9 +9678,9 @@ "dev": true }, "marked": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz", - "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.1.tgz", + "integrity": "sha512-5+/fKgMv2hARmMW7DOpykr2iLhl0NgjyELk5yn92iE7z8Se1IS9n3UsFm86hFXIkvMBmVxki8+ckcpjBeyo/hw==", "dev": true }, "md5.js": { @@ -8761,6 +9706,33 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, + "mem": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-8.0.0.tgz", + "integrity": "sha512-qrcJOe6uD+EW8Wrci1Vdiua/15Xw3n/QnaNXE7varnB6InxSk7nu3/i5jfy3S6kWxr8WYJ6R1o0afMUtvorTsA==", + "dev": true, + "requires": { + "map-age-cleaner": "^0.1.3", + "mimic-fn": "^3.1.0" + }, + "dependencies": { + "mimic-fn": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz", + "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==", + "dev": true + } + } + }, + "memfs": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.0.tgz", + "integrity": "sha512-f/xxz2TpdKv6uDn6GtHee8ivFyxwxmPuXatBb1FBwxYNuVpbM3k/Y1Z+vC0mH/dIXXrukYfe3qe5J32Dfjg93A==", + "dev": true, + "requires": { + "fs-monkey": "1.0.1" + } + }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -9010,36 +9982,36 @@ "dev": true }, "mocha": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.1.0.tgz", - "integrity": "sha512-sI0gaI1I/jPVu3KFpnveWGadfe3JNBAENqgTUPgLZAUppu725zS2mrVztzAgIR8DUscuS4doEBTx9LATC+HSeA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz", + "integrity": "sha512-TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q==", "dev": true, "requires": { + "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", - "chokidar": "3.3.1", - "debug": "3.2.6", - "diff": "4.0.2", - "escape-string-regexp": "1.0.5", - "find-up": "4.1.0", + "chokidar": "3.5.1", + "debug": "4.3.1", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", "glob": "7.1.6", "growl": "1.10.5", "he": "1.2.0", - "js-yaml": "3.13.1", - "log-symbols": "3.0.0", + "js-yaml": "4.0.0", + "log-symbols": "4.0.0", "minimatch": "3.0.4", - "ms": "2.1.2", - "object.assign": "4.1.0", - "promise.allsettled": "1.0.2", - "serialize-javascript": "4.0.0", - "strip-json-comments": "3.0.1", - "supports-color": "7.1.0", + "ms": "2.1.3", + "nanoid": "3.1.20", + "serialize-javascript": "5.0.1", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", "which": "2.0.2", "wide-align": "1.1.3", - "workerpool": "6.0.0", - "yargs": "13.3.2", - "yargs-parser": "13.1.2", - "yargs-unparser": "1.6.1" + "workerpool": "6.1.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" }, "dependencies": { "ansi-colors": { @@ -9048,12 +10020,6 @@ "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true }, - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, "anymatch": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", @@ -9064,10 +10030,16 @@ "picomatch": "^2.0.4" } }, + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "braces": { @@ -9080,30 +10052,50 @@ } }, "chokidar": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", - "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", "dev": true, "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.3.0" + "readdirp": "~3.5.0" } }, "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" + }, + "dependencies": { + "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 + } } }, + "diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -9114,19 +10106,19 @@ } }, "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "requires": { - "locate-path": "^5.0.0", + "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true }, @@ -9160,28 +10152,46 @@ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "js-yaml": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", + "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", "dev": true, "requires": { - "p-locate": "^4.1.0" + "argparse": "^2.0.1" + } + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "requires": { - "p-limit": "^2.2.0" + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" } }, "path-exists": { @@ -9191,47 +10201,35 @@ "dev": true }, "readdirp": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", - "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, "requires": { - "picomatch": "^2.0.7" + "picomatch": "^2.2.1" + }, + "dependencies": { + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true + } } }, "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", "dev": true, "requires": { "randombytes": "^2.1.0" } }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -9255,59 +10253,11 @@ "isexe": "^2.0.0" } }, - "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - } - } + "yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true } } }, @@ -9360,6 +10310,12 @@ "dev": true, "optional": true }, + "nanoid": { + "version": "3.1.20", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", + "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", + "dev": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -9404,9 +10360,9 @@ "dev": true }, "nise": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/nise/-/nise-4.0.3.tgz", - "integrity": "sha512-EGlhjm7/4KvmmE6B/UFsKh7eHykRl9VH+au8dduHLCyWUO/hr7+N+WtTvDUwc9zHuM1IaIJs/0lQ6Ag1jDkQSg==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz", + "integrity": "sha512-bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==", "dev": true, "requires": { "@sinonjs/commons": "^1.7.0", @@ -9416,10 +10372,16 @@ "path-to-regexp": "^1.7.0" } }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "dev": true + }, "node-forge": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", - "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true }, "node-libs-browser": { @@ -9462,9 +10424,9 @@ } }, "node-releases": { - "version": "1.1.60", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz", - "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==", + "version": "1.1.71", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", + "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==", "dev": true }, "nopt": { @@ -9521,12 +10483,6 @@ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, - "object-component": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", - "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", - "dev": true - }, "object-copy": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", @@ -9559,19 +10515,19 @@ } }, "object-inspect": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", - "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", + "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", "dev": true }, "object-is": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", - "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz", + "integrity": "sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" } }, "object-keys": { @@ -9629,9 +10585,9 @@ "dev": true }, "ol-mapbox-style": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-6.1.2.tgz", - "integrity": "sha512-0n+6K1dhMH7/AMA1eAEb1Pt4ZRFWr1fiJWSgwHfDFQpK4yuhJgtLcn9dtxprB1NOpTHeJ5XbTKOrgTY/DR0oxQ==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-6.3.1.tgz", + "integrity": "sha512-hZsvPVkk1Y+qmifxRX/gCaZJ5Mo04vWj6lbFhXpHDloQquHD3kTY0q8o3xbg4FehucuG7HyQteKWeFJRh3FMww==", "requires": { "@mapbox/mapbox-gl-style-spec": "^13.14.0", "mapbox-to-css-font": "^2.4.0", @@ -9715,6 +10671,12 @@ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, + "p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", + "dev": true + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -9787,14 +10749,13 @@ } }, "parse-asn1": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", - "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", + "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", "dev": true, "requires": { - "asn1.js": "^4.0.0", + "asn1.js": "^5.2.0", "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", "evp_bytestokey": "^1.0.0", "pbkdf2": "^3.0.3", "safe-buffer": "^5.1.1" @@ -9809,30 +10770,6 @@ "error-ex": "^1.2.0" } }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", - "dev": true - }, - "parseqs": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", - "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", - "dev": true, - "requires": { - "better-assert": "~1.0.0" - } - }, - "parseuri": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", - "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", - "dev": true, - "requires": { - "better-assert": "~1.0.0" - } - }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -9998,20 +10935,20 @@ } }, "pngjs": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", - "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz", + "integrity": "sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==", "dev": true }, "portfinder": { - "version": "1.0.26", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz", - "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==", + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", + "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", "dev": true, "requires": { "async": "^2.6.2", "debug": "^3.1.1", - "mkdirp": "^0.5.1" + "mkdirp": "^0.5.5" }, "dependencies": { "async": { @@ -10024,9 +10961,9 @@ } }, "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" @@ -10080,9 +11017,9 @@ "dev": true }, "proj4": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.6.2.tgz", - "integrity": "sha512-Pn0+HZtXb4JzuN8RR0VM7yyseegiYHbXkF+2FOdGpzRojcZ1BTjWxOh7qfp2vH0EyLu8pvcrhLxidwzgyUy/Gw==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.7.0.tgz", + "integrity": "sha512-UVhulf8m70/dREOBrJagWq8cDYUgjQUWILRqys/gqo/+ZLeNB/04zbtPhJbz8+cCPzZNQMychfBaWUCP60U9mQ==", "dev": true, "requires": { "mgrs": "1.0.0", @@ -10095,19 +11032,6 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, - "promise.allsettled": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz", - "integrity": "sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==", - "dev": true, - "requires": { - "array.prototype.map": "^1.0.1", - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "iterate-value": "^1.0.0" - } - }, "protocol-buffers-schema": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz", @@ -10203,19 +11127,19 @@ "dev": true }, "puppeteer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.2.1.tgz", - "integrity": "sha512-PZoZG7u+T6N1GFWBQmGVG162Ak5MAy8nYSVpeeQrwJK2oYUlDWpHEJPcd/zopyuEMTv7DiztS1blgny1txR2qw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz", + "integrity": "sha512-D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==", "dev": true, "requires": { "debug": "^4.1.0", - "devtools-protocol": "0.0.781568", + "devtools-protocol": "0.0.854822", "extract-zip": "^2.0.0", - "https-proxy-agent": "^4.0.0", - "mime": "^2.0.3", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.1", "pkg-dir": "^4.2.0", "progress": "^2.0.1", - "proxy-from-env": "^1.0.0", + "proxy-from-env": "^1.1.0", "rimraf": "^3.0.2", "tar-fs": "^2.0.0", "unbzip2-stream": "^1.3.3", @@ -10301,9 +11225,9 @@ "dev": true }, "querystringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", - "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", "dev": true }, "quickselect": { @@ -10515,12 +11439,42 @@ } }, "regexp.prototype.flags": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz", - "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz", + "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==", "dev": true, "requires": { - "define-properties": "^1.1.2" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "dependencies": { + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "get-intrinsic": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz", + "integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + } } }, "regexpp": { @@ -10619,6 +11573,12 @@ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, + "require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true + }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -10666,29 +11626,6 @@ } } }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "dev": true, - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - }, - "dependencies": { - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - } - } - }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -10738,9 +11675,9 @@ "dev": true }, "rfdc": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz", - "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.2.0.tgz", + "integrity": "sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==", "dev": true }, "rimraf": { @@ -10763,18 +11700,18 @@ } }, "rollup": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.23.0.tgz", - "integrity": "sha512-vLNmZFUGVwrnqNAJ/BvuLk1MtWzu4IuoqsH9UWK5AIdO3rt8/CSiJNvPvCIvfzrbNsqKbNzPAG1V2O4eTe2XZg==", + "version": "2.40.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.40.0.tgz", + "integrity": "sha512-WiOGAPbXoHu+TOz6hyYUxIksOwsY/21TRWoO593jgYt8mvYafYqQl+axaA8y1z2HFazNUUrsMSjahV2A6/2R9A==", "dev": true, "requires": { - "fsevents": "~2.1.2" + "fsevents": "~2.3.1" }, "dependencies": { "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true } @@ -10839,27 +11776,56 @@ } }, "rollup-plugin-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-6.1.0.tgz", - "integrity": "sha512-4fB3M9nuoWxrwm39habpd4hvrbrde2W2GG4zEGPQg1YITNkM3Tqur5jSuXlWNzbv/2aMLJ+dZJaySc3GCD8oDw==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz", + "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.8.3", - "jest-worker": "^26.0.0", - "serialize-javascript": "^3.0.0", - "terser": "^4.7.0" + "@babel/code-frame": "^7.10.4", + "jest-worker": "^26.2.1", + "serialize-javascript": "^4.0.0", + "terser": "^5.0.0" }, "dependencies": { - "serialize-javascript": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz", - "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==", + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", "dev": true }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, "terser": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz", - "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.0.tgz", + "integrity": "sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==", "dev": true, "requires": { "commander": "^2.20.0", @@ -10960,12 +11926,12 @@ "dev": true }, "selfsigned": { - "version": "1.10.7", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz", - "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==", + "version": "1.10.8", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", + "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "dev": true, "requires": { - "node-forge": "0.9.0" + "node-forge": "^0.10.0" } }, "semver": { @@ -11021,9 +11987,9 @@ } }, "serialize-javascript": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", - "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -11230,14 +12196,92 @@ } }, "shx": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.2.tgz", - "integrity": "sha512-aS0mWtW3T2sHAenrSrip2XGv39O9dXIFUqxAEWHEOS1ePtGIBavdPJY1kE2IHl14V/4iCbUiNDPGdyYTtmhSoA==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.3.tgz", + "integrity": "sha512-nZJ3HFWVoTSyyB+evEKjJ1STiixGztlqwKLTUNV5KqMWtGey9fTd4KU1gdZ1X9BV6215pswQ/Jew9NsuS/fNDA==", "dev": true, "requires": { - "es6-object-assign": "^1.0.3", - "minimist": "^1.2.0", - "shelljs": "^0.8.1" + "minimist": "^1.2.3", + "shelljs": "^0.8.4" + } + }, + "side-channel": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz", + "integrity": "sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==", + "dev": true, + "requires": { + "es-abstract": "^1.18.0-next.0", + "object-inspect": "^1.8.0" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + }, + "string.prototype.trimend": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz", + "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" + } + }, + "string.prototype.trimstart": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz", + "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" + } + } } }, "signal-exit": { @@ -11247,26 +12291,19 @@ "dev": true }, "sinon": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.0.2.tgz", - "integrity": "sha512-0uF8Q/QHkizNUmbK3LRFqx5cpTttEVXudywY9Uwzy8bTfZUhljZ7ARzSxnRHWYWtVTeh4Cw+tTb3iU21FQVO9A==", + "version": "9.2.4", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", + "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==", "dev": true, "requires": { - "@sinonjs/commons": "^1.7.2", + "@sinonjs/commons": "^1.8.1", "@sinonjs/fake-timers": "^6.0.1", - "@sinonjs/formatio": "^5.0.1", - "@sinonjs/samsam": "^5.0.3", + "@sinonjs/samsam": "^5.3.1", "diff": "^4.0.2", - "nise": "^4.0.1", + "nise": "^4.0.4", "supports-color": "^7.1.0" }, "dependencies": { - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -11274,9 +12311,9 @@ "dev": true }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "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" @@ -11430,123 +12467,88 @@ } }, "socket.io": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz", - "integrity": "sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz", + "integrity": "sha512-7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA==", "dev": true, "requires": { - "debug": "~4.1.0", - "engine.io": "~3.4.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.3.0", - "socket.io-parser": "~3.4.0" - } - }, - "socket.io-adapter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", - "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==", - "dev": true - }, - "socket.io-client": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz", - "integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==", - "dev": true, - "requires": { - "backo2": "1.0.2", - "base64-arraybuffer": "0.1.5", - "component-bind": "1.0.0", - "component-emitter": "1.2.1", - "debug": "~4.1.0", - "engine.io-client": "~3.4.0", - "has-binary2": "~1.0.2", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "object-component": "0.0.3", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "socket.io-parser": "~3.3.0", - "to-array": "0.1.4" + "@types/cookie": "^0.4.0", + "@types/cors": "^2.8.8", + "@types/node": "^14.14.10", + "accepts": "~1.3.4", + "base64id": "~2.0.0", + "debug": "~4.3.1", + "engine.io": "~4.1.0", + "socket.io-adapter": "~2.1.0", + "socket.io-parser": "~4.0.3" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "@types/node": { + "version": "14.14.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.28.tgz", + "integrity": "sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g==", "dev": true }, - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "socket.io-parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz", - "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==", + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "component-emitter": "1.2.1", - "debug": "~3.1.0", - "isarray": "2.0.1" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "ms": "2.1.2" } + }, + "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 } } }, + "socket.io-adapter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz", + "integrity": "sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==", + "dev": true + }, "socket.io-parser": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz", - "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", + "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", "dev": true, "requires": { - "component-emitter": "1.2.1", - "debug": "~4.1.0", - "isarray": "2.0.1" + "@types/component-emitter": "^1.2.10", + "component-emitter": "~1.3.0", + "debug": "~4.3.1" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } }, - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", + "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 } } }, "sockjs": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz", - "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz", + "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==", "dev": true, "requires": { - "faye-websocket": "^0.10.0", + "faye-websocket": "^0.11.3", "uuid": "^3.4.0", - "websocket-driver": "0.6.5" + "websocket-driver": "^0.7.4" }, "dependencies": { "uuid": { @@ -11558,36 +12560,33 @@ } }, "sockjs-client": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", - "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.0.tgz", + "integrity": "sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==", "dev": true, "requires": { - "debug": "^3.2.5", + "debug": "^3.2.6", "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" + "faye-websocket": "^0.11.3", + "inherits": "^2.0.4", + "json3": "^3.3.3", + "url-parse": "^1.4.7" }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" } }, - "faye-websocket": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", - "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true } } }, @@ -11865,9 +12864,9 @@ } }, "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", "dev": true } } @@ -11883,34 +12882,116 @@ } }, "string.prototype.matchall": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.0.tgz", - "integrity": "sha512-/cSuf1qsUaPicdvXcVZJ98fM9FmvkXvw7PKSM5pTtlj4R9VLQc7B51fOZBMsGfv9UXhUhdpxSrEsGe2ObsR2cw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz", + "integrity": "sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==", "dev": true, "requires": { + "call-bind": "^1.0.0", "define-properties": "^1.1.3", - "es-abstract": "^1.15.0", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "regexp.prototype.flags": "^1.2.0" + "es-abstract": "^1.18.0-next.1", + "has-symbols": "^1.0.1", + "internal-slot": "^1.0.2", + "regexp.prototype.flags": "^1.3.0", + "side-channel": "^1.0.3" }, "dependencies": { "es-abstract": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz", - "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==", + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "dev": true, "requires": { - "es-to-primitive": "^1.2.0", + "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.0", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-inspect": "^1.6.0", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "string.prototype.trimleft": "^2.1.0", - "string.prototype.trimright": "^2.1.0" + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + }, + "regexp.prototype.flags": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", + "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + } + } + }, + "string.prototype.trimend": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz", + "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" + } + }, + "string.prototype.trimstart": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz", + "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3" } } } @@ -11925,26 +13006,6 @@ "es-abstract": "^1.17.5" } }, - "string.prototype.trimleft": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz", - "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - } - }, - "string.prototype.trimright": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz", - "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - } - }, "string.prototype.trimstart": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz", @@ -11985,10 +13046,16 @@ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true + }, "strip-json-comments": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", - "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, "supports-color": { @@ -12105,24 +13172,24 @@ } }, "tar-fs": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz", - "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==", + "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, "requires": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", - "tar-stream": "^2.0.0" + "tar-stream": "^2.1.4" } }, "tar-stream": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz", - "integrity": "sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", "dev": true, "requires": { - "bl": "^4.0.1", + "bl": "^4.0.3", "end-of-stream": "^1.4.1", "fs-constants": "^1.0.0", "inherits": "^2.0.3", @@ -12154,26 +13221,26 @@ } }, "terser-webpack-plugin": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.8.tgz", - "integrity": "sha512-ygwK8TYMRTYtSyLB2Mhnt90guQh989CIq/mL/2apwi6rA15Xys4ydNUiH4ah6EZCfQxSk26ZFQilZ4IQ6IZw6A==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz", + "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==", "dev": true, "requires": { "cacache": "^15.0.5", "find-cache-dir": "^3.3.1", - "jest-worker": "^26.1.0", + "jest-worker": "^26.5.0", "p-limit": "^3.0.2", - "schema-utils": "^2.6.6", - "serialize-javascript": "^4.0.0", + "schema-utils": "^3.0.0", + "serialize-javascript": "^5.0.1", "source-map": "^0.6.1", - "terser": "^4.8.0", + "terser": "^5.3.4", "webpack-sources": "^1.4.3" }, "dependencies": { "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -12253,9 +13320,9 @@ "dev": true }, "jest-worker": { - "version": "26.2.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.2.1.tgz", - "integrity": "sha512-+XcGMMJDTeEGncRb5M5Zq9P7K4sQ1sirhjdOxsN1462h6lFo9w59bl2LVQmdGEEeU3m+maZCkS2Tcc9SfCHO4A==", + "version": "26.5.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz", + "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==", "dev": true, "requires": { "@types/node": "*", @@ -12359,14 +13426,14 @@ } }, "schema-utils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", - "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", + "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", "dev": true, "requires": { - "@types/json-schema": "^7.0.4", - "ajv": "^6.12.2", - "ajv-keywords": "^3.4.1" + "@types/json-schema": "^7.0.6", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" } }, "semver": { @@ -12376,14 +13443,24 @@ "dev": true }, "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", "dev": true, "requires": { "randombytes": "^2.1.0" } }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, "ssri": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", @@ -12394,14 +13471,33 @@ } }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "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" } }, + "terser": { + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.4.tgz", + "integrity": "sha512-dxuB8KQo8Gt6OVOeLg/rxfcxdNZI/V1G6ze1czFUzPeCFWZRtvZMgSzlZZ5OYBZ4HoG607F6pFPNLekJyV+yVw==", + "dev": true, + "requires": { + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.19" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } + } + }, "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -12439,9 +13535,9 @@ "dev": true }, "timers-browserify": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", - "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", + "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", "dev": true, "requires": { "setimmediate": "^1.0.4" @@ -12456,12 +13552,6 @@ "os-tmpdir": "~1.0.2" } }, - "to-array": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", - "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", - "dev": true - }, "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", @@ -12603,15 +13693,15 @@ "dev": true }, "typescript": { - "version": "3.9.7", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", - "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz", + "integrity": "sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ==", "dev": true }, "ua-parser-js": { - "version": "0.7.21", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz", - "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==", + "version": "0.7.24", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.24.tgz", + "integrity": "sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw==", "dev": true }, "uc.micro": { @@ -12621,24 +13711,11 @@ "dev": true }, "uglify-js": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.1.tgz", - "integrity": "sha512-W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw==", + "version": "3.12.8", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.8.tgz", + "integrity": "sha512-fvBeuXOsvqjecUtF/l1dwsrrf5y2BCUk9AOJGzGcm6tE7vegku5u/YvqjyDaAGr422PLoLnrxg3EnRvTqsdC1w==", "dev": true, - "optional": true, - "requires": { - "commander": "~2.20.3", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "optional": true - } - } + "optional": true }, "unbzip2-stream": { "version": "1.4.3", @@ -12651,13 +13728,13 @@ }, "dependencies": { "buffer": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", - "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4" + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" } } } @@ -12828,9 +13905,9 @@ } }, "url-polyfill": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.10.tgz", - "integrity": "sha512-vSaPpaRgBrf41+Uky1myiSh6gpcbw8FpwHYnEy0abxndojOBnIs+yh/49gKYFLtUMP9qoNWjn6j9aUVy23Ie2A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.12.tgz", + "integrity": "sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==", "dev": true }, "use": { @@ -12927,15 +14004,15 @@ } }, "watchpack": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz", - "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", + "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", "dev": true, "requires": { "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.0" + "watchpack-chokidar2": "^2.0.1" }, "dependencies": { "anymatch": { @@ -12950,9 +14027,9 @@ } }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true, "optional": true }, @@ -12967,20 +14044,20 @@ } }, "chokidar": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz", - "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", "dev": true, "optional": true, "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.5.0" } }, "fill-range": { @@ -12994,9 +14071,9 @@ } }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz", + "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==", "dev": true, "optional": true }, @@ -13028,9 +14105,9 @@ "optional": true }, "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, "optional": true, "requires": { @@ -13059,9 +14136,9 @@ } }, "watchpack-chokidar2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz", - "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz", + "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==", "dev": true, "optional": true, "requires": { @@ -13083,9 +14160,9 @@ "integrity": "sha1-mM6VCXsp4x++czBT4Q5XFkLRxsc=" }, "webpack": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", - "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", + "version": "4.46.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", + "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "requires": { "@webassemblyjs/ast": "1.9.0", @@ -13096,7 +14173,7 @@ "ajv": "^6.10.2", "ajv-keywords": "^3.4.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.3.0", + "enhanced-resolve": "^4.5.0", "eslint-scope": "^4.0.3", "json-parse-better-errors": "^1.0.2", "loader-runner": "^2.4.0", @@ -13114,9 +14191,9 @@ }, "dependencies": { "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -13144,16 +14221,16 @@ "dev": true }, "terser-webpack-plugin": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz", - "integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", + "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", "dev": true, "requires": { "cacache": "^12.0.2", "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", - "serialize-javascript": "^3.1.0", + "serialize-javascript": "^4.0.0", "source-map": "^0.6.1", "terser": "^4.1.2", "webpack-sources": "^1.4.0", @@ -13163,160 +14240,288 @@ } }, "webpack-cli": { - "version": "3.3.12", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz", - "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.5.0.tgz", + "integrity": "sha512-wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q==", "dev": true, "requires": { - "chalk": "^2.4.2", - "cross-spawn": "^6.0.5", - "enhanced-resolve": "^4.1.1", - "findup-sync": "^3.0.0", - "global-modules": "^2.0.0", - "import-local": "^2.0.0", - "interpret": "^1.4.0", - "loader-utils": "^1.4.0", - "supports-color": "^6.1.0", - "v8-compile-cache": "^2.1.1", - "yargs": "^13.3.2" + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^1.0.1", + "@webpack-cli/info": "^1.2.2", + "@webpack-cli/serve": "^1.3.0", + "colorette": "^1.2.1", + "commander": "^7.0.0", + "enquirer": "^2.3.6", + "execa": "^5.0.0", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^2.2.0", + "rechoir": "^0.7.0", + "v8-compile-cache": "^2.2.0", + "webpack-merge": "^5.7.3" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "commander": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz", + "integrity": "sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==", "dev": true }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true - }, - "enhanced-resolve": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz", - "integrity": "sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ==", + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.5.0", - "tapable": "^1.0.0" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "execa": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", + "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "get-stream": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz", + "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", + "dev": true + }, + "import-local": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", + "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" } }, "interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", + "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", "dev": true }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "p-locate": "^4.1.0" } }, - "memory-fs": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", - "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "path-key": "^3.0.0" } }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "mimic-fn": "^2.1.0" } }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "p-limit": "^2.2.0" } }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "find-up": "^4.0.0" } }, + "rechoir": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz", + "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==", + "dev": true, + "requires": { + "resolve": "^1.9.0" + } + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "requires": { + "resolve-from": "^5.0.0" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "dev": true + }, "v8-compile-cache": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz", - "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz", + "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==", "dev": true }, - "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "isexe": "^2.0.0" } } } }, "webpack-dev-middleware": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz", - "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-4.1.0.tgz", + "integrity": "sha512-mpa/FY+DiBu5+r5JUIyTCYWRfkWgyA3/OOE9lwfzV9S70A4vJYLsVRKj5rMFEsezBroy2FmPyQ8oBRVW8QmK1A==", "dev": true, "requires": { - "memory-fs": "^0.4.1", - "mime": "^2.4.4", - "mkdirp": "^0.5.1", + "colorette": "^1.2.1", + "mem": "^8.0.0", + "memfs": "^3.2.0", + "mime-types": "^2.1.28", "range-parser": "^1.2.1", - "webpack-log": "^2.0.0" + "schema-utils": "^3.0.0" }, "dependencies": { - "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true + }, + "mime-db": { + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz", + "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==", + "dev": true + }, + "mime-types": { + "version": "2.1.28", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz", + "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==", + "dev": true, + "requires": { + "mime-db": "1.45.0" + } + }, + "schema-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", + "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.6", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } } } }, "webpack-dev-server": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz", - "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==", + "version": "3.11.2", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz", + "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==", "dev": true, "requires": { "ansi-html": "0.0.7", @@ -13339,11 +14544,11 @@ "p-retry": "^3.0.1", "portfinder": "^1.0.26", "schema-utils": "^1.0.0", - "selfsigned": "^1.10.7", + "selfsigned": "^1.10.8", "semver": "^6.3.0", "serve-index": "^1.9.1", - "sockjs": "0.3.20", - "sockjs-client": "1.4.0", + "sockjs": "^0.3.21", + "sockjs-client": "^1.5.0", "spdy": "^4.0.2", "strip-ansi": "^3.0.1", "supports-color": "^6.1.0", @@ -13412,6 +14617,19 @@ "has-flag": "^3.0.0" } }, + "webpack-dev-middleware": { + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz", + "integrity": "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==", + "dev": true, + "requires": { + "memory-fs": "^0.4.1", + "mime": "^2.4.4", + "mkdirp": "^0.5.1", + "range-parser": "^1.2.1", + "webpack-log": "^2.0.0" + } + }, "ws": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", @@ -13438,16 +14656,6 @@ "y18n": "^4.0.0", "yargs-parser": "^13.1.2" } - }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, @@ -13461,6 +14669,16 @@ "uuid": "^3.3.2" } }, + "webpack-merge": { + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", + "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", + "dev": true, + "requires": { + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" + } + }, "webpack-sources": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", @@ -13472,11 +14690,13 @@ } }, "websocket-driver": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz", - "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", "dev": true, "requires": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", "websocket-extensions": ">=0.1.1" } }, @@ -13510,6 +14730,12 @@ "string-width": "^1.0.2 || 2" } }, + "wildcard": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "dev": true + }, "wkt-parser": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.2.4.tgz", @@ -13538,19 +14764,19 @@ } }, "worker-loader": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.0.tgz", - "integrity": "sha512-TNDhyNxUfOGkxNDH28bkrfS4d2BSKYtc3Jznkhhpra9q3p5Su9mRD9Rso5uUNCK6vsEdlceTCJ7aMcluJAotZw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz", + "integrity": "sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==", "dev": true, "requires": { "loader-utils": "^2.0.0", - "schema-utils": "^2.7.0" + "schema-utils": "^3.0.0" }, "dependencies": { "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -13578,9 +14804,9 @@ "dev": true }, "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", "dev": true, "requires": { "minimist": "^1.2.5" @@ -13598,22 +14824,22 @@ } }, "schema-utils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", - "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", + "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", "dev": true, "requires": { - "@types/json-schema": "^7.0.4", - "ajv": "^6.12.2", - "ajv-keywords": "^3.4.1" + "@types/json-schema": "^7.0.6", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" } } } }, "workerpool": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz", - "integrity": "sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", + "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", "dev": true }, "wrap-ansi": { @@ -13671,9 +14897,9 @@ } }, "ws": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", - "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz", + "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==", "dev": true }, "xmlcreate": { @@ -13682,12 +14908,6 @@ "integrity": "sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ==", "dev": true }, - "xmlhttprequest-ssl": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", - "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", - "dev": true - }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -13701,28 +14921,24 @@ "dev": true }, "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, "yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" }, "dependencies": { "ansi-regex": { @@ -13732,24 +14948,23 @@ "dev": true }, "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" } }, "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, "requires": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "wrap-ansi": "^7.0.0" } }, "color-convert": { @@ -13773,46 +14988,12 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", @@ -13834,9 +15015,9 @@ } }, "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "requires": { "ansi-styles": "^4.0.0", @@ -13844,15 +15025,17 @@ "strip-ansi": "^6.0.0" } }, + "y18n": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz", + "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==", + "dev": true + }, "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true } } }, @@ -13867,72 +15050,28 @@ } }, "yargs-unparser": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz", - "integrity": "sha512-qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, "requires": { - "camelcase": "^5.3.1", - "decamelize": "^1.2.0", - "flat": "^4.1.0", - "is-plain-obj": "^1.1.0", - "yargs": "^14.2.3" + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "camelcase": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", + "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", "dev": true }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "yargs": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", - "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^15.0.1" - } - }, - "yargs-parser": { - "version": "15.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz", - "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true } } }, @@ -13946,10 +15085,10 @@ "fd-slicer": "~1.1.0" } }, - "yeast": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", - "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true } } diff --git a/package.json b/package.json index c7ec01a591..4aee814d55 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ol", - "version": "6.4.4-dev", + "version": "6.5.1-dev", "description": "OpenLayers mapping library", "keywords": [ "map", @@ -17,9 +17,9 @@ "test": "npm run test-spec && npm run test-rendering -- --force", "karma": "karma start test/karma.config.js", "start": "npm run serve-examples", - "serve-examples": "webpack-dev-server --config examples/webpack/config.js --mode development --watch", + "serve-examples": "webpack serve --config examples/webpack/config.js --mode development", "build-examples": "webpack --config examples/webpack/config.js --mode production", - "build-package": "npm run transpile && npm run copy-css && node tasks/prepare-package && shx cp README.md build/ol", + "build-package": "npm run transpile && npm run copy-css && node tasks/prepare-package", "build-index": "npm run build-package && node tasks/generate-index", "build-legacy": "shx rm -rf build && npm run build-index && webpack --config config/webpack-config-legacy-build.js && cleancss --source-map src/ol/ol.css -o build/legacy/ol.css", "build-site": "npm run build-examples && npm run apidoc && mkdir -p build/site && cp site/index.html build/site && mv build/apidoc build/site/apidoc && mv build/examples build/site/examples", @@ -59,55 +59,56 @@ "buble": "^0.20.0", "buble-loader": "^0.5.1", "chaikin-smooth": "^1.0.4", - "clean-css-cli": "4.3.0", + "clean-css-cli": "5.2.0", "copy-webpack-plugin": "^6.0.1", "coveralls": "3.1.0", "eslint": "^7.2.0", "eslint-config-openlayers": "^14.0.0", "expect.js": "0.3.1", + "express": "^4.17.1", "front-matter": "^4.0.0", "fs-extra": "^9.0.0", "glob": "^7.1.5", "globby": "^11.0.0", - "handlebars": "4.7.6", + "handlebars": "4.7.7", "istanbul": "0.4.5", "istanbul-instrumenter-loader": "^3.0.1", "jquery": "3.5.1", - "jsdoc": "3.6.5", + "jsdoc": "3.6.6", "jsdoc-plugin-typescript": "^2.0.5", "json-stringify-safe": "^5.0.1", - "karma": "^5.0.1", + "karma": "^6.0.1", "karma-chrome-launcher": "3.1.0", "karma-coverage-istanbul-reporter": "^3.0.0", - "karma-firefox-launcher": "^1.1.0", + "karma-firefox-launcher": "^2.0.0", "karma-mocha": "2.0.1", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^4.0.0-rc.2", "loglevelnext": "^4.0.1", - "marked": "1.1.1", - "mocha": "8.1.0", + "marked": "2.0.1", + "mocha": "8.3.0", "pixelmatch": "^5.1.0", - "pngjs": "^5.0.0", - "proj4": "2.6.2", - "puppeteer": "5.2.1", + "pngjs": "^6.0.0", + "proj4": "2.7.0", + "puppeteer": "8.0.0", "rollup": "^2.1.0", "rollup-plugin-babel": "^4.3.3", "rollup-plugin-commonjs": "^10.0.0", "rollup-plugin-node-resolve": "^5.2.0", - "rollup-plugin-terser": "^6.1.0", + "rollup-plugin-terser": "^7.0.0", "serve-static": "^1.14.0", "shx": "^0.3.2", "sinon": "^9.0.0", - "terser-webpack-plugin": "^3.0.0", - "typescript": "^3.8.3", + "terser-webpack-plugin": "^4.0.0", + "typescript": "^4.0.2", "url-polyfill": "^1.1.5", "walk": "^2.3.9", - "webpack": "4.44.1", - "webpack-cli": "^3.3.2", - "webpack-dev-middleware": "^3.6.2", + "webpack": "4.46.0", + "webpack-cli": "^4.0.0", + "webpack-dev-middleware": "^4.0.0", "webpack-dev-server": "^3.3.1", "worker-loader": "^3.0.0", - "yargs": "^15.0.2" + "yargs": "^16.0.3" }, "eslintConfig": { "extends": "openlayers", diff --git a/rendering/cases/circle-style/expected.png b/rendering/cases/circle-style/expected.png index 84eef2b6e8..a72891b86e 100644 Binary files a/rendering/cases/circle-style/expected.png and b/rendering/cases/circle-style/expected.png differ diff --git a/rendering/cases/circle-style/main.js b/rendering/cases/circle-style/main.js index 7f9ac70aa7..89b919859d 100644 --- a/rendering/cases/circle-style/main.js +++ b/rendering/cases/circle-style/main.js @@ -8,6 +8,21 @@ import VectorLayer from '../../../src/ol/layer/Vector.js'; import VectorSource from '../../../src/ol/source/Vector.js'; import View from '../../../src/ol/View.js'; +const ellipse = new Feature(new Point([-50, -50])); + +ellipse.setStyle( + new Style({ + image: new Circle({ + radius: 30, + scale: [1, 0.5], + stroke: new Stroke({ + color: '#00f', + width: 3, + }), + }), + }) +); + const vectorSource = new VectorSource(); vectorSource.addFeatures([ @@ -23,6 +38,7 @@ vectorSource.addFeatures([ geometry: new Point([50, 50]), radius: 30, }), + ellipse, ]); const style = new Style({ @@ -36,7 +52,7 @@ const style = new Style({ }); new Map({ - pixelRatio: 1, + pixelRatio: 2, layers: [ new VectorLayer({ source: vectorSource, diff --git a/rendering/cases/icon-scale/expected.png b/rendering/cases/icon-scale/expected.png index a3ef37e19c..bc25213de8 100644 Binary files a/rendering/cases/icon-scale/expected.png and b/rendering/cases/icon-scale/expected.png differ diff --git a/rendering/cases/icon-scale/main.js b/rendering/cases/icon-scale/main.js index ae6165ae81..cb3744c6fe 100644 --- a/rendering/cases/icon-scale/main.js +++ b/rendering/cases/icon-scale/main.js @@ -7,7 +7,14 @@ import VectorLayer from '../../../src/ol/layer/Vector.js'; import VectorSource from '../../../src/ol/source/Vector.js'; import View from '../../../src/ol/View.js'; -const features = []; +const features = [ + new Feature({ + geometry: new Point([-1, 12]), + scale: [-8, -8], + anchor: [0.5, 0.5], + rotated: 0, + }), +]; for (let i = 0; i < 2; ++i) { const x = i * 5; features.push( @@ -104,6 +111,7 @@ const vectorLayer = new VectorLayer({ style.getImage().setRotation((feature.get('rotated') * Math.PI) / 4); return style; }, + renderBuffer: 25, }); const map = new Map({ diff --git a/rendering/cases/layer-vector-multi-world/expected.png b/rendering/cases/layer-vector-multi-world/expected.png new file mode 100644 index 0000000000..908c05a4a2 Binary files /dev/null and b/rendering/cases/layer-vector-multi-world/expected.png differ diff --git a/rendering/cases/layer-vector-multi-world/main.js b/rendering/cases/layer-vector-multi-world/main.js new file mode 100644 index 0000000000..ae458e87fe --- /dev/null +++ b/rendering/cases/layer-vector-multi-world/main.js @@ -0,0 +1,69 @@ +import Feature from '../../../src/ol/Feature.js'; +import Fill from '../../../src/ol/style/Fill.js'; +import Map from '../../../src/ol/Map.js'; +import Polygon from '../../../src/ol/geom/Polygon.js'; +import Style from '../../../src/ol/style/Style.js'; +import VectorLayer from '../../../src/ol/layer/Vector.js'; +import VectorSource from '../../../src/ol/source/Vector.js'; +import View from '../../../src/ol/View.js'; +import {Projection, addCoordinateTransforms} from '../../../src/ol/proj.js'; +import {fromEPSG4326, toEPSG4326} from '../../../src/ol/proj/epsg3857.js'; + +const projection = new Projection({ + code: 'custom', + units: 'm', + global: true, + extent: [-40075016.68557849, -20037508.342789244, 0, 20037508.342789244], +}); + +addCoordinateTransforms( + 'EPSG:4326', + projection, + function (coord) { + const converted = fromEPSG4326(coord); + converted[0] -= 20037508.342789244; + return converted; + }, + function (coord) { + return toEPSG4326([coord[0] + 20037508.342789244, coord[1]]); + } +); + +const feature = new Feature({ + geometry: new Polygon([ + [ + [-20037508.342789244, 20037508.342789244], + [-20037508.342789244, -20037508.342789244], + [-16037508.342789244, -20037508.342789244], + [-16037508.342789244, 20037508.342789244], + [-20037508.342789244, 20037508.342789244], + ], + ]), +}); + +new Map({ + pixelRatio: 1, + layers: [ + new VectorLayer({ + renderBuffer: 0, + source: new VectorSource({ + features: [feature], + }), + style: new Style({ + fill: new Fill({ + color: 'black', + }), + }), + }), + ], + target: 'map', + view: new View({ + projection: projection, + multiWorld: true, + maxResolution: 485254.1017841229, + zoom: 0, + center: [2000000, 0], + }), +}); + +render(); diff --git a/rendering/cases/layer-vector-multipoint-decluttering/expected.png b/rendering/cases/layer-vector-multipoint-decluttering/expected.png new file mode 100644 index 0000000000..f650963374 Binary files /dev/null and b/rendering/cases/layer-vector-multipoint-decluttering/expected.png differ diff --git a/rendering/cases/layer-vector-multipoint-decluttering/main.js b/rendering/cases/layer-vector-multipoint-decluttering/main.js new file mode 100644 index 0000000000..7b17e84ecc --- /dev/null +++ b/rendering/cases/layer-vector-multipoint-decluttering/main.js @@ -0,0 +1,53 @@ +import Feature from '../../../src/ol/Feature.js'; +import Map from '../../../src/ol/Map.js'; +import MultiPoint from '../../../src/ol/geom/MultiPoint.js'; +import VectorSource from '../../../src/ol/source/Vector.js'; +import View from '../../../src/ol/View.js'; +import {Icon, Stroke, Style, Text} from '../../../src/ol/style.js'; +import {Vector as VectorLayer} from '../../../src/ol/layer.js'; + +const vectorLayer = new VectorLayer({ + declutter: true, + renderBuffer: 0, + source: new VectorSource({ + features: [ + new Feature( + new MultiPoint([ + [0, 0], + [0, 1], + [0.5, 0.5], + [0.9, 0.85], + [1, 0], + [0.3, 0.5], + ]) + ), + ], + }), + style: new Style({ + image: new Icon({ + anchor: [0.5, 46], + anchorXUnits: 'fraction', + anchorYUnits: 'pixels', + src: '/data/icon.png', + }), + text: new Text({ + text: 'Test', + font: 'italic 700 20px Ubuntu', + stroke: new Stroke({ + color: 'red', + width: 20, + }), + }), + }), +}); + +new Map({ + layers: [vectorLayer], + target: document.getElementById('map'), + view: new View({ + center: [0.5, 0.5], + resolution: 0.006679631467570084, + }), +}); + +render({tolerance: 0.007}); diff --git a/rendering/cases/layer-vectortile-icon-label/expected.png b/rendering/cases/layer-vectortile-icon-label/expected.png new file mode 100644 index 0000000000..fb473b68ea Binary files /dev/null and b/rendering/cases/layer-vectortile-icon-label/expected.png differ diff --git a/rendering/cases/layer-vectortile-icon-label/main.js b/rendering/cases/layer-vectortile-icon-label/main.js new file mode 100644 index 0000000000..3120eb4d74 --- /dev/null +++ b/rendering/cases/layer-vectortile-icon-label/main.js @@ -0,0 +1,22 @@ +import Map from '../../../src/ol/Map.js'; +import MapboxVector from '../../../src/ol/layer/MapboxVector.js'; +import View from '../../../src/ol/View.js'; + +const mapboxVectorLayer = new MapboxVector({ + styleUrl: '/data/styles/bright-v9/style.json', + accessToken: 'test-token', +}); + +new Map({ + layers: [mapboxVectorLayer], + target: 'map', + view: new View({ + center: [1822585.77586262, 6141438.140891937], + zoom: 16, + }), +}); + +render({ + message: 'Vector tile layer declutters image with text correctly', + tolerance: 0.01, +}); diff --git a/rendering/cases/layer-vectortile-opacity-declutter/expected.png b/rendering/cases/layer-vectortile-opacity-declutter/expected.png new file mode 100644 index 0000000000..b8b3cc196c Binary files /dev/null and b/rendering/cases/layer-vectortile-opacity-declutter/expected.png differ diff --git a/rendering/cases/layer-vectortile-opacity-declutter/main.js b/rendering/cases/layer-vectortile-opacity-declutter/main.js new file mode 100644 index 0000000000..7ea4b13cb7 --- /dev/null +++ b/rendering/cases/layer-vectortile-opacity-declutter/main.js @@ -0,0 +1,31 @@ +import MVT from '../../../src/ol/format/MVT.js'; +import Map from '../../../src/ol/Map.js'; +import VectorTileLayer from '../../../src/ol/layer/VectorTile.js'; +import VectorTileSource from '../../../src/ol/source/VectorTile.js'; +import View from '../../../src/ol/View.js'; +import {createXYZ} from '../../../src/ol/tilegrid.js'; + +new Map({ + layers: [ + new VectorTileLayer({ + declutter: true, + opacity: 0.1, + source: new VectorTileSource({ + format: new MVT(), + tileGrid: createXYZ(), + url: '/data/tiles/mapbox-streets-v6/{z}/{x}/{y}.vector.pbf', + transition: 0, + }), + }), + ], + target: 'map', + view: new View({ + center: [1825927.7316762917, 6143091.089223046], + zoom: 14, + }), +}); + +render({ + message: 'Vector tile layer renders', + tolerance: 0.02, +}); diff --git a/rendering/cases/layer-vectortile-opacity/expected.png b/rendering/cases/layer-vectortile-opacity/expected.png new file mode 100644 index 0000000000..4cdca58a93 Binary files /dev/null and b/rendering/cases/layer-vectortile-opacity/expected.png differ diff --git a/rendering/cases/layer-vectortile-opacity/main.js b/rendering/cases/layer-vectortile-opacity/main.js new file mode 100644 index 0000000000..bda563a18c --- /dev/null +++ b/rendering/cases/layer-vectortile-opacity/main.js @@ -0,0 +1,30 @@ +import MVT from '../../../src/ol/format/MVT.js'; +import Map from '../../../src/ol/Map.js'; +import VectorTileLayer from '../../../src/ol/layer/VectorTile.js'; +import VectorTileSource from '../../../src/ol/source/VectorTile.js'; +import View from '../../../src/ol/View.js'; +import {createXYZ} from '../../../src/ol/tilegrid.js'; + +new Map({ + layers: [ + new VectorTileLayer({ + opacity: 0.1, + source: new VectorTileSource({ + format: new MVT(), + tileGrid: createXYZ(), + url: '/data/tiles/mapbox-streets-v6/{z}/{x}/{y}.vector.pbf', + transition: 0, + }), + }), + ], + target: 'map', + view: new View({ + center: [1825927.7316762917, 6143091.089223046], + zoom: 14, + }), +}); + +render({ + message: 'Vector tile layer renders', + tolerance: 0.02, +}); diff --git a/rendering/cases/layer-vectortile-renderbuffer/expected.png b/rendering/cases/layer-vectortile-renderbuffer/expected.png new file mode 100644 index 0000000000..95fadf80ba Binary files /dev/null and b/rendering/cases/layer-vectortile-renderbuffer/expected.png differ diff --git a/rendering/cases/layer-vectortile-renderbuffer/main.js b/rendering/cases/layer-vectortile-renderbuffer/main.js new file mode 100644 index 0000000000..439c671a65 --- /dev/null +++ b/rendering/cases/layer-vectortile-renderbuffer/main.js @@ -0,0 +1,59 @@ +import Feature from '../../../src/ol/Feature.js'; +import Map from '../../../src/ol/Map.js'; +import Point from '../../../src/ol/geom/Point.js'; +import VectorTileLayer from '../../../src/ol/layer/VectorTile.js'; +import VectorTileSource from '../../../src/ol/source/VectorTile.js'; +import View from '../../../src/ol/View.js'; +import {Circle, Fill, Stroke, Style} from '../../../src/ol/style.js'; + +const offset = 1380000; +const points = [ + [-offset, -offset], + [-offset, offset], + [offset, offset], + [offset, -offset], +]; + +const vectorTileSource = new VectorTileSource({ + tileUrlFunction: (tileCoord) => tileCoord, + tileLoadFunction(tile, tileCoord) { + const features = points.map( + (corner) => + new Feature({ + geometry: new Point(corner), + tileCoord, + }) + ); + tile.setFeatures(features); + }, +}); + +const vectorTileLayer = new VectorTileLayer({ + source: vectorTileSource, + style: new Style({ + image: new Circle({ + radius: 50, + fill: new Fill({ + color: 'rgba(255, 0, 0, 0.5)', + }), + stroke: new Stroke({ + width: 1, + color: 'black', + }), + }), + }), +}); + +new Map({ + target: 'map', + layers: [vectorTileLayer], + view: new View({ + center: [0, 0], + zoom: 2, + multiWorld: true, + }), +}); + +render({ + message: 'Vector tile layer renders tiles from renderBuffer', +}); diff --git a/rendering/cases/layer-vectortile-rendermode-vector-opacity/expected.png b/rendering/cases/layer-vectortile-rendermode-vector-opacity/expected.png new file mode 100644 index 0000000000..147fb61264 Binary files /dev/null and b/rendering/cases/layer-vectortile-rendermode-vector-opacity/expected.png differ diff --git a/rendering/cases/layer-vectortile-rendermode-vector-opacity/main.js b/rendering/cases/layer-vectortile-rendermode-vector-opacity/main.js new file mode 100644 index 0000000000..bb36089195 --- /dev/null +++ b/rendering/cases/layer-vectortile-rendermode-vector-opacity/main.js @@ -0,0 +1,32 @@ +import MVT from '../../../src/ol/format/MVT.js'; +import Map from '../../../src/ol/Map.js'; +import VectorTileLayer from '../../../src/ol/layer/VectorTile.js'; +import VectorTileRenderType from '../../../src/ol/layer/VectorTileRenderType.js'; +import VectorTileSource from '../../../src/ol/source/VectorTile.js'; +import View from '../../../src/ol/View.js'; +import {createXYZ} from '../../../src/ol/tilegrid.js'; + +new Map({ + layers: [ + new VectorTileLayer({ + renderMode: VectorTileRenderType.VECTOR, + opacity: 0.1, + source: new VectorTileSource({ + format: new MVT(), + tileGrid: createXYZ(), + url: '/data/tiles/mapbox-streets-v6/{z}/{x}/{y}.vector.pbf', + transition: 0, + }), + }), + ], + target: 'map', + view: new View({ + center: [1825927.7316762917, 6143091.089223046], + zoom: 14, + }), +}); + +render({ + message: 'Vector tile layer renders with vector render mode', + tolerance: 0.02, +}); diff --git a/rendering/cases/regularshape-style/expected.png b/rendering/cases/regularshape-style/expected.png index b89511eef3..f9ec11d499 100644 Binary files a/rendering/cases/regularshape-style/expected.png and b/rendering/cases/regularshape-style/expected.png differ diff --git a/rendering/cases/regularshape-style/main.js b/rendering/cases/regularshape-style/main.js index 6c201fb030..327e466db6 100644 --- a/rendering/cases/regularshape-style/main.js +++ b/rendering/cases/regularshape-style/main.js @@ -83,6 +83,25 @@ function createFeatures(stroke, fill, offSet = [0, 0]) { }) ); vectorSource.addFeature(feature); + + feature = new Feature({ + geometry: new Point([8 + offSet[0], 30 + offSet[1]]), + }); + // rectangle + feature.setStyle( + new Style({ + image: new RegularShape({ + fill: fill, + stroke: stroke, + radius: 10 / Math.SQRT2, + radius2: 10, + points: 4, + angle: 0, + scale: [1, 0.5], + }), + }) + ); + vectorSource.addFeature(feature); } createFeatures(new Stroke({width: 2}), new Fill({color: 'red'})); diff --git a/rendering/cases/rtl-text-align/expected.png b/rendering/cases/rtl-text-align/expected.png new file mode 100644 index 0000000000..ca2dd0b456 Binary files /dev/null and b/rendering/cases/rtl-text-align/expected.png differ diff --git a/rendering/cases/rtl-text-align/main.js b/rendering/cases/rtl-text-align/main.js new file mode 100644 index 0000000000..adf2547acd --- /dev/null +++ b/rendering/cases/rtl-text-align/main.js @@ -0,0 +1,94 @@ +import CircleStyle from '../../../src/ol/style/Circle.js'; +import Feature from '../../../src/ol/Feature.js'; +import Fill from '../../../src/ol/style/Fill.js'; +import Map from '../../../src/ol/Map.js'; +import Point from '../../../src/ol/geom/Point.js'; +import Stroke from '../../../src/ol/style/Stroke.js'; +import Style from '../../../src/ol/style/Style.js'; +import Text from '../../../src/ol/style/Text.js'; +import VectorLayer from '../../../src/ol/layer/Vector.js'; +import VectorSource from '../../../src/ol/source/Vector.js'; +import View from '../../../src/ol/View.js'; + +const vectorSource = new VectorSource({ + features: [ + // Latin - end (right) + new Feature({ + geometry: new Point([-10, 50]), + text: 'Latin', + textAlign: 'end', + }), + + // Hebrew - start (right) + new Feature({ + geometry: new Point([-10, 0]), + text: 'עִברִית', + textAlign: 'start', + }), + + // Arabic - start (right) + new Feature({ + geometry: new Point([-10, -50]), + text: 'عربى', + textAlign: 'start', + }), + + // Latin - start (left) + new Feature({ + geometry: new Point([10, 50]), + text: 'Latin', + textAlign: 'start', + }), + + // Hebrew - end (left) + new Feature({ + geometry: new Point([10, 0]), + text: 'עִברִית', + textAlign: 'end', + }), + + // Arabic - end (left) + new Feature({ + geometry: new Point([10, -50]), + text: 'عربى', + textAlign: 'end', + }), + ], +}); + +new Map({ + pixelRatio: 1, + layers: [ + new VectorLayer({ + source: vectorSource, + style: function (feature) { + return new Style({ + text: new Text({ + text: feature.get('text'), + font: '24px Ubuntu', + textAlign: feature.get('textAlign'), + fill: new Fill({ + color: 'black', + }), + stroke: new Stroke({ + color: 'white', + }), + }), + image: new CircleStyle({ + radius: 10, + fill: new Fill({ + color: 'cyan', + }), + }), + }); + }, + }), + ], + target: 'map', + view: new View({ + center: [0, 0], + resolution: 1, + }), +}); + +render({tolerance: 0.01}); diff --git a/rendering/cases/source-vectortile-declutter/expected.png b/rendering/cases/source-vectortile-declutter/expected.png new file mode 100644 index 0000000000..e1ede79331 Binary files /dev/null and b/rendering/cases/source-vectortile-declutter/expected.png differ diff --git a/rendering/cases/source-vectortile-declutter/main.js b/rendering/cases/source-vectortile-declutter/main.js new file mode 100644 index 0000000000..dac6b8b6b1 --- /dev/null +++ b/rendering/cases/source-vectortile-declutter/main.js @@ -0,0 +1,60 @@ +import Feature from '../../../src/ol/Feature.js'; +import Map from '../../../src/ol/Map.js'; +import Point from '../../../src/ol/geom/Point.js'; +import VectorTileLayer from '../../../src/ol/layer/VectorTile.js'; +import VectorTileSource from '../../../src/ol/source/VectorTile.js'; +import View from '../../../src/ol/View.js'; +import {Circle, Fill, Stroke, Style} from '../../../src/ol/style.js'; +import {createXYZ} from '../../../src/ol/tilegrid.js'; + +const points = [[0, 0]]; + +const vectorTileSource = new VectorTileSource({ + tileGrid: createXYZ({ + extent: [-20000000, -10000000, 10000000, 20000000], + tileSize: 512, + }), + tileUrlFunction: (tileCoord) => tileCoord, + tileLoadFunction(tile, tileCoord) { + const features = points.map( + (corner) => + new Feature({ + geometry: new Point(corner), + tileCoord, + }) + ); + tile.setFeatures(features); + }, +}); + +const vectorTileLayer = new VectorTileLayer({ + declutter: true, + source: vectorTileSource, + style: new Style({ + image: new Circle({ + radius: 100, + fill: new Fill({ + color: 'rgba(255, 0, 0, 0.5)', + }), + stroke: new Stroke({ + width: 1, + color: 'black', + }), + }), + }), +}); + +new Map({ + target: 'map', + layers: [vectorTileLayer], + view: new View({ + center: [0, 0], + zoom: 4, + multiWorld: true, + }), +}); + +render({ + message: + 'Vector tile source tile grid different from render tile grid, with decluttering', +}); diff --git a/rendering/cases/text-style-linestring-nice/main.js b/rendering/cases/text-style-linestring-nice/main.js index 4dbdec77fe..9cfb1c0703 100644 --- a/rendering/cases/text-style-linestring-nice/main.js +++ b/rendering/cases/text-style-linestring-nice/main.js @@ -114,7 +114,7 @@ feature4.setStyle( text: 'negative offsetX', font: 'normal 400 10px/1 Ubuntu', offsetX: -10, - textAlign: 'start', + textAlign: 'end', textBaseline: 'top', placement: 'line', }), @@ -133,7 +133,7 @@ feature5.setStyle( font: '10px Ubuntu', offsetY: 5, scale: 0.7, - textAlign: 'end', + textAlign: 'start', placement: 'line', }), }) diff --git a/rendering/data/styles/bright-v9/mapbox-streets-v7/15/17874/11362.vector.pbf b/rendering/data/styles/bright-v9/mapbox-streets-v7/15/17874/11362.vector.pbf new file mode 100644 index 0000000000..21fb561ca0 Binary files /dev/null and b/rendering/data/styles/bright-v9/mapbox-streets-v7/15/17874/11362.vector.pbf differ diff --git a/rendering/data/styles/bright-v9/sprite.json b/rendering/data/styles/bright-v9/sprite.json new file mode 100644 index 0000000000..aee4b3990d --- /dev/null +++ b/rendering/data/styles/bright-v9/sprite.json @@ -0,0 +1 @@ +{"airfield-15":{"width":21,"height":21,"x":0,"y":0,"pixelRatio":1,"visible":true},"airport-15":{"width":21,"height":21,"x":21,"y":0,"pixelRatio":1,"visible":true},"alcohol-shop-15":{"width":21,"height":21,"x":0,"y":21,"pixelRatio":1,"visible":true},"amusement-park-15":{"width":21,"height":21,"x":21,"y":21,"pixelRatio":1,"visible":true},"aquarium-15":{"width":21,"height":21,"x":42,"y":0,"pixelRatio":1,"visible":true},"art-gallery-15":{"width":21,"height":21,"x":63,"y":0,"pixelRatio":1,"visible":true},"attraction-15":{"width":21,"height":21,"x":42,"y":21,"pixelRatio":1,"visible":true},"bakery-15":{"width":21,"height":21,"x":63,"y":21,"pixelRatio":1,"visible":true},"bank-15":{"width":21,"height":21,"x":0,"y":42,"pixelRatio":1,"visible":true},"bar-15":{"width":21,"height":21,"x":21,"y":42,"pixelRatio":1,"visible":true},"beer-15":{"width":21,"height":21,"x":42,"y":42,"pixelRatio":1,"visible":true},"bicycle-15":{"width":21,"height":21,"x":63,"y":42,"pixelRatio":1,"visible":true},"bicycle-share-15":{"width":21,"height":21,"x":0,"y":63,"pixelRatio":1,"visible":true},"bus-15":{"width":21,"height":21,"x":21,"y":63,"pixelRatio":1,"visible":true},"cafe-15":{"width":21,"height":21,"x":42,"y":63,"pixelRatio":1,"visible":true},"campsite-15":{"width":21,"height":21,"x":63,"y":63,"pixelRatio":1,"visible":true},"car-15":{"width":21,"height":21,"x":84,"y":0,"pixelRatio":1,"visible":true},"castle-15":{"width":21,"height":21,"x":105,"y":0,"pixelRatio":1,"visible":true},"cemetery-15":{"width":21,"height":21,"x":126,"y":0,"pixelRatio":1,"visible":true},"cinema-15":{"width":21,"height":21,"x":147,"y":0,"pixelRatio":1,"visible":true},"circle-15":{"width":21,"height":21,"x":84,"y":21,"pixelRatio":1,"visible":true},"circle-stroked-15":{"width":21,"height":21,"x":105,"y":21,"pixelRatio":1,"visible":true},"clothing-store-15":{"width":21,"height":21,"x":126,"y":21,"pixelRatio":1,"visible":true},"college-15":{"width":21,"height":21,"x":147,"y":21,"pixelRatio":1,"visible":true},"dentist-15":{"width":21,"height":21,"x":84,"y":42,"pixelRatio":1,"visible":true},"doctor-15":{"width":21,"height":21,"x":105,"y":42,"pixelRatio":1,"visible":true},"dog-park-15":{"width":21,"height":21,"x":126,"y":42,"pixelRatio":1,"visible":true},"drinking-water-15":{"width":21,"height":21,"x":147,"y":42,"pixelRatio":1,"visible":true},"embassy-15":{"width":21,"height":21,"x":84,"y":63,"pixelRatio":1,"visible":true},"entrance-15":{"width":21,"height":21,"x":105,"y":63,"pixelRatio":1,"visible":true},"fast-food-15":{"width":21,"height":21,"x":126,"y":63,"pixelRatio":1,"visible":true},"ferry-15":{"width":21,"height":21,"x":147,"y":63,"pixelRatio":1,"visible":true},"fire-station-15":{"width":21,"height":21,"x":0,"y":84,"pixelRatio":1,"visible":true},"fuel-15":{"width":21,"height":21,"x":21,"y":84,"pixelRatio":1,"visible":true},"garden-15":{"width":21,"height":21,"x":42,"y":84,"pixelRatio":1,"visible":true},"golf-15":{"width":21,"height":21,"x":63,"y":84,"pixelRatio":1,"visible":true},"grocery-15":{"width":21,"height":21,"x":84,"y":84,"pixelRatio":1,"visible":true},"harbor-15":{"width":21,"height":21,"x":105,"y":84,"pixelRatio":1,"visible":true},"heliport-15":{"width":21,"height":21,"x":126,"y":84,"pixelRatio":1,"visible":true},"hospital-15":{"width":21,"height":21,"x":147,"y":84,"pixelRatio":1,"visible":true},"ice-cream-15":{"width":21,"height":21,"x":0,"y":105,"pixelRatio":1,"visible":true},"information-15":{"width":21,"height":21,"x":21,"y":105,"pixelRatio":1,"visible":true},"laundry-15":{"width":21,"height":21,"x":42,"y":105,"pixelRatio":1,"visible":true},"library-15":{"width":21,"height":21,"x":63,"y":105,"pixelRatio":1,"visible":true},"lodging-15":{"width":21,"height":21,"x":84,"y":105,"pixelRatio":1,"visible":true},"marker-15":{"width":21,"height":21,"x":105,"y":105,"pixelRatio":1,"visible":true},"monument-15":{"width":21,"height":21,"x":126,"y":105,"pixelRatio":1,"visible":true},"mountain-15":{"width":21,"height":21,"x":147,"y":105,"pixelRatio":1,"visible":true},"museum-15":{"width":21,"height":21,"x":0,"y":126,"pixelRatio":1,"visible":true},"music-15":{"width":21,"height":21,"x":21,"y":126,"pixelRatio":1,"visible":true},"park-15":{"width":21,"height":21,"x":42,"y":126,"pixelRatio":1,"visible":true},"pharmacy-15":{"width":21,"height":21,"x":63,"y":126,"pixelRatio":1,"visible":true},"picnic-site-15":{"width":21,"height":21,"x":84,"y":126,"pixelRatio":1,"visible":true},"place-of-worship-15":{"width":21,"height":21,"x":105,"y":126,"pixelRatio":1,"visible":true},"playground-15":{"width":21,"height":21,"x":126,"y":126,"pixelRatio":1,"visible":true},"police-15":{"width":21,"height":21,"x":147,"y":126,"pixelRatio":1,"visible":true},"post-15":{"width":21,"height":21,"x":0,"y":147,"pixelRatio":1,"visible":true},"prison-15":{"width":21,"height":21,"x":21,"y":147,"pixelRatio":1,"visible":true},"rail-15":{"width":21,"height":21,"x":42,"y":147,"pixelRatio":1,"visible":true},"rail-light-15":{"width":21,"height":21,"x":63,"y":147,"pixelRatio":1,"visible":true},"rail-metro-15":{"width":21,"height":21,"x":84,"y":147,"pixelRatio":1,"visible":true},"religious-christian-15":{"width":21,"height":21,"x":105,"y":147,"pixelRatio":1,"visible":true},"religious-jewish-15":{"width":21,"height":21,"x":126,"y":147,"pixelRatio":1,"visible":true},"religious-muslim-15":{"width":21,"height":21,"x":147,"y":147,"pixelRatio":1,"visible":true},"restaurant-15":{"width":21,"height":21,"x":168,"y":0,"pixelRatio":1,"visible":true},"rocket-15":{"width":21,"height":21,"x":189,"y":0,"pixelRatio":1,"visible":true},"school-15":{"width":21,"height":21,"x":210,"y":0,"pixelRatio":1,"visible":true},"shop-15":{"width":21,"height":21,"x":231,"y":0,"pixelRatio":1,"visible":true},"stadium-15":{"width":21,"height":21,"x":252,"y":0,"pixelRatio":1,"visible":true},"star-15":{"width":21,"height":21,"x":273,"y":0,"pixelRatio":1,"visible":true},"suitcase-15":{"width":21,"height":21,"x":294,"y":0,"pixelRatio":1,"visible":true},"swimming-15":{"width":21,"height":21,"x":315,"y":0,"pixelRatio":1,"visible":true},"theatre-15":{"width":21,"height":21,"x":168,"y":21,"pixelRatio":1,"visible":true},"toilet-15":{"width":21,"height":21,"x":189,"y":21,"pixelRatio":1,"visible":true},"town-hall-15":{"width":21,"height":21,"x":210,"y":21,"pixelRatio":1,"visible":true},"triangle-15":{"width":21,"height":21,"x":231,"y":21,"pixelRatio":1,"visible":true},"triangle-stroked-15":{"width":21,"height":21,"x":252,"y":21,"pixelRatio":1,"visible":true},"veterinary-15":{"width":21,"height":21,"x":273,"y":21,"pixelRatio":1,"visible":true},"volcano-15":{"width":21,"height":21,"x":294,"y":21,"pixelRatio":1,"visible":true},"zoo-15":{"width":21,"height":21,"x":315,"y":21,"pixelRatio":1,"visible":true},"motorway_1":{"width":18,"height":18,"x":168,"y":42,"pixelRatio":1,"visible":true},"motorway_2":{"width":25,"height":18,"x":186,"y":42,"pixelRatio":1,"visible":true},"motorway_3":{"width":32,"height":18,"x":211,"y":42,"pixelRatio":1,"visible":true},"motorway_4":{"width":39,"height":18,"x":243,"y":42,"pixelRatio":1,"visible":true},"motorway_5":{"width":45,"height":18,"x":282,"y":42,"pixelRatio":1,"visible":true},"motorway_6":{"width":50,"height":18,"x":168,"y":63,"pixelRatio":1,"visible":true},"airfield-11":{"width":17,"height":17,"x":218,"y":63,"pixelRatio":1,"visible":true},"airport-11":{"width":17,"height":17,"x":235,"y":63,"pixelRatio":1,"visible":true},"alcohol-shop-11":{"width":17,"height":17,"x":252,"y":63,"pixelRatio":1,"visible":true},"amusement-park-11":{"width":17,"height":17,"x":269,"y":63,"pixelRatio":1,"visible":true},"aquarium-11":{"width":17,"height":17,"x":286,"y":63,"pixelRatio":1,"visible":true},"art-gallery-11":{"width":17,"height":17,"x":303,"y":63,"pixelRatio":1,"visible":true},"attraction-11":{"width":17,"height":17,"x":168,"y":84,"pixelRatio":1,"visible":true},"bakery-11":{"width":17,"height":17,"x":185,"y":84,"pixelRatio":1,"visible":true},"bank-11":{"width":17,"height":17,"x":202,"y":84,"pixelRatio":1,"visible":true},"bar-11":{"width":17,"height":17,"x":219,"y":84,"pixelRatio":1,"visible":true},"beer-11":{"width":17,"height":17,"x":236,"y":84,"pixelRatio":1,"visible":true},"bicycle-11":{"width":17,"height":17,"x":253,"y":84,"pixelRatio":1,"visible":true},"bicycle-share-11":{"width":17,"height":17,"x":270,"y":84,"pixelRatio":1,"visible":true},"bus-11":{"width":17,"height":17,"x":287,"y":84,"pixelRatio":1,"visible":true},"cafe-11":{"width":17,"height":17,"x":304,"y":84,"pixelRatio":1,"visible":true},"campsite-11":{"width":17,"height":17,"x":168,"y":105,"pixelRatio":1,"visible":true},"car-11":{"width":17,"height":17,"x":185,"y":105,"pixelRatio":1,"visible":true},"castle-11":{"width":17,"height":17,"x":202,"y":105,"pixelRatio":1,"visible":true},"cemetery-11":{"width":17,"height":17,"x":219,"y":105,"pixelRatio":1,"visible":true},"cinema-11":{"width":17,"height":17,"x":236,"y":105,"pixelRatio":1,"visible":true},"circle-11":{"width":17,"height":17,"x":253,"y":105,"pixelRatio":1,"visible":true},"circle-stroked-11":{"width":17,"height":17,"x":270,"y":105,"pixelRatio":1,"visible":true},"clothing-store-11":{"width":17,"height":17,"x":287,"y":105,"pixelRatio":1,"visible":true},"college-11":{"width":17,"height":17,"x":304,"y":105,"pixelRatio":1,"visible":true},"dentist-11":{"width":17,"height":17,"x":168,"y":126,"pixelRatio":1,"visible":true},"doctor-11":{"width":17,"height":17,"x":185,"y":126,"pixelRatio":1,"visible":true},"dog-park-11":{"width":17,"height":17,"x":202,"y":126,"pixelRatio":1,"visible":true},"drinking-water-11":{"width":17,"height":17,"x":219,"y":126,"pixelRatio":1,"visible":true},"embassy-11":{"width":17,"height":17,"x":236,"y":126,"pixelRatio":1,"visible":true},"entrance-11":{"width":17,"height":17,"x":253,"y":126,"pixelRatio":1,"visible":true},"fast-food-11":{"width":17,"height":17,"x":270,"y":126,"pixelRatio":1,"visible":true},"ferry-11":{"width":17,"height":17,"x":287,"y":126,"pixelRatio":1,"visible":true},"fire-station-11":{"width":17,"height":17,"x":304,"y":126,"pixelRatio":1,"visible":true},"fuel-11":{"width":17,"height":17,"x":168,"y":147,"pixelRatio":1,"visible":true},"garden-11":{"width":17,"height":17,"x":185,"y":147,"pixelRatio":1,"visible":true},"golf-11":{"width":17,"height":17,"x":202,"y":147,"pixelRatio":1,"visible":true},"grocery-11":{"width":17,"height":17,"x":219,"y":147,"pixelRatio":1,"visible":true},"harbor-11":{"width":17,"height":17,"x":236,"y":147,"pixelRatio":1,"visible":true},"heliport-11":{"width":17,"height":17,"x":253,"y":147,"pixelRatio":1,"visible":true},"hospital-11":{"width":17,"height":17,"x":270,"y":147,"pixelRatio":1,"visible":true},"ice-cream-11":{"width":17,"height":17,"x":287,"y":147,"pixelRatio":1,"visible":true},"information-11":{"width":17,"height":17,"x":304,"y":147,"pixelRatio":1,"visible":true},"laundry-11":{"width":17,"height":17,"x":0,"y":168,"pixelRatio":1,"visible":true},"library-11":{"width":17,"height":17,"x":17,"y":168,"pixelRatio":1,"visible":true},"lodging-11":{"width":17,"height":17,"x":34,"y":168,"pixelRatio":1,"visible":true},"marker-11":{"width":17,"height":17,"x":51,"y":168,"pixelRatio":1,"visible":true},"monument-11":{"width":17,"height":17,"x":68,"y":168,"pixelRatio":1,"visible":true},"mountain-11":{"width":17,"height":17,"x":85,"y":168,"pixelRatio":1,"visible":true},"museum-11":{"width":17,"height":17,"x":102,"y":168,"pixelRatio":1,"visible":true},"music-11":{"width":17,"height":17,"x":119,"y":168,"pixelRatio":1,"visible":true},"park-11":{"width":17,"height":17,"x":136,"y":168,"pixelRatio":1,"visible":true},"pharmacy-11":{"width":17,"height":17,"x":153,"y":168,"pixelRatio":1,"visible":true},"picnic-site-11":{"width":17,"height":17,"x":170,"y":168,"pixelRatio":1,"visible":true},"place-of-worship-11":{"width":17,"height":17,"x":187,"y":168,"pixelRatio":1,"visible":true},"playground-11":{"width":17,"height":17,"x":204,"y":168,"pixelRatio":1,"visible":true},"police-11":{"width":17,"height":17,"x":221,"y":168,"pixelRatio":1,"visible":true},"post-11":{"width":17,"height":17,"x":238,"y":168,"pixelRatio":1,"visible":true},"prison-11":{"width":17,"height":17,"x":255,"y":168,"pixelRatio":1,"visible":true},"rail-11":{"width":17,"height":17,"x":272,"y":168,"pixelRatio":1,"visible":true},"rail-light-11":{"width":17,"height":17,"x":289,"y":168,"pixelRatio":1,"visible":true},"rail-metro-11":{"width":17,"height":17,"x":306,"y":168,"pixelRatio":1,"visible":true},"religious-christian-11":{"width":17,"height":17,"x":0,"y":185,"pixelRatio":1,"visible":true},"religious-jewish-11":{"width":17,"height":17,"x":17,"y":185,"pixelRatio":1,"visible":true},"religious-muslim-11":{"width":17,"height":17,"x":34,"y":185,"pixelRatio":1,"visible":true},"restaurant-11":{"width":17,"height":17,"x":51,"y":185,"pixelRatio":1,"visible":true},"rocket-11":{"width":17,"height":17,"x":68,"y":185,"pixelRatio":1,"visible":true},"school-11":{"width":17,"height":17,"x":85,"y":185,"pixelRatio":1,"visible":true},"shop-11":{"width":17,"height":17,"x":102,"y":185,"pixelRatio":1,"visible":true},"stadium-11":{"width":17,"height":17,"x":119,"y":185,"pixelRatio":1,"visible":true},"star-11":{"width":17,"height":17,"x":136,"y":185,"pixelRatio":1,"visible":true},"suitcase-11":{"width":17,"height":17,"x":153,"y":185,"pixelRatio":1,"visible":true},"swimming-11":{"width":17,"height":17,"x":170,"y":185,"pixelRatio":1,"visible":true},"theatre-11":{"width":17,"height":17,"x":187,"y":185,"pixelRatio":1,"visible":true},"toilet-11":{"width":17,"height":17,"x":204,"y":185,"pixelRatio":1,"visible":true},"town-hall-11":{"width":17,"height":17,"x":221,"y":185,"pixelRatio":1,"visible":true},"triangle-11":{"width":17,"height":17,"x":238,"y":185,"pixelRatio":1,"visible":true},"triangle-stroked-11":{"width":17,"height":17,"x":255,"y":185,"pixelRatio":1,"visible":true},"veterinary-11":{"width":17,"height":17,"x":272,"y":185,"pixelRatio":1,"visible":true},"volcano-11":{"width":17,"height":17,"x":289,"y":185,"pixelRatio":1,"visible":true},"zoo-11":{"width":17,"height":17,"x":306,"y":185,"pixelRatio":1,"visible":true},"wave":{"width":16,"height":8,"x":320,"y":63,"pixelRatio":1,"visible":true}} \ No newline at end of file diff --git a/rendering/data/styles/bright-v9/sprite.png b/rendering/data/styles/bright-v9/sprite.png new file mode 100644 index 0000000000..083aa800b0 Binary files /dev/null and b/rendering/data/styles/bright-v9/sprite.png differ diff --git a/rendering/data/styles/bright-v9/sprite@2x.json b/rendering/data/styles/bright-v9/sprite@2x.json new file mode 100644 index 0000000000..24158e69f1 --- /dev/null +++ b/rendering/data/styles/bright-v9/sprite@2x.json @@ -0,0 +1 @@ +{"airfield-15":{"width":42,"height":42,"x":0,"y":0,"pixelRatio":2,"visible":true},"airport-15":{"width":42,"height":42,"x":42,"y":0,"pixelRatio":2,"visible":true},"alcohol-shop-15":{"width":42,"height":42,"x":0,"y":42,"pixelRatio":2,"visible":true},"amusement-park-15":{"width":42,"height":42,"x":42,"y":42,"pixelRatio":2,"visible":true},"aquarium-15":{"width":42,"height":42,"x":84,"y":0,"pixelRatio":2,"visible":true},"art-gallery-15":{"width":42,"height":42,"x":126,"y":0,"pixelRatio":2,"visible":true},"attraction-15":{"width":42,"height":42,"x":84,"y":42,"pixelRatio":2,"visible":true},"bakery-15":{"width":42,"height":42,"x":126,"y":42,"pixelRatio":2,"visible":true},"bank-15":{"width":42,"height":42,"x":0,"y":84,"pixelRatio":2,"visible":true},"bar-15":{"width":42,"height":42,"x":42,"y":84,"pixelRatio":2,"visible":true},"beer-15":{"width":42,"height":42,"x":84,"y":84,"pixelRatio":2,"visible":true},"bicycle-15":{"width":42,"height":42,"x":126,"y":84,"pixelRatio":2,"visible":true},"bicycle-share-15":{"width":42,"height":42,"x":0,"y":126,"pixelRatio":2,"visible":true},"bus-15":{"width":42,"height":42,"x":42,"y":126,"pixelRatio":2,"visible":true},"cafe-15":{"width":42,"height":42,"x":84,"y":126,"pixelRatio":2,"visible":true},"campsite-15":{"width":42,"height":42,"x":126,"y":126,"pixelRatio":2,"visible":true},"car-15":{"width":42,"height":42,"x":168,"y":0,"pixelRatio":2,"visible":true},"castle-15":{"width":42,"height":42,"x":210,"y":0,"pixelRatio":2,"visible":true},"cemetery-15":{"width":42,"height":42,"x":252,"y":0,"pixelRatio":2,"visible":true},"cinema-15":{"width":42,"height":42,"x":294,"y":0,"pixelRatio":2,"visible":true},"circle-15":{"width":42,"height":42,"x":168,"y":42,"pixelRatio":2,"visible":true},"circle-stroked-15":{"width":42,"height":42,"x":210,"y":42,"pixelRatio":2,"visible":true},"clothing-store-15":{"width":42,"height":42,"x":252,"y":42,"pixelRatio":2,"visible":true},"college-15":{"width":42,"height":42,"x":294,"y":42,"pixelRatio":2,"visible":true},"dentist-15":{"width":42,"height":42,"x":168,"y":84,"pixelRatio":2,"visible":true},"doctor-15":{"width":42,"height":42,"x":210,"y":84,"pixelRatio":2,"visible":true},"dog-park-15":{"width":42,"height":42,"x":252,"y":84,"pixelRatio":2,"visible":true},"drinking-water-15":{"width":42,"height":42,"x":294,"y":84,"pixelRatio":2,"visible":true},"embassy-15":{"width":42,"height":42,"x":168,"y":126,"pixelRatio":2,"visible":true},"entrance-15":{"width":42,"height":42,"x":210,"y":126,"pixelRatio":2,"visible":true},"fast-food-15":{"width":42,"height":42,"x":252,"y":126,"pixelRatio":2,"visible":true},"ferry-15":{"width":42,"height":42,"x":294,"y":126,"pixelRatio":2,"visible":true},"fire-station-15":{"width":42,"height":42,"x":0,"y":168,"pixelRatio":2,"visible":true},"fuel-15":{"width":42,"height":42,"x":42,"y":168,"pixelRatio":2,"visible":true},"garden-15":{"width":42,"height":42,"x":84,"y":168,"pixelRatio":2,"visible":true},"golf-15":{"width":42,"height":42,"x":126,"y":168,"pixelRatio":2,"visible":true},"grocery-15":{"width":42,"height":42,"x":168,"y":168,"pixelRatio":2,"visible":true},"harbor-15":{"width":42,"height":42,"x":210,"y":168,"pixelRatio":2,"visible":true},"heliport-15":{"width":42,"height":42,"x":252,"y":168,"pixelRatio":2,"visible":true},"hospital-15":{"width":42,"height":42,"x":294,"y":168,"pixelRatio":2,"visible":true},"ice-cream-15":{"width":42,"height":42,"x":0,"y":210,"pixelRatio":2,"visible":true},"information-15":{"width":42,"height":42,"x":42,"y":210,"pixelRatio":2,"visible":true},"laundry-15":{"width":42,"height":42,"x":84,"y":210,"pixelRatio":2,"visible":true},"library-15":{"width":42,"height":42,"x":126,"y":210,"pixelRatio":2,"visible":true},"lodging-15":{"width":42,"height":42,"x":168,"y":210,"pixelRatio":2,"visible":true},"marker-15":{"width":42,"height":42,"x":210,"y":210,"pixelRatio":2,"visible":true},"monument-15":{"width":42,"height":42,"x":252,"y":210,"pixelRatio":2,"visible":true},"mountain-15":{"width":42,"height":42,"x":294,"y":210,"pixelRatio":2,"visible":true},"museum-15":{"width":42,"height":42,"x":0,"y":252,"pixelRatio":2,"visible":true},"music-15":{"width":42,"height":42,"x":42,"y":252,"pixelRatio":2,"visible":true},"park-15":{"width":42,"height":42,"x":84,"y":252,"pixelRatio":2,"visible":true},"pharmacy-15":{"width":42,"height":42,"x":126,"y":252,"pixelRatio":2,"visible":true},"picnic-site-15":{"width":42,"height":42,"x":168,"y":252,"pixelRatio":2,"visible":true},"place-of-worship-15":{"width":42,"height":42,"x":210,"y":252,"pixelRatio":2,"visible":true},"playground-15":{"width":42,"height":42,"x":252,"y":252,"pixelRatio":2,"visible":true},"police-15":{"width":42,"height":42,"x":294,"y":252,"pixelRatio":2,"visible":true},"post-15":{"width":42,"height":42,"x":0,"y":294,"pixelRatio":2,"visible":true},"prison-15":{"width":42,"height":42,"x":42,"y":294,"pixelRatio":2,"visible":true},"rail-15":{"width":42,"height":42,"x":84,"y":294,"pixelRatio":2,"visible":true},"rail-light-15":{"width":42,"height":42,"x":126,"y":294,"pixelRatio":2,"visible":true},"rail-metro-15":{"width":42,"height":42,"x":168,"y":294,"pixelRatio":2,"visible":true},"religious-christian-15":{"width":42,"height":42,"x":210,"y":294,"pixelRatio":2,"visible":true},"religious-jewish-15":{"width":42,"height":42,"x":252,"y":294,"pixelRatio":2,"visible":true},"religious-muslim-15":{"width":42,"height":42,"x":294,"y":294,"pixelRatio":2,"visible":true},"restaurant-15":{"width":42,"height":42,"x":336,"y":0,"pixelRatio":2,"visible":true},"rocket-15":{"width":42,"height":42,"x":378,"y":0,"pixelRatio":2,"visible":true},"school-15":{"width":42,"height":42,"x":420,"y":0,"pixelRatio":2,"visible":true},"shop-15":{"width":42,"height":42,"x":462,"y":0,"pixelRatio":2,"visible":true},"stadium-15":{"width":42,"height":42,"x":504,"y":0,"pixelRatio":2,"visible":true},"star-15":{"width":42,"height":42,"x":546,"y":0,"pixelRatio":2,"visible":true},"suitcase-15":{"width":42,"height":42,"x":588,"y":0,"pixelRatio":2,"visible":true},"swimming-15":{"width":42,"height":42,"x":630,"y":0,"pixelRatio":2,"visible":true},"theatre-15":{"width":42,"height":42,"x":336,"y":42,"pixelRatio":2,"visible":true},"toilet-15":{"width":42,"height":42,"x":378,"y":42,"pixelRatio":2,"visible":true},"town-hall-15":{"width":42,"height":42,"x":420,"y":42,"pixelRatio":2,"visible":true},"triangle-15":{"width":42,"height":42,"x":462,"y":42,"pixelRatio":2,"visible":true},"triangle-stroked-15":{"width":42,"height":42,"x":504,"y":42,"pixelRatio":2,"visible":true},"veterinary-15":{"width":42,"height":42,"x":546,"y":42,"pixelRatio":2,"visible":true},"volcano-15":{"width":42,"height":42,"x":588,"y":42,"pixelRatio":2,"visible":true},"zoo-15":{"width":42,"height":42,"x":630,"y":42,"pixelRatio":2,"visible":true},"motorway_1":{"width":36,"height":36,"x":336,"y":84,"pixelRatio":2,"visible":true},"motorway_2":{"width":50,"height":36,"x":372,"y":84,"pixelRatio":2,"visible":true},"motorway_3":{"width":64,"height":36,"x":422,"y":84,"pixelRatio":2,"visible":true},"motorway_4":{"width":78,"height":36,"x":486,"y":84,"pixelRatio":2,"visible":true},"motorway_5":{"width":90,"height":36,"x":564,"y":84,"pixelRatio":2,"visible":true},"motorway_6":{"width":100,"height":36,"x":336,"y":126,"pixelRatio":2,"visible":true},"airfield-11":{"width":34,"height":34,"x":436,"y":126,"pixelRatio":2,"visible":true},"airport-11":{"width":34,"height":34,"x":470,"y":126,"pixelRatio":2,"visible":true},"alcohol-shop-11":{"width":34,"height":34,"x":504,"y":126,"pixelRatio":2,"visible":true},"amusement-park-11":{"width":34,"height":34,"x":538,"y":126,"pixelRatio":2,"visible":true},"aquarium-11":{"width":34,"height":34,"x":572,"y":126,"pixelRatio":2,"visible":true},"art-gallery-11":{"width":34,"height":34,"x":606,"y":126,"pixelRatio":2,"visible":true},"attraction-11":{"width":34,"height":34,"x":336,"y":168,"pixelRatio":2,"visible":true},"bakery-11":{"width":34,"height":34,"x":370,"y":168,"pixelRatio":2,"visible":true},"bank-11":{"width":34,"height":34,"x":404,"y":168,"pixelRatio":2,"visible":true},"bar-11":{"width":34,"height":34,"x":438,"y":168,"pixelRatio":2,"visible":true},"beer-11":{"width":34,"height":34,"x":472,"y":168,"pixelRatio":2,"visible":true},"bicycle-11":{"width":34,"height":34,"x":506,"y":168,"pixelRatio":2,"visible":true},"bicycle-share-11":{"width":34,"height":34,"x":540,"y":168,"pixelRatio":2,"visible":true},"bus-11":{"width":34,"height":34,"x":574,"y":168,"pixelRatio":2,"visible":true},"cafe-11":{"width":34,"height":34,"x":608,"y":168,"pixelRatio":2,"visible":true},"campsite-11":{"width":34,"height":34,"x":336,"y":210,"pixelRatio":2,"visible":true},"car-11":{"width":34,"height":34,"x":370,"y":210,"pixelRatio":2,"visible":true},"castle-11":{"width":34,"height":34,"x":404,"y":210,"pixelRatio":2,"visible":true},"cemetery-11":{"width":34,"height":34,"x":438,"y":210,"pixelRatio":2,"visible":true},"cinema-11":{"width":34,"height":34,"x":472,"y":210,"pixelRatio":2,"visible":true},"circle-11":{"width":34,"height":34,"x":506,"y":210,"pixelRatio":2,"visible":true},"circle-stroked-11":{"width":34,"height":34,"x":540,"y":210,"pixelRatio":2,"visible":true},"clothing-store-11":{"width":34,"height":34,"x":574,"y":210,"pixelRatio":2,"visible":true},"college-11":{"width":34,"height":34,"x":608,"y":210,"pixelRatio":2,"visible":true},"dentist-11":{"width":34,"height":34,"x":336,"y":252,"pixelRatio":2,"visible":true},"doctor-11":{"width":34,"height":34,"x":370,"y":252,"pixelRatio":2,"visible":true},"dog-park-11":{"width":34,"height":34,"x":404,"y":252,"pixelRatio":2,"visible":true},"drinking-water-11":{"width":34,"height":34,"x":438,"y":252,"pixelRatio":2,"visible":true},"embassy-11":{"width":34,"height":34,"x":472,"y":252,"pixelRatio":2,"visible":true},"entrance-11":{"width":34,"height":34,"x":506,"y":252,"pixelRatio":2,"visible":true},"fast-food-11":{"width":34,"height":34,"x":540,"y":252,"pixelRatio":2,"visible":true},"ferry-11":{"width":34,"height":34,"x":574,"y":252,"pixelRatio":2,"visible":true},"fire-station-11":{"width":34,"height":34,"x":608,"y":252,"pixelRatio":2,"visible":true},"fuel-11":{"width":34,"height":34,"x":336,"y":294,"pixelRatio":2,"visible":true},"garden-11":{"width":34,"height":34,"x":370,"y":294,"pixelRatio":2,"visible":true},"golf-11":{"width":34,"height":34,"x":404,"y":294,"pixelRatio":2,"visible":true},"grocery-11":{"width":34,"height":34,"x":438,"y":294,"pixelRatio":2,"visible":true},"harbor-11":{"width":34,"height":34,"x":472,"y":294,"pixelRatio":2,"visible":true},"heliport-11":{"width":34,"height":34,"x":506,"y":294,"pixelRatio":2,"visible":true},"hospital-11":{"width":34,"height":34,"x":540,"y":294,"pixelRatio":2,"visible":true},"ice-cream-11":{"width":34,"height":34,"x":574,"y":294,"pixelRatio":2,"visible":true},"information-11":{"width":34,"height":34,"x":608,"y":294,"pixelRatio":2,"visible":true},"laundry-11":{"width":34,"height":34,"x":0,"y":336,"pixelRatio":2,"visible":true},"library-11":{"width":34,"height":34,"x":34,"y":336,"pixelRatio":2,"visible":true},"lodging-11":{"width":34,"height":34,"x":68,"y":336,"pixelRatio":2,"visible":true},"marker-11":{"width":34,"height":34,"x":102,"y":336,"pixelRatio":2,"visible":true},"monument-11":{"width":34,"height":34,"x":136,"y":336,"pixelRatio":2,"visible":true},"mountain-11":{"width":34,"height":34,"x":170,"y":336,"pixelRatio":2,"visible":true},"museum-11":{"width":34,"height":34,"x":204,"y":336,"pixelRatio":2,"visible":true},"music-11":{"width":34,"height":34,"x":238,"y":336,"pixelRatio":2,"visible":true},"park-11":{"width":34,"height":34,"x":272,"y":336,"pixelRatio":2,"visible":true},"pharmacy-11":{"width":34,"height":34,"x":306,"y":336,"pixelRatio":2,"visible":true},"picnic-site-11":{"width":34,"height":34,"x":340,"y":336,"pixelRatio":2,"visible":true},"place-of-worship-11":{"width":34,"height":34,"x":374,"y":336,"pixelRatio":2,"visible":true},"playground-11":{"width":34,"height":34,"x":408,"y":336,"pixelRatio":2,"visible":true},"police-11":{"width":34,"height":34,"x":442,"y":336,"pixelRatio":2,"visible":true},"post-11":{"width":34,"height":34,"x":476,"y":336,"pixelRatio":2,"visible":true},"prison-11":{"width":34,"height":34,"x":510,"y":336,"pixelRatio":2,"visible":true},"rail-11":{"width":34,"height":34,"x":544,"y":336,"pixelRatio":2,"visible":true},"rail-light-11":{"width":34,"height":34,"x":578,"y":336,"pixelRatio":2,"visible":true},"rail-metro-11":{"width":34,"height":34,"x":612,"y":336,"pixelRatio":2,"visible":true},"religious-christian-11":{"width":34,"height":34,"x":0,"y":370,"pixelRatio":2,"visible":true},"religious-jewish-11":{"width":34,"height":34,"x":34,"y":370,"pixelRatio":2,"visible":true},"religious-muslim-11":{"width":34,"height":34,"x":68,"y":370,"pixelRatio":2,"visible":true},"restaurant-11":{"width":34,"height":34,"x":102,"y":370,"pixelRatio":2,"visible":true},"rocket-11":{"width":34,"height":34,"x":136,"y":370,"pixelRatio":2,"visible":true},"school-11":{"width":34,"height":34,"x":170,"y":370,"pixelRatio":2,"visible":true},"shop-11":{"width":34,"height":34,"x":204,"y":370,"pixelRatio":2,"visible":true},"stadium-11":{"width":34,"height":34,"x":238,"y":370,"pixelRatio":2,"visible":true},"star-11":{"width":34,"height":34,"x":272,"y":370,"pixelRatio":2,"visible":true},"suitcase-11":{"width":34,"height":34,"x":306,"y":370,"pixelRatio":2,"visible":true},"swimming-11":{"width":34,"height":34,"x":340,"y":370,"pixelRatio":2,"visible":true},"theatre-11":{"width":34,"height":34,"x":374,"y":370,"pixelRatio":2,"visible":true},"toilet-11":{"width":34,"height":34,"x":408,"y":370,"pixelRatio":2,"visible":true},"town-hall-11":{"width":34,"height":34,"x":442,"y":370,"pixelRatio":2,"visible":true},"triangle-11":{"width":34,"height":34,"x":476,"y":370,"pixelRatio":2,"visible":true},"triangle-stroked-11":{"width":34,"height":34,"x":510,"y":370,"pixelRatio":2,"visible":true},"veterinary-11":{"width":34,"height":34,"x":544,"y":370,"pixelRatio":2,"visible":true},"volcano-11":{"width":34,"height":34,"x":578,"y":370,"pixelRatio":2,"visible":true},"zoo-11":{"width":34,"height":34,"x":612,"y":370,"pixelRatio":2,"visible":true},"wave":{"width":32,"height":16,"x":640,"y":126,"pixelRatio":2,"visible":true}} \ No newline at end of file diff --git a/rendering/data/styles/bright-v9/sprite@2x.png b/rendering/data/styles/bright-v9/sprite@2x.png new file mode 100644 index 0000000000..51d939aa33 Binary files /dev/null and b/rendering/data/styles/bright-v9/sprite@2x.png differ diff --git a/rendering/data/styles/bright-v9/style.json b/rendering/data/styles/bright-v9/style.json new file mode 100644 index 0000000000..c6a6efb3ec --- /dev/null +++ b/rendering/data/styles/bright-v9/style.json @@ -0,0 +1,4035 @@ +{ + "version": 8, + "name": "Bright", + "metadata": { + "mapbox:autocomposite": true, + "mapbox:type": "template", + "mapbox:groups": { + "1444849364238.8171": { + "name": "Buildings", + "collapsed": true + }, + "1444849354174.1904": { + "name": "Tunnels", + "collapsed": true + }, + "1444849320558.5054": { + "name": "Water labels", + "collapsed": true + }, + "1444849371739.5945": { + "name": "Aeroways", + "collapsed": true + }, + "1444849258897.3083": { + "name": "Marine labels", + "collapsed": true + }, + "1444849388993.3071": { + "name": "Landuse", + "collapsed": true + }, + "1444849242106.713": { + "name": "Country labels", + "collapsed": true + }, + "1444849382550.77": { + "name": "Water", + "collapsed": true + }, + "1444849345966.4436": { + "name": "Roads", + "collapsed": true + }, + "1444849307123.581": { + "name": "Admin lines", + "collapsed": true + }, + "1456163609504.0715": { + "name": "Road labels", + "collapsed": true + }, + "1444849272561.29": { + "name": "Place labels", + "collapsed": true + }, + "1444849290021.1838": { + "name": "Road labels", + "collapsed": true + }, + "1444849334699.1902": { + "name": "Bridges", + "collapsed": true + }, + "1444849297111.495": { + "name": "POI labels", + "collapsed": true + } + } + }, + "sources": { + "mapbox": { + "url": "/data/styles/bright-v9/mapbox-streets-v7/{z}/{x}/{y}.vector.pbf", + "type": "vector" + } + }, + "center": [ + -118.2518, + 34.0442 + ], + "zoom": 15, + "sprite": "/data/styles/bright-v9/sprite", + "glyphs": "/data/styles/bright-v9/fonts/mapbox/{fontstack}/{range}.pbf", + "layers": [ + { + "id": "background", + "type": "background", + "paint": { + "background-color": "#f8f4f0" + }, + "interactive": true + }, + { + "id": "landuse_overlay_national_park", + "type": "fill", + "source": "mapbox", + "source-layer": "landuse_overlay", + "filter": [ + "==", + "class", + "national_park" + ], + "paint": { + "fill-color": "#d8e8c8", + "fill-opacity": 0.75 + }, + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "interactive": true + }, + { + "id": "landuse_park", + "type": "fill", + "source": "mapbox", + "source-layer": "landuse", + "filter": [ + "==", + "class", + "park" + ], + "paint": { + "fill-color": "#d8e8c8" + }, + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "interactive": true + }, + { + "id": "landuse_cemetery", + "type": "fill", + "source": "mapbox", + "source-layer": "landuse", + "filter": [ + "==", + "class", + "cemetery" + ], + "paint": { + "fill-color": "#e0e4dd" + }, + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "interactive": true + }, + { + "id": "landuse_hospital", + "type": "fill", + "source": "mapbox", + "source-layer": "landuse", + "filter": [ + "==", + "class", + "hospital" + ], + "paint": { + "fill-color": "#fde" + }, + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "interactive": true + }, + { + "id": "landuse_school", + "type": "fill", + "source": "mapbox", + "source-layer": "landuse", + "filter": [ + "==", + "class", + "school" + ], + "paint": { + "fill-color": "#f0e8f8" + }, + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "interactive": true + }, + { + "id": "landuse_wood", + "type": "fill", + "source": "mapbox", + "source-layer": "landuse", + "filter": [ + "==", + "class", + "wood" + ], + "paint": { + "fill-color": "#6a4", + "fill-opacity": 0.1 + }, + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "interactive": true + }, + { + "interactive": true, + "layout": { + "line-cap": "round" + }, + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "filter": [ + "all", + [ + "!=", + "class", + "river" + ], + [ + "!=", + "class", + "stream" + ], + [ + "!=", + "class", + "canal" + ] + ], + "type": "line", + "source": "mapbox", + "id": "waterway", + "paint": { + "line-color": "#a0c8f0", + "line-width": { + "base": 1.3, + "stops": [ + [ + 13, + 0.5 + ], + [ + 20, + 2 + ] + ] + } + }, + "source-layer": "waterway" + }, + { + "interactive": true, + "layout": { + "line-cap": "round" + }, + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "filter": [ + "==", + "class", + "river" + ], + "type": "line", + "source": "mapbox", + "id": "waterway_river", + "paint": { + "line-color": "#a0c8f0", + "line-width": { + "base": 1.2, + "stops": [ + [ + 11, + 0.5 + ], + [ + 20, + 6 + ] + ] + } + }, + "source-layer": "waterway" + }, + { + "interactive": true, + "layout": { + "line-cap": "round" + }, + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "filter": [ + "in", + "class", + "stream", + "canal" + ], + "type": "line", + "source": "mapbox", + "id": "waterway_stream_canal", + "paint": { + "line-color": "#a0c8f0", + "line-width": { + "base": 1.3, + "stops": [ + [ + 13, + 0.5 + ], + [ + 20, + 6 + ] + ] + } + }, + "source-layer": "waterway" + }, + { + "id": "water", + "type": "fill", + "source": "mapbox", + "source-layer": "water", + "paint": { + "fill-color": "#a0c8f0" + }, + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "interactive": true + }, + { + "id": "water_offset", + "paint": { + "fill-color": "white", + "fill-opacity": 0.3, + "fill-translate": [ + 0, + 2.5 + ] + }, + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "interactive": true, + "ref": "water" + }, + { + "id": "water_pattern", + "paint": { + "fill-translate": [ + 0, + 2.5 + ], + "fill-pattern": "wave" + }, + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "interactive": true, + "ref": "water" + }, + { + "interactive": true, + "minzoom": 11, + "metadata": { + "mapbox:group": "1444849371739.5945" + }, + "filter": [ + "==", + "$type", + "Polygon" + ], + "type": "fill", + "source": "mapbox", + "id": "aeroway_fill", + "paint": { + "fill-color": "#f0ede9", + "fill-opacity": 0.7 + }, + "source-layer": "aeroway" + }, + { + "interactive": true, + "minzoom": 11, + "metadata": { + "mapbox:group": "1444849371739.5945" + }, + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "==", + "type", + "runway" + ] + ], + "type": "line", + "source": "mapbox", + "id": "aeroway_runway", + "paint": { + "line-color": "#f0ede9", + "line-width": { + "base": 1.2, + "stops": [ + [ + 11, + 3 + ], + [ + 20, + 16 + ] + ] + } + }, + "source-layer": "aeroway" + }, + { + "interactive": true, + "minzoom": 11, + "metadata": { + "mapbox:group": "1444849371739.5945" + }, + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "==", + "type", + "taxiway" + ] + ], + "type": "line", + "source": "mapbox", + "id": "aeroway_taxiway", + "paint": { + "line-color": "#f0ede9", + "line-width": { + "base": 1.2, + "stops": [ + [ + 11, + 0.5 + ], + [ + 20, + 6 + ] + ] + } + }, + "source-layer": "aeroway" + }, + { + "id": "building", + "type": "fill", + "source": "mapbox", + "source-layer": "building", + "paint": { + "fill-color": { + "base": 1, + "stops": [ + [ + 15.5, + "#f2eae2" + ], + [ + 16, + "#dfdbd7" + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849364238.8171" + }, + "interactive": true + }, + { + "id": "building_top", + "paint": { + "fill-color": "#f2eae2", + "fill-opacity": { + "base": 1, + "stops": [ + [ + 15, + 0 + ], + [ + 16, + 1 + ] + ] + }, + "fill-translate": { + "stops": [ + [ + 15, + [ + 0, + 0 + ] + ], + [ + 16, + [ + -2, + -2 + ] + ] + ], + "base": 1 + }, + "fill-outline-color": "#dfdbd7" + }, + "metadata": { + "mapbox:group": "1444849364238.8171" + }, + "interactive": true, + "ref": "building" + }, + { + "interactive": true, + "layout": { + "line-join": "round", + "visibility": "visible" + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "filter": [ + "all", + [ + "==", + "structure", + "tunnel" + ], + [ + "==", + "class", + "motorway_link" + ] + ], + "type": "line", + "source": "mapbox", + "id": "tunnel_motorway_link_casing", + "paint": { + "line-color": "#e9ac77", + "line-dasharray": [ + 0.5, + 0.25 + ], + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 1 + ], + [ + 13, + 3 + ], + [ + 14, + 4 + ], + [ + 20, + 15 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "filter": [ + "all", + [ + "==", + "structure", + "tunnel" + ], + [ + "in", + "class", + "service", + "track" + ] + ], + "type": "line", + "source": "mapbox", + "id": "tunnel_service_track_casing", + "paint": { + "line-color": "#cfcdca", + "line-dasharray": [ + 0.5, + 0.25 + ], + "line-width": { + "base": 1.2, + "stops": [ + [ + 15, + 1 + ], + [ + 16, + 4 + ], + [ + 20, + 11 + ] + ] + } + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "filter": [ + "all", + [ + "==", + "structure", + "tunnel" + ], + [ + "==", + "class", + "link" + ] + ], + "type": "line", + "source": "mapbox", + "id": "tunnel_link_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 1 + ], + [ + 13, + 3 + ], + [ + 14, + 4 + ], + [ + 20, + 15 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "filter": [ + "all", + [ + "==", + "structure", + "tunnel" + ], + [ + "in", + "class", + "street", + "street_limited" + ] + ], + "type": "line", + "source": "mapbox", + "id": "tunnel_street_casing", + "paint": { + "line-color": "#cfcdca", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 0.5 + ], + [ + 13, + 1 + ], + [ + 14, + 4 + ], + [ + 20, + 15 + ] + ] + }, + "line-opacity": { + "stops": [ + [ + 12, + 0 + ], + [ + 12.5, + 1 + ] + ] + } + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "filter": [ + "all", + [ + "==", + "structure", + "tunnel" + ], + [ + "in", + "class", + "secondary", + "tertiary" + ] + ], + "type": "line", + "source": "mapbox", + "id": "tunnel_secondary_tertiary_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 8, + 1.5 + ], + [ + 20, + 17 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "filter": [ + "all", + [ + "==", + "structure", + "tunnel" + ], + [ + "in", + "class", + "trunk", + "primary" + ] + ], + "type": "line", + "source": "mapbox", + "id": "tunnel_trunk_primary_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 5, + 0.4 + ], + [ + 6, + 0.6 + ], + [ + 7, + 1.5 + ], + [ + 20, + 22 + ] + ] + } + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round", + "visibility": "visible" + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "filter": [ + "all", + [ + "==", + "structure", + "tunnel" + ], + [ + "==", + "class", + "motorway" + ] + ], + "type": "line", + "source": "mapbox", + "id": "tunnel_motorway_casing", + "paint": { + "line-color": "#e9ac77", + "line-dasharray": [ + 0.5, + 0.25 + ], + "line-width": { + "base": 1.2, + "stops": [ + [ + 5, + 0.4 + ], + [ + 6, + 0.6 + ], + [ + 7, + 1.5 + ], + [ + 20, + 22 + ] + ] + } + }, + "source-layer": "road" + }, + { + "id": "tunnel_path_pedestrian", + "type": "line", + "source": "mapbox", + "source-layer": "road", + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "all", + [ + "==", + "structure", + "tunnel" + ], + [ + "in", + "class", + "path", + "pedestrian" + ] + ] + ], + "paint": { + "line-color": "#cba", + "line-dasharray": [ + 1.5, + 0.75 + ], + "line-width": { + "base": 1.2, + "stops": [ + [ + 15, + 1.2 + ], + [ + 20, + 4 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "interactive": true + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "id": "tunnel_motorway_link", + "paint": { + "line-color": "#fc8", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12.5, + 0 + ], + [ + 13, + 1.5 + ], + [ + 14, + 2.5 + ], + [ + 20, + 11.5 + ] + ] + } + }, + "ref": "tunnel_motorway_link_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "id": "tunnel_service_track", + "paint": { + "line-color": "#fff", + "line-width": { + "base": 1.2, + "stops": [ + [ + 15.5, + 0 + ], + [ + 16, + 2 + ], + [ + 20, + 7.5 + ] + ] + } + }, + "ref": "tunnel_service_track_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "id": "tunnel_link", + "paint": { + "line-color": "#fff4c6", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12.5, + 0 + ], + [ + 13, + 1.5 + ], + [ + 14, + 2.5 + ], + [ + 20, + 11.5 + ] + ] + } + }, + "ref": "tunnel_link_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "id": "tunnel_street", + "paint": { + "line-color": "#fff", + "line-width": { + "base": 1.2, + "stops": [ + [ + 13.5, + 0 + ], + [ + 14, + 2.5 + ], + [ + 20, + 11.5 + ] + ] + }, + "line-opacity": 1 + }, + "ref": "tunnel_street_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "id": "tunnel_secondary_tertiary", + "paint": { + "line-color": "#fff4c6", + "line-width": { + "base": 1.2, + "stops": [ + [ + 6.5, + 0 + ], + [ + 7, + 0.5 + ], + [ + 20, + 10 + ] + ] + } + }, + "ref": "tunnel_secondary_tertiary_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "id": "tunnel_trunk_primary", + "paint": { + "line-color": "#fff4c6", + "line-width": { + "base": 1.2, + "stops": [ + [ + 6.5, + 0 + ], + [ + 7, + 0.5 + ], + [ + 20, + 18 + ] + ] + } + }, + "ref": "tunnel_trunk_primary_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "id": "tunnel_motorway", + "paint": { + "line-color": "#ffdaa6", + "line-width": { + "base": 1.2, + "stops": [ + [ + 6.5, + 0 + ], + [ + 7, + 0.5 + ], + [ + 20, + 18 + ] + ] + } + }, + "ref": "tunnel_motorway_casing" + }, + { + "id": "tunnel_major_rail", + "type": "line", + "source": "mapbox", + "source-layer": "road", + "filter": [ + "all", + [ + "==", + "structure", + "tunnel" + ], + [ + "in", + "class", + "major_rail", + "minor_rail" + ] + ], + "paint": { + "line-color": "#bbb", + "line-width": { + "base": 1.4, + "stops": [ + [ + 14, + 0.4 + ], + [ + 15, + 0.75 + ], + [ + 20, + 2 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "interactive": true + }, + { + "id": "tunnel_major_rail_hatching", + "paint": { + "line-color": "#bbb", + "line-dasharray": [ + 0.2, + 8 + ], + "line-width": { + "base": 1.4, + "stops": [ + [ + 14.5, + 0 + ], + [ + 15, + 3 + ], + [ + 20, + 8 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849354174.1904" + }, + "interactive": true, + "ref": "tunnel_major_rail" + }, + { + "interactive": true, + "minzoom": 12, + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "filter": [ + "all", + [ + "==", + "class", + "motorway_link" + ], + [ + "!in", + "structure", + "bridge", + "tunnel" + ] + ], + "type": "line", + "source": "mapbox", + "id": "road_motorway_link_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 1 + ], + [ + 13, + 3 + ], + [ + 14, + 4 + ], + [ + 20, + 15 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "filter": [ + "all", + [ + "in", + "class", + "service", + "track" + ], + [ + "!in", + "structure", + "bridge", + "tunnel" + ] + ], + "type": "line", + "source": "mapbox", + "id": "road_service_track_casing", + "paint": { + "line-color": "#cfcdca", + "line-width": { + "base": 1.2, + "stops": [ + [ + 15, + 1 + ], + [ + 16, + 4 + ], + [ + 20, + 11 + ] + ] + } + }, + "source-layer": "road" + }, + { + "interactive": true, + "minzoom": 13, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "filter": [ + "all", + [ + "==", + "class", + "link" + ], + [ + "!in", + "structure", + "bridge", + "tunnel" + ] + ], + "type": "line", + "source": "mapbox", + "id": "road_link_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 1 + ], + [ + 13, + 3 + ], + [ + 14, + 4 + ], + [ + 20, + 15 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "all", + [ + "in", + "class", + "street", + "street_limited" + ], + [ + "!in", + "structure", + "bridge", + "tunnel" + ] + ] + ], + "type": "line", + "source": "mapbox", + "id": "road_street_casing", + "paint": { + "line-color": "#cfcdca", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 0.5 + ], + [ + 13, + 1 + ], + [ + 14, + 4 + ], + [ + 20, + 15 + ] + ] + }, + "line-opacity": { + "stops": [ + [ + 12, + 0 + ], + [ + 12.5, + 1 + ] + ] + } + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "filter": [ + "all", + [ + "in", + "class", + "secondary", + "tertiary" + ], + [ + "!in", + "structure", + "bridge", + "tunnel" + ] + ], + "type": "line", + "source": "mapbox", + "id": "road_secondary_tertiary_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 8, + 1.5 + ], + [ + 20, + 17 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "filter": [ + "all", + [ + "in", + "class", + "trunk", + "primary" + ], + [ + "!in", + "structure", + "bridge", + "tunnel" + ] + ], + "type": "line", + "source": "mapbox", + "id": "road_trunk_primary_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 5, + 0.4 + ], + [ + 6, + 0.6 + ], + [ + 7, + 1.5 + ], + [ + 20, + 22 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "minzoom": 5, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "filter": [ + "all", + [ + "==", + "class", + "motorway" + ], + [ + "!in", + "structure", + "bridge", + "tunnel" + ] + ], + "type": "line", + "source": "mapbox", + "id": "road_motorway_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 5, + 0.4 + ], + [ + 6, + 0.6 + ], + [ + 7, + 1.5 + ], + [ + 20, + 22 + ] + ] + } + }, + "source-layer": "road" + }, + { + "id": "road_path_pedestrian", + "type": "line", + "source": "mapbox", + "source-layer": "road", + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "all", + [ + "in", + "class", + "path", + "pedestrian" + ], + [ + "!in", + "structure", + "bridge", + "tunnel" + ] + ] + ], + "paint": { + "line-color": "#cba", + "line-dasharray": [ + 1.5, + 0.75 + ], + "line-width": { + "base": 1.2, + "stops": [ + [ + 15, + 1.2 + ], + [ + 20, + 4 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "interactive": true + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "id": "road_motorway_link", + "paint": { + "line-color": "#fc8", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12.5, + 0 + ], + [ + 13, + 1.5 + ], + [ + 14, + 2.5 + ], + [ + 20, + 11.5 + ] + ] + } + }, + "ref": "road_motorway_link_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "id": "road_service_track", + "paint": { + "line-color": "#fff", + "line-width": { + "base": 1.2, + "stops": [ + [ + 15.5, + 0 + ], + [ + 16, + 2 + ], + [ + 20, + 7.5 + ] + ] + } + }, + "ref": "road_service_track_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "id": "road_link", + "paint": { + "line-color": "#fea", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12.5, + 0 + ], + [ + 13, + 1.5 + ], + [ + 14, + 2.5 + ], + [ + 20, + 11.5 + ] + ] + } + }, + "ref": "road_link_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "id": "road_street", + "paint": { + "line-color": "#fff", + "line-width": { + "base": 1.2, + "stops": [ + [ + 13.5, + 0 + ], + [ + 14, + 2.5 + ], + [ + 20, + 11.5 + ] + ] + }, + "line-opacity": 1 + }, + "ref": "road_street_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "id": "road_secondary_tertiary", + "paint": { + "line-color": "#fea", + "line-width": { + "base": 1.2, + "stops": [ + [ + 6.5, + 0 + ], + [ + 8, + 0.5 + ], + [ + 20, + 13 + ] + ] + } + }, + "ref": "road_secondary_tertiary_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "id": "road_trunk_primary", + "paint": { + "line-color": "#fea", + "line-width": { + "base": 1.2, + "stops": [ + [ + 6.5, + 0 + ], + [ + 7, + 0.5 + ], + [ + 20, + 18 + ] + ] + } + }, + "ref": "road_trunk_primary_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "id": "road_motorway", + "paint": { + "line-color": "#fc8", + "line-width": { + "base": 1.2, + "stops": [ + [ + 6.5, + 0 + ], + [ + 7, + 0.5 + ], + [ + 20, + 18 + ] + ] + } + }, + "ref": "road_motorway_casing" + }, + { + "id": "road_major_rail", + "type": "line", + "source": "mapbox", + "source-layer": "road", + "filter": [ + "all", + [ + "==", + "class", + "major_rail" + ], + [ + "!in", + "structure", + "bridge", + "tunnel" + ] + ], + "paint": { + "line-color": "#bbb", + "line-width": { + "base": 1.4, + "stops": [ + [ + 14, + 0.4 + ], + [ + 15, + 0.75 + ], + [ + 20, + 2 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "interactive": true + }, + { + "id": "road_major_rail_hatching", + "paint": { + "line-color": "#bbb", + "line-dasharray": [ + 0.2, + 8 + ], + "line-width": { + "base": 1.4, + "stops": [ + [ + 14.5, + 0 + ], + [ + 15, + 3 + ], + [ + 20, + 8 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "interactive": true, + "ref": "road_major_rail" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "filter": [ + "all", + [ + "==", + "structure", + "bridge" + ], + [ + "==", + "class", + "motorway_link" + ] + ], + "type": "line", + "source": "mapbox", + "id": "bridge_motorway_link_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 1 + ], + [ + 13, + 3 + ], + [ + 14, + 4 + ], + [ + 20, + 15 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "filter": [ + "all", + [ + "==", + "structure", + "bridge" + ], + [ + "in", + "class", + "service", + "track" + ] + ], + "type": "line", + "source": "mapbox", + "id": "bridge_service_track_casing", + "paint": { + "line-color": "#cfcdca", + "line-width": { + "base": 1.2, + "stops": [ + [ + 15, + 1 + ], + [ + 16, + 4 + ], + [ + 20, + 11 + ] + ] + } + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "filter": [ + "all", + [ + "==", + "structure", + "bridge" + ], + [ + "==", + "class", + "link" + ] + ], + "type": "line", + "source": "mapbox", + "id": "bridge_link_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 1 + ], + [ + 13, + 3 + ], + [ + 14, + 4 + ], + [ + 20, + 15 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "filter": [ + "all", + [ + "==", + "structure", + "bridge" + ], + [ + "in", + "class", + "street", + "street_limited" + ] + ], + "type": "line", + "source": "mapbox", + "id": "bridge_street_casing", + "paint": { + "line-color": "#cfcdca", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 0.5 + ], + [ + 13, + 1 + ], + [ + 14, + 4 + ], + [ + 20, + 15 + ] + ] + }, + "line-opacity": { + "stops": [ + [ + 12, + 0 + ], + [ + 12.5, + 1 + ] + ] + } + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "filter": [ + "all", + [ + "==", + "structure", + "bridge" + ], + [ + "in", + "class", + "secondary", + "tertiary" + ] + ], + "type": "line", + "source": "mapbox", + "id": "bridge_secondary_tertiary_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 8, + 1.5 + ], + [ + 20, + 17 + ] + ] + }, + "line-opacity": 1 + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "filter": [ + "all", + [ + "==", + "structure", + "bridge" + ], + [ + "in", + "class", + "trunk", + "primary" + ] + ], + "type": "line", + "source": "mapbox", + "id": "bridge_trunk_primary_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 5, + 0.4 + ], + [ + 6, + 0.6 + ], + [ + 7, + 1.5 + ], + [ + 20, + 22 + ] + ] + } + }, + "source-layer": "road" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "filter": [ + "all", + [ + "==", + "structure", + "bridge" + ], + [ + "==", + "class", + "motorway" + ] + ], + "type": "line", + "source": "mapbox", + "id": "bridge_motorway_casing", + "paint": { + "line-color": "#e9ac77", + "line-width": { + "base": 1.2, + "stops": [ + [ + 5, + 0.4 + ], + [ + 6, + 0.6 + ], + [ + 7, + 1.5 + ], + [ + 20, + 22 + ] + ] + } + }, + "source-layer": "road" + }, + { + "id": "bridge_path_pedestrian", + "type": "line", + "source": "mapbox", + "source-layer": "road", + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "all", + [ + "==", + "structure", + "bridge" + ], + [ + "in", + "class", + "path", + "pedestrian" + ] + ] + ], + "paint": { + "line-color": "#cba", + "line-dasharray": [ + 1.5, + 0.75 + ], + "line-width": { + "base": 1.2, + "stops": [ + [ + 15, + 1.2 + ], + [ + 20, + 4 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "interactive": true + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "id": "bridge_motorway_link", + "paint": { + "line-color": "#fc8", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12.5, + 0 + ], + [ + 13, + 1.5 + ], + [ + 14, + 2.5 + ], + [ + 20, + 11.5 + ] + ] + } + }, + "ref": "bridge_motorway_link_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "id": "bridge_service_track", + "paint": { + "line-color": "#fff", + "line-width": { + "base": 1.2, + "stops": [ + [ + 15.5, + 0 + ], + [ + 16, + 2 + ], + [ + 20, + 7.5 + ] + ] + } + }, + "ref": "bridge_service_track_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "id": "bridge_link", + "paint": { + "line-color": "#fea", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12.5, + 0 + ], + [ + 13, + 1.5 + ], + [ + 14, + 2.5 + ], + [ + 20, + 11.5 + ] + ] + } + }, + "ref": "bridge_link_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "id": "bridge_street", + "paint": { + "line-color": "#fff", + "line-width": { + "base": 1.2, + "stops": [ + [ + 13.5, + 0 + ], + [ + 14, + 2.5 + ], + [ + 20, + 11.5 + ] + ] + }, + "line-opacity": 1 + }, + "ref": "bridge_street_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "id": "bridge_secondary_tertiary", + "paint": { + "line-color": "#fea", + "line-width": { + "base": 1.2, + "stops": [ + [ + 6.5, + 0 + ], + [ + 7, + 0.5 + ], + [ + 20, + 10 + ] + ] + } + }, + "ref": "bridge_secondary_tertiary_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "id": "bridge_trunk_primary", + "paint": { + "line-color": "#fea", + "line-width": { + "base": 1.2, + "stops": [ + [ + 6.5, + 0 + ], + [ + 7, + 0.5 + ], + [ + 20, + 18 + ] + ] + } + }, + "ref": "bridge_trunk_primary_casing" + }, + { + "interactive": true, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "id": "bridge_motorway", + "paint": { + "line-color": "#fc8", + "line-width": { + "base": 1.2, + "stops": [ + [ + 6.5, + 0 + ], + [ + 7, + 0.5 + ], + [ + 20, + 18 + ] + ] + } + }, + "ref": "bridge_motorway_casing" + }, + { + "id": "bridge_major_rail", + "type": "line", + "source": "mapbox", + "source-layer": "road", + "filter": [ + "all", + [ + "==", + "structure", + "bridge" + ], + [ + "==", + "class", + "major_rail" + ] + ], + "paint": { + "line-color": "#bbb", + "line-width": { + "base": 1.4, + "stops": [ + [ + 14, + 0.4 + ], + [ + 15, + 0.75 + ], + [ + 20, + 2 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "interactive": true + }, + { + "id": "bridge_major_rail_hatching", + "paint": { + "line-color": "#bbb", + "line-dasharray": [ + 0.2, + 8 + ], + "line-width": { + "base": 1.4, + "stops": [ + [ + 14.5, + 0 + ], + [ + 15, + 3 + ], + [ + 20, + 8 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849334699.1902" + }, + "interactive": true, + "ref": "bridge_major_rail" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849307123.581" + }, + "filter": [ + "all", + [ + ">=", + "admin_level", + 3 + ], + [ + "==", + "maritime", + 0 + ] + ], + "type": "line", + "source": "mapbox", + "id": "admin_level_3", + "paint": { + "line-color": "#9e9cab", + "line-dasharray": [ + 3, + 1, + 1, + 1 + ], + "line-width": { + "base": 1, + "stops": [ + [ + 4, + 0.4 + ], + [ + 5, + 1 + ], + [ + 12, + 3 + ] + ] + } + }, + "source-layer": "admin" + }, + { + "interactive": true, + "layout": { + "line-join": "round", + "line-cap": "round" + }, + "metadata": { + "mapbox:group": "1444849307123.581" + }, + "filter": [ + "all", + [ + "==", + "admin_level", + 2 + ], + [ + "==", + "disputed", + 0 + ], + [ + "==", + "maritime", + 0 + ] + ], + "type": "line", + "source": "mapbox", + "id": "admin_level_2", + "paint": { + "line-color": "#9e9cab", + "line-width": { + "base": 1, + "stops": [ + [ + 4, + 1.4 + ], + [ + 5, + 2 + ], + [ + 12, + 8 + ] + ] + } + }, + "source-layer": "admin" + }, + { + "interactive": true, + "layout": { + "line-cap": "round" + }, + "metadata": { + "mapbox:group": "1444849307123.581" + }, + "filter": [ + "all", + [ + "==", + "admin_level", + 2 + ], + [ + "==", + "disputed", + 1 + ], + [ + "==", + "maritime", + 0 + ] + ], + "type": "line", + "source": "mapbox", + "id": "admin_level_2_disputed", + "paint": { + "line-color": "#9e9cab", + "line-dasharray": [ + 2, + 2 + ], + "line-width": { + "base": 1, + "stops": [ + [ + 4, + 1.4 + ], + [ + 5, + 2 + ], + [ + 12, + 8 + ] + ] + } + }, + "source-layer": "admin" + }, + { + "interactive": true, + "layout": { + "line-join": "round" + }, + "metadata": { + "mapbox:group": "1444849307123.581" + }, + "filter": [ + "all", + [ + ">=", + "admin_level", + 3 + ], + [ + "==", + "maritime", + 1 + ] + ], + "type": "line", + "source": "mapbox", + "id": "admin_level_3_maritime", + "paint": { + "line-color": "#a0c8f0", + "line-opacity": 0.5, + "line-dasharray": [ + 3, + 1, + 1, + 1 + ], + "line-width": { + "base": 1, + "stops": [ + [ + 4, + 0.4 + ], + [ + 5, + 1 + ], + [ + 12, + 3 + ] + ] + } + }, + "source-layer": "admin" + }, + { + "interactive": true, + "layout": { + "line-cap": "round" + }, + "metadata": { + "mapbox:group": "1444849307123.581" + }, + "filter": [ + "all", + [ + "==", + "admin_level", + 2 + ], + [ + "==", + "maritime", + 1 + ] + ], + "type": "line", + "source": "mapbox", + "id": "admin_level_2_maritime", + "paint": { + "line-color": "#a0c8f0", + "line-opacity": 0.5, + "line-width": { + "base": 1, + "stops": [ + [ + 4, + 1.4 + ], + [ + 5, + 2 + ], + [ + 12, + 8 + ] + ] + } + }, + "source-layer": "admin" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Italic", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-max-width": 5, + "text-size": 12 + }, + "metadata": { + "mapbox:group": "1444849320558.5054" + }, + "filter": [ + "==", + "$type", + "Point" + ], + "type": "symbol", + "source": "mapbox", + "id": "water_label", + "paint": { + "text-color": "#74aee9", + "text-halo-width": 1.5, + "text-halo-color": "rgba(255,255,255,0.7)" + }, + "source-layer": "water_label" + }, + { + "interactive": true, + "minzoom": 16, + "layout": { + "icon-image": "{maki}-11", + "text-font": [ + "Open Sans Semibold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "scalerank", + 4 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "poi_label_4", + "paint": { + "text-color": "#666", + "text-halo-color": "#ffffff", + "text-halo-width": 1, + "text-halo-blur": 0.5 + }, + "source-layer": "poi_label" + }, + { + "interactive": true, + "minzoom": 15, + "layout": { + "icon-image": "{maki}-11", + "text-font": [ + "Open Sans Semibold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "scalerank", + 3 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "poi_label_3", + "paint": { + "text-color": "#666", + "text-halo-color": "#ffffff", + "text-halo-width": 1, + "text-halo-blur": 0.5 + }, + "source-layer": "poi_label" + }, + { + "interactive": true, + "minzoom": 14, + "layout": { + "icon-image": "{maki}-11", + "text-font": [ + "Open Sans Semibold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "scalerank", + 2 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "poi_label_2", + "paint": { + "text-color": "#666", + "text-halo-color": "#ffffff", + "text-halo-width": 1, + "text-halo-blur": 0.5 + }, + "source-layer": "poi_label" + }, + { + "layout": { + "text-size": 12, + "icon-image": "{maki}-11", + "text-font": [ + "Open Sans Semibold", + "Arial Unicode MS Bold" + ], + "text-padding": 2, + "visibility": "visible", + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-field": "{name_en}", + "text-max-width": 9 + }, + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "type": "symbol", + "source": "mapbox", + "id": "rail_station_label", + "paint": { + "text-color": "#666", + "text-halo-color": "#ffffff", + "text-halo-width": 1, + "text-halo-blur": 0.5 + }, + "source-layer": "rail_station_label", + "interactive": true + }, + { + "interactive": true, + "minzoom": 13, + "layout": { + "icon-image": "{maki}-11", + "text-font": [ + "Open Sans Semibold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "scalerank", + 1 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "poi_label_1", + "paint": { + "text-color": "#666", + "text-halo-color": "#ffffff", + "text-halo-width": 1, + "text-halo-blur": 0.5 + }, + "source-layer": "poi_label" + }, + { + "interactive": true, + "minzoom": 11, + "layout": { + "icon-image": "{maki}-11", + "text-font": [ + "Open Sans Semibold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "in", + "scalerank", + 1, + 2, + 3 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "airport_label", + "paint": { + "text-color": "#666", + "text-halo-color": "#ffffff", + "text-halo-width": 1, + "text-halo-blur": 0.5 + }, + "source-layer": "airport_label" + }, + { + "interactive": true, + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Open Sans Regular", + "Arial Unicode MS Regular" + ], + "text-size": { + "base": 1, + "stops": [ + [ + 13, + 12 + ], + [ + 14, + 13 + ] + ] + }, + "symbol-placement": "line" + }, + "metadata": { + "mapbox:group": "1456163609504.0715" + }, + "filter": [ + "!=", + "class", + "ferry" + ], + "type": "symbol", + "source": "mapbox", + "id": "road_label", + "paint": { + "text-color": "#765", + "text-halo-width": 1, + "text-halo-blur": 0.5 + }, + "source-layer": "road_label" + }, + { + "interactive": true, + "minzoom": 8, + "layout": { + "text-field": "{ref}", + "text-font": [ + "Open Sans Semibold", + "Arial Unicode MS Bold" + ], + "text-size": 11, + "icon-image": "motorway_{reflen}", + "symbol-placement": { + "base": 1, + "stops": [ + [ + 10, + "point" + ], + [ + 11, + "line" + ] + ] + }, + "symbol-spacing": 500, + "text-rotation-alignment": "viewport", + "icon-rotation-alignment": "viewport" + }, + "metadata": { + "mapbox:group": "1456163609504.0715" + }, + "filter": [ + "<=", + "reflen", + 6 + ], + "type": "symbol", + "source": "mapbox", + "id": "road_label_highway_shield", + "paint": {}, + "source-layer": "road_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Bold", + "Arial Unicode MS Bold" + ], + "text-transform": "uppercase", + "text-letter-spacing": 0.1, + "text-field": "{name_en}", + "text-max-width": 9, + "text-size": { + "base": 1.2, + "stops": [ + [ + 12, + 10 + ], + [ + 15, + 14 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849272561.29" + }, + "filter": [ + "in", + "type", + "hamlet", + "suburb", + "neighbourhood", + "island", + "islet" + ], + "type": "symbol", + "source": "mapbox", + "id": "place_label_other", + "paint": { + "text-color": "#633", + "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-width": 1.2 + }, + "source-layer": "place_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Regular", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-max-width": 8, + "text-size": { + "base": 1.2, + "stops": [ + [ + 10, + 12 + ], + [ + 15, + 22 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849272561.29" + }, + "filter": [ + "==", + "type", + "village" + ], + "type": "symbol", + "source": "mapbox", + "id": "place_label_village", + "paint": { + "text-color": "#333", + "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-width": 1.2 + }, + "source-layer": "place_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Regular", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-max-width": 8, + "text-size": { + "base": 1.2, + "stops": [ + [ + 10, + 14 + ], + [ + 15, + 24 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849272561.29" + }, + "filter": [ + "==", + "type", + "town" + ], + "type": "symbol", + "source": "mapbox", + "id": "place_label_town", + "paint": { + "text-color": "#333", + "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-width": 1.2 + }, + "source-layer": "place_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Semibold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 8, + "text-size": { + "base": 1.2, + "stops": [ + [ + 7, + 14 + ], + [ + 11, + 24 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849272561.29" + }, + "filter": [ + "==", + "type", + "city" + ], + "type": "symbol", + "source": "mapbox", + "id": "place_label_city", + "paint": { + "text-color": "#333", + "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-width": 1.2 + }, + "source-layer": "place_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Italic", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-letter-spacing": 0.2, + "symbol-placement": "line", + "text-size": { + "stops": [ + [ + 3, + 11 + ], + [ + 4, + 12 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849258897.3083" + }, + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + ">=", + "labelrank", + 4 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "marine_label_line_4", + "paint": { + "text-color": "#74aee9", + "text-halo-color": "rgba(255,255,255,0.7)", + "text-halo-width": 0.75, + "text-halo-blur": 0.75 + }, + "source-layer": "marine_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Italic", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-max-width": 6, + "text-letter-spacing": 0.2, + "symbol-placement": "point", + "text-size": { + "stops": [ + [ + 3, + 11 + ], + [ + 4, + 12 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849258897.3083" + }, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + ">=", + "labelrank", + 4 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "marine_label_4", + "paint": { + "text-color": "#74aee9", + "text-halo-color": "rgba(255,255,255,0.7)", + "text-halo-width": 0.75, + "text-halo-blur": 0.75 + }, + "source-layer": "marine_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Italic", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-letter-spacing": 0.2, + "symbol-placement": "line", + "text-size": { + "stops": [ + [ + 3, + 11 + ], + [ + 4, + 14 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849258897.3083" + }, + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "==", + "labelrank", + 3 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "marine_label_line_3", + "paint": { + "text-color": "#74aee9", + "text-halo-color": "rgba(255,255,255,0.7)", + "text-halo-width": 0.75, + "text-halo-blur": 0.75 + }, + "source-layer": "marine_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Italic", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-max-width": 5, + "text-letter-spacing": 0.2, + "symbol-placement": "point", + "text-size": { + "stops": [ + [ + 3, + 11 + ], + [ + 4, + 14 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849258897.3083" + }, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "labelrank", + 3 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "marine_label_point_3", + "paint": { + "text-color": "#74aee9", + "text-halo-color": "rgba(255,255,255,0.7)", + "text-halo-width": 0.75, + "text-halo-blur": 0.75 + }, + "source-layer": "marine_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Italic", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-letter-spacing": 0.2, + "symbol-placement": "line", + "text-size": { + "stops": [ + [ + 3, + 14 + ], + [ + 4, + 16 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849258897.3083" + }, + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "==", + "labelrank", + 2 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "marine_label_line_2", + "paint": { + "text-color": "#74aee9", + "text-halo-color": "rgba(255,255,255,0.7)", + "text-halo-width": 0.75, + "text-halo-blur": 0.75 + }, + "source-layer": "marine_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Italic", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-max-width": 5, + "text-letter-spacing": 0.2, + "symbol-placement": "point", + "text-size": { + "stops": [ + [ + 3, + 14 + ], + [ + 4, + 16 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849258897.3083" + }, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "labelrank", + 2 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "marine_label_point_2", + "paint": { + "text-color": "#74aee9", + "text-halo-color": "rgba(255,255,255,0.7)", + "text-halo-width": 0.75, + "text-halo-blur": 0.75 + }, + "source-layer": "marine_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Italic", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-letter-spacing": 0.2, + "symbol-placement": "line", + "text-size": { + "stops": [ + [ + 3, + 18 + ], + [ + 4, + 22 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849258897.3083" + }, + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "==", + "labelrank", + 1 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "marine_label_line_1", + "paint": { + "text-color": "#74aee9", + "text-halo-color": "rgba(255,255,255,0.7)", + "text-halo-width": 0.75, + "text-halo-blur": 0.75 + }, + "source-layer": "marine_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Italic", + "Arial Unicode MS Regular" + ], + "text-field": "{name_en}", + "text-max-width": 5, + "text-letter-spacing": 0.2, + "text-line-height": 1.6, + "symbol-placement": "point", + "text-offset": [ + 0, + 2.4 + ], + "text-size": { + "stops": [ + [ + 3, + 18 + ], + [ + 4, + 22 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849258897.3083" + }, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "labelrank", + 1 + ] + ], + "type": "symbol", + "source": "mapbox", + "id": "marine_label_point_1", + "paint": { + "text-color": "#74aee9", + "text-halo-color": "rgba(255,255,255,0.7)", + "text-halo-width": 0.75, + "text-halo-blur": 0.75 + }, + "source-layer": "marine_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Bold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 6.25, + "text-transform": "uppercase", + "text-size": { + "stops": [ + [ + 4, + 11 + ], + [ + 6, + 15 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849242106.713" + }, + "filter": [ + ">=", + "scalerank", + 4 + ], + "type": "symbol", + "source": "mapbox", + "id": "country_label_4", + "paint": { + "text-color": "#334", + "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-width": 2, + "text-halo-blur": 1 + }, + "source-layer": "country_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Bold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 6.25, + "text-transform": "uppercase", + "text-size": { + "stops": [ + [ + 3, + 11 + ], + [ + 7, + 17 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849242106.713" + }, + "filter": [ + "==", + "scalerank", + 3 + ], + "type": "symbol", + "source": "mapbox", + "id": "country_label_3", + "paint": { + "text-color": "#334", + "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-width": 2, + "text-halo-blur": 1 + }, + "source-layer": "country_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Bold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 6.25, + "text-transform": "uppercase", + "text-size": { + "stops": [ + [ + 2, + 11 + ], + [ + 5, + 17 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849242106.713" + }, + "filter": [ + "==", + "scalerank", + 2 + ], + "type": "symbol", + "source": "mapbox", + "id": "country_label_2", + "paint": { + "text-color": "#334", + "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-width": 2, + "text-halo-blur": 1 + }, + "source-layer": "country_label" + }, + { + "interactive": true, + "layout": { + "text-font": [ + "Open Sans Bold", + "Arial Unicode MS Bold" + ], + "text-field": "{name_en}", + "text-max-width": 6.25, + "text-transform": "uppercase", + "text-size": { + "stops": [ + [ + 1, + 11 + ], + [ + 4, + 17 + ] + ] + } + }, + "metadata": { + "mapbox:group": "1444849242106.713" + }, + "filter": [ + "==", + "scalerank", + 1 + ], + "type": "symbol", + "source": "mapbox", + "id": "country_label_1", + "paint": { + "text-color": "#334", + "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-width": 2, + "text-halo-blur": 1 + }, + "source-layer": "country_label" + } + ], + "created": "1970-01-01T00:00:00.000Z", + "modified": "1970-01-01T00:00:00.000Z", + "owner": "mapbox", + "id": "bright-v9", + "draft": false, + "visibility": "public" +} \ No newline at end of file diff --git a/rendering/test.js b/rendering/test.js index c34d42f414..5f5c9b53a1 100755 --- a/rendering/test.js +++ b/rendering/test.js @@ -3,7 +3,7 @@ const puppeteer = require('puppeteer'); const webpack = require('webpack'); const config = require('./webpack.config'); const webpackMiddleware = require('webpack-dev-middleware'); -const http = require('http'); +const express = require('express'); const path = require('path'); const png = require('pngjs'); const fs = require('fs'); @@ -56,13 +56,12 @@ function notFound(req, res) { function serve(options) { const webpackHandler = webpackMiddleware(compiler, { - lazy: true, - logger: options.log, - stats: 'minimal', + writeToDisk: false, }); return new Promise((resolve, reject) => { - const server = http.createServer((req, res) => { + const app = express(); + app.use((req, res) => { if (req.url === '/favicon.ico') { res.writeHead(204); res.end(); @@ -78,7 +77,7 @@ function serve(options) { staticHandler(req, res, notFound(req, res)); }); - server.listen(options.port, options.host, (err) => { + const server = app.listen(options.port, options.host, (err) => { if (err) { return reject(err); } @@ -86,7 +85,7 @@ function serve(options) { options.log.info( `test server listening http://${address.address}:${address.port}/` ); - resolve(() => server.close()); + resolve(() => server.close(() => process.exit(0))); }); }); } diff --git a/rendering/webpack.config.js b/rendering/webpack.config.js index 0c3b0099ff..0bf16a16c5 100644 --- a/rendering/webpack.config.js +++ b/rendering/webpack.config.js @@ -23,6 +23,7 @@ module.exports = { target: 'web', entry: entry, devtool: 'source-map', + stats: 'minimal', module: { rules: [ { diff --git a/src/ol/Collection.js b/src/ol/Collection.js index ab11627c3b..401e19d256 100644 --- a/src/ol/Collection.js +++ b/src/ol/Collection.js @@ -22,8 +22,8 @@ const Property = { export class CollectionEvent extends Event { /** * @param {import("./CollectionEventType.js").default} type Type. - * @param {*=} opt_element Element. - * @param {number=} opt_index The index of the added or removed element. + * @param {*} [opt_element] Element. + * @param {number} [opt_index] The index of the added or removed element. */ constructor(type, opt_element, opt_index) { super(type); @@ -65,8 +65,8 @@ export class CollectionEvent extends Event { */ class Collection extends BaseObject { /** - * @param {Array=} opt_array Array. - * @param {Options=} opt_options Collection options. + * @param {Array} [opt_array] Array. + * @param {Options} [opt_options] Collection options. */ constructor(opt_array, opt_options) { super(); @@ -277,7 +277,7 @@ class Collection extends BaseObject { /** * @private * @param {T} elem Element. - * @param {number=} opt_except Optional index to ignore. + * @param {number} [opt_except] Optional index to ignore. */ assertUnique_(elem, opt_except) { for (let i = 0, ii = this.array_.length; i < ii; ++i) { diff --git a/src/ol/Feature.js b/src/ol/Feature.js index 9ae3b94303..502c623e20 100644 --- a/src/ol/Feature.js +++ b/src/ol/Feature.js @@ -61,7 +61,7 @@ import {listen, unlistenByKey} from './events.js'; */ class Feature extends BaseObject { /** - * @param {Geometry|Object=} opt_geometryOrProperties + * @param {Geometry|Object} [opt_geometryOrProperties] * You may pass a Geometry object directly, or an object literal containing * properties. If you pass an object literal, you may include a Geometry * associated with a `geometry` key. @@ -240,7 +240,7 @@ class Feature extends BaseObject { * single style object, an array of styles, or a function that takes a * resolution and returns an array of styles. To unset the feature style, call * `setStyle()` without arguments or a falsey value. - * @param {import("./style/Style.js").StyleLike=} opt_style Style for this feature. + * @param {import("./style/Style.js").StyleLike} [opt_style] Style for this feature. * @api * @fires module:ol/events/Event~BaseEvent#event:change */ diff --git a/src/ol/Geolocation.js b/src/ol/Geolocation.js index 26f76d2296..62d2621652 100644 --- a/src/ol/Geolocation.js +++ b/src/ol/Geolocation.js @@ -34,7 +34,7 @@ const Property = { */ class GeolocationError extends BaseEvent { /** - * @param {PositionError} error error object. + * @param {GeolocationPositionError} error error object. */ constructor(error) { super(EventType.ERROR); @@ -56,7 +56,7 @@ class GeolocationError extends BaseEvent { * @property {boolean} [tracking=false] Start Tracking right after * instantiation. * @property {PositionOptions} [trackingOptions] Tracking options. - * See http://www.w3.org/TR/geolocation-API/#position_options_interface. + * See https://www.w3.org/TR/geolocation-API/#position_options_interface. * @property {import("./proj.js").ProjectionLike} [projection] The projection the position * is reported in. */ @@ -64,7 +64,7 @@ class GeolocationError extends BaseEvent { /** * @classdesc * Helper class for providing HTML5 Geolocation capabilities. - * The [Geolocation API](http://www.w3.org/TR/geolocation-API/) + * The [Geolocation API](https://www.w3.org/TR/geolocation-API/) * is used to locate a user's position. * * To get notified of position changes, register a listener for the generic @@ -86,7 +86,7 @@ class GeolocationError extends BaseEvent { */ class Geolocation extends BaseObject { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -176,7 +176,7 @@ class Geolocation extends BaseObject { /** * @private - * @param {Position} position position event. + * @param {GeolocationPosition} position position event. */ positionChange_(position) { const coords = position.coords; @@ -210,7 +210,7 @@ class Geolocation extends BaseObject { /** * @private - * @param {PositionError} error error object. + * @param {GeolocationPositionError} error error object. */ positionError_(error) { this.dispatchEvent(new GeolocationError(error)); @@ -324,10 +324,10 @@ class Geolocation extends BaseObject { /** * Get the tracking options. - * See http://www.w3.org/TR/geolocation-API/#position-options. + * See https://www.w3.org/TR/geolocation-API/#position-options. * @return {PositionOptions|undefined} PositionOptions as defined by * the [HTML5 Geolocation spec - * ](http://www.w3.org/TR/geolocation-API/#position_options_interface). + * ](https://www.w3.org/TR/geolocation-API/#position_options_interface). * @observable * @api */ diff --git a/src/ol/ImageCanvas.js b/src/ol/ImageCanvas.js index d6893b9ac2..8e6a541f12 100644 --- a/src/ol/ImageCanvas.js +++ b/src/ol/ImageCanvas.js @@ -19,7 +19,7 @@ class ImageCanvas extends ImageBase { * @param {number} resolution Resolution. * @param {number} pixelRatio Pixel ratio. * @param {HTMLCanvasElement} canvas Canvas. - * @param {Loader=} opt_loader Optional loader function to + * @param {Loader} [opt_loader] Optional loader function to * support asynchronous canvas drawing. */ constructor(extent, resolution, pixelRatio, canvas, opt_loader) { @@ -58,7 +58,7 @@ class ImageCanvas extends ImageBase { /** * Handle async drawing complete. - * @param {Error=} err Any error during drawing. + * @param {Error} [err] Any error during drawing. * @private */ handleLoad_(err) { diff --git a/src/ol/ImageTile.js b/src/ol/ImageTile.js index d636ef73c4..f6367490ac 100644 --- a/src/ol/ImageTile.js +++ b/src/ol/ImageTile.js @@ -13,7 +13,7 @@ class ImageTile extends Tile { * @param {string} src Image source URI. * @param {?string} crossOrigin Cross origin. * @param {import("./Tile.js").LoadFunction} tileLoadFunction Tile load function. - * @param {import("./Tile.js").Options=} opt_options Tile options. + * @param {import("./Tile.js").Options} [opt_options] Tile options. */ constructor( tileCoord, @@ -39,6 +39,8 @@ class ImageTile extends Tile { */ this.src_ = src; + this.key = src; + /** * @private * @type {HTMLImageElement|HTMLCanvasElement} @@ -70,13 +72,6 @@ class ImageTile extends Tile { return this.image_; } - /** - * @return {string} Key. - */ - getKey() { - return this.src_; - } - /** * Tracks loading or read errors. * diff --git a/src/ol/MapBrowserEvent.js b/src/ol/MapBrowserEvent.js index 3fbbb76593..90b502b9b8 100644 --- a/src/ol/MapBrowserEvent.js +++ b/src/ol/MapBrowserEvent.js @@ -7,15 +7,15 @@ import MapEvent from './MapEvent.js'; * @classdesc * Events emitted as map browser events are instances of this type. * See {@link module:ol/PluggableMap~PluggableMap} for which events trigger a map browser event. - * @template {UIEvent} EVENT + * @template {UIEvent|import("./MapBrowserEventHandler").PointerEventData} EVENT */ class MapBrowserEvent extends MapEvent { /** * @param {string} type Event type. * @param {import("./PluggableMap.js").default} map Map. * @param {EVENT} originalEvent Original event. - * @param {boolean=} opt_dragging Is the map currently being dragged? - * @param {?import("./PluggableMap.js").FrameState=} opt_frameState Frame state. + * @param {boolean} [opt_dragging] Is the map currently being dragged? + * @param {?import("./PluggableMap.js").FrameState} [opt_frameState] Frame state. */ constructor(type, map, originalEvent, opt_dragging, opt_frameState) { super(type, map, opt_frameState); @@ -88,7 +88,9 @@ class MapBrowserEvent extends MapEvent { */ preventDefault() { super.preventDefault(); - this.originalEvent.preventDefault(); + if ('preventDefault' in this.originalEvent) { + /** @type {UIEvent} */ (this.originalEvent).preventDefault(); + } } /** @@ -98,7 +100,9 @@ class MapBrowserEvent extends MapEvent { */ stopPropagation() { super.stopPropagation(); - this.originalEvent.stopPropagation(); + if ('stopPropagation' in this.originalEvent) { + /** @type {UIEvent} */ (this.originalEvent).stopPropagation(); + } } } diff --git a/src/ol/MapBrowserEventHandler.js b/src/ol/MapBrowserEventHandler.js index dd950f0488..c8dcdcd2bb 100644 --- a/src/ol/MapBrowserEventHandler.js +++ b/src/ol/MapBrowserEventHandler.js @@ -2,18 +2,26 @@ * @module ol/MapBrowserEventHandler */ -import EventTarget from './events/Target.js'; import EventType from './events/EventType.js'; import MapBrowserEvent from './MapBrowserEvent.js'; import MapBrowserEventType from './MapBrowserEventType.js'; import PointerEventType from './pointer/EventType.js'; +import Target from './events/Target.js'; import {DEVICE_PIXEL_RATIO, PASSIVE_EVENT_LISTENERS} from './has.js'; import {listen, unlistenByKey} from './events.js'; -class MapBrowserEventHandler extends EventTarget { +/** + * @typedef {Object} PointerEventData + * @property {string} type + * @property {number} clientX + * @property {number} clientY + * @property {EventTarget} target + */ + +class MapBrowserEventHandler extends Target { /** * @param {import("./PluggableMap.js").default} map The map with the viewport to listen to events on. - * @param {number=} moveTolerance The minimal distance the pointer must travel to trigger a move. + * @param {number} [moveTolerance] The minimal distance the pointer must travel to trigger a move. */ constructor(map, moveTolerance) { super(map); @@ -31,6 +39,12 @@ class MapBrowserEventHandler extends EventTarget { */ this.clickTimeoutId_; + /** + * Emulate dblclick and singleclick. Will be true when only one pointer is active. + * @type {boolean} + */ + this.emulateClicks_ = false; + /** * @type {boolean} * @private @@ -54,7 +68,7 @@ class MapBrowserEventHandler extends EventTarget { /** * The most recent "down" type event (or null if none have occurred). * Set on pointerdown. - * @type {PointerEvent} + * @type {PointerEventData} * @private */ this.down_ = null; @@ -116,7 +130,7 @@ class MapBrowserEventHandler extends EventTarget { } /** - * @param {PointerEvent} pointerEvent Pointer + * @param {PointerEventData} pointerEvent Pointer * event. * @private */ @@ -140,6 +154,7 @@ class MapBrowserEventHandler extends EventTarget { } else { // click this.clickTimeoutId_ = setTimeout( + /** @this {MapBrowserEventHandler} */ function () { this.clickTimeoutId_ = undefined; const newEvent = new MapBrowserEvent( @@ -196,6 +211,7 @@ class MapBrowserEventHandler extends EventTarget { // We only fire click, singleclick, and doubleclick if nobody has called // event.stopPropagation() or event.preventDefault(). if ( + this.emulateClicks_ && !newEvent.propagationStopped && !this.dragging_ && this.isMouseActionButton_(pointerEvent) @@ -227,6 +243,7 @@ class MapBrowserEventHandler extends EventTarget { * @private */ handlePointerDown_(pointerEvent) { + this.emulateClicks_ = this.activePointers_ === 0; this.updateActivePointers_(pointerEvent); const newEvent = new MapBrowserEvent( MapBrowserEventType.POINTERDOWN, @@ -235,22 +252,23 @@ class MapBrowserEventHandler extends EventTarget { ); this.dispatchEvent(newEvent); - this.down_ = pointerEvent; + this.down_ = { + type: pointerEvent.type, + clientX: pointerEvent.clientX, + clientY: pointerEvent.clientY, + target: pointerEvent.target, + }; if (this.dragListenerKeys_.length === 0) { + const doc = this.map_.getOwnerDocument(); this.dragListenerKeys_.push( listen( - document, + doc, MapBrowserEventType.POINTERMOVE, this.handlePointerMove_, this ), - listen( - document, - MapBrowserEventType.POINTERUP, - this.handlePointerUp_, - this - ), + listen(doc, MapBrowserEventType.POINTERUP, this.handlePointerUp_, this), /* Note that the listener for `pointercancel is set up on * `pointerEventHandler_` and not `documentPointerEventHandler_` like * the `pointerup` and `pointermove` listeners. @@ -271,10 +289,7 @@ class MapBrowserEventHandler extends EventTarget { this ) ); - if ( - this.element_.getRootNode && - this.element_.getRootNode() !== document - ) { + if (this.element_.getRootNode && this.element_.getRootNode() !== doc) { this.dragListenerKeys_.push( listen( this.element_.getRootNode(), @@ -334,9 +349,10 @@ class MapBrowserEventHandler extends EventTarget { handleTouchMove_(event) { // Due to https://github.com/mpizenberg/elm-pep/issues/2, `this.originalPointerMoveEvent_` // may not be initialized yet when we get here on a platform without native pointer events. + const originalEvent = this.originalPointerMoveEvent_; if ( - !this.originalPointerMoveEvent_ || - this.originalPointerMoveEvent_.defaultPrevented + (!originalEvent || originalEvent.defaultPrevented) && + (typeof event.cancelable !== 'boolean' || event.cancelable === true) ) { event.preventDefault(); } diff --git a/src/ol/MapEvent.js b/src/ol/MapEvent.js index 5722b3f681..9c0ec07041 100644 --- a/src/ol/MapEvent.js +++ b/src/ol/MapEvent.js @@ -12,7 +12,7 @@ class MapEvent extends Event { /** * @param {string} type Event type. * @param {import("./PluggableMap.js").default} map Map. - * @param {?import("./PluggableMap.js").FrameState=} opt_frameState Frame state. + * @param {?import("./PluggableMap.js").FrameState} [opt_frameState] Frame state. */ constructor(type, map, opt_frameState) { super(type); diff --git a/src/ol/Object.js b/src/ol/Object.js index 59fb349811..3343b6521f 100644 --- a/src/ol/Object.js +++ b/src/ol/Object.js @@ -82,7 +82,7 @@ export class ObjectEvent extends Event { */ class BaseObject extends Observable { /** - * @param {Object=} opt_values An object with key-value pairs. + * @param {Object} [opt_values] An object with key-value pairs. */ constructor(opt_values) { super(); @@ -159,7 +159,7 @@ class BaseObject extends Observable { * Sets a value. * @param {string} key Key name. * @param {*} value Value. - * @param {boolean=} opt_silent Update without triggering an event. + * @param {boolean} [opt_silent] Update without triggering an event. * @api */ set(key, value, opt_silent) { @@ -179,7 +179,7 @@ class BaseObject extends Observable { * Sets a collection of key-value pairs. Note that this changes any existing * properties and adds new ones (it does not remove any existing properties). * @param {Object} values Values. - * @param {boolean=} opt_silent Update without triggering an event. + * @param {boolean} [opt_silent] Update without triggering an event. * @api */ setProperties(values, opt_silent) { @@ -188,10 +188,22 @@ class BaseObject extends Observable { } } + /** + * Apply any properties from another object without triggering events. + * @param {BaseObject} source The source object. + * @protected + */ + applyProperties(source) { + if (!source.values_) { + return; + } + assign(this.values_ || (this.values_ = {}), source.values_); + } + /** * Unsets a property. * @param {string} key Key name. - * @param {boolean=} opt_silent Unset without triggering an event. + * @param {boolean} [opt_silent] Unset without triggering an event. * @api */ unset(key, opt_silent) { diff --git a/src/ol/Overlay.js b/src/ol/Overlay.js index 62b8d4d342..869eac4614 100644 --- a/src/ol/Overlay.js +++ b/src/ol/Overlay.js @@ -396,7 +396,7 @@ class Overlay extends BaseObject { } /** - * Pan the map so that the overlay is entirely visisble in the current viewport + * Pan the map so that the overlay is entirely visible in the current viewport * (if necessary) using the configured autoPan parameters * @protected */ @@ -409,7 +409,7 @@ class Overlay extends BaseObject { /** * Pan the map so that the overlay is entirely visible in the current viewport * (if necessary). - * @param {PanIntoViewOptions=} opt_panIntoViewOptions Options for the pan action + * @param {PanIntoViewOptions} [opt_panIntoViewOptions] Options for the pan action * @api */ panIntoView(opt_panIntoViewOptions) { @@ -458,6 +458,9 @@ class Overlay extends BaseObject { .getView() .getCenterInternal()); const centerPx = map.getPixelFromCoordinateInternal(center); + if (!centerPx) { + return; + } const newCenterPx = [centerPx[0] + delta[0], centerPx[1] + delta[1]]; const panOptions = panIntoViewOptions.animation || {}; diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js index d7684ea616..1ca470e823 100644 --- a/src/ol/PluggableMap.js +++ b/src/ol/PluggableMap.js @@ -48,26 +48,20 @@ import {removeNode} from './dom.js'; * @property {number} pixelRatio The pixel ratio of the frame. * @property {number} time The time when rendering of the frame was requested. * @property {import("./View.js").State} viewState The state of the current view. - * @property {boolean} animate - * @property {import("./transform.js").Transform} coordinateToPixelTransform - * @property {null|import("./extent.js").Extent} extent - * @property {Array} declutterItems - * @property {number} index - * @property {Array} layerStatesArray - * @property {number} layerIndex - * @property {import("./transform.js").Transform} pixelToCoordinateTransform - * @property {Array} postRenderFunctions - * @property {import("./size.js").Size} size - * @property {TileQueue} tileQueue - * @property {!Object>} usedTiles - * @property {Array} viewHints - * @property {!Object>} wantedTiles - */ - -/** - * @typedef {Object} DeclutterItems - * @property {Array<*>} items Declutter items of an executor. - * @property {number} opacity Layer opacity. + * @property {boolean} animate Animate. + * @property {import("./transform.js").Transform} coordinateToPixelTransform CoordinateToPixelTransform. + * @property {import("rbush").default} declutterTree DeclutterTree. + * @property {null|import("./extent.js").Extent} extent Extent. + * @property {number} index Index. + * @property {Array} layerStatesArray LayerStatesArray. + * @property {number} layerIndex LayerIndex. + * @property {import("./transform.js").Transform} pixelToCoordinateTransform PixelToCoordinateTransform. + * @property {Array} postRenderFunctions PostRenderFunctions. + * @property {import("./size.js").Size} size Size. + * @property {TileQueue} tileQueue TileQueue. + * @property {!Object>} usedTiles UsedTiles. + * @property {Array} viewHints ViewHints. + * @property {!Object>} wantedTiles WantedTiles. */ /** @@ -81,7 +75,7 @@ import {removeNode} from './dom.js'; * {@link module:ol/layer/Layer layer-candidate} and it should return a boolean value. * Only layers which are visible and for which this function returns `true` * will be tested for features. By default, all visible layers will be tested. - * @property {number} [hitTolerance=0] Hit-detection tolerance in pixels. Pixels + * @property {number} [hitTolerance=0] Hit-detection tolerance in css pixels. Pixels * inside the radius around the given position will be checked for features. * @property {boolean} [checkWrapped=true] Check-Wrapped Will check for for wrapped geometries inside the range of * +/- 1 world width. Works only if a projection is used that can be wrapped. @@ -89,11 +83,11 @@ import {removeNode} from './dom.js'; /** * @typedef {Object} MapOptionsInternal - * @property {Collection} [controls] - * @property {Collection} [interactions] - * @property {HTMLElement|Document} keyboardEventTarget - * @property {Collection} overlays - * @property {Object} values + * @property {Collection} [controls] Controls. + * @property {Collection} [interactions] Interactions. + * @property {HTMLElement|Document} keyboardEventTarget KeyboardEventTarget. + * @property {Collection} overlays Overlays. + * @property {Object} values Values. */ /** @@ -130,7 +124,7 @@ import {removeNode} from './dom.js'; * @property {HTMLElement|string} [target] The container for the map, either the * element itself or the `id` of the element. If not specified at construction * time, {@link module:ol/Map~Map#setTarget} must be called for the map to be - * rendered. + * rendered. If passed by element, the container can be in a secondary document. * @property {View} [view] The map's view. No layer sources will be * fetched unless this is specified at construction time or through * {@link module:ol/Map~Map#setView}. @@ -187,7 +181,7 @@ class PluggableMap extends BaseObject { /** * @private */ - this.animationDelay_ = function () { + this.animationDelay_ = /** @this {PluggableMap} */ function () { this.animationDelayKey_ = undefined; this.renderFrame_(Date.now()); }.bind(this); @@ -544,15 +538,14 @@ class PluggableMap extends BaseObject { * callback with each intersecting feature. Layers included in the detection can * be configured through the `layerFilter` option in `opt_options`. * @param {import("./pixel.js").Pixel} pixel Pixel. - * @param {function(this: S, import("./Feature.js").FeatureLike, - * import("./layer/Layer.js").default): T} callback Feature callback. The callback will be + * @param {function(import("./Feature.js").FeatureLike, import("./layer/Layer.js").default, import("./geom/SimpleGeometry.js").default): T} callback Feature callback. The callback will be * called with two arguments. The first argument is one * {@link module:ol/Feature feature} or * {@link module:ol/render/Feature render feature} at the pixel, the second is * the {@link module:ol/layer/Layer layer} of the feature and will be null for * unmanaged layers. To stop detection, callback functions can return a * truthy value. - * @param {AtPixelOptions=} opt_options Optional options. + * @param {AtPixelOptions} [opt_options] Optional options. * @return {T|undefined} Callback result, i.e. the return value of last * callback execution, or the first truthy callback return value. * @template S,T @@ -565,9 +558,7 @@ class PluggableMap extends BaseObject { const coordinate = this.getCoordinateFromPixelInternal(pixel); opt_options = opt_options !== undefined ? opt_options : {}; const hitTolerance = - opt_options.hitTolerance !== undefined - ? opt_options.hitTolerance * this.frameState_.pixelRatio - : 0; + opt_options.hitTolerance !== undefined ? opt_options.hitTolerance : 0; const layerFilter = opt_options.layerFilter !== undefined ? opt_options.layerFilter : TRUE; const checkWrapped = opt_options.checkWrapped !== false; @@ -586,7 +577,7 @@ class PluggableMap extends BaseObject { /** * Get all features that intersect a pixel on the viewport. * @param {import("./pixel.js").Pixel} pixel Pixel. - * @param {AtPixelOptions=} opt_options Optional options. + * @param {AtPixelOptions} [opt_options] Optional options. * @return {Array} The detected features or * an empty array if none were found. * @api @@ -618,7 +609,7 @@ class PluggableMap extends BaseObject { * [R, G, B, A] pixel values (0 - 255) and will be `null` for layer types * that do not currently support this argument. To stop detection, callback * functions can return a truthy value. - * @param {AtPixelOptions=} opt_options Configuration options. + * @param {AtPixelOptions} [opt_options] Configuration options. * @return {T|undefined} Callback result, i.e. the return value of last * callback execution, or the first truthy callback return value. * @template S,T @@ -630,9 +621,7 @@ class PluggableMap extends BaseObject { } const options = opt_options || {}; const hitTolerance = - options.hitTolerance !== undefined - ? options.hitTolerance * this.frameState_.pixelRatio - : 0; + options.hitTolerance !== undefined ? options.hitTolerance : 0; const layerFilter = options.layerFilter || TRUE; return this.renderer_.forEachLayerAtPixel( pixel, @@ -647,7 +636,7 @@ class PluggableMap extends BaseObject { * Detect if features intersect a pixel on the viewport. Layers included in the * detection can be configured through `opt_layerFilter`. * @param {import("./pixel.js").Pixel} pixel Pixel. - * @param {AtPixelOptions=} opt_options Optional options. + * @param {AtPixelOptions} [opt_options] Optional options. * @return {boolean} Is there a feature at the given pixel? * @api */ @@ -660,9 +649,7 @@ class PluggableMap extends BaseObject { const layerFilter = opt_options.layerFilter !== undefined ? opt_options.layerFilter : TRUE; const hitTolerance = - opt_options.hitTolerance !== undefined - ? opt_options.hitTolerance * this.frameState_.pixelRatio - : 0; + opt_options.hitTolerance !== undefined ? opt_options.hitTolerance : 0; const checkWrapped = opt_options.checkWrapped !== false; return this.renderer_.hasFeatureAtCoordinate( coordinate, @@ -695,7 +682,7 @@ class PluggableMap extends BaseObject { /** * Returns the map pixel position for a browser event relative to the viewport. - * @param {UIEvent} event Event. + * @param {UIEvent|import("./MapBrowserEventHandler").PointerEventData} event Event. * @return {import("./pixel.js").Pixel} Pixel. * @api */ @@ -953,6 +940,14 @@ class PluggableMap extends BaseObject { return this.overlayContainerStopEvent_; } + /** + * @return {!Document} The document where the map is displayed. + */ + getOwnerDocument() { + const targetElement = this.getTargetElement(); + return targetElement ? targetElement.ownerDocument : document; + } + /** * @param {import("./Tile.js").default} tile Tile. * @param {string} tileSourceKey Tile source key. @@ -972,7 +967,7 @@ class PluggableMap extends BaseObject { /** * @param {UIEvent} browserEvent Browser event. - * @param {string=} opt_type Type. + * @param {string} [opt_type] Type. */ handleBrowserEvent(browserEvent, opt_type) { const type = opt_type || browserEvent.type; @@ -996,16 +991,7 @@ class PluggableMap extends BaseObject { eventType === EventType.WHEEL || eventType === EventType.KEYDOWN ) { - const rootNode = this.viewport_.getRootNode - ? this.viewport_.getRootNode() - : document; - const target = - rootNode === document - ? /** @type {Node} */ (originalEvent.target) - : /** @type {ShadowRoot} */ (rootNode).elementFromPoint( - originalEvent.clientX, - originalEvent.clientY - ); + const target = /** @type {Node} */ (originalEvent.target); if ( // Abort if the target is a child of the container for elements whose events are not meant // to be handled by map interactions. @@ -1014,23 +1000,25 @@ class PluggableMap extends BaseObject { // It's possible for the target to no longer be in the page if it has been removed in an // event listener, this might happen in a Control that recreates it's content based on // user interaction either manually or via a render in something like https://reactjs.org/ - !(rootNode === document ? document.documentElement : rootNode).contains( - target - ) + !this.getOwnerDocument().contains(target) ) { return; } } mapBrowserEvent.frameState = this.frameState_; - const interactionsArray = this.getInteractions().getArray(); if (this.dispatchEvent(mapBrowserEvent) !== false) { + const interactionsArray = this.getInteractions().getArray().slice(); for (let i = interactionsArray.length - 1; i >= 0; i--) { const interaction = interactionsArray[i]; - if (!interaction.getActive()) { + if ( + interaction.getMap() !== this || + !interaction.getActive() || + !this.getTargetElement() + ) { continue; } const cont = interaction.handleEvent(mapBrowserEvent); - if (!cont) { + if (!cont || mapBrowserEvent.propagationStopped) { break; } } @@ -1141,6 +1129,7 @@ class PluggableMap extends BaseObject { if (!targetElement) { if (this.renderer_) { clearTimeout(this.postRenderTimeoutHandle_); + this.postRenderTimeoutHandle_ = undefined; this.postRenderFunctions_.length = 0; this.renderer_.dispose(); this.renderer_ = null; @@ -1375,9 +1364,7 @@ class PluggableMap extends BaseObject { frameState = { animate: false, coordinateToPixelTransform: this.coordinateToPixelTransform_, - declutterItems: previousFrameState - ? previousFrameState.declutterItems - : [], + declutterTree: null, extent: getForViewAndSize( viewState.center, viewState.resolution, @@ -1441,10 +1428,12 @@ class PluggableMap extends BaseObject { this.dispatchEvent(new MapEvent(MapEventType.POSTRENDER, this, frameState)); - this.postRenderTimeoutHandle_ = setTimeout( - this.handlePostRender.bind(this), - 0 - ); + if (!this.postRenderTimeoutHandle_) { + this.postRenderTimeoutHandle_ = setTimeout(() => { + this.postRenderTimeoutHandle_ = undefined; + this.handlePostRender(); + }, 0); + } } /** @@ -1500,18 +1489,25 @@ class PluggableMap extends BaseObject { this.setSize(undefined); } else { const computedStyle = getComputedStyle(targetElement); - this.setSize([ + const width = targetElement.offsetWidth - - parseFloat(computedStyle['borderLeftWidth']) - - parseFloat(computedStyle['paddingLeft']) - - parseFloat(computedStyle['paddingRight']) - - parseFloat(computedStyle['borderRightWidth']), + parseFloat(computedStyle['borderLeftWidth']) - + parseFloat(computedStyle['paddingLeft']) - + parseFloat(computedStyle['paddingRight']) - + parseFloat(computedStyle['borderRightWidth']); + const height = targetElement.offsetHeight - - parseFloat(computedStyle['borderTopWidth']) - - parseFloat(computedStyle['paddingTop']) - - parseFloat(computedStyle['paddingBottom']) - - parseFloat(computedStyle['borderBottomWidth']), - ]); + parseFloat(computedStyle['borderTopWidth']) - + parseFloat(computedStyle['paddingTop']) - + parseFloat(computedStyle['paddingBottom']) - + parseFloat(computedStyle['borderBottomWidth']); + if (height === 0 || width === 0) { + // eslint-disable-next-line + console.warn( + "No map visible because the map container's width or height are 0." + ); + } + this.setSize([width, height]); } this.updateViewportSize_(); diff --git a/src/ol/Tile.js b/src/ol/Tile.js index e1fb33d809..cbdfb70703 100644 --- a/src/ol/Tile.js +++ b/src/ol/Tile.js @@ -76,7 +76,7 @@ class Tile extends EventTarget { /** * @param {import("./tilecoord.js").TileCoord} tileCoord Tile coordinate. * @param {import("./TileState.js").default} state State. - * @param {Options=} opt_options Tile options. + * @param {Options} [opt_options] Tile options. */ constructor(tileCoord, state, opt_options) { super(); diff --git a/src/ol/TileRange.js b/src/ol/TileRange.js index 35e5781515..319e8d554e 100644 --- a/src/ol/TileRange.js +++ b/src/ol/TileRange.js @@ -136,7 +136,7 @@ class TileRange { * @param {number} maxX Maximum X. * @param {number} minY Minimum Y. * @param {number} maxY Maximum Y. - * @param {TileRange=} tileRange TileRange. + * @param {TileRange} [tileRange] TileRange. * @return {TileRange} Tile range. */ export function createOrUpdate(minX, maxX, minY, maxY, tileRange) { diff --git a/src/ol/VectorRenderTile.js b/src/ol/VectorRenderTile.js index 782cd7860c..7f771fcdde 100644 --- a/src/ol/VectorRenderTile.js +++ b/src/ol/VectorRenderTile.js @@ -7,14 +7,14 @@ import {getUid} from './util.js'; /** * @typedef {Object} ReplayState - * @property {boolean} dirty - * @property {null|import("./render.js").OrderFunction} renderedRenderOrder - * @property {number} renderedTileRevision - * @property {number} renderedResolution - * @property {number} renderedRevision - * @property {number} renderedZ - * @property {number} renderedTileResolution - * @property {number} renderedTileZ + * @property {boolean} dirty Dirty. + * @property {null|import("./render.js").OrderFunction} renderedRenderOrder RenderedRenderOrder. + * @property {number} renderedTileRevision RenderedTileRevision. + * @property {number} renderedResolution RenderedResolution. + * @property {number} renderedRevision RenderedRevision. + * @property {number} renderedZ RenderedZ. + * @property {number} renderedTileResolution RenderedTileResolution. + * @property {number} renderedTileZ RenderedTileZ. */ /** @@ -45,6 +45,12 @@ class VectorRenderTile extends Tile { */ this.executorGroups = {}; + /** + * Executor groups for decluttering, by layer uid. Entries are read/written by the renderer. + * @type {Object>} + */ + this.declutterExecutorGroups = {}; + /** * Number of loading source tiles. Read/written by the source. * @type {number} @@ -164,6 +170,7 @@ class VectorRenderTile extends Tile { release() { for (const key in this.context_) { canvasPool.push(this.context_[key].canvas); + delete this.context_[key]; } super.release(); } diff --git a/src/ol/VectorTile.js b/src/ol/VectorTile.js index fb2e63605f..5f909344c8 100644 --- a/src/ol/VectorTile.js +++ b/src/ol/VectorTile.js @@ -11,7 +11,7 @@ class VectorTile extends Tile { * @param {string} src Data source url. * @param {import("./format/Feature.js").default} format Feature format. * @param {import("./Tile.js").LoadFunction} tileLoadFunction Tile load function. - * @param {import("./Tile.js").Options=} opt_options Tile options. + * @param {import("./Tile.js").Options} [opt_options] Tile options. */ constructor(tileCoord, state, src, format, tileLoadFunction, opt_options) { super(tileCoord, state, opt_options); @@ -63,6 +63,8 @@ class VectorTile extends Tile { * @type {string} */ this.url_ = src; + + this.key = src; } /** @@ -83,13 +85,6 @@ class VectorTile extends Tile { return this.features_; } - /** - * @return {string} Key. - */ - getKey() { - return this.url_; - } - /** * Load not yet loaded URI. */ diff --git a/src/ol/View.js b/src/ol/View.js index 4103cd0f48..e1cd60c174 100644 --- a/src/ol/View.js +++ b/src/ol/View.js @@ -54,25 +54,25 @@ import {fromExtent as polygonFromExtent} from './geom/Polygon.js'; * An animation configuration * * @typedef {Object} Animation - * @property {import("./coordinate.js").Coordinate} [sourceCenter] - * @property {import("./coordinate.js").Coordinate} [targetCenter] - * @property {number} [sourceResolution] - * @property {number} [targetResolution] - * @property {number} [sourceRotation] - * @property {number} [targetRotation] - * @property {import("./coordinate.js").Coordinate} [anchor] - * @property {number} start - * @property {number} duration - * @property {boolean} complete - * @property {function(number):number} easing - * @property {function(boolean):void} callback + * @property {import("./coordinate.js").Coordinate} [sourceCenter] Source center. + * @property {import("./coordinate.js").Coordinate} [targetCenter] Target center. + * @property {number} [sourceResolution] Source resolution. + * @property {number} [targetResolution] Target resolution. + * @property {number} [sourceRotation] Source rotation. + * @property {number} [targetRotation] Target rotation. + * @property {import("./coordinate.js").Coordinate} [anchor] Anchor. + * @property {number} start Start. + * @property {number} duration Duration. + * @property {boolean} complete Complete. + * @property {function(number):number} easing Easing. + * @property {function(boolean):void} callback Callback. */ /** * @typedef {Object} Constraints - * @property {import("./centerconstraint.js").Type} center - * @property {import("./resolutionconstraint.js").Type} resolution - * @property {import("./rotationconstraint.js").Type} rotation + * @property {import("./centerconstraint.js").Type} center Center. + * @property {import("./resolutionconstraint.js").Type} resolution Resolution. + * @property {import("./rotationconstraint.js").Type} rotation Rotation. */ /** @@ -175,6 +175,10 @@ import {fromExtent as polygonFromExtent} from './geom/Polygon.js'; * level used to calculate the initial resolution for the view. * @property {number} [zoomFactor=2] The zoom factor used to compute the * corresponding resolution. + * @property {!Array} [padding=[0, 0, 0, 0]] Padding (in css pixels). + * If the map viewport is partially covered with other content (overlays) along + * its edges, this setting allows to shift the center of the viewport away from + * that content. The order of the values is top, right, bottom, left. */ /** @@ -199,11 +203,11 @@ import {fromExtent as polygonFromExtent} from './geom/Polygon.js'; /** * @typedef {Object} State - * @property {import("./coordinate.js").Coordinate} center - * @property {import("./proj/Projection.js").default} projection - * @property {number} resolution - * @property {number} rotation - * @property {number} zoom + * @property {import("./coordinate.js").Coordinate} center Center. + * @property {import("./proj/Projection.js").default} projection Projection. + * @property {number} resolution Resolution. + * @property {number} rotation Rotation. + * @property {number} zoom Zoom. */ /** @@ -286,7 +290,7 @@ const DEFAULT_MIN_ZOOM = 0; */ class View extends BaseObject { /** - * @param {ViewOptions=} opt_options View options. + * @param {ViewOptions} [opt_options] View options. */ constructor(opt_options) { super(); @@ -394,6 +398,12 @@ class View extends BaseObject { */ this.resolutions_ = options.resolutions; + /** + * @type {Array|undefined} + * @private + */ + this.padding_ = options.padding; + /** * @private * @type {number} @@ -433,6 +443,36 @@ class View extends BaseObject { this.options_ = options; } + /** + * Padding (in css pixels). + * If the map viewport is partially covered with other content (overlays) along + * its edges, this setting allows to shift the center of the viewport away from that + * content. The order of the values in the array is top, right, bottom, left. + * The default is no padding, which is equivalent to `[0, 0, 0, 0]`. + * @type {Array|undefined} + * @api + */ + get padding() { + return this.padding_; + } + set padding(padding) { + let oldPadding = this.padding_; + this.padding_ = padding; + const center = this.getCenter(); + if (center) { + const newPadding = padding || [0, 0, 0, 0]; + oldPadding = oldPadding || [0, 0, 0, 0]; + const resolution = this.getResolution(); + const offsetX = + (resolution / 2) * + (newPadding[3] - oldPadding[3] + oldPadding[1] - newPadding[1]); + const offsetY = + (resolution / 2) * + (newPadding[0] - oldPadding[0] + oldPadding[2] - newPadding[2]); + this.setCenterInternal([center[0] + offsetX, center[1] - offsetY]); + } + } + /** * Get an updated version of the view options used to construct the view. The * current resolution (or zoom), center, and rotation are applied to any stored @@ -798,7 +838,7 @@ class View extends BaseObject { /** * Returns the current viewport size. * @private - * @param {number=} opt_rotation Take into account the rotation of the viewport when giving the size + * @param {number} [opt_rotation] Take into account the rotation of the viewport when giving the size * @return {import("./size.js").Size} Viewport size or `[100, 100]` when no viewport is found. */ getViewportSize_(opt_rotation) { @@ -822,7 +862,7 @@ class View extends BaseObject { * to avoid performance hit and layout reflow. * This should be done on map size change. * Note: the constraints are not resolved during an animation to avoid stopping it - * @param {import("./size.js").Size=} opt_size Viewport size; if undefined, [100, 100] is assumed + * @param {import("./size.js").Size} [opt_size] Viewport size; if undefined, [100, 100] is assumed */ setViewportSize(opt_size) { this.viewportSize_ = Array.isArray(opt_size) @@ -872,7 +912,7 @@ class View extends BaseObject { } /** - * @param {Array=} opt_hints Destination array. + * @param {Array} [opt_hints] Destination array. * @return {Array} Hint. */ getHints(opt_hints) { @@ -890,7 +930,7 @@ class View extends BaseObject { * The size is the pixel dimensions of the box into which the calculated extent * should fit. In most cases you want to get the extent of the entire map, * that is `map.getSize()`. - * @param {import("./size.js").Size=} opt_size Box pixel size. If not provided, the size + * @param {import("./size.js").Size} [opt_size] Box pixel size. If not provided, the size * of the map that uses this view will be used. * @return {import("./extent.js").Extent} Extent. * @api @@ -901,12 +941,12 @@ class View extends BaseObject { } /** - * @param {import("./size.js").Size=} opt_size Box pixel size. If not provided, the size of the - * first map that uses this view will be used. + * @param {import("./size.js").Size} [opt_size] Box pixel size. If not provided, + * the map's last known viewport size will be used. * @return {import("./extent.js").Extent} Extent. */ calculateExtentInternal(opt_size) { - const size = opt_size || this.getViewportSize_(); + const size = opt_size || this.getViewportSizeMinusPadding_(); const center = /** @type {!import("./coordinate.js").Coordinate} */ (this.getCenterInternal()); assert(center, 1); // The view center is not defined const resolution = /** @type {!number} */ (this.getResolution()); @@ -976,7 +1016,7 @@ class View extends BaseObject { } /** - * Set whether the view shoud allow intermediary zoom levels. + * Set whether the view should allow intermediary zoom levels. * @param {boolean} enabled Whether the resolution is constrained. * @api */ @@ -1016,7 +1056,7 @@ class View extends BaseObject { /** * Get the resolution for a provided extent (in map units) and size (in pixels). * @param {import("./extent.js").Extent} extent Extent. - * @param {import("./size.js").Size=} opt_size Box pixel size. + * @param {import("./size.js").Size} [opt_size] Box pixel size. * @return {number} The resolution at which the provided extent will render at * the given size. * @api @@ -1031,7 +1071,7 @@ class View extends BaseObject { /** * Get the resolution for a provided extent (in map units) and size (in pixels). * @param {import("./extent.js").Extent} extent Extent. - * @param {import("./size.js").Size=} opt_size Box pixel size. + * @param {import("./size.js").Size} [opt_size] Box pixel size. * @return {number} The resolution at which the provided extent will render at * the given size. */ @@ -1045,7 +1085,7 @@ class View extends BaseObject { /** * Return a function that returns a value between 0 and 1 for a * resolution. Exponential scaling is assumed. - * @param {number=} opt_power Power. + * @param {number} [opt_power] Power. * @return {function(number): number} Resolution for value function. */ getResolutionForValueFunction(opt_power) { @@ -1078,7 +1118,7 @@ class View extends BaseObject { /** * Return a function that returns a resolution for a value between * 0 and 1. Exponential scaling is assumed. - * @param {number=} opt_power Power. + * @param {number} [opt_power] Power. * @return {function(number): number} Value for resolution function. */ getValueForResolutionFunction(opt_power) { @@ -1098,14 +1138,43 @@ class View extends BaseObject { ); } + /** + * Returns the size of the viewport minus padding. + * @private + * @param {number} [opt_rotation] Take into account the rotation of the viewport when giving the size + * @return {import("./size.js").Size} Viewport size reduced by the padding. + */ + getViewportSizeMinusPadding_(opt_rotation) { + let size = this.getViewportSize_(opt_rotation); + const padding = this.padding_; + if (padding) { + size = [ + size[0] - padding[1] - padding[3], + size[1] - padding[0] - padding[2], + ]; + } + return size; + } + /** * @return {State} View state. */ getState() { - const center = /** @type {import("./coordinate.js").Coordinate} */ (this.getCenterInternal()); const projection = this.getProjection(); const resolution = /** @type {number} */ (this.getResolution()); const rotation = this.getRotation(); + let center = /** @type {import("./coordinate.js").Coordinate} */ (this.getCenterInternal()); + const padding = this.padding_; + if (padding) { + const reducedSize = this.getViewportSizeMinusPadding_(); + center = calculateCenterOn( + center, + this.getViewportSize_(), + [reducedSize[0] / 2 + padding[3], reducedSize[1] / 2 + padding[0]], + resolution, + rotation + ); + } return { center: center.slice(0), projection: projection !== undefined ? projection : null, @@ -1192,12 +1261,10 @@ class View extends BaseObject { * Takes care of the map angle. * @param {import("./geom/SimpleGeometry.js").default|import("./extent.js").Extent} geometryOrExtent The geometry or * extent to fit the view to. - * @param {FitOptions=} opt_options Options. + * @param {FitOptions} [opt_options] Options. * @api */ fit(geometryOrExtent, opt_options) { - const options = assign({size: this.getViewportSize_()}, opt_options || {}); - /** @type {import("./geom/SimpleGeometry.js").default} */ let geometry; assert( @@ -1228,18 +1295,18 @@ class View extends BaseObject { } } - this.fitInternal(geometry, options); + this.fitInternal(geometry, opt_options); } /** * @param {import("./geom/SimpleGeometry.js").default} geometry The geometry. - * @param {FitOptions=} opt_options Options. + * @param {FitOptions} [opt_options] Options. */ fitInternal(geometry, opt_options) { const options = opt_options || {}; let size = options.size; if (!size) { - size = this.getViewportSize_(); + size = this.getViewportSizeMinusPadding_(); } const padding = options.padding !== undefined ? options.padding : [0, 0, 0, 0]; @@ -1290,14 +1357,14 @@ class View extends BaseObject { centerRotY += ((padding[0] - padding[2]) / 2) * resolution; const centerX = centerRotX * cosAngle - centerRotY * sinAngle; const centerY = centerRotY * cosAngle + centerRotX * sinAngle; - const center = [centerX, centerY]; + const center = this.getConstrainedCenter([centerX, centerY], resolution); const callback = options.callback ? options.callback : VOID; if (options.duration !== undefined) { this.animateInternal( { resolution: resolution, - center: this.getConstrainedCenter(center, resolution), + center: center, duration: options.duration, easing: options.easing, }, @@ -1332,22 +1399,43 @@ class View extends BaseObject { * @param {import("./pixel.js").Pixel} position Position on the view to center on. */ centerOnInternal(coordinate, size, position) { - // calculate rotated position - const rotation = this.getRotation(); - const cosAngle = Math.cos(-rotation); - let sinAngle = Math.sin(-rotation); - let rotX = coordinate[0] * cosAngle - coordinate[1] * sinAngle; - let rotY = coordinate[1] * cosAngle + coordinate[0] * sinAngle; - const resolution = this.getResolution(); - rotX += (size[0] / 2 - position[0]) * resolution; - rotY += (position[1] - size[1] / 2) * resolution; + this.setCenterInternal( + calculateCenterOn( + coordinate, + size, + position, + this.getResolution(), + this.getRotation() + ) + ); + } - // go back to original angle - sinAngle = -sinAngle; // go back to original rotation - const centerX = rotX * cosAngle - rotY * sinAngle; - const centerY = rotY * cosAngle + rotX * sinAngle; - - this.setCenterInternal([centerX, centerY]); + /** + * Calculates the shift between map and viewport center. + * @param {import("./coordinate.js").Coordinate} center Center. + * @param {number} resolution Resolution. + * @param {number} rotation Rotation. + * @param {import("./size.js").Size} size Size. + * @return {Array|undefined} Center shift. + */ + calculateCenterShift(center, resolution, rotation, size) { + let centerShift; + const padding = this.padding_; + if (padding && center) { + const reducedSize = this.getViewportSizeMinusPadding_(-rotation); + const shiftedCenter = calculateCenterOn( + center, + size, + [reducedSize[0] / 2 + padding[3], reducedSize[1] / 2 + padding[0]], + resolution, + rotation + ); + centerShift = [ + center[0] - shiftedCenter[0], + center[1] - shiftedCenter[1], + ]; + } + return centerShift; } /** @@ -1386,7 +1474,7 @@ class View extends BaseObject { * Multiply the view resolution by a ratio, optionally using an anchor. Any resolution * constraint will apply. * @param {number} ratio The ratio to apply on the view resolution. - * @param {import("./coordinate.js").Coordinate=} opt_anchor The origin of the transformation. + * @param {import("./coordinate.js").Coordinate} [opt_anchor] The origin of the transformation. * @api */ adjustResolution(ratio, opt_anchor) { @@ -1399,7 +1487,7 @@ class View extends BaseObject { * Multiply the view resolution by a ratio, optionally using an anchor. Any resolution * constraint will apply. * @param {number} ratio The ratio to apply on the view resolution. - * @param {import("./coordinate.js").Coordinate=} opt_anchor The origin of the transformation. + * @param {import("./coordinate.js").Coordinate} [opt_anchor] The origin of the transformation. */ adjustResolutionInternal(ratio, opt_anchor) { const isMoving = this.getAnimating() || this.getInteracting(); @@ -1423,7 +1511,7 @@ class View extends BaseObject { * Adds a value to the view zoom level, optionally using an anchor. Any resolution * constraint will apply. * @param {number} delta Relative value to add to the zoom level. - * @param {import("./coordinate.js").Coordinate=} opt_anchor The origin of the transformation. + * @param {import("./coordinate.js").Coordinate} [opt_anchor] The origin of the transformation. * @api */ adjustZoom(delta, opt_anchor) { @@ -1434,7 +1522,7 @@ class View extends BaseObject { * Adds a value to the view rotation, optionally using an anchor. Any rotation * constraint will apply. * @param {number} delta Relative value to add to the zoom rotation, in radians. - * @param {import("./coordinate.js").Coordinate=} opt_anchor The rotation center. + * @param {import("./coordinate.js").Coordinate} [opt_anchor] The rotation center. * @api */ adjustRotation(delta, opt_anchor) { @@ -1446,7 +1534,7 @@ class View extends BaseObject { /** * @param {number} delta Relative value to add to the zoom rotation, in radians. - * @param {import("./coordinate.js").Coordinate=} opt_anchor The rotation center. + * @param {import("./coordinate.js").Coordinate} [opt_anchor] The rotation center. */ adjustRotationInternal(delta, opt_anchor) { const isMoving = this.getAnimating() || this.getInteracting(); @@ -1526,8 +1614,8 @@ class View extends BaseObject { * Recompute rotation/resolution/center based on target values. * Note: we have to compute rotation first, then resolution and center considering that * parameters can influence one another in case a view extent constraint is present. - * @param {boolean=} opt_doNotCancelAnims Do not cancel animations. - * @param {boolean=} opt_forceMoving Apply constraints as if the view is moving. + * @param {boolean} [opt_doNotCancelAnims] Do not cancel animations. + * @param {boolean} [opt_forceMoving] Apply constraints as if the view is moving. * @private */ applyTargetState_(opt_doNotCancelAnims, opt_forceMoving) { @@ -1550,7 +1638,13 @@ class View extends BaseObject { this.targetCenter_, newResolution, size, - isMoving + isMoving, + this.calculateCenterShift( + this.targetCenter_, + newResolution, + newRotation, + size + ) ); if (this.get(ViewProperty.ROTATION) !== newRotation) { @@ -1577,9 +1671,9 @@ class View extends BaseObject { * This is typically done on interaction end. * Note: calling this with a duration of 0 will apply the constrained values straight away, * without animation. - * @param {number=} opt_duration The animation duration in ms. - * @param {number=} opt_resolutionDirection Which direction to zoom. - * @param {import("./coordinate.js").Coordinate=} opt_anchor The origin of the transformation. + * @param {number} [opt_duration] The animation duration in ms. + * @param {number} [opt_resolutionDirection] Which direction to zoom. + * @param {import("./coordinate.js").Coordinate} [opt_anchor] The origin of the transformation. */ resolveConstraints(opt_duration, opt_resolutionDirection, opt_anchor) { const duration = opt_duration !== undefined ? opt_duration : 200; @@ -1595,7 +1689,14 @@ class View extends BaseObject { const newCenter = this.constraints_.center( this.targetCenter_, newResolution, - size + size, + false, + this.calculateCenterShift( + this.targetCenter_, + newResolution, + newRotation, + size + ) ); if (duration === 0 && !this.cancelAnchor_) { @@ -1646,9 +1747,9 @@ class View extends BaseObject { /** * Notify the View that an interaction has ended. The view state will be resolved * to a stable one if needed (depending on its constraints). - * @param {number=} opt_duration Animation duration in ms. - * @param {number=} opt_resolutionDirection Which direction to zoom. - * @param {import("./coordinate.js").Coordinate=} opt_anchor The origin of the transformation. + * @param {number} [opt_duration] Animation duration in ms. + * @param {number} [opt_resolutionDirection] Which direction to zoom. + * @param {import("./coordinate.js").Coordinate} [opt_anchor] The origin of the transformation. * @api */ endInteraction(opt_duration, opt_resolutionDirection, opt_anchor) { @@ -1660,9 +1761,9 @@ class View extends BaseObject { /** * Notify the View that an interaction has ended. The view state will be resolved * to a stable one if needed (depending on its constraints). - * @param {number=} opt_duration Animation duration in ms. - * @param {number=} opt_resolutionDirection Which direction to zoom. - * @param {import("./coordinate.js").Coordinate=} opt_anchor The origin of the transformation. + * @param {number} [opt_duration] Animation duration in ms. + * @param {number} [opt_resolutionDirection] Which direction to zoom. + * @param {import("./coordinate.js").Coordinate} [opt_anchor] The origin of the transformation. */ endInteractionInternal(opt_duration, opt_resolutionDirection, opt_anchor) { this.setHint(ViewHint.INTERACTING, -1); @@ -1673,7 +1774,7 @@ class View extends BaseObject { /** * Get a valid position for the view center according to the current constraints. * @param {import("./coordinate.js").Coordinate|undefined} targetCenter Target center position. - * @param {number=} opt_targetResolution Target resolution. If not supplied, the current one will be used. + * @param {number} [opt_targetResolution] Target resolution. If not supplied, the current one will be used. * This is useful to guess a valid center position at a different zoom level. * @return {import("./coordinate.js").Coordinate|undefined} Valid center position. */ @@ -1689,7 +1790,7 @@ class View extends BaseObject { /** * Get a valid zoom level according to the current view constraints. * @param {number|undefined} targetZoom Target zoom. - * @param {number=} [opt_direction=0] Indicate which resolution should be used + * @param {number} [opt_direction=0] Indicate which resolution should be used * by a renderer if the view resolution does not match any resolution of the tile source. * If 0, the nearest resolution will be used. If 1, the nearest lower resolution * will be used. If -1, the nearest higher resolution will be used. @@ -1705,7 +1806,7 @@ class View extends BaseObject { /** * Get a valid resolution according to the current view constraints. * @param {number|undefined} targetResolution Target resolution. - * @param {number=} [opt_direction=0] Indicate which resolution should be used + * @param {number} [opt_direction=0] Indicate which resolution should be used * by a renderer if the view resolution does not match any resolution of the tile source. * If 0, the nearest resolution will be used. If 1, the nearest lower resolution * will be used. If -1, the nearest higher resolution will be used. @@ -1936,4 +2037,29 @@ export function isNoopAnimation(animation) { return true; } +/** + * @param {import("./coordinate.js").Coordinate} coordinate Coordinate. + * @param {import("./size.js").Size} size Box pixel size. + * @param {import("./pixel.js").Pixel} position Position on the view to center on. + * @param {number} resolution Resolution. + * @param {number} rotation Rotation. + * @return {import("./coordinate.js").Coordinate} Shifted center. + */ +function calculateCenterOn(coordinate, size, position, resolution, rotation) { + // calculate rotated position + const cosAngle = Math.cos(-rotation); + let sinAngle = Math.sin(-rotation); + let rotX = coordinate[0] * cosAngle - coordinate[1] * sinAngle; + let rotY = coordinate[1] * cosAngle + coordinate[0] * sinAngle; + rotX += (size[0] / 2 - position[0]) * resolution; + rotY += (position[1] - size[1] / 2) * resolution; + + // go back to original angle + sinAngle = -sinAngle; // go back to original rotation + const centerX = rotX * cosAngle - rotY * sinAngle; + const centerY = rotY * cosAngle + rotX * sinAngle; + + return [centerX, centerY]; +} + export default View; diff --git a/src/ol/array.js b/src/ol/array.js index 578c096cc1..7f7090e509 100644 --- a/src/ol/array.js +++ b/src/ol/array.js @@ -8,7 +8,7 @@ * * @param {Array<*>} haystack Items to search through. * @param {*} needle The item to look for. - * @param {Function=} opt_comparator Comparator function. + * @param {Function} [opt_comparator] Comparator function. * @return {number} The index of the item if found, -1 if not. */ export function binarySearch(haystack, needle, opt_comparator) { @@ -222,8 +222,8 @@ export function findIndex(arr, func) { /** * @param {Array<*>} arr The array to test. - * @param {Function=} opt_func Comparison function. - * @param {boolean=} opt_strict Strictly sorted (default false). + * @param {Function} [opt_func] Comparison function. + * @param {boolean} [opt_strict] Strictly sorted (default false). * @return {boolean} Return index. */ export function isSorted(arr, opt_func, opt_strict) { diff --git a/src/ol/centerconstraint.js b/src/ol/centerconstraint.js index b024106275..56f6307a36 100644 --- a/src/ol/centerconstraint.js +++ b/src/ol/centerconstraint.js @@ -4,7 +4,7 @@ import {clamp} from './math.js'; /** - * @typedef {function((import("./coordinate.js").Coordinate|undefined), number, import("./size.js").Size, boolean=): (import("./coordinate.js").Coordinate|undefined)} Type + * @typedef {function((import("./coordinate.js").Coordinate|undefined), number, import("./size.js").Size, boolean=, Array=): (import("./coordinate.js").Coordinate|undefined)} Type */ /** @@ -20,17 +20,20 @@ export function createExtent(extent, onlyCenter, smooth) { * @param {import("./coordinate.js").Coordinate|undefined} center Center. * @param {number} resolution Resolution. * @param {import("./size.js").Size} size Viewport size; unused if `onlyCenter` was specified. - * @param {boolean=} opt_isMoving True if an interaction or animation is in progress. + * @param {boolean} [opt_isMoving] True if an interaction or animation is in progress. + * @param {Array} [opt_centerShift] Shift between map center and viewport center. * @return {import("./coordinate.js").Coordinate|undefined} Center. */ - function (center, resolution, size, opt_isMoving) { + function (center, resolution, size, opt_isMoving, opt_centerShift) { if (center) { const viewWidth = onlyCenter ? 0 : size[0] * resolution; const viewHeight = onlyCenter ? 0 : size[1] * resolution; - let minX = extent[0] + viewWidth / 2; - let maxX = extent[2] - viewWidth / 2; - let minY = extent[1] + viewHeight / 2; - let maxY = extent[3] - viewHeight / 2; + const shiftX = opt_centerShift ? opt_centerShift[0] : 0; + const shiftY = opt_centerShift ? opt_centerShift[1] : 0; + let minX = extent[0] + viewWidth / 2 + shiftX; + let maxX = extent[2] - viewWidth / 2 + shiftX; + let minY = extent[1] + viewHeight / 2 + shiftY; + let maxY = extent[3] - viewHeight / 2 + shiftY; // note: when zooming out of bounds, min and max values for x and y may // end up inverted (min > max); this has to be accounted for @@ -66,7 +69,7 @@ export function createExtent(extent, onlyCenter, smooth) { } /** - * @param {import("./coordinate.js").Coordinate=} center Center. + * @param {import("./coordinate.js").Coordinate} [center] Center. * @return {import("./coordinate.js").Coordinate|undefined} Center. */ export function none(center) { diff --git a/src/ol/control.js b/src/ol/control.js index 73ea893dd7..358083e6e4 100644 --- a/src/ol/control.js +++ b/src/ol/control.js @@ -41,7 +41,7 @@ export {default as ZoomToExtent} from './control/ZoomToExtent.js'; * * {@link module:ol/control/Rotate~Rotate} * * {@link module:ol/control/Attribution~Attribution} * - * @param {DefaultsOptions=} opt_options + * @param {DefaultsOptions} [opt_options] * Defaults options. * @return {Collection} * Controls. diff --git a/src/ol/control/Attribution.js b/src/ol/control/Attribution.js index 12eb3c570d..b8ccc8f1ee 100644 --- a/src/ol/control/Attribution.js +++ b/src/ol/control/Attribution.js @@ -23,9 +23,13 @@ import {removeChildren, replaceNode} from '../dom.js'; * @property {string} [label='i'] Text label to use for the * collapsed attributions button. * Instead of text, also an element (e.g. a `span` element) can be used. + * @property {string} [expandClassName=className + '-expand'] CSS class name for the + * collapsed attributions button. * @property {string|HTMLElement} [collapseLabel='»'] Text label to use * for the expanded attributions button. * Instead of text, also an element (e.g. a `span` element) can be used. + * @property {string} [collapseClassName=className + '-collapse'] CSS class name for the + * expanded attributions button. * @property {function(import("../MapEvent.js").default):void} [render] Function called when * the control should be re-rendered. This is called in a `requestAnimationFrame` * callback. @@ -42,7 +46,7 @@ import {removeChildren, replaceNode} from '../dom.js'; */ class Attribution extends Control { /** - * @param {Options=} opt_options Attribution options. + * @param {Options} [opt_options] Attribution options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -66,6 +70,12 @@ class Attribution extends Control { this.collapsed_ = options.collapsed !== undefined ? options.collapsed : true; + /** + * @private + * @type {boolean} + */ + this.userCollapsed_ = this.collapsed_; + /** * @private * @type {boolean} @@ -89,9 +99,19 @@ class Attribution extends Control { const tipLabel = options.tipLabel !== undefined ? options.tipLabel : 'Attributions'; + const expandClassName = + options.expandClassName !== undefined + ? options.expandClassName + : className + '-expand'; + const collapseLabel = options.collapseLabel !== undefined ? options.collapseLabel : '\u00BB'; + const collapseClassName = + options.collapseClassName !== undefined + ? options.collapseClassName + : className + '-collpase'; + if (typeof collapseLabel === 'string') { /** * @private @@ -99,6 +119,7 @@ class Attribution extends Control { */ this.collapseLabel_ = document.createElement('span'); this.collapseLabel_.textContent = collapseLabel; + this.collapseLabel_.className = collapseClassName; } else { this.collapseLabel_ = collapseLabel; } @@ -112,6 +133,7 @@ class Attribution extends Control { */ this.label_ = document.createElement('span'); this.label_.textContent = label; + this.label_.className = expandClassName; } else { this.label_ = label; } @@ -175,6 +197,7 @@ class Attribution extends Control { */ const visibleAttributions = []; + let collapsible = true; const layerStatesArray = frameState.layerStatesArray; for (let i = 0, ii = layerStatesArray.length; i < ii; ++i) { const layerState = layerStatesArray[i]; @@ -197,12 +220,8 @@ class Attribution extends Control { continue; } - if ( - !this.overrideCollapsible_ && - source.getAttributionsCollapsible() === false - ) { - this.setCollapsible(false); - } + collapsible = + collapsible && source.getAttributionsCollapsible() !== false; if (Array.isArray(attributions)) { for (let j = 0, jj = attributions.length; j < jj; ++j) { @@ -218,6 +237,9 @@ class Attribution extends Control { } } } + if (!this.overrideCollapsible_) { + this.setCollapsible(collapsible); + } return visibleAttributions; } @@ -265,6 +287,7 @@ class Attribution extends Control { handleClick_(event) { event.preventDefault(); this.handleToggle_(); + this.userCollapsed_ = this.collapsed_; } /** @@ -300,7 +323,7 @@ class Attribution extends Control { } this.collapsible_ = collapsible; this.element.classList.toggle('ol-uncollapsible'); - if (!collapsible && this.collapsed_) { + if (this.userCollapsed_) { this.handleToggle_(); } } @@ -313,6 +336,7 @@ class Attribution extends Control { * @api */ setCollapsed(collapsed) { + this.userCollapsed_ = collapsed; if (!this.collapsible_ || this.collapsed_ === collapsed) { return; } diff --git a/src/ol/control/FullScreen.js b/src/ol/control/FullScreen.js index 0cd11711e2..b29a827cf0 100644 --- a/src/ol/control/FullScreen.js +++ b/src/ol/control/FullScreen.js @@ -39,6 +39,10 @@ const FullScreenEventType = { * Instead of text, also an element (e.g. a `span` element) can be used. * @property {string|Text} [labelActive='\u00d7'] Text label to use for the * button when full-screen is active. + * @property {string} [activeClassName=className + '-true'] CSS class name for the button + * when full-screen is active. + * @property {string} [inactiveClassName=className + '-false'] CSS class name for the button + * when full-screen is inactive. * Instead of text, also an element (e.g. a `span` element) can be used. * @property {string} [tipLabel='Toggle full-screen'] Text label to use for the button tip. * @property {boolean} [keys=false] Full keyboard access. @@ -57,7 +61,7 @@ const FullScreenEventType = { * element introduced using this parameter will be displayed in full screen. * * When in full screen mode, a close button is shown to exit full screen mode. - * The [Fullscreen API](http://www.w3.org/TR/fullscreen/) is used to + * The [Fullscreen API](https://www.w3.org/TR/fullscreen/) is used to * toggle the map in full screen mode. * * @fires FullScreenEventType#enterfullscreen @@ -66,7 +70,7 @@ const FullScreenEventType = { */ class FullScreen extends Control { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -83,6 +87,24 @@ class FullScreen extends Control { this.cssClassName_ = options.className !== undefined ? options.className : 'ol-full-screen'; + /** + * @private + * @type {Array} + */ + this.activeClassName_ = + options.activeClassName !== undefined + ? options.activeClassName.split(' ') + : [this.cssClassName_ + '-true']; + + /** + * @private + * @type {Array} + */ + this.inactiveClassName_ = + options.inactiveClassName !== undefined + ? options.inactiveClassName.split(' ') + : [this.cssClassName_ + '-false']; + const label = options.label !== undefined ? options.label : '\u2922'; /** @@ -212,12 +234,12 @@ class FullScreen extends Control { * @private */ setClassName_(element, fullscreen) { - const activeClassName = this.cssClassName_ + '-true'; - const inactiveClassName = this.cssClassName_ + '-false'; + const activeClassName = this.activeClassName_; + const inactiveClassName = this.inactiveClassName_; const nextClassName = fullscreen ? activeClassName : inactiveClassName; - element.classList.remove(activeClassName); - element.classList.remove(inactiveClassName); - element.classList.add(nextClassName); + element.classList.remove(...activeClassName); + element.classList.remove(...inactiveClassName); + element.classList.add(...nextClassName); } /** diff --git a/src/ol/control/MousePosition.js b/src/ol/control/MousePosition.js index 10dae0d11d..be69cad9cb 100644 --- a/src/ol/control/MousePosition.js +++ b/src/ol/control/MousePosition.js @@ -54,7 +54,7 @@ const COORDINATE_FORMAT = 'coordinateFormat'; */ class MousePosition extends Control { /** - * @param {Options=} opt_options Mouse position options. + * @param {Options} [opt_options] Mouse position options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index 6258005646..aab527e568 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -74,7 +74,7 @@ class ControlledMap extends PluggableMap { */ class OverviewMap extends Control { /** - * @param {Options=} opt_options OverviewMap options. + * @param {Options} [opt_options] OverviewMap options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; diff --git a/src/ol/control/Rotate.js b/src/ol/control/Rotate.js index 3c4043451a..0005b7aabf 100644 --- a/src/ol/control/Rotate.js +++ b/src/ol/control/Rotate.js @@ -12,6 +12,7 @@ import {easeOut} from '../easing.js'; * @property {string|HTMLElement} [label='⇧'] Text label to use for the rotate button. * Instead of text, also an element (e.g. a `span` element) can be used. * @property {string} [tipLabel='Reset rotation'] Text label to use for the rotate tip. + * @property {string} [compassClassName='ol-compass'] CSS class name for the compass. * @property {number} [duration=250] Animation duration in milliseconds. * @property {boolean} [autoHide=true] Hide the control when rotation is 0. * @property {function(import("../MapEvent.js").default):void} [render] Function called when the control should @@ -32,7 +33,7 @@ import {easeOut} from '../easing.js'; */ class Rotate extends Control { /** - * @param {Options=} opt_options Rotate options. + * @param {Options} [opt_options] Rotate options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -48,6 +49,11 @@ class Rotate extends Control { const label = options.label !== undefined ? options.label : '\u21E7'; + const compassClassName = + options.compassClassName !== undefined + ? options.compassClassName + : 'ol-compass'; + /** * @type {HTMLElement} * @private @@ -56,11 +62,11 @@ class Rotate extends Control { if (typeof label === 'string') { this.label_ = document.createElement('span'); - this.label_.className = 'ol-compass'; + this.label_.className = compassClassName; this.label_.textContent = label; } else { this.label_ = label; - this.label_.classList.add('ol-compass'); + this.label_.classList.add(compassClassName); } const tipLabel = options.tipLabel ? options.tipLabel : 'Reset rotation'; diff --git a/src/ol/control/ScaleLine.js b/src/ol/control/ScaleLine.js index 00d8974bde..10af5361ab 100644 --- a/src/ol/control/ScaleLine.js +++ b/src/ol/control/ScaleLine.js @@ -73,7 +73,7 @@ const DEFAULT_DPI = 25.4 / 0.28; */ class ScaleLine extends Control { /** - * @param {Options=} opt_options Scale line options. + * @param {Options} [opt_options] Scale line options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -329,7 +329,7 @@ class ScaleLine extends Control { * @param {number} width The current width of the scalebar. * @param {number} scale The current scale. * @param {string} suffix The suffix to append to the scale text. - * @returns {string} The stringified HTML of the scalebar. + * @return {string} The stringified HTML of the scalebar. */ createScaleBar(width, scale, suffix) { const mapScale = @@ -400,9 +400,9 @@ class ScaleLine extends Control { /** * Creates a marker at given position - * @param {string} position - The position, absolute or relative - * @param {number} i - The iterator - * @returns {string} The stringified div containing the marker + * @param {string} position The position, absolute or relative + * @param {number} i The iterator + * @return {string} The stringified div containing the marker */ createMarker(position, i) { const top = position === 'absolute' ? 3 : -10; @@ -421,12 +421,12 @@ class ScaleLine extends Control { /** * Creates the label for a marker marker at given position - * @param {number} i - The iterator - * @param {number} width - The width the scalebar will currently use - * @param {boolean} isLast - Flag indicating if we add the last step text - * @param {number} scale - The current scale for the whole scalebar - * @param {string} suffix - The suffix for the scale - * @returns {string} The stringified div containing the step text + * @param {number} i The iterator + * @param {number} width The width the scalebar will currently use + * @param {boolean} isLast Flag indicating if we add the last step text + * @param {number} scale The current scale for the whole scalebar + * @param {string} suffix The suffix for the scale + * @return {string} The stringified div containing the step text */ createStepText(i, width, isLast, scale, suffix) { const length = @@ -468,7 +468,7 @@ class ScaleLine extends Control { ); const dpi = this.dpi_ || DEFAULT_DPI; const mpu = this.viewState_.projection.getMetersPerUnit(); - const inchesPerMeter = 39.37; + const inchesPerMeter = 1000 / 25.4; return parseFloat(resolution.toString()) * mpu * inchesPerMeter * dpi; } diff --git a/src/ol/control/Zoom.js b/src/ol/control/Zoom.js index b2ac5dae04..a8dff2825b 100644 --- a/src/ol/control/Zoom.js +++ b/src/ol/control/Zoom.js @@ -10,6 +10,8 @@ import {easeOut} from '../easing.js'; * @typedef {Object} Options * @property {number} [duration=250] Animation duration in milliseconds. * @property {string} [className='ol-zoom'] CSS class name. + * @property {string} [zoomInClassName=className + '-in'] CSS class name for the zoom-in button. + * @property {string} [zoomOutClassName=className + '-out'] CSS class name for the zoom-out button. * @property {string|HTMLElement} [zoomInLabel='+'] Text label to use for the zoom-in * button. Instead of text, also an element (e.g. a `span` element) can be used. * @property {string|HTMLElement} [zoomOutLabel='-'] Text label to use for the zoom-out button. @@ -31,7 +33,7 @@ import {easeOut} from '../easing.js'; */ class Zoom extends Control { /** - * @param {Options=} opt_options Zoom options. + * @param {Options} [opt_options] Zoom options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -46,6 +48,16 @@ class Zoom extends Control { const delta = options.delta !== undefined ? options.delta : 1; + const zoomInClassName = + options.zoomInClassName !== undefined + ? options.zoomInClassName + : className + '-in'; + + const zoomOutClassName = + options.zoomOutClassName !== undefined + ? options.zoomOutClassName + : className + '-out'; + const zoomInLabel = options.zoomInLabel !== undefined ? options.zoomInLabel : '+'; const zoomOutLabel = @@ -59,7 +71,7 @@ class Zoom extends Control { : 'Zoom out'; const inElement = document.createElement('button'); - inElement.className = className + '-in'; + inElement.className = zoomInClassName; inElement.setAttribute('type', 'button'); inElement.title = zoomInTipLabel; inElement.appendChild( @@ -75,7 +87,7 @@ class Zoom extends Control { ); const outElement = document.createElement('button'); - outElement.className = className + '-out'; + outElement.className = zoomOutClassName; outElement.setAttribute('type', 'button'); outElement.title = zoomOutTipLabel; outElement.appendChild( diff --git a/src/ol/control/ZoomSlider.js b/src/ol/control/ZoomSlider.js index 0387f0bfc3..2d4e7724cc 100644 --- a/src/ol/control/ZoomSlider.js +++ b/src/ol/control/ZoomSlider.js @@ -41,7 +41,7 @@ const Direction = { */ class ZoomSlider extends Control { /** - * @param {Options=} opt_options Zoom slider options. + * @param {Options} [opt_options] Zoom slider options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -52,7 +52,7 @@ class ZoomSlider extends Control { }); /** - * @type {!Array.} + * @type {!Array} * @private */ this.dragListenerKeys_ = []; @@ -250,9 +250,10 @@ class ZoomSlider extends Control { if (this.dragListenerKeys_.length === 0) { const drag = this.handleDraggerDrag_; const end = this.handleDraggerEnd_; + const doc = this.getMap().getOwnerDocument(); this.dragListenerKeys_.push( - listen(document, PointerEventType.POINTERMOVE, drag, this), - listen(document, PointerEventType.POINTERUP, end, this) + listen(doc, PointerEventType.POINTERMOVE, drag, this), + listen(doc, PointerEventType.POINTERUP, end, this) ); } } diff --git a/src/ol/control/ZoomToExtent.js b/src/ol/control/ZoomToExtent.js index 68ddcc3c88..d883244cd6 100644 --- a/src/ol/control/ZoomToExtent.js +++ b/src/ol/control/ZoomToExtent.js @@ -27,7 +27,7 @@ import {fromExtent as polygonFromExtent} from '../geom/Polygon.js'; */ class ZoomToExtent extends Control { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; diff --git a/src/ol/coordinate.js b/src/ol/coordinate.js index d34e8cecf9..4be1010142 100644 --- a/src/ol/coordinate.js +++ b/src/ol/coordinate.js @@ -135,7 +135,7 @@ export function closestOnSegment(coordinate, segment) { * var out = stringifyFunc(coord); * // out is now '7.85, 47.98' * - * @param {number=} opt_fractionDigits The number of digits to include + * @param {number} [opt_fractionDigits] The number of digits to include * after the decimal point. Default is `0`. * @return {CoordinateFormat} Coordinate format. * @api @@ -155,7 +155,7 @@ export function createStringXY(opt_fractionDigits) { /** * @param {string} hemispheres Hemispheres. * @param {number} degrees Degrees. - * @param {number=} opt_fractionDigits The number of digits to include + * @param {number} [opt_fractionDigits] The number of digits to include * after the decimal point. Default is `0`. * @return {string} String. */ @@ -219,7 +219,7 @@ export function degreesToStringHDMS(hemispheres, degrees, opt_fractionDigits) { * @param {Coordinate} coordinate Coordinate. * @param {string} template A template string with `{x}` and `{y}` placeholders * that will be replaced by first and second coordinate values. - * @param {number=} opt_fractionDigits The number of digits to include + * @param {number} [opt_fractionDigits] The number of digits to include * after the decimal point. Default is `0`. * @return {string} Formatted coordinate. * @api @@ -354,7 +354,7 @@ export function squaredDistanceToSegment(coordinate, segment) { * // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E' * * @param {Coordinate} coordinate Coordinate. - * @param {number=} opt_fractionDigits The number of digits to include + * @param {number} [opt_fractionDigits] The number of digits to include * after the decimal point. Default is `0`. * @return {string} Hemisphere, degrees, minutes and seconds. * @api @@ -391,7 +391,7 @@ export function toStringHDMS(coordinate, opt_fractionDigits) { * // out is now '7.8, 48.0' * * @param {Coordinate} coordinate Coordinate. - * @param {number=} opt_fractionDigits The number of digits to include + * @param {number} [opt_fractionDigits] The number of digits to include * after the decimal point. Default is `0`. * @return {string} XY. * @api @@ -422,7 +422,7 @@ export function wrapX(coordinate, projection) { /** * @param {Coordinate} coordinate Coordinate. * @param {import("./proj/Projection.js").default} projection Projection. - * @param {number=} opt_sourceExtentWidth Width of the source extent. + * @param {number} [opt_sourceExtentWidth] Width of the source extent. * @return {number} Offset in world widths. */ export function getWorldsAway(coordinate, projection, opt_sourceExtentWidth) { diff --git a/src/ol/css.js b/src/ol/css.js index b7eb38b0bf..1175a9949a 100644 --- a/src/ol/css.js +++ b/src/ol/css.js @@ -4,13 +4,13 @@ /** * @typedef {Object} FontParameters - * @property {string} style - * @property {string} variant - * @property {string} weight - * @property {string} size - * @property {string} lineHeight - * @property {string} family - * @property {Array} families + * @property {string} style Style. + * @property {string} variant Variant. + * @property {string} weight Weight. + * @property {string} size Size. + * @property {string} lineHeight LineHeight. + * @property {string} family Family. + * @property {Array} families Families. */ /** @@ -63,7 +63,7 @@ export const CLASS_CONTROL = 'ol-control'; export const CLASS_COLLAPSED = 'ol-collapsed'; /** - * From http://stackoverflow.com/questions/10135697/regex-to-parse-any-css-font + * From https://stackoverflow.com/questions/10135697/regex-to-parse-any-css-font * @type {RegExp} */ const fontRegEx = new RegExp( diff --git a/src/ol/dom.js b/src/ol/dom.js index 1c392cce21..3b251301a7 100644 --- a/src/ol/dom.js +++ b/src/ol/dom.js @@ -7,9 +7,9 @@ import {WORKER_OFFSCREEN_CANVAS} from './has.js'; //FIXME Move this function to the canvas module /** * Create an html canvas element and returns its 2d context. - * @param {number=} opt_width Canvas width. - * @param {number=} opt_height Canvas height. - * @param {Array=} opt_canvasPool Canvas pool to take existing canvas from. + * @param {number} [opt_width] Canvas width. + * @param {number} [opt_height] Canvas height. + * @param {Array} [opt_canvasPool] Canvas pool to take existing canvas from. * @return {CanvasRenderingContext2D} The context. */ export function createCanvasContext2D(opt_width, opt_height, opt_canvasPool) { @@ -72,7 +72,7 @@ export function replaceNode(newNode, oldNode) { /** * @param {Node} node The node to remove. - * @returns {Node} The node that was removed or null. + * @return {Node} The node that was removed or null. */ export function removeNode(node) { return node && node.parentNode ? node.parentNode.removeChild(node) : null; diff --git a/src/ol/events.js b/src/ol/events.js index 8bd12b7b6e..c7b3e8db0d 100644 --- a/src/ol/events.js +++ b/src/ol/events.js @@ -6,9 +6,9 @@ import {clear} from './obj.js'; /** * Key to use with {@link module:ol/Observable~Observable#unByKey}. * @typedef {Object} EventsKey - * @property {ListenerFunction} listener - * @property {import("./events/Target.js").EventTargetLike} target - * @property {string} type + * @property {ListenerFunction} listener Listener. + * @property {import("./events/Target.js").EventTargetLike} target Target. + * @property {string} type Type. * @api */ @@ -22,7 +22,7 @@ import {clear} from './obj.js'; /** * @typedef {Object} ListenerObject - * @property {ListenerFunction} handleEvent + * @property {ListenerFunction} handleEvent HandleEvent listener function. */ /** @@ -39,9 +39,9 @@ import {clear} from './obj.js'; * @param {import("./events/Target.js").EventTargetLike} target Event target. * @param {string} type Event type. * @param {ListenerFunction} listener Listener. - * @param {Object=} opt_this Object referenced by the `this` keyword in the + * @param {Object} [opt_this] Object referenced by the `this` keyword in the * listener. Default is the `target`. - * @param {boolean=} opt_once If true, add the listener as one-off listener. + * @param {boolean} [opt_once] If true, add the listener as one-off listener. * @return {EventsKey} Unique key for the listener. */ export function listen(target, type, listener, opt_this, opt_once) { @@ -80,7 +80,7 @@ export function listen(target, type, listener, opt_this, opt_once) { * @param {import("./events/Target.js").EventTargetLike} target Event target. * @param {string} type Event type. * @param {ListenerFunction} listener Listener. - * @param {Object=} opt_this Object referenced by the `this` keyword in the + * @param {Object} [opt_this] Object referenced by the `this` keyword in the * listener. Default is the `target`. * @return {EventsKey} Key for unlistenByKey. */ diff --git a/src/ol/events/Target.js b/src/ol/events/Target.js index e8e4967acd..4a2299de9e 100644 --- a/src/ol/events/Target.js +++ b/src/ol/events/Target.js @@ -27,7 +27,7 @@ import {clear} from '../obj.js'; */ class Target extends Disposable { /** - * @param {*=} opt_target Default event target for dispatched events. + * @param {*} [opt_target] Default event target for dispatched events. */ constructor(opt_target) { super(); @@ -147,7 +147,7 @@ class Target extends Disposable { } /** - * @param {string=} opt_type Type. If not provided, + * @param {string} [opt_type] Type. If not provided, * `true` will be returned if this event target has any listeners. * @return {boolean} Has listeners. */ diff --git a/src/ol/events/condition.js b/src/ol/events/condition.js index f6551ac0fd..f4bc8abf06 100644 --- a/src/ol/events/condition.js +++ b/src/ol/events/condition.js @@ -248,7 +248,7 @@ export const mouseOnly = function (mapBrowserEvent) { const pointerEvent = /** @type {import("../MapBrowserEvent").default} */ (mapBrowserEvent) .originalEvent; assert(pointerEvent !== undefined, 56); // mapBrowserEvent must originate from a pointer event - // see http://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType + // see https://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType return pointerEvent.pointerType == 'mouse'; }; @@ -263,7 +263,7 @@ export const touchOnly = function (mapBrowserEvent) { const pointerEvt = /** @type {import("../MapBrowserEvent").default} */ (mapBrowserEvent) .originalEvent; assert(pointerEvt !== undefined, 56); // mapBrowserEvent must originate from a pointer event - // see http://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType + // see https://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType return pointerEvt.pointerType === 'touch'; }; @@ -278,14 +278,14 @@ export const penOnly = function (mapBrowserEvent) { const pointerEvt = /** @type {import("../MapBrowserEvent").default} */ (mapBrowserEvent) .originalEvent; assert(pointerEvt !== undefined, 56); // mapBrowserEvent must originate from a pointer event - // see http://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType + // see https://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType return pointerEvt.pointerType === 'pen'; }; /** * Return `true` if the event originates from a primary pointer in * contact with the surface or if the left mouse button is pressed. - * See http://www.w3.org/TR/pointerevents/#button-states. + * See https://www.w3.org/TR/pointerevents/#button-states. * * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. * @return {boolean} True if the event originates from a primary pointer. diff --git a/src/ol/extent.js b/src/ol/extent.js index 0a8f5225e2..a9c20bc445 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -29,7 +29,7 @@ export function boundingExtent(coordinates) { /** * @param {Array} xs Xs. * @param {Array} ys Ys. - * @param {Extent=} opt_extent Destination extent. + * @param {Extent} [opt_extent] Destination extent. * @private * @return {Extent} Extent. */ @@ -45,7 +45,7 @@ function _boundingExtentXYs(xs, ys, opt_extent) { * Return extent increased by the provided value. * @param {Extent} extent Extent. * @param {number} value The amount by which the extent should be buffered. - * @param {Extent=} opt_extent Extent. + * @param {Extent} [opt_extent] Extent. * @return {Extent} Extent. * @api */ @@ -70,7 +70,7 @@ export function buffer(extent, value, opt_extent) { * Creates a clone of an extent. * * @param {Extent} extent Extent to clone. - * @param {Extent=} opt_extent Extent. + * @param {Extent} [opt_extent] Extent. * @return {Extent} The clone. */ export function clone(extent, opt_extent) { @@ -202,7 +202,7 @@ export function createEmpty() { * @param {number} minY Minimum Y. * @param {number} maxX Maximum X. * @param {number} maxY Maximum Y. - * @param {Extent=} opt_extent Destination extent. + * @param {Extent} [opt_extent] Destination extent. * @return {Extent} Extent. */ export function createOrUpdate(minX, minY, maxX, maxY, opt_extent) { @@ -219,7 +219,7 @@ export function createOrUpdate(minX, minY, maxX, maxY, opt_extent) { /** * Create a new empty extent or make the provided one empty. - * @param {Extent=} opt_extent Extent. + * @param {Extent} [opt_extent] Extent. * @return {Extent} Extent. */ export function createOrUpdateEmpty(opt_extent) { @@ -228,7 +228,7 @@ export function createOrUpdateEmpty(opt_extent) { /** * @param {import("./coordinate.js").Coordinate} coordinate Coordinate. - * @param {Extent=} opt_extent Extent. + * @param {Extent} [opt_extent] Extent. * @return {Extent} Extent. */ export function createOrUpdateFromCoordinate(coordinate, opt_extent) { @@ -239,7 +239,7 @@ export function createOrUpdateFromCoordinate(coordinate, opt_extent) { /** * @param {Array} coordinates Coordinates. - * @param {Extent=} opt_extent Extent. + * @param {Extent} [opt_extent] Extent. * @return {Extent} Extent. */ export function createOrUpdateFromCoordinates(coordinates, opt_extent) { @@ -252,7 +252,7 @@ export function createOrUpdateFromCoordinates(coordinates, opt_extent) { * @param {number} offset Offset. * @param {number} end End. * @param {number} stride Stride. - * @param {Extent=} opt_extent Extent. + * @param {Extent} [opt_extent] Extent. * @return {Extent} Extent. */ export function createOrUpdateFromFlatCoordinates( @@ -268,7 +268,7 @@ export function createOrUpdateFromFlatCoordinates( /** * @param {Array>} rings Rings. - * @param {Extent=} opt_extent Extent. + * @param {Extent} [opt_extent] Extent. * @return {Extent} Extent. */ export function createOrUpdateFromRings(rings, opt_extent) { @@ -521,7 +521,7 @@ export function getEnlargedArea(extent1, extent2) { * @param {number} resolution Resolution. * @param {number} rotation Rotation. * @param {import("./size.js").Size} size Size. - * @param {Extent=} opt_extent Destination extent. + * @param {Extent} [opt_extent] Destination extent. * @return {Extent} Extent. */ export function getForViewAndSize( @@ -582,7 +582,7 @@ export function getIntersectionArea(extent1, extent2) { * Get the intersection of two extents. * @param {Extent} extent1 Extent 1. * @param {Extent} extent2 Extent 2. - * @param {Extent=} opt_extent Optional extent to populate with intersection. + * @param {Extent} [opt_extent] Optional extent to populate with intersection. * @return {Extent} Intersecting extent. * @api */ @@ -691,7 +691,7 @@ export function isEmpty(extent) { /** * @param {Extent} extent Extent. - * @param {Extent=} opt_extent Extent. + * @param {Extent} [opt_extent] Extent. * @return {Extent} Extent. */ export function returnOrUpdate(extent, opt_extent) { @@ -788,8 +788,8 @@ export function intersectsSegment(extent, start, end) { * @param {Extent} extent Extent. * @param {import("./proj.js").TransformFunction} transformFn Transform function. * Called with `[minX, minY, maxX, maxY]` extent coordinates. - * @param {Extent=} opt_extent Destination extent. - * @param {number=} opt_stops Number of stops per side used for the transform. + * @param {Extent} [opt_extent] Destination extent. + * @param {number} [opt_stops] Number of stops per side used for the transform. * By default only the corners are used. * @return {Extent} Extent. * @api diff --git a/src/ol/featureloader.js b/src/ol/featureloader.js index c80007a707..6c146b1b63 100644 --- a/src/ol/featureloader.js +++ b/src/ol/featureloader.js @@ -15,16 +15,22 @@ let withCredentials = false; * {@link module:ol/source/Vector} sources use a function of this type to * load features. * - * This function takes an {@link module:ol/extent~Extent} representing the area to be loaded, - * a `{number}` representing the resolution (map units per pixel) and an - * {@link module:ol/proj/Projection} for the projection as - * arguments. `this` within the function is bound to the + * This function takes up to 5 arguments. These are an {@link module:ol/extent~Extent} representing + * the area to be loaded, a `{number}` representing the resolution (map units per pixel), an + * {@link module:ol/proj/Projection} for the projection, an optional success callback that should get + * the loaded features passed as an argument and an optional failure callback with no arguments. If + * the callbacks are not used, the corresponding vector source will not fire `'featuresloadend'` and + * `'featuresloaderror'` events. `this` within the function is bound to the * {@link module:ol/source/Vector} it's called from. * * The function is responsible for loading the features and adding them to the * source. - * @typedef {function(this:(import("./source/Vector").default|import("./VectorTile.js").default), import("./extent.js").Extent, number, - * import("./proj/Projection.js").default): void} FeatureLoader + * @typedef {function(this:(import("./source/Vector").default|import("./VectorTile.js").default), + * import("./extent.js").Extent, + * number, + * import("./proj/Projection.js").default, + * function(Array): void=, + * function(): void=): void} FeatureLoader * @api */ @@ -43,81 +49,77 @@ let withCredentials = false; /** * @param {string|FeatureUrlFunction} url Feature URL service. * @param {import("./format/Feature.js").default} format Feature format. - * @param {function(this:import("./VectorTile.js").default, Array, import("./proj/Projection.js").default, import("./extent.js").Extent): void|function(this:import("./source/Vector").default, Array): void} success - * Function called with the loaded features and optionally with the data - * projection. Called with the vector tile or source as `this`. - * @param {function(this:import("./VectorTile.js").default): void|function(this:import("./source/Vector").default): void} failure - * Function called when loading failed. Called with the vector tile or - * source as `this`. - * @return {FeatureLoader} The feature loader. + * @param {import("./extent.js").Extent} extent Extent. + * @param {number} resolution Resolution. + * @param {import("./proj/Projection.js").default} projection Projection. + * @param {function(Array, import("./proj/Projection.js").default): void} success Success + * Function called with the loaded features and optionally with the data projection. + * @param {function(): void} failure Failure + * Function called when loading failed. */ -export function loadFeaturesXhr(url, format, success, failure) { - return ( - /** - * @param {import("./extent.js").Extent} extent Extent. - * @param {number} resolution Resolution. - * @param {import("./proj/Projection.js").default} projection Projection. - * @this {import("./source/Vector").default|import("./VectorTile.js").default} - */ - function (extent, resolution, projection) { - const xhr = new XMLHttpRequest(); - xhr.open( - 'GET', - typeof url === 'function' ? url(extent, resolution, projection) : url, - true - ); - if (format.getType() == FormatType.ARRAY_BUFFER) { - xhr.responseType = 'arraybuffer'; - } - xhr.withCredentials = withCredentials; - /** - * @param {Event} event Event. - * @private - */ - xhr.onload = function (event) { - // status will be 0 for file:// urls - if (!xhr.status || (xhr.status >= 200 && xhr.status < 300)) { - const type = format.getType(); - /** @type {Document|Node|Object|string|undefined} */ - let source; - if (type == FormatType.JSON || type == FormatType.TEXT) { - source = xhr.responseText; - } else if (type == FormatType.XML) { - source = xhr.responseXML; - if (!source) { - source = new DOMParser().parseFromString( - xhr.responseText, - 'application/xml' - ); - } - } else if (type == FormatType.ARRAY_BUFFER) { - source = /** @type {ArrayBuffer} */ (xhr.response); - } - if (source) { - success.call( - this, - format.readFeatures(source, { - extent: extent, - featureProjection: projection, - }), - format.readProjection(source) - ); - } else { - failure.call(this); - } - } else { - failure.call(this); - } - }.bind(this); - /** - * @private - */ - xhr.onerror = function () { - failure.call(this); - }.bind(this); - xhr.send(); - } +export function loadFeaturesXhr( + url, + format, + extent, + resolution, + projection, + success, + failure +) { + const xhr = new XMLHttpRequest(); + xhr.open( + 'GET', + typeof url === 'function' ? url(extent, resolution, projection) : url, + true ); + if (format.getType() == FormatType.ARRAY_BUFFER) { + xhr.responseType = 'arraybuffer'; + } + xhr.withCredentials = withCredentials; + /** + * @param {Event} event Event. + * @private + */ + xhr.onload = function (event) { + // status will be 0 for file:// urls + if (!xhr.status || (xhr.status >= 200 && xhr.status < 300)) { + const type = format.getType(); + /** @type {Document|Node|Object|string|undefined} */ + let source; + if (type == FormatType.JSON || type == FormatType.TEXT) { + source = xhr.responseText; + } else if (type == FormatType.XML) { + source = xhr.responseXML; + if (!source) { + source = new DOMParser().parseFromString( + xhr.responseText, + 'application/xml' + ); + } + } else if (type == FormatType.ARRAY_BUFFER) { + source = /** @type {ArrayBuffer} */ (xhr.response); + } + if (source) { + success( + /** @type {Array} */ + (format.readFeatures(source, { + extent: extent, + featureProjection: projection, + })), + format.readProjection(source) + ); + } else { + failure(); + } + } else { + failure(); + } + }; + /** + * @private + */ + xhr.onerror = failure; + xhr.send(); } /** @@ -130,25 +132,38 @@ export function loadFeaturesXhr(url, format, success, failure) { * @api */ export function xhr(url, format) { - return loadFeaturesXhr( - url, - format, - /** - * @param {Array} features The loaded features. - * @param {import("./proj/Projection.js").default} dataProjection Data - * projection. - * @this {import("./source/Vector").default|import("./VectorTile.js").default} - */ - function (features, dataProjection) { - const sourceOrTile = /** @type {?} */ (this); - if (typeof sourceOrTile.addFeatures === 'function') { - /** @type {import("./source/Vector").default} */ (sourceOrTile).addFeatures( - features - ); - } - }, - /* FIXME handle error */ VOID - ); + /** + * @param {import("./extent.js").Extent} extent Extent. + * @param {number} resolution Resolution. + * @param {import("./proj/Projection.js").default} projection Projection. + * @param {function(): void} [success] Success + * Function called when loading succeeded. + * @param {function(): void} [failure] Failure + * Function called when loading failed. + * @this {import("./source/Vector").default} + */ + return function (extent, resolution, projection, success, failure) { + const source = /** @type {import("./source/Vector").default} */ (this); + loadFeaturesXhr( + url, + format, + extent, + resolution, + projection, + /** + * @param {Array} features The loaded features. + * @param {import("./proj/Projection.js").default} dataProjection Data + * projection. + */ + function (features, dataProjection) { + if (success !== undefined) { + success(features); + } + source.addFeatures(features); + }, + /* FIXME handle error */ failure ? failure : VOID + ); + }; } /** diff --git a/src/ol/format/EsriJSON.js b/src/ol/format/EsriJSON.js index 77973fdf2c..5b17a7f43b 100644 --- a/src/ol/format/EsriJSON.js +++ b/src/ol/format/EsriJSON.js @@ -78,7 +78,7 @@ GEOMETRY_WRITERS[GeometryType.MULTI_POLYGON] = writeMultiPolygonGeometry; */ class EsriJSON extends JSONFeature { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -95,8 +95,8 @@ class EsriJSON extends JSONFeature { /** * @param {Object} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. - * @param {string=} opt_idField Name of the field where to get the id from. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. + * @param {string} [opt_idField] Name of the field where to get the id from. * @protected * @return {import("../Feature.js").default} Feature. */ @@ -120,7 +120,7 @@ class EsriJSON extends JSONFeature { /** * @param {Object} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {Array} Features. */ @@ -148,7 +148,7 @@ class EsriJSON extends JSONFeature { /** * @param {EsriJSONGeometry} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {import("../geom/Geometry.js").default} Geometry. */ @@ -180,7 +180,7 @@ class EsriJSON extends JSONFeature { * Encode a geometry as a EsriJSON object. * * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {EsriJSONGeometry} Object. * @api */ @@ -192,7 +192,7 @@ class EsriJSON extends JSONFeature { * Encode a feature as a esriJSON Feature object. * * @param {import("../Feature.js").default} feature Feature. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {Object} Object. * @api */ @@ -207,16 +207,14 @@ class EsriJSON extends JSONFeature { const geometry = feature.getGeometry(); if (geometry) { object['geometry'] = writeGeometry(geometry, opt_options); - if (opt_options && opt_options.featureProjection) { + const projection = + opt_options && + (opt_options.dataProjection || opt_options.featureProjection); + if (projection) { object['geometry'][ 'spatialReference' ] = /** @type {EsriJSONSpatialReferenceWkid} */ ({ - wkid: Number( - getProjection(opt_options.featureProjection) - .getCode() - .split(':') - .pop() - ), + wkid: Number(getProjection(projection).getCode().split(':').pop()), }); } delete properties[feature.getGeometryName()]; @@ -233,7 +231,7 @@ class EsriJSON extends JSONFeature { * Encode an array of features as a EsriJSON object. * * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {EsriJSONFeatureSet} EsriJSON Object. * @api */ @@ -251,7 +249,7 @@ class EsriJSON extends JSONFeature { /** * @param {EsriJSONGeometry} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../geom/Geometry.js").default} Geometry. */ function readGeometry(object, opt_options) { @@ -431,7 +429,7 @@ function readPolygonGeometry(object) { /** * @param {import("../geom/Point.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {EsriJSONPoint} EsriJSON geometry. */ function writePointGeometry(geometry, opt_options) { @@ -483,7 +481,7 @@ function getHasZM(geometry) { /** * @param {import("../geom/LineString.js").default} lineString Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {EsriJSONPolyline} EsriJSON geometry. */ function writeLineStringGeometry(lineString, opt_options) { @@ -499,7 +497,7 @@ function writeLineStringGeometry(lineString, opt_options) { /** * @param {import("../geom/Polygon.js").default} polygon Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {EsriJSONPolygon} EsriJSON geometry. */ function writePolygonGeometry(polygon, opt_options) { @@ -516,7 +514,7 @@ function writePolygonGeometry(polygon, opt_options) { /** * @param {import("../geom/MultiLineString.js").default} multiLineString Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {EsriJSONPolyline} EsriJSON geometry. */ function writeMultiLineStringGeometry(multiLineString, opt_options) { @@ -530,7 +528,7 @@ function writeMultiLineStringGeometry(multiLineString, opt_options) { /** * @param {import("../geom/MultiPoint.js").default} multiPoint Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {EsriJSONMultipoint} EsriJSON geometry. */ function writeMultiPointGeometry(multiPoint, opt_options) { @@ -544,7 +542,7 @@ function writeMultiPointGeometry(multiPoint, opt_options) { /** * @param {import("../geom/MultiPolygon.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {EsriJSONPolygon} EsriJSON geometry. */ function writeMultiPolygonGeometry(geometry, opt_options) { @@ -565,7 +563,7 @@ function writeMultiPolygonGeometry(geometry, opt_options) { /** * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {EsriJSONGeometry} EsriJSON geometry. */ function writeGeometry(geometry, opt_options) { diff --git a/src/ol/format/Feature.js b/src/ol/format/Feature.js index e3473eae9a..67cecd902c 100644 --- a/src/ol/format/Feature.js +++ b/src/ol/format/Feature.js @@ -67,21 +67,21 @@ class FeatureFormat { constructor() { /** * @protected - * @type {import("../proj/Projection.js").default} + * @type {import("../proj/Projection.js").default|undefined} */ - this.dataProjection = null; + this.dataProjection = undefined; /** * @protected - * @type {import("../proj/Projection.js").default} + * @type {import("../proj/Projection.js").default|undefined} */ - this.defaultFeatureProjection = null; + this.defaultFeatureProjection = undefined; } /** * Adds the data projection to the read options. * @param {Document|Element|Object|string} source Source. - * @param {ReadOptions=} opt_options Options. + * @param {ReadOptions} [opt_options] Options. * @return {ReadOptions|undefined} Options. * @protected */ @@ -139,7 +139,7 @@ class FeatureFormat { * * @abstract * @param {Document|Element|Object|string} source Source. - * @param {ReadOptions=} opt_options Read options. + * @param {ReadOptions} [opt_options] Read options. * @return {import("../Feature.js").FeatureLike} Feature. */ readFeature(source, opt_options) { @@ -151,7 +151,7 @@ class FeatureFormat { * * @abstract * @param {Document|Element|ArrayBuffer|Object|string} source Source. - * @param {ReadOptions=} opt_options Read options. + * @param {ReadOptions} [opt_options] Read options. * @return {Array} Features. */ readFeatures(source, opt_options) { @@ -163,7 +163,7 @@ class FeatureFormat { * * @abstract * @param {Document|Element|Object|string} source Source. - * @param {ReadOptions=} opt_options Read options. + * @param {ReadOptions} [opt_options] Read options. * @return {import("../geom/Geometry.js").default} Geometry. */ readGeometry(source, opt_options) { @@ -175,7 +175,7 @@ class FeatureFormat { * * @abstract * @param {Document|Element|Object|string} source Source. - * @return {import("../proj/Projection.js").default} Projection. + * @return {import("../proj/Projection.js").default|undefined} Projection. */ readProjection(source) { return abstract(); @@ -186,7 +186,7 @@ class FeatureFormat { * * @abstract * @param {import("../Feature.js").default} feature Feature. - * @param {WriteOptions=} opt_options Write options. + * @param {WriteOptions} [opt_options] Write options. * @return {string} Result. */ writeFeature(feature, opt_options) { @@ -198,7 +198,7 @@ class FeatureFormat { * * @abstract * @param {Array} features Features. - * @param {WriteOptions=} opt_options Write options. + * @param {WriteOptions} [opt_options] Write options. * @return {string} Result. */ writeFeatures(features, opt_options) { @@ -210,7 +210,7 @@ class FeatureFormat { * * @abstract * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {WriteOptions=} opt_options Write options. + * @param {WriteOptions} [opt_options] Write options. * @return {string} Result. */ writeGeometry(geometry, opt_options) { @@ -223,7 +223,7 @@ export default FeatureFormat; /** * @param {import("../geom/Geometry.js").default} geometry Geometry. * @param {boolean} write Set to true for writing, false for reading. - * @param {(WriteOptions|ReadOptions)=} opt_options Options. + * @param {WriteOptions|ReadOptions} [opt_options] Options. * @return {import("../geom/Geometry.js").default} Transformed geometry. */ export function transformGeometryWithOptions(geometry, write, opt_options) { @@ -277,7 +277,7 @@ export function transformGeometryWithOptions(geometry, write, opt_options) { /** * @param {import("../extent.js").Extent} extent Extent. - * @param {ReadOptions=} opt_options Read options. + * @param {ReadOptions} [opt_options] Read options. * @return {import("../extent.js").Extent} Transformed extent. */ export function transformExtentWithOptions(extent, opt_options) { diff --git a/src/ol/format/GML.js b/src/ol/format/GML.js index 5763af23c2..0577902018 100644 --- a/src/ol/format/GML.js +++ b/src/ol/format/GML.js @@ -9,7 +9,7 @@ import GML3 from './GML3.js'; * version 3.1.1. * Currently only supports GML 3.1.1 Simple Features profile. * - * @param {import("./GMLBase.js").Options=} opt_options + * @param {import("./GMLBase.js").Options} [opt_options] * Optional configuration object. * @api */ @@ -20,7 +20,7 @@ const GML = GML3; * * @function * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @return {string} Result. * @api */ @@ -31,7 +31,7 @@ GML.prototype.writeFeatures; * * @function * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @return {Node} Node. * @api */ diff --git a/src/ol/format/GML2.js b/src/ol/format/GML2.js index 0d2cb67be8..300f27fc29 100644 --- a/src/ol/format/GML2.js +++ b/src/ol/format/GML2.js @@ -49,7 +49,7 @@ const MULTIGEOMETRY_TO_MEMBER_NODENAME = { */ class GML2 extends GMLBase { /** - * @param {import("./GMLBase.js").Options=} opt_options Optional configuration object. + * @param {import("./GMLBase.js").Options} [opt_options] Optional configuration object. */ constructor(opt_options) { const options = @@ -170,7 +170,7 @@ class GML2 extends GMLBase { * @const * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Element|undefined} Node. * @private */ @@ -356,7 +356,7 @@ class GML2 extends GMLBase { /** * @param {string} namespaceURI XML namespace. - * @returns {Element} coordinates node. + * @return {Element} coordinates node. * @private */ createCoordinatesNode_(namespaceURI) { @@ -434,7 +434,7 @@ class GML2 extends GMLBase { /** * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Node} Node. * @private */ @@ -476,8 +476,8 @@ class GML2 extends GMLBase { /** * @param {Array} point Point geometry. - * @param {string=} opt_srsName Optional srsName - * @param {boolean=} opt_hasZ whether the geometry has a Z coordinate (is 3D) or not. + * @param {string} [opt_srsName] Optional srsName + * @param {boolean} [opt_hasZ] whether the geometry has a Z coordinate (is 3D) or not. * @return {string} The coords string. * @private */ @@ -636,7 +636,7 @@ class GML2 extends GMLBase { * @const * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Node|undefined} Node. * @private */ diff --git a/src/ol/format/GML3.js b/src/ol/format/GML3.js index fb67e703ee..50fb0572eb 100644 --- a/src/ol/format/GML3.js +++ b/src/ol/format/GML3.js @@ -1,6 +1,7 @@ /** * @module ol/format/GML3 */ +import GML2 from './GML2.js'; import GMLBase, {GMLNS} from './GMLBase.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; @@ -61,7 +62,7 @@ const MULTIGEOMETRY_TO_MEMBER_NODENAME = { */ class GML3 extends GMLBase { /** - * @param {import("./GMLBase.js").Options=} opt_options Optional configuration object. + * @param {import("./GMLBase.js").Options} [opt_options] Optional configuration object. */ constructor(opt_options) { const options = @@ -465,8 +466,8 @@ class GML3 extends GMLBase { /** * @param {Array} point Point geometry. - * @param {string=} opt_srsName Optional srsName - * @param {boolean=} opt_hasZ whether the geometry has a Z coordinate (is 3D) or not. + * @param {string} [opt_srsName] Optional srsName + * @param {boolean} [opt_hasZ] whether the geometry has a Z coordinate (is 3D) or not. * @return {string} The coords string. * @private */ @@ -572,7 +573,7 @@ class GML3 extends GMLBase { /** * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Node} Node. * @private */ @@ -919,7 +920,7 @@ class GML3 extends GMLBase { * @const * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Node|undefined} Node. * @private */ @@ -935,7 +936,7 @@ class GML3 extends GMLBase { * @const * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Element|undefined} Node. * @private */ @@ -967,7 +968,7 @@ class GML3 extends GMLBase { * Encode a geometry in GML 3.1.1 Simple Features. * * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @return {Node} Node. * @api */ @@ -994,7 +995,7 @@ class GML3 extends GMLBase { * Encode an array of features in the GML 3.1.1 format as an XML node. * * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @return {Element} Node. * @api */ @@ -1032,6 +1033,7 @@ GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS = { 'http://www.opengis.net/gml': { 'pos': makeReplacer(GML3.prototype.readFlatPos), 'posList': makeReplacer(GML3.prototype.readFlatPosList), + 'coordinates': makeReplacer(GML2.prototype.readFlatCoordinates), }, }; @@ -1167,7 +1169,7 @@ GML3.prototype.SEGMENTS_PARSERS = { * * @function * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @return {string} Result. * @api */ diff --git a/src/ol/format/GML32.js b/src/ol/format/GML32.js index 25cd9babb3..5e6dec6a89 100644 --- a/src/ol/format/GML32.js +++ b/src/ol/format/GML32.js @@ -1,6 +1,7 @@ /** * @module ol/format/GML32 */ +import GML2 from './GML2.js'; import GML3 from './GML3.js'; import GMLBase from './GMLBase.js'; import {makeArrayPusher, makeChildAppender, makeReplacer} from '../xml.js'; @@ -13,7 +14,7 @@ import {writeStringTextNode} from '../format/xsd.js'; */ class GML32 extends GML3 { /** - * @param {import("./GMLBase.js").Options=} opt_options Optional configuration object. + * @param {import("./GMLBase.js").Options} [opt_options] Optional configuration object. */ constructor(opt_options) { const options = /** @type {import("./GMLBase.js").Options} */ (opt_options @@ -41,6 +42,7 @@ GML32.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS = { 'http://www.opengis.net/gml/3.2': { 'pos': makeReplacer(GML3.prototype.readFlatPos), 'posList': makeReplacer(GML3.prototype.readFlatPosList), + 'coordinates': makeReplacer(GML2.prototype.readFlatCoordinates), }, }; diff --git a/src/ol/format/GMLBase.js b/src/ol/format/GMLBase.js index 2c90cd2413..afbffa04f5 100644 --- a/src/ol/format/GMLBase.js +++ b/src/ol/format/GMLBase.js @@ -93,7 +93,7 @@ const ONLY_WHITESPACE_RE = /^[\s\xa0]*$/; */ class GMLBase extends XMLFeature { /** - * @param {Options=} opt_options Optional configuration object. + * @param {Options} [opt_options] Optional configuration object. */ constructor(opt_options) { super(); @@ -150,7 +150,11 @@ class GMLBase extends XMLFeature { objectStack, this ); - } else if (localName == 'featureMembers' || localName == 'featureMember') { + } else if ( + localName == 'featureMembers' || + localName == 'featureMember' || + localName == 'member' + ) { const context = objectStack[0]; let featureType = context['featureType']; let featureNS = context['featureNS']; @@ -214,7 +218,7 @@ class GMLBase extends XMLFeature { } parsersNS[featureNS[p]] = parsers; } - if (localName == 'featureMember') { + if (localName == 'featureMember' || localName == 'member') { features = pushParseAndPop(undefined, parsersNS, node, objectStack); } else { features = pushParseAndPop([], parsersNS, node, objectStack); @@ -528,7 +532,7 @@ class GMLBase extends XMLFeature { /** * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @protected * @return {import("../geom/Geometry.js").default|import("../extent.js").Extent} Geometry. */ @@ -542,7 +546,7 @@ class GMLBase extends XMLFeature { /** * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {Array} Features. */ readFeaturesFromNode(node, opt_options) { diff --git a/src/ol/format/GPX.js b/src/ol/format/GPX.js index baf23abf3b..9ac50dc18b 100644 --- a/src/ol/format/GPX.js +++ b/src/ol/format/GPX.js @@ -109,8 +109,8 @@ const GPX_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, { /** * @typedef {Object} LayoutOptions - * @property {boolean} [hasZ] - * @property {boolean} [hasM] + * @property {boolean} [hasZ] HasZ. + * @property {boolean} [hasM] HasM. */ /** @@ -131,7 +131,7 @@ const GPX_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, { */ class GPX extends XMLFeature { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -170,7 +170,7 @@ class GPX extends XMLFeature { /** * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {import("../Feature.js").default} Feature. */ readFeatureFromNode(node, opt_options) { @@ -193,7 +193,7 @@ class GPX extends XMLFeature { /** * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {Array} Features. */ readFeaturesFromNode(node, opt_options) { @@ -221,7 +221,7 @@ class GPX extends XMLFeature { * as tracks (``). * * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @return {Node} Node. * @api */ @@ -508,7 +508,7 @@ const GEOMETRY_TYPE_TO_NODENAME = { /** * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Node|undefined} Node. */ function GPX_NODE_FACTORY(value, objectStack, opt_nodeName) { @@ -557,7 +557,7 @@ function appendCoordinate(flatCoordinates, layoutOptions, node, values) { * * @param {LayoutOptions} layoutOptions Layout options. * @param {Array} flatCoordinates Flat coordinates. - * @param {Array=} ends Ends. + * @param {Array} [ends] Ends. * @return {import("../geom/GeometryLayout.js").default} Layout. */ function applyLayoutOptions(layoutOptions, flatCoordinates, ends) { diff --git a/src/ol/format/GeoJSON.js b/src/ol/format/GeoJSON.js index 583215bdfc..3ef5d15beb 100644 --- a/src/ol/format/GeoJSON.js +++ b/src/ol/format/GeoJSON.js @@ -51,7 +51,7 @@ import {transformGeometryWithOptions} from './Feature.js'; */ class GeoJSON extends JSONFeature { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -86,7 +86,7 @@ class GeoJSON extends JSONFeature { /** * @param {Object} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {import("../Feature.js").default} Feature. */ @@ -129,7 +129,7 @@ class GeoJSON extends JSONFeature { /** * @param {Object} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {Array} Features. */ @@ -154,7 +154,7 @@ class GeoJSON extends JSONFeature { /** * @param {GeoJSONGeometry} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {import("../geom/Geometry.js").default} Geometry. */ @@ -188,7 +188,7 @@ class GeoJSON extends JSONFeature { * Encode a feature as a GeoJSON Feature object. * * @param {import("../Feature.js").default} feature Feature. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONFeature} Object. * @api */ @@ -230,7 +230,7 @@ class GeoJSON extends JSONFeature { * Encode an array of features as a GeoJSON object. * * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONFeatureCollection} GeoJSON Object. * @api */ @@ -250,7 +250,7 @@ class GeoJSON extends JSONFeature { * Encode a geometry as a GeoJSON object. * * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONGeometry|GeoJSONGeometryCollection} Object. * @api */ @@ -261,7 +261,7 @@ class GeoJSON extends JSONFeature { /** * @param {GeoJSONGeometry|GeoJSONGeometryCollection} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../geom/Geometry.js").default} Geometry. */ function readGeometry(object, opt_options) { @@ -321,7 +321,7 @@ function readGeometry(object, opt_options) { /** * @param {GeoJSONGeometryCollection} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {GeometryCollection} Geometry collection. */ function readGeometryCollectionGeometry(object, opt_options) { @@ -387,7 +387,7 @@ function readPolygonGeometry(object) { /** * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONGeometry} GeoJSON geometry. */ function writeGeometry(geometry, opt_options) { @@ -462,7 +462,7 @@ function writeGeometry(geometry, opt_options) { /** * @param {GeometryCollection} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONGeometryCollection} GeoJSON geometry collection. */ function writeGeometryCollectionGeometry(geometry, opt_options) { @@ -479,7 +479,7 @@ function writeGeometryCollectionGeometry(geometry, opt_options) { /** * @param {LineString} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONGeometry} GeoJSON geometry. */ function writeLineStringGeometry(geometry, opt_options) { @@ -491,7 +491,7 @@ function writeLineStringGeometry(geometry, opt_options) { /** * @param {MultiLineString} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONGeometry} GeoJSON geometry. */ function writeMultiLineStringGeometry(geometry, opt_options) { @@ -503,7 +503,7 @@ function writeMultiLineStringGeometry(geometry, opt_options) { /** * @param {MultiPoint} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONGeometry} GeoJSON geometry. */ function writeMultiPointGeometry(geometry, opt_options) { @@ -515,7 +515,7 @@ function writeMultiPointGeometry(geometry, opt_options) { /** * @param {MultiPolygon} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONGeometry} GeoJSON geometry. */ function writeMultiPolygonGeometry(geometry, opt_options) { @@ -531,7 +531,7 @@ function writeMultiPolygonGeometry(geometry, opt_options) { /** * @param {Point} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONGeometry} GeoJSON geometry. */ function writePointGeometry(geometry, opt_options) { @@ -543,7 +543,7 @@ function writePointGeometry(geometry, opt_options) { /** * @param {Polygon} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {GeoJSONGeometry} GeoJSON geometry. */ function writePolygonGeometry(geometry, opt_options) { diff --git a/src/ol/format/IGC.js b/src/ol/format/IGC.js index 441abce9bb..d519fb5cd4 100644 --- a/src/ol/format/IGC.js +++ b/src/ol/format/IGC.js @@ -62,7 +62,7 @@ const NEWLINE_RE = /\r\n|\r|\n/; */ class IGC extends TextFeature { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -86,7 +86,7 @@ class IGC extends TextFeature { /** * @protected * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../Feature.js").default} Feature. */ readFeatureFromText(text, opt_options) { @@ -166,7 +166,7 @@ class IGC extends TextFeature { /** * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {Array} Features. */ diff --git a/src/ol/format/IIIFInfo.js b/src/ol/format/IIIFInfo.js index 15ee9136ab..37b7e7baa8 100644 --- a/src/ol/format/IIIFInfo.js +++ b/src/ol/format/IIIFInfo.js @@ -3,6 +3,7 @@ */ import {assert} from '../asserts.js'; +import {includes} from '../array.js'; /** * @typedef {Object} PreferredOptions @@ -245,10 +246,10 @@ function generateVersion3Options(iiifInfo) { iiifInfo.imageInfo.preferredFormats.length > 0 ? iiifInfo.imageInfo.preferredFormats .filter(function (format) { - return ['jpg', 'png', 'gif'].includes(format); + return includes(['jpg', 'png', 'gif'], format); }) .reduce(function (acc, format) { - return acc === undefined && formats.includes(format) + return acc === undefined && includes(formats, format) ? format : acc; }, undefined) @@ -326,7 +327,7 @@ class IIIFInfo { } /** - * @returns {Versions} Major IIIF version. + * @return {Versions} Major IIIF version. * @api */ getImageApiVersion() { @@ -363,7 +364,7 @@ class IIIFInfo { /** * @param {Versions} version Optional IIIF image API version - * @returns {string} Compliance level as it appears in the IIIF image information + * @return {string} Compliance level as it appears in the IIIF image information * response. */ getComplianceLevelEntryFromProfile(version) { @@ -406,7 +407,7 @@ class IIIFInfo { /** * @param {Versions} version Optional IIIF image API version - * @returns {string} Compliance level, on of 'level0', 'level1' or 'level2' or undefined + * @return {string} Compliance level, on of 'level0', 'level1' or 'level2' or undefined */ getComplianceLevelFromProfile(version) { const complianceLevel = this.getComplianceLevelEntryFromProfile(version); @@ -418,7 +419,7 @@ class IIIFInfo { } /** - * @returns {SupportedFeatures} Image formats, qualities and region / size calculation + * @return {SupportedFeatures} Image formats, qualities and region / size calculation * methods that are supported by the IIIF service. */ getComplianceLevelSupportedFeatures() { @@ -434,8 +435,8 @@ class IIIFInfo { } /** - * @param {PreferredOptions=} opt_preferredOptions Optional options for preferred format and quality. - * @returns {import("../source/IIIF.js").Options} IIIF tile source ready constructor options. + * @param {PreferredOptions} [opt_preferredOptions] Optional options for preferred format and quality. + * @return {import("../source/IIIF.js").Options} IIIF tile source ready constructor options. * @api */ getTileSourceOptions(opt_preferredOptions) { @@ -456,16 +457,16 @@ class IIIFInfo { sizes: imageOptions.sizes, format: options.format !== undefined && - imageOptions.formats.includes(options.format) + includes(imageOptions.formats, options.format) ? options.format : imageOptions.preferredFormat !== undefined ? imageOptions.preferredFormat : 'jpg', supports: imageOptions.supports, quality: - options.quality && imageOptions.qualities.includes(options.quality) + options.quality && includes(imageOptions.qualities, options.quality) ? options.quality - : imageOptions.qualities.includes('native') + : includes(imageOptions.qualities, 'native') ? 'native' : 'default', resolutions: Array.isArray(imageOptions.resolutions) diff --git a/src/ol/format/JSONFeature.js b/src/ol/format/JSONFeature.js index 020b6dc114..b83ac8b1e9 100644 --- a/src/ol/format/JSONFeature.js +++ b/src/ol/format/JSONFeature.js @@ -30,7 +30,7 @@ class JSONFeature extends FeatureFormat { * read a feature collection. * * @param {ArrayBuffer|Document|Element|Object|string} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../Feature.js").default} Feature. * @api */ @@ -46,7 +46,7 @@ class JSONFeature extends FeatureFormat { * collection. * * @param {ArrayBuffer|Document|Element|Object|string} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {Array} Features. * @api */ @@ -60,7 +60,7 @@ class JSONFeature extends FeatureFormat { /** * @abstract * @param {Object} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {import("../Feature.js").default} Feature. */ @@ -71,7 +71,7 @@ class JSONFeature extends FeatureFormat { /** * @abstract * @param {Object} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {Array} Features. */ @@ -83,7 +83,7 @@ class JSONFeature extends FeatureFormat { * Read a geometry. * * @param {ArrayBuffer|Document|Element|Object|string} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../geom/Geometry.js").default} Geometry. * @api */ @@ -97,7 +97,7 @@ class JSONFeature extends FeatureFormat { /** * @abstract * @param {Object} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {import("../geom/Geometry.js").default} Geometry. */ @@ -130,7 +130,7 @@ class JSONFeature extends FeatureFormat { * Encode a feature as string. * * @param {import("../Feature.js").default} feature Feature. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {string} Encoded feature. * @api */ @@ -141,7 +141,7 @@ class JSONFeature extends FeatureFormat { /** * @abstract * @param {import("../Feature.js").default} feature Feature. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {Object} Object. */ writeFeatureObject(feature, opt_options) { @@ -152,7 +152,7 @@ class JSONFeature extends FeatureFormat { * Encode an array of features as string. * * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {string} Encoded features. * @api */ @@ -163,7 +163,7 @@ class JSONFeature extends FeatureFormat { /** * @abstract * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {Object} Object. */ writeFeaturesObject(features, opt_options) { @@ -174,7 +174,7 @@ class JSONFeature extends FeatureFormat { * Encode a geometry as string. * * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {string} Encoded geometry. * @api */ @@ -185,7 +185,7 @@ class JSONFeature extends FeatureFormat { /** * @abstract * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {Object} Object. */ writeGeometryObject(geometry, opt_options) { diff --git a/src/ol/format/KML.js b/src/ol/format/KML.js index 0b2badd950..e2c9e0dd2a 100644 --- a/src/ol/format/KML.js +++ b/src/ol/format/KML.js @@ -56,17 +56,17 @@ import {transformGeometryWithOptions} from './Feature.js'; /** * @typedef {Object} Vec2 - * @property {number} x - * @property {import("../style/IconAnchorUnits").default} xunits - * @property {number} y - * @property {import("../style/IconAnchorUnits").default} yunits - * @property {import("../style/IconOrigin.js").default} origin + * @property {number} x X coordinate. + * @property {import("../style/IconAnchorUnits").default} xunits Units of x. + * @property {number} y Y coordinate. + * @property {import("../style/IconAnchorUnits").default} yunits Units of Y. + * @property {import("../style/IconOrigin.js").default} origin Origin. */ /** * @typedef {Object} GxTrackObject - * @property {Array} flatCoordinates - * @property {Array} whens + * @property {Array} flatCoordinates Flat coordinates. + * @property {Array} whens Whens. */ /** @@ -126,7 +126,7 @@ const PLACEMARK_PARSERS = makeStructureNS( 'name': makeObjectPropertySetter(readString), 'open': makeObjectPropertySetter(readBoolean), 'phoneNumber': makeObjectPropertySetter(readString), - 'styleUrl': makeObjectPropertySetter(readURI), + 'styleUrl': makeObjectPropertySetter(readStyleURL), 'visibility': makeObjectPropertySetter(readBoolean), }, makeStructureNS(GX_NAMESPACE_URIS, { @@ -378,6 +378,24 @@ function createStyleDefaults() { */ let TEXTAREA; +/** + * A function that takes a url `{string}` and returns a url `{string}`. + * Might be used to change an icon path or to substitute a + * data url obtained from a KMZ array buffer. + * + * @typedef {function(string):string} IconUrlFunction + * @api + */ + +/** + * Function that returns a url unchanged. + * @param {string} href Input url. + * @return {string} Output url. + */ +function defaultIconUrlFunction(href) { + return href; +} + /** * @typedef {Object} Options * @property {boolean} [extractStyles=true] Extract styles from the KML. @@ -387,6 +405,8 @@ let TEXTAREA; * @property {boolean} [writeStyles=true] Write styles into KML. * @property {null|string} [crossOrigin='anonymous'] The `crossOrigin` attribute for loaded images. Note that you must provide a * `crossOrigin` value if you want to access pixel data with the Canvas renderer. + * @property {IconUrlFunction} [iconUrlFunction] Function that takes a url string and returns a url string. + * Might be used to change an icon path or to substitute a data url obtained from a KMZ array buffer. */ /** @@ -407,7 +427,7 @@ let TEXTAREA; */ class KML extends XMLFeature { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -462,6 +482,13 @@ class KML extends XMLFeature { */ this.crossOrigin_ = options.crossOrigin !== undefined ? options.crossOrigin : 'anonymous'; + + /** + * @type {IconUrlFunction} + */ + this.iconUrlFunction_ = options.iconUrlFunction + ? options.iconUrlFunction + : defaultIconUrlFunction; } /** @@ -597,7 +624,7 @@ class KML extends XMLFeature { /** * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {import("../Feature.js").default} Feature. */ readFeatureFromNode(node, opt_options) { @@ -617,7 +644,7 @@ class KML extends XMLFeature { /** * @protected * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {Array} Features. */ readFeaturesFromNode(node, opt_options) { @@ -859,7 +886,7 @@ class KML extends XMLFeature { * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries. * * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @return {Node} Node. * @api */ @@ -1047,12 +1074,6 @@ function findStyle(styleValue, defaultStyle, sharedStyles) { if (Array.isArray(styleValue)) { return styleValue; } else if (typeof styleValue === 'string') { - // KML files in the wild occasionally forget the leading `#` on styleUrls - // defined in the same document. Add a leading `#` if it enables to find - // a style. - if (!(styleValue in sharedStyles) && '#' + styleValue in sharedStyles) { - styleValue = '#' + styleValue; - } return findStyle(sharedStyles[styleValue], defaultStyle, sharedStyles); } else { return defaultStyle; @@ -1090,7 +1111,8 @@ export function readFlatCoordinates(node) { const flatCoordinates = []; // The KML specification states that coordinate tuples should not include // spaces, but we tolerate them. - const re = /^\s*([+\-]?\d*\.?\d+(?:e[+\-]?\d+)?)\s*,\s*([+\-]?\d*\.?\d+(?:e[+\-]?\d+)?)(?:\s*,\s*([+\-]?\d*\.?\d+(?:e[+\-]?\d+)?))?\s*/i; + s = s.replace(/\s*,\s*/g, ','); + const re = /^\s*([+\-]?\d*\.?\d+(?:e[+\-]?\d+)?),([+\-]?\d*\.?\d+(?:e[+\-]?\d+)?)(?:\s+|,|$)(?:([+\-]?\d*\.?\d+(?:e[+\-]?\d+)?)(?:\s+|$))?\s*/i; let m; while ((m = re.exec(s))) { const x = parseFloat(m[1]); @@ -1123,6 +1145,28 @@ function readURI(node) { } } +/** + * @param {Node} node Node. + * @return {string} URI. + */ +function readStyleURL(node) { + // KML files in the wild occasionally forget the leading + // `#` on styleUrlsdefined in the same document. + const s = getAllTextContent(node, false) + .trim() + .replace(/^(?!.*#)/, '#'); + let baseURI = node.baseURI; + if (!baseURI || baseURI == 'about:blank') { + baseURI = window.location.href; + } + if (baseURI) { + const url = new URL(s, baseURI); + return url.href; + } else { + return s; + } +} + /** * @param {Element} node Node. * @return {Vec2} Vec2. @@ -1282,7 +1326,7 @@ function iconStyleParser(node, objectStack) { rotation: rotation, scale: scale, size: size, - src: src, + src: this.iconUrlFunction_(src), color: color, }); styleObject['imageStyle'] = imageStyle; @@ -1993,7 +2037,7 @@ function regionParser(node, objectStack) { const PAIR_PARSERS = makeStructureNS(NAMESPACE_URIS, { 'Style': makeObjectPropertySetter(readStyle), 'key': makeObjectPropertySetter(readString), - 'styleUrl': makeObjectPropertySetter(readURI), + 'styleUrl': makeObjectPropertySetter(readStyleURL), }); /** @@ -2359,7 +2403,7 @@ const DOCUMENT_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, { * @const * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Node|undefined} Node. */ const DOCUMENT_NODE_FACTORY = function (value, objectStack, opt_nodeName) { @@ -2448,7 +2492,7 @@ const ICON_SERIALIZERS = makeStructureNS( * @const * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Node|undefined} Node. */ const GX_NODE_FACTORY = function (value, objectStack, opt_nodeName) { @@ -2687,7 +2731,7 @@ const GEOMETRY_TYPE_TO_NODENAME = { * @const * @param {*} value Value. * @param {Array<*>} objectStack Object stack. - * @param {string=} opt_nodeName Node name. + * @param {string} [opt_nodeName] Node name. * @return {Node|undefined} Node. */ const GEOMETRY_NODE_FACTORY = function (value, objectStack, opt_nodeName) { diff --git a/src/ol/format/MVT.js b/src/ol/format/MVT.js index 08a77e5f97..759e907f4f 100644 --- a/src/ol/format/MVT.js +++ b/src/ol/format/MVT.js @@ -38,12 +38,12 @@ import {linearRingIsClockwise} from '../geom/flat/orient.js'; * @classdesc * Feature format for reading data in the Mapbox MVT format. * - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. * @api */ class MVT extends FeatureFormat { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -194,7 +194,7 @@ class MVT extends FeatureFormat { values, id ); - feature.transform(options.dataProjection, options.featureProjection); + feature.transform(options.dataProjection); } else { let geom; if (geometryType == GeometryType.POLYGON) { @@ -260,7 +260,7 @@ class MVT extends FeatureFormat { * Read all features. * * @param {ArrayBuffer} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {Array} Features. * @api */ diff --git a/src/ol/format/OSMXML.js b/src/ol/format/OSMXML.js index 39385a929e..8dc5a2c815 100644 --- a/src/ol/format/OSMXML.js +++ b/src/ol/format/OSMXML.js @@ -43,7 +43,7 @@ const PARSERS = makeStructureNS(NAMESPACE_URIS, { /** * @classdesc * Feature format for reading data in the - * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML). + * [OSMXML format](https://wiki.openstreetmap.org/wiki/OSM_XML). * * @api */ @@ -60,7 +60,7 @@ class OSMXML extends XMLFeature { /** * @protected * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {Array} Features. */ readFeaturesFromNode(node, opt_options) { diff --git a/src/ol/format/Polyline.js b/src/ol/format/Polyline.js index e19e722d44..047aad1285 100644 --- a/src/ol/format/Polyline.js +++ b/src/ol/format/Polyline.js @@ -35,7 +35,7 @@ import {transformGeometryWithOptions} from './Feature.js'; */ class Polyline extends TextFeature { /** - * @param {Options=} opt_options Optional configuration object. + * @param {Options} [opt_options] Optional configuration object. */ constructor(opt_options) { super(); @@ -65,7 +65,7 @@ class Polyline extends TextFeature { /** * @protected * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../Feature.js").default} Feature. */ readFeatureFromText(text, opt_options) { @@ -75,7 +75,7 @@ class Polyline extends TextFeature { /** * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {Array} Features. */ @@ -86,7 +86,7 @@ class Polyline extends TextFeature { /** * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {import("../geom/Geometry.js").default} Geometry. */ @@ -111,7 +111,7 @@ class Polyline extends TextFeature { /** * @param {import("../Feature.js").default} feature Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @protected * @return {string} Text. */ @@ -127,7 +127,7 @@ class Polyline extends TextFeature { /** * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @protected * @return {string} Text. */ @@ -137,7 +137,7 @@ class Polyline extends TextFeature { /** * @param {LineString} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @protected * @return {string} Text. */ @@ -163,7 +163,7 @@ class Polyline extends TextFeature { * * @param {Array} numbers A list of n-dimensional points. * @param {number} stride The number of dimension of the points in the list. - * @param {number=} opt_factor The factor by which the numbers will be + * @param {number} [opt_factor] The factor by which the numbers will be * multiplied. The remaining decimal places will get rounded away. * Default is `1e5`. * @return {string} The encoded string. @@ -197,7 +197,7 @@ export function encodeDeltas(numbers, stride, opt_factor) { * @param {string} encoded An encoded string. * @param {number} stride The number of dimension of the points in the * encoded string. - * @param {number=} opt_factor The factor by which the resulting numbers will + * @param {number} [opt_factor] The factor by which the resulting numbers will * be divided. Default is `1e5`. * @return {Array} A list of n-dimensional points. * @api @@ -231,7 +231,7 @@ export function decodeDeltas(encoded, stride, opt_factor) { * Attention: This function will modify the passed array! * * @param {Array} numbers A list of floating point numbers. - * @param {number=} opt_factor The factor by which the numbers will be + * @param {number} [opt_factor] The factor by which the numbers will be * multiplied. The remaining decimal places will get rounded away. * Default is `1e5`. * @return {string} The encoded string. @@ -250,7 +250,7 @@ export function encodeFloats(numbers, opt_factor) { * Decode a list of floating point numbers from an encoded string * * @param {string} encoded An encoded string. - * @param {number=} opt_factor The factor by which the result will be divided. + * @param {number} [opt_factor] The factor by which the result will be divided. * Default is `1e5`. * @return {Array} A list of floating point numbers. * @api diff --git a/src/ol/format/TextFeature.js b/src/ol/format/TextFeature.js index 27c28c024b..8787f03915 100644 --- a/src/ol/format/TextFeature.js +++ b/src/ol/format/TextFeature.js @@ -29,7 +29,7 @@ class TextFeature extends FeatureFormat { * Read the feature from the source. * * @param {Document|Element|Object|string} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../Feature.js").default} Feature. * @api */ @@ -43,7 +43,7 @@ class TextFeature extends FeatureFormat { /** * @abstract * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {import("../Feature.js").default} Feature. */ @@ -55,7 +55,7 @@ class TextFeature extends FeatureFormat { * Read the features from the source. * * @param {Document|Element|Object|string} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {Array} Features. * @api */ @@ -69,7 +69,7 @@ class TextFeature extends FeatureFormat { /** * @abstract * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {Array} Features. */ @@ -81,7 +81,7 @@ class TextFeature extends FeatureFormat { * Read the geometry from the source. * * @param {Document|Element|Object|string} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../geom/Geometry.js").default} Geometry. * @api */ @@ -95,7 +95,7 @@ class TextFeature extends FeatureFormat { /** * @abstract * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {import("../geom/Geometry.js").default} Geometry. */ @@ -107,7 +107,7 @@ class TextFeature extends FeatureFormat { * Read the projection from the source. * * @param {Document|Element|Object|string} source Source. - * @return {import("../proj/Projection.js").default} Projection. + * @return {import("../proj/Projection.js").default|undefined} Projection. * @api */ readProjection(source) { @@ -117,7 +117,7 @@ class TextFeature extends FeatureFormat { /** * @param {string} text Text. * @protected - * @return {import("../proj/Projection.js").default} Projection. + * @return {import("../proj/Projection.js").default|undefined} Projection. */ readProjectionFromText(text) { return this.dataProjection; @@ -127,7 +127,7 @@ class TextFeature extends FeatureFormat { * Encode a feature as a string. * * @param {import("../Feature.js").default} feature Feature. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {string} Encoded feature. * @api */ @@ -138,7 +138,7 @@ class TextFeature extends FeatureFormat { /** * @abstract * @param {import("../Feature.js").default} feature Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @protected * @return {string} Text. */ @@ -150,7 +150,7 @@ class TextFeature extends FeatureFormat { * Encode an array of features as string. * * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {string} Encoded features. * @api */ @@ -161,7 +161,7 @@ class TextFeature extends FeatureFormat { /** * @abstract * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @protected * @return {string} Text. */ @@ -173,7 +173,7 @@ class TextFeature extends FeatureFormat { * Write a single geometry. * * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {string} Geometry. * @api */ @@ -184,7 +184,7 @@ class TextFeature extends FeatureFormat { /** * @abstract * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @protected * @return {string} Text. */ diff --git a/src/ol/format/TopoJSON.js b/src/ol/format/TopoJSON.js index 2b40927e07..ede0944c52 100644 --- a/src/ol/format/TopoJSON.js +++ b/src/ol/format/TopoJSON.js @@ -56,7 +56,7 @@ import {transformGeometryWithOptions} from './Feature.js'; */ class TopoJSON extends JSONFeature { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -85,7 +85,7 @@ class TopoJSON extends JSONFeature { /** * @param {Object} object Object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {Array} Features. */ @@ -318,7 +318,7 @@ function readMultiPolygonGeometry(object, arcs) { * @param {string|undefined} property Property to set the `GeometryCollection`'s parent * object to. * @param {string} name Name of the `Topology`'s child object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {Array} Array of features. */ function readFeaturesFromGeometryCollection( @@ -356,7 +356,7 @@ function readFeaturesFromGeometryCollection( * @param {string|undefined} property Property to set the `GeometryCollection`'s parent * object to. * @param {string} name Name of the `Topology`'s child object. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {Feature} Feature. */ function readFeatureFromGeometry( @@ -368,18 +368,18 @@ function readFeatureFromGeometry( name, opt_options ) { - let geometry; + let geometry = null; const type = object.type; - const geometryReader = GEOMETRY_READERS[type]; - if (type === 'Point' || type === 'MultiPoint') { - geometry = geometryReader(object, scale, translate); - } else { - geometry = geometryReader(object, arcs); + if (type) { + const geometryReader = GEOMETRY_READERS[type]; + if (type === 'Point' || type === 'MultiPoint') { + geometry = geometryReader(object, scale, translate); + } else { + geometry = geometryReader(object, arcs); + } + geometry = transformGeometryWithOptions(geometry, false, opt_options); } - const feature = new Feature(); - feature.setGeometry( - transformGeometryWithOptions(geometry, false, opt_options) - ); + const feature = new Feature({geometry: geometry}); if (object.id !== undefined) { feature.setId(object.id); } diff --git a/src/ol/format/WFS.js b/src/ol/format/WFS.js index 3438edfe44..12f76c44df 100644 --- a/src/ol/format/WFS.js +++ b/src/ol/format/WFS.js @@ -3,6 +3,7 @@ */ import GML2 from './GML2.js'; import GML3 from './GML3.js'; +import GML32 from './GML32.js'; import GMLBase, {GMLNS} from './GMLBase.js'; import XMLFeature from './XMLFeature.js'; import { @@ -18,7 +19,7 @@ import { pushParseAndPop, pushSerializeAndPop, } from '../xml.js'; -import {and as andFilter, bbox as bboxFilter} from './filter.js'; +import {and as andFilterFn, bbox as bboxFilterFn} from './filter.js'; import {assert} from '../asserts.js'; import {assign} from '../obj.js'; import {get as getProjection} from '../proj.js'; @@ -39,6 +40,9 @@ const FEATURE_COLLECTION_PARSERS = { 'bounds' ), }, + 'http://www.opengis.net/wfs/2.0': { + 'member': makeArrayPusher(GMLBase.prototype.readFeaturesInternal), + }, }; /** @@ -51,6 +55,11 @@ const TRANSACTION_SUMMARY_PARSERS = { 'totalUpdated': makeObjectPropertySetter(readNonNegativeInteger), 'totalDeleted': makeObjectPropertySetter(readNonNegativeInteger), }, + 'http://www.opengis.net/wfs/2.0': { + 'totalInserted': makeObjectPropertySetter(readNonNegativeInteger), + 'totalUpdated': makeObjectPropertySetter(readNonNegativeInteger), + 'totalDeleted': makeObjectPropertySetter(readNonNegativeInteger), + }, }; /** @@ -65,6 +74,13 @@ const TRANSACTION_RESPONSE_PARSERS = { ), 'InsertResults': makeObjectPropertySetter(readInsertResults, 'insertIds'), }, + 'http://www.opengis.net/wfs/2.0': { + 'TransactionSummary': makeObjectPropertySetter( + readTransactionSummary, + 'transactionSummary' + ), + 'InsertResults': makeObjectPropertySetter(readInsertResults, 'insertIds'), + }, }; /** @@ -74,6 +90,9 @@ const QUERY_SERIALIZERS = { 'http://www.opengis.net/wfs': { 'PropertyName': makeChildAppender(writeStringTextNode), }, + 'http://www.opengis.net/wfs/2.0': { + 'PropertyName': makeChildAppender(writeStringTextNode), + }, }; /** @@ -87,21 +106,32 @@ const TRANSACTION_SERIALIZERS = { 'Property': makeChildAppender(writeProperty), 'Native': makeChildAppender(writeNative), }, + 'http://www.opengis.net/wfs/2.0': { + 'Insert': makeChildAppender(writeFeature), + 'Update': makeChildAppender(writeUpdate), + 'Delete': makeChildAppender(writeDelete), + 'Property': makeChildAppender(writeProperty), + 'Native': makeChildAppender(writeNative), + }, }; /** * @typedef {Object} Options * @property {Object|string} [featureNS] The namespace URI used for features. * @property {Array|string} [featureType] The feature type to parse. Only used for read operations. - * @property {GMLBase} [gmlFormat] The GML format to use to parse the response. Default is `ol/format/GML3`. + * @property {GMLBase} [gmlFormat] The GML format to use to parse the response. + * Default is `ol/format/GML2` for WFS 1.0.0, `ol/format/GML3` for WFS 1.1.0 and `ol/format/GML32` for WFS 2.0.0. * @property {string} [schemaLocation] Optional schemaLocation to use for serialization, this will override the default. + * @property {string} [version='1.1.0'] WFS version to use. Can be either `1.0.0`, `1.1.0` or `2.0.0`. */ /** * @typedef {Object} WriteGetFeatureOptions * @property {string} featureNS The namespace URI used for features. * @property {string} featurePrefix The prefix for the feature namespace. - * @property {Array} featureTypes The feature type names. + * @property {Array} featureTypes The feature type names or FeatureType objects to + * define a unique bbox filter per feature type name (in this case, options `bbox` and `geometryName` are + * ignored.). * @property {string} [srsName] SRS name. No srsName attribute will be set on * geometries when this is not provided. * @property {string} [handle] Handle. @@ -115,13 +145,21 @@ const TRANSACTION_SERIALIZERS = { * @property {number} [count] Number of features to retrieve when paging. This is a * WFS 2.0 feature backported to WFS 1.1.0 by some Web Feature Services. Please note that some * Web Feature Services have repurposed `maxfeatures` instead. - * @property {import("../extent.js").Extent} [bbox] Extent to use for the BBOX filter. + * @property {import("../extent.js").Extent} [bbox] Extent to use for the BBOX filter. The `geometryName` + * option must be set. * @property {import("./filter/Filter.js").default} [filter] Filter condition. See * {@link module:ol/format/Filter} for more information. * @property {string} [resultType] Indicates what response should be returned, * E.g. `hits` only includes the `numberOfFeatures` attribute in the response and no features. */ +/** + * @typedef {Object} FeatureType + * @property {!string} name The feature type name. + * @property {!import("../extent.js").Extent} bbox Extent to use for the BBOX filter. + * @property {!string} geometryName Geometry name to use in the BBOX filter. + */ + /** * @typedef {Object} WriteTransactionOptions * @property {string} featureNS The namespace URI used for features. @@ -134,23 +172,23 @@ const TRANSACTION_SERIALIZERS = { * a 3D layer. This will allow the Z coordinate to be included in the transaction. * @property {Array} nativeElements Native elements. Currently not supported. * @property {import("./GMLBase.js").Options} [gmlOptions] GML options for the WFS transaction writer. - * @property {string} [version='1.1.0'] WFS version to use for the transaction. Can be either `1.0.0` or `1.1.0`. + * @property {string} [version='1.1.0'] WFS version to use for the transaction. Can be either `1.0.0`, `1.1.0` or `2.0.0`. */ /** * Number of features; bounds/extent. * @typedef {Object} FeatureCollectionMetadata - * @property {number} numberOfFeatures - * @property {import("../extent.js").Extent} bounds + * @property {number} numberOfFeatures NumberOfFeatures. + * @property {import("../extent.js").Extent} bounds Bounds. */ /** * Total deleted; total inserted; total updated; array of insert ids. * @typedef {Object} TransactionResponse - * @property {number} totalDeleted - * @property {number} totalInserted - * @property {number} totalUpdated - * @property {Array} insertIds + * @property {number} totalDeleted TotalDeleted. + * @property {number} totalInserted TotalInserted. + * @property {number} totalUpdated TotalUpdated. + * @property {Array} insertIds InsertIds. */ /** @@ -164,30 +202,53 @@ const FEATURE_PREFIX = 'feature'; const XMLNS = 'http://www.w3.org/2000/xmlns/'; /** - * @type {string} + * @type {Object} */ -const OGCNS = 'http://www.opengis.net/ogc'; +const OGCNS = { + '2.0.0': 'http://www.opengis.net/ogc/1.1', + '1.1.0': 'http://www.opengis.net/ogc', + '1.0.0': 'http://www.opengis.net/ogc', +}; /** - * @type {string} + * @type {Object} */ -const WFSNS = 'http://www.opengis.net/wfs'; +const WFSNS = { + '2.0.0': 'http://www.opengis.net/wfs/2.0', + '1.1.0': 'http://www.opengis.net/wfs', + '1.0.0': 'http://www.opengis.net/wfs', +}; /** - * @type {string} + * @type {Object} */ -const FESNS = 'http://www.opengis.net/fes'; +const FESNS = { + '2.0.0': 'http://www.opengis.net/fes/2.0', + '1.1.0': 'http://www.opengis.net/fes', + '1.0.0': 'http://www.opengis.net/fes', +}; /** * @type {Object} */ const SCHEMA_LOCATIONS = { + '2.0.0': + 'http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd', '1.1.0': 'http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd', '1.0.0': 'http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd', }; +/** + * @type {Object} + */ +const GML_FORMATS = { + '2.0.0': GML32, + '1.1.0': GML3, + '1.0.0': GML2, +}; + /** * @const * @type {string} @@ -198,20 +259,26 @@ const DEFAULT_VERSION = '1.1.0'; * @classdesc * Feature format for reading and writing data in the WFS format. * By default, supports WFS version 1.1.0. You can pass a GML format - * as option if you want to read a WFS that contains GML2 (WFS 1.0.0). + * as option to override the default. * Also see {@link module:ol/format/GMLBase~GMLBase} which is used by this format. * * @api */ class WFS extends XMLFeature { /** - * @param {Options=} opt_options Optional configuration object. + * @param {Options} [opt_options] Optional configuration object. */ constructor(opt_options) { super(); const options = opt_options ? opt_options : {}; + /** + * @private + * @type {string} + */ + this.version_ = options.version ? options.version : DEFAULT_VERSION; + /** * @private * @type {Array|string|undefined} @@ -228,7 +295,9 @@ class WFS extends XMLFeature { * @private * @type {GMLBase} */ - this.gmlFormat_ = options.gmlFormat ? options.gmlFormat : new GML3(); + this.gmlFormat_ = options.gmlFormat + ? options.gmlFormat + : new GML_FORMATS[this.version_](); /** * @private @@ -236,7 +305,7 @@ class WFS extends XMLFeature { */ this.schemaLocation_ = options.schemaLocation ? options.schemaLocation - : SCHEMA_LOCATIONS[DEFAULT_VERSION]; + : SCHEMA_LOCATIONS[this.version_]; } /** @@ -256,13 +325,13 @@ class WFS extends XMLFeature { /** * @protected * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {Array} Features. */ readFeaturesFromNode(node, opt_options) { /** @type {import("../xml.js").NodeStackItem} */ const context = { - node: node, + node, }; assign(context, { 'featureType': this.featureType_, @@ -271,12 +340,15 @@ class WFS extends XMLFeature { assign(context, this.getReadOptions(node, opt_options ? opt_options : {})); const objectStack = [context]; - this.gmlFormat_.FEATURE_COLLECTION_PARSERS[GMLNS][ - 'featureMember' - ] = makeArrayPusher(GMLBase.prototype.readFeaturesInternal); + let featuresNS; + if (this.version_ === '2.0.0') { + featuresNS = FEATURE_COLLECTION_PARSERS; + } else { + featuresNS = this.gmlFormat_.FEATURE_COLLECTION_PARSERS; + } let features = pushParseAndPop( [], - this.gmlFormat_.FEATURE_COLLECTION_PARSERS, + featuresNS, node, objectStack, this.gmlFormat_ @@ -406,47 +478,29 @@ class WFS extends XMLFeature { * @api */ writeGetFeature(options) { - const node = createElementNS(WFSNS, 'GetFeature'); + const node = createElementNS(WFSNS[this.version_], 'GetFeature'); node.setAttribute('service', 'WFS'); - node.setAttribute('version', '1.1.0'); - let filter; - if (options) { - if (options.handle) { - node.setAttribute('handle', options.handle); - } - if (options.outputFormat) { - node.setAttribute('outputFormat', options.outputFormat); - } - if (options.maxFeatures !== undefined) { - node.setAttribute('maxFeatures', String(options.maxFeatures)); - } - if (options.resultType) { - node.setAttribute('resultType', options.resultType); - } - if (options.startIndex !== undefined) { - node.setAttribute('startIndex', String(options.startIndex)); - } - if (options.count !== undefined) { - node.setAttribute('count', String(options.count)); - } - if (options.viewParams !== undefined) { - node.setAttribute('viewParams', options.viewParams); - } - filter = options.filter; - if (options.bbox) { - assert(options.geometryName, 12); // `options.geometryName` must also be provided when `options.bbox` is set - const bbox = bboxFilter( - /** @type {string} */ (options.geometryName), - options.bbox, - options.srsName - ); - if (filter) { - // if bbox and filter are both set, combine the two into a single filter - filter = andFilter(filter, bbox); - } else { - filter = bbox; - } - } + node.setAttribute('version', this.version_); + if (options.handle) { + node.setAttribute('handle', options.handle); + } + if (options.outputFormat) { + node.setAttribute('outputFormat', options.outputFormat); + } + if (options.maxFeatures !== undefined) { + node.setAttribute('maxFeatures', String(options.maxFeatures)); + } + if (options.resultType) { + node.setAttribute('resultType', options.resultType); + } + if (options.startIndex !== undefined) { + node.setAttribute('startIndex', String(options.startIndex)); + } + if (options.count !== undefined) { + node.setAttribute('count', String(options.count)); + } + if (options.viewParams !== undefined) { + node.setAttribute('viewParams', options.viewParams); } node.setAttributeNS( XML_SCHEMA_INSTANCE_URI, @@ -455,26 +509,74 @@ class WFS extends XMLFeature { ); /** @type {import("../xml.js").NodeStackItem} */ const context = { - node: node, + node, }; assign(context, { + 'version': this.version_, 'srsName': options.srsName, 'featureNS': options.featureNS ? options.featureNS : this.featureNS_, 'featurePrefix': options.featurePrefix, - 'geometryName': options.geometryName, - 'filter': filter, 'propertyNames': options.propertyNames ? options.propertyNames : [], }); - - assert(Array.isArray(options.featureTypes), 11); // `options.featureTypes` should be an Array - writeGetFeature( - node, - /** @type {!Array} */ (options.featureTypes), - [context] - ); + assert(Array.isArray(options.featureTypes), 11); // `options.featureTypes` must be an Array + if (typeof options.featureTypes[0] === 'string') { + let filter = options.filter; + if (options.bbox) { + assert(options.geometryName, 12); // `options.geometryName` must also be provided when `options.bbox` is set + filter = this.combineBboxAndFilter( + options.geometryName, + options.bbox, + options.srsName, + filter + ); + } + assign(context, { + 'geometryName': options.geometryName, + 'filter': filter, + }); + writeGetFeature( + node, + /** @type {!Array} */ (options.featureTypes), + [context] + ); + } else { + // Write one query node per element in featuresType. + options.featureTypes.forEach((/** @type {FeatureType} */ featureType) => { + const completeFilter = this.combineBboxAndFilter( + featureType.geometryName, + featureType.bbox, + options.srsName, + options.filter + ); + assign(context, { + 'geometryName': featureType.geometryName, + 'filter': completeFilter, + }); + writeGetFeature(node, [featureType.name], [context]); + }); + } return node; } + /** + * Create a bbox filter and combine it with another optional filter. + * + * @param {!string} geometryName Geometry name to use. + * @param {!import("../extent.js").Extent} extent Extent. + * @param {string} [opt_srsName] SRS name. No srsName attribute will be + * set on geometries when this is not provided. + * @param {import("./filter/Filter.js").default} [opt_filter] Filter condition. + * @return {import("./filter/Filter.js").default} The filter. + */ + combineBboxAndFilter(geometryName, extent, opt_srsName, opt_filter) { + const bboxFilter = bboxFilterFn(geometryName, extent, opt_srsName); + if (opt_filter) { + // if bbox and filter are both set, combine the two into a single filter + return andFilterFn(opt_filter, bboxFilter); + } + return bboxFilter; + } + /** * Encode format as WFS `Transaction` and return the Node. * @@ -487,101 +589,41 @@ class WFS extends XMLFeature { */ writeTransaction(inserts, updates, deletes, options) { const objectStack = []; - const node = createElementNS(WFSNS, 'Transaction'); - const version = options.version ? options.version : DEFAULT_VERSION; - const gmlVersion = version === '1.0.0' ? 2 : 3; + const version = options.version ? options.version : this.version_; + const node = createElementNS(WFSNS[version], 'Transaction'); + node.setAttribute('service', 'WFS'); node.setAttribute('version', version); let baseObj; /** @type {import("../xml.js").NodeStackItem} */ - let obj; if (options) { baseObj = options.gmlOptions ? options.gmlOptions : {}; if (options.handle) { node.setAttribute('handle', options.handle); } } - const schemaLocation = SCHEMA_LOCATIONS[version]; node.setAttributeNS( XML_SCHEMA_INSTANCE_URI, 'xsi:schemaLocation', - schemaLocation + SCHEMA_LOCATIONS[version] ); - const featurePrefix = options.featurePrefix - ? options.featurePrefix - : FEATURE_PREFIX; + + const request = createTransactionRequest(node, baseObj, version, options); if (inserts) { - obj = assign( - {node: node}, - { - 'featureNS': options.featureNS, - 'featureType': options.featureType, - 'featurePrefix': featurePrefix, - 'gmlVersion': gmlVersion, - 'hasZ': options.hasZ, - 'srsName': options.srsName, - } - ); - assign(obj, baseObj); - pushSerializeAndPop( - obj, - TRANSACTION_SERIALIZERS, - makeSimpleNodeFactory('Insert'), - inserts, - objectStack - ); + serializeTransactionRequest('Insert', inserts, objectStack, request); } if (updates) { - obj = assign( - {node: node}, - { - 'featureNS': options.featureNS, - 'featureType': options.featureType, - 'featurePrefix': featurePrefix, - 'gmlVersion': gmlVersion, - 'hasZ': options.hasZ, - 'srsName': options.srsName, - } - ); - assign(obj, baseObj); - pushSerializeAndPop( - obj, - TRANSACTION_SERIALIZERS, - makeSimpleNodeFactory('Update'), - updates, - objectStack - ); + serializeTransactionRequest('Update', updates, objectStack, request); } if (deletes) { - pushSerializeAndPop( - { - node: node, - 'featureNS': options.featureNS, - 'featureType': options.featureType, - 'featurePrefix': featurePrefix, - 'gmlVersion': gmlVersion, - 'srsName': options.srsName, - }, - TRANSACTION_SERIALIZERS, - makeSimpleNodeFactory('Delete'), - deletes, - objectStack - ); + serializeTransactionRequest('Delete', deletes, objectStack, request); } if (options.nativeElements) { - pushSerializeAndPop( - { - node: node, - 'featureNS': options.featureNS, - 'featureType': options.featureType, - 'featurePrefix': featurePrefix, - 'gmlVersion': gmlVersion, - 'srsName': options.srsName, - }, - TRANSACTION_SERIALIZERS, - makeSimpleNodeFactory('Native'), + serializeTransactionRequest( + 'Native', options.nativeElements, - objectStack + objectStack, + request ); } return node; @@ -625,6 +667,57 @@ class WFS extends XMLFeature { } } +/** + * @param {Element} node Node. + * @param {*} baseObj Base object. + * @param {string} version Version. + * @param {WriteTransactionOptions} options Options. + * @return {Object} Request object. + */ +function createTransactionRequest(node, baseObj, version, options) { + const featurePrefix = options.featurePrefix + ? options.featurePrefix + : FEATURE_PREFIX; + let gmlVersion; + if (version === '1.0.0') { + gmlVersion = 2; + } else if (version === '1.1.0') { + gmlVersion = 3; + } else if (version === '2.0.0') { + gmlVersion = 3.2; + } + const obj = assign( + {node}, + { + version, + 'featureNS': options.featureNS, + 'featureType': options.featureType, + 'featurePrefix': featurePrefix, + 'gmlVersion': gmlVersion, + 'hasZ': options.hasZ, + 'srsName': options.srsName, + }, + baseObj + ); + return obj; +} + +/** + * @param {string} type Request type. + * @param {Array} features Features. + * @param {Array<*>} objectStack Object stack. + * @param {Element} request Transaction Request. + */ +function serializeTransactionRequest(type, features, objectStack, request) { + pushSerializeAndPop( + request, + TRANSACTION_SERIALIZERS, + makeSimpleNodeFactory(type), + features, + objectStack + ); +} + /** * @param {Element} node Node. * @param {Array<*>} objectStack Object stack. @@ -644,6 +737,11 @@ const OGC_FID_PARSERS = { return node.getAttribute('fid'); }), }, + 'http://www.opengis.net/ogc/1.1': { + 'FeatureId': makeArrayPusher(function (node, objectStack) { + return node.getAttribute('fid'); + }), + }, }; /** @@ -662,6 +760,9 @@ const INSERT_RESULTS_PARSERS = { 'http://www.opengis.net/wfs': { 'Feature': fidParser, }, + 'http://www.opengis.net/wfs/2.0': { + 'Feature': fidParser, + }, }; /** @@ -687,8 +788,10 @@ function writeFeature(node, feature, objectStack) { node.appendChild(child); if (gmlVersion === 2) { GML2.prototype.writeFeatureElement(child, feature, objectStack); - } else { + } else if (gmlVersion === 3) { GML3.prototype.writeFeatureElement(child, feature, objectStack); + } else { + GML32.prototype.writeFeatureElement(child, feature, objectStack); } } @@ -698,8 +801,11 @@ function writeFeature(node, feature, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeOgcFidFilter(node, fid, objectStack) { - const filter = createElementNS(OGCNS, 'Filter'); - const child = createElementNS(OGCNS, 'FeatureId'); + const context = objectStack[objectStack.length - 1]; + const version = context['version']; + const ns = OGCNS[version]; + const filter = createElementNS(ns, 'Filter'); + const child = createElementNS(ns, 'FeatureId'); filter.appendChild(child); child.setAttribute('fid', /** @type {string} */ (fid)); node.appendChild(filter); @@ -708,7 +814,7 @@ function writeOgcFidFilter(node, fid, objectStack) { /** * @param {string|undefined} featurePrefix The prefix of the feature. * @param {string} featureType The type of the feature. - * @returns {string} The value of the typeName property. + * @return {string} The value of the typeName property. */ function getTypeName(featurePrefix, featureType) { featurePrefix = featurePrefix ? featurePrefix : FEATURE_PREFIX; @@ -749,6 +855,7 @@ function writeDelete(node, feature, objectStack) { function writeUpdate(node, feature, objectStack) { const context = objectStack[objectStack.length - 1]; assert(feature.getId() !== undefined, 27); // Features must have an id set + const version = context['version']; const featureType = context['featureType']; const featurePrefix = context['featurePrefix']; const featureNS = context['featureNS']; @@ -775,8 +882,9 @@ function writeUpdate(node, feature, objectStack) { } pushSerializeAndPop( /** @type {import("../xml.js").NodeStackItem} */ ({ + version, 'gmlVersion': context['gmlVersion'], - node: node, + node, 'hasZ': context['hasZ'], 'srsName': context['srsName'], }), @@ -795,13 +903,15 @@ function writeUpdate(node, feature, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeProperty(node, pair, objectStack) { - const name = createElementNS(WFSNS, 'Name'); const context = objectStack[objectStack.length - 1]; + const version = context['version']; + const ns = WFSNS[version]; + const name = createElementNS(ns, 'Name'); const gmlVersion = context['gmlVersion']; node.appendChild(name); writeStringTextNode(name, pair.name); if (pair.value !== undefined && pair.value !== null) { - const value = createElementNS(WFSNS, 'Value'); + const value = createElementNS(ns, 'Value'); node.appendChild(value); if ( pair.value && @@ -810,8 +920,10 @@ function writeProperty(node, pair, objectStack) { ) { if (gmlVersion === 2) { GML2.prototype.writeGeometryElement(value, pair.value, objectStack); - } else { + } else if (gmlVersion === 3) { GML3.prototype.writeGeometryElement(value, pair.value, objectStack); + } else { + GML32.prototype.writeGeometryElement(value, pair.value, objectStack); } } else { writeStringTextNode(value, pair.value); @@ -843,15 +955,41 @@ const GETFEATURE_SERIALIZERS = { 'http://www.opengis.net/wfs': { 'Query': makeChildAppender(writeQuery), }, + 'http://www.opengis.net/wfs/2.0': { + 'Query': makeChildAppender(writeQuery), + }, 'http://www.opengis.net/ogc': { 'During': makeChildAppender(writeDuringFilter), 'And': makeChildAppender(writeLogicalFilter), 'Or': makeChildAppender(writeLogicalFilter), 'Not': makeChildAppender(writeNotFilter), 'BBOX': makeChildAppender(writeBboxFilter), - 'Contains': makeChildAppender(writeContainsFilter), - 'Intersects': makeChildAppender(writeIntersectsFilter), - 'Within': makeChildAppender(writeWithinFilter), + 'Contains': makeChildAppender(writeSpatialFilter), + 'Intersects': makeChildAppender(writeSpatialFilter), + 'Within': makeChildAppender(writeSpatialFilter), + 'DWithin': makeChildAppender(writeDWithinFilter), + 'PropertyIsEqualTo': makeChildAppender(writeComparisonFilter), + 'PropertyIsNotEqualTo': makeChildAppender(writeComparisonFilter), + 'PropertyIsLessThan': makeChildAppender(writeComparisonFilter), + 'PropertyIsLessThanOrEqualTo': makeChildAppender(writeComparisonFilter), + 'PropertyIsGreaterThan': makeChildAppender(writeComparisonFilter), + 'PropertyIsGreaterThanOrEqualTo': makeChildAppender(writeComparisonFilter), + 'PropertyIsNull': makeChildAppender(writeIsNullFilter), + 'PropertyIsBetween': makeChildAppender(writeIsBetweenFilter), + 'PropertyIsLike': makeChildAppender(writeIsLikeFilter), + }, + 'http://www.opengis.net/fes/2.0': { + 'During': makeChildAppender(writeDuringFilter), + 'And': makeChildAppender(writeLogicalFilter), + 'Or': makeChildAppender(writeLogicalFilter), + 'Not': makeChildAppender(writeNotFilter), + 'BBOX': makeChildAppender(writeBboxFilter), + 'Contains': makeChildAppender(writeSpatialFilter), + 'Disjoint': makeChildAppender(writeSpatialFilter), + 'Intersects': makeChildAppender(writeSpatialFilter), + 'ResourceId': makeChildAppender(writeResourceIdFilter), + 'Within': makeChildAppender(writeSpatialFilter), + 'DWithin': makeChildAppender(writeDWithinFilter), 'PropertyIsEqualTo': makeChildAppender(writeComparisonFilter), 'PropertyIsNotEqualTo': makeChildAppender(writeComparisonFilter), 'PropertyIsLessThan': makeChildAppender(writeComparisonFilter), @@ -871,6 +1009,7 @@ const GETFEATURE_SERIALIZERS = { */ function writeQuery(node, featureType, objectStack) { const context = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const version = context['version']; const featurePrefix = context['featurePrefix']; const featureNS = context['featureNS']; const propertyNames = context['propertyNames']; @@ -882,7 +1021,13 @@ function writeQuery(node, featureType, objectStack) { } else { typeName = featureType; } - node.setAttribute('typeName', typeName); + let typeNameAttr; + if (version === '2.0.0') { + typeNameAttr = 'typeNames'; + } else { + typeNameAttr = 'typeName'; + } + node.setAttribute(typeNameAttr, typeName); if (srsName) { node.setAttribute('srsName', srsName); } @@ -903,7 +1048,7 @@ function writeQuery(node, featureType, objectStack) { ); const filter = context['filter']; if (filter) { - const child = createElementNS(OGCNS, 'Filter'); + const child = createElementNS(getFilterNS(version), 'Filter'); node.appendChild(child); writeFilterCondition(child, filter, objectStack); } @@ -915,8 +1060,10 @@ function writeQuery(node, featureType, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeFilterCondition(node, filter, objectStack) { + const context = /** @type {Object} */ (objectStack[objectStack.length - 1]); /** @type {import("../xml.js").NodeStackItem} */ - const item = {node: node}; + const item = {node}; + assign(item, {context}); pushSerializeAndPop( item, GETFEATURE_SERIALIZERS, @@ -932,50 +1079,59 @@ function writeFilterCondition(node, filter, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeBboxFilter(node, filter, objectStack) { - const context = objectStack[objectStack.length - 1]; - context['srsName'] = filter.srsName; + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; + const version = context['version']; + parent['srsName'] = filter.srsName; + const format = GML_FORMATS[version]; - writeOgcPropertyName(node, filter.geometryName); - GML3.prototype.writeGeometryElement(node, filter.extent, objectStack); + writePropertyName(version, node, filter.geometryName); + format.prototype.writeGeometryElement(node, filter.extent, objectStack); +} + +/** + * @param {Element} node Element. + * @param {import("./filter/ResourceId.js").default} filter Filter. + * @param {Array<*>} objectStack Node stack. + */ +function writeResourceIdFilter(node, filter, objectStack) { + node.setAttribute('rid', /** @type {string} */ (filter.rid)); } /** * @param {Node} node Node. - * @param {import("./filter/Contains.js").default} filter Filter. + * @param {import("./filter/Spatial.js").default} filter Filter. * @param {Array<*>} objectStack Node stack. */ -function writeContainsFilter(node, filter, objectStack) { - const context = objectStack[objectStack.length - 1]; - context['srsName'] = filter.srsName; +function writeSpatialFilter(node, filter, objectStack) { + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; + const version = context['version']; + parent['srsName'] = filter.srsName; + const format = GML_FORMATS[version]; - writeOgcPropertyName(node, filter.geometryName); - GML3.prototype.writeGeometryElement(node, filter.geometry, objectStack); + writePropertyName(version, node, filter.geometryName); + format.prototype.writeGeometryElement(node, filter.geometry, objectStack); } /** * @param {Node} node Node. - * @param {import("./filter/Intersects.js").default} filter Filter. + * @param {import("./filter/DWithin.js").default} filter Filter. * @param {Array<*>} objectStack Node stack. */ -function writeIntersectsFilter(node, filter, objectStack) { - const context = objectStack[objectStack.length - 1]; - context['srsName'] = filter.srsName; - - writeOgcPropertyName(node, filter.geometryName); - GML3.prototype.writeGeometryElement(node, filter.geometry, objectStack); -} - -/** - * @param {Node} node Node. - * @param {import("./filter/Within.js").default} filter Filter. - * @param {Array<*>} objectStack Node stack. - */ -function writeWithinFilter(node, filter, objectStack) { - const context = objectStack[objectStack.length - 1]; - context['srsName'] = filter.srsName; - - writeOgcPropertyName(node, filter.geometryName); - GML3.prototype.writeGeometryElement(node, filter.geometry, objectStack); +function writeDWithinFilter(node, filter, objectStack) { + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; + const version = context['version']; + writeSpatialFilter(node, filter, objectStack); + const distance = createElementNS(getFilterNS(version), 'Distance'); + writeStringTextNode(distance, filter.distance.toString()); + if (version === '2.0.0') { + distance.setAttribute('uom', filter.unit); + } else { + distance.setAttribute('units', filter.unit); + } + node.appendChild(distance); } /** @@ -984,10 +1140,11 @@ function writeWithinFilter(node, filter, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeDuringFilter(node, filter, objectStack) { - const valueReference = createElementNS(FESNS, 'ValueReference'); - writeStringTextNode(valueReference, filter.propertyName); - node.appendChild(valueReference); + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; + const version = context['version']; + writeExpression(FESNS[version], 'ValueReference', node, filter.propertyName); const timePeriod = createElementNS(GMLNS, 'TimePeriod'); node.appendChild(timePeriod); @@ -1007,8 +1164,11 @@ function writeDuringFilter(node, filter, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeLogicalFilter(node, filter, objectStack) { + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; /** @type {import("../xml.js").NodeStackItem} */ - const item = {node: node}; + const item = {node}; + assign(item, {context}); const conditions = filter.conditions; for (let i = 0, ii = conditions.length; i < ii; ++i) { const condition = conditions[i]; @@ -1028,8 +1188,11 @@ function writeLogicalFilter(node, filter, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeNotFilter(node, filter, objectStack) { + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; /** @type {import("../xml.js").NodeStackItem} */ - const item = {node: node}; + const item = {node}; + assign(item, {context}); const condition = filter.condition; pushSerializeAndPop( item, @@ -1046,11 +1209,14 @@ function writeNotFilter(node, filter, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeComparisonFilter(node, filter, objectStack) { + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; + const version = context['version']; if (filter.matchCase !== undefined) { node.setAttribute('matchCase', filter.matchCase.toString()); } - writeOgcPropertyName(node, filter.propertyName); - writeOgcLiteral(node, '' + filter.expression); + writePropertyName(version, node, filter.propertyName); + writeLiteral(version, node, '' + filter.expression); } /** @@ -1059,7 +1225,10 @@ function writeComparisonFilter(node, filter, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeIsNullFilter(node, filter, objectStack) { - writeOgcPropertyName(node, filter.propertyName); + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; + const version = context['version']; + writePropertyName(version, node, filter.propertyName); } /** @@ -1068,15 +1237,20 @@ function writeIsNullFilter(node, filter, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeIsBetweenFilter(node, filter, objectStack) { - writeOgcPropertyName(node, filter.propertyName); + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; + const version = context['version']; + const ns = getFilterNS(version); - const lowerBoundary = createElementNS(OGCNS, 'LowerBoundary'); + writePropertyName(version, node, filter.propertyName); + + const lowerBoundary = createElementNS(ns, 'LowerBoundary'); node.appendChild(lowerBoundary); - writeOgcLiteral(lowerBoundary, '' + filter.lowerBoundary); + writeLiteral(version, lowerBoundary, '' + filter.lowerBoundary); - const upperBoundary = createElementNS(OGCNS, 'UpperBoundary'); + const upperBoundary = createElementNS(ns, 'UpperBoundary'); node.appendChild(upperBoundary); - writeOgcLiteral(upperBoundary, '' + filter.upperBoundary); + writeLiteral(version, upperBoundary, '' + filter.upperBoundary); } /** @@ -1085,41 +1259,51 @@ function writeIsBetweenFilter(node, filter, objectStack) { * @param {Array<*>} objectStack Node stack. */ function writeIsLikeFilter(node, filter, objectStack) { + const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); + const context = parent['context']; + const version = context['version']; node.setAttribute('wildCard', filter.wildCard); node.setAttribute('singleChar', filter.singleChar); node.setAttribute('escapeChar', filter.escapeChar); if (filter.matchCase !== undefined) { node.setAttribute('matchCase', filter.matchCase.toString()); } - writeOgcPropertyName(node, filter.propertyName); - writeOgcLiteral(node, '' + filter.pattern); + writePropertyName(version, node, filter.propertyName); + writeLiteral(version, node, '' + filter.pattern); } /** + * @param {string} ns Namespace. * @param {string} tagName Tag name. * @param {Node} node Node. * @param {string} value Value. */ -function writeOgcExpression(tagName, node, value) { - const property = createElementNS(OGCNS, tagName); +function writeExpression(ns, tagName, node, value) { + const property = createElementNS(ns, tagName); writeStringTextNode(property, value); node.appendChild(property); } /** + * @param {string} version Version. * @param {Node} node Node. * @param {string} value PropertyName value. */ -function writeOgcPropertyName(node, value) { - writeOgcExpression('PropertyName', node, value); +function writeLiteral(version, node, value) { + writeExpression(getFilterNS(version), 'Literal', node, value); } /** + * @param {string} version Version. * @param {Node} node Node. * @param {string} value PropertyName value. */ -function writeOgcLiteral(node, value) { - writeOgcExpression('Literal', node, value); +function writePropertyName(version, node, value) { + if (version === '2.0.0') { + writeExpression(FESNS[version], 'ValueReference', node, value); + } else { + writeExpression(OGCNS[version], 'PropertyName', node, value); + } } /** @@ -1139,12 +1323,21 @@ function writeTimeInstant(node, time) { * Encode filter as WFS `Filter` and return the Node. * * @param {import("./filter/Filter.js").default} filter Filter. + * @param {string} opt_version WFS version. If not provided defaults to '1.1.0' * @return {Node} Result. * @api */ -export function writeFilter(filter) { - const child = createElementNS(OGCNS, 'Filter'); - writeFilterCondition(child, filter, []); +export function writeFilter(filter, opt_version) { + const version = opt_version || '1.1.0'; + const child = createElementNS(getFilterNS(version), 'Filter'); + const context = { + node: child, + }; + assign(context, { + 'version': version, + 'filter': filter, + }); + writeFilterCondition(child, filter, [context]); return child; } @@ -1169,4 +1362,14 @@ function writeGetFeature(node, featureTypes, objectStack) { ); } +function getFilterNS(version) { + let ns; + if (version === '2.0.0') { + ns = FESNS[version]; + } else { + ns = OGCNS[version]; + } + return ns; +} + export default WFS; diff --git a/src/ol/format/WKT.js b/src/ol/format/WKT.js index 6f91b1e2bc..3fc5add4eb 100644 --- a/src/ol/format/WKT.js +++ b/src/ol/format/WKT.js @@ -35,9 +35,9 @@ const GeometryConstructor = { /** * @typedef {Object} Token - * @property {number} type - * @property {number|string} [value] - * @property {number} position + * @property {number} type Type. + * @property {number|string} [value] Value. + * @property {number} position Position. */ /** @@ -69,6 +69,7 @@ const ZM = 'ZM'; * @enum {number} */ const TokenType = { + START: 0, TEXT: 1, LEFT_PAREN: 2, RIGHT_PAREN: 3, @@ -117,7 +118,7 @@ class Lexer { /** * @param {string} c Character. - * @param {boolean=} opt_decimal Whether the string number + * @param {boolean} [opt_decimal] Whether the string number * contains a dot, i.e. is a decimal number. * @return {boolean} Whether the character is numeric. * @private @@ -146,7 +147,7 @@ class Lexer { /** * Fetch and return the next token. - * @return {!Token} Next string token. + * @return {Token} Next string token. */ nextToken() { const c = this.nextChar_(); @@ -238,7 +239,10 @@ class Parser { * @type {Token} * @private */ - this.token_; + this.token_ = { + position: 0, + type: TokenType.START, + }; /** * @type {import("../geom/GeometryLayout.js").default} @@ -261,8 +265,7 @@ class Parser { * @return {boolean} Whether the token matches the given type. */ isTokenType(type) { - const isMatch = this.token_.type == type; - return isMatch; + return this.token_.type == type; } /** @@ -284,8 +287,7 @@ class Parser { */ parse() { this.consume_(); - const geometry = this.parseGeometry_(); - return geometry; + return this.parseGeometry_(); } /** @@ -313,7 +315,7 @@ class Parser { } /** - * @return {!Array} A collection of geometries. + * @return {Array} A collection of geometries. * @private */ parseGeometryCollectionText_() { @@ -325,8 +327,6 @@ class Parser { if (this.match(TokenType.RIGHT_PAREN)) { return geometries; } - } else if (this.isEmptyGeometry_()) { - return []; } throw new Error(this.formatErrorMessage_()); } @@ -341,14 +341,12 @@ class Parser { if (this.match(TokenType.RIGHT_PAREN)) { return coordinates; } - } else if (this.isEmptyGeometry_()) { - return null; } throw new Error(this.formatErrorMessage_()); } /** - * @return {!Array>} All points in a linestring. + * @return {Array>} All points in a linestring. * @private */ parseLineStringText_() { @@ -357,14 +355,12 @@ class Parser { if (this.match(TokenType.RIGHT_PAREN)) { return coordinates; } - } else if (this.isEmptyGeometry_()) { - return []; } throw new Error(this.formatErrorMessage_()); } /** - * @return {!Array>>} All points in a polygon. + * @return {Array>>} All points in a polygon. * @private */ parsePolygonText_() { @@ -373,14 +369,12 @@ class Parser { if (this.match(TokenType.RIGHT_PAREN)) { return coordinates; } - } else if (this.isEmptyGeometry_()) { - return []; } throw new Error(this.formatErrorMessage_()); } /** - * @return {!Array>} All points in a multipoint. + * @return {Array>} All points in a multipoint. * @private */ parseMultiPointText_() { @@ -394,14 +388,12 @@ class Parser { if (this.match(TokenType.RIGHT_PAREN)) { return coordinates; } - } else if (this.isEmptyGeometry_()) { - return []; } throw new Error(this.formatErrorMessage_()); } /** - * @return {!Array>>} All linestring points + * @return {Array>>} All linestring points * in a multilinestring. * @private */ @@ -411,14 +403,12 @@ class Parser { if (this.match(TokenType.RIGHT_PAREN)) { return coordinates; } - } else if (this.isEmptyGeometry_()) { - return []; } throw new Error(this.formatErrorMessage_()); } /** - * @return {!Array>>>} All polygon points in a multipolygon. + * @return {Array>>>} All polygon points in a multipolygon. * @private */ parseMultiPolygonText_() { @@ -427,14 +417,12 @@ class Parser { if (this.match(TokenType.RIGHT_PAREN)) { return coordinates; } - } else if (this.isEmptyGeometry_()) { - return []; } throw new Error(this.formatErrorMessage_()); } /** - * @return {!Array} A point. + * @return {Array} A point. * @private */ parsePoint_() { @@ -455,7 +443,7 @@ class Parser { } /** - * @return {!Array>} An array of points. + * @return {Array>} An array of points. * @private */ parsePointList_() { @@ -467,7 +455,7 @@ class Parser { } /** - * @return {!Array>} An array of points. + * @return {Array>} An array of points. * @private */ parsePointTextList_() { @@ -479,7 +467,7 @@ class Parser { } /** - * @return {!Array>>} An array of points. + * @return {Array>>} An array of points. * @private */ parseLineStringTextList_() { @@ -491,7 +479,7 @@ class Parser { } /** - * @return {!Array>>>} An array of points. + * @return {Array>>>} An array of points. * @private */ parsePolygonTextList_() { @@ -533,15 +521,19 @@ class Parser { } /** - * @return {!import("../geom/Geometry.js").default} The geometry. + * @return {import("../geom/Geometry.js").default} The geometry. * @private */ parseGeometry_() { const token = this.token_; if (this.match(TokenType.TEXT)) { - const geomType = token.value; + const geomType = /** @type {string} */ (token.value); this.layout_ = this.parseGeometryLayout_(); + const isEmpty = this.isEmptyGeometry_(); if (geomType == 'GEOMETRYCOLLECTION') { + if (isEmpty) { + return new GeometryCollection([]); + } const geometries = this.parseGeometryCollectionText_(); return new GeometryCollection(geometries); } else { @@ -551,43 +543,44 @@ class Parser { } let coordinates; - switch (geomType) { - case 'POINT': { - coordinates = this.parsePointText_(); - break; - } - case 'LINESTRING': { - coordinates = this.parseLineStringText_(); - break; - } - case 'POLYGON': { - coordinates = this.parsePolygonText_(); - break; - } - case 'MULTIPOINT': { - coordinates = this.parseMultiPointText_(); - break; - } - case 'MULTILINESTRING': { - coordinates = this.parseMultiLineStringText_(); - break; - } - case 'MULTIPOLYGON': { - coordinates = this.parseMultiPolygonText_(); - break; - } - default: { - throw new Error('Invalid geometry type: ' + geomType); - } - } - if (!coordinates) { - if (ctor === GeometryConstructor['POINT']) { + if (isEmpty) { + if (geomType == 'POINT') { coordinates = [NaN, NaN]; } else { coordinates = []; } + } else { + switch (geomType) { + case 'POINT': { + coordinates = this.parsePointText_(); + break; + } + case 'LINESTRING': { + coordinates = this.parseLineStringText_(); + break; + } + case 'POLYGON': { + coordinates = this.parsePolygonText_(); + break; + } + case 'MULTIPOINT': { + coordinates = this.parseMultiPointText_(); + break; + } + case 'MULTILINESTRING': { + coordinates = this.parseMultiLineStringText_(); + break; + } + case 'MULTIPOLYGON': { + coordinates = this.parseMultiPolygonText_(); + break; + } + default: + break; + } } + return new ctor(coordinates, this.layout_); } } @@ -604,7 +597,7 @@ class Parser { */ class WKT extends TextFeature { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -623,7 +616,7 @@ class WKT extends TextFeature { /** * Parse a WKT string. * @param {string} wkt WKT string. - * @return {import("../geom/Geometry.js").default|undefined} + * @return {import("../geom/Geometry.js").default} * The geometry created. * @private */ @@ -636,22 +629,19 @@ class WKT extends TextFeature { /** * @protected * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../Feature.js").default} Feature. */ readFeatureFromText(text, opt_options) { const geom = this.readGeometryFromText(text, opt_options); - if (geom) { - const feature = new Feature(); - feature.setGeometry(geom); - return feature; - } - return null; + const feature = new Feature(); + feature.setGeometry(geom); + return feature; } /** * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {Array} Features. */ @@ -677,22 +667,18 @@ class WKT extends TextFeature { /** * @param {string} text Text. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @protected * @return {import("../geom/Geometry.js").default} Geometry. */ readGeometryFromText(text, opt_options) { const geometry = this.parse_(text); - if (geometry) { - return transformGeometryWithOptions(geometry, false, opt_options); - } else { - return null; - } + return transformGeometryWithOptions(geometry, false, opt_options); } /** * @param {import("../Feature.js").default} feature Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @protected * @return {string} Text. */ @@ -706,7 +692,7 @@ class WKT extends TextFeature { /** * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @protected * @return {string} Text. */ @@ -724,7 +710,7 @@ class WKT extends TextFeature { /** * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @protected * @return {string} Text. */ @@ -855,7 +841,7 @@ const GeometryEncoder = { /** * Encode a geometry as WKT. - * @param {!import("../geom/Geometry.js").default} geom The geometry to encode. + * @param {import("../geom/Geometry.js").default} geom The geometry to encode. * @return {string} WKT string for the geometry. */ function encode(geom) { diff --git a/src/ol/format/WMSCapabilities.js b/src/ol/format/WMSCapabilities.js index 0ceced4465..4a72564fa4 100644 --- a/src/ol/format/WMSCapabilities.js +++ b/src/ol/format/WMSCapabilities.js @@ -407,7 +407,13 @@ function readException(node, objectStack) { * @return {Object|undefined} Layer object. */ function readCapabilityLayer(node, objectStack) { - return pushParseAndPop({}, LAYER_PARSERS, node, objectStack); + const layerObject = pushParseAndPop({}, LAYER_PARSERS, node, objectStack); + + if (layerObject['Layer'] === undefined) { + return Object.assign(layerObject, readLayer(node, objectStack)); + } + + return layerObject; } /** diff --git a/src/ol/format/WMSGetFeatureInfo.js b/src/ol/format/WMSGetFeatureInfo.js index 1aa6ae6958..b1e2f97658 100644 --- a/src/ol/format/WMSGetFeatureInfo.js +++ b/src/ol/format/WMSGetFeatureInfo.js @@ -33,7 +33,7 @@ const layerIdentifier = '_layer'; */ class WMSGetFeatureInfo extends XMLFeature { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -151,7 +151,7 @@ class WMSGetFeatureInfo extends XMLFeature { /** * @protected * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {Array} Features. */ readFeaturesFromNode(node, opt_options) { diff --git a/src/ol/format/XMLFeature.js b/src/ol/format/XMLFeature.js index e2a8539fef..9dc05efe40 100644 --- a/src/ol/format/XMLFeature.js +++ b/src/ol/format/XMLFeature.js @@ -37,7 +37,7 @@ class XMLFeature extends FeatureFormat { * Read a single feature. * * @param {Document|Element|Object|string} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../Feature.js").default} Feature. * @api */ @@ -62,7 +62,7 @@ class XMLFeature extends FeatureFormat { /** * @param {Document} doc Document. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {import("../Feature.js").default} Feature. */ readFeatureFromDocument(doc, opt_options) { @@ -76,7 +76,7 @@ class XMLFeature extends FeatureFormat { /** * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {import("../Feature.js").default} Feature. */ readFeatureFromNode(node, opt_options) { @@ -87,7 +87,7 @@ class XMLFeature extends FeatureFormat { * Read all features from a feature collection. * * @param {Document|Element|Object|string} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @return {Array} Features. * @api */ @@ -112,7 +112,7 @@ class XMLFeature extends FeatureFormat { /** * @param {Document} doc Document. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @protected * @return {Array} Features. */ @@ -133,7 +133,7 @@ class XMLFeature extends FeatureFormat { /** * @abstract * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @protected * @return {Array} Features. */ @@ -145,7 +145,7 @@ class XMLFeature extends FeatureFormat { * Read a single geometry from a source. * * @param {Document|Element|Object|string} source Source. - * @param {import("./Feature.js").ReadOptions=} opt_options Read options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Read options. * @return {import("../geom/Geometry.js").default} Geometry. */ readGeometry(source, opt_options) { @@ -169,7 +169,7 @@ class XMLFeature extends FeatureFormat { /** * @param {Document} doc Document. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @protected * @return {import("../geom/Geometry.js").default} Geometry. */ @@ -179,7 +179,7 @@ class XMLFeature extends FeatureFormat { /** * @param {Element} node Node. - * @param {import("./Feature.js").ReadOptions=} opt_options Options. + * @param {import("./Feature.js").ReadOptions} [opt_options] Options. * @protected * @return {import("../geom/Geometry.js").default} Geometry. */ @@ -229,7 +229,7 @@ class XMLFeature extends FeatureFormat { * Encode a feature as string. * * @param {import("../Feature.js").default} feature Feature. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {string} Encoded feature. */ writeFeature(feature, opt_options) { @@ -239,7 +239,7 @@ class XMLFeature extends FeatureFormat { /** * @param {import("../Feature.js").default} feature Feature. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @protected * @return {Node} Node. */ @@ -251,7 +251,7 @@ class XMLFeature extends FeatureFormat { * Encode an array of features as string. * * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {string} Result. * @api */ @@ -262,7 +262,7 @@ class XMLFeature extends FeatureFormat { /** * @param {Array} features Features. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @return {Node} Node. */ writeFeaturesNode(features, opt_options) { @@ -273,7 +273,7 @@ class XMLFeature extends FeatureFormat { * Encode a geometry as string. * * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Write options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Write options. * @return {string} Encoded geometry. */ writeGeometry(geometry, opt_options) { @@ -283,7 +283,7 @@ class XMLFeature extends FeatureFormat { /** * @param {import("../geom/Geometry.js").default} geometry Geometry. - * @param {import("./Feature.js").WriteOptions=} opt_options Options. + * @param {import("./Feature.js").WriteOptions} [opt_options] Options. * @return {Node} Node. */ writeGeometryNode(geometry, opt_options) { diff --git a/src/ol/format/filter.js b/src/ol/format/filter.js index c4d2c9615d..c44f97a774 100644 --- a/src/ol/format/filter.js +++ b/src/ol/format/filter.js @@ -4,6 +4,8 @@ import And from './filter/And.js'; import Bbox from './filter/Bbox.js'; import Contains from './filter/Contains.js'; +import DWithin from './filter/DWithin.js'; +import Disjoint from './filter/Disjoint.js'; import During from './filter/During.js'; import EqualTo from './filter/EqualTo.js'; import GreaterThan from './filter/GreaterThan.js'; @@ -17,13 +19,14 @@ import LessThanOrEqualTo from './filter/LessThanOrEqualTo.js'; import Not from './filter/Not.js'; import NotEqualTo from './filter/NotEqualTo.js'; import Or from './filter/Or.js'; +import ResourceId from './filter/ResourceId.js'; import Within from './filter/Within.js'; /** * Create a logical `` operator between two or more filter conditions. * * @param {...import("./filter/Filter.js").default} conditions Filter conditions. - * @returns {!And} `` operator. + * @return {!And} `` operator. * @api */ export function and(conditions) { @@ -35,7 +38,7 @@ export function and(conditions) { * Create a logical `` operator between two or more filter conditions. * * @param {...import("./filter/Filter.js").default} conditions Filter conditions. - * @returns {!Or} `` operator. + * @return {!Or} `` operator. * @api */ export function or(conditions) { @@ -47,7 +50,7 @@ export function or(conditions) { * Represents a logical `` operator for a filter condition. * * @param {!import("./filter/Filter.js").default} condition Filter condition. - * @returns {!Not} `` operator. + * @return {!Not} `` operator. * @api */ export function not(condition) { @@ -60,9 +63,9 @@ export function not(condition) { * * @param {!string} geometryName Geometry name to use. * @param {!import("../extent.js").Extent} extent Extent. - * @param {string=} opt_srsName SRS name. No srsName attribute will be + * @param {string} [opt_srsName] SRS name. No srsName attribute will be * set on geometries when this is not provided. - * @returns {!Bbox} `` operator. + * @return {!Bbox} `` operator. * @api */ export function bbox(geometryName, extent, opt_srsName) { @@ -75,9 +78,9 @@ export function bbox(geometryName, extent, opt_srsName) { * * @param {!string} geometryName Geometry name to use. * @param {!import("../geom/Geometry.js").default} geometry Geometry. - * @param {string=} opt_srsName SRS name. No srsName attribute will be + * @param {string} [opt_srsName] SRS name. No srsName attribute will be * set on geometries when this is not provided. - * @returns {!Contains} `` operator. + * @return {!Contains} `` operator. * @api */ export function contains(geometryName, geometry, opt_srsName) { @@ -90,37 +93,69 @@ export function contains(geometryName, geometry, opt_srsName) { * * @param {!string} geometryName Geometry name to use. * @param {!import("../geom/Geometry.js").default} geometry Geometry. - * @param {string=} opt_srsName SRS name. No srsName attribute will be + * @param {string} [opt_srsName] SRS name. No srsName attribute will be * set on geometries when this is not provided. - * @returns {!Intersects} `` operator. + * @return {!Intersects} `` operator. * @api */ export function intersects(geometryName, geometry, opt_srsName) { return new Intersects(geometryName, geometry, opt_srsName); } +/** + * Create a `` operator to test whether a geometry-valued property + * is disjoint to a given geometry. + * + * @param {!string} geometryName Geometry name to use. + * @param {!import("../geom/Geometry.js").default} geometry Geometry. + * @param {string} [opt_srsName] SRS name. No srsName attribute will be + * set on geometries when this is not provided. + * @return {!Disjoint} `` operator. + * @api + */ +export function disjoint(geometryName, geometry, opt_srsName) { + return new Disjoint(geometryName, geometry, opt_srsName); +} + /** * Create a `` operator to test whether a geometry-valued property * is within a given geometry. * * @param {!string} geometryName Geometry name to use. * @param {!import("../geom/Geometry.js").default} geometry Geometry. - * @param {string=} opt_srsName SRS name. No srsName attribute will be + * @param {string} [opt_srsName] SRS name. No srsName attribute will be * set on geometries when this is not provided. - * @returns {!Within} `` operator. + * @return {!Within} `` operator. * @api */ export function within(geometryName, geometry, opt_srsName) { return new Within(geometryName, geometry, opt_srsName); } +/** + * Create a `` operator to test whether a geometry-valued property + * is within a distance to a given geometry. + * + * @param {!string} geometryName Geometry name to use. + * @param {!import("../geom/Geometry.js").default} geometry Geometry. + * @param {!number} distance Distance. + * @param {!string} unit Unit. + * @param {string} [opt_srsName] SRS name. No srsName attribute will be + * set on geometries when this is not provided. + * @return {!DWithin} `` operator. + * @api + */ +export function dwithin(geometryName, geometry, distance, unit, opt_srsName) { + return new DWithin(geometryName, geometry, distance, unit, opt_srsName); +} + /** * Creates a `` comparison operator. * * @param {!string} propertyName Name of the context property to compare. * @param {!(string|number)} expression The value to compare. - * @param {boolean=} opt_matchCase Case-sensitive? - * @returns {!EqualTo} `` operator. + * @param {boolean} [opt_matchCase] Case-sensitive? + * @return {!EqualTo} `` operator. * @api */ export function equalTo(propertyName, expression, opt_matchCase) { @@ -132,8 +167,8 @@ export function equalTo(propertyName, expression, opt_matchCase) { * * @param {!string} propertyName Name of the context property to compare. * @param {!(string|number)} expression The value to compare. - * @param {boolean=} opt_matchCase Case-sensitive? - * @returns {!NotEqualTo} `` operator. + * @param {boolean} [opt_matchCase] Case-sensitive? + * @return {!NotEqualTo} `` operator. * @api */ export function notEqualTo(propertyName, expression, opt_matchCase) { @@ -145,7 +180,7 @@ export function notEqualTo(propertyName, expression, opt_matchCase) { * * @param {!string} propertyName Name of the context property to compare. * @param {!number} expression The value to compare. - * @returns {!LessThan} `` operator. + * @return {!LessThan} `` operator. * @api */ export function lessThan(propertyName, expression) { @@ -157,7 +192,7 @@ export function lessThan(propertyName, expression) { * * @param {!string} propertyName Name of the context property to compare. * @param {!number} expression The value to compare. - * @returns {!LessThanOrEqualTo} `` operator. + * @return {!LessThanOrEqualTo} `` operator. * @api */ export function lessThanOrEqualTo(propertyName, expression) { @@ -169,7 +204,7 @@ export function lessThanOrEqualTo(propertyName, expression) { * * @param {!string} propertyName Name of the context property to compare. * @param {!number} expression The value to compare. - * @returns {!GreaterThan} `` operator. + * @return {!GreaterThan} `` operator. * @api */ export function greaterThan(propertyName, expression) { @@ -181,7 +216,7 @@ export function greaterThan(propertyName, expression) { * * @param {!string} propertyName Name of the context property to compare. * @param {!number} expression The value to compare. - * @returns {!GreaterThanOrEqualTo} `` operator. + * @return {!GreaterThanOrEqualTo} `` operator. * @api */ export function greaterThanOrEqualTo(propertyName, expression) { @@ -193,7 +228,7 @@ export function greaterThanOrEqualTo(propertyName, expression) { * is null. * * @param {!string} propertyName Name of the context property to compare. - * @returns {!IsNull} `` operator. + * @return {!IsNull} `` operator. * @api */ export function isNull(propertyName) { @@ -207,7 +242,7 @@ export function isNull(propertyName) { * @param {!string} propertyName Name of the context property to compare. * @param {!number} lowerBoundary The lower bound of the range. * @param {!number} upperBoundary The upper bound of the range. - * @returns {!IsBetween} `` operator. + * @return {!IsBetween} `` operator. * @api */ export function between(propertyName, lowerBoundary, upperBoundary) { @@ -220,14 +255,14 @@ export function between(propertyName, lowerBoundary, upperBoundary) { * * @param {!string} propertyName Name of the context property to compare. * @param {!string} pattern Text pattern. - * @param {string=} opt_wildCard Pattern character which matches any sequence of + * @param {string} [opt_wildCard] Pattern character which matches any sequence of * zero or more string characters. Default is '*'. - * @param {string=} opt_singleChar pattern character which matches any single + * @param {string} [opt_singleChar] pattern character which matches any single * string character. Default is '.'. - * @param {string=} opt_escapeChar Escape character which can be used to escape + * @param {string} [opt_escapeChar] Escape character which can be used to escape * the pattern characters. Default is '!'. - * @param {boolean=} opt_matchCase Case-sensitive? - * @returns {!IsLike} `` operator. + * @param {boolean} [opt_matchCase] Case-sensitive? + * @return {!IsLike} `` operator. * @api */ export function like( @@ -254,9 +289,13 @@ export function like( * @param {!string} propertyName Name of the context property to compare. * @param {!string} begin The begin date in ISO-8601 format. * @param {!string} end The end date in ISO-8601 format. - * @returns {!During} `` operator. + * @return {!During} `` operator. * @api */ export function during(propertyName, begin, end) { return new During(propertyName, begin, end); } + +export function resourceId(rid) { + return new ResourceId(rid); +} diff --git a/src/ol/format/filter/Bbox.js b/src/ol/format/filter/Bbox.js index 1e3d899f6d..c8273c0e92 100644 --- a/src/ol/format/filter/Bbox.js +++ b/src/ol/format/filter/Bbox.js @@ -14,7 +14,7 @@ class Bbox extends Filter { /** * @param {!string} geometryName Geometry name to use. * @param {!import("../../extent.js").Extent} extent Extent. - * @param {string=} opt_srsName SRS name. No srsName attribute will be set + * @param {string} [opt_srsName] SRS name. No srsName attribute will be set * on geometries when this is not provided. */ constructor(geometryName, extent, opt_srsName) { diff --git a/src/ol/format/filter/ComparisonBinary.js b/src/ol/format/filter/ComparisonBinary.js index e1c4b8c2b0..1d86883497 100644 --- a/src/ol/format/filter/ComparisonBinary.js +++ b/src/ol/format/filter/ComparisonBinary.js @@ -15,7 +15,7 @@ class ComparisonBinary extends Comparison { * @param {!string} tagName The XML tag name for this filter. * @param {!string} propertyName Name of the context property to compare. * @param {!(string|number)} expression The value to compare. - * @param {boolean=} opt_matchCase Case-sensitive? + * @param {boolean} [opt_matchCase] Case-sensitive? */ constructor(tagName, propertyName, expression, opt_matchCase) { super(tagName, propertyName); diff --git a/src/ol/format/filter/Contains.js b/src/ol/format/filter/Contains.js index 408dc2659f..f06f33d098 100644 --- a/src/ol/format/filter/Contains.js +++ b/src/ol/format/filter/Contains.js @@ -13,7 +13,7 @@ class Contains extends Spatial { /** * @param {!string} geometryName Geometry name to use. * @param {!import("../../geom/Geometry.js").default} geometry Geometry. - * @param {string=} opt_srsName SRS name. No srsName attribute will be + * @param {string} [opt_srsName] SRS name. No srsName attribute will be * set on geometries when this is not provided. */ constructor(geometryName, geometry, opt_srsName) { diff --git a/src/ol/format/filter/DWithin.js b/src/ol/format/filter/DWithin.js new file mode 100644 index 0000000000..9e1f54b0ab --- /dev/null +++ b/src/ol/format/filter/DWithin.js @@ -0,0 +1,38 @@ +/** + * @module ol/format/filter/DWithin + */ +import Spatial from './Spatial.js'; + +/** + * @classdesc + * Represents a `` operator to test whether a geometry-valued property + * is within a distance to a given geometry. + * @api + */ +class DWithin extends Spatial { + /** + * @param {!string} geometryName Geometry name to use. + * @param {!import("../../geom/Geometry.js").default} geometry Geometry. + * @param {!number} distance Distance. + * @param {!string} unit Unit. + * @param {string} [opt_srsName] SRS name. No srsName attribute will be + * set on geometries when this is not provided. + */ + constructor(geometryName, geometry, distance, unit, opt_srsName) { + super('DWithin', geometryName, geometry, opt_srsName); + + /** + * @public + * @type {!number} + */ + this.distance = distance; + + /** + * @public + * @type {!string} + */ + this.unit = unit; + } +} + +export default DWithin; diff --git a/src/ol/format/filter/Disjoint.js b/src/ol/format/filter/Disjoint.js new file mode 100644 index 0000000000..80c8895d2c --- /dev/null +++ b/src/ol/format/filter/Disjoint.js @@ -0,0 +1,24 @@ +/** + * @module ol/format/filter/Disjoint + */ +import Spatial from './Spatial.js'; + +/** + * @classdesc + * Represents a `` operator to test whether a geometry-valued property + * is disjoint to a given geometry. + * @api + */ +class Disjoint extends Spatial { + /** + * @param {!string} geometryName Geometry name to use. + * @param {!import("../../geom/Geometry.js").default} geometry Geometry. + * @param {string} [opt_srsName] SRS name. No srsName attribute will be + * set on geometries when this is not provided. + */ + constructor(geometryName, geometry, opt_srsName) { + super('Disjoint', geometryName, geometry, opt_srsName); + } +} + +export default Disjoint; diff --git a/src/ol/format/filter/EqualTo.js b/src/ol/format/filter/EqualTo.js index 7134883671..1ad14c3d77 100644 --- a/src/ol/format/filter/EqualTo.js +++ b/src/ol/format/filter/EqualTo.js @@ -12,7 +12,7 @@ class EqualTo extends ComparisonBinary { /** * @param {!string} propertyName Name of the context property to compare. * @param {!(string|number)} expression The value to compare. - * @param {boolean=} opt_matchCase Case-sensitive? + * @param {boolean} [opt_matchCase] Case-sensitive? */ constructor(propertyName, expression, opt_matchCase) { super('PropertyIsEqualTo', propertyName, expression, opt_matchCase); diff --git a/src/ol/format/filter/Filter.js b/src/ol/format/filter/Filter.js index ef493c4c76..d75588ac9c 100644 --- a/src/ol/format/filter/Filter.js +++ b/src/ol/format/filter/Filter.js @@ -23,7 +23,7 @@ class Filter { /** * The XML tag name for a filter. - * @returns {!string} Name. + * @return {!string} Name. */ getTagName() { return this.tagName_; diff --git a/src/ol/format/filter/Intersects.js b/src/ol/format/filter/Intersects.js index db74c2bcc1..b80a704e2f 100644 --- a/src/ol/format/filter/Intersects.js +++ b/src/ol/format/filter/Intersects.js @@ -13,7 +13,7 @@ class Intersects extends Spatial { /** * @param {!string} geometryName Geometry name to use. * @param {!import("../../geom/Geometry.js").default} geometry Geometry. - * @param {string=} opt_srsName SRS name. No srsName attribute will be + * @param {string} [opt_srsName] SRS name. No srsName attribute will be * set on geometries when this is not provided. */ constructor(geometryName, geometry, opt_srsName) { diff --git a/src/ol/format/filter/IsLike.js b/src/ol/format/filter/IsLike.js index 666cfafc07..49e5c44268 100644 --- a/src/ol/format/filter/IsLike.js +++ b/src/ol/format/filter/IsLike.js @@ -13,13 +13,13 @@ class IsLike extends Comparison { * [constructor description] * @param {!string} propertyName Name of the context property to compare. * @param {!string} pattern Text pattern. - * @param {string=} opt_wildCard Pattern character which matches any sequence of + * @param {string} [opt_wildCard] Pattern character which matches any sequence of * zero or more string characters. Default is '*'. - * @param {string=} opt_singleChar pattern character which matches any single + * @param {string} [opt_singleChar] pattern character which matches any single * string character. Default is '.'. - * @param {string=} opt_escapeChar Escape character which can be used to escape + * @param {string} [opt_escapeChar] Escape character which can be used to escape * the pattern characters. Default is '!'. - * @param {boolean=} opt_matchCase Case-sensitive? + * @param {boolean} [opt_matchCase] Case-sensitive? */ constructor( propertyName, diff --git a/src/ol/format/filter/NotEqualTo.js b/src/ol/format/filter/NotEqualTo.js index 66e34a3eb6..f9923c97b8 100644 --- a/src/ol/format/filter/NotEqualTo.js +++ b/src/ol/format/filter/NotEqualTo.js @@ -12,7 +12,7 @@ class NotEqualTo extends ComparisonBinary { /** * @param {!string} propertyName Name of the context property to compare. * @param {!(string|number)} expression The value to compare. - * @param {boolean=} opt_matchCase Case-sensitive? + * @param {boolean} [opt_matchCase] Case-sensitive? */ constructor(propertyName, expression, opt_matchCase) { super('PropertyIsNotEqualTo', propertyName, expression, opt_matchCase); diff --git a/src/ol/format/filter/ResourceId.js b/src/ol/format/filter/ResourceId.js new file mode 100644 index 0000000000..d68a6bcf75 --- /dev/null +++ b/src/ol/format/filter/ResourceId.js @@ -0,0 +1,25 @@ +/** + * @module ol/format/filter/ResourceId + */ +import Filter from './Filter.js'; + +/** + * @classdesc + * + * @abstract + */ +class ResourceId extends Filter { + /** + * @param {!string} rid Resource ID. + */ + constructor(rid) { + super('ResourceId'); + + /** + * @type {!string} + */ + this.rid = rid; + } +} + +export default ResourceId; diff --git a/src/ol/format/filter/Spatial.js b/src/ol/format/filter/Spatial.js index b978333c7f..7fd5affe0e 100644 --- a/src/ol/format/filter/Spatial.js +++ b/src/ol/format/filter/Spatial.js @@ -16,7 +16,7 @@ class Spatial extends Filter { * @param {!string} tagName The XML tag name for this filter. * @param {!string} geometryName Geometry name to use. * @param {!import("../../geom/Geometry.js").default} geometry Geometry. - * @param {string=} opt_srsName SRS name. No srsName attribute will be + * @param {string} [opt_srsName] SRS name. No srsName attribute will be * set on geometries when this is not provided. */ constructor(tagName, geometryName, geometry, opt_srsName) { diff --git a/src/ol/format/filter/Within.js b/src/ol/format/filter/Within.js index 5ee73102ed..4c51282a3c 100644 --- a/src/ol/format/filter/Within.js +++ b/src/ol/format/filter/Within.js @@ -13,7 +13,7 @@ class Within extends Spatial { /** * @param {!string} geometryName Geometry name to use. * @param {!import("../../geom/Geometry.js").default} geometry Geometry. - * @param {string=} opt_srsName SRS name. No srsName attribute will be + * @param {string} [opt_srsName] SRS name. No srsName attribute will be * set on geometries when this is not provided. */ constructor(geometryName, geometry, opt_srsName) { diff --git a/src/ol/format/readme.md b/src/ol/format/readme.md index 7023f3ab07..ad7856b49d 100644 --- a/src/ol/format/readme.md +++ b/src/ol/format/readme.md @@ -124,7 +124,7 @@ In the above there are many common operations, like setting the property of the ### Putting it all together -With the above, you should be able to read through the [source code to `ol/format/GPX`](https://github.com/openlayers/openlayers/blob/main/src/ol/format/gpxformat.js) and get a feel for how it works. Start from the bottom of the file and work upwards. It's also useful to have [an example GPX file](http://www.topografix.com/fells_loop.gpx) and [the GPX specification](http://www.topografix.com/GPX/1/1/) to hand. +With the above, you should be able to read through the [source code to `ol/format/GPX`](https://github.com/openlayers/openlayers/blob/main/src/ol/format/GPX.js) and get a feel for how it works. Start from the bottom of the file and work upwards. It's also useful to have [an example GPX file](https://openlayers.org/en/latest/examples/data/fells_loop.gpx) and [the GPX specification](https://www.topografix.com/GPX/1/1/) to hand. ### Handling errors diff --git a/src/ol/functions.js b/src/ol/functions.js index 0e8d8086b2..87fa024d5e 100644 --- a/src/ol/functions.js +++ b/src/ol/functions.js @@ -6,7 +6,7 @@ import {equals as arrayEquals} from './array.js'; /** * Always returns true. - * @returns {boolean} true. + * @return {boolean} true. */ export function TRUE() { return true; @@ -14,7 +14,7 @@ export function TRUE() { /** * Always returns false. - * @returns {boolean} false. + * @return {boolean} false. */ export function FALSE() { return false; diff --git a/src/ol/geom/Circle.js b/src/ol/geom/Circle.js index 6e4a669976..0a70180d4c 100644 --- a/src/ol/geom/Circle.js +++ b/src/ol/geom/Circle.js @@ -18,8 +18,8 @@ class Circle extends SimpleGeometry { * @param {!import("../coordinate.js").Coordinate} center Center. * For internal use, flat coordinates in combination with `opt_layout` and no * `opt_radius` are also accepted. - * @param {number=} opt_radius Radius. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {number} [opt_radius] Radius. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. */ constructor(center, opt_radius, opt_layout) { super(); @@ -37,7 +37,13 @@ class Circle extends SimpleGeometry { * @api */ clone() { - return new Circle(this.flatCoordinates.slice(), undefined, this.layout); + const circle = new Circle( + this.flatCoordinates.slice(), + undefined, + this.layout + ); + circle.applyProperties(this); + return circle; } /** @@ -183,7 +189,7 @@ class Circle extends SimpleGeometry { * number) of the circle. * @param {!import("../coordinate.js").Coordinate} center Center. * @param {number} radius Radius. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. * @api */ setCenterAndRadius(center, radius, opt_layout) { @@ -221,7 +227,7 @@ class Circle extends SimpleGeometry { /** * Rotate the geometry around a given coordinate. This modifies the geometry * coordinates in place. - * @param {number} angle Rotation angle in radians. + * @param {number} angle Rotation angle in counter-clockwise radians. * @param {import("../coordinate.js").Coordinate} anchor The rotation center. * @api */ diff --git a/src/ol/geom/Geometry.js b/src/ol/geom/Geometry.js index e7d7cd26f0..3d19052f86 100644 --- a/src/ol/geom/Geometry.js +++ b/src/ol/geom/Geometry.js @@ -135,7 +135,7 @@ class Geometry extends BaseObject { * Return the closest point of the geometry to the passed point as * {@link module:ol/coordinate~Coordinate coordinate}. * @param {import("../coordinate.js").Coordinate} point Point. - * @param {import("../coordinate.js").Coordinate=} opt_closestPoint Closest point. + * @param {import("../coordinate.js").Coordinate} [opt_closestPoint] Closest point. * @return {import("../coordinate.js").Coordinate} Closest point. * @api */ @@ -168,7 +168,7 @@ class Geometry extends BaseObject { /** * Get the extent of the geometry. - * @param {import("../extent.js").Extent=} opt_extent Extent. + * @param {import("../extent.js").Extent} [opt_extent] Extent. * @return {import("../extent.js").Extent} extent Extent. * @api */ @@ -200,8 +200,8 @@ class Geometry extends BaseObject { * coordinates in place. * @abstract * @param {number} sx The scaling factor in the x-direction. - * @param {number=} opt_sy The scaling factor in the y-direction (defaults to sx). - * @param {import("../coordinate.js").Coordinate=} opt_anchor The scale origin (defaults to the center + * @param {number} [opt_sy] The scaling factor in the y-direction (defaults to sx). + * @param {import("../coordinate.js").Coordinate} [opt_anchor] The scale origin (defaults to the center * of the geometry extent). * @api */ diff --git a/src/ol/geom/GeometryCollection.js b/src/ol/geom/GeometryCollection.js index 2f08c25cea..c41cc79045 100644 --- a/src/ol/geom/GeometryCollection.js +++ b/src/ol/geom/GeometryCollection.js @@ -20,7 +20,7 @@ import {listen, unlistenByKey} from '../events.js'; */ class GeometryCollection extends Geometry { /** - * @param {Array=} opt_geometries Geometries. + * @param {Array} [opt_geometries] Geometries. */ constructor(opt_geometries) { super(); @@ -69,6 +69,7 @@ class GeometryCollection extends Geometry { clone() { const geometryCollection = new GeometryCollection(null); geometryCollection.setGeometries(this.geometries_); + geometryCollection.applyProperties(this); return geometryCollection; } @@ -254,8 +255,8 @@ class GeometryCollection extends Geometry { * coordinates in place. * @abstract * @param {number} sx The scaling factor in the x-direction. - * @param {number=} opt_sy The scaling factor in the y-direction (defaults to sx). - * @param {import("../coordinate.js").Coordinate=} opt_anchor The scale origin (defaults to the center + * @param {number} [opt_sy] The scaling factor in the y-direction (defaults to sx). + * @param {import("../coordinate.js").Coordinate} [opt_anchor] The scale origin (defaults to the center * of the geometry extent). * @api */ diff --git a/src/ol/geom/LineString.js b/src/ol/geom/LineString.js index c791e0ebdd..8f340fc27f 100644 --- a/src/ol/geom/LineString.js +++ b/src/ol/geom/LineString.js @@ -25,7 +25,7 @@ class LineString extends SimpleGeometry { /** * @param {Array|Array} coordinates Coordinates. * For internal use, flat coordinates in combination with `opt_layout` are also accepted. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. */ constructor(coordinates, opt_layout) { super(); @@ -87,7 +87,12 @@ class LineString extends SimpleGeometry { * @api */ clone() { - return new LineString(this.flatCoordinates.slice(), this.layout); + const lineString = new LineString( + this.flatCoordinates.slice(), + this.layout + ); + lineString.applyProperties(this); + return lineString; } /** @@ -158,7 +163,7 @@ class LineString extends SimpleGeometry { * return the last coordinate. * * @param {number} m M. - * @param {boolean=} opt_extrapolate Extrapolate. Default is `false`. + * @param {boolean} [opt_extrapolate] Extrapolate. Default is `false`. * @return {import("../coordinate.js").Coordinate} Coordinate. * @api */ @@ -199,7 +204,7 @@ class LineString extends SimpleGeometry { * The `fraction` is a number between 0 and 1, where 0 is the start of the * linestring and 1 is the end. * @param {number} fraction Fraction. - * @param {import("../coordinate.js").Coordinate=} opt_dest Optional coordinate whose values will + * @param {import("../coordinate.js").Coordinate} [opt_dest] Optional coordinate whose values will * be modified. If not provided, a new coordinate will be returned. * @return {import("../coordinate.js").Coordinate} Coordinate of the interpolated point. * @api @@ -288,7 +293,7 @@ class LineString extends SimpleGeometry { /** * Set the coordinates of the linestring. * @param {!Array} coordinates Coordinates. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. * @api */ setCoordinates(coordinates, opt_layout) { diff --git a/src/ol/geom/LinearRing.js b/src/ol/geom/LinearRing.js index 0c4de89059..f7618e619f 100644 --- a/src/ol/geom/LinearRing.js +++ b/src/ol/geom/LinearRing.js @@ -22,7 +22,7 @@ class LinearRing extends SimpleGeometry { /** * @param {Array|Array} coordinates Coordinates. * For internal use, flat coordinates in combination with `opt_layout` are also accepted. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. */ constructor(coordinates, opt_layout) { super(); @@ -167,7 +167,7 @@ class LinearRing extends SimpleGeometry { /** * Set the coordinates of the linear ring. * @param {!Array} coordinates Coordinates. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. * @api */ setCoordinates(coordinates, opt_layout) { diff --git a/src/ol/geom/MultiLineString.js b/src/ol/geom/MultiLineString.js index d604195899..d4f712c2be 100644 --- a/src/ol/geom/MultiLineString.js +++ b/src/ol/geom/MultiLineString.js @@ -28,8 +28,8 @@ class MultiLineString extends SimpleGeometry { * @param {Array|LineString>|Array} coordinates * Coordinates or LineString geometries. (For internal use, flat coordinates in * combination with `opt_layout` and `opt_ends` are also accepted.) - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. - * @param {Array=} opt_ends Flat coordinate ends for internal use. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. + * @param {Array} [opt_ends] Flat coordinate ends for internal use. */ constructor(coordinates, opt_layout, opt_ends) { super(); @@ -102,11 +102,13 @@ class MultiLineString extends SimpleGeometry { * @api */ clone() { - return new MultiLineString( + const multiLineString = new MultiLineString( this.flatCoordinates.slice(), this.layout, this.ends_.slice() ); + multiLineString.applyProperties(this); + return multiLineString; } /** @@ -163,8 +165,8 @@ class MultiLineString extends SimpleGeometry { * LineStrings. * * @param {number} m M. - * @param {boolean=} opt_extrapolate Extrapolate. Default is `false`. - * @param {boolean=} opt_interpolate Interpolate. Default is `false`. + * @param {boolean} [opt_extrapolate] Extrapolate. Default is `false`. + * @param {boolean} [opt_interpolate] Interpolate. Default is `false`. * @return {import("../coordinate.js").Coordinate} Coordinate. * @api */ @@ -330,7 +332,7 @@ class MultiLineString extends SimpleGeometry { /** * Set the coordinates of the multilinestring. * @param {!Array>} coordinates Coordinates. - * @param {GeometryLayout=} opt_layout Layout. + * @param {GeometryLayout} [opt_layout] Layout. * @api */ setCoordinates(coordinates, opt_layout) { diff --git a/src/ol/geom/MultiPoint.js b/src/ol/geom/MultiPoint.js index 92033cff8b..4036c7993d 100644 --- a/src/ol/geom/MultiPoint.js +++ b/src/ol/geom/MultiPoint.js @@ -20,7 +20,7 @@ class MultiPoint extends SimpleGeometry { /** * @param {Array|Array} coordinates Coordinates. * For internal use, flat coordinates in combination with `opt_layout` are also accepted. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. */ constructor(coordinates, opt_layout) { super(); @@ -61,6 +61,7 @@ class MultiPoint extends SimpleGeometry { this.flatCoordinates.slice(), this.layout ); + multiPoint.applyProperties(this); return multiPoint; } @@ -180,7 +181,7 @@ class MultiPoint extends SimpleGeometry { /** * Set the coordinates of the multipoint. * @param {!Array} coordinates Coordinates. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. * @api */ setCoordinates(coordinates, opt_layout) { diff --git a/src/ol/geom/MultiPolygon.js b/src/ol/geom/MultiPolygon.js index 3925cd69b5..2c15391d78 100644 --- a/src/ol/geom/MultiPolygon.js +++ b/src/ol/geom/MultiPolygon.js @@ -35,8 +35,8 @@ class MultiPolygon extends SimpleGeometry { /** * @param {Array>|Polygon>|Array} coordinates Coordinates. * For internal use, flat coordinates in combination with `opt_layout` and `opt_endss` are also accepted. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. - * @param {Array>=} opt_endss Array of ends for internal use with flat coordinates. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. + * @param {Array>} [opt_endss] Array of ends for internal use with flat coordinates. */ constructor(coordinates, opt_layout, opt_endss) { super(); @@ -155,11 +155,14 @@ class MultiPolygon extends SimpleGeometry { newEndss[i] = this.endss_[i].slice(); } - return new MultiPolygon( + const multiPolygon = new MultiPolygon( this.flatCoordinates.slice(), this.layout, newEndss ); + multiPolygon.applyProperties(this); + + return multiPolygon; } /** @@ -233,7 +236,7 @@ class MultiPolygon extends SimpleGeometry { * Get the coordinate array for this geometry. This array has the structure * of a GeoJSON coordinate array for multi-polygons. * - * @param {boolean=} opt_right Orient coordinates according to the right-hand + * @param {boolean} [opt_right] Orient coordinates according to the right-hand * rule (counter-clockwise for exterior and clockwise for interior rings). * If `false`, coordinates will be oriented according to the left-hand rule * (clockwise for exterior and counter-clockwise for interior rings). @@ -446,7 +449,7 @@ class MultiPolygon extends SimpleGeometry { /** * Set the coordinates of the multipolygon. * @param {!Array>>} coordinates Coordinates. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. * @api */ setCoordinates(coordinates, opt_layout) { diff --git a/src/ol/geom/Point.js b/src/ol/geom/Point.js index 08cae660e9..a640affb70 100644 --- a/src/ol/geom/Point.js +++ b/src/ol/geom/Point.js @@ -16,7 +16,7 @@ import {squaredDistance as squaredDx} from '../math.js'; class Point extends SimpleGeometry { /** * @param {import("../coordinate.js").Coordinate} coordinates Coordinates. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. */ constructor(coordinates, opt_layout) { super(); @@ -30,6 +30,7 @@ class Point extends SimpleGeometry { */ clone() { const point = new Point(this.flatCoordinates.slice(), this.layout); + point.applyProperties(this); return point; } @@ -99,7 +100,7 @@ class Point extends SimpleGeometry { /** * @param {!Array<*>} coordinates Coordinates. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. * @api */ setCoordinates(coordinates, opt_layout) { diff --git a/src/ol/geom/Polygon.js b/src/ol/geom/Polygon.js index 974340a6e0..cc4785e13e 100644 --- a/src/ol/geom/Polygon.js +++ b/src/ol/geom/Polygon.js @@ -35,8 +35,8 @@ class Polygon extends SimpleGeometry { * an array of vertices' coordinates where the first coordinate and the last are * equivalent. (For internal use, flat coordinates in combination with * `opt_layout` and `opt_ends` are also accepted.) - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. - * @param {Array=} opt_ends Ends (for internal use with flat coordinates). + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. + * @param {Array} [opt_ends] Ends (for internal use with flat coordinates). */ constructor(coordinates, opt_layout, opt_ends) { super(); @@ -118,11 +118,13 @@ class Polygon extends SimpleGeometry { * @api */ clone() { - return new Polygon( + const polygon = new Polygon( this.flatCoordinates.slice(), this.layout, this.ends_.slice() ); + polygon.applyProperties(this); + return polygon; } /** @@ -196,7 +198,7 @@ class Polygon extends SimpleGeometry { * Get the coordinate array for this geometry. This array has the structure * of a GeoJSON coordinate array for polygons. * - * @param {boolean=} opt_right Orient coordinates according to the right-hand + * @param {boolean} [opt_right] Orient coordinates according to the right-hand * rule (counter-clockwise for exterior and clockwise for interior rings). * If `false`, coordinates will be oriented according to the left-hand rule * (clockwise for exterior and counter-clockwise for interior rings). @@ -385,7 +387,7 @@ class Polygon extends SimpleGeometry { /** * Set the coordinates of the polygon. * @param {!Array>} coordinates Coordinates. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. * @api */ setCoordinates(coordinates, opt_layout) { @@ -411,10 +413,10 @@ export default Polygon; * Create an approximation of a circle on the surface of a sphere. * @param {import("../coordinate.js").Coordinate} center Center (`[lon, lat]` in degrees). * @param {number} radius The great-circle distance from the center to - * the polygon vertices. - * @param {number=} opt_n Optional number of vertices for the resulting + * the polygon vertices in meters. + * @param {number} [opt_n] Optional number of vertices for the resulting * polygon. Default is `32`. - * @param {number=} opt_sphereRadius Optional radius for the sphere (defaults to + * @param {number} [opt_sphereRadius] Optional radius for the sphere (defaults to * the Earth's mean radius using the WGS84 ellipsoid). * @return {Polygon} The "circular" polygon. * @api @@ -466,9 +468,9 @@ export function fromExtent(extent) { /** * Create a regular polygon from a circle. * @param {import("./Circle.js").default} circle Circle geometry. - * @param {number=} opt_sides Number of sides of the polygon. Default is 32. - * @param {number=} opt_angle Start angle for the first vertex of the polygon in - * radians. Default is 0. + * @param {number} [opt_sides] Number of sides of the polygon. Default is 32. + * @param {number} [opt_angle] Start angle for the first vertex of the polygon in + * counter-clockwise radians. 0 means East. Default is 0. * @return {Polygon} Polygon geometry. * @api */ @@ -497,8 +499,8 @@ export function fromCircle(circle, opt_sides, opt_angle) { * @param {Polygon} polygon Polygon geometry. * @param {import("../coordinate.js").Coordinate} center Center of the regular polygon. * @param {number} radius Radius of the regular polygon. - * @param {number=} opt_angle Start angle for the first vertex of the polygon in - * radians. Default is 0. + * @param {number} [opt_angle] Start angle for the first vertex of the polygon in + * counter-clockwise radians. 0 means East. Default is 0. */ export function makeRegular(polygon, center, radius, opt_angle) { const flatCoordinates = polygon.getFlatCoordinates(); diff --git a/src/ol/geom/SimpleGeometry.js b/src/ol/geom/SimpleGeometry.js index 1f8b244694..87e1c67e2d 100644 --- a/src/ol/geom/SimpleGeometry.js +++ b/src/ol/geom/SimpleGeometry.js @@ -164,7 +164,7 @@ class SimpleGeometry extends Geometry { /** * @abstract * @param {!Array<*>} coordinates Coordinates. - * @param {import("./GeometryLayout.js").default=} opt_layout Layout. + * @param {import("./GeometryLayout.js").default} [opt_layout] Layout. */ setCoordinates(coordinates, opt_layout) { abstract(); @@ -217,7 +217,7 @@ class SimpleGeometry extends Geometry { /** * Rotate the geometry around a given coordinate. This modifies the geometry * coordinates in place. - * @param {number} angle Rotation angle in radians. + * @param {number} angle Rotation angle in counter-clockwise radians. * @param {import("../coordinate.js").Coordinate} anchor The rotation center. * @api */ @@ -242,8 +242,8 @@ class SimpleGeometry extends Geometry { * Scale the geometry (with an optional origin). This modifies the geometry * coordinates in place. * @param {number} sx The scaling factor in the x-direction. - * @param {number=} opt_sy The scaling factor in the y-direction (defaults to sx). - * @param {import("../coordinate.js").Coordinate=} opt_anchor The scale origin (defaults to the center + * @param {number} [opt_sy] The scaling factor in the y-direction (defaults to sx). + * @param {import("../coordinate.js").Coordinate} [opt_anchor] The scale origin (defaults to the center * of the geometry extent). * @api */ @@ -333,7 +333,7 @@ export function getStrideForLayout(layout) { /** * @param {SimpleGeometry} simpleGeometry Simple geometry. * @param {import("../transform.js").Transform} transform Transform. - * @param {Array=} opt_dest Destination. + * @param {Array} [opt_dest] Destination. * @return {Array} Transformed flat coordinates. */ export function transformGeom2D(simpleGeometry, transform, opt_dest) { diff --git a/src/ol/geom/flat/closest.js b/src/ol/geom/flat/closest.js index c9f5e0242f..247f3e92c6 100644 --- a/src/ol/geom/flat/closest.js +++ b/src/ol/geom/flat/closest.js @@ -138,7 +138,7 @@ export function multiArrayMaxSquaredDelta( * @param {number} y Y. * @param {Array} closestPoint Closest point. * @param {number} minSquaredDistance Minimum squared distance. - * @param {Array=} opt_tmpPoint Temporary point object. + * @param {Array} [opt_tmpPoint] Temporary point object. * @return {number} Minimum squared distance. */ export function assignClosestPoint( @@ -251,7 +251,7 @@ export function assignClosestPoint( * @param {number} y Y. * @param {Array} closestPoint Closest point. * @param {number} minSquaredDistance Minimum squared distance. - * @param {Array=} opt_tmpPoint Temporary point object. + * @param {Array} [opt_tmpPoint] Temporary point object. * @return {number} Minimum squared distance. */ export function assignClosestArrayPoint( @@ -299,7 +299,7 @@ export function assignClosestArrayPoint( * @param {number} y Y. * @param {Array} closestPoint Closest point. * @param {number} minSquaredDistance Minimum squared distance. - * @param {Array=} opt_tmpPoint Temporary point object. + * @param {Array} [opt_tmpPoint] Temporary point object. * @return {number} Minimum squared distance. */ export function assignClosestMultiArrayPoint( diff --git a/src/ol/geom/flat/contains.js b/src/ol/geom/flat/contains.js index ef66b407d2..db1f3673df 100644 --- a/src/ol/geom/flat/contains.js +++ b/src/ol/geom/flat/contains.js @@ -55,7 +55,7 @@ export function linearRingContainsXY( x, y ) { - // http://geomalgorithms.com/a03-_inclusion.html + // https://geomalgorithms.com/a03-_inclusion.html // Copyright 2000 softSurfer, 2012 Dan Sunday // This code may be freely used and modified for any purpose // providing that this copyright notice is included with it. diff --git a/src/ol/geom/flat/deflate.js b/src/ol/geom/flat/deflate.js index 00ac60b06d..882f95f1e9 100644 --- a/src/ol/geom/flat/deflate.js +++ b/src/ol/geom/flat/deflate.js @@ -43,7 +43,7 @@ export function deflateCoordinates( * @param {number} offset Offset. * @param {Array>} coordinatess Coordinatess. * @param {number} stride Stride. - * @param {Array=} opt_ends Ends. + * @param {Array} [opt_ends] Ends. * @return {Array} Ends. */ export function deflateCoordinatesArray( @@ -74,7 +74,7 @@ export function deflateCoordinatesArray( * @param {number} offset Offset. * @param {Array>>} coordinatesss Coordinatesss. * @param {number} stride Stride. - * @param {Array>=} opt_endss Endss. + * @param {Array>} [opt_endss] Endss. * @return {Array>} Endss. */ export function deflateMultiCoordinatesArray( diff --git a/src/ol/geom/flat/flip.js b/src/ol/geom/flat/flip.js index af60307a87..e5abcf5992 100644 --- a/src/ol/geom/flat/flip.js +++ b/src/ol/geom/flat/flip.js @@ -7,8 +7,8 @@ * @param {number} offset Offset. * @param {number} end End. * @param {number} stride Stride. - * @param {Array=} opt_dest Destination. - * @param {number=} opt_destOffset Destination offset. + * @param {Array} [opt_dest] Destination. + * @param {number} [opt_destOffset] Destination offset. * @return {Array} Flat coordinates. */ export function flipXY( diff --git a/src/ol/geom/flat/inflate.js b/src/ol/geom/flat/inflate.js index 590cd301f5..774a813fc9 100644 --- a/src/ol/geom/flat/inflate.js +++ b/src/ol/geom/flat/inflate.js @@ -7,7 +7,7 @@ * @param {number} offset Offset. * @param {number} end End. * @param {number} stride Stride. - * @param {Array=} opt_coordinates Coordinates. + * @param {Array} [opt_coordinates] Coordinates. * @return {Array} Coordinates. */ export function inflateCoordinates( @@ -31,7 +31,7 @@ export function inflateCoordinates( * @param {number} offset Offset. * @param {Array} ends Ends. * @param {number} stride Stride. - * @param {Array>=} opt_coordinatess Coordinatess. + * @param {Array>} [opt_coordinatess] Coordinatess. * @return {Array>} Coordinatess. */ export function inflateCoordinatesArray( @@ -63,7 +63,7 @@ export function inflateCoordinatesArray( * @param {number} offset Offset. * @param {Array>} endss Endss. * @param {number} stride Stride. - * @param {Array>>=} opt_coordinatesss + * @param {Array>>} [opt_coordinatesss] * Coordinatesss. * @return {Array>>} Coordinatesss. */ diff --git a/src/ol/geom/flat/interiorpoint.js b/src/ol/geom/flat/interiorpoint.js index 77e2882986..1a158d3e95 100644 --- a/src/ol/geom/flat/interiorpoint.js +++ b/src/ol/geom/flat/interiorpoint.js @@ -13,7 +13,7 @@ import {numberSafeCompareFunction} from '../../array.js'; * @param {number} stride Stride. * @param {Array} flatCenters Flat centers. * @param {number} flatCentersOffset Flat center offset. - * @param {Array=} opt_dest Destination. + * @param {Array} [opt_dest] Destination. * @return {Array} Destination point as XYM coordinate, where M is the * length of the horizontal intersection that the point belongs to. */ diff --git a/src/ol/geom/flat/interpolate.js b/src/ol/geom/flat/interpolate.js index 72f819f78a..d87709ca5e 100644 --- a/src/ol/geom/flat/interpolate.js +++ b/src/ol/geom/flat/interpolate.js @@ -10,8 +10,8 @@ import {lerp} from '../../math.js'; * @param {number} end End. * @param {number} stride Stride. * @param {number} fraction Fraction. - * @param {Array=} opt_dest Destination. - * @param {number=} opt_dimension Destination dimension (default is `2`) + * @param {Array} [opt_dest] Destination. + * @param {number} [opt_dimension] Destination dimension (default is `2`) * @return {Array} Destination. */ export function interpolatePoint( diff --git a/src/ol/geom/flat/orient.js b/src/ol/geom/flat/orient.js index 2a7d36cb08..30d46c6139 100644 --- a/src/ol/geom/flat/orient.js +++ b/src/ol/geom/flat/orient.js @@ -14,69 +14,19 @@ import {coordinates as reverseCoordinates} from './reverse.js'; * @return {boolean} Is clockwise. */ export function linearRingIsClockwise(flatCoordinates, offset, end, stride) { - // https://stackoverflow.com/a/1180256/2389327 - // https://en.wikipedia.org/wiki/Curve_orientation#Orientation_of_a_simple_polygon - - let firstVertexRepeated = true; - for (let i = 0; i < stride; ++i) { - if (flatCoordinates[offset + i] !== flatCoordinates[end - stride + i]) { - firstVertexRepeated = false; - break; - } + // https://stackoverflow.com/q/1165647/clockwise-method#1165943 + // https://github.com/OSGeo/gdal/blob/master/gdal/ogr/ogrlinearring.cpp + let edge = 0; + let x1 = flatCoordinates[end - stride]; + let y1 = flatCoordinates[end - stride + 1]; + for (; offset < end; offset += stride) { + const x2 = flatCoordinates[offset]; + const y2 = flatCoordinates[offset + 1]; + edge += (x2 - x1) * (y2 + y1); + x1 = x2; + y1 = y2; } - if (firstVertexRepeated) { - end -= stride; - } - const iMinVertex = findCornerVertex(flatCoordinates, offset, end, stride); - // Orientation matrix: - // [ 1 xa ya ] - // O = | 1 xb yb | - // [ 1 xc yc ] - let iPreviousVertex = iMinVertex - stride; - if (iPreviousVertex < offset) { - iPreviousVertex = end - stride; - } - let iNextVertex = iMinVertex + stride; - if (iNextVertex >= end) { - iNextVertex = offset; - } - const aX = flatCoordinates[iPreviousVertex]; - const aY = flatCoordinates[iPreviousVertex + 1]; - const bX = flatCoordinates[iMinVertex]; - const bY = flatCoordinates[iMinVertex + 1]; - const cX = flatCoordinates[iNextVertex]; - const cY = flatCoordinates[iNextVertex + 1]; - const determinant = - bX * cY + aX * bY + aY * cX - (aY * bX + bY * cX + aX * cY); - - return determinant < 0; -} - -// Find vertex along one edge of bounding box. -// In this case, we find smallest y; in case of tie also smallest x. -function findCornerVertex(flatCoordinates, offset, end, stride) { - let iMinVertex = -1; - let minY = Infinity; - let minXAtMinY = Infinity; - for (let i = offset; i < end; i += stride) { - const x = flatCoordinates[i]; - const y = flatCoordinates[i + 1]; - if (y > minY) { - continue; - } - if (y == minY) { - if (x >= minXAtMinY) { - continue; - } - } - - // Minimum so far. - iMinVertex = i; - minY = y; - minXAtMinY = x; - } - - return iMinVertex; + return edge === 0 ? undefined : edge > 0; } /** @@ -88,7 +38,7 @@ function findCornerVertex(flatCoordinates, offset, end, stride) { * @param {number} offset Offset. * @param {Array} ends Array of end indexes. * @param {number} stride Stride. - * @param {boolean=} opt_right Test for right-hand orientation + * @param {boolean} [opt_right] Test for right-hand orientation * (counter-clockwise exterior ring and clockwise interior rings). * @return {boolean} Rings are correctly oriented. */ @@ -131,7 +81,7 @@ export function linearRingsAreOriented( * @param {number} offset Offset. * @param {Array>} endss Array of array of end indexes. * @param {number} stride Stride. - * @param {boolean=} opt_right Test for right-hand orientation + * @param {boolean} [opt_right] Test for right-hand orientation * (counter-clockwise exterior ring and clockwise interior rings). * @return {boolean} Rings are correctly oriented. */ @@ -166,7 +116,7 @@ export function linearRingssAreOriented( * @param {number} offset Offset. * @param {Array} ends Ends. * @param {number} stride Stride. - * @param {boolean=} opt_right Follow the right-hand rule for orientation. + * @param {boolean} [opt_right] Follow the right-hand rule for orientation. * @return {number} End. */ export function orientLinearRings( @@ -207,7 +157,7 @@ export function orientLinearRings( * @param {number} offset Offset. * @param {Array>} endss Array of array of end indexes. * @param {number} stride Stride. - * @param {boolean=} opt_right Follow the right-hand rule for orientation. + * @param {boolean} [opt_right] Follow the right-hand rule for orientation. * @return {number} End. */ export function orientLinearRingsArray( diff --git a/src/ol/geom/flat/simplify.js b/src/ol/geom/flat/simplify.js index 75fc8b011f..89057a3304 100644 --- a/src/ol/geom/flat/simplify.js +++ b/src/ol/geom/flat/simplify.js @@ -36,7 +36,7 @@ import {squaredDistance, squaredSegmentDistance} from '../../math.js'; * @param {number} stride Stride. * @param {number} squaredTolerance Squared tolerance. * @param {boolean} highQuality Highest quality. - * @param {Array=} opt_simplifiedFlatCoordinates Simplified flat + * @param {Array} [opt_simplifiedFlatCoordinates] Simplified flat * coordinates. * @return {Array} Simplified line string. */ diff --git a/src/ol/geom/flat/textpath.js b/src/ol/geom/flat/textpath.js index 89b4a04add..0f04401acf 100644 --- a/src/ol/geom/flat/textpath.js +++ b/src/ol/geom/flat/textpath.js @@ -34,74 +34,114 @@ export function drawTextOnPath( cache, rotation ) { - const result = []; + let x2 = flatCoordinates[offset]; + let y2 = flatCoordinates[offset + 1]; + let x1 = 0; + let y1 = 0; + let segmentLength = 0; + let segmentM = 0; + + function advance() { + x1 = x2; + y1 = y2; + offset += stride; + x2 = flatCoordinates[offset]; + y2 = flatCoordinates[offset + 1]; + segmentM += segmentLength; + segmentLength = Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)); + } + do { + advance(); + } while (offset < end - stride && segmentM + segmentLength < startM); + + let interpolate = (startM - segmentM) / segmentLength; + const beginX = lerp(x1, x2, interpolate); + const beginY = lerp(y1, y2, interpolate); + + const startOffset = offset - stride; + const startLength = segmentM; + const endM = startM + scale * measureAndCacheTextWidth(font, text, cache); + while (offset < end - stride && segmentM + segmentLength < endM) { + advance(); + } + interpolate = (endM - segmentM) / segmentLength; + const endX = lerp(x1, x2, interpolate); + const endY = lerp(y1, y2, interpolate); // Keep text upright let reverse; if (rotation) { - const rotatedCoordinates = rotate( - flatCoordinates, - offset, - end, - stride, - rotation, - [flatCoordinates[offset], flatCoordinates[offset + 1]] - ); - reverse = - rotatedCoordinates[0] > - rotatedCoordinates[rotatedCoordinates.length - stride]; + const flat = [beginX, beginY, endX, endY]; + rotate(flat, 0, 4, 2, rotation, flat, flat); + reverse = flat[0] > flat[2]; } else { - reverse = flatCoordinates[offset] > flatCoordinates[end - stride]; + reverse = beginX > endX; } - const numChars = text.length; + const PI = Math.PI; + const result = []; + const singleSegment = startOffset + stride === offset; - let x1 = flatCoordinates[offset]; - let y1 = flatCoordinates[offset + 1]; - offset += stride; - let x2 = flatCoordinates[offset]; - let y2 = flatCoordinates[offset + 1]; - let segmentM = 0; - let segmentLength = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2)); - let angleChanged = false; + offset = startOffset; + segmentLength = 0; + segmentM = startLength; + x2 = flatCoordinates[offset]; + y2 = flatCoordinates[offset + 1]; - let index, previousAngle; - for (let i = 0; i < numChars; ++i) { - index = reverse ? numChars - i - 1 : i; - const char = text[index]; - const charLength = scale * measureAndCacheTextWidth(font, char, cache); - const charM = startM + charLength / 2; - while (offset < end - stride && segmentM + segmentLength < charM) { - x1 = x2; - y1 = y2; - offset += stride; - x2 = flatCoordinates[offset]; - y2 = flatCoordinates[offset + 1]; - segmentM += segmentLength; - segmentLength = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2)); + // All on the same segment + if (singleSegment) { + advance(); + + let previousAngle = Math.atan2(y2 - y1, x2 - x1); + if (reverse) { + previousAngle += previousAngle > 0 ? -PI : PI; } - const segmentPos = charM - segmentM; + const x = (endX + beginX) / 2; + const y = (endY + beginY) / 2; + result[0] = [x, y, (endM - startM) / 2, previousAngle, text]; + return result; + } + + let previousAngle; + for (let i = 0, ii = text.length; i < ii; ) { + advance(); let angle = Math.atan2(y2 - y1, x2 - x1); if (reverse) { - angle += angle > 0 ? -Math.PI : Math.PI; + angle += angle > 0 ? -PI : PI; } if (previousAngle !== undefined) { let delta = angle - previousAngle; - angleChanged = angleChanged || delta !== 0; - delta += - delta > Math.PI ? -2 * Math.PI : delta < -Math.PI ? 2 * Math.PI : 0; + delta += delta > PI ? -2 * PI : delta < -PI ? 2 * PI : 0; if (Math.abs(delta) > maxAngle) { return null; } } previousAngle = angle; - const interpolate = segmentPos / segmentLength; + + const iStart = i; + let charLength = 0; + for (; i < ii; ++i) { + const index = reverse ? ii - i - 1 : i; + const len = scale * measureAndCacheTextWidth(font, text[index], cache); + if ( + offset + stride < end && + segmentM + segmentLength < startM + charLength + len / 2 + ) { + break; + } + charLength += len; + } + if (i === iStart) { + continue; + } + const chars = reverse + ? text.substring(ii - iStart, ii - i) + : text.substring(iStart, i); + interpolate = (startM + charLength / 2 - segmentM) / segmentLength; const x = lerp(x1, x2, interpolate); const y = lerp(y1, y2, interpolate); - result[index] = [x, y, charLength / 2, angle, char]; + result.push([x, y, charLength / 2, angle, chars]); startM += charLength; } - return angleChanged - ? result - : [[result[0][0], result[0][1], result[0][2], result[0][3], text]]; + return result; } diff --git a/src/ol/geom/flat/transform.js b/src/ol/geom/flat/transform.js index ed33240d45..45096f13c4 100644 --- a/src/ol/geom/flat/transform.js +++ b/src/ol/geom/flat/transform.js @@ -8,7 +8,7 @@ * @param {number} end End. * @param {number} stride Stride. * @param {import("../../transform.js").Transform} transform Transform. - * @param {Array=} opt_dest Destination. + * @param {Array} [opt_dest] Destination. * @return {Array} Transformed coordinates. */ export function transform2D( @@ -40,7 +40,7 @@ export function transform2D( * @param {number} stride Stride. * @param {number} angle Angle. * @param {Array} anchor Rotation anchor point. - * @param {Array=} opt_dest Destination. + * @param {Array} [opt_dest] Destination. * @return {Array} Transformed coordinates. */ export function rotate( @@ -82,7 +82,7 @@ export function rotate( * @param {number} sx Scale factor in the x-direction. * @param {number} sy Scale factor in the y-direction. * @param {Array} anchor Scale anchor point. - * @param {Array=} opt_dest Destination. + * @param {Array} [opt_dest] Destination. * @return {Array} Transformed coordinates. */ export function scale( @@ -121,7 +121,7 @@ export function scale( * @param {number} stride Stride. * @param {number} deltaX Delta X. * @param {number} deltaY Delta Y. - * @param {Array=} opt_dest Destination. + * @param {Array} [opt_dest] Destination. * @return {Array} Transformed coordinates. */ export function translate( diff --git a/src/ol/interaction.js b/src/ol/interaction.js index 285a966c9b..0a6a74380a 100644 --- a/src/ol/interaction.js +++ b/src/ol/interaction.js @@ -75,7 +75,7 @@ export {default as Translate} from './interaction/Translate.js'; * * {@link module:ol/interaction/MouseWheelZoom~MouseWheelZoom} * * {@link module:ol/interaction/DragZoom~DragZoom} * - * @param {DefaultsOptions=} opt_options Defaults options. + * @param {DefaultsOptions} [opt_options] Defaults options. * @return {import("./Collection.js").default} * A collection of interactions to be used with the {@link module:ol/Map~Map} * constructor's `interactions` option. diff --git a/src/ol/interaction/DoubleClickZoom.js b/src/ol/interaction/DoubleClickZoom.js index 271a4e1c02..bea4c52e3f 100644 --- a/src/ol/interaction/DoubleClickZoom.js +++ b/src/ol/interaction/DoubleClickZoom.js @@ -17,7 +17,7 @@ import MapBrowserEventType from '../MapBrowserEventType.js'; */ class DoubleClickZoom extends Interaction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -52,7 +52,7 @@ class DoubleClickZoom extends Interaction { const delta = browserEvent.shiftKey ? -this.delta_ : this.delta_; const view = map.getView(); zoomByDelta(view, delta, anchor, this.duration_); - mapBrowserEvent.preventDefault(); + browserEvent.preventDefault(); stopEvent = true; } return !stopEvent; diff --git a/src/ol/interaction/DragAndDrop.js b/src/ol/interaction/DragAndDrop.js index e1e839c308..44bb6aaac4 100644 --- a/src/ol/interaction/DragAndDrop.js +++ b/src/ol/interaction/DragAndDrop.js @@ -5,6 +5,7 @@ import Event from '../events/Event.js'; import EventType from '../events/EventType.js'; +import FormatType from '../format/FormatType.js'; import Interaction from './Interaction.js'; import {TRUE} from '../functions.js'; import {get as getProjection} from '../proj.js'; @@ -12,7 +13,8 @@ import {listen, unlistenByKey} from '../events.js'; /** * @typedef {Object} Options - * @property {Array} [formatConstructors] Format constructors. + * @property {Array} [formatConstructors] Format constructors + * (and/or formats pre-constructed with options). * @property {import("../source/Vector.js").default} [source] Optional vector source where features will be added. If a source is provided * all existing features will be removed and new features will be added when * they are dropped on the target. If you want to add features to a vector @@ -39,12 +41,12 @@ const DragAndDropEventType = { * Events emitted by {@link module:ol/interaction/DragAndDrop~DragAndDrop} instances are instances * of this type. */ -class DragAndDropEvent extends Event { +export class DragAndDropEvent extends Event { /** * @param {DragAndDropEventType} type Type. * @param {File} file File. - * @param {Array=} opt_features Features. - * @param {import("../proj/Projection.js").default=} opt_projection Projection. + * @param {Array} [opt_features] Features. + * @param {import("../proj/Projection.js").default} [opt_projection] Projection. */ constructor(type, file, opt_features, opt_projection) { super(type); @@ -75,13 +77,18 @@ class DragAndDropEvent extends Event { /** * @classdesc * Handles input of vector data by drag and drop. + * + * Note that the DragAndDrop interaction uses the TextDecoder() constructor if the supplied + * combinnation of formats read both text string and ArrayBuffer sources. Older browsers such + * as IE which do not support this will need a TextDecoder polyfill to be loaded before use. + * * @api * * @fires DragAndDropEvent */ class DragAndDrop extends Interaction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -92,11 +99,27 @@ class DragAndDrop extends Interaction { /** * @private - * @type {Array} + * @type {boolean} */ - this.formatConstructors_ = options.formatConstructors + this.readAsBuffer_ = false; + + /** + * @private + * @type {Array} + */ + this.formats_ = []; + const formatConstructors = options.formatConstructors ? options.formatConstructors : []; + for (let i = 0, ii = formatConstructors.length; i < ii; ++i) { + let format = formatConstructors[i]; + if (typeof format === 'function') { + format = new format(); + } + this.formats_.push(format); + this.readAsBuffer_ = + this.readAsBuffer_ || format.getType() === FormatType.ARRAY_BUFFER; + } /** * @private @@ -139,10 +162,18 @@ class DragAndDrop extends Interaction { projection = view.getProjection(); } - const formatConstructors = this.formatConstructors_; - for (let i = 0, ii = formatConstructors.length; i < ii; ++i) { - const format = new formatConstructors[i](); - const features = this.tryReadFeatures_(format, result, { + let text; + const formats = this.formats_; + for (let i = 0, ii = formats.length; i < ii; ++i) { + const format = formats[i]; + let input = result; + if (this.readAsBuffer_ && format.getType() !== FormatType.ARRAY_BUFFER) { + if (text === undefined) { + text = new TextDecoder().decode(result); + } + input = text; + } + const features = this.tryReadFeatures_(format, input, { featureProjection: projection, }); if (features && features.length > 0) { @@ -249,7 +280,11 @@ class DragAndDrop extends Interaction { EventType.LOAD, this.handleResult_.bind(this, file) ); - reader.readAsText(file); + if (this.readAsBuffer_) { + reader.readAsArrayBuffer(file); + } else { + reader.readAsText(file); + } } } diff --git a/src/ol/interaction/DragBox.js b/src/ol/interaction/DragBox.js index 8619c74872..804777da95 100644 --- a/src/ol/interaction/DragBox.js +++ b/src/ol/interaction/DragBox.js @@ -53,6 +53,13 @@ const DragBoxEventType = { * @api */ BOXEND: 'boxend', + + /** + * Triggered upon drag box canceled. + * @event DragBoxEvent#boxcancel + * @api + */ + BOXCANCEL: 'boxcancel', }; /** @@ -60,7 +67,7 @@ const DragBoxEventType = { * Events emitted by {@link module:ol/interaction/DragBox~DragBox} instances are instances of * this type. */ -class DragBoxEvent extends Event { +export class DragBoxEvent extends Event { /** * @param {string} type The event type. * @param {import("../coordinate.js").Coordinate} coordinate The event coordinate. @@ -100,7 +107,7 @@ class DragBoxEvent extends Event { */ class DragBox extends PointerInteraction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -192,22 +199,21 @@ class DragBox extends PointerInteraction { handleUpEvent(mapBrowserEvent) { this.box_.setMap(null); - if ( - this.boxEndCondition_( - mapBrowserEvent, - this.startPixel_, - mapBrowserEvent.pixel - ) - ) { + const completeBox = this.boxEndCondition_( + mapBrowserEvent, + this.startPixel_, + mapBrowserEvent.pixel + ); + if (completeBox) { this.onBoxEnd(mapBrowserEvent); - this.dispatchEvent( - new DragBoxEvent( - DragBoxEventType.BOXEND, - mapBrowserEvent.coordinate, - mapBrowserEvent - ) - ); } + this.dispatchEvent( + new DragBoxEvent( + completeBox ? DragBoxEventType.BOXEND : DragBoxEventType.BOXCANCEL, + mapBrowserEvent.coordinate, + mapBrowserEvent + ) + ); return false; } diff --git a/src/ol/interaction/DragPan.js b/src/ol/interaction/DragPan.js index e4a7d78efc..f13a932751 100644 --- a/src/ol/interaction/DragPan.js +++ b/src/ol/interaction/DragPan.js @@ -34,7 +34,7 @@ import { */ class DragPan extends PointerInteraction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super({ diff --git a/src/ol/interaction/DragRotate.js b/src/ol/interaction/DragRotate.js index dfba6b40ee..cb04464fb5 100644 --- a/src/ol/interaction/DragRotate.js +++ b/src/ol/interaction/DragRotate.js @@ -30,7 +30,7 @@ import {disable} from '../rotationconstraint.js'; */ class DragRotate extends PointerInteraction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; diff --git a/src/ol/interaction/DragRotateAndZoom.js b/src/ol/interaction/DragRotateAndZoom.js index f722803537..99bbb5d5e9 100644 --- a/src/ol/interaction/DragRotateAndZoom.js +++ b/src/ol/interaction/DragRotateAndZoom.js @@ -26,7 +26,7 @@ import {mouseOnly, shiftKeyOnly} from '../events/condition.js'; */ class DragRotateAndZoom extends PointerInteraction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; diff --git a/src/ol/interaction/DragZoom.js b/src/ol/interaction/DragZoom.js index 68e3361226..66b8373a51 100644 --- a/src/ol/interaction/DragZoom.js +++ b/src/ol/interaction/DragZoom.js @@ -38,7 +38,7 @@ import {shiftKeyOnly} from '../events/condition.js'; */ class DragZoom extends DragBox { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index dd6281a343..0409beb7af 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -48,7 +48,7 @@ import {squaredDistance as squaredCoordinateDistance} from '../coordinate.js'; * @property {number} [dragVertexDelay=500] Delay in milliseconds after pointerdown * before the current vertex can be dragged to its exact position. * @property {number} [snapTolerance=12] Pixel distance for snapping to the - * drawing finish. + * drawing finish. Must be greater than `0`. * @property {boolean} [stopClick=false] Stop click, singleclick, and * doubleclick events from firing during drawing. * @property {number} [maxPoints] The number of points that can be drawn before @@ -59,7 +59,8 @@ import {squaredDistance as squaredCoordinateDistance} from '../coordinate.js'; * polygon rings and `2` for line strings. * @property {import("../events/condition.js").Condition} [finishCondition] A function * that takes an {@link module:ol/MapBrowserEvent~MapBrowserEvent} and returns a - * boolean to indicate whether the drawing can be finished. + * boolean to indicate whether the drawing can be finished. Not used when drawing + * POINT or MULTI_POINT geometries. * @property {import("../style/Style.js").StyleLike} [style] * Style for sketch features. * @property {GeometryFunction} [geometryFunction] @@ -109,8 +110,8 @@ import {squaredDistance as squaredCoordinateDistance} from '../coordinate.js'; * and a projection as arguments, and returns a geometry. The optional existing * geometry is the geometry that is returned when the function is called without * a second argument. - * @typedef {function(!SketchCoordType, import("../geom/SimpleGeometry.js").default=, - * import("../proj/Projection.js").default=): + * @typedef {function(!SketchCoordType, import("../geom/SimpleGeometry.js").default, + * import("../proj/Projection.js").default): * import("../geom/SimpleGeometry.js").default} GeometryFunction */ @@ -155,7 +156,7 @@ const DrawEventType = { * Events emitted by {@link module:ol/interaction/Draw~Draw} instances are * instances of this type. */ -class DrawEvent extends Event { +export class DrawEvent extends Event { /** * @param {DrawEventType} type Type. * @param {Feature} feature The feature drawn. @@ -215,6 +216,13 @@ class Draw extends PointerInteraction { */ this.lastDragTime_; + /** + * Pointer type of the last pointermove event + * @type {string} + * @private + */ + this.pointerType_; + /** * @type {boolean} * @private @@ -283,7 +291,12 @@ class Draw extends PointerInteraction { * @type {number} * @private */ - this.maxPoints_ = options.maxPoints ? options.maxPoints : Infinity; + this.maxPoints_ = + this.mode_ === Mode.CIRCLE + ? 2 + : options.maxPoints + ? options.maxPoints + : Infinity; /** * A function to decide if a potential finish coordinate is permissible @@ -296,21 +309,22 @@ class Draw extends PointerInteraction { let geometryFunction = options.geometryFunction; if (!geometryFunction) { - if (this.type_ === GeometryType.CIRCLE) { + const mode = this.mode_; + if (mode === Mode.CIRCLE) { /** * @param {!LineCoordType} coordinates The coordinates. - * @param {import("../geom/SimpleGeometry.js").default=} opt_geometry Optional geometry. + * @param {import("../geom/SimpleGeometry.js").default|undefined} geometry Optional geometry. * @param {import("../proj/Projection.js").default} projection The view projection. * @return {import("../geom/SimpleGeometry.js").default} A geometry. */ - geometryFunction = function (coordinates, opt_geometry, projection) { - const circle = opt_geometry - ? /** @type {Circle} */ (opt_geometry) + geometryFunction = function (coordinates, geometry, projection) { + const circle = geometry + ? /** @type {Circle} */ (geometry) : new Circle([NaN, NaN]); const center = fromUserCoordinate(coordinates[0], projection); const squaredLength = squaredCoordinateDistance( center, - fromUserCoordinate(coordinates[1], projection) + fromUserCoordinate(coordinates[coordinates.length - 1], projection) ); circle.setCenterAndRadius(center, Math.sqrt(squaredLength)); const userProjection = getUserProjection(); @@ -321,7 +335,6 @@ class Draw extends PointerInteraction { }; } else { let Constructor; - const mode = this.mode_; if (mode === Mode.POINT) { Constructor = Point; } else if (mode === Mode.LINE_STRING) { @@ -331,12 +344,11 @@ class Draw extends PointerInteraction { } /** * @param {!LineCoordType} coordinates The coordinates. - * @param {import("../geom/SimpleGeometry.js").default=} opt_geometry Optional geometry. + * @param {import("../geom/SimpleGeometry.js").default|undefined} geometry Optional geometry. * @param {import("../proj/Projection.js").default} projection The view projection. * @return {import("../geom/SimpleGeometry.js").default} A geometry. */ - geometryFunction = function (coordinates, opt_geometry, projection) { - let geometry = opt_geometry; + geometryFunction = function (coordinates, geometry, projection) { if (geometry) { if (mode === Mode.POLYGON) { if (coordinates[0].length) { @@ -500,7 +512,7 @@ class Draw extends PointerInteraction { handleEvent(event) { if (event.originalEvent.type === EventType.CONTEXTMENU) { // Avoid context menu for long taps when drawing on mobile - event.preventDefault(); + event.originalEvent.preventDefault(); } this.freehand_ = this.mode_ !== Mode.POINT && this.freehandCondition_(event); @@ -536,16 +548,16 @@ class Draw extends PointerInteraction { event.type === MapBrowserEventType.POINTERDOWN ) { pass = false; - } else if (move) { + } else if (move && this.getPointerCount() < 2) { pass = event.type === MapBrowserEventType.POINTERMOVE; if (pass && this.freehand_) { this.handlePointerMove_(event); if (this.shouldHandle_) { // Avoid page scrolling when freehand drawing on mobile - event.preventDefault(); + event.originalEvent.preventDefault(); } } else if ( - event.originalEvent.pointerType == 'mouse' || + event.originalEvent.pointerType === 'mouse' || (event.type === MapBrowserEventType.POINTERDRAG && this.downTimeout_ === undefined) ) { @@ -569,7 +581,7 @@ class Draw extends PointerInteraction { if (this.freehand_) { this.downPx_ = event.pixel; if (!this.finishCoordinate_) { - this.startDrawing_(event); + this.startDrawing_(event.coordinate); } return true; } else if (this.condition_(event)) { @@ -604,34 +616,39 @@ class Draw extends PointerInteraction { handleUpEvent(event) { let pass = true; - if (this.downTimeout_) { - clearTimeout(this.downTimeout_); - this.downTimeout_ = undefined; - } - - this.handlePointerMove_(event); - - const circleMode = this.mode_ === Mode.CIRCLE; - - if (this.shouldHandle_) { - if (!this.finishCoordinate_) { - this.startDrawing_(event); - if (this.mode_ === Mode.POINT) { - this.finishDrawing(); - } - } else if (this.freehand_ || circleMode) { - this.finishDrawing(); - } else if (this.atFinish_(event)) { - if (this.finishCondition_(event)) { - this.finishDrawing(); - } - } else { - this.addToDrawing_(event.coordinate); + if (this.getPointerCount() === 0) { + if (this.downTimeout_) { + clearTimeout(this.downTimeout_); + this.downTimeout_ = undefined; + } + + this.handlePointerMove_(event); + + if (this.shouldHandle_) { + const startingToDraw = !this.finishCoordinate_; + if (startingToDraw) { + this.startDrawing_(event.coordinate); + } + if (!startingToDraw && this.freehand_) { + this.finishDrawing(); + } else if ( + !this.freehand_ && + (!startingToDraw || this.mode_ === Mode.POINT) + ) { + if (this.atFinish_(event.pixel)) { + if (this.finishCondition_(event)) { + this.finishDrawing(); + } + } else { + this.addToDrawing_(event.coordinate); + } + } + pass = false; + } else if (this.freehand_) { + this.abortDrawing(); } - pass = false; - } else if (this.freehand_) { - this.abortDrawing(); } + if (!pass && this.stopClick_) { event.stopPropagation(); } @@ -644,6 +661,7 @@ class Draw extends PointerInteraction { * @private */ handlePointerMove_(event) { + this.pointerType_ = event.originalEvent.pointerType; if ( this.downPx_ && ((!this.freehand_ && this.shouldHandle_) || @@ -663,7 +681,7 @@ class Draw extends PointerInteraction { } if (this.finishCoordinate_) { - this.modifyDrawing_(event); + this.modifyDrawing_(event.coordinate); } else { this.createOrUpdateSketchPoint_(event); } @@ -671,18 +689,23 @@ class Draw extends PointerInteraction { /** * Determine if an event is within the snapping tolerance of the start coord. - * @param {import("../MapBrowserEvent.js").default} event Event. + * @param {import("../pixel.js").Pixel} pixel Pixel. * @return {boolean} The event is within the snapping tolerance of the start. * @private */ - atFinish_(event) { + atFinish_(pixel) { let at = false; if (this.sketchFeature_) { let potentiallyDone = false; let potentiallyFinishCoordinates = [this.finishCoordinate_]; - if (this.mode_ === Mode.LINE_STRING) { + const mode = this.mode_; + if (mode === Mode.POINT) { + at = true; + } else if (mode === Mode.CIRCLE) { + at = this.sketchCoords_.length === 2; + } else if (mode === Mode.LINE_STRING) { potentiallyDone = this.sketchCoords_.length > this.minPoints_; - } else if (this.mode_ === Mode.POLYGON) { + } else if (mode === Mode.POLYGON) { const sketchCoords = /** @type {PolyCoordType} */ (this.sketchCoords_); potentiallyDone = sketchCoords[0].length > this.minPoints_; potentiallyFinishCoordinates = [ @@ -691,11 +714,10 @@ class Draw extends PointerInteraction { ]; } if (potentiallyDone) { - const map = event.map; + const map = this.getMap(); for (let i = 0, ii = potentiallyFinishCoordinates.length; i < ii; i++) { const finishCoordinate = potentiallyFinishCoordinates[i]; const finishPixel = map.getPixelFromCoordinate(finishCoordinate); - const pixel = event.pixel; const dx = pixel[0] - finishPixel[0]; const dy = pixel[1] - finishPixel[1]; const snapTolerance = this.freehand_ ? 1 : this.snapTolerance_; @@ -726,13 +748,37 @@ class Draw extends PointerInteraction { } /** - * Start the drawing. - * @param {import("../MapBrowserEvent.js").default} event Event. + * @param {import("../geom/Polygon.js").default} geometry Polygon geometry. * @private */ - startDrawing_(event) { - const start = event.coordinate; - const projection = event.map.getView().getProjection(); + createOrUpdateCustomSketchLine_(geometry) { + if (!this.sketchLine_) { + this.sketchLine_ = new Feature(); + } + const ring = geometry.getLinearRing(0); + let sketchLineGeom = this.sketchLine_.getGeometry(); + if (!sketchLineGeom) { + sketchLineGeom = new LineString( + ring.getFlatCoordinates(), + ring.getLayout() + ); + this.sketchLine_.setGeometry(sketchLineGeom); + } else { + sketchLineGeom.setFlatCoordinates( + ring.getLayout(), + ring.getFlatCoordinates() + ); + sketchLineGeom.changed(); + } + } + + /** + * Start the drawing. + * @param {import("../coordinate.js").Coordinate} start Start coordinate. + * @private + */ + startDrawing_(start) { + const projection = this.getMap().getView().getProjection(); this.finishCoordinate_ = start; if (this.mode_ === Mode.POINT) { this.sketchCoords_ = start.slice(); @@ -763,20 +809,20 @@ class Draw extends PointerInteraction { /** * Modify the drawing. - * @param {import("../MapBrowserEvent.js").default} event Event. + * @param {import("../coordinate.js").Coordinate} coordinate Coordinate. * @private */ - modifyDrawing_(event) { - let coordinate = event.coordinate; + modifyDrawing_(coordinate) { + const map = this.getMap(); const geometry = this.sketchFeature_.getGeometry(); - const projection = event.map.getView().getProjection(); + const projection = map.getView().getProjection(); let coordinates, last; if (this.mode_ === Mode.POINT) { last = this.sketchCoords_; } else if (this.mode_ === Mode.POLYGON) { coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0]; last = coordinates[coordinates.length - 1]; - if (this.atFinish_(event)) { + if (this.atFinish_(map.getPixelFromCoordinate(coordinate))) { // snap to finish coordinate = this.finishCoordinate_.slice(); } @@ -795,32 +841,13 @@ class Draw extends PointerInteraction { const sketchPointGeom = this.sketchPoint_.getGeometry(); sketchPointGeom.setCoordinates(coordinate); } - /** @type {LineString} */ - let sketchLineGeom; if ( - geometry.getType() == GeometryType.POLYGON && + geometry.getType() === GeometryType.POLYGON && this.mode_ !== Mode.POLYGON ) { - if (!this.sketchLine_) { - this.sketchLine_ = new Feature(); - } - const ring = geometry.getLinearRing(0); - sketchLineGeom = this.sketchLine_.getGeometry(); - if (!sketchLineGeom) { - sketchLineGeom = new LineString( - ring.getFlatCoordinates(), - ring.getLayout() - ); - this.sketchLine_.setGeometry(sketchLineGeom); - } else { - sketchLineGeom.setFlatCoordinates( - ring.getLayout(), - ring.getFlatCoordinates() - ); - sketchLineGeom.changed(); - } + this.createOrUpdateCustomSketchLine_(/** @type {Polygon} */ (geometry)); } else if (this.sketchLineCoords_) { - sketchLineGeom = this.sketchLine_.getGeometry(); + const sketchLineGeom = this.sketchLine_.getGeometry(); sketchLineGeom.setCoordinates(this.sketchLineCoords_); } this.updateSketchFeatures_(); @@ -836,7 +863,8 @@ class Draw extends PointerInteraction { const projection = this.getMap().getView().getProjection(); let done; let coordinates; - if (this.mode_ === Mode.LINE_STRING) { + const mode = this.mode_; + if (mode === Mode.LINE_STRING || mode === Mode.CIRCLE) { this.finishCoordinate_ = coordinate.slice(); coordinates = /** @type {LineCoordType} */ (this.sketchCoords_); if (coordinates.length >= this.maxPoints_) { @@ -848,7 +876,7 @@ class Draw extends PointerInteraction { } coordinates.push(coordinate.slice()); this.geometryFunction_(coordinates, geometry, projection); - } else if (this.mode_ === Mode.POLYGON) { + } else if (mode === Mode.POLYGON) { coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0]; if (coordinates.length >= this.maxPoints_) { if (this.freehand_) { @@ -870,7 +898,8 @@ class Draw extends PointerInteraction { } /** - * Remove last point of the feature currently being drawn. + * Remove last point of the feature currently being drawn. Does not do anything when + * drawing POINT or MULTI_POINT geometries. * @api */ removeLastPoint() { @@ -880,24 +909,34 @@ class Draw extends PointerInteraction { const geometry = this.sketchFeature_.getGeometry(); const projection = this.getMap().getView().getProjection(); let coordinates; - /** @type {LineString} */ - let sketchLineGeom; - if (this.mode_ === Mode.LINE_STRING) { + const mode = this.mode_; + if (mode === Mode.LINE_STRING || mode === Mode.CIRCLE) { coordinates = /** @type {LineCoordType} */ (this.sketchCoords_); coordinates.splice(-2, 1); - this.geometryFunction_(coordinates, geometry, projection); if (coordinates.length >= 2) { this.finishCoordinate_ = coordinates[coordinates.length - 2].slice(); + const finishCoordinate = this.finishCoordinate_.slice(); + coordinates[coordinates.length - 1] = finishCoordinate; + this.sketchPoint_.setGeometry(new Point(finishCoordinate)); } - } else if (this.mode_ === Mode.POLYGON) { + this.geometryFunction_(coordinates, geometry, projection); + if (geometry.getType() === GeometryType.POLYGON && this.sketchLine_) { + this.createOrUpdateCustomSketchLine_(/** @type {Polygon} */ (geometry)); + } + } else if (mode === Mode.POLYGON) { coordinates = /** @type {PolyCoordType} */ (this.sketchCoords_)[0]; coordinates.splice(-2, 1); - sketchLineGeom = this.sketchLine_.getGeometry(); + const sketchLineGeom = this.sketchLine_.getGeometry(); + if (coordinates.length >= 2) { + const finishCoordinate = coordinates[coordinates.length - 2].slice(); + coordinates[coordinates.length - 1] = finishCoordinate; + this.sketchPoint_.setGeometry(new Point(finishCoordinate)); + } sketchLineGeom.setCoordinates(coordinates); this.geometryFunction_(this.sketchCoords_, geometry, projection); } - if (coordinates.length === 0) { + if (coordinates.length === 1) { this.abortDrawing(); } @@ -986,33 +1025,46 @@ class Draw extends PointerInteraction { * Append coordinates to the end of the geometry that is currently being drawn. * This can be used when drawing LineStrings or Polygons. Coordinates will * either be appended to the current LineString or the outer ring of the current - * Polygon. - * @param {!LineCoordType} coordinates Linear coordinates to be appended into + * Polygon. If no geometry is being drawn, a new one will be created. + * @param {!LineCoordType} coordinates Linear coordinates to be appended to * the coordinate array. * @api */ appendCoordinates(coordinates) { const mode = this.mode_; - let sketchCoords = []; - if (mode === Mode.LINE_STRING) { - sketchCoords = /** @type {LineCoordType} */ this.sketchCoords_; + const newDrawing = !this.sketchFeature_; + if (newDrawing) { + this.startDrawing_(coordinates[0]); + } + /** @type {LineCoordType} */ + let sketchCoords; + if (mode === Mode.LINE_STRING || mode === Mode.CIRCLE) { + sketchCoords = /** @type {LineCoordType} */ (this.sketchCoords_); } else if (mode === Mode.POLYGON) { sketchCoords = this.sketchCoords_ && this.sketchCoords_.length ? /** @type {PolyCoordType} */ (this.sketchCoords_)[0] : []; + } else { + return; + } + + if (newDrawing) { + sketchCoords.shift(); } // Remove last coordinate from sketch drawing (this coordinate follows cursor position) - const ending = sketchCoords.pop(); + sketchCoords.pop(); // Append coordinate list for (let i = 0; i < coordinates.length; i++) { this.addToDrawing_(coordinates[i]); } - // Duplicate last coordinate for sketch drawing + const ending = coordinates[coordinates.length - 1]; + // Duplicate last coordinate for sketch drawing (cursor position) this.addToDrawing_(ending); + this.modifyDrawing_(ending); } /** @@ -1035,6 +1087,7 @@ class Draw extends PointerInteraction { const last = this.sketchCoords_[this.sketchCoords_.length - 1]; this.finishCoordinate_ = last.slice(); this.sketchCoords_.push(last.slice()); + this.sketchPoint_ = new Feature(new Point(last)); this.updateSketchFeatures_(); this.dispatchEvent( new DrawEvent(DrawEventType.DRAWSTART, this.sketchFeature_) @@ -1086,15 +1139,15 @@ function getDefaultStyleFunction() { /** * Create a `geometryFunction` for `type: 'Circle'` that will create a regular - * polygon with a user specified number of sides and start angle instead of an + * polygon with a user specified number of sides and start angle instead of a * `import("../geom/Circle.js").Circle` geometry. - * @param {number=} opt_sides Number of sides of the regular polygon. Default is - * 32. - * @param {number=} opt_angle Angle of the first point in radians. 0 means East. + * @param {number} [opt_sides] Number of sides of the regular polygon. + * Default is 32. + * @param {number} [opt_angle] Angle of the first point in counter-clockwise + * radians. 0 means East. * Default is the angle defined by the heading from the center of the * regular polygon to the current pointer position. - * @return {GeometryFunction} Function that draws a - * polygon. + * @return {GeometryFunction} Function that draws a polygon. * @api */ export function createRegularPolygon(opt_sides, opt_angle) { @@ -1104,20 +1157,22 @@ export function createRegularPolygon(opt_sides, opt_angle) { projection ); const end = fromUserCoordinate( - /** @type {LineCoordType} */ (coordinates)[1], + /** @type {LineCoordType} */ (coordinates)[coordinates.length - 1], projection ); const radius = Math.sqrt(squaredCoordinateDistance(center, end)); const geometry = opt_geometry ? /** @type {Polygon} */ (opt_geometry) : fromCircle(new Circle(center), opt_sides); + let angle = opt_angle; - if (!opt_angle) { + if (!opt_angle && opt_angle !== 0) { const x = end[0] - center[0]; const y = end[1] - center[1]; - angle = Math.atan(y / x) - (x < 0 ? Math.PI : 0); + angle = Math.atan2(y, x); } makeRegular(geometry, center, radius, angle); + const userProjection = getUserProjection(); if (userProjection) { geometry.transform(projection, userProjection); @@ -1136,7 +1191,10 @@ export function createRegularPolygon(opt_sides, opt_angle) { export function createBox() { return function (coordinates, opt_geometry, projection) { const extent = boundingExtent( - /** @type {LineCoordType} */ (coordinates).map(function (coordinate) { + /** @type {LineCoordType} */ ([ + coordinates[0], + coordinates[coordinates.length - 1], + ]).map(function (coordinate) { return fromUserCoordinate(coordinate, projection); }) ); @@ -1170,23 +1228,21 @@ export function createBox() { * @return {Mode} Drawing mode. */ function getMode(type) { - let mode; - if (type === GeometryType.POINT || type === GeometryType.MULTI_POINT) { - mode = Mode.POINT; - } else if ( - type === GeometryType.LINE_STRING || - type === GeometryType.MULTI_LINE_STRING - ) { - mode = Mode.LINE_STRING; - } else if ( - type === GeometryType.POLYGON || - type === GeometryType.MULTI_POLYGON - ) { - mode = Mode.POLYGON; - } else if (type === GeometryType.CIRCLE) { - mode = Mode.CIRCLE; + switch (type) { + case GeometryType.POINT: + case GeometryType.MULTI_POINT: + return Mode.POINT; + case GeometryType.LINE_STRING: + case GeometryType.MULTI_LINE_STRING: + return Mode.LINE_STRING; + case GeometryType.POLYGON: + case GeometryType.MULTI_POLYGON: + return Mode.POLYGON; + case GeometryType.CIRCLE: + return Mode.CIRCLE; + default: + throw new Error('Invalid type: ' + type); } - return /** @type {!Mode} */ (mode); } export default Draw; diff --git a/src/ol/interaction/Extent.js b/src/ol/interaction/Extent.js index d547f567cb..9dc85b21c4 100644 --- a/src/ol/interaction/Extent.js +++ b/src/ol/interaction/Extent.js @@ -58,7 +58,7 @@ const ExtentEventType = { * Events emitted by {@link module:ol/interaction/Extent~Extent} instances are * instances of this type. */ -class ExtentEvent extends Event { +export class ExtentEvent extends Event { /** * @param {import("../extent.js").Extent} extent the new extent */ @@ -85,7 +85,7 @@ class ExtentEvent extends Event { */ class Extent extends PointerInteraction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options || {}; @@ -188,7 +188,7 @@ class Extent extends PointerInteraction { /** * @param {import("../pixel.js").Pixel} pixel cursor location * @param {import("../PluggableMap.js").default} map map - * @returns {import("../coordinate.js").Coordinate|null} snapped vertex on extent + * @return {import("../coordinate.js").Coordinate|null} snapped vertex on extent * @private */ snapToVertex_(pixel, map) { @@ -245,7 +245,7 @@ class Extent extends PointerInteraction { /** * @param {import("../extent.js").Extent} extent extent - * @returns {Feature} extent as featrue + * @return {Feature} extent as featrue * @private */ createOrUpdateExtentFeature_(extent) { @@ -271,7 +271,7 @@ class Extent extends PointerInteraction { /** * @param {import("../coordinate.js").Coordinate} vertex location of feature - * @returns {Feature} vertex as feature + * @return {Feature} vertex as feature * @private */ createOrUpdatePointerFeature_(vertex) { @@ -471,7 +471,7 @@ function getDefaultPointerStyleFunction() { /** * @param {import("../coordinate.js").Coordinate} fixedPoint corner that will be unchanged in the new extent - * @returns {function (import("../coordinate.js").Coordinate): import("../extent.js").Extent} event handler + * @return {function (import("../coordinate.js").Coordinate): import("../extent.js").Extent} event handler */ function getPointHandler(fixedPoint) { return function (point) { @@ -482,7 +482,7 @@ function getPointHandler(fixedPoint) { /** * @param {import("../coordinate.js").Coordinate} fixedP1 first corner that will be unchanged in the new extent * @param {import("../coordinate.js").Coordinate} fixedP2 second corner that will be unchanged in the new extent - * @returns {function (import("../coordinate.js").Coordinate): import("../extent.js").Extent|null} event handler + * @return {function (import("../coordinate.js").Coordinate): import("../extent.js").Extent|null} event handler */ function getEdgeHandler(fixedP1, fixedP2) { if (fixedP1[0] == fixedP2[0]) { @@ -500,7 +500,7 @@ function getEdgeHandler(fixedP1, fixedP2) { /** * @param {import("../extent.js").Extent} extent extent - * @returns {Array>} extent line segments + * @return {Array>} extent line segments */ function getSegments(extent) { return [ diff --git a/src/ol/interaction/Interaction.js b/src/ol/interaction/Interaction.js index 55c3f240c0..284b90aed6 100644 --- a/src/ol/interaction/Interaction.js +++ b/src/ol/interaction/Interaction.js @@ -31,7 +31,7 @@ import {easeOut, linear} from '../easing.js'; */ class Interaction extends BaseObject { /** - * @param {InteractionOptions=} opt_options Options. + * @param {InteractionOptions} [opt_options] Options. */ constructor(opt_options) { super(); @@ -102,7 +102,7 @@ class Interaction extends BaseObject { /** * @param {import("../View.js").default} view View. * @param {import("../coordinate.js").Coordinate} delta Delta. - * @param {number=} opt_duration Duration. + * @param {number} [opt_duration] Duration. */ export function pan(view, delta, opt_duration) { const currentCenter = view.getCenterInternal(); @@ -119,8 +119,8 @@ export function pan(view, delta, opt_duration) { /** * @param {import("../View.js").default} view View. * @param {number} delta Delta from previous zoom level. - * @param {import("../coordinate.js").Coordinate=} opt_anchor Anchor coordinate in the user projection. - * @param {number=} opt_duration Duration. + * @param {import("../coordinate.js").Coordinate} [opt_anchor] Anchor coordinate in the user projection. + * @param {number} [opt_duration] Duration. */ export function zoomByDelta(view, delta, opt_anchor, opt_duration) { const currentZoom = view.getZoom(); diff --git a/src/ol/interaction/KeyboardPan.js b/src/ol/interaction/KeyboardPan.js index be54b99c78..c7b49917db 100644 --- a/src/ol/interaction/KeyboardPan.js +++ b/src/ol/interaction/KeyboardPan.js @@ -34,7 +34,7 @@ import {rotate as rotateCoordinate} from '../coordinate.js'; */ class KeyboardPan extends Interaction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -112,7 +112,7 @@ class KeyboardPan extends Interaction { const delta = [deltaX, deltaY]; rotateCoordinate(delta, view.getRotation()); pan(view, delta, this.duration_); - mapBrowserEvent.preventDefault(); + keyEvent.preventDefault(); stopEvent = true; } } diff --git a/src/ol/interaction/KeyboardZoom.js b/src/ol/interaction/KeyboardZoom.js index 37ba540309..9dc139170d 100644 --- a/src/ol/interaction/KeyboardZoom.js +++ b/src/ol/interaction/KeyboardZoom.js @@ -30,7 +30,7 @@ import {targetNotEditable} from '../events/condition.js'; */ class KeyboardZoom extends Interaction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -81,7 +81,7 @@ class KeyboardZoom extends Interaction { charCode == '+'.charCodeAt(0) ? this.delta_ : -this.delta_; const view = map.getView(); zoomByDelta(view, delta, undefined, this.duration_); - mapBrowserEvent.preventDefault(); + keyEvent.preventDefault(); stopEvent = true; } } diff --git a/src/ol/interaction/Modify.js b/src/ol/interaction/Modify.js index 70d54e5696..1b479a9ae7 100644 --- a/src/ol/interaction/Modify.js +++ b/src/ol/interaction/Modify.js @@ -81,12 +81,12 @@ const ModifyEventType = { /** * @typedef {Object} SegmentData - * @property {Array} [depth] - * @property {Feature} feature - * @property {import("../geom/SimpleGeometry.js").default} geometry - * @property {number} [index] - * @property {Array} segment - * @property {Array} [featureSegments] + * @property {Array} [depth] Depth. + * @property {Feature} feature Feature. + * @property {import("../geom/SimpleGeometry.js").default} geometry Geometry. + * @property {number} [index] Index. + * @property {Array} segment Segment. + * @property {Array} [featureSegments] FeatureSegments. */ /** @@ -108,16 +108,28 @@ const ModifyEventType = { * @property {number} [pixelTolerance=10] Pixel tolerance for considering the * pointer close enough to a segment or vertex for editing. * @property {import("../style/Style.js").StyleLike} [style] - * Style used for the features being modified. By default the default edit - * style is used (see {@link module:ol/style}). + * Style used for the modification point or vertex. For linestrings and polygons, this will + * be the affected vertex, for circles a point along the circle, and for points the actual + * point. If not configured, the default edit style is used (see {@link module:ol/style}). + * When using a style function, the point feature passed to the function will have a `features` + * property - an array whose entries are the features that are being modified, and a `geometries` + * property - an array whose entries are the geometries that are being modified. Both arrays are + * in the same order. The `geometries` are only useful when modifying geometry collections, where + * the geometry will be the particular geometry from the collection that is being modified. * @property {VectorSource} [source] The vector source with * features to modify. If a vector source is not provided, a feature collection - * must be provided with the features option. + * must be provided with the `features` option. + * @property {boolean|import("../layer/BaseVector").default} [hitDetection] When configured, point + * features will be considered for modification based on their visual appearance, instead of being within + * the `pixelTolerance` from the pointer location. When a {@link module:ol/layer/BaseVector} is + * provided, only the rendered representation of the features on that layer will be considered. * @property {Collection} [features] * The features the interaction works on. If a feature collection is not - * provided, a vector source must be provided with the source option. + * provided, a vector source must be provided with the `source` option. * @property {boolean} [wrapX=false] Wrap the world horizontally on the sketch * overlay. + * @property {boolean} [snapToPointer=!hitDetection] The vertex, point or segment being modified snaps to the + * pointer coordinate when clicked within the `pixelTolerance`. */ /** @@ -161,6 +173,12 @@ export class ModifyEvent extends Event { * the `features` option. The interaction must be constructed with either a * `source` or `features` option. * + * Cartesian distance from the pointer is used to determine the features that + * will be modified. This means that geometries will only be considered for + * modification when they are within the configured `pixelTolerane`. For point + * geometries, the `hitDetection` option can be used to match their visual + * appearance. + * * By default, the interaction will allow deletion of vertices when the `alt` * key is pressed. To configure the interaction with a different condition * for deletion, use the `deleteCondition` option. @@ -237,10 +255,10 @@ class Modify extends PointerInteraction { this.ignoreNextSingleClick_ = false; /** - * @type {boolean} + * @type {Collection} * @private */ - this.modified_ = false; + this.featuresBeingModified_ = null; /** * Segment RTree for each layer @@ -314,8 +332,15 @@ class Modify extends PointerInteraction { */ this.source_ = null; + /** + * @type {boolean|import("../layer/BaseVector").default} + */ + this.hitDetection_ = null; + let features; - if (options.source) { + if (options.features) { + features = options.features; + } else if (options.source) { this.source_ = options.source; features = new Collection(this.source_.getFeatures()); this.source_.addEventListener( @@ -326,15 +351,18 @@ class Modify extends PointerInteraction { VectorEventType.REMOVEFEATURE, this.handleSourceRemove_.bind(this) ); - } else { - features = options.features; } if (!features) { - throw new Error('The modify interaction requires features or a source'); + throw new Error( + 'The modify interaction requires features, a source or a layer' + ); + } + if (options.hitDetection) { + this.hitDetection_ = options.hitDetection; } /** - * @type {Collection} + * @type {Collection} * @private */ this.features_ = features; @@ -354,6 +382,20 @@ class Modify extends PointerInteraction { * @private */ this.lastPointerEvent_ = null; + + /** + * Delta (x, y in map units) between matched rtree vertex and pointer vertex. + * @type {Array} + */ + this.delta_ = [0, 0]; + + /** + * @private + */ + this.snapToPointer_ = + options.snapToPointer === undefined + ? !this.hitDetection_ + : options.snapToPointer; } /** @@ -376,14 +418,30 @@ class Modify extends PointerInteraction { } /** - * @param {import("../MapBrowserEvent.js").default} evt Map browser event + * @param {import("../MapBrowserEvent.js").default} evt Map browser event. + * @param {Array>} segments The segments subject to modification. * @private */ - willModifyFeatures_(evt) { - if (!this.modified_) { - this.modified_ = true; + willModifyFeatures_(evt, segments) { + if (!this.featuresBeingModified_) { + this.featuresBeingModified_ = new Collection(); + const features = this.featuresBeingModified_.getArray(); + for (let i = 0, ii = segments.length; i < ii; ++i) { + const segment = segments[i]; + for (let s = 0, ss = segment.length; s < ss; ++s) { + const feature = segment[s].feature; + if (feature && features.indexOf(feature) === -1) { + this.featuresBeingModified_.push(feature); + } + } + } + this.dispatchEvent( - new ModifyEvent(ModifyEventType.MODIFYSTART, this.features_, evt) + new ModifyEvent( + ModifyEventType.MODIFYSTART, + this.featuresBeingModified_, + evt + ) ); } } @@ -460,7 +518,7 @@ class Modify extends PointerInteraction { } /** - * Get the overlay layer that this interaction renders sketch features to. + * Get the overlay layer that this interaction renders the modification point or vertex to. * @return {VectorLayer} Overlay layer. * @api */ @@ -725,10 +783,12 @@ class Modify extends PointerInteraction { /** * @param {import("../coordinate.js").Coordinate} coordinates Coordinates. + * @param {Array} features The features being modified. + * @param {Array} geometries The geometries being modified. * @return {Feature} Vertex feature. * @private */ - createOrUpdateVertexFeature_(coordinates) { + createOrUpdateVertexFeature_(coordinates, features, geometries) { let vertexFeature = this.vertexFeature_; if (!vertexFeature) { vertexFeature = new Feature(new Point(coordinates)); @@ -738,6 +798,8 @@ class Modify extends PointerInteraction { const geometry = vertexFeature.getGeometry(); geometry.setCoordinates(coordinates); } + vertexFeature.set('features', features); + vertexFeature.set('geometries', geometries); return vertexFeature; } @@ -784,14 +846,26 @@ class Modify extends PointerInteraction { */ handleDragEvent(evt) { this.ignoreNextSingleClick_ = false; - this.willModifyFeatures_(evt); + this.willModifyFeatures_(evt, this.dragSegments_); - const vertex = evt.coordinate; + const vertex = [ + evt.coordinate[0] + this.delta_[0], + evt.coordinate[1] + this.delta_[1], + ]; + const features = []; + const geometries = []; for (let i = 0, ii = this.dragSegments_.length; i < ii; ++i) { const dragSegment = this.dragSegments_[i]; const segmentData = dragSegment[0]; - const depth = segmentData.depth; + const feature = segmentData.feature; + if (features.indexOf(feature) === -1) { + features.push(feature); + } const geometry = segmentData.geometry; + if (geometries.indexOf(geometry) === -1) { + geometries.push(geometry); + } + const depth = segmentData.depth; let coordinates; const segment = segmentData.segment; const index = dragSegment[1]; @@ -869,7 +943,7 @@ class Modify extends PointerInteraction { this.setGeometryCoordinates_(geometry, coordinates); } } - this.createOrUpdateVertexFeature_(vertex); + this.createOrUpdateVertexFeature_(vertex, features, geometries); } /** @@ -884,7 +958,7 @@ class Modify extends PointerInteraction { const pixelCoordinate = evt.coordinate; this.handlePointerAtPixel_(evt.pixel, evt.map, pixelCoordinate); this.dragSegments_.length = 0; - this.modified_ = false; + this.featuresBeingModified_ = null; const vertexFeature = this.vertexFeature_; if (vertexFeature) { const projection = evt.map.getView().getProjection(); @@ -960,16 +1034,16 @@ class Modify extends PointerInteraction { !componentSegments[uid][1] && this.insertVertexCondition_(evt) ) { - insertVertices.push([segmentDataMatch, vertex]); + insertVertices.push(segmentDataMatch); } } if (insertVertices.length) { - this.willModifyFeatures_(evt); + this.willModifyFeatures_(evt, [insertVertices]); } for (let j = insertVertices.length - 1; j >= 0; --j) { - this.insertVertex_.apply(this, insertVertices[j]); + this.insertVertex_(insertVertices[j], vertex); } } return !!this.vertexFeature_; @@ -1014,11 +1088,15 @@ class Modify extends PointerInteraction { this.rBush_.update(boundingExtent(segmentData.segment), segmentData); } } - if (this.modified_) { + if (this.featuresBeingModified_) { this.dispatchEvent( - new ModifyEvent(ModifyEventType.MODIFYEND, this.features_, evt) + new ModifyEvent( + ModifyEventType.MODIFYEND, + this.featuresBeingModified_, + evt + ) ); - this.modified_ = false; + this.featuresBeingModified_ = null; } return false; } @@ -1035,7 +1113,7 @@ class Modify extends PointerInteraction { /** * @param {import("../pixel.js").Pixel} pixel Pixel * @param {import("../PluggableMap.js").default} map Map. - * @param {import("../coordinate.js").Coordinate=} opt_coordinate The pixel Coordinate. + * @param {import("../coordinate.js").Coordinate} [opt_coordinate] The pixel Coordinate. * @private */ handlePointerAtPixel_(pixel, map, opt_coordinate) { @@ -1048,35 +1126,70 @@ class Modify extends PointerInteraction { ); }; - const viewExtent = fromUserExtent( - createExtent(pixelCoordinate, tempExtent), - projection - ); - const buffer = map.getView().getResolution() * this.pixelTolerance_; - const box = toUserExtent( - bufferExtent(viewExtent, buffer, tempExtent), - projection - ); + let nodes, hitPointGeometry; + if (this.hitDetection_) { + const layerFilter = + typeof this.hitDetection_ === 'object' + ? (layer) => layer === this.hitDetection_ + : undefined; + map.forEachFeatureAtPixel( + pixel, + (feature, layer, geometry) => { + geometry = geometry || feature.getGeometry(); + if (geometry.getType() === GeometryType.POINT) { + hitPointGeometry = geometry; + const coordinate = geometry.getCoordinates(); + nodes = [ + { + feature, + geometry, + segment: [coordinate, coordinate], + }, + ]; + } + return true; + }, + {layerFilter} + ); + } + if (!nodes) { + const viewExtent = fromUserExtent( + createExtent(pixelCoordinate, tempExtent), + projection + ); + const buffer = map.getView().getResolution() * this.pixelTolerance_; + const box = toUserExtent( + bufferExtent(viewExtent, buffer, tempExtent), + projection + ); + nodes = this.rBush_.getInExtent(box); + } - const rBush = this.rBush_; - const nodes = rBush.getInExtent(box); - if (nodes.length > 0) { - nodes.sort(sortByDistance); - const node = nodes[0]; + if (nodes && nodes.length > 0) { + const node = nodes.sort(sortByDistance)[0]; const closestSegment = node.segment; let vertex = closestOnSegmentData(pixelCoordinate, node, projection); const vertexPixel = map.getPixelFromCoordinate(vertex); let dist = coordinateDistance(pixel, vertexPixel); - if (dist <= this.pixelTolerance_) { + if (hitPointGeometry || dist <= this.pixelTolerance_) { /** @type {Object} */ const vertexSegments = {}; + vertexSegments[getUid(closestSegment)] = true; + if (!this.snapToPointer_) { + this.delta_[0] = vertex[0] - pixelCoordinate[0]; + this.delta_[1] = vertex[1] - pixelCoordinate[1]; + } if ( node.geometry.getType() === GeometryType.CIRCLE && node.index === CIRCLE_CIRCUMFERENCE_INDEX ) { this.snappedToVertex_ = true; - this.createOrUpdateVertexFeature_(vertex); + this.createOrUpdateVertexFeature_( + vertex, + [node.feature], + [node.geometry] + ); } else { const pixel1 = map.getPixelFromCoordinate(closestSegment[0]); const pixel2 = map.getPixelFromCoordinate(closestSegment[1]); @@ -1090,7 +1203,13 @@ class Modify extends PointerInteraction { ? closestSegment[1] : closestSegment[0]; } - this.createOrUpdateVertexFeature_(vertex); + this.createOrUpdateVertexFeature_( + vertex, + [node.feature], + [node.geometry] + ); + const geometries = {}; + geometries[getUid(node.geometry)] = true; for (let i = 1, ii = nodes.length; i < ii; ++i) { const segment = nodes[i].segment; if ( @@ -1099,14 +1218,17 @@ class Modify extends PointerInteraction { (coordinatesEqual(closestSegment[0], segment[1]) && coordinatesEqual(closestSegment[1], segment[0])) ) { - vertexSegments[getUid(segment)] = true; + const geometryUid = getUid(nodes[i].geometry); + if (!(geometryUid in geometries)) { + geometries[geometryUid] = true; + vertexSegments[getUid(segment)] = true; + } } else { break; } } } - vertexSegments[getUid(closestSegment)] = true; this.vertexSegments_ = vertexSegments; return; } @@ -1197,12 +1319,16 @@ class Modify extends PointerInteraction { this.lastPointerEvent_.type != MapBrowserEventType.POINTERDRAG ) { const evt = this.lastPointerEvent_; - this.willModifyFeatures_(evt); + this.willModifyFeatures_(evt, this.dragSegments_); const removed = this.removeVertex_(); this.dispatchEvent( - new ModifyEvent(ModifyEventType.MODIFYEND, this.features_, evt) + new ModifyEvent( + ModifyEventType.MODIFYEND, + this.featuresBeingModified_, + evt + ) ); - this.modified_ = false; + this.featuresBeingModified_ = null; return removed; } return false; diff --git a/src/ol/interaction/MouseWheelZoom.js b/src/ol/interaction/MouseWheelZoom.js index 3b9167674b..2b0d1b912f 100644 --- a/src/ol/interaction/MouseWheelZoom.js +++ b/src/ol/interaction/MouseWheelZoom.js @@ -41,7 +41,7 @@ export const Mode = { */ class MouseWheelZoom extends Interaction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -178,10 +178,9 @@ class MouseWheelZoom extends Interaction { return true; } - mapBrowserEvent.preventDefault(); - const map = mapBrowserEvent.map; const wheelEvent = /** @type {WheelEvent} */ (mapBrowserEvent.originalEvent); + wheelEvent.preventDefault(); if (this.useAnchor_) { this.lastAnchor_ = mapBrowserEvent.coordinate; diff --git a/src/ol/interaction/PinchRotate.js b/src/ol/interaction/PinchRotate.js index ba4848ad06..f971f82bd4 100644 --- a/src/ol/interaction/PinchRotate.js +++ b/src/ol/interaction/PinchRotate.js @@ -22,7 +22,7 @@ import {disable} from '../rotationconstraint.js'; */ class PinchRotate extends PointerInteraction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; diff --git a/src/ol/interaction/PinchZoom.js b/src/ol/interaction/PinchZoom.js index 7a5071921d..4e29acc821 100644 --- a/src/ol/interaction/PinchZoom.js +++ b/src/ol/interaction/PinchZoom.js @@ -19,7 +19,7 @@ import {FALSE} from '../functions.js'; */ class PinchZoom extends PointerInteraction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; diff --git a/src/ol/interaction/Pointer.js b/src/ol/interaction/Pointer.js index 9a488af0f0..a4919e15c1 100644 --- a/src/ol/interaction/Pointer.js +++ b/src/ol/interaction/Pointer.js @@ -45,7 +45,7 @@ import {getValues} from '../obj.js'; */ class PointerInteraction extends Interaction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { const options = opt_options ? opt_options : {}; @@ -139,7 +139,7 @@ class PointerInteraction extends Interaction { if (mapBrowserEvent.type == MapBrowserEventType.POINTERDRAG) { this.handleDragEvent(mapBrowserEvent); // prevent page scrolling during dragging - mapBrowserEvent.preventDefault(); + mapBrowserEvent.originalEvent.preventDefault(); } else if (mapBrowserEvent.type == MapBrowserEventType.POINTERUP) { const handledUp = this.handleUpEvent(mapBrowserEvent); this.handlingDownUpSequence = diff --git a/src/ol/interaction/Select.js b/src/ol/interaction/Select.js index 4d35046606..14fc85e485 100644 --- a/src/ol/interaction/Select.js +++ b/src/ol/interaction/Select.js @@ -94,7 +94,7 @@ const SelectEventType = { * Events emitted by {@link module:ol/interaction/Select~Select} instances are instances of * this type. */ -class SelectEvent extends Event { +export class SelectEvent extends Event { /** * @param {SelectEventType} type The event type. * @param {Array} selected Selected features. @@ -130,7 +130,7 @@ class SelectEvent extends Event { /** * Original feature styles to reset to when features are no longer selected. - * @type {Object.|import("../style/Style.js").StyleFunction>} + * @type {Object|import("../style/Style.js").StyleFunction>} */ const originalFeatureStyles = {}; @@ -151,7 +151,7 @@ const originalFeatureStyles = {}; */ class Select extends Interaction { /** - * @param {Options=} opt_options Options. + * @param {Options} [opt_options] Options. */ constructor(opt_options) { super(); @@ -216,7 +216,7 @@ class Select extends Interaction { /** * @private - * @type {import("../style/Style.js").default|Array.|import("../style/Style.js").StyleFunction|null} + * @type {import("../style/Style.js").default|Array|import("../style/Style.js").StyleFunction|null} */ this.style_ = options.style !== undefined ? options.style : getDefaultStyleFunction(); @@ -277,7 +277,7 @@ class Select extends Interaction { /** * Returns the Hit-detection tolerance. - * @returns {number} Hit tolerance in pixels. + * @return {number} Hit tolerance in pixels. * @api */ getHitTolerance() { @@ -391,25 +391,23 @@ class Select extends Interaction { * @private */ restorePreviousStyle_(feature) { - const key = getUid(feature); - const selectInteractions = /** @type {Array