RoyAalekh commited on
Commit
44730c0
·
1 Parent(s): cf43a83

Revert to realistic-tree marker style - minimal looked too much like candy

Browse files
Files changed (6) hide show
  1. marker_preview.html +186 -0
  2. static/index.html +2 -2
  3. static/map.html +2 -2
  4. static/map.js +1 -1
  5. static/sw.js +1 -1
  6. version.json +1 -1
marker_preview.html ADDED
@@ -0,0 +1,186 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <!DOCTYPE html>
2
+ <html lang="en">
3
+ <head>
4
+ <meta charset="UTF-8">
5
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
+ <title>TreeTrack Minimal Tree Markers Preview</title>
7
+ <style>
8
+ body {
9
+ font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
10
+ background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
11
+ margin: 0;
12
+ padding: 40px;
13
+ min-height: 100vh;
14
+ }
15
+
16
+ .container {
17
+ max-width: 800px;
18
+ margin: 0 auto;
19
+ background: white;
20
+ border-radius: 12px;
21
+ box-shadow: 0 10px 30px rgba(0,0,0,0.1);
22
+ padding: 40px;
23
+ }
24
+
25
+ h1 {
26
+ text-align: center;
27
+ color: #2d3748;
28
+ margin-bottom: 30px;
29
+ }
30
+
31
+ .markers-grid {
32
+ display: grid;
33
+ grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
34
+ gap: 30px;
35
+ margin: 40px 0;
36
+ }
37
+
38
+ .marker-demo {
39
+ text-align: center;
40
+ padding: 20px;
41
+ background: #f8fafc;
42
+ border-radius: 8px;
43
+ border: 2px solid #e2e8f0;
44
+ transition: all 0.2s ease;
45
+ }
46
+
47
+ .marker-demo:hover {
48
+ transform: translateY(-2px);
49
+ box-shadow: 0 4px 12px rgba(0,0,0,0.1);
50
+ }
51
+
52
+ .marker-container {
53
+ margin: 20px 0;
54
+ display: flex;
55
+ justify-content: center;
56
+ }
57
+
58
+ .minimal-tree-marker {
59
+ transition: all 0.2s cubic-bezier(0.25, 0.46, 0.45, 0.94);
60
+ cursor: pointer;
61
+ }
62
+
63
+ .minimal-tree-marker:hover {
64
+ transform: scale(1.15) translateY(-2px);
65
+ filter: drop-shadow(0 4px 8px rgba(0,0,0,0.3)) brightness(1.1);
66
+ }
67
+
68
+ .marker-label {
69
+ font-weight: 600;
70
+ color: #4a5568;
71
+ margin-bottom: 5px;
72
+ }
73
+
74
+ .marker-id {
75
+ font-size: 12px;
76
+ color: #718096;
77
+ }
78
+
79
+ .description {
80
+ background: #edf2f7;
81
+ padding: 20px;
82
+ border-radius: 8px;
83
+ margin-top: 30px;
84
+ color: #4a5568;
85
+ line-height: 1.6;
86
+ }
87
+ </style>
88
+ </head>
89
+ <body>
90
+ <div class="container">
91
+ <h1>TreeTrack Minimal Tree Markers</h1>
92
+
93
+ <div class="markers-grid">
94
+ <!-- Forest Green -->
95
+ <div class="marker-demo">
96
+ <div class="marker-label">Forest Green</div>
97
+ <div class="marker-container">
98
+ <div class="minimal-tree-marker">
99
+ <svg width="28" height="32" viewBox="0 0 28 32" fill="none">
100
+ <rect x="12" y="24" width="4" height="8" fill="#7c6643" rx="0.5"/>
101
+ <path d="M14 2 C18.5 2, 22 6, 22 11 C22 16, 18.5 20, 14 20 C9.5 20, 6 16, 6 11 C6 6, 9.5 2, 14 2 Z" fill="#059669" stroke="white" stroke-width="1.5"/>
102
+ <path d="M14 4 C17 4, 19.5 7, 19.5 10.5 C19.5 14, 17 17, 14 17 C11 17, 8.5 14, 8.5 10.5 C8.5 7, 11 4, 14 4 Z" fill="#047857" opacity="0.6"/>
103
+ <circle cx="12" cy="9" r="2" fill="white" opacity="0.3"/>
104
+ </svg>
105
+ </div>
106
+ </div>
107
+ <div class="marker-id">Group 1 (IDs: 1, 6, 11...)</div>
108
+ </div>
109
+
110
+ <!-- Ocean Blue -->
111
+ <div class="marker-demo">
112
+ <div class="marker-label">Ocean Blue</div>
113
+ <div class="marker-container">
114
+ <div class="minimal-tree-marker">
115
+ <svg width="28" height="32" viewBox="0 0 28 32" fill="none">
116
+ <rect x="12" y="24" width="4" height="8" fill="#78716c" rx="0.5"/>
117
+ <path d="M14 2 C18.5 2, 22 6, 22 11 C22 16, 18.5 20, 14 20 C9.5 20, 6 16, 6 11 C6 6, 9.5 2, 14 2 Z" fill="#0ea5e9" stroke="white" stroke-width="1.5"/>
118
+ <path d="M14 4 C17 4, 19.5 7, 19.5 10.5 C19.5 14, 17 17, 14 17 C11 17, 8.5 14, 8.5 10.5 C8.5 7, 11 4, 14 4 Z" fill="#0284c7" opacity="0.6"/>
119
+ <circle cx="12" cy="9" r="2" fill="white" opacity="0.3"/>
120
+ </svg>
121
+ </div>
122
+ </div>
123
+ <div class="marker-id">Group 2 (IDs: 2, 7, 12...)</div>
124
+ </div>
125
+
126
+ <!-- Sunset Orange -->
127
+ <div class="marker-demo">
128
+ <div class="marker-label">Sunset Orange</div>
129
+ <div class="marker-container">
130
+ <div class="minimal-tree-marker">
131
+ <svg width="28" height="32" viewBox="0 0 28 32" fill="none">
132
+ <rect x="12" y="24" width="4" height="8" fill="#92400e" rx="0.5"/>
133
+ <path d="M14 2 C18.5 2, 22 6, 22 11 C22 16, 18.5 20, 14 20 C9.5 20, 6 16, 6 11 C6 6, 9.5 2, 14 2 Z" fill="#f97316" stroke="white" stroke-width="1.5"/>
134
+ <path d="M14 4 C17 4, 19.5 7, 19.5 10.5 C19.5 14, 17 17, 14 17 C11 17, 8.5 14, 8.5 10.5 C8.5 7, 11 4, 14 4 Z" fill="#ea580c" opacity="0.6"/>
135
+ <circle cx="12" cy="9" r="2" fill="white" opacity="0.3"/>
136
+ </svg>
137
+ </div>
138
+ </div>
139
+ <div class="marker-id">Group 3 (IDs: 3, 8, 13...)</div>
140
+ </div>
141
+
142
+ <!-- Royal Purple -->
143
+ <div class="marker-demo">
144
+ <div class="marker-label">Royal Purple</div>
145
+ <div class="marker-container">
146
+ <div class="minimal-tree-marker">
147
+ <svg width="28" height="32" viewBox="0 0 28 32" fill="none">
148
+ <rect x="12" y="24" width="4" height="8" fill="#6b21a8" rx="0.5"/>
149
+ <path d="M14 2 C18.5 2, 22 6, 22 11 C22 16, 18.5 20, 14 20 C9.5 20, 6 16, 6 11 C6 6, 9.5 2, 14 2 Z" fill="#a855f7" stroke="white" stroke-width="1.5"/>
150
+ <path d="M14 4 C17 4, 19.5 7, 19.5 10.5 C19.5 14, 17 17, 14 17 C11 17, 8.5 14, 8.5 10.5 C8.5 7, 11 4, 14 4 Z" fill="#9333ea" opacity="0.6"/>
151
+ <circle cx="12" cy="9" r="2" fill="white" opacity="0.3"/>
152
+ </svg>
153
+ </div>
154
+ </div>
155
+ <div class="marker-id">Group 4 (IDs: 4, 9, 14...)</div>
156
+ </div>
157
+
158
+ <!-- Crimson Red -->
159
+ <div class="marker-demo">
160
+ <div class="marker-label">Crimson Red</div>
161
+ <div class="marker-container">
162
+ <div class="minimal-tree-marker">
163
+ <svg width="28" height="32" viewBox="0 0 28 32" fill="none">
164
+ <rect x="12" y="24" width="4" height="8" fill="#991b1b" rx="0.5"/>
165
+ <path d="M14 2 C18.5 2, 22 6, 22 11 C22 16, 18.5 20, 14 20 C9.5 20, 6 16, 6 11 C6 6, 9.5 2, 14 2 Z" fill="#ef4444" stroke="white" stroke-width="1.5"/>
166
+ <path d="M14 4 C17 4, 19.5 7, 19.5 10.5 C19.5 14, 17 17, 14 17 C11 17, 8.5 14, 8.5 10.5 C8.5 7, 11 4, 14 4 Z" fill="#dc2626" opacity="0.6"/>
167
+ <circle cx="12" cy="9" r="2" fill="white" opacity="0.3"/>
168
+ </svg>
169
+ </div>
170
+ </div>
171
+ <div class="marker-id">Group 5 (IDs: 5, 10, 15...)</div>
172
+ </div>
173
+ </div>
174
+
175
+ <div class="description">
176
+ <strong>Minimal Tree Marker Features:</strong><br>
177
+ • Clean, single-shape canopy with white outline for sharpness<br>
178
+ • Subtle depth layer for dimensionality without clutter<br>
179
+ • 28×32 pixel size - perfect visibility without overwhelming<br>
180
+ • Smooth hover animation with scale and brightness effects<br>
181
+ • Tree colors rotate based on ID numbers in 5 groups<br>
182
+ • Hover over the markers above to see the animation effect!
183
+ </div>
184
+ </div>
185
+ </body>
186
+ </html>
static/index.html CHANGED
@@ -947,7 +947,7 @@
947
  // Force refresh if we detect cached version
948
  (function() {
949
  const currentVersion = '5.1.1';
950
- const timestamp = '1761509901'; // Cache-busting bump
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=1761509901"></script>
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 = '1761510113'; // 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=1761510113"></script>
1197
 
1198
  <script>
1199
  // Idle-time prefetch of map assets to speed up first navigation
static/map.html CHANGED
@@ -960,7 +960,7 @@
960
  // Force refresh if we detect cached version
961
  (function() {
962
  const currentVersion = '5.1.1';
963
- const timestamp = '1761509901'; // Current timestamp for cache busting
964
  const lastVersion = sessionStorage.getItem('treetrack_version');
965
  const lastTimestamp = sessionStorage.getItem('treetrack_timestamp');
966
 
@@ -1113,7 +1113,7 @@ const timestamp = '1761509901'; // Current timestamp for cache busting
1113
  <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
1114
  <!-- Leaflet MarkerCluster JS for performance and grouping -->
1115
  <script src="https://unpkg.com/leaflet.markercluster@1.4.1/dist/leaflet.markercluster.js"></script>
1116
- <script src="/static/map.js?v=5.1.1&t=1761509901"></script>
1117
  <script>
1118
  console.log('🗺️ Map script loaded successfully');
1119
  </script>
 
960
  // Force refresh if we detect cached version
961
  (function() {
962
  const currentVersion = '5.1.1';
963
+ const timestamp = '1761510113'; // Current timestamp for cache busting
964
  const lastVersion = sessionStorage.getItem('treetrack_version');
965
  const lastTimestamp = sessionStorage.getItem('treetrack_timestamp');
966
 
 
1113
  <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
1114
  <!-- Leaflet MarkerCluster JS for performance and grouping -->
1115
  <script src="https://unpkg.com/leaflet.markercluster@1.4.1/dist/leaflet.markercluster.js"></script>
1116
+ <script src="/static/map.js?v=5.1.1&t=1761510113"></script>
1117
  <script>
1118
  console.log('🗺️ Map script loaded successfully');
1119
  </script>
static/map.js CHANGED
@@ -893,7 +893,7 @@ class TreeTrackMap {
893
  const colors = treeInfo.colors;
894
 
895
  // Choose marker style - you can change this to test different options
896
- const markerStyle = 'minimal-tree'; // Options: 'realistic-tree', 'simple-circle', 'pin-style', 'geometric', 'minimalist', 'minimal-tree'
897
 
898
  let treeIcon;
899
 
 
893
  const colors = treeInfo.colors;
894
 
895
  // Choose marker style - you can change this to test different options
896
+ const markerStyle = 'realistic-tree'; // Options: 'realistic-tree', 'simple-circle', 'pin-style', 'geometric', 'minimalist', 'minimal-tree'
897
 
898
  let treeIcon;
899
 
static/sw.js CHANGED
@@ -1,5 +1,5 @@
1
  // TreeTrack Service Worker - PWA and Offline Support
2
- const VERSION = 1761509901; // 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
  // TreeTrack Service Worker - PWA and Offline Support
2
+ const VERSION = 1761510113; // 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}`;
version.json CHANGED
@@ -1,4 +1,4 @@
1
  {
2
  "version": "5.1.1",
3
- "timestamp": 1761509901
4
  }
 
1
  {
2
  "version": "5.1.1",
3
+ "timestamp": 1761510113
4
  }