Skip to content

Commit

Permalink
Rename Web-Map-Custom-Element -> MapML.js in files
Browse files Browse the repository at this point in the history
  • Loading branch information
prushforth committed Aug 21, 2024
1 parent 358fca7 commit a4dcfe0
Show file tree
Hide file tree
Showing 21 changed files with 42 additions and 42 deletions.
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`.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@maps4html/web-map-custom-element",
"name": "@maps4html/mapml",
"version": "0.13.4",
"description": "Custom <mapml-viewer> element suite",
"keywords": [
Expand All @@ -17,18 +17,18 @@
"author": "Maps for HTML Community Group",
"repository": {
"type": "git",
"url": "git://github.com/Maps4HTML/Web-Map-Custom-Element.git"
"url": "git://github.com/Maps4HTML/MapML.js.git"
},
"website": "http://maps4html.org/Web-Map-Doc/",
"bugs": {
"url": "https://github.com/Maps4HTML/Web-Map-Custom-Element/issues"
"url": "https://github.com/Maps4HTML/MapML.js/issues"
},
"license": "W3C",
"contributors": [
{
"name": "Maps for HTML community",
"email": "[email protected]",
"url": "https://github.com/Maps4HTML/Web-Map-Custom-Element/graphs/contributors"
"url": "https://github.com/Maps4HTML/MapML.js/graphs/contributors"
}
],
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/mapml-viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export class MapViewer extends HTMLElement {

this._createMap();

// https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/274
// https://github.com/Maps4HTML/MapML.js/issues/274
this.setAttribute('role', 'application');
this._toggleStatic();

Expand Down Expand Up @@ -241,7 +241,7 @@ export class MapViewer extends HTMLElement {
let mapDefaultCSS = document.createElement('style');
mapDefaultCSS.innerHTML =
`:host {` +
`all: initial;` + // Reset properties inheritable from html/body, as some inherited styles may cause unexpected issues with the map element's components (https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/140).
`all: initial;` + // Reset properties inheritable from html/body, as some inherited styles may cause unexpected issues with the map element's components (https://github.com/Maps4HTML/MapML.js/issues/140).
`contain: layout size;` + // Contain layout and size calculations within the map element.
`display: inline-block;` + // This together with dimension properties is required so that Leaflet isn't working with a height=0 box by default.
`height: 150px;` + // Provide a "default object size" (https://github.com/Maps4HTML/HTML-Map-Element/issues/31).
Expand All @@ -256,7 +256,7 @@ export class MapViewer extends HTMLElement {
`display: none!important;` +
`}` +
`:host .leaflet-control-container {` +
`visibility: hidden!important;` + // Visibility hack to improve percieved performance (mitigate FOUC) – visibility is unset in mapml.css! (https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/154).
`visibility: hidden!important;` + // Visibility hack to improve percieved performance (mitigate FOUC) – visibility is unset in mapml.css! (https://github.com/Maps4HTML/MapML.js/issues/154).
`}`;

// Hide all (light DOM) children of the map element.
Expand Down
4 changes: 2 additions & 2 deletions src/mapml.css
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ summary {

/*
* Visibility hack – mitigates FOUC.
* (https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/154)
* (https://github.com/Maps4HTML/MapML.js/issues/154)
*/

/* Unset `visibility: hidden` (inherited from web-map/mapml-viewer.js). */
Expand Down Expand Up @@ -663,7 +663,7 @@ summary {
}

/* Force printers to include background-images of controls for printing.
(https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/294) */
(https://github.com/Maps4HTML/MapML.js/issues/294) */
@media print {
.leaflet-control {
-webkit-print-color-adjust: exact;
Expand Down
2 changes: 1 addition & 1 deletion src/mapml/features/featureRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export var FeatureRenderer = L.SVG.extend({
* Override method of same name from L.SVG, use the this._container property
* to set up the role="none presentation" on featureGroupu container,
* per this recommendation:
* https://github.com/Maps4HTML/Web-Map-Custom-Element/pull/471#issuecomment-845192246
* https://github.com/Maps4HTML/MapML.js/pull/471#issuecomment-845192246
* @private overrides ancestor method so that we have a _container to work with
*/
_initContainer: function () {
Expand Down
2 changes: 1 addition & 1 deletion src/mapml/layers/MapMLLayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ export var MapMLLayer = L.LayerGroup.extend({

popup._container.setAttribute('role', 'dialog');
content.setAttribute('tabindex', '-1');
// https://github.com/Maps4HTML/Web-Map-Custom-Element/pull/467#issuecomment-844307818
// https://github.com/Maps4HTML/MapML.js/pull/467#issuecomment-844307818
content.setAttribute('role', 'document');
popup._count = 0; // used for feature pagination

Expand Down
10 changes: 5 additions & 5 deletions src/web-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -244,14 +244,14 @@ export class WebMap extends HTMLMapElement {
mapDefaultCSS.id = 'web-map-default-style';
mapDefaultCSS.innerHTML =
`[is="web-map"] {` +
`all: initial;` + // Reset properties inheritable from html/body, as some inherited styles may cause unexpected issues with the map element's components (https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/140).
`all: initial;` + // Reset properties inheritable from html/body, as some inherited styles may cause unexpected issues with the map element's components (https://github.com/Maps4HTML/MapML.js/issues/140).
`contain: layout size;` + // Contain layout and size calculations within the map element.
`display: inline-block;` + // This together with dimension properties is required so that Leaflet isn't working with a height=0 box by default.
`height: 150px;` + // Provide a "default object size" (https://github.com/Maps4HTML/HTML-Map-Element/issues/31).
`width: 300px;` +
`border-width: 2px;` + // Set a default border for contrast, similar to UA default for iframes.
`border-style: inset;` +
`box-sizing: inherit;` + // https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/350#issuecomment-888361985
`box-sizing: inherit;` + // https://github.com/Maps4HTML/MapML.js/issues/350#issuecomment-888361985
`}` +
`[is="web-map"][frameborder="0"] {` +
`border-width: 0;` +
Expand All @@ -266,7 +266,7 @@ export class WebMap extends HTMLMapElement {
let shadowRootCSS = document.createElement('style');
shadowRootCSS.innerHTML =
`:host .leaflet-control-container {` +
`visibility: hidden!important;` + // Visibility hack to improve percieved performance (mitigate FOUC) – visibility is unset in mapml.css! (https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/154).
`visibility: hidden!important;` + // Visibility hack to improve percieved performance (mitigate FOUC) – visibility is unset in mapml.css! (https://github.com/Maps4HTML/MapML.js/issues/154).
`}`;

// Hide all (light DOM) children of the map element except for the
Expand Down Expand Up @@ -336,13 +336,13 @@ export class WebMap extends HTMLMapElement {

// undisplay the img in the image map, because it's not needed now.
// gives a slight FOUC, unless:
// 1) the img is pre-styled (https://github.com/Maps4HTML/Web-Map-Custom-Element/blob/80a4a4e372d2ef61bb7cad6a111e17e396b8e908/index-map-area.html#L35)
// 1) the img is pre-styled (https://github.com/Maps4HTML/MapML.js/blob/80a4a4e372d2ef61bb7cad6a111e17e396b8e908/index-map-area.html#L35)
// 2) placed after the map element
if (this.poster) {
this.poster.setAttribute('hidden', '');
}

// https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/274
// https://github.com/Maps4HTML/MapML.js/issues/274
this.setAttribute('role', 'application');
// Make the Leaflet container element programmatically identifiable
// (https://github.com/Leaflet/Leaflet/issues/7193).
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/core/history.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test.describe('History test', () => {
await context.close();
});

//https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/550
//https://github.com/Maps4HTML/MapML.js/issues/550
test('History does not get added to when trying to zoom out at min zoom level', async () => {
await page.keyboard.press('Tab');
await page.keyboard.press('Minus');
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/core/mapSpan.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test.describe('<map-span> test ', () => {
expect(index).toEqual(-1);
});

//https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/559#issuecomment-959805896
//https://github.com/Maps4HTML/MapML.js/issues/559#issuecomment-959805896
test('White space parsing for map-coordinates', async () => {
await page.waitForTimeout(1000);
const feature = await page.$eval(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test.describe('map-extent checked order tests', () => {
await page.goto('map-extent-checked.html');
});
test('map-extent layer control order correct when cycling checked state', async () => {
// Fixed #935 https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/935
// Fixed #935 https://github.com/Maps4HTML/MapML.js/issues/935
/*
Go to this map map-extent-checked.html
Expand Down Expand Up @@ -87,6 +87,6 @@ The imagery layer <map-extent> draws on top of the states layer.
// ensure that
// a) render order/z-index is correct
// b) render order is reflected in layer control order as well
// see https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/956
// see https://github.com/Maps4HTML/MapML.js/issues/956
});
});
2 changes: 1 addition & 1 deletion test/e2e/elements/map-extent/map-extent.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ test.describe('map-extent tests', () => {
layer.appendChild(me);
});

// see https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/921
// see https://github.com/Maps4HTML/MapML.js/issues/921
mapExtent = page.getByTestId('ext5');

// get the extent of map-extent
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/layers/multipleQueryExtents.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<layer- label="Multiple Query Extents" checked>
<!-- the non-query extent (in this case a TemplatedTileLayer) is necessary
to have the layer not disabled in the layer control -->
<!-- see: https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/647#issue-1096626052 -->
<!-- see: https://github.com/Maps4HTML/MapML.js/issues/647#issue-1096626052 -->
<map-extent units="CBMTILE" checked hidden>
<map-input name="z" type="zoom" value="17" min="0" max="17"></map-input>
<map-input name="y" type="location" units="tilematrix" axis="row" min="29750" max="34475"></map-input>
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/layers/step/imageStep.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ test.describe('Templated image layer with step', () => {
The resetting mentioned below would make it look like the map zoomed out before panning since the
scaled layer's css scale transform would be removed and there would be enough time to see it before the new
layer is added.
https://github.com/Maps4HTML/Web-Map-Custom-Element/commit/8df7c993276e719bb30c4f55a8966289d4c918b7
https://github.com/Maps4HTML/MapML.js/commit/8df7c993276e719bb30c4f55a8966289d4c918b7
*/
test('Overlay to remove does not reset its transform on shift pan when on a scaled layer', async () => {
await page.keyboard.press('Shift+ArrowUp');
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/layers/step/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ exports.test = (
await zoomIn(z5, urlBase, u5);
});

//https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/666
//https://github.com/Maps4HTML/MapML.js/issues/666
if (native) {
test('No requests out of native zoom bounds', async () => {
await zoomIn(0, '', '');
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/layers/templatedTileLayer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ test.describe('Playwright mapMLTemplatedTile Layer Tests', () => {
});

test('Templated tile layer works without <map-input> for zoom level', async () => {
// tests fix for https://github.com/Maps4HTML/Web-Map-Custom-Element/issues/669
// tests fix for https://github.com/Maps4HTML/MapML.js/issues/669
await page.hover(
'div > div.leaflet-control-container > div.leaflet-top.leaflet-right > div'
);
Expand Down
6 changes: 3 additions & 3 deletions w3c-tag-advice-for-polyfill-authors.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ conforms to the W3C <abbr title="Technical Architecture Group">TAG</abbr>'s
<ul><li>- [x] </li></ul>
</td>
<td>
<a href="https://www.npmjs.com/package/@maps4html/web-map-custom-element">Published to npm</a>
<a href="https://www.npmjs.com/package/@maps4html/mapml">Published to npm</a>
and
<a href="https://unpkg.com/@maps4html/web-map-custom-element@latest/dist/mapml-viewer.js">hosted on the UNPKG CDN</a>
<a href="https://unpkg.com/@maps4html/mapml@latest/dist/mapml-viewer.js">hosted on the UNPKG CDN</a>
</td>
</tr>
<tr>
Expand All @@ -62,7 +62,7 @@ conforms to the W3C <abbr title="Technical Architecture Group">TAG</abbr>'s
</td>
<td>
On the backlog of the
<a href="https://github.com/Maps4HTML/Web-Map-Custom-Element/projects/2#card-43799737">Road Map</a> project
<a href="https://github.com/Maps4HTML/MapML.js/projects/2#card-43799737">Road Map</a> project
</td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion w3c-tag-guidelines-web-compatible-components.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ conforms to the W3C <abbr title="Technical Architecture Group">TAG</abbr>'s
</td>
<td>
See the
<a href="https://github.com/Maps4HTML/Web-Map-Custom-Element/issues?q=label%3A%22basic+styling%22">basic styling</a>
<a href="https://github.com/Maps4HTML/MapML.js/issues?q=label%3A%22basic+styling%22">basic styling</a>
label for relevant issues/PRs
</td>
</tr>
Expand Down

0 comments on commit a4dcfe0

Please sign in to comment.