Merge pull request #19134 from hujambo-dunia/openlayers-xml-0.0.1

Viz update to v0.0.1 and bug fix
galaxyproject · Nov 12, 2024 · e74ff84 · e74ff84
2 parents 2bdfbce + 91e7b39
commit e74ff84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/client/gulpfile.js b/client/gulpfile.js
@@ -28,7 +28,6 @@ const STATIC_PLUGIN_BUILD_IDS = [
     "mvpapp",
     "nora",
     "nvd3/nvd3_bar",
-    "openlayers",
     "openseadragon",
     "PCA_3Dplot",
     "phylocanvas",
@@ -38,7 +37,7 @@ const STATIC_PLUGIN_BUILD_IDS = [
     "ts_visjs",
     "venn",
 ];
-const INSTALL_PLUGIN_BUILD_IDS = ["ngl", "msa"]; // todo: derive from XML
+const INSTALL_PLUGIN_BUILD_IDS = ["ngl", "msa", "openlayers"]; // todo: derive from XML
 const DIST_PLUGIN_BUILD_IDS = ["new_user"];
 const PLUGIN_BUILD_IDS = Array.prototype.concat(DIST_PLUGIN_BUILD_IDS, STATIC_PLUGIN_BUILD_IDS);
 

diff --git a/config/plugins/visualizations/openlayers/config/openlayers.xml b/config/plugins/visualizations/openlayers/config/openlayers.xml
@@ -6,22 +6,25 @@
         <data_source>
             <model_class>HistoryDatasetAssociation</model_class>
             <test test_attr="ext" result_type="datatype">geojson</test>
-           <test test_attr="ext" result_type="datatype">shp</test>
+            <test test_attr="ext" result_type="datatype">shp</test>
             <to_param param_attr="id">dataset_id</to_param>
         </data_source>
     </data_sources>
     <params>
         <param type="dataset" var_name_in_template="hda" required="true">dataset_id</param>
     </params>
-    <entry_point entry_point_type="chart" src="script.js" css="ol.css"/>
+    <requirements>
+        <requirement type="npm" version="0.0.2" package="galaxy-openlayers"/>
+    </requirements>
+    <entry_point entry_point_type="script" src="dist/index.js" css="dist/index.css" />
     <settings>
         <input>
             <label>Types of geometry</label>
             <name>geometry_type</name>
             <help>Select a geometry type.</help>
             <type>select</type>
             <display>radio</display>
-            <value>circle</value>
+            <value>Circle</value>
             <data>
                 <data>
                     <label>None</label>