ONEARTH-356 Removed need for TileMatrixSet config in vectorgen test

Author: jtroberts

src/test/test_vectorgen.py

@@ -138,13 +138,6 @@ def test_MVT_MRF_generation(self):
 
         # Run vectorgen
         os.chdir(test_artifact_path)
-        if os.path.isfile("../../tilematrixsets.xml") == False: # Check for tilematrixsets.xml
-            if os.path.isfile("/etc/onearth/config/conf/tilematrixsets.xml"):
-                os.symlink("/etc/onearth/config/conf/tilematrixsets.xml", test_artifact_path+"/tilematrixsets.xml")
-            else:
-                self.fail("Cannot find tilematrixsets.xml. Aborting test.")
-        else:
-            os.symlink("../../tilematrixsets.xml", test_artifact_path+"/tilematrixsets.xml")
         cmd = 'oe_vectorgen -c ' + self.mrf_test_config
         run_command(cmd, ignore_warnings=True)
 

src/test/vectorgen_test_data/vectorgen_test_create_mvt_mrf.xml

@@ -21,10 +21,11 @@ limitations under the License.
  <output_dir>output_dir/</output_dir>
  <working_dir>working_dir/</working_dir>
  <output_name>test_pvt</output_name>
- <output_format>MRF</output_format>
+ <output_format>MVT-MRF</output_format>
  <target_epsg>4326</target_epsg>
  <source_epsg>4326</source_epsg>
- <tilematrixset>EPSG4326_16km</tilematrixset>
+ <target_x>2560</target_x>
+ <target_y>1280</target_y>
  <feature_reduce_rate>0</feature_reduce_rate>
  <cluster_reduce_rate>0</cluster_reduce_rate>
 </vectorgen_configuration>