publish_my_data 1.2.1 → 1.2.2

data/app/controllers/publish_my_data/data_cube/dimensions_controller.rb

@@ -19,6 +19,11 @@ module PublishMyData
       def measure
         respond_with @cube.measure_property
       end
+      
+      # GET /data/:dataset_slug/cube/area_dimension(.:format)
+      def area_dimension
+        respond_with @cube.area_dimension
+      end
 
       # all values for a single dimension in the cube.
       # Useful for getting axes data for cube grids.
@@ -39,7 +44,6 @@ module PublishMyData
         end
       end
 
-
       # recommended starting columns
       def recommended
         respond_to do |format|

data/app/models/publish_my_data/data_cube/cube.rb

@@ -56,10 +56,41 @@ module PublishMyData
         dim_objs.sort{ |x,y| y.size <=> x.size } # ordered by size desc
       end
 
+      # the (one and only) area dimenson for this cube.
+      def area_dimension
+
+        # NOTE: finds any properties which are any level of descendant of sdmxDim:refArea
+
+        query = "PREFIX qb: <http://purl.org/linked-data/cube#>
+        PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+        PREFIX sdmxDim: <http://purl.org/linked-data/sdmx/2009/dimension#>
+
+        SELECT DISTINCT ?uri ?label WHERE {
+                  
+          ?uri a ?dimensionType .
+          ?uri a qb:DimensionProperty .
+
+          OPTIONAL {
+            ?uri rdfs:label ?label .
+            ?uri rdfs:subPropertyOf+ ?superProperty .
+          }
+          GRAPH <#{dataset.data_graph_uri}> {
+            ?s ?uri ?o .
+          }
+
+          FILTER ( 
+            ?dimensionType = sdmxDim:refArea || 
+            ( 
+              bound(?superProperty) && 
+              ?superProperty = sdmxDim:refArea
+            )
+          )          
+        }"
+
+        uris_and_labels_only(Tripod::SparqlClient::Query.select(query)).first
+      end
+
       # the (one and only) measure property for this cube.
-      # This method appears to exist only for the DimensionsController,
-      # currently in PMD Enterprise (link taken 17-Oct-2013):
-      # https://github.com/Swirrl/publish_my_data_enterprise/blob/545215a331ea8752b6ff4c9692db17170453d2c8/app/controllers/publish_my_data/data_cube/dimensions_controller.rb#L19-L23
       def measure_property
 
         query = "PREFIX qb: <http://purl.org/linked-data/cube#>

data/app/views/publish_my_data/datasets/show.html.haml

@@ -1,6 +1,6 @@
 - highlight_in_menu "catalogue"
 - set_page_title "Dataset: #{dataset.title}"
-- page_description dataset.description
+- page_description dataset.comment
 - page_kind 'dataset metadata'
 - bodyclass 'dataset'
 

data/config/routes.rb

@@ -11,6 +11,7 @@ PublishMyData::Engine.routes.draw do
   # data cube stuff
   match "/data/*id/cube/dimensions(.:format)" => "data_cube/dimensions#index" # list the dimensions for the cube
   match "/data/*id/cube/measure(.:format)" => "data_cube/dimensions#measure" # the measure property for the cube
+  match "/data/*id/cube/area_dimension(.:format)" => "data_cube/dimensions#area_dimension" # the measure property for the cube
   match "/data/*id/cube/dimension_values(.:format)" => "data_cube/dimensions#values" # all values for a single dimension in the cube. Useful for getting axes.
   match "/data/*id/cube/dimension_size(.:format)" => "data_cube/dimensions#size" # number of values for a dimension in the cube.
   match "/data/*id/cube/recommended_dimensions(.:format)" => "data_cube/dimensions#recommended" # recommended dimensions to use.

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end