Switch perspective 2 to 1

Author: esikkala

src/client/containers/SemanticPortal.js

@@ -51,8 +51,10 @@ import {
   processPortalConfig,
   createPerspectiveConfig,
   createPerspectiveConfigOnlyInfoPages
-}
-  from '../helpers/helpers'
+} from '../helpers/helpers'
+import * as apexChartsConfig from '../library_configs/ApexCharts/ApexChartsConfig'
+import * as leafletConfig from '../library_configs/Leaflet/LeafletConfig'
+import * as networkConfig from '../library_configs/Cytoscape.js/NetworkConfig'
 
 // ** Generate portal configuration based on JSON configs **
 import portalConfig from '../../configs/portalConfig.json'
@@ -71,9 +73,7 @@ const perspectiveConfigOnlyInfoPages = await createPerspectiveConfigOnlyInfoPage
   portalID,
   onlyInstancePagePerspectives: perspectives.onlyInstancePages
 })
-const apexChartsConfig = await import(`../library_configs/${portalID}/ApexCharts/ApexChartsConfig`)
-const leafletConfig = await import(`../library_configs/${portalID}/Leaflet/LeafletConfig`)
-const networkConfig = await import(`../library_configs/${portalID}/Cytoscape.js/NetworkConfig`)
+
 // ** portal configuration end **
 
 // ** Import general components **

src/client/library_configs/sampo/ApexCharts/ApexChartsConfig.js renamed to src/client/library_configs/ApexCharts/ApexChartsConfig.js

@@ -1,6 +1,6 @@
 
 import intl from 'react-intl-universal'
-import { generateLabelForMissingValue } from '../../../helpers/helpers'
+import { generateLabelForMissingValue } from '../../helpers/helpers'
 
 export const createSingleLineChartData = ({
   rawData,

src/client/library_configs/sampo/Cytoscape.js/NetworkConfig.js renamed to src/client/library_configs/Cytoscape.js/NetworkConfig.js

@@ -1,5 +1,5 @@
 import { has, orderBy } from 'lodash'
-import history from '../../../History'
+import history from '../../History'
 import intl from 'react-intl-universal'
 
 export const createPopUpContentDefault = ({ data, resultClass }) => {
@@ -95,7 +95,7 @@ export const createPopUpContentNameSampo = ({ data }) => {
   return popUpTemplate
 }
 
-export const createPopUpContentFindSampo = data => {
+export const createPopUpContentFindSampo = ({ data }) => {
   const container = document.createElement('div')
 
   if (has(data, 'image')) {
@@ -104,8 +104,8 @@ export const createPopUpContentFindSampo = data => {
       image = image[0]
     }
     const imageElement = document.createElement('img')
+    imageElement.className = 'leaflet-popup-content-image'
     imageElement.setAttribute('src', image.url)
-    imageElement.style.cssText = 'width: 100%'
     container.appendChild(imageElement)
   }
   const heading = document.createElement('h3')
@@ -116,13 +116,13 @@ export const createPopUpContentFindSampo = data => {
   heading.appendChild(headingLink)
   container.appendChild(heading)
   if (has(data, 'objectType')) {
-    container.appendChild(this.createPopUpElement({
+    container.appendChild(createPopUpElement({
       label: intl.get('perspectives.finds.properties.objectType.label'),
       value: data.objectType.prefLabel
     }))
   }
   if (has(data, 'material')) {
-    container.appendChild(this.createPopUpElement({
+    container.appendChild(createPopUpElement({
       label: intl.get('perspectives.finds.properties.material.label'),
       value: data.material.prefLabel
     }))
@@ -228,21 +228,24 @@ const bufferStyle = feature => {
 }
 
 const createArchealogicalSiteColor = feature => {
-  let color = '#dd2c00'
-  if (feature.properties.laji.includes('poistettu kiinteä muinaisjäännös')) {
-    color = '#000000'
-  }
-  return color
+  const entry = fhaLegend.find(el => el.key === feature.properties.laji.trim())
+  return entry.color
 }
 
-/*
-  FHA spatial data general documentation:
-    https://www.museovirasto.fi/en/services-and-guidelines/data-systems/kulttuuriympaeristoen-tietojaerjestelmae/kulttuuriympaeristoen-paikkatietoaineistot
+export const fhaLegend = [
+  { key: 'kiinteä muinaisjäännös', color: '#f00501' },
+  { key: 'luonnonmuodostuma', color: '#00cafb' },
+  { key: 'löytöpaikka', color: '#ffb202' },
+  { key: 'mahdollinen muinaisjäännös', color: '#fc01e2' },
+  { key: 'muu kohde', color: '#ffffff' },
+  { key: 'muu kulttuuriperintökohde', color: '#b57b3b' },
+  { key: 'poistettu kiinteä muinaisjäännös (ei rauhoitettu)', color: '#8b928b' }
+]
 
+/*
   FHA WFS services:
     https://kartta.nba.fi/arcgis/rest/services/WFS/MV_KulttuuriymparistoSuojellut/MapServer
     https://kartta.nba.fi/arcgis/rest/services/WFS/MV_Kulttuuriymparisto/MapServer/
-
   MV_Kulttuuriymparisto service documentation:
     https://www.paikkatietohakemisto.fi/geonetwork/srv/fin/catalog.search#/metadata/83787bc0-5a11-4429-a79d-22b37360a408
     https://www.museovirasto.fi/uploads/Tietotuotemaarittely_kulttuuriymparisto_kaikki.pdf
@@ -290,16 +293,16 @@ export const layerConfigs = [
     },
     createPopup: createArchealogicalSitePopUp
   },
-  // {
-  //   id: 'fhaLidar',
-  //   type: 'WMS',
-  //   url: `${process.env.API_URL}/fha-wms`,
-  //   layers: 'NBA:lidar',
-  //   version: '1.3.0',
-  //   attribution: 'Museovirasto',
-  //   minZoom: 13,
-  //   maxZoom: 18
-  // },
+  {
+    id: 'fhaLidar',
+    type: 'WMS',
+    url: `${process.env.API_URL}/fha-wms`,
+    layers: 'NBA:lidar',
+    version: '1.3.0',
+    attribution: 'Museovirasto',
+    minZoom: 13,
+    maxZoom: 18
+  },
   {
     id: 'karelianMaps',
     type: 'WMTS',

src/client/library_configs/sampo/Leaflet/LeafletConfig.js renamed to src/client/library_configs/Leaflet/LeafletConfig.js

@@ -190,8 +190,8 @@
         }
       }
     },
-    "perspective1": {
-      "label": "Perspective 1",
+    "perspective2": {
+      "label": "Perspective 2",
       "facetResultsType": "manuscripts",
       "shortDescription": "Perspective1 description",
       "longDescription": "<p class=\"MuiTypography-root MuiTypography-body1 MuiTypography-paragraph\"> Use this perspective to access data related to physical manuscript objects. If two or more source datasets include the same manuscript and this has been verified, the information from the source datasets has been merged into one manuscript. See <a href=\"/instructions\">instructions</a> for using the filters. The result view can be selected using the tabs: </p> <ul class=\"MuiTypography-root MuiTypography-body1\"> <li> <strong>TABLE</STRONG> view includes all manuscripts in the MMM data. One table row is equivalent to one manuscript. </li> <li> <strong>PRODUCTION PLACES</STRONG> view visualizes the connection between manuscripts and the places where they were produced. </li> <li> <strong>MIGRATIONS</strong> view visualizes the migration of a manuscript from place of production to its most recently observed location. </li> <li> <strong>EXPORT</strong> the SPARQL query used to generate the result table view into YASGUI query editor. </li> </ul>",
@@ -303,8 +303,8 @@
         }
       }
     },
-    "perspective2": {
-      "label": "Perspective 2",
+    "perspective1": {
+      "label": "Perspective 1",
       "facetResultsType": "works",
       "shortDescription": "Perspective 2 description",
       "longDescription": "<p class=\"MuiTypography-root MuiTypography-body1 MuiTypography-paragraph\"> Use this perspective to access data related to Works. The MMM data model follows the <a href='https://www.ifla.org/publications/node/11240' target='_blank' rel='noopener noreferrer'>FRBRoo</a> definition of a work, which refers to “distinct concepts or combinations of concepts identified in artistic and intellectual expressions.” Works contain title and author information. If two or more source datasets include the same Work and this has been verified, the information from the source datasets has been merged into one Work. See <a href=\"/instructions\">instructions</a> for using the filters. The result view can be selected using the tabs: </p> <ul class=\"MuiTypography-root MuiTypography-body1\"> <li> <strong>TABLE</STRONG> view gives you a list of specific works, and the manuscripts and manuscript collections in which they can be found. </li> <li> <strong>EXPORT</strong> the SPARQL query used to generate the result table view into YASGUI query editor. </li> </ul>",

src/client/translations/sampo/localeEN.json

@@ -90,7 +90,7 @@
         "yasguiParams": {
             "contentTypeConstruct": "text/turtle",
             "contentTypeSelect": "application/sparql-results+json",
-            "endpoint": "http://ldf.fi/mmm/sparql",
+            "endpoint": "https://ldf.fi/mmm/sparql",
             "requestMethod": "POST",
             "tabTitle": "Exported query"
         }

src/configs/portalConfig.json

@@ -5,7 +5,7 @@
         "useAuth": false,
         "prefixesFile": "SparqlQueriesPrefixes.js"
     },
-    "sparqlQueriesFile": "SparqlQueriesPerspective1.js",
+    "sparqlQueriesFile": "SparqlQueriesPerspective2.js",
     "baseURI": "http://ldf.fi/mmm",
     "URITemplate": "<BASE_URI>/manifestation_singleton/<LOCAL_ID>",
     "resultClasses": {

src/configs/sampo/only_instance_pages/manuscripts.json

@@ -5,7 +5,7 @@
     "useAuth": false,
     "prefixesFile": "SparqlQueriesPrefixes.js"
   },
-  "sparqlQueriesFile": "SparqlQueriesPerspective2.js",
+  "sparqlQueriesFile": "SparqlQueriesPerspective1.js",
   "baseURI": "http://ldf.fi/mmm",
   "URITemplate": "<BASE_URI>/work/<LOCAL_ID>",
   "resultClasses": {