Merge origin/main into main

prushforth · prushforth · commit e5ab1a321e2f · 2024-08-24T07:54:24.000-04:00
diff --git 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
@@ -4,13 +4,13 @@
 
 The &lt;mapml-viewer> is a declarative vocabulary for Web mapping that extends
 HTML to include modern Web maps.  It is a pilot / reference implementation of the
-proposed and evolving [Map Markup Language](https://maps4html.org/web-map-doc/docs/) 
+proposed and evolving [Map Markup Language](https://maps4html.org/web-map-doc/docs/) (MapML)
 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,18 +43,26 @@ 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!
-2. Create your feature branch: `git checkout -b my-new-feature`
-3. Commit your changes: `git commit -am 'Add some feature'`
-4. Push to the branch: `git push origin my-new-feature`
-5. Submit a pull request :D
+1. Discuss your proposed changes or requirements in a GitHub issue in maps4html organization
+2. Once agreement is reached on your ideas, fork it!
+3. Create your feature branch: `git checkout -b my-new-feature`
+4. Commit your changes: `git commit -am 'Add some feature'`
+5. Push to the branch: `git push origin my-new-feature`
+6. Submit a pull request :D
+7. Iterate as required.
 
 ## History
 
-TODO: Write history
+The idea of standardizing maps in the web platform arose from discussions at a 
+W3C linking spatial data workshop in 2014.  A second 
+online workshop focused on maps for the web was held in 2020, and from the latter,
+many detailed requirements for maps on the web were presented.  The MapML 
+polyfill attempts to track and implement these (evolving) requirements, with the
+intent being to eventually fully specify and the requirements of web map
+users as an update to the HTML Living Standard, implemented by browsers.
 
 ## Credits
 
@@ -63,6 +71,13 @@ Map for HTML Community members and supporters past, present and future.
 ## License
 
 All Reports in this Repository are licensed by Contributors under the 
-[W3C Software and Document License](http://www.w3.org/Consortium/Legal/2015/copyright-software-and-document).  
+[W3C Software and Document License](https://www.w3.org/copyright/software-license-2023/).  
 Contributions to Specifications are made under the
 [W3C CLA](https://www.w3.org/community/about/agreements/cla/).
+
+
+## Code of Conduct
+[Professional conduct](https://www.w3.org/policies/code-of-conduct/) on the part 
+of our members is required and expected by our
+status as a project of the 
+[W3C Community and Business Groups program](https://www.w3.org/community/about/).
diff --git a/badge.svg b/badge.svg
@@ -14,10 +14,10 @@
     <g font-family="'DejaVu Sans',Verdana,Geneva,sans-serif" font-size="11">
       <path id="workflow-bg" d="M0,3 C0,1.3431 1.3552,0 3.02702703,0 L65,0 L65,20 L3.02702703,20 C1.3552,20 0,18.6569 0,17 L0,3 Z" fill="url(#workflow-fill)" fill-rule="nonzero"/>
       <text fill="#010101" fill-opacity=".3">
-        <tspan x="22.1981982" y="15" aria-hidden="true">Web-Map-Custom-Element</tspan>
+        <tspan x="22.1981982" y="15" aria-hidden="true">MapML.js</tspan>
       </text>
       <text fill="#FFFFFF">
-        <tspan x="22.1981982" y="14">Web-Map-Custom-Element</tspan>
+        <tspan x="22.1981982" y="14">MapML.js</tspan>
       </text>
     </g>
     <g transform="translate(65)" font-family="'DejaVu Sans',Verdana,Geneva,sans-serif" font-size="11">
diff --git 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`.
diff --git a/package-lock.json b/package-lock.json
diff --git 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 <mapml-viewer> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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(
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
@@ -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 <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
   });
 });
diff --git 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
@@ -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>
diff --git a/test/e2e/layers/step/imageStep.test.js b/test/e2e/layers/step/imageStep.test.js
@@ -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');
diff --git a/test/e2e/layers/step/request.js b/test/e2e/layers/step/request.js
@@ -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, '', '');
diff --git a/test/e2e/layers/templatedTileLayer.test.js b/test/e2e/layers/templatedTileLayer.test.js
@@ -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'
       );
diff --git a/w3c-tag-advice-for-polyfill-authors.md b/w3c-tag-advice-for-polyfill-authors.md
@@ -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>
@@ -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>
diff --git a/w3c-tag-guidelines-web-compatible-components.md b/w3c-tag-guidelines-web-compatible-components.md
@@ -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>
