From f19baf9d1672dffc32241477fd52385179afb0e5 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Mon, 25 Oct 2021 15:30:33 +0300
Subject: [PATCH] Test config for polygon layer
---
src/client/components/facet_results/Deck.js | 4 ++--
src/server/sparql/Mappers.js | 9 ++++++---
.../sampo/sparql_queries/SparqlQueriesPerspective1.js | 1 -
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/client/components/facet_results/Deck.js b/src/client/components/facet_results/Deck.js
index c70abb78..206bede3 100644
--- a/src/client/components/facet_results/Deck.js
+++ b/src/client/components/facet_results/Deck.js
@@ -197,10 +197,9 @@ class Deck extends React.Component {
pickable: true,
stroked: true,
filled: true,
- wireframe: false,
lineWidthMinPixels: 1,
getPolygon: d => d.polygon,
- getFillColor: d => [255, 255, 0, 255],
+ getFillColor: d => [255, 0, 0, 30],
getLineColor: [80, 80, 80],
getLineWidth: 1
})
@@ -215,6 +214,7 @@ class Deck extends React.Component {
(results[0].from && results[0].to) ||
results[0].polygon
)
+ // console.log(hasData)
/* It's OK to create a new Layer instance on every render
https://github.com/uber/deck.gl/blob/master/docs/developer-guide/using-layers.md#should-i-be-creating-new-layers-on-every-render
diff --git a/src/server/sparql/Mappers.js b/src/server/sparql/Mappers.js
index ab80565e..eafd6af3 100644
--- a/src/server/sparql/Mappers.js
+++ b/src/server/sparql/Mappers.js
@@ -178,7 +178,7 @@ export const linearScale = ({ data, config }) => {
const unscaledNum = Number(item[variable])
// https://stackoverflow.com/a/31687097
const scaled = (maxAllowed - minAllowed) * (unscaledNum - min) / (max - min) + minAllowed
- item[`${variable}Scaled`] = scaled.toFixed(2)
+ item[`${variable}Scaled`] = parseFloat(scaled.toFixed(2))
}
})
return data
@@ -313,11 +313,14 @@ export const toPolygonLayerFormat = ({ data, config }) => {
const deckGlArray = pointArray.map(point => {
const latLng = point.split(',')
return [
- parseFloat(latLng[1]).toFixed(4),
- parseFloat(latLng[0]).toFixed(4)
+ parseFloat(parseFloat(latLng[0]).toFixed(4)),
+ parseFloat(parseFloat(latLng[1]).toFixed(4))
]
})
item.polygon = deckGlArray
})
+ // const example = scaledData[0].polygon[0][0]
+ // console.log(typeof example)
+ // console.log(example)
return scaledData
}
diff --git a/src/server/sparql/sampo/sparql_queries/SparqlQueriesPerspective1.js b/src/server/sparql/sampo/sparql_queries/SparqlQueriesPerspective1.js
index 41cb0183..0e2fb53e 100644
--- a/src/server/sparql/sampo/sparql_queries/SparqlQueriesPerspective1.js
+++ b/src/server/sparql/sampo/sparql_queries/SparqlQueriesPerspective1.js
@@ -607,5 +607,4 @@ export const choroplethQuery = `
}
GROUP BY ?id ?prefLabel ?polygon
ORDER BY desc(?instanceCount)
- LIMIT 1
`
--
GitLab