Revert removal of M.geojson2mapml and M.mapml2geojson public API methods

prushforth · prushforth · commit dfa15e283c71 · 2024-09-19T12:54:10.000-04:00
Add test to confirm their existence
diff --git a/src/mapml/GlobalM.js b/src/mapml/GlobalM.js
@@ -696,6 +696,9 @@ import './handlers/keyboard';
     }
   });
 
+  M.geojson2mapml = Util.geojson2mapml;
+  M.mapml2geojson = Util.mapml2geojson;
+
   // see https://leafletjs.com/examples/extending/extending-3-controls.html#handlers
   L.Map.addInitHook('addHandler', 'query', QueryHandler);
   L.Map.addInitHook('addHandler', 'contextMenu', ContextMenu);
diff --git a/test/e2e/geojson/geojson2mapml.html b/test/e2e/geojson/geojson2mapml.html
@@ -11,7 +11,7 @@
 
 <body>
     <!--geojson2mapml layer output goes here dynamically-->
-    <mapml-viewer id="output" projection="OSMTILE" zoom="10" lon="-75.7" lat="45.4" controls>
+    <mapml-viewer data-testid="map" id="output" projection="OSMTILE" zoom="10" lon="-75.7" lat="45.4" controls>
     </mapml-viewer>
 
     <!-- The expected results for geojson2mapml go here-->
diff --git a/test/e2e/geojson/geojson2mapml.test.js b/test/e2e/geojson/geojson2mapml.test.js
@@ -158,4 +158,15 @@ test.describe('GeoJSON API - geojson2mapml', () => {
       );
     expect(out).toEqual(exp);
   });
+  test('M.geojson2mapml public API method exists and works', async ()=>{
+    const viewer = page.getByTestId('map');
+    await viewer.evaluate((v)=>{
+      let l = M.geojson2mapml(point, {label: 'M.geojson2mapml public API method works'});
+      v.appendChild(l);
+      l.setAttribute('data-testid','test-layer');
+    });
+    const layer = page.getByTestId('test-layer');
+    await expect(layer).not.toHaveAttribute('disabled');
+    await expect(layer).toHaveAttribute('label','M.geojson2mapml public API method works');
+  });
 });
diff --git a/test/e2e/geojson/mapml2geojson.html b/test/e2e/geojson/mapml2geojson.html
@@ -13,7 +13,7 @@
   <!--All the mapml layers- that will be converted to geojson go in the mapml-viewer-->
     <mapml-viewer projection="OSMTILE" zoom="10" lon="-75.7" lat="45.4" controls>
         
-      <layer- label="Point Geometry" checked>
+      <layer- data-testid="point" label="Point Geometry" checked>
           <map-feature>
             <map-featurecaption>Point</map-featurecaption>
             <map-geometry>
diff --git a/test/e2e/geojson/mapml2geojson.test.js b/test/e2e/geojson/mapml2geojson.test.js
@@ -125,4 +125,11 @@ test.describe('GeoJSON API - mapml2geojson', () => {
     );
     expect(out10).toEqual(exp10);
   });
+  test('M.mapml2geojson public API method exists and works', async () => {
+    const geojsonPoint = await page.evaluate(() => {
+      let layer = document.querySelector('[data-testid=point]');
+      return M.mapml2geojson(layer);
+    });
+    expect(geojsonPoint.title).toEqual('Point Geometry');
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -696,6 +696,9 @@ import './handlers/keyboard';`
`696`	`696`	`}`
`697`	`697`	`});`
`698`	`698`
	`699`	`+ M.geojson2mapml = Util.geojson2mapml;`
	`700`	`+ M.mapml2geojson = Util.mapml2geojson;`
	`701`	`+`
`699`	`702`	`// see https://leafletjs.com/examples/extending/extending-3-controls.html#handlers`
`700`	`703`	`L.Map.addInitHook('addHandler', 'query', QueryHandler);`
`701`	`704`	`L.Map.addInitHook('addHandler', 'contextMenu', ContextMenu);`