Update the tile-cache-OSMTILE.mapml test file to work with actual OpenStreetMap. Note that there is still the matter of making the {s} variable work without hardcoding. This is likely only possible if we invent another input type=random-value or something like that, which I'm not keen to do, except that maybe because OSM is a globally important mapping organization we should make such a concession. It seems a hack though, and likely is no longer necessary with HTTP 2 etc.

prushforth · prushforth · commit abec92ffc062 · 2017-12-21T10:23:02.000-05:00
diff --git a/demo/index.html b/demo/index.html
@@ -36,7 +36,7 @@
       <!-- the @width / @height attributes take precedence over properties, but currently don't change to reflect updates -->
 <!--      <img usemap="#dowslake" src="map1.png" width="700" height="400" alt="Dow's Lake area" />-->
       <map name="dowslake" is="web-map" zoom="17" lat="45.398043" lon="-75.70683" width="700" height="400" controls hidden>
-        <layer- id="osm" src="http://geogratis.gc.ca/mapml/en/osmtile/osm/" label="Open Street Map" checked ></layer->
+        <layer- id="osm" src="tile-cache-OSMTILE.mapml" label="Open Street Map" checked ></layer->
         <device-location centered></device-location>
 <!--        <layer- id="cbmt" label="Canada Base Map" src="http://geogratis.gc.ca/mapml/en/osmtile/cbmt/" checked></layer->-->
 <!--        <layer- id="canvec" label="CanVec+ 031G" src="http://geogratis.gc.ca/mapml/canvec/50k/features/" class="transparency"></layer->
diff --git a/demo/tile-cache-OSMTILE.mapml b/demo/tile-cache-OSMTILE.mapml
@@ -4,21 +4,20 @@
     <meta http-equiv="Content-Type" content="text/mapml"/>
     <meta charset="utf-8"/>
     <meta name="projection" content="OSMTILE"/>
-    <meta name="zoom" content="min=0,max=15"/>
-    <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="license" href="https://www.openstreetmap.org/copyright" title="© Open Street Map Contributors"/>
   </head>
   <body>
     <extent units="OSMTILE">
-      <input name="z" type="zoom" value="0" min="0" max="15"/>
-      <input name="x" type="location" units="tile" axis="column"/>
-      <input name="y" type="location" units="tile" axis="row"/>
+      <input name="z" type="zoom" value="0" min="0" max="18"/>
+      <input name="x" type="location" units="tilematrix" axis="column"/>
+      <input name="y" type="location" units="tilematrix" axis="row"/>
       <input name="xmin" type="xmin" min="0.0" max="256.0"/>
       <input name="ymin" type="ymin" min="0.0" max="256.0"/>
       <input name="xmax" type="xmax" min="0.0" max="256.0"/>
       <input name="ymax" type="ymax" min="0.0" max="256.0"/>
       <input name="projection" type="projection" value="OSMTILE"/>
-      <template type="tile" tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT_CBCT_GEOM_3857/MapServer/tile/{z}/{y}/{x}?m4h=t"/>
-      <template type="tile" tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT_TXT_3857/MapServer/tile/{z}/{y}/{x}?m4h=t"/>
+      <input name="s" type="hidden"/>
+      <template type="tile" tref="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"/>
     </extent>
   </body>
 </mapml>
