Merge pull request #233 from ahmadayubi/htmlNamespace

prushforth · web-flow · commit 882365fb3677 · 2021-01-15T13:29:32.000-05:00
Change namespace of .mapml data to xhtml
diff --git a/debug/cbmt-test.mapml b/debug/cbmt-test.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
     <head>
         <title>Canada Base Map - Transportation (CBMT)</title>
         <meta http-equiv="Content-Type" content="text/mapml;projection=CBMTILE" />
diff --git a/test/e2e/data/tiles/cbmt/alabama_feature.mapml b/test/e2e/data/tiles/cbmt/alabama_feature.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
     <head>
         <title>Natural Resources Canada's CanVec+ 031G - Map Markup Language</title>
         <meta http-equiv="Content-Type" content="text/mapml;projection=WGS84;zoom=2"/>
diff --git a/test/e2e/data/tiles/cbmt/cbmt.mapml b/test/e2e/data/tiles/cbmt/cbmt.mapml
@@ -1,18 +1,22 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
+
   <head>
     <title>Canada Base Map - Transportation (CBMT)</title>
-    <meta http-equiv="Content-Type" content="text/mapml;projection=CBMTILE"/>
-    <meta charset="utf-8"/>
-    <base href=""/>
-    <link rel="license" href="https://www.nrcan.gc.ca/earth-sciences/geography/topographic-information/free-data-geogratis/licence/17285" title="Canada Base Map © Natural Resources Canada"/>
-    <link rel="zoomin" href="/mapml/en/cbmtile/cbmt/?z=18" type="text/mapml"/>
+    <meta http-equiv="Content-Type" content="text/mapml;projection=CBMTILE" />
+    <meta charset="utf-8" />
+    <base href="" />
+    <link rel="license"
+      href="https://www.nrcan.gc.ca/earth-sciences/geography/topographic-information/free-data-geogratis/licence/17285"
+      title="Canada Base Map © Natural Resources Canada" />
+    <link rel="zoomin" href="/mapml/en/cbmtile/cbmt/?z=18" type="text/mapml" />
   </head>
+
   <body>
     <extent units="CBMTILE">
-    <input name="z" type="zoom" value="17" min="0" max="17"/>
-    <input name="y" type="location" units="tilematrix" axis="row" min="29750" max="34475" />
-    <input name="x" type="location" units="tilematrix" axis="column" min="26484" max="32463" />
-    <link rel="tile" tref="cbmt/{z}/c{x}_r{y}.png" />
+      <input name="z" type="zoom" value="17" min="0" max="17" />
+      <input name="y" type="location" units="tilematrix" axis="row" min="29750" max="34475" />
+      <input name="x" type="location" units="tilematrix" axis="column" min="26484" max="32463" />
+      <link rel="tile" tref="cbmt/{z}/c{x}_r{y}.png" />
     </extent>
   </body>
 </mapml>
diff --git a/test/e2e/data/tiles/cbmt/templatedImage.mapml b/test/e2e/data/tiles/cbmt/templatedImage.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
   <head>
     <title>Toporama</title>
     <meta charset="utf-8"/>
diff --git a/test/e2e/data/tiles/cbmt/us_pop_density.mapml b/test/e2e/data/tiles/cbmt/us_pop_density.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
   <head>
     <title>US Population Density</title>
     <meta http-equiv="Content-Type" content="text/mapml"/>
diff --git a/test/e2e/data/tiles/wgs84/0/r0_c0.mapml b/test/e2e/data/tiles/wgs84/0/r0_c0.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/0/r0_c1.mapml b/test/e2e/data/tiles/wgs84/0/r0_c1.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/1/r0_c0.mapml b/test/e2e/data/tiles/wgs84/1/r0_c0.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/1/r0_c1.mapml b/test/e2e/data/tiles/wgs84/1/r0_c1.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/1/r0_c2.mapml b/test/e2e/data/tiles/wgs84/1/r0_c2.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/1/r0_c3.mapml b/test/e2e/data/tiles/wgs84/1/r0_c3.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/1/r1_c0.mapml b/test/e2e/data/tiles/wgs84/1/r1_c0.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/1/r1_c1.mapml b/test/e2e/data/tiles/wgs84/1/r1_c1.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/1/r1_c2.mapml b/test/e2e/data/tiles/wgs84/1/r1_c2.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/1/r1_c3.mapml b/test/e2e/data/tiles/wgs84/1/r1_c3.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c0.mapml b/test/e2e/data/tiles/wgs84/2/r0_c0.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c1.mapml b/test/e2e/data/tiles/wgs84/2/r0_c1.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c2.mapml b/test/e2e/data/tiles/wgs84/2/r0_c2.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c3.mapml b/test/e2e/data/tiles/wgs84/2/r0_c3.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c4.mapml b/test/e2e/data/tiles/wgs84/2/r0_c4.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c5.mapml b/test/e2e/data/tiles/wgs84/2/r0_c5.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c6.mapml b/test/e2e/data/tiles/wgs84/2/r0_c6.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r0_c7.mapml b/test/e2e/data/tiles/wgs84/2/r0_c7.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c0.mapml b/test/e2e/data/tiles/wgs84/2/r1_c0.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c1.mapml b/test/e2e/data/tiles/wgs84/2/r1_c1.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c2.mapml b/test/e2e/data/tiles/wgs84/2/r1_c2.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c3.mapml b/test/e2e/data/tiles/wgs84/2/r1_c3.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c4.mapml b/test/e2e/data/tiles/wgs84/2/r1_c4.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c5.mapml b/test/e2e/data/tiles/wgs84/2/r1_c5.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c6.mapml b/test/e2e/data/tiles/wgs84/2/r1_c6.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r1_c7.mapml b/test/e2e/data/tiles/wgs84/2/r1_c7.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c0.mapml b/test/e2e/data/tiles/wgs84/2/r2_c0.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c1.mapml b/test/e2e/data/tiles/wgs84/2/r2_c1.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c2.mapml b/test/e2e/data/tiles/wgs84/2/r2_c2.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c3.mapml b/test/e2e/data/tiles/wgs84/2/r2_c3.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c4.mapml b/test/e2e/data/tiles/wgs84/2/r2_c4.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c5.mapml b/test/e2e/data/tiles/wgs84/2/r2_c5.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c6.mapml b/test/e2e/data/tiles/wgs84/2/r2_c6.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r2_c7.mapml b/test/e2e/data/tiles/wgs84/2/r2_c7.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c0.mapml b/test/e2e/data/tiles/wgs84/2/r3_c0.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c1.mapml b/test/e2e/data/tiles/wgs84/2/r3_c1.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c2.mapml b/test/e2e/data/tiles/wgs84/2/r3_c2.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c3.mapml b/test/e2e/data/tiles/wgs84/2/r3_c3.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c4.mapml b/test/e2e/data/tiles/wgs84/2/r3_c4.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c5.mapml b/test/e2e/data/tiles/wgs84/2/r3_c5.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c6.mapml b/test/e2e/data/tiles/wgs84/2/r3_c6.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/2/r3_c7.mapml b/test/e2e/data/tiles/wgs84/2/r3_c7.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
    <head>
       <title>ne_10m_admin_0_countries</title>
 
diff --git a/test/e2e/data/tiles/wgs84/vector-tile-test.mapml b/test/e2e/data/tiles/wgs84/vector-tile-test.mapml
@@ -1,4 +1,4 @@
-<mapml>
+<mapml xmlns="https://www.w3.org/1999/xhtml/">
     <head>
         <title>World Countries - WGS84</title>
         <meta charset="utf-8" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<mapml>`
	`1`	`+<mapml xmlns="https://www.w3.org/1999/xhtml/">`
`2`	`2`	`<head>`
`3`	`3`	`<title>Canada Base Map - Transportation (CBMT)</title>`
`4`	`4`	`<meta http-equiv="Content-Type" content="text/mapml;projection=CBMTILE" />`