From 4911f2ab86eadf5253df05b71af86a781cebebfc Mon Sep 17 00:00:00 2001
From: Peter Rushforth <peter.rushforth@gmail.com>
Date: Thu, 26 Sep 2024 15:12:44 -0400
Subject: [PATCH] - Export MapViewer from module, allowing use of `new
 MapViewer()`. - Fix broken favicon.ico link in attribution. - Remove unused
 rollup file. - Update name of primary module files for esm and cjs(?) module
 systems in package.json, to mapml.js.

---
 package.json                           |  4 +--
 src/mapml/control/AttributionButton.js |  2 +-
 src/mapml/index-web-map.js             | 47 --------------------------
 src/mapml/index.js                     |  2 +-
 4 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 src/mapml/index-web-map.js

diff --git a/package.json b/package.json
index be384584f..94cb8ebad 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,8 @@
     "web-map",
     "layer"
   ],
-  "main": "mapml-viewer.js",
-  "module": "mapml-viewer.js",
+  "main": "mapml.js",
+  "module": "mapml.js",
   "author": "Maps for HTML Community Group",
   "repository": {
     "type": "git",
diff --git a/src/mapml/control/AttributionButton.js b/src/mapml/control/AttributionButton.js
index 75b878b09..5c1a442c9 100644
--- a/src/mapml/control/AttributionButton.js
+++ b/src/mapml/control/AttributionButton.js
@@ -1,7 +1,7 @@
 export var AttributionButton = L.Control.Attribution.extend({
   options: {
     prefix:
-      '<img src="https://www.w3.org/community/src/templates/wordpress/StoryTeller/favicon.ico" style="position: relative; top: 5px" alt="W3C Community and Business Groups logo"> <a href="https://www.w3.org/community/maps4html/">Maps for HTML Community Group</a> | <img src="data:image/svg+xml;base64,PHN2ZyBhcmlhLWhpZGRlbj0idHJ1ZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTIiIGhlaWdodD0iOCI+PHBhdGggZmlsbD0iIzRDN0JFMSIgZD0iTTAgMGgxMnY0SDB6Ii8+PHBhdGggZmlsbD0iI0ZGRDUwMCIgZD0iTTAgNGgxMnYzSDB6Ii8+PHBhdGggZmlsbD0iI0UwQkMwMCIgZD0iTTAgN2gxMnYxSDB6Ii8+PC9zdmc+" style="padding-right: 0.3em;" alt="Slava Ukraini"> <a href="https://leafletjs.com" title="A JS library for interactive maps">Leaflet</a> '
+      '<img src="https://www.w3.org/community/wp-content/themes/StoryTeller/favicon.ico" style="position: relative; top: 5px" alt="W3C Community and Business Groups logo"> <a href="https://www.w3.org/community/maps4html/">Maps for HTML Community Group</a> | <img src="data:image/svg+xml;base64,PHN2ZyBhcmlhLWhpZGRlbj0idHJ1ZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTIiIGhlaWdodD0iOCI+PHBhdGggZmlsbD0iIzRDN0JFMSIgZD0iTTAgMGgxMnY0SDB6Ii8+PHBhdGggZmlsbD0iI0ZGRDUwMCIgZD0iTTAgNGgxMnYzSDB6Ii8+PHBhdGggZmlsbD0iI0UwQkMwMCIgZD0iTTAgN2gxMnYxSDB6Ii8+PC9zdmc+" style="padding-right: 0.3em;" alt="Slava Ukraini"> <a href="https://leafletjs.com" title="A JS library for interactive maps">Leaflet</a> '
   },
 
   onAdd: function (map) {
diff --git a/src/mapml/index-web-map.js b/src/mapml/index-web-map.js
deleted file mode 100644
index 3e3c2cf25..000000000
--- a/src/mapml/index-web-map.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2015-2024 Canada Centre for Mapping and Earth Observation,
- * Earth Sciences Sector, Natural Resources Canada.
- *
- * License
- *
- * By obtaining and/or copying this work, you (the licensee) agree that you have
- * read, understood, and will comply with the following terms and conditions.
- *
- * Permission to copy, modify, and distribute this work, with or without
- * modification, for any purpose and without fee or royalty is hereby granted,
- * provided that you include the following on ALL copies of the work or portions
- * thereof, including modifications:
- *
- * The full text of this NOTICE in a location viewable to users of the
- * redistributed or derivative work.
- *
- * Any pre-existing intellectual property disclaimers, notices, or terms and
- * conditions. If none exist, the W3C Software and Document Short Notice should
- * be included.
- *
- * Notice of any changes or modifications, through a copyright statement on the
- * new code or document such as "This software or document includes material
- * copied from or derived from [title and URI of the W3C document].
- * Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
- *
- * Disclaimers
- *
- * THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
- * OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
- * MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
- * SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
- * TRADEMARKS OR OTHER RIGHTS.
- * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
- * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
- *
- * The name and trademarks of copyright holders may NOT be used in advertising or
- * publicity pertaining to the work without specific, written prior permission.
- * Title to copyright in this work will at all times remain with copyright holders.
- */
-/* global L, Node */
-import '../../dist/leaflet-src.js';
-import '../../dist/proj4-src.js';
-import '../../dist/proj4leaflet.js';
-import '../../dist/L.Control.Locate.js';
-import './GlobalM.js';
-import { WebMap } from '../web-map';
diff --git a/src/mapml/index.js b/src/mapml/index.js
index 37b5178b3..e650b037d 100644
--- a/src/mapml/index.js
+++ b/src/mapml/index.js
@@ -44,4 +44,4 @@ import '../../dist/proj4-src.js';
 import '../../dist/proj4leaflet.js';
 import '../../dist/L.Control.Locate.js';
 import './GlobalM.js';
-import { MapViewer } from '../mapml-viewer';
+export { MapViewer } from '../mapml-viewer';