Skip to content

Commit

Permalink
Merge branch 'Maps4HTML:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
prushforth authored Aug 21, 2024
2 parents 83011bd + a4dcfe0 commit dbe65e1
Show file tree
Hide file tree
Showing 110 changed files with 12,069 additions and 789 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
- run: npx playwright install --with-deps
- run: npm install -g grunt-cli
- run: grunt default
- run: xvfb-run --auto-servernum -- npx playwright test --retries=3
- run: xvfb-run --auto-servernum -- npx playwright test --grep-invert="popupTabNavigation\.test\.js|layerContextMenuKeyboard\.test\.js" --workers=1 --retries=3
# - run: xvfb-run --auto-servernum -- npx playwright test --grep="popupTabNavigation\.test\.js|layerContextMenuKeyboard\.test\.js" --workers=1 --retries=3
# - run: xvfb-run --auto-servernum -- npm run jest
env:
CI: true
CI: true
2 changes: 1 addition & 1 deletion .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build:
if: github.repository == 'Maps4HTML/Web-Map-Custom-Element'
if: github.repository == 'Maps4HTML/MapML.js'
runs-on: ubuntu-latest

steps:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Web standard.
## Installation

```console
$ npm install @maps4html/web-map-custom-element
$ npm install @maps4html/mapml
```

See [instructions](https://maps4html.org/web-map-doc/docs/installation#install-the-mapml-viewer-suite-of-custom-elements) for further details.
Expand Down Expand Up @@ -43,7 +43,7 @@ OR inline content

## Contributing

See [CONTRIBUTING](https://github.com/Maps4HTML/Web-Map-Custom-Element/blob/main/CONTRIBUTING.md#contributing-to-mapml) for details, but generally:
See [CONTRIBUTING](https://github.com/Maps4HTML/MapML.js/blob/main/CONTRIBUTING.md#contributing-to-mapml) for details, but generally:

0. Join our [Community Group](https://www.w3.org/community/wp-login.php?redirect_to=%2Fcommunity%2Fmaps4html%2Fjoin)
1. Fork it!
Expand Down
4 changes: 2 additions & 2 deletions badge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions how-to-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if needed.

```json
{
"name": "@maps4html/web-map-custom-element",
"name": "@maps4html/mapml",
"version": "X.X.X",
...
"files": [
Expand All @@ -20,7 +20,7 @@ if needed.
Note that when releasing on npm, you are distributing leaflet, proj4 etc., so
you need to distribute the text of their licenses with the dist folder.

Open the command prompt and cd into the Web-Map-Custom-Element project directory.
Open the command prompt and cd into the MapML.js project directory.

Type in –
```bash
Expand All @@ -32,12 +32,12 @@ npm publish --access=public
```
When it publishes successfully you should see:
```bash
+@maps4html/web-map-custom-element@X.X.X
+@maps4html/mapml@X.X.X
```

**GitHub release procedure**

To create a new release on GitHub, visit the [release page](https://github.com/Maps4HTML/Web-Map-Custom-Element/releases),
To create a new release on GitHub, visit the [release page](https://github.com/Maps4HTML/MapML.js/releases),
then click `Draft a new release`.

Enter the new release version in the `Choose a tag` dropdown, fill in the title and description
Expand All @@ -48,7 +48,7 @@ if needed, and then publish the release.
Create a personal access token on [GitHub](https://github.com/settings/tokens/new)
and check `write:packages` and `delete:packages`.

Open the command prompt and cd into the Web-Map-Custom-Element project directory. Enter:
Open the command prompt and cd into the MapML.js project directory. Enter:
```bash
npm login --scope=@Maps4HTML --registry=https://npm.pkg.github.com
```
Expand All @@ -70,6 +70,6 @@ npm publish
```
When it publishes successfully you should see:
```bash
+@maps4html/web-map-custom-element@X.X.X
+@maps4html/mapml@X.X.X
```
Now `"publishConfig"` can be removed from `package.json`.
3 changes: 1 addition & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,13 @@
<mapml-viewer projection="OSMTILE" zoom="14" lat="45.406314" lon="-75.6883335" controls controlslist="geolocation">
<layer- data-testid="osm-layer" label="OpenStreetMap" checked >
<map-link rel="license" title="© OpenStreetMap contributors CC BY-SA" href="https://www.openstreetmap.org/copyright"></map-link>
<map-extent units="OSMTILE" checked="checked" hidden="hidden">
<map-extent units="OSMTILE" checked="checked">
<map-input name="z" type="zoom" value="18" min="0" max="18"></map-input>
<map-input name="x" type="location" units="tilematrix" axis="column" min="0" max="262144"></map-input>
<map-input name="y" type="location" units="tilematrix" axis="row" min="0" max="262144"></map-input>
<map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png"></map-link>
</map-extent>
</layer->
</layer->
</mapml-viewer>
</body>
</html>
Loading

0 comments on commit dbe65e1

Please sign in to comment.