Standardise data URLs to virtualflybrain.org/data host

get_secure_data_v2_url now rewrites the www data host to the
environment-independent https://virtualflybrain.org/data/ host (instead of
https://v2.virtualflybrain.org/data/), matching the term-link permalink
standardisation. Test expectations updated.

Author: Robbie1977

src/test/term_info_queries_test.py

@@ -487,13 +487,13 @@ def test_term_info_serialization_template(self):
         self.assertTrue("filemeta" in serialized)
         self.assertEqual(3, len(serialized["filemeta"]))
         self.assertEqual({'obj': {'local': '/MeshFiles(OBJ)/my_id_(my_name).obj',
-                                  'url': 'https://v2.virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume_man.obj'}},
+                                  'url': 'https://virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume_man.obj'}},
                          serialized["filemeta"][0])
         self.assertEqual({'wlz': {'local': '/Slices(WOOLZ)/my_id_(my_name).wlz',
-                                  'url': 'https://v2.virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume.wlz'}},
+                                  'url': 'https://virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume.wlz'}},
                          serialized["filemeta"][1])
         self.assertEqual({'nrrd': {'local': '/SignalFiles(NRRD)/my_id_(my_name).nrrd',
-                                   'url': 'https://v2.virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume.nrrd'}},
+                                   'url': 'https://virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume.nrrd'}},
                          serialized["filemeta"][2])
         self.assertTrue("template" in serialized)
         self.assertEqual("[JRC2018UnisexVNC](VFB_00200000)", serialized["template"])

src/vfbquery/term_info_queries.py

@@ -1069,12 +1069,14 @@ def get_secure_data_url(data_url: str) -> str:
 
 def get_secure_data_v2_url(data_url: str) -> str:
     """
-    Generates a secure data v2 url from the given url
+    Generates a secure, canonical data url from the given url: forces https and
+    rewrites the www data host to the environment-independent virtualflybrain.org
+    host, consistent with VFB term permalinks.
     :param data_url: data url to secure
-    :return: secured v2 url
+    :return: secured data url
     """
     return data_url.replace("http://", "https://").replace("https://www.virtualflybrain.org/data/",
-                                                           "https://v2.virtualflybrain.org/data/")
+                                                           "https://virtualflybrain.org/data/")
 
 
 def serialize_term_info_to_json(vfb_term: VfbTerminfo, show_types=False) -> str: