upgrade OpenLayers to newer version to fix Safari display issues

macchina-io · Aug 10, 2021 · bf982cd · bf982cd
1 parent b6bae0f
commit bf982cd
Show file tree

Hide file tree

Showing 73 changed files with 70 additions and 2,085 deletions.
diff --git a/webui/GNSSTracking/GNSSTracking.bndlspec b/webui/GNSSTracking/GNSSTracking.bndlspec
@@ -3,7 +3,7 @@
   <manifest>
     <name>macchina.io GNSS Tracking</name>
     <symbolicName>io.macchina.webui.gnsstracking</symbolicName>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <vendor>Applied Informatics</vendor>
     <copyright>(c) 2015-2021, Applied Informatics Software Engineering GmbH</copyright>
     <lazyStart>false</lazyStart>

diff --git a/webui/GNSSTracking/bundle/webapp/index.html b/webui/GNSSTracking/bundle/webapp/index.html
@@ -7,12 +7,13 @@
     <link rel="stylesheet" href="/css/macchina.css" type="text/css"/>
     <link rel="stylesheet" href="/css/font-awesome.min.css" type="text/css"/>
     <link rel="stylesheet" href="/macchina/gnss/css/styles.css" type="text/css"/>
+    <link rel="stylesheet" href="/openlayers/css/ol.css">
     <link rel="icon" href="/images/favicon.ico">
     <script type="text/javascript" src="/jquery/jquery.min.js"></script>
     <script type="text/javascript" src="/angular/angular.min.js"></script>
     <script type="text/javascript" src="/macchina/gnss/js/app.js"></script>
     <script type="text/javascript" src="/macchina/gnss/js/controllers.js"></script>
-    <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+    <script type="text/javascript" src="/openlayers/js/ol.js"></script>
   </head>
   <body ng-controller="SessionCtrl">
     <header>

diff --git a/webui/GNSSTracking/bundle/webapp/js/controllers.js b/webui/GNSSTracking/bundle/webapp/js/controllers.js
@@ -8,7 +8,7 @@ trackingControllers.controller('TrackingCtrl', ['$scope', '$http', '$interval',
     	available: false,
     	valid: false
     };
-    
+
     $scope.map = null;
 
 	$scope.resizeMap = function() {
@@ -20,42 +20,65 @@ trackingControllers.controller('TrackingCtrl', ['$scope', '$http', '$interval',
         $scope.map.updateSize();
       }
 	}
-	
+
 	$scope.resizeMap();
 
-    $scope.map = new OpenLayers.Map('mapview');
-    $scope.baseLayer = new OpenLayers.Layer.OSM();
-    $scope.map.addLayer($scope.baseLayer);
-    $scope.markers = new OpenLayers.Layer.Markers("Markers");
-    $scope.map.addLayer($scope.markers);
-    $scope.marker = null;
-    var initialPosition = new OpenLayers.LonLat(0, 0);
-    $scope.map.setCenter(initialPosition, 1);
+	$scope.map = new ol.Map({
+      target: 'mapview',
+      layers: [
+        new ol.layer.Tile({
+          source: new ol.source.OSM()
+        })
+      ],
+      view: new ol.View({
+        center: ol.proj.fromLonLat([0.0, 0.0]),
+        zoom: 1
+      })
+    });
+
+    $scope.markers = null;
+
+    $scope.setPosition = function(position) {
+      var zoomIn = false;
+      if ($scope.markers)
+      {
+        $scope.map.removeLayer($scope.markers);
+        $scope.markers = null;
+      }
+      else
+      {
+        zoomIn = true;
+      }
+      const projPos = ol.proj.fromLonLat([position.longitude, position.latitude]);
+      $scope.markers = new ol.layer.Vector({
+        source: new ol.source.Vector({
+          features: [
+            new ol.Feature({
+              geometry: new ol.geom.Point(projPos)
+            })
+          ]
+        }),
+        style: new ol.style.Style({
+          image: new ol.style.Icon({
+            anchor: [0.5, 1],
+            anchorXUnits: 'fraction',
+            anchorYUnits: 'fraction',
+            src: '/openlayers/img/marker.png'
+          })
+        })
+      })
+      $scope.map.addLayer($scope.markers);
+      $scope.map.getView().setCenter(projPos);
+      if (zoomIn)
+      {
+		$scope.map.getView().setZoom(10);
+	  }
+    };
 
     $(window).resize(function() {
       $scope.resizeMap();
     });
 
-    $scope.setPosition = function(position) {
-        var olPosition = new OpenLayers.LonLat(position.longitude, position.latitude);
-        var wgs84Proj = new OpenLayers.Projection("EPSG:4326"); // WGS 1984
-        var mercatorProj = new OpenLayers.Projection("EPSG:900913"); // Spherical Mercator Projection
-        olPosition = olPosition.transform(wgs84Proj, mercatorProj);
-        var zoomIn = false;
-        if (!$scope.marker) zoomIn = true; // zoom in first time marker is set
-        if ($scope.marker)
-        {
-        	$scope.markers.removeMarker($scope.marker);
-        	$scope.marker = null;
-        }
-        if (zoomIn)
-			$scope.map.setCenter(olPosition, 10);
-		else
-			$scope.map.setCenter(olPosition);
-		$scope.marker = new OpenLayers.Marker(olPosition);
-		$scope.markers.addMarker($scope.marker);	
-    };
-
     $http.get('/macchina/gnss/tracking.jss').success(function(data) {
       $scope.trackingData = data;
       if (data.valid)

diff --git a/webui/OpenLayers/OpenLayers.bndlspec b/webui/OpenLayers/OpenLayers.bndlspec
@@ -3,7 +3,7 @@
   <manifest>
     <name>OpenLayers for macchina.io</name>
     <symbolicName>io.macchina.webui.openlayers</symbolicName>
-    <version>2.13.1</version>
+    <version>6.4.3</version>
     <vendor>Applied Informatics</vendor>
     <copyright>(c) 2015-2021, Applied Informatics Software Engineering GmbH</copyright>
     <lazyStart>false</lazyStart>

diff --git a/webui/OpenLayers/bundle/openlayers/OpenLayers.js b/webui/OpenLayers/bundle/openlayers/OpenLayers.js
diff --git a/webui/OpenLayers/bundle/openlayers/css/ol.css b/webui/OpenLayers/bundle/openlayers/css/ol.css
diff --git a/webui/OpenLayers/bundle/openlayers/css/ol.css.map b/webui/OpenLayers/bundle/openlayers/css/ol.css.map
diff --git a/webui/OpenLayers/bundle/openlayers/img/blank.gif b/webui/OpenLayers/bundle/openlayers/img/blank.gif
diff --git a/webui/OpenLayers/bundle/openlayers/img/cloud-popup-relative.png b/webui/OpenLayers/bundle/openlayers/img/cloud-popup-relative.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/drag-rectangle-off.png b/webui/OpenLayers/bundle/openlayers/img/drag-rectangle-off.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/drag-rectangle-on.png b/webui/OpenLayers/bundle/openlayers/img/drag-rectangle-on.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/east-mini.png b/webui/OpenLayers/bundle/openlayers/img/east-mini.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/layer-switcher-maximize.png b/webui/OpenLayers/bundle/openlayers/img/layer-switcher-maximize.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/layer-switcher-minimize.png b/webui/OpenLayers/bundle/openlayers/img/layer-switcher-minimize.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/marker-blue.png b/webui/OpenLayers/bundle/openlayers/img/marker-blue.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/marker-gold.png b/webui/OpenLayers/bundle/openlayers/img/marker-gold.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/marker-green.png b/webui/OpenLayers/bundle/openlayers/img/marker-green.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/measuring-stick-off.png b/webui/OpenLayers/bundle/openlayers/img/measuring-stick-off.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/measuring-stick-on.png b/webui/OpenLayers/bundle/openlayers/img/measuring-stick-on.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/north-mini.png b/webui/OpenLayers/bundle/openlayers/img/north-mini.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/panning-hand-off.png b/webui/OpenLayers/bundle/openlayers/img/panning-hand-off.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/panning-hand-on.png b/webui/OpenLayers/bundle/openlayers/img/panning-hand-on.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/slider.png b/webui/OpenLayers/bundle/openlayers/img/slider.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/south-mini.png b/webui/OpenLayers/bundle/openlayers/img/south-mini.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/west-mini.png b/webui/OpenLayers/bundle/openlayers/img/west-mini.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/zoom-minus-mini.png b/webui/OpenLayers/bundle/openlayers/img/zoom-minus-mini.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/zoom-plus-mini.png b/webui/OpenLayers/bundle/openlayers/img/zoom-plus-mini.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/zoom-world-mini.png b/webui/OpenLayers/bundle/openlayers/img/zoom-world-mini.png
diff --git a/webui/OpenLayers/bundle/openlayers/img/zoombar.png b/webui/OpenLayers/bundle/openlayers/img/zoombar.png
diff --git a/webui/OpenLayers/bundle/openlayers/js/ol.js b/webui/OpenLayers/bundle/openlayers/js/ol.js
diff --git a/webui/OpenLayers/bundle/openlayers/js/ol.js.map b/webui/OpenLayers/bundle/openlayers/js/ol.js.map
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/google.css b/webui/OpenLayers/bundle/openlayers/theme/default/google.css
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/google.tidy.css b/webui/OpenLayers/bundle/openlayers/theme/default/google.tidy.css
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/ie6-style.css b/webui/OpenLayers/bundle/openlayers/theme/default/ie6-style.css
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/ie6-style.tidy.css b/webui/OpenLayers/bundle/openlayers/theme/default/ie6-style.tidy.css
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/add_point_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/add_point_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/add_point_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/add_point_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/blank.gif b/webui/OpenLayers/bundle/openlayers/theme/default/img/blank.gif
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/close.gif b/webui/OpenLayers/bundle/openlayers/theme/default/img/close.gif
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/drag-rectangle-off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/drag-rectangle-off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/drag-rectangle-on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/drag-rectangle-on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_line_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_line_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_line_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_line_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_point_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_point_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_point_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_point_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_polygon_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_polygon_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_polygon_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/draw_polygon_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/editing_tool_bar.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/editing_tool_bar.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/move_feature_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/move_feature_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/move_feature_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/move_feature_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/navigation_history.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/navigation_history.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/overview_replacement.gif b/webui/OpenLayers/bundle/openlayers/theme/default/img/overview_replacement.gif
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/pan-panel-NOALPHA.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/pan-panel-NOALPHA.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/pan-panel.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/pan-panel.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/pan_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/pan_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/pan_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/pan_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/panning-hand-off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/panning-hand-off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/panning-hand-on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/panning-hand-on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/remove_point_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/remove_point_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/remove_point_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/remove_point_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/ruler.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/ruler.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/save_features_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/save_features_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/save_features_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/save_features_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/view_next_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/view_next_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/view_next_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/view_next_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/view_previous_off.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/view_previous_off.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/view_previous_on.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/view_previous_on.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/zoom-panel-NOALPHA.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/zoom-panel-NOALPHA.png
diff --git a/webui/OpenLayers/bundle/openlayers/theme/default/img/zoom-panel.png b/webui/OpenLayers/bundle/openlayers/theme/default/img/zoom-panel.png