Spaces:
Runtime error
Enhanced TreeTrack map with comprehensive improvements
Browse filesTree Loading & Performance:
- Implemented batch loading to handle large datasets efficiently
- Added accurate tree count display showing loaded vs total trees
- Enhanced error handling and progress tracking for marker creation
- Optimized loading performance with batched API calls
Visual Enhancements:
- Upgraded to beautiful satellite imagery as primary map layer
- Added terrain and street map options with layer switcher
- Implemented category-based tree markers with distinct colors:
* Ficus (Banyan/Fig) - Emerald green
* Mangifera (Mango) - Amber
* Bambusa (Bamboo) - Green
* Azadirachta (Neem) - Lime green
* Tectona (Teak) - Red-brown
* Other Species - Default green
User Experience:
- Added comprehensive instructions panel with Ishita's exact text
- Included interactive tree species legend with color coding
- Auto-show instructions for first-time visitors (10s timeout)
- Dismissible instructions panel with localStorage persistence
- Enhanced tooltips and popups with better species information
Conference Ready:
- Professional styling suitable for conference presentation
- Clear user guidance about map functionality
- Beautiful satellite imagery showcasing Tezpur's natural landscape
- Responsive design for various screen sizes
- static/index.html +2 -2
- static/map.html +158 -2
- static/map.js +189 -23
- static/sw.js +1 -1
- version.json +1 -1
|
@@ -947,7 +947,7 @@
|
|
| 947 |
// Force refresh if we detect cached version
|
| 948 |
(function() {
|
| 949 |
const currentVersion = '5.1.1';
|
| 950 |
-
const timestamp = '
|
| 951 |
const lastVersion = sessionStorage.getItem('treetrack_version');
|
| 952 |
const lastTimestamp = sessionStorage.getItem('treetrack_timestamp');
|
| 953 |
|
|
@@ -1193,7 +1193,7 @@
|
|
| 1193 |
</div>
|
| 1194 |
</div>
|
| 1195 |
|
| 1196 |
-
<script type="module" src="/static/js/tree-track-app.js?v=5.1.1&t=
|
| 1197 |
|
| 1198 |
<script>
|
| 1199 |
// Idle-time prefetch of map assets to speed up first navigation
|
|
|
|
| 947 |
// Force refresh if we detect cached version
|
| 948 |
(function() {
|
| 949 |
const currentVersion = '5.1.1';
|
| 950 |
+
const timestamp = '1761504811'; // Cache-busting bump
|
| 951 |
const lastVersion = sessionStorage.getItem('treetrack_version');
|
| 952 |
const lastTimestamp = sessionStorage.getItem('treetrack_timestamp');
|
| 953 |
|
|
|
|
| 1193 |
</div>
|
| 1194 |
</div>
|
| 1195 |
|
| 1196 |
+
<script type="module" src="/static/js/tree-track-app.js?v=5.1.1&t=1761504811"></script>
|
| 1197 |
|
| 1198 |
<script>
|
| 1199 |
// Idle-time prefetch of map assets to speed up first navigation
|
|
@@ -781,6 +781,138 @@
|
|
| 781 |
transform: translate3d(0, 0, 0);
|
| 782 |
}
|
| 783 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 784 |
/* Focus States */
|
| 785 |
.btn:focus-visible,
|
| 786 |
.control-button:focus-visible,
|
|
@@ -793,7 +925,7 @@
|
|
| 793 |
// Force refresh if we detect cached version
|
| 794 |
(function() {
|
| 795 |
const currentVersion = '5.1.1';
|
| 796 |
-
const timestamp = '
|
| 797 |
const lastVersion = sessionStorage.getItem('treetrack_version');
|
| 798 |
const lastTimestamp = sessionStorage.getItem('treetrack_timestamp');
|
| 799 |
|
|
@@ -852,6 +984,30 @@ const timestamp = '1761504068'; // Current timestamp for cache busting
|
|
| 852 |
<div class="map-container">
|
| 853 |
<div id="map"></div>
|
| 854 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 855 |
<!-- Controls Panel -->
|
| 856 |
<div class="controls-panel">
|
| 857 |
<div class="controls-header">
|
|
@@ -920,7 +1076,7 @@ const timestamp = '1761504068'; // Current timestamp for cache busting
|
|
| 920 |
|
| 921 |
<!-- Leaflet JS -->
|
| 922 |
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
|
| 923 |
-
<script src="/static/map.js?v=5.1.1&t=
|
| 924 |
|
| 925 |
"default-state": {
|
| 926 |
gradients: [
|
|
|
|
| 781 |
transform: translate3d(0, 0, 0);
|
| 782 |
}
|
| 783 |
|
| 784 |
+
/* Instructions Panel */
|
| 785 |
+
.instructions-panel {
|
| 786 |
+
position: absolute;
|
| 787 |
+
top: var(--space-4);
|
| 788 |
+
right: var(--space-4);
|
| 789 |
+
z-index: 1000;
|
| 790 |
+
background: rgba(255, 255, 255, 0.95);
|
| 791 |
+
backdrop-filter: blur(12px);
|
| 792 |
+
border-radius: var(--radius-xl);
|
| 793 |
+
border: 1px solid var(--gray-200);
|
| 794 |
+
box-shadow: var(--shadow-lg);
|
| 795 |
+
width: 320px;
|
| 796 |
+
max-width: calc(100vw - 2rem);
|
| 797 |
+
transition: all 0.3s ease;
|
| 798 |
+
}
|
| 799 |
+
|
| 800 |
+
.instructions-panel.hidden {
|
| 801 |
+
transform: translateX(100%);
|
| 802 |
+
opacity: 0;
|
| 803 |
+
pointer-events: none;
|
| 804 |
+
}
|
| 805 |
+
|
| 806 |
+
.instructions-header {
|
| 807 |
+
padding: var(--space-4);
|
| 808 |
+
border-bottom: 1px solid var(--gray-100);
|
| 809 |
+
display: flex;
|
| 810 |
+
justify-content: space-between;
|
| 811 |
+
align-items: center;
|
| 812 |
+
}
|
| 813 |
+
|
| 814 |
+
.instructions-title {
|
| 815 |
+
font-size: 1rem;
|
| 816 |
+
font-weight: 600;
|
| 817 |
+
color: var(--gray-900);
|
| 818 |
+
margin: 0;
|
| 819 |
+
}
|
| 820 |
+
|
| 821 |
+
.close-instructions {
|
| 822 |
+
background: none;
|
| 823 |
+
border: none;
|
| 824 |
+
font-size: 1.5rem;
|
| 825 |
+
color: var(--gray-500);
|
| 826 |
+
cursor: pointer;
|
| 827 |
+
padding: 0;
|
| 828 |
+
width: 24px;
|
| 829 |
+
height: 24px;
|
| 830 |
+
display: flex;
|
| 831 |
+
align-items: center;
|
| 832 |
+
justify-content: center;
|
| 833 |
+
border-radius: 50%;
|
| 834 |
+
transition: all 0.15s ease;
|
| 835 |
+
}
|
| 836 |
+
|
| 837 |
+
.close-instructions:hover {
|
| 838 |
+
background: var(--gray-100);
|
| 839 |
+
color: var(--gray-700);
|
| 840 |
+
}
|
| 841 |
+
|
| 842 |
+
.instructions-content {
|
| 843 |
+
padding: var(--space-4);
|
| 844 |
+
}
|
| 845 |
+
|
| 846 |
+
.instructions-content p {
|
| 847 |
+
margin: 0 0 var(--space-3) 0;
|
| 848 |
+
font-size: 0.875rem;
|
| 849 |
+
color: var(--gray-700);
|
| 850 |
+
line-height: 1.5;
|
| 851 |
+
}
|
| 852 |
+
|
| 853 |
+
.instructions-content p:last-of-type {
|
| 854 |
+
margin-bottom: var(--space-4);
|
| 855 |
+
}
|
| 856 |
+
|
| 857 |
+
.tree-legend h4 {
|
| 858 |
+
font-size: 0.875rem;
|
| 859 |
+
font-weight: 600;
|
| 860 |
+
color: var(--gray-900);
|
| 861 |
+
margin: 0 0 var(--space-2) 0;
|
| 862 |
+
}
|
| 863 |
+
|
| 864 |
+
.legend-items {
|
| 865 |
+
display: grid;
|
| 866 |
+
gap: var(--space-1);
|
| 867 |
+
}
|
| 868 |
+
|
| 869 |
+
.legend-item {
|
| 870 |
+
display: flex;
|
| 871 |
+
align-items: center;
|
| 872 |
+
gap: var(--space-2);
|
| 873 |
+
font-size: 0.75rem;
|
| 874 |
+
color: var(--gray-600);
|
| 875 |
+
}
|
| 876 |
+
|
| 877 |
+
.legend-color {
|
| 878 |
+
width: 12px;
|
| 879 |
+
height: 12px;
|
| 880 |
+
border-radius: 50%;
|
| 881 |
+
flex-shrink: 0;
|
| 882 |
+
}
|
| 883 |
+
|
| 884 |
+
/* Instructions Toggle Button */
|
| 885 |
+
.instructions-toggle {
|
| 886 |
+
position: absolute;
|
| 887 |
+
top: var(--space-4);
|
| 888 |
+
right: var(--space-4);
|
| 889 |
+
z-index: 1001;
|
| 890 |
+
background: var(--primary-600);
|
| 891 |
+
color: white;
|
| 892 |
+
border: none;
|
| 893 |
+
border-radius: 50%;
|
| 894 |
+
width: 48px;
|
| 895 |
+
height: 48px;
|
| 896 |
+
display: flex;
|
| 897 |
+
align-items: center;
|
| 898 |
+
justify-content: center;
|
| 899 |
+
cursor: pointer;
|
| 900 |
+
box-shadow: var(--shadow-lg);
|
| 901 |
+
transition: all 0.2s ease;
|
| 902 |
+
font-size: 0.875rem;
|
| 903 |
+
font-weight: 600;
|
| 904 |
+
}
|
| 905 |
+
|
| 906 |
+
.instructions-toggle:hover {
|
| 907 |
+
background: var(--primary-700);
|
| 908 |
+
transform: scale(1.05);
|
| 909 |
+
}
|
| 910 |
+
|
| 911 |
+
.instructions-toggle.hidden {
|
| 912 |
+
opacity: 0;
|
| 913 |
+
pointer-events: none;
|
| 914 |
+
}
|
| 915 |
+
|
| 916 |
/* Focus States */
|
| 917 |
.btn:focus-visible,
|
| 918 |
.control-button:focus-visible,
|
|
|
|
| 925 |
// Force refresh if we detect cached version
|
| 926 |
(function() {
|
| 927 |
const currentVersion = '5.1.1';
|
| 928 |
+
const timestamp = '1761504811'; // Current timestamp for cache busting
|
| 929 |
const lastVersion = sessionStorage.getItem('treetrack_version');
|
| 930 |
const lastTimestamp = sessionStorage.getItem('treetrack_timestamp');
|
| 931 |
|
|
|
|
| 984 |
<div class="map-container">
|
| 985 |
<div id="map"></div>
|
| 986 |
|
| 987 |
+
<!-- Instructions Panel -->
|
| 988 |
+
<div class="instructions-panel" id="instructionsPanel">
|
| 989 |
+
<div class="instructions-header">
|
| 990 |
+
<h3 class="instructions-title">Tree Map of Tezpur</h3>
|
| 991 |
+
<button class="close-instructions" id="closeInstructions">×</button>
|
| 992 |
+
</div>
|
| 993 |
+
<div class="instructions-content">
|
| 994 |
+
<p>This is the Tree Map of Tezpur.</p>
|
| 995 |
+
<p>Zoom in and out to explore data collected from various locations.</p>
|
| 996 |
+
<p>Click on tree icons to view their names.</p>
|
| 997 |
+
<div class="tree-legend">
|
| 998 |
+
<h4>Tree Categories:</h4>
|
| 999 |
+
<div class="legend-items">
|
| 1000 |
+
<div class="legend-item"><span class="legend-color" style="background: #059669;"></span> Ficus (Banyan/Fig)</div>
|
| 1001 |
+
<div class="legend-item"><span class="legend-color" style="background: #d97706;"></span> Mangifera (Mango)</div>
|
| 1002 |
+
<div class="legend-item"><span class="legend-color" style="background: #16a34a;"></span> Bambusa (Bamboo)</div>
|
| 1003 |
+
<div class="legend-item"><span class="legend-color" style="background: #84cc16;"></span> Azadirachta (Neem)</div>
|
| 1004 |
+
<div class="legend-item"><span class="legend-color" style="background: #dc2626;"></span> Tectona (Teak)</div>
|
| 1005 |
+
<div class="legend-item"><span class="legend-color" style="background: #8ab070;"></span> Other Species</div>
|
| 1006 |
+
</div>
|
| 1007 |
+
</div>
|
| 1008 |
+
</div>
|
| 1009 |
+
</div>
|
| 1010 |
+
|
| 1011 |
<!-- Controls Panel -->
|
| 1012 |
<div class="controls-panel">
|
| 1013 |
<div class="controls-header">
|
|
|
|
| 1076 |
|
| 1077 |
<!-- Leaflet JS -->
|
| 1078 |
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
|
| 1079 |
+
<script src="/static/map.js?v=5.1.1&t=1761504811">
|
| 1080 |
|
| 1081 |
"default-state": {
|
| 1082 |
gradients: [
|
|
@@ -82,6 +82,9 @@ class TreeTrackMap {
|
|
| 82 |
|
| 83 |
// Show welcome button only for demo users
|
| 84 |
this.setupWelcomeButton();
|
|
|
|
|
|
|
|
|
|
| 85 |
}
|
| 86 |
|
| 87 |
displayUserInfo() {
|
|
@@ -127,6 +130,45 @@ class TreeTrackMap {
|
|
| 127 |
}
|
| 128 |
}
|
| 129 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 130 |
async logout() {
|
| 131 |
try {
|
| 132 |
await fetch('/api/auth/logout', {
|
|
@@ -220,11 +262,35 @@ class TreeTrackMap {
|
|
| 220 |
attributionControl: true
|
| 221 |
});
|
| 222 |
|
| 223 |
-
// Add tile
|
| 224 |
-
L.tileLayer('https://
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 225 |
attribution: '© OpenStreetMap contributors',
|
| 226 |
maxZoom: 18
|
| 227 |
-
})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 228 |
|
| 229 |
// Map click handler for pin dropping
|
| 230 |
this.map.on('click', (e) => {
|
|
@@ -506,22 +572,56 @@ class TreeTrackMap {
|
|
| 506 |
console.log('Loading trees...');
|
| 507 |
|
| 508 |
try {
|
| 509 |
-
|
| 510 |
-
|
|
|
|
|
|
|
|
|
|
| 511 |
|
| 512 |
-
|
| 513 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 514 |
|
| 515 |
// Clear existing tree markers
|
| 516 |
this.clearTreeMarkers();
|
| 517 |
|
| 518 |
-
// Add tree markers
|
| 519 |
-
|
| 520 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 521 |
});
|
| 522 |
|
| 523 |
-
//
|
| 524 |
-
document.getElementById('treeCount').textContent = trees
|
| 525 |
|
| 526 |
if (trees.length > 0) {
|
| 527 |
// Fit map to show all trees with debounced execution
|
|
@@ -538,19 +638,85 @@ class TreeTrackMap {
|
|
| 538 |
}
|
| 539 |
|
| 540 |
addTreeMarker(tree) {
|
| 541 |
-
// Determine tree
|
| 542 |
-
const
|
| 543 |
-
|
| 544 |
-
|
| 545 |
-
|
| 546 |
-
|
| 547 |
-
|
| 548 |
-
|
| 549 |
-
|
| 550 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 551 |
};
|
| 552 |
|
| 553 |
-
const
|
|
|
|
| 554 |
|
| 555 |
const treeIcon = L.divIcon({
|
| 556 |
html: `
|
|
|
|
| 82 |
|
| 83 |
// Show welcome button only for demo users
|
| 84 |
this.setupWelcomeButton();
|
| 85 |
+
|
| 86 |
+
// Setup instructions panel
|
| 87 |
+
this.setupInstructionsPanel();
|
| 88 |
}
|
| 89 |
|
| 90 |
displayUserInfo() {
|
|
|
|
| 130 |
}
|
| 131 |
}
|
| 132 |
|
| 133 |
+
setupInstructionsPanel() {
|
| 134 |
+
// Show instructions panel on first visit
|
| 135 |
+
const hasSeenInstructions = localStorage.getItem('treetrack_seen_instructions');
|
| 136 |
+
const instructionsPanel = document.getElementById('instructionsPanel');
|
| 137 |
+
|
| 138 |
+
if (!hasSeenInstructions && instructionsPanel) {
|
| 139 |
+
// Show instructions for 10 seconds, then auto-hide
|
| 140 |
+
setTimeout(() => {
|
| 141 |
+
this.hideInstructions();
|
| 142 |
+
localStorage.setItem('treetrack_seen_instructions', 'true');
|
| 143 |
+
}, 10000);
|
| 144 |
+
} else if (instructionsPanel) {
|
| 145 |
+
instructionsPanel.classList.add('hidden');
|
| 146 |
+
}
|
| 147 |
+
|
| 148 |
+
// Setup close button
|
| 149 |
+
const closeBtn = document.getElementById('closeInstructions');
|
| 150 |
+
if (closeBtn) {
|
| 151 |
+
closeBtn.addEventListener('click', () => {
|
| 152 |
+
this.hideInstructions();
|
| 153 |
+
localStorage.setItem('treetrack_seen_instructions', 'true');
|
| 154 |
+
});
|
| 155 |
+
}
|
| 156 |
+
}
|
| 157 |
+
|
| 158 |
+
hideInstructions() {
|
| 159 |
+
const instructionsPanel = document.getElementById('instructionsPanel');
|
| 160 |
+
if (instructionsPanel) {
|
| 161 |
+
instructionsPanel.classList.add('hidden');
|
| 162 |
+
}
|
| 163 |
+
}
|
| 164 |
+
|
| 165 |
+
showInstructions() {
|
| 166 |
+
const instructionsPanel = document.getElementById('instructionsPanel');
|
| 167 |
+
if (instructionsPanel) {
|
| 168 |
+
instructionsPanel.classList.remove('hidden');
|
| 169 |
+
}
|
| 170 |
+
}
|
| 171 |
+
|
| 172 |
async logout() {
|
| 173 |
try {
|
| 174 |
await fetch('/api/auth/logout', {
|
|
|
|
| 262 |
attributionControl: true
|
| 263 |
});
|
| 264 |
|
| 265 |
+
// Add multiple beautiful tile layers
|
| 266 |
+
const satelliteLayer = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
|
| 267 |
+
attribution: 'Tiles © Esri — Source: Esri, Maxar, GeoEye, Earthstar Geographics, CNES/Airbus DS, USDA, AeroGRID, IGN, and the GIS User Community',
|
| 268 |
+
maxZoom: 18,
|
| 269 |
+
minZoom: 3
|
| 270 |
+
});
|
| 271 |
+
|
| 272 |
+
const terrainLayer = L.tileLayer('https://stamen-tiles-{s}.a.ssl.fastly.net/terrain/{z}/{x}/{y}{r}.png', {
|
| 273 |
+
attribution: 'Map tiles by Stamen Design, CC BY 3.0 — Map data © OpenStreetMap contributors',
|
| 274 |
+
maxZoom: 16,
|
| 275 |
+
minZoom: 3
|
| 276 |
+
});
|
| 277 |
+
|
| 278 |
+
const streetLayer = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
| 279 |
attribution: '© OpenStreetMap contributors',
|
| 280 |
maxZoom: 18
|
| 281 |
+
});
|
| 282 |
+
|
| 283 |
+
// Use satellite as primary layer for Tezpur's natural beauty
|
| 284 |
+
satelliteLayer.addTo(this.map);
|
| 285 |
+
|
| 286 |
+
// Add layer control for users to switch
|
| 287 |
+
const baseMaps = {
|
| 288 |
+
"Satellite": satelliteLayer,
|
| 289 |
+
"Terrain": terrainLayer,
|
| 290 |
+
"Street Map": streetLayer
|
| 291 |
+
};
|
| 292 |
+
|
| 293 |
+
L.control.layers(baseMaps).addTo(this.map);
|
| 294 |
|
| 295 |
// Map click handler for pin dropping
|
| 296 |
this.map.on('click', (e) => {
|
|
|
|
| 572 |
console.log('Loading trees...');
|
| 573 |
|
| 574 |
try {
|
| 575 |
+
// Load trees in batches to handle large datasets
|
| 576 |
+
let allTrees = [];
|
| 577 |
+
let offset = 0;
|
| 578 |
+
let batchSize = 500;
|
| 579 |
+
let hasMore = true;
|
| 580 |
|
| 581 |
+
while (hasMore) {
|
| 582 |
+
const response = await this.authenticatedFetch(`/api/trees?limit=${batchSize}&offset=${offset}`);
|
| 583 |
+
if (!response) break;
|
| 584 |
+
|
| 585 |
+
const trees = await response.json();
|
| 586 |
+
console.log(`Loaded batch: ${trees.length} trees (offset: ${offset})`);
|
| 587 |
+
|
| 588 |
+
if (trees.length === 0) {
|
| 589 |
+
hasMore = false;
|
| 590 |
+
} else {
|
| 591 |
+
allTrees = allTrees.concat(trees);
|
| 592 |
+
offset += batchSize;
|
| 593 |
+
|
| 594 |
+
// Prevent infinite loops
|
| 595 |
+
if (offset > 10000) {
|
| 596 |
+
console.warn('Tree loading limit reached');
|
| 597 |
+
hasMore = false;
|
| 598 |
+
}
|
| 599 |
+
}
|
| 600 |
+
}
|
| 601 |
+
|
| 602 |
+
console.log(`Total loaded: ${allTrees.length} trees`);
|
| 603 |
|
| 604 |
// Clear existing tree markers
|
| 605 |
this.clearTreeMarkers();
|
| 606 |
|
| 607 |
+
// Add tree markers with progress tracking
|
| 608 |
+
let loadedCount = 0;
|
| 609 |
+
allTrees.forEach((tree, index) => {
|
| 610 |
+
try {
|
| 611 |
+
this.addTreeMarker(tree);
|
| 612 |
+
loadedCount++;
|
| 613 |
+
} catch (error) {
|
| 614 |
+
console.warn(`Failed to add tree marker for tree ${tree.id}:`, error);
|
| 615 |
+
}
|
| 616 |
+
|
| 617 |
+
// Update count periodically for large datasets
|
| 618 |
+
if (index % 100 === 0 || index === allTrees.length - 1) {
|
| 619 |
+
document.getElementById('treeCount').textContent = `${loadedCount} of ${allTrees.length}`;
|
| 620 |
+
}
|
| 621 |
});
|
| 622 |
|
| 623 |
+
// Final count update
|
| 624 |
+
document.getElementById('treeCount').textContent = `${loadedCount} trees`;
|
| 625 |
|
| 626 |
if (trees.length > 0) {
|
| 627 |
// Fit map to show all trees with debounced execution
|
|
|
|
| 638 |
}
|
| 639 |
|
| 640 |
addTreeMarker(tree) {
|
| 641 |
+
// Determine tree category and colors based on species
|
| 642 |
+
const getTreeCategoryAndColors = (tree) => {
|
| 643 |
+
const scientificName = (tree.scientific_name || '').toLowerCase();
|
| 644 |
+
const commonName = (tree.common_name || '').toLowerCase();
|
| 645 |
+
const localName = (tree.local_name || '').toLowerCase();
|
| 646 |
+
|
| 647 |
+
// Categorize trees by families/types with distinct colors
|
| 648 |
+
if (scientificName.includes('ficus') || commonName.includes('banyan') || commonName.includes('fig')) {
|
| 649 |
+
return {
|
| 650 |
+
category: 'Ficus (Banyan/Fig)',
|
| 651 |
+
colors: {
|
| 652 |
+
canopy1: '#059669', // Emerald green for Ficus
|
| 653 |
+
canopy2: '#047857',
|
| 654 |
+
canopy3: '#065f46',
|
| 655 |
+
trunk: '#7c6643',
|
| 656 |
+
shadow: 'rgba(5, 150, 105, 0.3)'
|
| 657 |
+
}
|
| 658 |
+
};
|
| 659 |
+
} else if (scientificName.includes('mangifera') || commonName.includes('mango')) {
|
| 660 |
+
return {
|
| 661 |
+
category: 'Mangifera (Mango)',
|
| 662 |
+
colors: {
|
| 663 |
+
canopy1: '#d97706', // Amber for Mango
|
| 664 |
+
canopy2: '#b45309',
|
| 665 |
+
canopy3: '#92400e',
|
| 666 |
+
trunk: '#78716c',
|
| 667 |
+
shadow: 'rgba(217, 119, 6, 0.3)'
|
| 668 |
+
}
|
| 669 |
+
};
|
| 670 |
+
} else if (scientificName.includes('bambusa') || commonName.includes('bamboo')) {
|
| 671 |
+
return {
|
| 672 |
+
category: 'Bambusa (Bamboo)',
|
| 673 |
+
colors: {
|
| 674 |
+
canopy1: '#16a34a', // Green for Bamboo
|
| 675 |
+
canopy2: '#15803d',
|
| 676 |
+
canopy3: '#166534',
|
| 677 |
+
trunk: '#6b7280',
|
| 678 |
+
shadow: 'rgba(22, 163, 74, 0.3)'
|
| 679 |
+
}
|
| 680 |
+
};
|
| 681 |
+
} else if (scientificName.includes('azadirachta') || commonName.includes('neem')) {
|
| 682 |
+
return {
|
| 683 |
+
category: 'Azadirachta (Neem)',
|
| 684 |
+
colors: {
|
| 685 |
+
canopy1: '#84cc16', // Lime green for Neem
|
| 686 |
+
canopy2: '#65a30d',
|
| 687 |
+
canopy3: '#4d7c0f',
|
| 688 |
+
trunk: '#a8a29e',
|
| 689 |
+
shadow: 'rgba(132, 204, 22, 0.3)'
|
| 690 |
+
}
|
| 691 |
+
};
|
| 692 |
+
} else if (scientificName.includes('tectona') || commonName.includes('teak')) {
|
| 693 |
+
return {
|
| 694 |
+
category: 'Tectona (Teak)',
|
| 695 |
+
colors: {
|
| 696 |
+
canopy1: '#dc2626', // Red-brown for Teak
|
| 697 |
+
canopy2: '#b91c1c',
|
| 698 |
+
canopy3: '#991b1b',
|
| 699 |
+
trunk: '#8b5a3c',
|
| 700 |
+
shadow: 'rgba(220, 38, 38, 0.3)'
|
| 701 |
+
}
|
| 702 |
+
};
|
| 703 |
+
} else {
|
| 704 |
+
// Default for other/unknown species
|
| 705 |
+
return {
|
| 706 |
+
category: 'Other Species',
|
| 707 |
+
colors: {
|
| 708 |
+
canopy1: '#8ab070', // primary-500
|
| 709 |
+
canopy2: '#739b5a', // primary-600
|
| 710 |
+
canopy3: '#5d7f49', // primary-700
|
| 711 |
+
trunk: '#7f5a44', // accent-700
|
| 712 |
+
shadow: 'rgba(93, 127, 73, 0.3)'
|
| 713 |
+
}
|
| 714 |
+
};
|
| 715 |
+
}
|
| 716 |
};
|
| 717 |
|
| 718 |
+
const treeInfo = getTreeCategoryAndColors(tree);
|
| 719 |
+
const colors = treeInfo.colors;
|
| 720 |
|
| 721 |
const treeIcon = L.divIcon({
|
| 722 |
html: `
|
|
@@ -1,5 +1,5 @@
|
|
| 1 |
// TreeTrack Service Worker - PWA and Offline Support
|
| 2 |
-
const VERSION =
|
| 3 |
const CACHE_NAME = `treetrack-v${VERSION}`;
|
| 4 |
const STATIC_CACHE = `static-v${VERSION}`;
|
| 5 |
const API_CACHE = `api-v${VERSION}`;
|
|
|
|
| 1 |
// TreeTrack Service Worker - PWA and Offline Support
|
| 2 |
+
const VERSION = 1761504811; // Cache busting bump - force clients to fetch new static assets and header image change
|
| 3 |
const CACHE_NAME = `treetrack-v${VERSION}`;
|
| 4 |
const STATIC_CACHE = `static-v${VERSION}`;
|
| 5 |
const API_CACHE = `api-v${VERSION}`;
|
|
@@ -1,4 +1,4 @@
|
|
| 1 |
{
|
| 2 |
"version": "5.1.1",
|
| 3 |
-
"timestamp":
|
| 4 |
}
|
|
|
|
| 1 |
{
|
| 2 |
"version": "5.1.1",
|
| 3 |
+
"timestamp": 1761504811
|
| 4 |
}
|