elikoy commited on
Commit
e2d381e
·
verified ·
1 Parent(s): 4c7cf52

Fix perceelnummer filter: use Textbox instead of Number to avoid Gradio 6 empty->0 conversion

Browse files
Files changed (1) hide show
  1. _space/app.py +17 -16
_space/app.py CHANGED
@@ -113,6 +113,18 @@ def _fmt(v):
113
  return str(v)
114
 
115
 
 
 
 
 
 
 
 
 
 
 
 
 
116
  def build_map(pid):
117
  sel = PARCELS[PARCELS[ID_COL] == pid]
118
  if sel.empty:
@@ -153,19 +165,6 @@ def build_map(pid):
153
  def apply_filters(garden_lo, garden_hi, parcel_lo, parcel_hi, cov_lo, cov_hi, nb_lo, nb_hi,
154
  gemeenten, secties, perc_lo, perc_hi, year_lo, year_hi, excl_year,
155
  doelen, residential, idq, limit):
156
- # DEBUG: log exactly what the UI/API sent
157
- print('DEBUG apply_filters inputs:', {
158
- 'garden_lo': garden_lo, 'garden_hi': garden_hi,
159
- 'parcel_lo': parcel_lo, 'parcel_hi': parcel_hi,
160
- 'cov_lo': cov_lo, 'cov_hi': cov_hi,
161
- 'nb_lo': nb_lo, 'nb_hi': nb_hi,
162
- 'gemeenten': gemeenten, 'secties': secties,
163
- 'perc_lo': perc_lo, 'perc_hi': perc_hi,
164
- 'year_lo': year_lo, 'year_hi': year_hi,
165
- 'excl_year': excl_year,
166
- 'doelen': doelen, 'residential': residential,
167
- 'idq': idq, 'limit': limit,
168
- })
169
  df = DATA
170
  if garden_lo is None:
171
  garden_lo = 0.0
@@ -193,6 +192,9 @@ def apply_filters(garden_lo, garden_hi, parcel_lo, parcel_hi, cov_lo, cov_hi, nb
193
  m = m & df['sectie'].isin(secties)
194
  if doelen:
195
  m = m & df['gebruiksdoel'].isin(doelen)
 
 
 
196
  if perc_lo is not None or perc_hi is not None:
197
  lo = -1 if perc_lo is None else perc_lo
198
  hi = 10 ** 9 if perc_hi is None else perc_hi
@@ -212,7 +214,6 @@ def apply_filters(garden_lo, garden_hi, parcel_lo, parcel_hi, cov_lo, cov_hi, nb
212
  if idq:
213
  m = m & df[ID_COL].astype(str).str.contains(idq.strip(), case=False, na=False)
214
  res = df[m]
215
- print('DEBUG result count:', len(res))
216
  if res.empty:
217
  return 'No parcels match these filters. Try widening the ranges.', None, None
218
  res = res.sort_values('calculated_garden_area', ascending=False)
@@ -287,8 +288,8 @@ with ui.Blocks(title='Maastricht Kadaster Garden Finder') as demo:
287
  nb_lo = ui.Number(value=0, label='Buildings min')
288
  nb_hi = ui.Number(value=50, label='Buildings max')
289
  with ui.Row():
290
- perc_lo = ui.Number(value=None, label='Perceel nr min')
291
- perc_hi = ui.Number(value=None, label='Perceel nr max')
292
  with ui.Row():
293
  year_lo = ui.Number(value=1200, label='Bouwjaar min')
294
  year_hi = ui.Number(value=2026, label='Bouwjaar max')
 
113
  return str(v)
114
 
115
 
116
+ def _parse_int(v):
117
+ if v is None:
118
+ return None
119
+ s = str(v).strip()
120
+ if not s:
121
+ return None
122
+ try:
123
+ return int(s)
124
+ except ValueError:
125
+ return None
126
+
127
+
128
  def build_map(pid):
129
  sel = PARCELS[PARCELS[ID_COL] == pid]
130
  if sel.empty:
 
165
  def apply_filters(garden_lo, garden_hi, parcel_lo, parcel_hi, cov_lo, cov_hi, nb_lo, nb_hi,
166
  gemeenten, secties, perc_lo, perc_hi, year_lo, year_hi, excl_year,
167
  doelen, residential, idq, limit):
 
 
 
 
 
 
 
 
 
 
 
 
 
168
  df = DATA
169
  if garden_lo is None:
170
  garden_lo = 0.0
 
192
  m = m & df['sectie'].isin(secties)
193
  if doelen:
194
  m = m & df['gebruiksdoel'].isin(doelen)
195
+ # Parse perceelnummer from Textbox (empty string = no filter)
196
+ perc_lo = _parse_int(perc_lo)
197
+ perc_hi = _parse_int(perc_hi)
198
  if perc_lo is not None or perc_hi is not None:
199
  lo = -1 if perc_lo is None else perc_lo
200
  hi = 10 ** 9 if perc_hi is None else perc_hi
 
214
  if idq:
215
  m = m & df[ID_COL].astype(str).str.contains(idq.strip(), case=False, na=False)
216
  res = df[m]
 
217
  if res.empty:
218
  return 'No parcels match these filters. Try widening the ranges.', None, None
219
  res = res.sort_values('calculated_garden_area', ascending=False)
 
288
  nb_lo = ui.Number(value=0, label='Buildings min')
289
  nb_hi = ui.Number(value=50, label='Buildings max')
290
  with ui.Row():
291
+ perc_lo = ui.Textbox(value='', label='Perceel nr min')
292
+ perc_hi = ui.Textbox(value='', label='Perceel nr max')
293
  with ui.Row():
294
  year_lo = ui.Number(value=1200, label='Bouwjaar min')
295
  year_hi = ui.Number(value=2026, label='Bouwjaar max')