Merge branch 'main'

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",

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
   }

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]

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>