Show the MapData button for tabular files #2957

IQSS · Feb 17, 2016 · d9c0d30 · d9c0d30
1 parent f37fdbd
commit d9c0d30
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java
@@ -611,4 +611,20 @@ public String getDisplayName() {
         // currently this method is not being used
         return getLatestFileMetadata().getLabel();
     }
+
+    /**
+     * Check if the Geospatial Tag has been assigned to this file
+     * @return 
+     */
+    public boolean hasGeospatialTag(){
+        if (this.dataFileTags == null){
+            return false;
+        }
+        for (DataFileTag tag : this.dataFileTags){
+            if (tag.isGeospatialTag()){
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileTag.java b/src/main/java/edu/harvard/iq/dataverse/DataFileTag.java
@@ -105,6 +105,7 @@ public TagType getType() {
         return this.type;
     }
 
+
     public void setType(TagType type) {
         this.type = type;
     }
@@ -127,6 +128,20 @@ public String getTypeLabel() {
         return null; 
     }
 
+    /**
+     * Is this a geospatial tag, e.g. TagType.Geospatial
+     * @return 
+     */
+    public boolean isGeospatialTag(){
+        if (this.type == null){
+            return false;
+        }
+        if (this.type == TagType.Geospatial){
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public int hashCode() {
         int hash = 0;

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1117,7 +1117,7 @@ public boolean canUserSeeMapDataButton(FileMetadata fm){
         //  (2) Is this file a Shapefile or a Tabular file tagged as Geospatial?
         //  TO DO:  EXPAND FOR TABULAR FILES TAGGED AS GEOSPATIAL!
         //
-        if (!(this.isShapefileType(fm))){
+        if (!(this.isPotentiallyMappableFileType(fm))){
             return false;
         }
 
@@ -1131,8 +1131,7 @@ public boolean canUserSeeMapDataButton(FileMetadata fm){
         if (!settingsService.isTrueForKey(SettingsServiceBean.Key.GeoconnectCreateEditMaps, false)){
             return false;
         }
-
-
+
         //  (5) Is File released?
         //
         if (fm.getDataFile().isReleased()){
@@ -1143,6 +1142,38 @@ public boolean canUserSeeMapDataButton(FileMetadata fm){
         return false;
     }
 
+
+    /**
+     * Check if this is a mappable file type.
+     * 
+     * Currently (2/2016)
+     * - Shapefile (zipped shapefile)
+     * - Tabular file with Geospatial Data tag
+     * 
+     * @param fm
+     * @return 
+     */
+    private boolean isPotentiallyMappableFileType(FileMetadata fm){
+        if (fm==null){
+            return false;
+        }
+
+        // Yes, it's a shapefile
+        //
+        if (this.isShapefileType(fm)){
+            return true;
+        }
+
+        // Yes, it's tabular with a geospatial tag
+        //
+        if (fm.getDataFile().isTabularData()){
+            if (fm.getDataFile().hasGeospatialTag()){
+                return true;
+            } 
+        }
+        return false;
+    }
+
     /**
      * Should there be a Explore WorldMap Button for this file?
      *   See table in: https://github.com/IQSS/dataverse/issues/1618