Update finds perspective configs

src/client/reducers/sampo/findsFacetsConstrainSelf.js

 import { handleFacetConstrainSelfAction } from '../general/facetsConstrainSelf'
+
 export const INITIAL_STATE = {
   updatedFacet: null,
   facetUpdateID: 0,
@@ -22,6 +23,25 @@ export const INITIAL_STATE = {
       uriFilter: null,
       priority: 1
     },
+    objectType: {
+      id: 'objectType',
+      // predicate: defined in backend
+      distinctValueCount: 0,
+      values: [],
+      flatValues: [],
+      sortBy: 'instanceCount',
+      sortDirection: 'desc',
+      sortButton: true,
+      spatialFilterButton: false,
+      pieChartButton: true,
+      isFetching: false,
+      searchField: true,
+      containerClass: 'ten',
+      filterType: 'uriFilter',
+      uriFilter: null,
+      type: 'hierarchical',
+      priority: 6
+    },
     specification: {
       id: 'specification',
       // predicate: defined in backend
@@ -150,8 +170,8 @@ export const INITIAL_STATE = {
       type: 'hierarchical',
       priority: 5
     },
-    municipality: {
-      id: 'municipality',
+    materialLiteral: {
+      id: 'materialLiteral',
       // predicate: defined in backend
       distinctValueCount: 0,
       values: [],
@@ -160,16 +180,16 @@ export const INITIAL_STATE = {
       sortDirection: 'desc',
       sortButton: true,
       spatialFilterButton: false,
-      chartButton: false,
+      pieChartButton: true,
       isFetching: false,
       searchField: true,
       containerClass: 'ten',
       filterType: 'uriFilter',
       uriFilter: null,
-      priority: 6
+      priority: 4
     },
-    materialLiteral: {
-      id: 'materialLiteral',
+    place: {
+      id: 'place',
       // predicate: defined in backend
       distinctValueCount: 0,
       values: [],
@@ -184,8 +204,10 @@ export const INITIAL_STATE = {
       containerClass: 'ten',
       filterType: 'uriFilter',
       uriFilter: null,
-      priority: 4
+      type: 'hierarchical',
+      priority: 6
     }
+
   }
 }
 

src/server/sparql/sampo/perspective_configs/FindsConfig.js

@@ -116,6 +116,25 @@ export const findsConfig = {
       predicate: ':municipality',
       labelPath: ':municipality/skos:prefLabel',
       type: 'list'
+    },
+    place: {
+      id: 'place',
+      facetValueFilter: '',
+      predicate: ':municipality/skos:related',
+      labelPath: ':municipalityskos:related//skos:prefLabel',
+      type: 'hierarchical',
+      parentPredicate: ':municipality/skos:related/skos:broader+',
+      parentProperty: 'skos:broader',
+      facetLabelFilter: 'FILTER(LANG(?prefLabel_) = \'fi\')'
+    },
+    objectType: {
+      id: 'objectType',
+      facetValueFilter: '',
+      predicate: ':object_type',
+      labelPath: ':object_type/skos:prefLabel',
+      type: 'hierarchical',
+      parentPredicate: ':object_type/skos:broader+',
+      parentProperty: 'skos:broader'
     }
   }
 }

src/server/sparql/sampo/sparql_queries/SparqlQueriesFinds.js

@@ -137,20 +137,6 @@ export const findsPlacesQuery = `
   }
 `
 
-export const nearbyFindsQuery = `
-  SELECT ?id ?lat ?long
-  WHERE {
-    BIND(<ID> as ?find)
-    ?find wgs84:lat ?fLat ;
-        wgs84:long ?fLong .
-    BIND(?fLat as ?findLat)
-    BIND(?fLong as ?findLong)
-    ?id spatial:nearby (?findLat ?findLong 20 'km') .
-    ?id wgs84:lat ?lat ;
-        wgs84:long ?long .
-  }
-`
-
 export const findsTimelineQuery = `
   SELECT ?id ?group ?data__id ?data__uri ?data__label
   ?data__data__id ?data__data__label ?data__data__val ?data__data__timeRange
@@ -160,9 +146,13 @@ export const findsTimelineQuery = `
 
     ?find :material/skos:prefLabel ?id  . # ?id = first hierarchy level
     BIND (?id as ?group)
-    ?find :find_name ?data__id . # ?data__id = second hierarchy level
+    #?find :find_name ?data__id . # ?data__id = second hierarchy level
+
+     ?find :find_name ?lable_temp .
+    BIND( STRAFTER(STR(?find),'http://ldf.fi/findsampo/finds/' ) AS ?find_num ).
+    BIND (CONCAT(str(?lable_temp), str(?find_num)) as ?data__id) .
     BIND (?data__id as ?data__label)
-    BIND (?find as ?data__data__id) # ?data__data__id = third hierarchy level
+    BIND (?find_num as ?data__data__id) # ?data__data__id = third hierarchy level
     BIND (?data__id as ?data__data__label)
     BIND (?data__id as ?data__data__val)