osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-23 05:35:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1793 from lonvia/remove-struct-params-in-gui

Browse Source 
search UI: hide unused query parameters
This commit is contained in:
Sarah Hoffmann 2020-05-15 16:50:54 +02:00 committed by GitHub
commit f69c3d2b66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/template/search-html.php
View File

@ -14,40 +14,21 @@
<div class="search-type-link">
<a id="switch-to-reverse" href="<?php echo CONST_Website_BaseURL; ?>reverse.php?format=html">reverse search</a>
</div>
<?php
$bSimpleQuery = !empty($aMoreParams['q']);
$bStructuredQuery = !$bSimpleQuery
&& !(empty($aMoreParams['street'])
&& empty($aMoreParams['city'])
&& empty($aMoreParams['county'])
&& empty($aMoreParams['state'])
&& empty($aMoreParams['country'])
&& empty($aMoreParams['postalcode']));
?>
<div class="radio-inline">
<input type="radio" name="query-selector" id="simple" value="simple" <?php if ($bSimpleQuery) { echo 'checked="checked"'; } ?> >
<input type="radio" name="query-selector" id="simple" value="simple">
<label for="simple">simple</label>
</div>
<div class="radio-inline">
<input type="radio" name="query-selector" id="structured" value="structured" <?php if ($bStructuredQuery) { echo 'checked="checked"'; } ?> >
<input type="radio" name="query-selector" id="structured" value="structured">
<label for="structured">structured</label>
</div>
<form role="search" accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php">
<div class="form-group-simple"
<?php
if ($bStructuredQuery) {
echo 'style="display:none;"';
}
?>>
<div class="form-group-simple">
<input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="<?php echo htmlspecialchars($aMoreParams['q'] ?? ''); ?>" >
</div>
<div class="form-group-structured"
<?php
if (!$bStructuredQuery) {
echo "style='display:none;'";
}
?>>
<div class="form-group-structured">
<div class="form-inline">
<input id="street" name="street" type="text" class="form-control input-sm" placeholder="House number/Street" value="<?php echo htmlspecialchars($aMoreParams['street'] ?? ''); ?>" >
<input id="city" name="city" type="text" class="form-control input-sm" placeholder="City" value="<?php echo htmlspecialchars($aMoreParams['city'] ?? ''); ?>" >
@ -141,6 +122,15 @@
echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
echo 'var nominatim_results = ' . json_encode($aSearchResults, JSON_PRETTY_PRINT) . ';';
$sStructuredQuery = (empty($aMoreParams['q'])
&& !(empty($aMoreParams['street'])
&& empty($aMoreParams['city'])
&& empty($aMoreParams['county'])
&& empty($aMoreParams['state'])
&& empty($aMoreParams['country'])
&& empty($aMoreParams['postalcode'])))
? 'true' : 'false';
echo 'var nominatim_structured_query = '.$sStructuredQuery.';';
?>
</script>
<?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>

10
website/js/nominatim-ui.js
View File

@ -31,14 +31,24 @@ jQuery(document).ready(function(){
if (query_val == "simple") {
$("div.form-group-structured").hide();
$("div.form-group-simple").show();
$("div.form-group-structured .form-control").prop('disabled', true);
$("div.form-group-simple .form-control").prop('disabled', false);
$('.form-group-structured').find('input:text').val('');
}
else if (query_val == "structured") {
$("div.form-group-simple").hide();
$("div.form-group-structured").show();
$("div.form-group-structured .form-control").prop('disabled', false);
$("div.form-group-simple .form-control").prop('disabled', true);
$('.form-group-simple').find('input:text').val('');
}
});
if (nominatim_structured_query) {
$('input#structured').prop('checked', true).trigger('click');
} else {
$('input#simple').prop('checked', true).trigger('click');
}
});
map = new L.map('map', {