Skip to content

Commit

Permalink
fix comments
Browse files Browse the repository at this point in the history
  • Loading branch information
YukaUU committed Aug 17, 2024
1 parent 5d1408c commit 66757a6
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 32 deletions.
20 changes: 0 additions & 20 deletions components/visualization-dashboard/chartDate.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
// DrawAnnotationData
function prepareDrawAnnotationData(getVisualizationData) {
let DrawAnnotationData = [];
// console.log('prepareDrawAnnotationData--getVisualizationData', getVisualizationData);

// Get initial data
getVisualizationData.annotations.map((d) => {
// console.log('prepareDrawAnnotationData--getVisualizationData--getVisualizationData.annotations', d);
d.geometries.features.map((detailData)=>{
if (detailData.viewerStates) {
// eslint-disable-next-line max-len
// console.log('prepareDrawAnnotationData--getVisualizationData--getVisualizationData.annotations-geometry--viewerStates', detailData.viewerStates);
DrawAnnotationData.push(roundToSecondDecimalPlace(detailData.viewerStates.z));
}
});
});
// console.log('DrawAnnotationData', DrawAnnotationData);
let result = countOccurrences(DrawAnnotationData);

return result;
Expand Down Expand Up @@ -50,11 +45,9 @@ function countOccurrences(arr) {

// Preset Labels annotations
function preparePresetLabelsData(getVisualizationData) {
// console.log('preparePresetLabelsData', getVisualizationData.annotations[1].properties.annotations.name);
let initialData = [];
// Get initial data
getVisualizationData.annotations.map((d) => {
// console.log('getVisualizationData.annotations', d.properties.annotations.notes);
if (d.properties.annotations.name == d.properties.annotations.notes) {
initialData.push(d.properties.annotations.name);
};
Expand All @@ -64,46 +57,33 @@ function preparePresetLabelsData(getVisualizationData) {
}

function countOccurrencesFromString(arr) {
// console.log('arr', arr);
// 文字列用のカウントマップを作成
let countMap = {};

// 配列の各要素をカウント
arr.forEach(function(value) {
// 文字列以外の場合は処理をスキップ
if (typeof value !== 'string') {
return;
}

// カウントマップに追加またはインクリメント
if (countMap[value] === undefined) {
countMap[value] = 1;
} else {
countMap[value]++;
}
});
// console.log(countMap);
// カウントマップを2次元配列に変換
let countArray = Object.entries(countMap).map(([key, value]) => [key, value]);

// console.log(countArray);
return countArray;
}

// Users of Annotations
function prepareUsersOfAnnotationsData(getVisualizationData) {
// console.log('creator', getVisualizationData.annotations[1].creator);
let initialData = [];
// Get initial data
getVisualizationData.annotations.map((d) => {
// console.log('getVisualizationData.annotations', d.properties.annotations.notes);
if (d.creator.length !== 0) {
initialData.push(d.creator);
// console.log('name', d.creator);
};
});
// console.log('initialData ', initialData );
let result = countOccurrencesFromString(initialData);
// console.log('result ', result);
return result;
}
1 change: 0 additions & 1 deletion components/visualization-dashboard/chartSetup.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ function createUsersOfAnnotationsChart(id, data) {
function createAnnotationZoomingChart(id, result) {
const ctx = document.getElementById(id);
const aa = result;
// console.log('id, result', id, result);
// Define data
var data = {
datasets: [{
Expand Down
4 changes: 2 additions & 2 deletions components/visualization-dashboard/modal.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

#modal-chart {
max-width: 100%;
max-height: 600px; /* 必要に応じて高さを調整 */
max-height: 600px;
width: auto;
height: auto;
}
}
3 changes: 1 addition & 2 deletions components/visualization-dashboard/navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
display: flex;
justify-content: space-between;
align-items: center;
/* box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); */
}

.navbar h1 {
Expand Down Expand Up @@ -35,4 +34,4 @@
color: white;;
margin-right: 1px;
margin-bottom: 6px;
}
}
7 changes: 0 additions & 7 deletions components/visualization-dashboard/visualization-init.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ function test() {
};

async function initialize() {
// クエリパラメータからIDを取得する関数
function getQueryParam(param) {
const urlParams = new URLSearchParams(window.location.search);
return urlParams.get(param);
}

// 取得したIDを使ってコンテンツを表示する
const slideId = getQueryParam('slideId');

const store = new Store('../data/');
Expand Down Expand Up @@ -42,17 +40,12 @@ async function initialize() {

if (slideId == JSONdata.id) {
getVisualizationData = {...JSONdata};
console.log('aaa');
// getVisualizationData.push(JSONdata);
}
} catch (error) {
console.error('Error finding slides:', error);
}
// console.log('a b', getVisualizationData);
}
} catch (error) {
console.error('Error finding slides:', error);
};
}
// Initialize the process
// initialize();

0 comments on commit 66757a6

Please sign in to comment.