Skip to content

Commit 7b24397

Browse files
prushforthyhy0217AliyanH
committed
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 <97408822+yhy0217@users.noreply.github.com> Co-authored-by: Aliyan Haq <aliyan.haq@nrcan-rncan.gc.ca>
1 parent 0d38126 commit 7b24397

7 files changed

Lines changed: 66 additions & 47 deletions

File tree

‎resources/tcrs.pptx‎

23 Bytes
Binary file not shown.

‎schema/mapml-document.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
title="Open Government Licence - Canada"/>
1111
<map-link rel="legend"
1212
href="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT_CBCT_GEOM_3978/MapServer/legend"
13-
/>
13+
></map-link>
1414
</map-head>
1515
<map-body>
16-
<map-extent units="CBMTILE">
16+
<map-extent units="CBMTILE" checked="checked">
1717
<map-input name="z" type="zoom" value="18" min="0" max="18"/>
1818
<map-input name="y" type="location" units="tilematrix" axis="row" min="51599"
1919
max="61455"/>
2020
<map-input name="x" type="location" units="tilematrix" axis="column" min="46501"
2121
max="56244"/>
2222
<map-link rel="tile"
2323
tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT_CBCT_GEOM_3978/MapServer/tile/{z}/{y}/{x}?m4h=t"
24-
/>
24+
></map-link>
2525
</map-extent>
2626
</map-body>
2727
</mapml->

‎spec/examples/cbmt.mapml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<mapml- xmlns="http://www.w3.org/1999/xhtml">
2+
<map-head>
3+
<map-title>Canada Base Map - Transportation</map-title>
4+
<map-meta charset="utf-8" ></map-meta>
5+
<map-meta content="text/mapml" http-equiv="Content-Type" ></map-meta>
6+
<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>
7+
</map-head>
8+
<map-body>
9+
<map-extent units="CBMTILE" checked="">
10+
<map-input name="z" type="zoom" value="17" min="0" max="17"></map-input>
11+
<map-input name="y" type="location" units="tilematrix" axis="row" min="29750" max="34475"></map-input>
12+
<map-input name="x" type="location" units="tilematrix" axis="column" min="26484" max="32463"></map-input>
13+
<map-link rel="tile" tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT3978/MapServer/tile/{z}/{y}/{x}?m4h=t"></map-link>
14+
</map-extent>
15+
</map-body>
16+
</mapml->
17+

‎spec/examples/map-1.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
<map-caption>Paris, the City of Lights</map-caption>
4848
<layer- label="OpenStreetMap" checked>
4949
<link rel="license" title="© OpenStreetMap contributors CC BY-SA" href="https://www.openstreetmap.org/copyright"></link>
50-
<map-extent units="OSMTILE" >
50+
<map-extent units="OSMTILE" checked>
5151
<map-input name="z" type="zoom" value="18" min="0" max="18"></map-input>
5252
<map-input name="x" type="location" units="tilematrix" axis="column" min="0" max="262144" ></map-input>
5353
<map-input name="y" type="location" units="tilematrix" axis="row" min="0" max="262144" ></map-input>
54-
<map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png" />
54+
<map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png" ></map-link>
5555
</map-extent>
5656
</layer->
5757
</mapml-viewer>

‎spec/examples/map-2.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</head>
4545
<body>
4646
<mapml-viewer projection="CBMTILE" zoom="15" lat="45.4215" lon="-75.6972" controls controlslist="geolocation">
47-
<layer- label="Canada Base Map - Transportation (CBMT)" src="https://geogratis.gc.ca/mapml/en/cbmtile/cbmt/" checked></layer->
47+
<layer- label="Canada Base Map - Transportation (CBMT)" src="cbmt.mapml" checked></layer->
4848
</mapml-viewer>
4949
</body>
5050
</html>

‎spec/examples/mapml.png‎

19.4 KB
Loading

‎spec/index.html‎

Lines changed: 43 additions & 41 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)