Prepare for geoogratis-is-down demo (Maps4HTML#89)

prushforth · Dec 17, 2021 · 9ee8a35 · 9ee8a35
1 parent 92d1d94
commit 9ee8a35
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 17 deletions.
diff --git a/api/custom-map-ui/geolocation-search-ui.html b/api/custom-map-ui/geolocation-search-ui.html
@@ -121,7 +121,7 @@
     </div>
 
     <mapml-viewer projection="OSMTILE" zoom="4" lat="58.276703" lon="-103.710938" controls controlslist="nofullscreen" id="map">
-        <layer- label="OpenStreetMap" src="https://geogratis.gc.ca/mapml/en/osmtile/osm/" checked></layer->
+        <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></layer->
     </mapml-viewer>
 
     <script>
@@ -367,4 +367,4 @@
 
     </script>
 </body>
-</html>
+</html>
diff --git a/api/custom-map-ui/geoname-search-ui.html b/api/custom-map-ui/geoname-search-ui.html
@@ -122,7 +122,7 @@
     </div>
 
     <mapml-viewer projection="OSMTILE" zoom="4" lat="58.276703" lon="-103.710938" controls controlslist="nofullscreen" id="map">
-        <layer- label="OpenStreetMap" src="https://geogratis.gc.ca/mapml/en/osmtile/osm/" checked></layer->
+        <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></layer->
     </mapml-viewer>
 
     <script>

diff --git a/api/custom-map-ui/index.html b/api/custom-map-ui/index.html
@@ -22,8 +22,8 @@
       <div class="navbar-nav">
         <a class="nav-link active" href="#">Info <span class="sr-only">(current)</span></a>
         <a class="nav-link" href="bootstrap-ui.html">Using Bootstrap</a>
-        <a class="nav-link" href="geoname-search-ui.html">Gazetteer (GeoName Search API)</a>
-        <a class="nav-link" href="geolocation-search-ui.html">Geocode (Geolocation Service)</a>
+        <a class="nav-link" href="geoname-search-ui.html">Gazetteer (GeoNames Search API)</a>
+        <a class="nav-link" href="geolocation-search-ui.html">Location / Address Search(GeoLocation API)</a>
         <a class="nav-link" href="#">Using Custom CSS</a>
       </div>
     </div>

diff --git a/linking/features/sportsplex.mapml b/linking/features/sportsplex.mapml
@@ -5,6 +5,7 @@
     <map-meta name="projection" content="CBMTILE"></map-meta>
     <map-meta name="cs" content="pcrs"></map-meta>
     <map-meta content="text/mapml" http-equiv="Content-Type"></map-meta>
+    <map-meta name="extent" content="top-left-easting=1510002.52, top-left-northing=-181063.40, bottom-right-easting=1510280.00, bottom-right-northing=-181199.83"></map-meta>
     <map-link href="https://www.arcgis.com/home/item.html?id=4be6c94b65ee408999d2d4483a30febf" rel="license" title="© Salt Lake County Assessor"/>
   </map-head>
   <map-body>

diff --git a/screenreader/closest-restaurants/index.html b/screenreader/closest-restaurants/index.html
@@ -170,7 +170,7 @@
     </div>
 
     <mapml-viewer projection="OSMTILE" zoom="4" lat="58.276703" lon="-103.710938" controls controlslist="nofullscreen" id="map">
-        <layer- label="OpenStreetMap" src="https://geogratis.gc.ca/mapml/en/osmtile/osm/" checked></layer->
+        <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></layer->
     </mapml-viewer>
 
     <script>

diff --git a/screenreader/restaurants/index.html b/screenreader/restaurants/index.html
@@ -8,8 +8,10 @@
     <link rel="stylesheet" href="../../global.css">
   </head>
   <body>
-    <mapml-viewer projection="CBMTILE" zoom="17" lat="45.4069740362364" lon="-75.70155300710053" >
-      <layer- label="CBMT" src="/experiments/refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></layer->
+<!--    <mapml-viewer projection="CBMTILE" zoom="17" lat="45.4069740362364" lon="-75.70155300710053" >
+      <layer- label="CBMT" src="/experiments/refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></layer->-->
+    <mapml-viewer projection="OSMTILE" zoom="15" lat="45.409071" lon="-75.703411" controls>
+      <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked hidden></layer->
       <layer- label="Ottawa Restaurants" src="restaurants.mapml" checked></layer->
     </mapml-viewer>
   </body>

diff --git a/screenreader/restaurants/restaurants.mapml b/screenreader/restaurants/restaurants.mapml
@@ -4,10 +4,11 @@
         <map-meta charset="utf-8" ></map-meta>
         <map-meta content="text/mapml" http-equiv="Content-Type" ></map-meta>
         <map-link rel="license" href="http://opendatacommons.org/licenses/odbl/1-0/" title="© OpenStreetMap and contributors" />
-        <map-meta name="projection" content="CBMTILE"></map-meta>
+        <map-meta name="projection" content="OSMTILE"></map-meta>
         <map-meta name="zoom" content="min=0,max=22,value=3" ></map-meta>
         <map-meta name="cs" content="gcrs" ></map-meta>
-        <map-meta name="extent" content="top-left-easting=1509080.1964270622,top-left-northing=-169400.558801122,bottom-right-easting=1512094.3357886747,bottom-right-northing=-172702.5654051304" ></map-meta>
+<!--   cbmtile extent     <map-meta name="extent" content="top-left-easting=1509080.1964270622,top-left-northing=-169400.558801122,bottom-right-easting=1512094.3357886747,bottom-right-northing=-172702.5654051304" ></map-meta>-->
+        <map-meta name="extent" content="top-left-easting=-8433134.90,top-left-northing=5689045.64,bottom-right-easting=-8421315.83,bottom-right-northing=5683319.12" ></map-meta>
     </map-head>
     <map-body>
         <map-feature id="restaurant_map-point.77" class="restaurant_map-point">

diff --git a/styling/dark-mode.html b/styling/dark-mode.html
@@ -6,7 +6,7 @@
     <meta name="color-scheme" content="dark light">
     <title>Dark mode</title>
     <script type="module" src="../dist/mapml-viewer.js"></script>
-    <script type="module" src="../dist/web-map.js"></script>
+<!--    <script type="module" src="../dist/web-map.js"></script>-->
     <style>
       body {
         font-family: 'system-ui', sans-serif;
@@ -45,8 +45,8 @@
       <mark>Set the preference for dark mode in your browser/OS settings or dev tools!</mark>
     </p>
 
-    <mapml-viewer projection="CBMTILE" zoom="1" lat="50" lon="-100" controls>
-      <layer- label="CBMT" src="https://geogratis.gc.ca/mapml/en/cbmtile/cbmt/" checked></layer->
+    <mapml-viewer projection="OSMTILE" zoom="1" lat="50" lon="-100" controls>
+      <layer- label="CBMT" src="../refactoring-temporary/osm.mapml" checked></layer->
     </mapml-viewer>
 
     <p><b>References</b></p>

diff --git a/vector-tiles/mapml/mapml-viewer/index.html b/vector-tiles/mapml/mapml-viewer/index.html
@@ -21,7 +21,7 @@
     <body>
       <mapml-viewer projection="WGS84" zoom="0" lat="0" lon="0" controls>
         <layer- label="Countries - WorldCRS84Quad" checked>
-          <map-link rel="stylesheet" href="../vector-tile.css" >
+          <map-link rel="stylesheet" href="../vector-tile.css" ></map-link>
         <map-extent units="WGS84">
             <map-input name="zoomLevel" type="zoom" min="0" max="6" value="0"></map-input>
             <map-input name="row" type="location" axis="row" units="tilematrix" min="0" max="5"></map-input>
@@ -34,7 +34,7 @@
       <mapml-viewer projection="OSMTILE" zoom="0" lat="0" lon="0" controls>
         <layer- label="OpenStreetMap" src="/experiments/refactoring-temporary/osm.mapml" checked></layer->
         <layer- label="Countries - WebMercatorQuad" checked>
-          <map-link rel="stylesheet" href="../vector-tile.css" >
+          <map-link rel="stylesheet" href="../vector-tile.css" ></map-link>
           <map-extent units="OSMTILE">
             <map-input  name="zoomLevel" type="zoom" min="0" max="7" value="0"></map-input>
             <map-input  name="row" type="location" axis="row" units="tilematrix" min="0" max="1"></map-input>

diff --git a/vector-tiles/mapml/web-map/index.html b/vector-tiles/mapml/web-map/index.html
@@ -21,7 +21,7 @@
     <body>
       <map is="web-map" projection="WGS84" zoom="0" lat="0" lon="0" controls>
         <layer- label="Countries - WorldCRS84Quad" checked>
-          <map-link rel="stylesheet" href="../vector-tile.css" >
+          <map-link rel="stylesheet" href="../vector-tile.css" ></map-link>
           <map-extent units="WGS84">
             <map-input name="zoomLevel" type="zoom" min="0" max="2" value="0"></map-input>
             <map-input name="row" type="location" axis="row" units="tilematrix" min="0" max="5"></map-input>
@@ -39,7 +39,7 @@
       <map is="web-map" projection="OSMTILE" zoom="0" lat="0" lon="0" controls>
         <layer- label="OpenStreetMap" src="/experiments/refactoring-temporary/osm.mapml" checked></layer->
         <layer- label="Countries - WebMercatorQuad" checked>
-          <map-link rel="stylesheet" href="../vector-tile.css" >
+          <map-link rel="stylesheet" href="../vector-tile.css" ></map-link>
           <map-extent units="OSMTILE">
             <map-input  name="zoomLevel" type="zoom" min="0" max="2" value="0"></map-input>
             <map-input  name="row" type="location" axis="row" units="tilematrix" min="0" max="1"></map-input>