default map city and province

data/config.cemetery.ontario.js

@@ -1,6 +1,9 @@
 import { config as cemeteryConfig } from "./config.cemetery.js";
 export const config = Object.assign({}, cemeteryConfig);
 config.settings.lotOccupancy.occupantProvinceDefault = "ON";
+config.settings.map = {
+    mapProvinceDefault: "ON"
+};
 config.settings.fees = {
     taxPercentageDefault: 13
 };

data/config.cemetery.ontario.ts

@@ -4,6 +4,10 @@ export const config =  Object.assign({}, cemeteryConfig);
 
 config.settings.lotOccupancy.occupantProvinceDefault = "ON";
 
+config.settings.map = {
+    mapProvinceDefault: "ON"
+};
+
 config.settings.fees = {
     taxPercentageDefault: 13
 };

data/config.cemetery.ssm.js

@@ -1,5 +1,6 @@
 import { config as cemeteryConfig } from "./config.cemetery.ontario.js";
 export const config = Object.assign({}, cemeteryConfig);
 config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie";
+config.settings.map.mapCityDefault = "Sault Ste. Marie";
 config.aliases.externalReceiptNumber = "GP Receipt Number";
 export default config;

data/config.cemetery.ssm.ts

@@ -3,6 +3,7 @@ import { config as cemeteryConfig } from "./config.cemetery.ontario.js";
 export const config =  Object.assign({}, cemeteryConfig);
 
 config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie";
+config.settings.map.mapCityDefault = "Sault Ste. Marie";
 
 config.aliases.externalReceiptNumber = "GP Receipt Number";
 

handlers/maps-get/new.js

@@ -1,7 +1,10 @@
 import * as configFunctions from "../../helpers/functions.config.js";
 import { getMapSVGs } from "../../helpers/functions.map.js";
 export const handler = async (_request, response) => {
-    const map = {};
+    const map = {
+        mapCity: configFunctions.getProperty("settings.map.mapCityDefault"),
+        mapProvince: configFunctions.getProperty("settings.map.mapProvinceDefault")
+    };
     const mapSVGs = await getMapSVGs();
     response.render("map-edit", {
         headTitle: configFunctions.getProperty("aliases.map") + " Create",

handlers/maps-get/new.ts

@@ -1,23 +1,31 @@
-import type { RequestHandler } from "express";
+import type {
+    RequestHandler
+} from "express";
 
 import * as configFunctions from "../../helpers/functions.config.js";
-import { getMapSVGs } from "../../helpers/functions.map.js";
+
+import {
+    getMapSVGs
+} from "../../helpers/functions.map.js";
 
 import * as recordTypes from "../../types/recordTypes";
 
 
 export const handler: RequestHandler = async (_request, response) => {
 
-  const map: recordTypes.Map = {};
+    const map: recordTypes.Map = {
+        mapCity: configFunctions.getProperty("settings.map.mapCityDefault"),
+        mapProvince: configFunctions.getProperty("settings.map.mapProvinceDefault")
+    };
 
-  const mapSVGs = await getMapSVGs();
+    const mapSVGs = await getMapSVGs();
 
-  response.render("map-edit", {
+    response.render("map-edit", {
-    headTitle: configFunctions.getProperty("aliases.map") + " Create",
+        headTitle: configFunctions.getProperty("aliases.map") + " Create",
-    isCreate: true,
+        isCreate: true,
-    map,
+        map,
-    mapSVGs
+        mapSVGs
-  });
+    });
 };
 
 

helpers/functions.config.d.ts

@@ -24,6 +24,8 @@ export declare function getProperty(propertyName: "aliases.occupancies"): string
 export declare function getProperty(propertyName: "aliases.occupant"): string;
 export declare function getProperty(propertyName: "aliases.occupants"): string;
 export declare function getProperty(propertyName: "aliases.externalReceiptNumber"): string;
+export declare function getProperty(propertyName: "settings.map.mapCityDefault"): string;
+export declare function getProperty(propertyName: "settings.map.mapProvinceDefault"): string;
 export declare function getProperty(propertyName: "settings.lotOccupancy.occupancyEndDateIsRequired"): boolean;
 export declare function getProperty(propertyName: "settings.lotOccupancy.occupantCityDefault"): string;
 export declare function getProperty(propertyName: "settings.lotOccupancy.occupantProvinceDefault"): string;

helpers/functions.config.js

@@ -24,6 +24,8 @@ configFallbackValues.set("aliases.occupancies", "Occupancies");
 configFallbackValues.set("aliases.occupant", "Occupant");
 configFallbackValues.set("aliases.occupants", "Occupants");
 configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number");
+configFallbackValues.set("settings.map.mapCityDefault", "");
+configFallbackValues.set("settings.map.mapProvinceDefault", "");
 configFallbackValues.set("settings.lotOccupancy.occupancyEndDateIsRequired", true);
 configFallbackValues.set("settings.lotOccupancy.occupantCityDefault", "");
 configFallbackValues.set("settings.lotOccupancy.occupantProvinceDefault", "");

helpers/functions.config.ts

@@ -43,6 +43,9 @@ configFallbackValues.set("aliases.occupant", "Occupant");
 configFallbackValues.set("aliases.occupants", "Occupants");
 configFallbackValues.set("aliases.externalReceiptNumber", "External Receipt Number");
 
+configFallbackValues.set("settings.map.mapCityDefault", "");
+configFallbackValues.set("settings.map.mapProvinceDefault", "");
+
 configFallbackValues.set("settings.lotOccupancy.occupancyEndDateIsRequired", true);
 configFallbackValues.set("settings.lotOccupancy.occupantCityDefault", "");
 configFallbackValues.set("settings.lotOccupancy.occupantProvinceDefault", "");
@@ -85,6 +88,9 @@ export function getProperty(propertyName: "aliases.occupant"): string;
 export function getProperty(propertyName: "aliases.occupants"): string;
 export function getProperty(propertyName: "aliases.externalReceiptNumber"): string;
 
+export function getProperty(propertyName: "settings.map.mapCityDefault"): string;
+export function getProperty(propertyName: "settings.map.mapProvinceDefault"): string;
+
 export function getProperty(propertyName: "settings.lotOccupancy.occupancyEndDateIsRequired"): boolean;
 export function getProperty(propertyName: "settings.lotOccupancy.occupantCityDefault"): string;
 export function getProperty(propertyName: "settings.lotOccupancy.occupantProvinceDefault"): string;

types/configTypes.d.ts

@@ -28,6 +28,10 @@ export interface Config {
         fees?: {
             taxPercentageDefault?: number;
         };
+        map?: {
+            mapCityDefault?: string;
+            mapProvinceDefault?: string;
+        };
         lotOccupancy?: {
             lotIdIsRequired?: boolean;
             occupancyEndDateIsRequired?: boolean;

types/configTypes.ts

@@ -22,18 +22,22 @@ export interface Config {
         occupancies ? : string;
         occupant ? : string;
         occupants ? : string;
-        externalReceiptNumber ?: string;
+        externalReceiptNumber ? : string;
     };
     settings ? : {
         fees ? : {
             taxPercentageDefault ? : number;
-        },
+        };
+        map ? : {
+            mapCityDefault ? : string;
+            mapProvinceDefault ? : string;
+        };
         lotOccupancy ? : {
             lotIdIsRequired ? : boolean;
             occupancyEndDateIsRequired ? : boolean;
             occupantCityDefault ? : string;
             occupantProvinceDefault ? : string;
-        }
+        };
     };
 }
 
@@ -43,7 +47,7 @@ interface ConfigApplication {
     logoURL ? : string;
     httpPort ? : number;
     userDomain ? : string;
-    useTestDatabases ?: boolean;
+    useTestDatabases ? : boolean;
 }