Merge pull request #1 from prushforth/mapml-customElement-refcatoring

Remove map-extent from vector tiles, removing conflicting blocks
ben-lu-uw · Sep 16, 2021 · 6051185 · 6051185
2 parents f37e351 + e09325b
commit 6051185
Show file tree

Hide file tree

Showing 41 changed files with 2 additions and 926 deletions.
diff --git a/test/e2e/data/tiles/wgs84/0/r0_c1.mapml b/test/e2e/data/tiles/wgs84/0/r0_c1.mapml
@@ -6,15 +6,6 @@
       <meta content="text/mapml" http-equiv="Content-Type" />
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <map-input name="minLon" type="location" value="0" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="-90" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="180" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.2" class="fclass _2">
          <geometry>
             <multipolygon>

diff --git a/test/e2e/data/tiles/wgs84/1/r0_c0.mapml b/test/e2e/data/tiles/wgs84/1/r0_c0.mapml
@@ -6,15 +6,6 @@
       <meta content="text/mapml" http-equiv="Content-Type" />
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <map-input name="minLon" type="location" value="-180" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="0" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="-90" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.5" class="fclass _5">
          <geometry>
             <polygon>

diff --git a/test/e2e/data/tiles/wgs84/1/r0_c1.mapml b/test/e2e/data/tiles/wgs84/1/r0_c1.mapml
@@ -6,15 +6,6 @@
       <meta content="text/mapml" http-equiv="Content-Type" />
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <map-input name="minLon" type="location" value="-90" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="0" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="0" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.5" class="fclass _5">
          <geometry>
             <polygon>

diff --git a/test/e2e/data/tiles/wgs84/1/r0_c2.mapml b/test/e2e/data/tiles/wgs84/1/r0_c2.mapml
@@ -6,15 +6,6 @@
       <meta content="text/mapml" http-equiv="Content-Type" />
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <map-input name="minLon" type="location" value="0" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="0" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="90" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.21" class="fclass _21">
          <geometry>
             <multipolygon>

diff --git a/test/e2e/data/tiles/wgs84/1/r0_c3.mapml b/test/e2e/data/tiles/wgs84/1/r0_c3.mapml
@@ -6,15 +6,6 @@
       <meta content="text/mapml" http-equiv="Content-Type" />
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <map-input name="minLon" type="location" value="90" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="0" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="180" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.58" class="fclass _58">
          <geometry>
             <multipolygon>

diff --git a/test/e2e/data/tiles/wgs84/1/r1_c0.mapml b/test/e2e/data/tiles/wgs84/1/r1_c0.mapml
@@ -6,15 +6,6 @@
       <meta content="text/mapml" http-equiv="Content-Type" />
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <map-input name="minLon" type="location" value="-180" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="-90" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="-90" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="0" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.2" class="fclass _2">
          <geometry>
             <multipolygon>

diff --git a/test/e2e/data/tiles/wgs84/1/r1_c1.mapml b/test/e2e/data/tiles/wgs84/1/r1_c1.mapml
@@ -6,15 +6,6 @@
       <meta content="text/mapml" http-equiv="Content-Type" />
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <map-input name="minLon" type="location" value="-90" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="-90" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="0" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="0" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.2" class="fclass _2">
          <geometry>
             <multipolygon>

diff --git a/test/e2e/data/tiles/wgs84/1/r1_c2.mapml b/test/e2e/data/tiles/wgs84/1/r1_c2.mapml
@@ -6,15 +6,6 @@
       <meta content="text/mapml" http-equiv="Content-Type" />
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <map-input name="minLon" type="location" value="0" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="-90" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="90" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="0" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.2" class="fclass _2">
          <geometry>
             <multipolygon>

diff --git a/test/e2e/data/tiles/wgs84/1/r1_c3.mapml b/test/e2e/data/tiles/wgs84/1/r1_c3.mapml
@@ -4,34 +4,8 @@
 
       <meta charset="utf-8" />
       <meta content="text/mapml" http-equiv="Content-Type" />
-<<<<<<< HEAD
-<<<<<<< HEAD
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <input name="minLon" type="location" value="90" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <input name="minLat" type="location" value="-90" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <input name="maxLon" type="location" value="180" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <input name="maxLat" type="location" value="0" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-   </head>
-   <body>
-      <extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="0" min="0" max="6" />
-         <map-input name="minLon" type="location" value="90" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="-90" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="180" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="0" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.2" class="fclass _2">
          <geometry>
             <multipolygon>

diff --git a/test/e2e/data/tiles/wgs84/2/r0_c0.mapml b/test/e2e/data/tiles/wgs84/2/r0_c0.mapml
@@ -4,34 +4,8 @@
 
       <meta charset="utf-8" />
       <meta content="text/mapml" http-equiv="Content-Type" />
-<<<<<<< HEAD
-<<<<<<< HEAD
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <input name="zoomLevel" type="zoom" value="1" min="0" max="6" />
-         <input name="minLon" type="location" value="-180" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <input name="minLat" type="location" value="45" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <input name="maxLon" type="location" value="-135" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-   </head>
-   <body>
-      <extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="1" min="0" max="6" />
-         <map-input name="minLon" type="location" value="-180" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="45" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="-135" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.68" class="fclass _68">
          <geometry>
             <multipolygon>

diff --git a/test/e2e/data/tiles/wgs84/2/r0_c1.mapml b/test/e2e/data/tiles/wgs84/2/r0_c1.mapml
@@ -4,34 +4,8 @@
 
       <meta charset="utf-8" />
       <meta content="text/mapml" http-equiv="Content-Type" />
-<<<<<<< HEAD
-<<<<<<< HEAD
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <input name="zoomLevel" type="zoom" value="1" min="0" max="6" />
-         <input name="minLon" type="location" value="-135" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <input name="minLat" type="location" value="45" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <input name="maxLon" type="location" value="-90" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-   </head>
-   <body>
-      <extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="1" min="0" max="6" />
-         <map-input name="minLon" type="location" value="-135" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="45" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="-90" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.68" class="fclass _68">
          <geometry>
             <multipolygon>

diff --git a/test/e2e/data/tiles/wgs84/2/r0_c2.mapml b/test/e2e/data/tiles/wgs84/2/r0_c2.mapml
@@ -4,34 +4,8 @@
 
       <meta charset="utf-8" />
       <meta content="text/mapml" http-equiv="Content-Type" />
-<<<<<<< HEAD
-<<<<<<< HEAD
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <input name="zoomLevel" type="zoom" value="1" min="0" max="6" />
-         <input name="minLon" type="location" value="-90" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <input name="minLat" type="location" value="45" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <input name="maxLon" type="location" value="-45" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-   </head>
-   <body>
-      <extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="1" min="0" max="6" />
-         <map-input name="minLon" type="location" value="-90" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="45" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="-45" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.21" class="fclass _21">
          <geometry>
             <polygon>

diff --git a/test/e2e/data/tiles/wgs84/2/r0_c3.mapml b/test/e2e/data/tiles/wgs84/2/r0_c3.mapml
@@ -4,34 +4,8 @@
 
       <meta charset="utf-8" />
       <meta content="text/mapml" http-equiv="Content-Type" />
-<<<<<<< HEAD
-<<<<<<< HEAD
    </map-head>
    <map-body>
-      <map-extent units="WGS84">
-         <input name="zoomLevel" type="zoom" value="1" min="0" max="6" />
-         <input name="minLon" type="location" value="-45" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <input name="minLat" type="location" value="45" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <input name="maxLon" type="location" value="0" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-=======
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-   </head>
-   <body>
-      <extent units="WGS84">
-         <map-input name="zoomLevel" type="zoom" value="1" min="0" max="6" />
-         <map-input name="minLon" type="location" value="-45" units="gcrs" axis="longitude" position="top-left" min="-180" max="180" />
-         <map-input name="minLat" type="location" value="45" units="gcrs" axis="latitude" position="bottom-right" min="-90" max="90.0002058236639" />
-         <map-input name="maxLon" type="location" value="0" units="gcrs" axis="longitude" position="bottom-right" min="-180" max="180" />
-         <map-input name="maxLat" type="location" value="90" units="gcrs" axis="latitude" position="top-left" min="-90" max="90.0002058236639" />
-<<<<<<< HEAD
->>>>>>> refactored the tests
-=======
->>>>>>> 02d6db1e424f96d0e549ea751c36de3995b56d9a
-
-         <link rel="features" type="text/mapml" title="ne_10m_admin_0_countries (as MapML)" tref="./items.mapml?tilingScheme=WorldCRS84Quad&amp;zoomLevel={zoomLevel}&amp;clipbox={minLon},{minLat},{maxLon},{maxLat}" />
-      </map-extent>
       <feature id="fclass.21" class="fclass _21">
          <geometry>
             <polygon>