Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

RAC

Browse Source
This commit is contained in:
Szymon Porwolik
2025-11-30 22:55:06 +01:00
parent 1f7144909e
commit bbc234880a
3 changed files with 51 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Awards.php
View File

@@ -775,7 +775,6 @@ class Awards extends CI_Controller {
public function rac() {
$footerData = [];
$footerData['scripts'] = [
'assets/js/sections/racmap_geojson.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/racmap_geojson.js")),
'assets/js/sections/racmap.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/racmap.js")),
'assets/js/leaflet/L.Maidenhead.js',
];

99
assets/js/sections/racmap.js
View File

@@ -87,69 +87,72 @@ function load_rac_map2(data) {
}
).addTo(map);
var notworked = mapcoordinates.features.length;
var confirmed = 0;
var workednotconfirmed = 0;
// Load GeoJSON from external file
$.getJSON(base_url + 'assets/json/geojson/states_1.geojson', function(mapcoordinates) {
var notworked = mapcoordinates.features.length;
var confirmed = 0;
var workednotconfirmed = 0;
for(var k in data) {
var mapColor = unworkedColor;
for(var k in data) {
var mapColor = unworkedColor;
if (data[k] == 'C') {
mapColor = confirmedColor;
confirmed++;
if (data[k] == 'C') {
mapColor = confirmedColor;
confirmed++;
notworked--;
}
if (data[k] == 'W') {
mapColor = workedColor;
workednotconfirmed++;
notworked--;
}
}
if (data[k] == 'W') {
mapColor = workedColor;
workednotconfirmed++;
notworked--;
}
}
/*Legend specific*/
var legend = L.control({ position: "topright" });
/*Legend specific*/
var legend = L.control({ position: "topright" });
legend.onAdd = function(map) {
var div = L.DomUtil.create("div", "legend");
div.innerHTML += "<h4>" + lang_general_word_colors + "</h4>";
div.innerHTML += "<i style='background: " + confirmedColor + "'></i><span>" + lang_general_word_confirmed + " (" + confirmed + ")</span><br>";
div.innerHTML += "<i style='background: " + workedColor + "'></i><span>" + lang_general_word_worked_not_confirmed + " (" + workednotconfirmed + ")</span><br>";
div.innerHTML += "<i style='background: " + unworkedColor + "'></i><span>" + lang_general_word_not_worked + " (" + notworked + ")</span><br>";
return div;
};
legend.onAdd = function(map) {
var div = L.DomUtil.create("div", "legend");
div.innerHTML += "<h4>" + lang_general_word_colors + "</h4>";
div.innerHTML += "<i style='background: " + confirmedColor + "'></i><span>" + lang_general_word_confirmed + " (" + confirmed + ")</span><br>";
div.innerHTML += "<i style='background: " + workedColor + "'></i><span>" + lang_general_word_worked_not_confirmed + " (" + workednotconfirmed + ")</span><br>";
div.innerHTML += "<i style='background: " + unworkedColor + "'></i><span>" + lang_general_word_not_worked + " (" + notworked + ")</span><br>";
return div;
};
legend.addTo(map);
legend.addTo(map);
info = L.control();
info = L.control();
info.onAdd = function (map) {
this._div = L.DomUtil.create('div', 'info'); // create a div with a class "info"
this.update();
return this._div;
};
info.onAdd = function (map) {
this._div = L.DomUtil.create('div', 'info'); // create a div with a class "info"
this.update();
return this._div;
};
// method that we will use to update the control based on feature properties passed
info.update = function (props) {
this._div.innerHTML = '<h4>' + lang_canada_province + '</h4>' + (props ?
'<b>' + props.id.substring(3,5) + ' - ' + props.name + '</b><br />' : lang_hover_over_a_province);
};
// method that we will use to update the control based on feature properties passed
info.update = function (props) {
this._div.innerHTML = '<h4>' + lang_canada_province + '</h4>' + (props ?
'<b>' + props.code + ' - ' + props.name + '</b><br />' : lang_hover_over_a_province);
};
info.addTo(map);
info.addTo(map);
geojson = L.geoJson(mapcoordinates, {style: style, onEachFeature: onEachFeature}).addTo(map);
geojson = L.geoJson(mapcoordinates, {style: style, onEachFeature: onEachFeature}).addTo(map);
map.setView([70, -100], 3);
map.setView([70, -100], 3);
addMarkers();
addMarkers();
map.on('zoomed', function() {
clearMarkers();
addMarkers();
});
map.on('zoomed', function() {
clearMarkers();
addMarkers();
});
var layerControl = new L.Control.Layers(null, { [lang_general_gridsquares]: maidenhead = L.maidenhead() }).addTo(map);
maidenhead.addTo(map);
var layerControl = new L.Control.Layers(null, { [lang_general_gridsquares]: maidenhead = L.maidenhead() }).addTo(map);
maidenhead.addTo(map);
}); // end $.getJSON
}
function clearMarkers() {
@@ -218,7 +221,7 @@ function resetHighlight(e) {
function style(feature) {
return {
fillColor: getColor(feature.id),
fillColor: getColor(feature.properties.code),
weight: 1,
opacity: 1,
color: 'white',
@@ -230,7 +233,7 @@ function style(feature) {
function onClick(e) {
zoomToFeature(e);
var marker = e.target;
displayContactsOnMap($("#racmap"),marker.feature.id, $('#band2').val(), 'All', 'All', $('#mode').val(), 'RAC');
displayContactsOnMap($("#racmap"),marker.feature.properties.code, $('#band2').val(), 'All', 'All', $('#mode').val(), 'RAC');
}
function onClick2(e) {

15
assets/js/sections/racmap_geojson.js
View File

File diff suppressed because one or more lines are too long