diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index edc9810fd..c5e91103e 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -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: diff --git a/README.md b/README.md index fb3c63bed..f43104d54 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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! diff --git a/badge.svg b/badge.svg index 5e29d579b..dfa9913d5 100644 --- a/badge.svg +++ b/badge.svg @@ -14,10 +14,10 @@ - + - Web-Map-Custom-Element + MapML.js diff --git a/how-to-release.md b/how-to-release.md index 97db3417f..1d5e67f50 100644 --- a/how-to-release.md +++ b/how-to-release.md @@ -6,7 +6,7 @@ if needed. ```json { - "name": "@maps4html/web-map-custom-element", + "name": "@maps4html/mapml", "version": "X.X.X", ... "files": [ @@ -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 @@ -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 @@ -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 ``` @@ -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`. \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2c0b2855c..33f9d4886 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "@maps4html/web-map-custom-element", + "name": "@maps4html/mapml", "version": "0.13.4", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "@maps4html/web-map-custom-element", + "name": "@maps4html/mapml", "version": "0.13.4", "license": "W3C", "devDependencies": { diff --git a/package.json b/package.json index e9958a806..a58ba0f5f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@maps4html/web-map-custom-element", + "name": "@maps4html/mapml", "version": "0.13.4", "description": "Custom element suite", "keywords": [ @@ -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": "public-maps4html@w3.org", - "url": "https://github.com/Maps4HTML/Web-Map-Custom-Element/graphs/contributors" + "url": "https://github.com/Maps4HTML/MapML.js/graphs/contributors" } ], "scripts": { diff --git a/src/mapml-viewer.js b/src/mapml-viewer.js index 79fbe626d..4aa15d235 100644 --- a/src/mapml-viewer.js +++ b/src/mapml-viewer.js @@ -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(); @@ -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). @@ -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. diff --git a/src/mapml.css b/src/mapml.css index bdd03cf55..5a7b2b6f8 100644 --- a/src/mapml.css +++ b/src/mapml.css @@ -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). */ @@ -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; diff --git a/src/mapml/features/featureRenderer.js b/src/mapml/features/featureRenderer.js index f04299f9d..2262b7c2b 100644 --- a/src/mapml/features/featureRenderer.js +++ b/src/mapml/features/featureRenderer.js @@ -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 () { diff --git a/src/mapml/layers/MapMLLayer.js b/src/mapml/layers/MapMLLayer.js index c9a03668b..a3ff2eef1 100644 --- a/src/mapml/layers/MapMLLayer.js +++ b/src/mapml/layers/MapMLLayer.js @@ -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 diff --git a/src/web-map.js b/src/web-map.js index 311a071de..672c9aef9 100644 --- a/src/web-map.js +++ b/src/web-map.js @@ -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;` + @@ -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 @@ -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). diff --git a/test/e2e/core/history.test.js b/test/e2e/core/history.test.js index e509b4d83..7c4402a50 100644 --- a/test/e2e/core/history.test.js +++ b/test/e2e/core/history.test.js @@ -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'); diff --git a/test/e2e/core/mapSpan.test.js b/test/e2e/core/mapSpan.test.js index 2f360fc05..311bc29cd 100644 --- a/test/e2e/core/mapSpan.test.js +++ b/test/e2e/core/mapSpan.test.js @@ -41,7 +41,7 @@ test.describe(' 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( diff --git a/test/e2e/elements/map-extent/map-extent-checked-ordering.test.js b/test/e2e/elements/map-extent/map-extent-checked-ordering.test.js index 87baff171..0349d827c 100644 --- a/test/e2e/elements/map-extent/map-extent-checked-ordering.test.js +++ b/test/e2e/elements/map-extent/map-extent-checked-ordering.test.js @@ -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 @@ -87,6 +87,6 @@ The imagery layer 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 }); }); diff --git a/test/e2e/elements/map-extent/map-extent.test.js b/test/e2e/elements/map-extent/map-extent.test.js index f1fb0cd0c..3fee3586f 100644 --- a/test/e2e/elements/map-extent/map-extent.test.js +++ b/test/e2e/elements/map-extent/map-extent.test.js @@ -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 diff --git a/test/e2e/layers/multipleQueryExtents.html b/test/e2e/layers/multipleQueryExtents.html index 823515ea1..c225ad851 100644 --- a/test/e2e/layers/multipleQueryExtents.html +++ b/test/e2e/layers/multipleQueryExtents.html @@ -26,7 +26,7 @@ - +