From 93117a14df2d0aee9109d51edd7d6dad834d8ec4 Mon Sep 17 00:00:00 2001
From: marc tobias <mtmail@gmx.net>
Date: Fri, 19 Jun 2020 06:36:37 +0200
Subject: [PATCH] control requesting polygons from API without hidden HTML
 field

---
 dist/assets/js/nominatim-ui.js | 2 +-
 dist/config.example.js         | 2 +-
 dist/search.html               | 3 ---
 dist/searchpage.hbs            | 3 ---
 src/assets/js/searchpage.js    | 2 +-
 src/templates/searchpage.hbs   | 3 ---
 6 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/dist/assets/js/nominatim-ui.js b/dist/assets/js/nominatim-ui.js
index c597643..05019aa 100644
--- 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'),
-      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'
diff --git a/dist/config.example.js b/dist/config.example.js
index bfddf7f..30da769 100644
--- 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['Search_AreaPolygons'] = 1;
+// Nominatim_Config['Search_AreaPolygons'] = true;
 // Nominatim_Config['Reverse_Default_Search_Zoom'] = 18;
 
 // ---- MAP ----
diff --git a/dist/search.html b/dist/search.html
index b3e2b03..afb6c33 100644
--- 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>
-      {{#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"
diff --git a/dist/searchpage.hbs b/dist/searchpage.hbs
index ae13597..7451398 100644
--- 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>
-      {{#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"
diff --git a/src/assets/js/searchpage.js b/src/assets/js/searchpage.js
index 1061712..5455f8e 100755
--- 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'),
-      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'
diff --git a/src/templates/searchpage.hbs b/src/templates/searchpage.hbs
index ae13597..7451398 100644
--- 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>
-      {{#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"
-- 
2.45.1