[UPD] add image proxy

Viglino · Dec 14, 2023 · 00aaead · 00aaead
1 parent ac577c4
commit 00aaead
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 84 deletions.
diff --git a/examples/control/map.control.overlay.menu.html b/examples/control/map.control.overlay.menu.html
@@ -11,13 +11,6 @@
   <meta name="description" content="styled popup for OL3" />
   <meta name="keywords" content="ol3, manu, control, overlay, jQuery" />
 
-  <!-- Prevent image error on load with https -->
-  <script>
-    if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-    }
-  </script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
   <!-- FontAwesome -->
@@ -182,7 +175,7 @@ <h1>Menu</h1>
   // On selected => show/hide popup
   select.getFeatures().on('add', function(e){
     var feature = e.element;
-    var img = $("<img>").attr("src", feature.get("img"));
+    var img = $("<img>").attr("src", '//wsrv.nl/?url=' + feature.get("img"));
     var info = $("<div>").append( $("<p>").text(feature.get("text")));
     var content = $("<div>")
         .append( img )

diff --git a/examples/layer/map.wmscapabilities.html b/examples/layer/map.wmscapabilities.html
@@ -80,11 +80,6 @@ <h1>ol-ext: WMS Capabilities control</h1>
   </div>
 
 <script type="text/javascript">
-  // http services load on http
-  if (location.protocol === 'https:' && !/^localhost/.test(location.host)) {
-    location.href = window.location.href.replace(/^https:/,'http:');
-  }
-
   // Define proj4 2154
   proj4.defs("EPSG:2154","+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs");
   if (ol.proj.proj4 && ol.proj.proj4.register) ol.proj.proj4.register(proj4);

diff --git a/examples/popup/map.control.overlay.html b/examples/popup/map.control.overlay.html
@@ -11,13 +11,6 @@
   <meta name="description" content="styled popup for OL3" />
   <meta name="keywords" content="ol3, menu, control, overlay, jQuery" />
 
-  <!-- Prevent image error on load with https -->
-	<script>
-		if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-		}
-	</script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 
@@ -154,7 +147,7 @@ <h2>Options:</h2>
   // On selected => show/hide popup
   select.getFeatures().on('add', function(e) {	
     var feature = e.element;
-    popup.showImage(feature.get("img").replace("_v.jpg","_p.jpg"), {
+    popup.showImage('//wsrv.nl/?url=' + feature.get("img").replace("_v.jpg","_p.jpg"), {
       coordinate: (/frompoint/.test($("#anim").val()) ? feature.getGeometry().getCoordinates() : null),
       title: feature.get("text") +'<br/>'
         +feature.get("commune")+" ("+feature.get("region")+" - "+feature.get("date").replace(".","/")+")<br/>"

diff --git a/examples/popup/map.fixedpopup.html b/examples/popup/map.fixedpopup.html
@@ -12,13 +12,6 @@
   <meta name="description" content="Display fixed popup on the map" />
   <meta name="keywords" content="openlayers, ol, popup, overlay, fix" />
 
-  <!-- Prevent image error on load with https -->
-	<script>
-		if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-		}
-	</script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 
@@ -205,7 +198,7 @@ <h2>Options:</h2>
   select.getFeatures().on(['add'], function(e) {
     var feature = e.element;
     var content = "";
-    content += "<img src='"+feature.get("img")+"'/>";
+    content += "<img src='" + '//wsrv.nl/?url=' + feature.get("img") + "'/>";
     content += feature.get("text");
     content += '<br/><i>powered by <a href="https://github.com/Viglino/ol-ext" target="ol">ol-ext</a></i>';
     if (select.getFeatures().getLength()>1) {

diff --git a/examples/popup/map.popup.anim.html b/examples/popup/map.popup.anim.html
@@ -11,13 +11,6 @@
   <meta name="description" content="animated popup for OL3" />
   <meta name="keywords" content="ol3, popup, overlay, jQuery, animation" />
 
-  <!-- Prevent image error on load with https -->
-	<script>
-		if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-		}
-	</script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 
@@ -156,7 +149,7 @@ <h2>Options:</h2>
   select.getFeatures().on(['add'], function(e) {
     var feature = e.element;
     var content = "";
-    content += "<img src='"+feature.get("img")+"'/>";
+    content += "<img src='" + '//wsrv.nl/?url=' + feature.get("img") + "'/>";
     content += feature.get("text");
     popup.show(feature.getGeometry().getCoordinates(), content); 
   })

diff --git a/examples/popup/map.popup.bar.html b/examples/popup/map.popup.bar.html
@@ -11,13 +11,6 @@
   <meta name="description" content="Styled popup for Openlayers" />
   <meta name="keywords" content="ol, openlayers, popup, overlay, style" />
 
-  <!-- Prevent image error on load with https -->
-	<script>
-		if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-		}
-	</script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 
@@ -215,7 +208,7 @@ <h2>Options:</h2>
   select.getFeatures().on(['add'], function(e) {
     var feature = e.element;
     var content = "";
-    content += "<img src='"+feature.get("img")+"'/>";
+    content += "<img src='" + '//wsrv.nl/?url=' + feature.get("img") + "'/>";
     content += '<a href="https://www.culture.gouv.fr/" target="new">&copy; Ministère de la Culture</a><br/>';
     content += feature.get("text");
     popup.show(feature.getGeometry().getFirstCoordinate(), content); 

diff --git a/examples/popup/map.popup.html b/examples/popup/map.popup.html
@@ -11,13 +11,6 @@
   <meta name="description" content="Styled popup for Openlayers" />
   <meta name="keywords" content="ol, openlayers, popup, overlay, style" />
 
-  <!-- Prevent image error on load with https -->
-	<script>
-		if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-		}
-	</script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 
@@ -222,7 +215,7 @@ <h2>Options:</h2>
   select.getFeatures().on(['add'], function(e) {
     var feature = e.element;
     var content = "";
-    content += "<img src='"+feature.get("img")+"'/>";
+    content += "<img src='" + '//wsrv.nl/?url=' + feature.get("img") + "'/>";
     content += feature.get("text");
     popup.show(feature.getGeometry().getFirstCoordinate(), content); 
   });

diff --git a/examples/storymap/map.control.imageline.html b/examples/storymap/map.control.imageline.html
@@ -11,13 +11,6 @@
   <meta name="description" content="A control to show image on a map." />
   <meta name="keywords" content="ol, image, control, line" />
 
-  <!-- Prevent image error on load with https -->
-	<script>
-		if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-		}
-	</script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 
@@ -147,7 +140,7 @@ <h1>ol-ext: Image line control</h1>
       if (!style) {
         style = cache[id] = new ol.style.Style({
           image: new ol.style.Photo({
-            src: f.get('img'),
+            src: '//wsrv.nl/?url=' + f.get('img'),
             radius: select ? 20:15,
             shadow: true,
             stroke: new ol.style.Stroke({

diff --git a/examples/storymap/map.control.timeinterval.html b/examples/storymap/map.control.timeinterval.html
@@ -11,13 +11,6 @@
   <meta name="description" content="A control to add timeline on a map." />
   <meta name="keywords" content="ol, timeline, control, date" />
 
-  <!-- Prevent image error on load with https -->
-	<script>
-		if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-		}
-	</script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 
@@ -123,7 +116,7 @@ <h1>ol-ext: Timeline control</h1>
       var style = cache[f.get('img')+'-'+select];
       if (!style) {
         var img = new ol.style.Photo({
-          src: f.get('img'),
+          src: '//wsrv.nl/?url=' + f.get('img'),
           radius: select ? 20:15,
           shadow: true,
           stroke: new ol.style.Stroke({

diff --git a/examples/storymap/map.control.timeline.html b/examples/storymap/map.control.timeline.html
@@ -11,13 +11,6 @@
   <meta name="description" content="A control to add timeline on a map." />
   <meta name="keywords" content="ol, timeline, control, date" />
 
-  <!-- Prevent image error on load with https -->
-	<script>
-		if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-		}
-	</script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
 
@@ -114,7 +107,7 @@ <h2>Options:</h2>
       var style = cache[f.get('img')+'-'+select];
       if (!style) {
         var img = new ol.style.Photo({
-          src: f.get('img'),
+          src: '//wsrv.nl/?url=' + f.get('img'),
           radius: select ? 20:15,
           shadow: true,
           stroke: new ol.style.Stroke({

diff --git a/examples/storymap/map.control.timemap.html b/examples/storymap/map.control.timemap.html
@@ -11,13 +11,6 @@
   <meta name="description" content="A control to add timeline on a map." />
   <meta name="keywords" content="ol, timeline, control, date" />
 
-  <!-- Prevent image error on load with https -->
-	<script>
-		if (location.protocol == 'https:' && !/^localhost/.test(location.host)) {
-      location.href = window.location.href.replace(/^https:/,'http:');
-		}
-	</script>
-
   <!-- jQuery -->
   <script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>