Changeset 9423 in ntrip for branches/BNC_2.12/src

Timestamp:

May 6, 2021, 9:47:40 PM (3 years ago)

Author:

stuerze

Message:

some OSM updates to force https usage and a changed crossOriginKeyword

File:

• branches/BNC_2.12/src/map/map_osm.html (modified) (5 diffs)

branches/BNC_2.12/src/map/map_osm.html

@@ -12 +12 @@
     </style>
 
-    <script src="http://openlayers.org/api/OpenLayers.js" ></script>
+    <script src="https://openlayers.org/api/OpenLayers.js" ></script>
 
     <script>
@@ -18 +18 @@
       var markers;
       var marker;
-      var icon;  
+      var icon;
       var traceIcon;
       var fromProjection;
@@ -28 +28 @@
       function initialize(lat, lon, mapWinDotSize, mapWinDotColor) {
         dotSize = mapWinDotSize;
-        dotColor = mapWinDotColor;
+            dotColor = mapWinDotColor;
 
         if (dotSize > 10) dotSize = 10;
@@ -38 +38 @@
         fromProjection = new OpenLayers.Projection("EPSG:4326");   // WGS 1984
         toProjection   = new OpenLayers.Projection("EPSG:900913"); // Spherical Mercator
-        zoom           = 0; 
+        zoom           = 0;
 
-        map.addLayer(new OpenLayers.Layer.OSM());
+        map.addLayer(new OpenLayers.Layer.OSM("OpenStreetMap",
+                    // Official OSM tileset as forced HTTPS URLs
+                    [   'https://a.tile.openstreetmap.de/${z}/${x}/${y}.png',
+                        'https://b.tile.openstreetmap.de/${z}/${x}/${y}.png',
+                        'https://c.tile.openstreetmap.de/${z}/${x}/${y}.png'
+                    ],{tileOptions : {crossOriginKeyword: null}}));
         var position = new OpenLayers.LonLat(lon, lat).transform(fromProjection, toProjection);
 
@@ -48 +53 @@
 
         var sizeT   = new OpenLayers.Size(dotSize,dotSize);
-        var offsetT = new OpenLayers.Pixel(-sizeT.w/2, -13);
-        if (dotColor == 1) {
+            var offsetT = new OpenLayers.Pixel(-sizeT.w/2, -13);
+        if (dotColor == 1) {
           traceIcon   = new OpenLayers.Icon("qrc:///map/reddot.png", sizeT, offsetT);
-        }
-        if (dotColor == 2) {
+        }
+            if (dotColor == 2) {
           traceIcon   = new OpenLayers.Icon("qrc:///map/yellowdot.png", sizeT, offsetT);
-        }
+        }
 
         markers = new OpenLayers.Layer.Markers("Markers");