control requesting polygons from API without hidden HTML field

diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index c597643fc804858acb26475c08b8af8040b41791..05019aa87ba63d7e7da6f95df422c1b644f8d4eb 100644 (file)
--- a/dist/assets/js/nominatim-ui.js
+++ b/dist/assets/js/nominatim-ui.js
@@ -653,7 +653,7 @@ jQuery(document).ready(function () {
       state: search_params.get('state'),
       country: search_params.get('country'),
       postalcode: search_params.get('postalcode'),
       state: search_params.get('state'),
       country: search_params.get('country'),
       postalcode: search_params.get('postalcode'),

-      polygon_geojson: search_params.get('polygon_geojson') ? 1 : 0,
+      polygon_geojson: get_config_value('Search_AreaPolygons', false) ? 1 : 0,

       viewbox: search_params.get('viewbox'),
       exclude_place_ids: search_params.get('exclude_place_ids'),
       format: 'jsonv2'
       viewbox: search_params.get('viewbox'),
       exclude_place_ids: search_params.get('exclude_place_ids'),
       format: 'jsonv2'

diff --git a/dist/config.example.js b/dist/config.example.js
index bfddf7fc2610ff3a17e88f6637125daecb1490d3..30da76997b2f28a450fe06435113da944d5b73d3 100644 (file)
--- a/dist/config.example.js
+++ b/dist/config.example.js
@@ -12,7 +12,7 @@ Nominatim_Config['Nominatim_API_Endpoint'] = 'https://nominatim.openstreetmap.or
 // Nominatim_Config['Images_Base_Url'] = '/mapicons/';
 
 // If the API should return polygons to be displayed on the map
 // Nominatim_Config['Images_Base_Url'] = '/mapicons/';
 
 // If the API should return polygons to be displayed on the map

-// Nominatim_Config['Search_AreaPolygons'] = 1;
+// Nominatim_Config['Search_AreaPolygons'] = true;

 // Nominatim_Config['Reverse_Default_Search_Zoom'] = 18;
 
 // ---- MAP ----
 // Nominatim_Config['Reverse_Default_Search_Zoom'] = 18;
 
 // ---- MAP ----

diff --git a/dist/search.html b/dist/search.html
index b3e2b032ae5d05da845d05337700439c6a88be9d..afb6c33adb69e28514e988e0fb1b0d0622f374a9 100644 (file)
--- a/dist/search.html
+++ b/dist/search.html
@@ -178,9 +178,6 @@
     </div>
     <div class="form-group search-button-group">
             <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>
     </div>
     <div class="form-group search-button-group">
             <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>

-      {{#if env.Search_AreaPolygons}}
-        <input type="hidden" value="1" name="polygon_geojson" />
-      {{/if}}

       <input type="hidden" name="viewbox" value="{{sViewBox}}" />
       <div class="form-check form-check-inline">
         <input type="checkbox" class="form-check-input"
       <input type="hidden" name="viewbox" value="{{sViewBox}}" />
       <div class="form-check form-check-inline">
         <input type="checkbox" class="form-check-input"

diff --git a/dist/searchpage.hbs b/dist/searchpage.hbs
index ae13597009ce9f7353834d6b0aeeb6cdcf689af3..7451398d88c148222ec792eaf6a29aa7397ed56f 100644 (file)
--- a/dist/searchpage.hbs
+++ b/dist/searchpage.hbs
@@ -59,9 +59,6 @@
     </div>
     <div class="form-group search-button-group">
             <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>
     </div>
     <div class="form-group search-button-group">
             <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>

-      {{#if env.Search_AreaPolygons}}
-        <input type="hidden" value="1" name="polygon_geojson" />
-      {{/if}}

       <input type="hidden" name="viewbox" value="{{sViewBox}}" />
       <div class="form-check form-check-inline">
         <input type="checkbox" class="form-check-input"
       <input type="hidden" name="viewbox" value="{{sViewBox}}" />
       <div class="form-check form-check-inline">
         <input type="checkbox" class="form-check-input"

diff --git a/src/assets/js/searchpage.js b/src/assets/js/searchpage.js
index 1061712a6cf0afe8ca9f82f34905cf6cd4d31cb3..5455f8e8f6dc542170c4569f4b63cff4cb8d25a9 100755 (executable)
--- a/src/assets/js/searchpage.js
+++ b/src/assets/js/searchpage.js
@@ -395,7 +395,7 @@ jQuery(document).ready(function () {
       state: search_params.get('state'),
       country: search_params.get('country'),
       postalcode: search_params.get('postalcode'),
       state: search_params.get('state'),
       country: search_params.get('country'),
       postalcode: search_params.get('postalcode'),

-      polygon_geojson: search_params.get('polygon_geojson') ? 1 : 0,
+      polygon_geojson: get_config_value('Search_AreaPolygons', false) ? 1 : 0,

       viewbox: search_params.get('viewbox'),
       exclude_place_ids: search_params.get('exclude_place_ids'),
       format: 'jsonv2'
       viewbox: search_params.get('viewbox'),
       exclude_place_ids: search_params.get('exclude_place_ids'),
       format: 'jsonv2'

diff --git a/src/templates/searchpage.hbs b/src/templates/searchpage.hbs
index ae13597009ce9f7353834d6b0aeeb6cdcf689af3..7451398d88c148222ec792eaf6a29aa7397ed56f 100644 (file)
--- a/src/templates/searchpage.hbs
+++ b/src/templates/searchpage.hbs
@@ -59,9 +59,6 @@
     </div>
     <div class="form-group search-button-group">
             <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>
     </div>
     <div class="form-group search-button-group">
             <button type="submit" class="btn btn-primary btn-sm mx-1">Search</button>

-      {{#if env.Search_AreaPolygons}}
-        <input type="hidden" value="1" name="polygon_geojson" />
-      {{/if}}

       <input type="hidden" name="viewbox" value="{{sViewBox}}" />
       <div class="form-check form-check-inline">
         <input type="checkbox" class="form-check-input"
       <input type="hidden" name="viewbox" value="{{sViewBox}}" />
       <div class="form-check form-check-inline">
         <input type="checkbox" class="form-check-input"