Skip to content

Commit

Permalink
Merge pull request #36 from kabooHD/master
Browse files Browse the repository at this point in the history
Add location search
  • Loading branch information
DBChoco authored Oct 4, 2023
2 parents 4c65945 + 29f0a8e commit 8d14fa2
Show file tree
Hide file tree
Showing 3 changed files with 176 additions and 6 deletions.
37 changes: 36 additions & 1 deletion src/settings/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,39 @@ footer{
#qibla{
margin: auto 0 5px 50%;
transform: translateX(-50%);
}
}

.autocomplete {
position: relative;
display: inline-block;
}

.autocomplete-items {
position: absolute;
border: 1px solid #d4d4d4;
border-bottom: none;
border-top: none;
z-index: 99;
/*position the autocomplete items to be the same width as the container:*/
top: 100%;
left: 0;
right: 0;
}

.autocomplete-items div {
padding: 10px;
cursor: pointer;
background-color: #212121;
border-bottom: 1px solid #d4d4d4;
}

/*when hovering an item:*/
.autocomplete-items div:hover {
background-color: #212121;
}

/*when navigating through the items using the arrow keys:*/
.autocomplete-active {
background-color: #13111e !important;
color: #ffffff;
}
16 changes: 13 additions & 3 deletions src/settings/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,24 @@ <h1 id=settingsTitle>Settings</h1>
<p class="h4" id="coordinatesText">Coordinates</p>
</div>
<div class="grid-itemR grid-itemR-S">
<label class="form-check-label" for="cityInput" id="cityText">
City
</label>
<div class="autocomplete">
<input id="cityInput" class="form-control" type="text">
</div>
</div>
<div class="grid-itemL grid-sub">
</div>
<div class="grid-itemR grid-itemR-S">
<label class="form-check-label" for="latInput" id="latText">
Latitude
</label>
<input id="latInput" class="form-control" type="number" value="0.00" min="-90" max="90" step="0.1" maxlength="5"
placeholder="00.00">
placeholder="00.00">
</div>
<div class="grid-itemL grid-sub">
</div>
<div class="grid-itemL grid-sub">
</div>
<div class="grid-itemR grid-itemR-S">
<label class="form-check-label" for="lonInput" id="lonText">
Longitude
Expand Down
129 changes: 127 additions & 2 deletions src/settings/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ calculationMethod, quran;
var lat,lon;
var fromQuran = false;

window.addEventListener('DOMContentLoaded', () => {
window.addEventListener('DOMContentLoaded', () => {
loadSettings()
setNumberLimit(document.getElementById("latInput"));
setNumberLimit(document.getElementById("lonInput"));
Expand All @@ -15,6 +15,7 @@ window.addEventListener('DOMContentLoaded', () => {
loadQueryString()
loadFont()
setQibla()
autocomplete(document.getElementById("cityInput"), countries);
})

/**
Expand Down Expand Up @@ -1226,4 +1227,128 @@ async function saveCustomTimes(){
if (customTimes != newCustomTimes) await window.api.setToStore("customTimes", newCustomTimes);
if (jumuahTime != newJumuahTime) await window.api.setToStore("jumuahTime", newJumuahTime);

}
}

var countries = ["Afghanistan","Albania","Algeria","Andorra","Angola","Anguilla","Antigua &amp; Barbuda","Argentina","Armenia","Aruba","Australia","Austria","Azerbaijan","Bahamas","Bahrain","Bangladesh","Barbados","Belarus","Belgium","Belize","Benin","Bermuda","Bhutan","Bolivia","Bosnia &amp; Herzegovina","Botswana","Brazil","British Virgin Islands","Brunei","Bulgaria","Burkina Faso","Burundi","Cambodia","Cameroon","Canada","Cape Verde","Cayman Islands","Central Arfrican Republic","Chad","Chile","China","Colombia","Congo","Cook Islands","Costa Rica","Cote D Ivoire","Croatia","Cuba","Curacao","Cyprus","Czech Republic","Denmark","Djibouti","Dominica","Dominican Republic","Ecuador","Egypt","El Salvador","Equatorial Guinea","Eritrea","Estonia","Ethiopia","Falkland Islands","Faroe Islands","Fiji","Finland","France","French Polynesia","French West Indies","Gabon","Gambia","Georgia","Germany","Ghana","Gibraltar","Greece","Greenland","Grenada","Guam","Guatemala","Guernsey","Guinea","Guinea Bissau","Guyana","Haiti","Honduras","Hong Kong","Hungary","Iceland","India","Indonesia","Iran","Iraq","Ireland","Isle of Man","Israel","Italy","Jamaica","Japan","Jersey","Jordan","Kazakhstan","Kenya","Kiribati","Kosovo","Kuwait","Kyrgyzstan","Laos","Latvia","Lebanon","Lesotho","Liberia","Libya","Liechtenstein","Lithuania","Luxembourg","Macau","Macedonia","Madagascar","Malawi","Malaysia","Maldives","Mali","Malta","Marshall Islands","Mauritania","Mauritius","Mexico","Micronesia","Moldova","Monaco","Mongolia","Montenegro","Montserrat","Morocco","Mozambique","Myanmar","Namibia","Nauro","Nepal","Netherlands","Netherlands Antilles","New Caledonia","New Zealand","Nicaragua","Niger","Nigeria","North Korea","Norway","Oman","Pakistan","Palau","Palestine","Panama","Papua New Guinea","Paraguay","Peru","Philippines","Poland","Portugal","Puerto Rico","Qatar","Reunion","Romania","Russia","Rwanda","Saint Pierre &amp; Miquelon","Samoa","San Marino","Sao Tome and Principe","Saudi Arabia","Senegal","Serbia","Seychelles","Sierra Leone","Singapore","Slovakia","Slovenia","Solomon Islands","Somalia","South Africa","South Korea","South Sudan","Spain","Sri Lanka","St Kitts &amp; Nevis","St Lucia","St Vincent","Sudan","Suriname","Swaziland","Sweden","Switzerland","Syria","Taiwan","Tajikistan","Tanzania","Thailand","Timor L'Este","Togo","Tonga","Trinidad &amp; Tobago","Tunisia","Turkey","Turkmenistan","Turks &amp; Caicos","Tuvalu","Uganda","Ukraine","United Arab Emirates","United Kingdom","United States of America","Uruguay","Uzbekistan","Vanuatu","Vatican City","Venezuela","Vietnam","Virgin Islands (US)","Yemen","Zambia","Zimbabwe"];

function autocomplete(inp, latitude, longitude, arr) {
var countries;
var apiUrl;
/*the autocomplete function takes two arguments,
the text field element and an array of possible autocompleted values:*/
var currentFocus;
/*execute a function when someone writes in the text field:*/
inp.addEventListener("input", function(e) {

var a, b, i, val = this.value;
var j = 0;
/*close any already open lists of autocompleted values*/
closeAllLists();
if ((!val) || (val.length < 3)) { return false;}

currentFocus = -1;
/*create a DIV element that will contain the items (values):*/
a = document.createElement("DIV");
a.setAttribute("id", this.id + "autocomplete-list");
a.setAttribute("class", "autocomplete-items");
/*append the DIV element as a child of the autocomplete container:*/
this.parentNode.appendChild(a);
/*for each item in the array...*/
apiUrl = `https://nominatim.openstreetmap.org/search?format=json&city=${encodeURIComponent(val)}`;
fetch(apiUrl)
.then(response => response.json())
.then(data => {
// Handle the data returned from the API
const uniqueDisplayNames = new Set();
arr = data.filter(item => {
if (!uniqueDisplayNames.has(item.display_name)) {
uniqueDisplayNames.add(item.display_name);
return true;
}
return false;
})
for (i = 0; i < arr.length; i++) {
/*check if the item starts with the same letters as the text field value:*/

j = j+1
if (j > 8) break;
/*create a DIV element for each matching element:*/
b = document.createElement("DIV");
/*make the matching letters bold:*/
b.innerHTML = arr[i].display_name
/*insert a input field that will hold the current array item's value:*/
b.innerHTML += "<input type='hidden' id='name' value='" + arr[i].display_name + "'>";
b.innerHTML += "<input type='hidden' id='longitude' value='" + arr[i].lon + "'>";
b.innerHTML += "<input type='hidden' id='latitude' value='" + arr[i].lat + "'>";
/*execute a function when someone clicks on the item value (DIV element):*/
b.addEventListener("click", function(e) {
/*insert the value for the autocomplete text field:*/
inp.value = this.getElementsByTagName("Input")[0].value;
document.getElementById("lonInput").value = this.getElementsByTagName("Input")[1].value;
document.getElementById("latInput").value = this.getElementsByTagName("Input")[2].value;
/*close the list of autocompleted values,
(or any other open lists of autocompleted values:*/
closeAllLists();
});
a.appendChild(b);
}
})


});
/*execute a function presses a key on the keyboard:*/
inp.addEventListener("keydown", function(e) {
var x = document.getElementById(this.id + "autocomplete-list");
if (x) x = x.getElementsByTagName("div");
if (e.keyCode == 40) {
/*If the arrow DOWN key is pressed,
increase the currentFocus variable:*/
currentFocus++;
/*and and make the current item more visible:*/
addActive(x);
} else if (e.keyCode == 38) { //up
/*If the arrow UP key is pressed,
decrease the currentFocus variable:*/
currentFocus--;
/*and and make the current item more visible:*/
addActive(x);
} else if (e.keyCode == 13) {
/*If the ENTER key is pressed, prevent the form from being submitted,*/
e.preventDefault();
if (currentFocus > -1) {
/*and simulate a click on the "active" item:*/
if (x) x[currentFocus].click();
}
}
});
function addActive(x) {
/*a function to classify an item as "active":*/
if (!x) return false;
/*start by removing the "active" class on all items:*/
removeActive(x);
if (currentFocus >= x.length) currentFocus = 0;
if (currentFocus < 0) currentFocus = (x.length - 1);
/*add class "autocomplete-active":*/
x[currentFocus].classList.add("autocomplete-active");
}
function removeActive(x) {
/*a function to remove the "active" class from all autocomplete items:*/
for (var i = 0; i < x.length; i++) {
x[i].classList.remove("autocomplete-active");
}
}
function closeAllLists(elmnt) {
/*close all autocomplete lists in the document,
except the one passed as an argument:*/
var x = document.getElementsByClassName("autocomplete-items");
for (var i = 0; i < x.length; i++) {
if (elmnt != x[i] && elmnt != inp) {
x[i].parentNode.removeChild(x[i]);
}
}
}
/*execute a function when someone clicks in the document:*/
document.addEventListener("click", function (e) {
closeAllLists(e.target);
});
}

0 comments on commit 8d14fa2

Please sign in to comment.