Update extent, layer, editors.

Add Contributors section, remove authors. Add `checked` to examples of local and remote content. Update extent content model to allow `map-meta` description of zoom and spatial bounds. Update resources, examples, checked attribute description Address @AliyanH comments: projection now read-write. Remote content prioritized over local content. map-meta can exist in extent elements. Fix typo in layer label attribute description. Co-authored-by: Hanyu Yao <[email protected]> Co-authored-by: Aliyan Haq <[email protected]>
Maps4HTML · Nov 7, 2023 · 7b24397 · 7b24397
1 parent 0d38126
commit 7b24397
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 47 deletions.
diff --git a/resources/tcrs.pptx b/resources/tcrs.pptx
diff --git a/schema/mapml-document.xml b/schema/mapml-document.xml
@@ -10,18 +10,18 @@
             title="Open Government Licence - Canada"/>
         <map-link rel="legend"
             href="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT_CBCT_GEOM_3978/MapServer/legend"
-        />
+            ></map-link>
     </map-head>
     <map-body>
-        <map-extent units="CBMTILE">
+        <map-extent units="CBMTILE" checked="checked">
             <map-input name="z" type="zoom" value="18" min="0" max="18"/>
             <map-input name="y" type="location" units="tilematrix" axis="row" min="51599"
                 max="61455"/>
             <map-input name="x" type="location" units="tilematrix" axis="column" min="46501"
                 max="56244"/>
             <map-link rel="tile"
                 tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT_CBCT_GEOM_3978/MapServer/tile/{z}/{y}/{x}?m4h=t"
-            />
+                ></map-link>
         </map-extent>
     </map-body>
 </mapml->
diff --git a/spec/examples/cbmt.mapml b/spec/examples/cbmt.mapml
@@ -0,0 +1,17 @@
+<mapml- xmlns="http://www.w3.org/1999/xhtml">
+  <map-head>
+    <map-title>Canada Base Map - Transportation</map-title>
+    <map-meta charset="utf-8" ></map-meta>
+    <map-meta content="text/mapml" http-equiv="Content-Type" ></map-meta>
+    <map-link xmlns="http://www.w3.org/1999/xhtml" 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"></map-link>
+  </map-head>
+  <map-body>
+    <map-extent units="CBMTILE" checked="">
+      <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>
+      <map-input name="x" type="location" units="tilematrix" axis="column" min="26484" max="32463"></map-input>
+      <map-link rel="tile" tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT3978/MapServer/tile/{z}/{y}/{x}?m4h=t"></map-link>
+    </map-extent>
+  </map-body>
+</mapml->
+
diff --git a/spec/examples/map-1.html b/spec/examples/map-1.html
@@ -47,11 +47,11 @@
       <map-caption>Paris, the City of Lights</map-caption>
       <layer- label="OpenStreetMap" checked>
         <link rel="license" title="© OpenStreetMap contributors CC BY-SA" href="https://www.openstreetmap.org/copyright"></link>
-        <map-extent units="OSMTILE" >
+        <map-extent units="OSMTILE" checked>
           <map-input name="z" type="zoom"  value="18" min="0" max="18"></map-input>
           <map-input name="x" type="location" units="tilematrix" axis="column" min="0"  max="262144" ></map-input>
           <map-input name="y" type="location" units="tilematrix" axis="row" min="0"  max="262144" ></map-input>
-          <map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png" />
+          <map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png" ></map-link>
         </map-extent>
       </layer->
     </mapml-viewer>

diff --git a/spec/examples/map-2.html b/spec/examples/map-2.html
@@ -44,7 +44,7 @@
   </head>
   <body>
     <mapml-viewer projection="CBMTILE" zoom="15" lat="45.4215" lon="-75.6972" controls controlslist="geolocation">
-      <layer- label="Canada Base Map - Transportation (CBMT)" src="https://geogratis.gc.ca/mapml/en/cbmtile/cbmt/" checked></layer->
+      <layer- label="Canada Base Map - Transportation (CBMT)" src="cbmt.mapml" checked></layer->
     </mapml-viewer>
   </body>
 </html>
diff --git a/spec/examples/mapml.png b/spec/examples/mapml.png
diff --git a/spec/index.html b/spec/index.html