Clean up

src/client/epics/index.js

@@ -8,7 +8,6 @@ import {
   updatePlace,
   updateFacet,
   updateResults,
-  //updateGeoJSON,
   FETCH_FACET,
   //FETCH_FACET_FAILED,
   FETCH_MANUSCRIPTS,
@@ -17,8 +16,6 @@ import {
   FETCH_PLACE,
   FETCH_RESULTS
   //FETCH_PLACES_FAILED,
-  //GET_GEOJSON,
-  //GET_GEOJSON_FAILED
 } from '../actions';
 
 const apiUrl = (process.env.NODE_ENV === 'development')
@@ -80,35 +77,12 @@ const getResultCount = action$ => action$.pipe(
   })
 );
 
-// const getGeoJSONEpic = (action$) => {
-//   const wfsUrl = apiUrl + 'wfs';
-//   return action$.ofType(GET_GEOJSON)
-//     .switchMap(action => {
-//       let s = '';
-//       action.layerIDs.map(layerID => {
-//         s += `&layerID=${layerID}`;
-//       });
-//       const requestUrl = `${wfsUrl}?${s}`;
-//       return ajax.getJSON(requestUrl)
-//         // .map(response => {
-//         //   console.log(response)
-//         // })
-//         .map(response => updateGeoJSON({ geoJSON: response }))
-//         .catch(error => Observable.of({
-//           type: GET_GEOJSON_FAILED,
-//           error: error,
-//         }));
-//     });
-// };
-
-
 const rootEpic = combineEpics(
   getManuscripts,
   getPlaces,
   getPlace,
   getFacet,
   getResultCount,
-  // getGeoJSONEpic
 );
 
 export default rootEpic;

src/server/index.js

@@ -24,17 +24,17 @@ app.use(function(req, res, next) {
 
 app.use(express.static(__dirname + './../public/'));
 
-// const filterObj = {
-//   creationPlace: {
-//     predicate: '^<http://erlangen-crm.org/efrbroo/R18_created>/<http://www.cidoc-crm.org/cidoc-crm/P7_took_place_at>',
-//     values: ['<http://ldf.fi/mmm/place/7>', '<http://ldf.fi/mmm/place/5>']
-//   },
-//   author: {
-//     predicate: '^<http://erlangen-crm.org/efrbroo/R18_created>/<http://www.cidoc-crm.org/cidoc-crm/P14_carried_out_by>',
-//     values: ['<http://ldf.fi/mmm/person/84>', '<http://ldf.fi/mmm/person/894>']
-//   }
-// };
-const filterObj = {}
+const filterObj = {
+  creationPlace: {
+    predicate: '^<http://erlangen-crm.org/efrbroo/R18_created>/<http://www.cidoc-crm.org/cidoc-crm/P7_took_place_at>',
+    values: ['<http://ldf.fi/mmm/place/7>', '<http://ldf.fi/mmm/place/5>']
+  },
+  author: {
+    predicate: '^<http://erlangen-crm.org/efrbroo/R18_created>/<http://www.cidoc-crm.org/cidoc-crm/P14_carried_out_by>',
+    values: ['<http://ldf.fi/mmm/person/84>', '<http://ldf.fi/mmm/person/894>']
+  }
+};
+//const filterObj = {}
 
 app.get('/manuscripts', (req, res) => {
   const page = req.query.page || 1;

src/server/sparql/Manuscripts.js

@@ -26,7 +26,7 @@ export const getManuscriptCount = (filterObj) => {
 };
 
 export const getPlaces = variant => {
-  console.log(variant)
+  // console.log(variant)
   const config = datasetConfig['mmm'];
   return sparqlSearchEngine.doSearch(config[`${variant}Query`], config.endpoint, makeObjectList);
 };