NavSatFix map fix due to OSM tile server being stricter about HTTP he…

…aders; fix ros-install-this for noetic
dheera · Jul 9, 2021 · 7ef5fc3 · 7ef5fc3
1 parent 91ff697
commit 7ef5fc3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/rosshow/ros-install-this b/rosshow/ros-install-this
@@ -50,7 +50,12 @@ source $ROS_REAL_ROOT/setup.bash
 cd $TEMP_DIR/src/
 catkin_init_workspace
 cd $TEMP_DIR/
-catkin_make
+
+if [ $ROS_DISTRO == "noetic" ]; then
+    catkin_make -DPYTHON_EXECUTABLE=/usr/bin/python3
+else 
+    catkin_make
+fi
 
 echo
 echo "You may be now be asked for your sudo password to complete installation."

diff --git a/rosshow/src/librosshow/viewers/sensor_msgs/NavSatFixViewer.py b/rosshow/src/librosshow/viewers/sensor_msgs/NavSatFixViewer.py
@@ -45,9 +45,13 @@ def __missing__(self, key):
 @memoize
 def get_tile(xtile, ytile, zoom):
     try:
-        url = 'http://a.tile.openstreetmap.org/%s/%s/%s.png' % (zoom, xtile, ytile)
+        url = 'https://a.tile.openstreetmap.org/%s/%s/%s.png' % (zoom, xtile, ytile)
         response = requests.get(url, headers = {
-            "User-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.116 Safari/537.36",
+            "User-Agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36",
+            "Accept-Language": "en-US,en;q=0.9",
+            "Http-Upgrade-Insecure-Requests": "1",
+            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
+            "Dnt": "1",
         })
         img = Image.open(BytesIO(response.content))
     except IOError: