Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions assets/js/barchartfilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class BarChartFilter {
g = parseFloat(g);
}
//Sort the groups
ga.sort(function (a, b) {
ga.sort(function(a, b) {
return a.key - b.key;
});

Expand Down Expand Up @@ -69,7 +69,7 @@ export default class BarChartFilter {
}

brush_listener(that) {
return function () {
return function() {
const g = d3.select(this.parentNode);
const brushRange = d3.event.selection || d3.brushSelection(this); // attempt to read brush range
let activeRange = brushRange;
Expand Down Expand Up @@ -98,7 +98,7 @@ export default class BarChartFilter {
// filter the active dimension to the range extents

that.dimension.filterAll();
that.dimension.filterFunction(function (d) {
that.dimension.filterFunction(function(d) {
return parseFloat(d) >= extents[0] && d <= extents[1];
});

Expand All @@ -123,7 +123,7 @@ export default class BarChartFilter {
chart(div, scale) {


console.log(scale)


const data_groups = this.group_for_barchart();

Expand All @@ -136,14 +136,14 @@ export default class BarChartFilter {
this.y = d3.scaleLog().range([100, 0]);

this.y.domain([1, d3.max(data_groups.map((g) => g.value))]);
console.log(this.y.domain());


} else {
//Log scale
this.x = d3
.scaleLog()
.range([0, 250])
// .domain([this.domain[0], this.domain[1]]);
// .domain([this.domain[0], this.domain[1]]);
this.y = d3.scaleLinear().range([100, 0]);
this.y.domain(d3.extent(data_groups, d => d.value));
this.x.domain([1, d3.max(data_groups, d => d.key)]);
Expand Down Expand Up @@ -421,9 +421,9 @@ export default class BarChartFilter {

title_icon.src = "./assets/svg/si-glyph-" + layer.toLowerCase() + ".svg";

console.log(title_icon.src.includes("si-glyph-.svg"))

if (title_icon.src.includes("si-glyph-.svg") == true) {
console.log("change")

title_icon.src = "./assets/svg/si-glyph-links.svg";
}

Expand Down Expand Up @@ -510,7 +510,7 @@ export default class BarChartFilter {
document.getElementsByClassName("barchart")[0].remove();
var container = document.getElementById("barchartContainer");
container.appendChild(chart_div)
// this.filter_div.appendChild(chart_div);
// this.filter_div.appendChild(chart_div);
}

render_minmax_inputs() {
Expand Down
3 changes: 0 additions & 3 deletions assets/js/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,9 @@ export default class Controller {
import_nodes_preset() {
// When a level is select, we import the value
let level = document.querySelector('input[name="NodesImportPresetFile"]:checked').value;

let dataset = document.getElementById(level).value

let nodeId = document.getElementById(dataset + 'ID').value;


// The previous inputs are needing to get the correct file.
let nodesGeojsonPreset = './public/arabesque-datasets-presets/geom/' + level + '/' + dataset + '.geojson';
fetch(nodesGeojsonPreset)
Expand Down
4 changes: 2 additions & 2 deletions assets/js/olrenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1312,10 +1312,10 @@ export default class OlRenderer {
source = new OSM();
// url = "https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png";
} else if (layer.name === "Humanitarian_OSM") {
url = "http://{a-b}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png";
url = "https://{a-b}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png";
source = new XYZ({ url: url, crossOrigin: "Anonymous" });
} else if (layer.name === "Wikimedia") {
url = "http://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png";
url = "https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png";
source = new XYZ({ url: url, crossOrigin: "Anonymous" });
} else if (layer.name === "Stamen_without_labels") {
url = "https://stamen-tiles-{a-d}.a.ssl.fastly.net/terrain-background/{z}/{x}/{y}.png";
Expand Down
407 changes: 0 additions & 407 deletions bundle.js

This file was deleted.

1 change: 0 additions & 1 deletion bundle.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion dist/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/bundle.js.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ <h5 class="card-title">Saved map</h5>
<div id="ModalNewReference"></div>
<div id="ModalNewGeojson"></div>
<div id="ModalSemioLayer"></div>

</div>
<link href="main.css" rel="stylesheet">
<script src="bundle.js"></script>
Expand Down
Loading