Merge branch 'develop'

joergboe · joergboe · commit 6cd3725e5f18 · 2019-09-11T10:19:42.000+02:00
diff --git a/com.ibm.streamsx.inetserver/opt/resources/index.html b/com.ibm.streamsx.inetserver/opt/resources/index.html
@@ -2,16 +2,15 @@
 <head>
 </head>
 <body>
-<H1>Embedded Jetty: com.ibm.streamsx.inet Streams toolkit</H1>
+<H1>Embedded Jetty: com.ibm.streamsx.inetserver Streams toolkit</H1>
 <H2>Contexts provided by toolkit</H2>
 <UL>
 <LI><b><code>/</code></b> - Resources provided by application from <code>application_data_directory/html</code>
 <UL>
 <LI><a href="../">/index.html</a> - Home page for application</LI>
 </UL>
 </LI>
-<LI><b><code>/streamsx.inet.resources</code></b> - Resources provided by com.ibm.streamsx.inet toolkit from <code>com.ibm.streamsxa00le4dan
-.inet/opt/resources</code>
+<LI><b><code>/streamsx.inet.resources</code></b> - Resources provided by com.ibm.streamsx.inetserver toolkit from <code>com.ibm.streamsx.inetserver/opt/resources</code>
 <UL>
 <LI><a href="../streamsx.inet.resources">/streamsx.inet.resources</a> - This page</LI>
 </UL>
diff --git a/com.ibm.streamsx.inetserver/opt/resources/openlayers/simplemap.html b/com.ibm.streamsx.inetserver/opt/resources/openlayers/simplemap.html
@@ -23,7 +23,7 @@
 <body>
   <div id="test"></div>
   <div id="map-canvas"></div>
-  <script src="http://www.openlayers.org/api/OpenLayers.js"></script>
+  <script src="https://www.openlayers.org/api/OpenLayers.js"></script>
   <script>
       
     var qp = getQueryParameters();
@@ -47,7 +47,16 @@
                      new OpenLayers.Control.LayerSwitcher() ]
       };
       var map = new OpenLayers.Map('map-canvas', map_options);
-      map.addLayer(new OpenLayers.Layer.OSM());
+      // Avoid http cross-origin issues
+      // See https://github.com/eclipse/sumo/issues/3991#issue-314263257
+      map.addLayer(new OpenLayers.Layer.OSM(
+        "OpenStreetMap", 
+        // Official OSM tileset as forced HTTPS URLs
+        [
+            'https://a.tile.openstreetmap.org/${z}/${x}/${y}.png',
+            'https://b.tile.openstreetmap.org/${z}/${x}/${y}.png',
+            'https://c.tile.openstreetmap.org/${z}/${x}/${y}.png'
+        ], null));
 
       // create marker layer
       var markerLayers = {};
