From 55e8f9d02dc79f332447c31c25e11578d43a3456 Mon Sep 17 00:00:00 2001
From: phil <phil.dev@philome.mooo.com>
Date: Thu, 24 Oct 2024 16:33:42 +0200
Subject: [PATCH 1/3] Adjust base url for dev server (ng serve)

---
 package.json    | 2 +-
 proxy.conf.json | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 60a1179..0638632 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config proxy.conf.json --port 4201",
+    "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail",
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
diff --git a/proxy.conf.json b/proxy.conf.json
index e24d739..7094876 100644
--- a/proxy.conf.json
+++ b/proxy.conf.json
@@ -1,17 +1,17 @@
 {
-  "/static": {
+  "/treetrail/static": {
     "target": "http://127.0.0.1:5002",
     "secure": false
   },
-  "/v1": {
+  "/treetrail/v1": {
     "target": "http://127.0.0.1:5002",
     "secure": false
   },
-  "/attachment": {
+  "/treetrail/attachment": {
     "target": "http://127.0.0.1:5002",
     "secure": false
   },
-  "/tiles": {
+  "/treetrail/tiles": {
     "target": "http://127.0.0.1:5002",
     "secure": false
   }

From b9d1bb11162db32cffff9c31477fca544cbebf96 Mon Sep 17 00:00:00 2001
From: phil <phil.dev@philome.mooo.com>
Date: Thu, 24 Oct 2024 16:35:56 +0200
Subject: [PATCH 2/3] Fix base uri for embedded tiles

---
 src/app/map/map.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/map/map.component.ts b/src/app/map/map.component.ts
index fb8a909..2c81158 100644
--- a/src/app/map/map.component.ts
+++ b/src/app/map/map.component.ts
@@ -80,7 +80,7 @@ export class MapComponent implements AfterContentInit, OnInit {
     let conf = this.configService.conf.value
     let bms = conf.background
     if (conf.bootstrap.baseMapStyles.embedded.indexOf(bms) >= 0) {
-      this.styleUrl = `/tiles/style/${bms}`
+      this.styleUrl = `tiles/style/${bms}`
     }
     else {
       this.styleUrl = conf.bootstrap.baseMapStyles.external[bms]

From 7d29b89f6550574c972290d43c4929502d2b61ff Mon Sep 17 00:00:00 2001
From: phil <phil.dev@philome.mooo.com>
Date: Thu, 24 Oct 2024 16:36:59 +0200
Subject: [PATCH 3/3] Settings: go to map after changes to map display options

---
 src/app/settings/settings.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index d1b7a8b..2032ada 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -40,7 +40,7 @@
     <div>
       <mat-button-toggle-group #background="matButtonToggleGroup"
         [value]="conf.background || conf.map?.background"
-        (change)="configService.setUserPref('background', background.value)"
+        (change)="configService.setUserPref('background', background.value) ; router.navigate(['/map'])"
       >
         <mat-button-toggle
           *ngFor="let bms of conf.bootstrap.baseMapStyles.embedded"
@@ -55,7 +55,7 @@
     <mat-label>Types of zones displayed on the map</mat-label>
     <div class="settings">
       <mat-checkbox *ngFor="let item of conf.showZones | keyvalue" [checked]="item.value"
-        (change)="configService.setUserPrefValue('showZones', item.key, $event.checked)">
+        (change)="configService.setUserPrefValue('showZones', item.key, $event.checked) ; router.navigate(['/map'])">
         {{ item.key }}
       </mat-checkbox>
     </div>