From 64bed2c16dbe84466f85f08fde51efd3ab884a6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 09:39:07 +0000 Subject: [PATCH 01/14] Bump numpy from 1.24.3 to 1.25.2 Bumps [numpy](https://github.com/numpy/numpy) from 1.24.3 to 1.25.2. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v1.24.3...v1.25.2) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 445d49c..e3e8e6a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ geopy==2.3.0 gunicorn==20.1.0 imagekitio==3.0.1 loguru==0.7.0 -numpy==1.24.3 +numpy==1.25.2 openpyxl==3.1.2 orjson==3.9.0 pandas==2.0.1 From 42f026812aa8236d1f040478034c90cf3c54c4ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 09:45:15 +0000 Subject: [PATCH 02/14] Bump orjson from 3.9.0 to 3.9.5 Bumps [orjson](https://github.com/ijl/orjson) from 3.9.0 to 3.9.5. - [Release notes](https://github.com/ijl/orjson/releases) - [Changelog](https://github.com/ijl/orjson/blob/master/CHANGELOG.md) - [Commits](https://github.com/ijl/orjson/compare/3.9.0...3.9.5) --- updated-dependencies: - dependency-name: orjson dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 445d49c..57573be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ imagekitio==3.0.1 loguru==0.7.0 numpy==1.24.3 openpyxl==3.1.2 -orjson==3.9.0 +orjson==3.9.5 pandas==2.0.1 protobuf==3.20.* pyarrow==12.0.1 From 29a6fad19968e8b303c30941a384b5100e125a0e Mon Sep 17 00:00:00 2001 From: Sahib Bhai Date: Sat, 26 Aug 2023 17:33:25 -0700 Subject: [PATCH 03/14] Update Dash Leaflet to the latest RC version Potential fix for the autoPan issue --- pages/buy_page.py | 5 ++--- pages/lease_page.py | 8 +++++--- requirements.txt | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pages/buy_page.py b/pages/buy_page.py index f7161bc..e96e1d0 100644 --- a/pages/buy_page.py +++ b/pages/buy_page.py @@ -646,14 +646,13 @@ def senior_community_function(choice, subtype_selected): lat_mean = df['Latitude'].mean() long_mean = df['Longitude'].mean() map = dl.Map( - [dl.TileLayer(), dl.LayerGroup(id="buy_geojson"), dl.FullscreenControl()], + [dl.TileLayer(), dl.LayerGroup(id="buy_geojson"), dl.FullScreenControl()], id='map', zoom=9, minZoom=9, center=(lat_mean, long_mean), preferCanvas=True, closePopupOnClick=True, - tap=False, style={'width': '100%', 'height': '90vh', 'margin': "auto", "display": "inline-block"} ) @@ -955,5 +954,5 @@ def update_map( 'radius': 160, 'minZoom': 3, }, - options=dict(onEachFeature=ns("on_each_feature")) + #options=dict(onEachFeature=ns("on_each_feature")) ) \ No newline at end of file diff --git a/pages/lease_page.py b/pages/lease_page.py index f0c9f1a..a9e5b8e 100644 --- a/pages/lease_page.py +++ b/pages/lease_page.py @@ -897,14 +897,13 @@ def subtype_function(choice): # Generate the map map = dl.Map( - [dl.TileLayer(), dl.LayerGroup(id="lease_geojson"), dl.FullscreenControl()], + [dl.TileLayer(), dl.LayerGroup(id="lease_geojson"), dl.FullScreenControl()], id='map', zoom=9, minZoom=9, center=(lat_mean, long_mean), preferCanvas=True, closePopupOnClick=True, - tap=False, style={'width': '100%', 'height': '90vh', 'margin': "auto", "display": "inline-block"} ) @@ -1097,6 +1096,9 @@ def update_map(subtypes_chosen, pets_chosen, terms_chosen, garage_spaces, rental The resulting filtered dataframe has {len(df_filtered.index)} rows and {len(markers)} markers out of {len(df.index)} total rows.""") + # print the Dash Leaflet version for debugging + logger.debug(f"""Dash Leaflet version: {dl.__version__}""") + # Now check for missing rows #if len(df) != len(df_filtered): # Merge the two dataframes to find rows that are not common in both dataframes @@ -1116,5 +1118,5 @@ def update_map(subtypes_chosen, pets_chosen, terms_chosen, garage_spaces, rental 'radius': 160, 'minZoom': 3, }, - options=dict(onEachFeature=ns("on_each_feature")) + #options=dict(onEachFeature=ns("on_each_feature")) ) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 445d49c..33c1e48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ dash_bootstrap_components==1.4.1 dash_core_components==2.0.0 dash_extensions==1.0.1 dash_html_components==2.0.0 -dash_leaflet==0.1.23 +dash-leaflet==1.0.5rc1 dash==2.10.0 geopy==2.3.0 gunicorn==20.1.0 From ce7ddac28726a6abb6ae5675ef6abf1f9ac3da91 Mon Sep 17 00:00:00 2001 From: Sahib Bhai Date: Sat, 26 Aug 2023 17:33:59 -0700 Subject: [PATCH 04/14] Remove debug statement --- pages/lease_page.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pages/lease_page.py b/pages/lease_page.py index a9e5b8e..b5b0fc1 100644 --- a/pages/lease_page.py +++ b/pages/lease_page.py @@ -1096,9 +1096,6 @@ def update_map(subtypes_chosen, pets_chosen, terms_chosen, garage_spaces, rental The resulting filtered dataframe has {len(df_filtered.index)} rows and {len(markers)} markers out of {len(df.index)} total rows.""") - # print the Dash Leaflet version for debugging - logger.debug(f"""Dash Leaflet version: {dl.__version__}""") - # Now check for missing rows #if len(df) != len(df_filtered): # Merge the two dataframes to find rows that are not common in both dataframes From c8b33b0f68cb700a83a835232628334e2dd62ec0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 00:41:08 +0000 Subject: [PATCH 05/14] Bump dash from 2.10.0 to 2.12.1 Bumps [dash](https://github.com/plotly/dash) from 2.10.0 to 2.12.1. - [Release notes](https://github.com/plotly/dash/releases) - [Changelog](https://github.com/plotly/dash/blob/dev/CHANGELOG.md) - [Commits](https://github.com/plotly/dash/compare/v2.10.0...v2.12.1) --- updated-dependencies: - dependency-name: dash dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 33c1e48..234c929 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ dash_core_components==2.0.0 dash_extensions==1.0.1 dash_html_components==2.0.0 dash-leaflet==1.0.5rc1 -dash==2.10.0 +dash==2.12.1 geopy==2.3.0 gunicorn==20.1.0 imagekitio==3.0.1 From d40cc75b7ea5f747c90641f7e34feb4bf8a9ffaf Mon Sep 17 00:00:00 2001 From: Sahib Bhai Date: Sat, 26 Aug 2023 17:47:10 -0700 Subject: [PATCH 06/14] Revert the JS changes, but omit autoPan disabling --- assets/popup.js | 4 ++-- pages/buy_page.py | 2 +- pages/lease_page.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/popup.js b/assets/popup.js index 5c094a9..9c6600f 100644 --- a/assets/popup.js +++ b/assets/popup.js @@ -11,8 +11,8 @@ window.dash_props = Object.assign({}, window.dash_props, { layer.bindPopup(feature.properties.popup, { // Here you can customize the popup // https://leafletjs.com/reference.html#popup-option - autoPan: false, - closeButton: false, + //autoPan: false, + //closeButton: false, // Set the maxHeight to 500px if the device is mobile, otherwise use the default value maxHeight: window.innerWidth < 768 ? 500 : 650, // Set the maxWidth to 175px if the device is mobile, otherwise use the default value diff --git a/pages/buy_page.py b/pages/buy_page.py index e96e1d0..ec29844 100644 --- a/pages/buy_page.py +++ b/pages/buy_page.py @@ -954,5 +954,5 @@ def update_map( 'radius': 160, 'minZoom': 3, }, - #options=dict(onEachFeature=ns("on_each_feature")) + options=dict(onEachFeature=ns("on_each_feature")) ) \ No newline at end of file diff --git a/pages/lease_page.py b/pages/lease_page.py index b5b0fc1..99679e3 100644 --- a/pages/lease_page.py +++ b/pages/lease_page.py @@ -1115,5 +1115,5 @@ def update_map(subtypes_chosen, pets_chosen, terms_chosen, garage_spaces, rental 'radius': 160, 'minZoom': 3, }, - #options=dict(onEachFeature=ns("on_each_feature")) + options=dict(onEachFeature=ns("on_each_feature")) ) \ No newline at end of file From 3fddc2318d23749d7de08c2b2f4831f62fa1c9a6 Mon Sep 17 00:00:00 2001 From: Sahib Bhai Date: Sat, 26 Aug 2023 21:56:56 -0700 Subject: [PATCH 07/14] Reduce popup size --- assets/popup.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/popup.js b/assets/popup.js index 9c6600f..8b951a6 100644 --- a/assets/popup.js +++ b/assets/popup.js @@ -13,10 +13,10 @@ window.dash_props = Object.assign({}, window.dash_props, { // https://leafletjs.com/reference.html#popup-option //autoPan: false, //closeButton: false, - // Set the maxHeight to 500px if the device is mobile, otherwise use the default value - maxHeight: window.innerWidth < 768 ? 500 : 650, - // Set the maxWidth to 175px if the device is mobile, otherwise use the default value - maxWidth: window.innerWidth < 768 ? 175 : 300, + // Set the maxHeight to 450px if the device is mobile, otherwise use the default value + maxHeight: window.innerWidth < 768 ? 450 : 650, + // Set the maxWidth to 400px if the device is mobile, otherwise use the default value + maxWidth: window.innerWidth < 768 ? 400 : 300, }) } } From b6c5effdd51ee31c09bf78a26b0eefb197f25dc3 Mon Sep 17 00:00:00 2001 From: Sahib Bhai Date: Sat, 26 Aug 2023 22:19:20 -0700 Subject: [PATCH 08/14] Revert "Reduce popup size" This reverts commit 3fddc2318d23749d7de08c2b2f4831f62fa1c9a6. --- assets/popup.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/popup.js b/assets/popup.js index 8b951a6..9c6600f 100644 --- a/assets/popup.js +++ b/assets/popup.js @@ -13,10 +13,10 @@ window.dash_props = Object.assign({}, window.dash_props, { // https://leafletjs.com/reference.html#popup-option //autoPan: false, //closeButton: false, - // Set the maxHeight to 450px if the device is mobile, otherwise use the default value - maxHeight: window.innerWidth < 768 ? 450 : 650, - // Set the maxWidth to 400px if the device is mobile, otherwise use the default value - maxWidth: window.innerWidth < 768 ? 400 : 300, + // Set the maxHeight to 500px if the device is mobile, otherwise use the default value + maxHeight: window.innerWidth < 768 ? 500 : 650, + // Set the maxWidth to 175px if the device is mobile, otherwise use the default value + maxWidth: window.innerWidth < 768 ? 175 : 300, }) } } From 87ec874167b12173d7312359bddf1eaf16c10ec6 Mon Sep 17 00:00:00 2001 From: Sahib Bhai Date: Sat, 26 Aug 2023 22:26:52 -0700 Subject: [PATCH 09/14] Reduce popup height so it doesn't autoclose when panning --- assets/popup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/popup.js b/assets/popup.js index 9c6600f..fb4003d 100644 --- a/assets/popup.js +++ b/assets/popup.js @@ -13,8 +13,8 @@ window.dash_props = Object.assign({}, window.dash_props, { // https://leafletjs.com/reference.html#popup-option //autoPan: false, //closeButton: false, - // Set the maxHeight to 500px if the device is mobile, otherwise use the default value - maxHeight: window.innerWidth < 768 ? 500 : 650, + // Set the maxHeight to 375px if the device is mobile, otherwise use the default value + maxHeight: window.innerWidth < 768 ? 375 : 650, // Set the maxWidth to 175px if the device is mobile, otherwise use the default value maxWidth: window.innerWidth < 768 ? 175 : 300, }) From 691a09835cf9e338f56f155ae8b0cd2e683de2c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 05:38:23 +0000 Subject: [PATCH 10/14] Bump pyarrow from 12.0.1 to 13.0.0 Bumps [pyarrow](https://github.com/apache/arrow) from 12.0.1 to 13.0.0. - [Commits](https://github.com/apache/arrow/compare/go/v12.0.1...go/v13.0.0) --- updated-dependencies: - dependency-name: pyarrow dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b1daa1d..9a414aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ openpyxl==3.1.2 orjson==3.9.5 pandas==2.0.1 protobuf==3.20.* -pyarrow==12.0.1 +pyarrow==13.0.0 python-dotenv==1.0.0 pyyaml requests==2.31.0 From cbcd85e1184ef193e2e5718d402262cb63583587 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 05:38:34 +0000 Subject: [PATCH 11/14] Bump dash-bootstrap-components from 1.4.1 to 1.4.2 Bumps [dash-bootstrap-components](https://github.com/facultyai/dash-bootstrap-components) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/facultyai/dash-bootstrap-components/releases) - [Changelog](https://github.com/facultyai/dash-bootstrap-components/blob/main/docs/how-to-release.md) - [Commits](https://github.com/facultyai/dash-bootstrap-components/compare/1.4.1...1.4.2) --- updated-dependencies: - dependency-name: dash-bootstrap-components dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b1daa1d..b057338 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ beautifulsoup4==4.12.2 -dash_bootstrap_components==1.4.1 +dash_bootstrap_components==1.4.2 dash_core_components==2.0.0 dash_extensions==1.0.1 dash_html_components==2.0.0 From a830ed6e7a5b2185596264d0efbf4408b8ad9a25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 05:38:38 +0000 Subject: [PATCH 12/14] Bump gunicorn from 20.1.0 to 21.2.0 Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 21.2.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/20.1.0...21.2.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b1daa1d..3919441 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ dash_html_components==2.0.0 dash-leaflet==1.0.5rc1 dash==2.12.1 geopy==2.3.0 -gunicorn==20.1.0 +gunicorn==21.2.0 imagekitio==3.0.1 loguru==0.7.0 numpy==1.25.2 From 169fa7087b72d692646e31d0c06cfcbe2c6b7136 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 05:38:43 +0000 Subject: [PATCH 13/14] Bump dash-extensions from 1.0.1 to 1.0.3 Bumps [dash-extensions](https://github.com/thedirtyfew/dash-extensions) from 1.0.1 to 1.0.3. - [Release notes](https://github.com/thedirtyfew/dash-extensions/releases) - [Changelog](https://github.com/thedirtyfew/dash-extensions/blob/master/CHANGELOG.md) - [Commits](https://github.com/thedirtyfew/dash-extensions/compare/1.0.1...1.0.3) --- updated-dependencies: - dependency-name: dash-extensions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b1daa1d..9b78092 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ beautifulsoup4==4.12.2 dash_bootstrap_components==1.4.1 dash_core_components==2.0.0 -dash_extensions==1.0.1 +dash_extensions==1.0.3 dash_html_components==2.0.0 dash-leaflet==1.0.5rc1 dash==2.12.1 From 17a243ca9bc757acbd2e57fbf7589545258bfb37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 05:39:50 +0000 Subject: [PATCH 14/14] Bump imagekitio from 3.0.1 to 3.1.0 Bumps [imagekitio](https://github.com/imagekit-developer/imagekit-python) from 3.0.1 to 3.1.0. - [Release notes](https://github.com/imagekit-developer/imagekit-python/releases) - [Commits](https://github.com/imagekit-developer/imagekit-python/compare/3.0.1...3.1.0) --- updated-dependencies: - dependency-name: imagekitio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0531fef..b1e8373 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ dash-leaflet==1.0.5rc1 dash==2.12.1 geopy==2.3.0 gunicorn==21.2.0 -imagekitio==3.0.1 +imagekitio==3.1.0 loguru==0.7.0 numpy==1.25.2 openpyxl==3.1.2