diff --git a/.gitignore b/.gitignore
index 937c0b0f..cadc4152 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,6 @@ data/config.ts
public/images-custom/*
+temp/wmf/
temp/config.*
-temp/wmf/
\ No newline at end of file
+temp/*.csv
diff --git a/app.js b/app.js
index 399d4769..4f2f932f 100644
--- a/app.js
+++ b/app.js
@@ -57,6 +57,7 @@ app.use(urlPrefix, express.static(path.join("public")));
app.use(urlPrefix + "/lib/fa", express.static(path.join("node_modules", "@fortawesome", "fontawesome-free")));
app.use(urlPrefix + "/lib/cityssm-bulma-webapp-js", express.static(path.join("node_modules", "@cityssm", "bulma-webapp-js")));
app.use(urlPrefix + "/lib/cityssm-bulma-js", express.static(path.join("node_modules", "@cityssm", "bulma-js", "dist")));
+app.use(urlPrefix + "/lib/leaflet", express.static(path.join("node_modules", "leaflet", "dist")));
const sessionCookieName = configFunctions.getProperty("session.cookieName");
const FileStoreSession = FileStore(session);
app.use(session({
diff --git a/app.ts b/app.ts
index 2495dd4a..f69759cc 100644
--- a/app.ts
+++ b/app.ts
@@ -109,6 +109,9 @@ app.use(urlPrefix + "/lib/cityssm-bulma-webapp-js",
app.use(urlPrefix + "/lib/cityssm-bulma-js",
express.static(path.join("node_modules", "@cityssm", "bulma-js", "dist")));
+app.use(urlPrefix + "/lib/leaflet",
+ express.static(path.join("node_modules", "leaflet", "dist")));
+
/*
* SESSION MANAGEMENT
diff --git a/handlers/maps-get/search.d.ts b/handlers/maps-get/search.d.ts
new file mode 100644
index 00000000..9621c611
--- /dev/null
+++ b/handlers/maps-get/search.d.ts
@@ -0,0 +1,3 @@
+import type { RequestHandler } from "express";
+export declare const handler: RequestHandler;
+export default handler;
diff --git a/handlers/maps-get/search.js b/handlers/maps-get/search.js
new file mode 100644
index 00000000..f6495414
--- /dev/null
+++ b/handlers/maps-get/search.js
@@ -0,0 +1,10 @@
+import * as configFunctions from "../../helpers/functions.config.js";
+import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js";
+export const handler = (_request, response) => {
+ const maps = getMaps();
+ response.render("map-search", {
+ headTitle: configFunctions.getProperty("aliases.map") + " Search",
+ maps
+ });
+};
+export default handler;
diff --git a/handlers/maps-get/search.ts b/handlers/maps-get/search.ts
new file mode 100644
index 00000000..d15163f1
--- /dev/null
+++ b/handlers/maps-get/search.ts
@@ -0,0 +1,23 @@
+import type {
+ RequestHandler
+} from "express";
+
+import * as configFunctions from "../../helpers/functions.config.js";
+
+import {
+ getMaps
+} from "../../helpers/lotOccupancyDB/getMaps.js";
+
+
+export const handler: RequestHandler = (_request, response) => {
+
+ const maps = getMaps();
+
+ response.render("map-search", {
+ headTitle: configFunctions.getProperty("aliases.map") + " Search",
+ maps
+ });
+};
+
+
+export default handler;
\ No newline at end of file
diff --git a/handlers/maps-get/view.d.ts b/handlers/maps-get/view.d.ts
new file mode 100644
index 00000000..9621c611
--- /dev/null
+++ b/handlers/maps-get/view.d.ts
@@ -0,0 +1,3 @@
+import type { RequestHandler } from "express";
+export declare const handler: RequestHandler;
+export default handler;
diff --git a/handlers/maps-get/view.js b/handlers/maps-get/view.js
new file mode 100644
index 00000000..931c4d18
--- /dev/null
+++ b/handlers/maps-get/view.js
@@ -0,0 +1,13 @@
+import * as configFunctions from "../../helpers/functions.config.js";
+import { getMap } from "../../helpers/lotOccupancyDB/getMap.js";
+export const handler = (request, response) => {
+ const map = getMap(request.params.mapId);
+ if (!map) {
+ return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + "/maps/?error=mapIdNotFound");
+ }
+ response.render("map-view", {
+ headTitle: map.mapName,
+ map
+ });
+};
+export default handler;
diff --git a/handlers/maps-get/view.ts b/handlers/maps-get/view.ts
new file mode 100644
index 00000000..5ac8413c
--- /dev/null
+++ b/handlers/maps-get/view.ts
@@ -0,0 +1,23 @@
+import type { RequestHandler } from "express";
+
+import * as configFunctions from "../../helpers/functions.config.js";
+
+import { getMap } from "../../helpers/lotOccupancyDB/getMap.js";
+
+
+export const handler: RequestHandler = (request, response) => {
+
+ const map = getMap(request.params.mapId);
+
+ if (!map) {
+ return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + "/maps/?error=mapIdNotFound");
+ }
+
+ response.render("map-view", {
+ headTitle: map.mapName,
+ map
+ });
+};
+
+
+export default handler;
\ No newline at end of file
diff --git a/helpers/databaseInitializer.js b/helpers/databaseInitializer.js
index 98ed9faa..b1a4e601 100644
--- a/helpers/databaseInitializer.js
+++ b/helpers/databaseInitializer.js
@@ -68,6 +68,7 @@ export const initLotOccupancyDB = () => {
" lotTypeId integer not null," +
" lotName varchar(100)," +
" mapId integer," +
+ " mapKey varchar(100)," +
" lotLatitude decimal(10, 8) check (lotLatitude between -90 and 90)," +
" lotLongitude decimal(11, 8) check (lotLongitude between -180 and 180)," +
" lotTypeStatusId integer," +
diff --git a/helpers/databaseInitializer.ts b/helpers/databaseInitializer.ts
index 708ee973..daea6860 100644
--- a/helpers/databaseInitializer.ts
+++ b/helpers/databaseInitializer.ts
@@ -93,6 +93,7 @@ export const initLotOccupancyDB = (): boolean => {
" lotTypeId integer not null," +
" lotName varchar(100)," +
" mapId integer," +
+ " mapKey varchar(100)," +
" lotLatitude decimal(10, 8) check (lotLatitude between -90 and 90)," +
" lotLongitude decimal(11, 8) check (lotLongitude between -180 and 180)," +
diff --git a/helpers/lotOccupancyDB/addLot.d.ts b/helpers/lotOccupancyDB/addLot.d.ts
new file mode 100644
index 00000000..ddd1fff1
--- /dev/null
+++ b/helpers/lotOccupancyDB/addLot.d.ts
@@ -0,0 +1,12 @@
+import type * as recordTypes from "../../types/recordTypes";
+interface AddLotForm {
+ lotName: string;
+ lotTypeId: string | number;
+ lotTypeStatusId: string | number;
+ mapId: string | number;
+ mapKey: string;
+ lotLatitude: string;
+ lotLongitude: string;
+}
+export declare const addLot: (lotForm: AddLotForm, requestSession: recordTypes.PartialSession) => number;
+export default addLot;
diff --git a/helpers/lotOccupancyDB/addLot.js b/helpers/lotOccupancyDB/addLot.js
new file mode 100644
index 00000000..a0659e1a
--- /dev/null
+++ b/helpers/lotOccupancyDB/addLot.js
@@ -0,0 +1,18 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const addLot = (lotForm, requestSession) => {
+ const database = sqlite(databasePath);
+ const rightNowMillis = Date.now();
+ const result = database
+ .prepare("insert into Lots (" +
+ "lotName, lotTypeId, lotTypeStatusId," +
+ " mapId, mapKey," +
+ " lotLatitude, lotLongitude," +
+ " recordCreate_userName, recordCreate_timeMillis," +
+ " recordUpdate_userName, recordUpdate_timeMillis)" +
+ " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+ .run(lotForm.lotName, lotForm.lotTypeId, (lotForm.lotTypeStatusId === "" ? undefined : lotForm.lotTypeStatusId), (lotForm.mapId === "" ? undefined : lotForm.mapId), lotForm.mapKey, (lotForm.lotLatitude === "" ? undefined : lotForm.lotLatitude), (lotForm.lotLongitude === "" ? undefined : lotForm.lotLongitude), requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+ database.close();
+ return result.lastInsertRowid;
+};
+export default addLot;
diff --git a/helpers/lotOccupancyDB/addLot.ts b/helpers/lotOccupancyDB/addLot.ts
new file mode 100644
index 00000000..009681a5
--- /dev/null
+++ b/helpers/lotOccupancyDB/addLot.ts
@@ -0,0 +1,53 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+interface AddLotForm {
+ lotName: string;
+ lotTypeId: string | number;
+ lotTypeStatusId: string | number;
+
+ mapId: string | number;
+ mapKey: string;
+
+ lotLatitude: string;
+ lotLongitude: string;
+}
+
+
+export const addLot =
+ (lotForm: AddLotForm, requestSession: recordTypes.PartialSession): number => {
+
+ const database = sqlite(databasePath);
+
+ const rightNowMillis = Date.now();
+
+ const result = database
+ .prepare("insert into Lots (" +
+ "lotName, lotTypeId, lotTypeStatusId," +
+ " mapId, mapKey," +
+ " lotLatitude, lotLongitude," +
+ " recordCreate_userName, recordCreate_timeMillis," +
+ " recordUpdate_userName, recordUpdate_timeMillis)" +
+ " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+ .run(lotForm.lotName,
+ lotForm.lotTypeId,
+ (lotForm.lotTypeStatusId === "" ? undefined : lotForm.lotTypeStatusId),
+ (lotForm.mapId === "" ? undefined : lotForm.mapId),
+ lotForm.mapKey,
+ (lotForm.lotLatitude === "" ? undefined : lotForm.lotLatitude),
+ (lotForm.lotLongitude === "" ? undefined : lotForm.lotLongitude),
+ requestSession.user.userName,
+ rightNowMillis,
+ requestSession.user.userName,
+ rightNowMillis);
+
+ database.close();
+
+ return result.lastInsertRowid as number;
+ };
+
+
+export default addLot;
\ No newline at end of file
diff --git a/helpers/lotOccupancyDB/addMap.d.ts b/helpers/lotOccupancyDB/addMap.d.ts
new file mode 100644
index 00000000..77588578
--- /dev/null
+++ b/helpers/lotOccupancyDB/addMap.d.ts
@@ -0,0 +1,16 @@
+import type * as recordTypes from "../../types/recordTypes";
+interface AddMapForm {
+ mapName: string;
+ mapDescription: string;
+ mapSVG: string;
+ mapLatitude: string;
+ mapLongitude: string;
+ mapAddress1: string;
+ mapAddress2: string;
+ mapCity: string;
+ mapProvince: string;
+ mapPostalCode: string;
+ mapPhoneNumber: string;
+}
+export declare const addMap: (mapForm: AddMapForm, requestSession: recordTypes.PartialSession) => number;
+export default addMap;
diff --git a/helpers/lotOccupancyDB/addMap.js b/helpers/lotOccupancyDB/addMap.js
new file mode 100644
index 00000000..bff4bf07
--- /dev/null
+++ b/helpers/lotOccupancyDB/addMap.js
@@ -0,0 +1,18 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const addMap = (mapForm, requestSession) => {
+ const database = sqlite(databasePath);
+ const rightNowMillis = Date.now();
+ const result = database
+ .prepare("insert into Maps (" +
+ "mapName, mapDescription," +
+ " mapSVG, mapLatitude, mapLongitude," +
+ " mapAddress1, mapAddress2, mapCity, mapProvince, mapPostalCode, mapPhoneNumber," +
+ " recordCreate_userName, recordCreate_timeMillis," +
+ " recordUpdate_userName, recordUpdate_timeMillis)" +
+ " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+ .run(mapForm.mapName, mapForm.mapDescription, mapForm.mapSVG, (mapForm.mapLatitude === "" ? undefined : mapForm.mapLatitude), (mapForm.mapLongitude === "" ? undefined : mapForm.mapLongitude), mapForm.mapAddress1, mapForm.mapAddress2, mapForm.mapCity, mapForm.mapProvince, mapForm.mapPostalCode, mapForm.mapPhoneNumber, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+ database.close();
+ return result.lastInsertRowid;
+};
+export default addMap;
diff --git a/helpers/lotOccupancyDB/addMap.ts b/helpers/lotOccupancyDB/addMap.ts
new file mode 100644
index 00000000..dad05a5a
--- /dev/null
+++ b/helpers/lotOccupancyDB/addMap.ts
@@ -0,0 +1,59 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+interface AddMapForm {
+ mapName: string;
+ mapDescription: string;
+ mapSVG: string;
+ mapLatitude: string;
+ mapLongitude: string;
+ mapAddress1: string;
+ mapAddress2: string;
+ mapCity: string;
+ mapProvince: string;
+ mapPostalCode: string;
+ mapPhoneNumber: string;
+}
+
+
+export const addMap =
+ (mapForm: AddMapForm, requestSession: recordTypes.PartialSession): number => {
+
+ const database = sqlite(databasePath);
+
+ const rightNowMillis = Date.now();
+
+ const result = database
+ .prepare("insert into Maps (" +
+ "mapName, mapDescription," +
+ " mapSVG, mapLatitude, mapLongitude," +
+ " mapAddress1, mapAddress2, mapCity, mapProvince, mapPostalCode, mapPhoneNumber," +
+ " recordCreate_userName, recordCreate_timeMillis," +
+ " recordUpdate_userName, recordUpdate_timeMillis)" +
+ " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+ .run(mapForm.mapName,
+ mapForm.mapDescription,
+ mapForm.mapSVG,
+ (mapForm.mapLatitude === "" ? undefined : mapForm.mapLatitude),
+ (mapForm.mapLongitude === "" ? undefined : mapForm.mapLongitude),
+ mapForm.mapAddress1,
+ mapForm.mapAddress2,
+ mapForm.mapCity,
+ mapForm.mapProvince,
+ mapForm.mapPostalCode,
+ mapForm.mapPhoneNumber,
+ requestSession.user.userName,
+ rightNowMillis,
+ requestSession.user.userName,
+ rightNowMillis);
+
+ database.close();
+
+ return result.lastInsertRowid as number;
+ };
+
+
+export default addMap;
\ No newline at end of file
diff --git a/helpers/lotOccupancyDB/addOccupant.d.ts b/helpers/lotOccupancyDB/addOccupant.d.ts
new file mode 100644
index 00000000..369fc04c
--- /dev/null
+++ b/helpers/lotOccupancyDB/addOccupant.d.ts
@@ -0,0 +1,13 @@
+import sqlite from "better-sqlite3";
+import type * as recordTypes from "../../types/recordTypes";
+interface AddOccupantForm {
+ occupantName: string;
+ occupantAddress1: string;
+ occupantAddress2: string;
+ occupantCity: string;
+ occupantProvince: string;
+ occupantPostalCode: string;
+ occupantPhoneNumber: string;
+}
+export declare const addOccupant: (occupantForm: AddOccupantForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database) => number;
+export default addOccupant;
diff --git a/helpers/lotOccupancyDB/addOccupant.js b/helpers/lotOccupancyDB/addOccupant.js
new file mode 100644
index 00000000..02c3b4d7
--- /dev/null
+++ b/helpers/lotOccupancyDB/addOccupant.js
@@ -0,0 +1,19 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const addOccupant = (occupantForm, requestSession, connectedDatabase) => {
+ const database = connectedDatabase || sqlite(databasePath);
+ const rightNowMillis = Date.now();
+ const result = database
+ .prepare("insert into Occupants (" +
+ "occupantName," +
+ " occupantAddress1, occupantAddress2, occupantCity, occupantProvince, occupantPostalCode, occupantPhoneNumber," +
+ " recordCreate_userName, recordCreate_timeMillis," +
+ " recordUpdate_userName, recordUpdate_timeMillis)" +
+ " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+ .run(occupantForm.occupantName, occupantForm.occupantAddress1, occupantForm.occupantAddress2, occupantForm.occupantCity, occupantForm.occupantProvince, occupantForm.occupantPostalCode, occupantForm.occupantPhoneNumber, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+ if (!connectedDatabase) {
+ database.close();
+ }
+ return result.lastInsertRowid;
+};
+export default addOccupant;
diff --git a/helpers/lotOccupancyDB/addOccupant.ts b/helpers/lotOccupancyDB/addOccupant.ts
new file mode 100644
index 00000000..a442ab9c
--- /dev/null
+++ b/helpers/lotOccupancyDB/addOccupant.ts
@@ -0,0 +1,54 @@
+import sqlite from "better-sqlite3";
+import {
+ lotOccupancyDB as databasePath
+} from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+interface AddOccupantForm {
+ occupantName: string;
+ occupantAddress1: string;
+ occupantAddress2: string;
+ occupantCity: string;
+ occupantProvince: string;
+ occupantPostalCode: string;
+ occupantPhoneNumber: string;
+}
+
+
+export const addOccupant =
+ (occupantForm: AddOccupantForm, requestSession: recordTypes.PartialSession, connectedDatabase ? : sqlite.Database): number => {
+
+ const database = connectedDatabase || sqlite(databasePath);
+
+ const rightNowMillis = Date.now();
+
+ const result = database
+ .prepare("insert into Occupants (" +
+ "occupantName," +
+ " occupantAddress1, occupantAddress2, occupantCity, occupantProvince, occupantPostalCode, occupantPhoneNumber," +
+ " recordCreate_userName, recordCreate_timeMillis," +
+ " recordUpdate_userName, recordUpdate_timeMillis)" +
+ " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+ .run(occupantForm.occupantName,
+ occupantForm.occupantAddress1,
+ occupantForm.occupantAddress2,
+ occupantForm.occupantCity,
+ occupantForm.occupantProvince,
+ occupantForm.occupantPostalCode,
+ occupantForm.occupantPhoneNumber,
+ requestSession.user.userName,
+ rightNowMillis,
+ requestSession.user.userName,
+ rightNowMillis);
+
+ if (!connectedDatabase) {
+ database.close();
+ }
+
+ return result.lastInsertRowid as number;
+ };
+
+
+export default addOccupant;
\ No newline at end of file
diff --git a/helpers/lotOccupancyDB/getLotTypes.d.ts b/helpers/lotOccupancyDB/getLotTypes.d.ts
new file mode 100644
index 00000000..e952d4d2
--- /dev/null
+++ b/helpers/lotOccupancyDB/getLotTypes.d.ts
@@ -0,0 +1,3 @@
+import type * as recordTypes from "../../types/recordTypes";
+export declare const getLotTypes: () => recordTypes.LotType[];
+export default getLotTypes;
diff --git a/helpers/lotOccupancyDB/getLotTypes.js b/helpers/lotOccupancyDB/getLotTypes.js
new file mode 100644
index 00000000..f890d11e
--- /dev/null
+++ b/helpers/lotOccupancyDB/getLotTypes.js
@@ -0,0 +1,15 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const getLotTypes = () => {
+ const database = sqlite(databasePath, {
+ readonly: true
+ });
+ const lotTypes = database
+ .prepare("select * from LotTypes" +
+ " where recordDelete_timeMillis is null" +
+ " order by orderNumber, lotType")
+ .all();
+ database.close();
+ return lotTypes;
+};
+export default getLotTypes;
diff --git a/helpers/lotOccupancyDB/getLotTypes.ts b/helpers/lotOccupancyDB/getLotTypes.ts
new file mode 100644
index 00000000..a2d02145
--- /dev/null
+++ b/helpers/lotOccupancyDB/getLotTypes.ts
@@ -0,0 +1,25 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+export const getLotTypes = (): recordTypes.LotType[] => {
+
+ const database = sqlite(databasePath, {
+ readonly: true
+ });
+
+ const lotTypes: recordTypes.LotType[] = database
+ .prepare("select * from LotTypes" +
+ " where recordDelete_timeMillis is null" +
+ " order by orderNumber, lotType")
+ .all();
+
+ database.close();
+
+ return lotTypes;
+ };
+
+
+export default getLotTypes;
\ No newline at end of file
diff --git a/helpers/lotOccupancyDB/getMap.d.ts b/helpers/lotOccupancyDB/getMap.d.ts
new file mode 100644
index 00000000..20e0b8cc
--- /dev/null
+++ b/helpers/lotOccupancyDB/getMap.d.ts
@@ -0,0 +1,3 @@
+import type * as recordTypes from "../../types/recordTypes";
+export declare const getMap: (mapId: number | string) => recordTypes.Map;
+export default getMap;
diff --git a/helpers/lotOccupancyDB/getMap.js b/helpers/lotOccupancyDB/getMap.js
new file mode 100644
index 00000000..af3ddff8
--- /dev/null
+++ b/helpers/lotOccupancyDB/getMap.js
@@ -0,0 +1,28 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const getMap = (mapId) => {
+ const database = sqlite(databasePath, {
+ readonly: true
+ });
+ const map = database
+ .prepare("select m.mapId, m.mapName, m.mapDescription," +
+ " m.mapLatitude, m.mapLongitude, m.mapSVG," +
+ " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," +
+ " m.recordCreate_userName, m.recordCreate_timeMillis," +
+ " m.recordUpdate_userName, m.recordUpdate_timeMillis," +
+ " m.recordDelete_userName, m.recordDelete_timeMillis," +
+ " count(l.lotId) as lotCount" +
+ " from Maps m" +
+ " left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null" +
+ " where m.mapId = ?" +
+ " group by m.mapId, m.mapName, m.mapDescription," +
+ " m.mapLatitude, m.mapLongitude, m.mapSVG," +
+ " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," +
+ " m.recordCreate_userName, m.recordCreate_timeMillis," +
+ " m.recordUpdate_userName, m.recordUpdate_timeMillis," +
+ " m.recordDelete_userName, m.recordDelete_timeMillis")
+ .get(mapId);
+ database.close();
+ return map;
+};
+export default getMap;
diff --git a/helpers/lotOccupancyDB/getMap.ts b/helpers/lotOccupancyDB/getMap.ts
new file mode 100644
index 00000000..27909324
--- /dev/null
+++ b/helpers/lotOccupancyDB/getMap.ts
@@ -0,0 +1,38 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+export const getMap = (mapId: number | string): recordTypes.Map => {
+
+ const database = sqlite(databasePath, {
+ readonly: true
+ });
+
+ const map: recordTypes.Map = database
+ .prepare("select m.mapId, m.mapName, m.mapDescription," +
+ " m.mapLatitude, m.mapLongitude, m.mapSVG," +
+ " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," +
+ " m.recordCreate_userName, m.recordCreate_timeMillis," +
+ " m.recordUpdate_userName, m.recordUpdate_timeMillis," +
+ " m.recordDelete_userName, m.recordDelete_timeMillis," +
+ " count(l.lotId) as lotCount" +
+ " from Maps m" +
+ " left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null" +
+ " where m.mapId = ?" +
+ " group by m.mapId, m.mapName, m.mapDescription," +
+ " m.mapLatitude, m.mapLongitude, m.mapSVG," +
+ " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," +
+ " m.recordCreate_userName, m.recordCreate_timeMillis," +
+ " m.recordUpdate_userName, m.recordUpdate_timeMillis," +
+ " m.recordDelete_userName, m.recordDelete_timeMillis")
+ .get(mapId);
+
+ database.close();
+
+ return map;
+ };
+
+
+export default getMap;
\ No newline at end of file
diff --git a/helpers/lotOccupancyDB/getMaps.d.ts b/helpers/lotOccupancyDB/getMaps.d.ts
new file mode 100644
index 00000000..b07dfda9
--- /dev/null
+++ b/helpers/lotOccupancyDB/getMaps.d.ts
@@ -0,0 +1,5 @@
+import type * as recordTypes from "../../types/recordTypes";
+interface GetMapsFilters {
+}
+export declare const getMaps: (filters?: GetMapsFilters) => recordTypes.Map[];
+export default getMaps;
diff --git a/helpers/lotOccupancyDB/getMaps.js b/helpers/lotOccupancyDB/getMaps.js
new file mode 100644
index 00000000..2b04821b
--- /dev/null
+++ b/helpers/lotOccupancyDB/getMaps.js
@@ -0,0 +1,24 @@
+import sqlite from "better-sqlite3";
+import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+export const getMaps = (filters) => {
+ const database = sqlite(databasePath, {
+ readonly: true
+ });
+ const maps = database
+ .prepare("select m.mapId, m.mapName, m.mapDescription," +
+ " m.mapLatitude, m.mapLongitude, m.mapSVG," +
+ " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," +
+ " l.lotCount" +
+ " from Maps m" +
+ (" left join (" +
+ "select mapId, count(lotId) as lotCount" +
+ " from Lots" +
+ " where recordDelete_timeMillis is null" +
+ " group by mapId) l on m.mapId = l.mapId") +
+ " where m.recordDelete_timeMillis is null" +
+ " order by m.mapName, m.mapId")
+ .all();
+ database.close();
+ return maps;
+};
+export default getMaps;
diff --git a/helpers/lotOccupancyDB/getMaps.ts b/helpers/lotOccupancyDB/getMaps.ts
new file mode 100644
index 00000000..813669f5
--- /dev/null
+++ b/helpers/lotOccupancyDB/getMaps.ts
@@ -0,0 +1,41 @@
+import sqlite from "better-sqlite3";
+import {
+ lotOccupancyDB as databasePath
+} from "../../data/databasePaths.js";
+
+import type * as recordTypes from "../../types/recordTypes";
+
+
+interface GetMapsFilters {
+
+}
+
+
+export const getMaps = (filters ? : GetMapsFilters): recordTypes.Map[] => {
+
+ const database = sqlite(databasePath, {
+ readonly: true
+ });
+
+ const maps: recordTypes.Map[] = database
+ .prepare("select m.mapId, m.mapName, m.mapDescription," +
+ " m.mapLatitude, m.mapLongitude, m.mapSVG," +
+ " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," +
+ " l.lotCount" +
+ " from Maps m" +
+ (" left join (" +
+ "select mapId, count(lotId) as lotCount" +
+ " from Lots" +
+ " where recordDelete_timeMillis is null" +
+ " group by mapId) l on m.mapId = l.mapId") +
+ " where m.recordDelete_timeMillis is null" +
+ " order by m.mapName, m.mapId")
+ .all();
+
+ database.close();
+
+ return maps;
+};
+
+
+export default getMaps;
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 61e8a9a8..0503e526 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,6 +27,7 @@
"express-rate-limit": "^6.4.0",
"express-session": "^1.17.3",
"http-errors": "^2.0.0",
+ "leaflet": "^1.8.0",
"session-file-store": "^1.5.0"
},
"devDependencies": {
@@ -46,9 +47,11 @@
"@types/gulp-minify": "^3.1.1",
"@types/gulp-sass": "^5.0.0",
"@types/http-errors": "^1.8.2",
+ "@types/leaflet": "^1.7.11",
"@types/mocha": "^9.1.1",
"@types/mssql": "^8.0.3",
"@types/node-windows": "^0.1.2",
+ "@types/papaparse": "^5.3.2",
"@types/session-file-store": "^1.2.2",
"@typescript-eslint/eslint-plugin": "^5.30.6",
"@typescript-eslint/parser": "^5.30.6",
@@ -62,6 +65,7 @@
"gulp-minify": "^3.1.0",
"gulp-sass": "^5.1.0",
"nodemon": "^2.0.19",
+ "papaparse": "^5.3.2",
"sass": "^1.53.0"
},
"engines": {
@@ -843,6 +847,12 @@
"@types/express": "*"
}
},
+ "node_modules/@types/geojson": {
+ "version": "7946.0.10",
+ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
+ "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==",
+ "dev": true
+ },
"node_modules/@types/glob": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
@@ -930,6 +940,15 @@
"@types/node": "*"
}
},
+ "node_modules/@types/leaflet": {
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.11.tgz",
+ "integrity": "sha512-VwAYom2pfIAf/pLj1VR5aLltd4tOtHyvfaJlNYCoejzP2nu52PrMi1ehsLRMUS+bgafmIIKBV1cMfKeS+uJ0Vg==",
+ "dev": true,
+ "dependencies": {
+ "@types/geojson": "*"
+ }
+ },
"node_modules/@types/mime": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -1019,6 +1038,15 @@
"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
"dev": true
},
+ "node_modules/@types/papaparse": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.2.tgz",
+ "integrity": "sha512-BNbCHJkTE4RwmAFkCxEalET4mDvGr/1ld7ZtQ4i/laWI/iiVt+GL07stdvufle4KfywyvloqqpIiJscXNCrKxA==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
"node_modules/@types/qs": {
"version": "6.9.7",
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
@@ -6329,6 +6357,11 @@
"node": ">= 0.10"
}
},
+ "node_modules/leaflet": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.8.0.tgz",
+ "integrity": "sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA=="
+ },
"node_modules/levn": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -7506,6 +7539,12 @@
"node": ">=4"
}
},
+ "node_modules/papaparse": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.2.tgz",
+ "integrity": "sha512-6dNZu0Ki+gyV0eBsFKJhYr+MdQYAzFUGlBMNj3GNrmHxmz1lfRa24CjFObPXtjcetlOv5Ad299MhIK0znp3afw==",
+ "dev": true
+ },
"node_modules/parent-module": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -11187,6 +11226,12 @@
"@types/express": "*"
}
},
+ "@types/geojson": {
+ "version": "7946.0.10",
+ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
+ "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==",
+ "dev": true
+ },
"@types/glob": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
@@ -11274,6 +11319,15 @@
"@types/node": "*"
}
},
+ "@types/leaflet": {
+ "version": "1.7.11",
+ "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.11.tgz",
+ "integrity": "sha512-VwAYom2pfIAf/pLj1VR5aLltd4tOtHyvfaJlNYCoejzP2nu52PrMi1ehsLRMUS+bgafmIIKBV1cMfKeS+uJ0Vg==",
+ "dev": true,
+ "requires": {
+ "@types/geojson": "*"
+ }
+ },
"@types/mime": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -11362,6 +11416,15 @@
"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
"dev": true
},
+ "@types/papaparse": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.2.tgz",
+ "integrity": "sha512-BNbCHJkTE4RwmAFkCxEalET4mDvGr/1ld7ZtQ4i/laWI/iiVt+GL07stdvufle4KfywyvloqqpIiJscXNCrKxA==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ },
"@types/qs": {
"version": "6.9.7",
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
@@ -15459,6 +15522,11 @@
"flush-write-stream": "^1.0.2"
}
},
+ "leaflet": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.8.0.tgz",
+ "integrity": "sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA=="
+ },
"levn": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -16381,6 +16449,12 @@
"integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
"dev": true
},
+ "papaparse": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.2.tgz",
+ "integrity": "sha512-6dNZu0Ki+gyV0eBsFKJhYr+MdQYAzFUGlBMNj3GNrmHxmz1lfRa24CjFObPXtjcetlOv5Ad299MhIK0znp3afw==",
+ "dev": true
+ },
"parent-module": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
diff --git a/package.json b/package.json
index 967709cb..ef631002 100644
--- a/package.json
+++ b/package.json
@@ -9,15 +9,12 @@
},
"scripts": {
"build:version": "npx genversion --es6 --semi version.js",
-
"start": "cross-env NODE_ENV=production node ./bin/www",
-
"dev:test": "cross-env NODE_ENV=dev DEBUG=lot-occupancy-system:* TEST_DATABASES=true nodemon ./bin/www",
"dev:live": "cross-env NODE_ENV=dev DEBUG=lot-occupancy-system:* nodemon ./bin/www",
-
"test": "echo \"Error: no test specified\" && exit 1",
-
- "temp:so:importMaps": "node ./temp/so.importMaps.js"
+ "temp:legacy:importFromCSV": "cross-env NODE_ENV=dev DEBUG=lot-occupancy-system:* TEST_DATABASES=true node ./temp/legacy.importFromCSV.js",
+ "temp:so:exportMaps": "node ./temp/so.exportMaps.js"
},
"repository": {
"type": "git",
@@ -49,6 +46,7 @@
"express-rate-limit": "^6.4.0",
"express-session": "^1.17.3",
"http-errors": "^2.0.0",
+ "leaflet": "^1.8.0",
"session-file-store": "^1.5.0"
},
"devDependencies": {
@@ -68,9 +66,11 @@
"@types/gulp-minify": "^3.1.1",
"@types/gulp-sass": "^5.0.0",
"@types/http-errors": "^1.8.2",
+ "@types/leaflet": "^1.7.11",
"@types/mocha": "^9.1.1",
"@types/mssql": "^8.0.3",
"@types/node-windows": "^0.1.2",
+ "@types/papaparse": "^5.3.2",
"@types/session-file-store": "^1.2.2",
"@typescript-eslint/eslint-plugin": "^5.30.6",
"@typescript-eslint/parser": "^5.30.6",
@@ -84,6 +84,7 @@
"gulp-minify": "^3.1.0",
"gulp-sass": "^5.1.0",
"nodemon": "^2.0.19",
+ "papaparse": "^5.3.2",
"sass": "^1.53.0"
}
}
diff --git a/public-typescript/licence-search.js b/public-typescript/licence-search.js
deleted file mode 100644
index e0703cc2..00000000
--- a/public-typescript/licence-search.js
+++ /dev/null
@@ -1,93 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-(() => {
- const urlPrefix = document.querySelector("main").dataset.urlPrefix;
- const formElement = document.querySelector("#form--filters");
- const limitElement = document.querySelector("#filter--limit");
- const offsetElement = document.querySelector("#filter--offset");
- const searchResultsElement = document.querySelector("#container--searchResults");
- const doLicenceSearchFunction = () => {
- const currentLimit = Number.parseInt(limitElement.value, 10);
- const currentOffset = Number.parseInt(offsetElement.value, 10);
- searchResultsElement.innerHTML = "" +
- "Loading licences... " +
- "
";
- cityssm.postJSON(urlPrefix + "/licences/doSearch", formElement, (licenceResults) => {
- const licenceList = licenceResults.licences;
- if (licenceList.length === 0) {
- searchResultsElement.innerHTML = "" +
- "
" +
- "Your search returned no results.
" +
- "
" +
- "" +
- "
";
- const tbodyElement = searchResultsElement.querySelector("tbody");
- for (const licenceObject of licenceList) {
- const trElement = document.createElement("tr");
- trElement.innerHTML = "";
- tbodyElement.append(trElement);
- }
- searchResultsElement.insertAdjacentHTML("beforeend", "" +
- "
" +
- "Displaying licences " +
- (currentOffset + 1).toString() +
- " to " +
- Math.min(currentLimit + currentOffset, licenceResults.count).toString() +
- " of " +
- licenceResults.count.toString() +
- "
" +
- "
Next Licences " +
- "" +
- "Loading licences... " +
- "
";
-
- cityssm.postJSON(urlPrefix + "/licences/doSearch",
- formElement,
- (licenceResults: { count: number; licences: recordTypes.Licence[] }) => {
-
- const licenceList = licenceResults.licences;
-
- if (licenceList.length === 0) {
-
- searchResultsElement.innerHTML = "" +
- "
" +
- "Your search returned no results.
" +
- "
" +
- "" +
-
- "
";
-
- const tbodyElement = searchResultsElement.querySelector("tbody");
-
- for (const licenceObject of licenceList) {
-
- const trElement = document.createElement("tr");
-
- trElement.innerHTML = "";
-
- tbodyElement.append(trElement);
- }
-
- searchResultsElement.insertAdjacentHTML("beforeend", "" +
- "
" +
- "Displaying licences " +
- (currentOffset + 1).toString() +
- " to " +
- Math.min(currentLimit + currentOffset, licenceResults.count).toString() +
- " of " +
- licenceResults.count.toString() +
- "
" +
- "
Next Licences " +
- "" +
+ "
";
+ let searchResultCount = 0;
+ const searchResultsTbodyElement = document.createElement("tbody");
+ const filterStringSplit = searchFilterElement.value.trim().toLowerCase().split(" ");
+ for (const map of maps) {
+ const mapSearchString = (map.mapName + " " +
+ map.mapDescription + " " +
+ map.mapAddress1 + " " +
+ map.mapAddress2).toLowerCase();
+ let showMap = true;
+ for (const filterStringPiece of filterStringSplit) {
+ if (!mapSearchString.includes(filterStringPiece)) {
+ showMap = false;
+ break;
+ }
+ }
+ if (!showMap) {
+ continue;
+ }
+ searchResultCount += 1;
+ const mapName = map.mapName === ""
+ ? "(No Name)"
+ : map.mapName;
+ searchResultsTbodyElement.insertAdjacentHTML("beforeend", "" +
+ ("" +
+ "" +
+ cityssm.escapeHTML(mapName) +
+ " ") +
+ "" +
+ (map.mapLatitude && map.mapLongitude
+ ? " " +
+ "" +
+ (map.mapSVG
+ ? " " +
+ "" + map.lotCount + " " +
+ " ");
+ }
+ searchResultsContainerElement.innerHTML = "";
+ if (searchResultCount === 0) {
+ searchResultsContainerElement.innerHTML = "" +
+ "
There are no " + exports.aliases.maps.toLowerCase() + " that meet the search criteria.
" +
+ "
" +
+ "" + exports.aliases.map + " " +
+ "Coordinates " +
+ "Image " +
+ "" + exports.aliases.lot + " Count " +
+ " " +
+ "
";
+
+ let searchResultCount = 0;
+ const searchResultsTbodyElement = document.createElement("tbody");
+
+ const filterStringSplit = searchFilterElement.value.trim().toLowerCase().split(" ");
+
+ for (const map of maps) {
+
+ const mapSearchString = (map.mapName + " " +
+ map.mapDescription + " " +
+ map.mapAddress1 + " " +
+ map.mapAddress2).toLowerCase();
+
+ let showMap = true;
+
+ for (const filterStringPiece of filterStringSplit) {
+ if (!mapSearchString.includes(filterStringPiece)) {
+ showMap = false;
+ break;
+ }
+ }
+
+ if (!showMap) {
+ continue;
+ }
+
+ searchResultCount += 1;
+
+ const mapName = map.mapName === ""
+ ? "(No Name)"
+ : map.mapName;
+
+ searchResultsTbodyElement.insertAdjacentHTML("beforeend", "" +
+ ("" +
+ "" +
+ cityssm.escapeHTML(mapName) +
+ " ") +
+ "" +
+ (map.mapLatitude && map.mapLongitude
+ ? " " +
+ "" +
+ (map.mapSVG
+ ? " " +
+ "" + map.lotCount + " " +
+ " ");
+ }
+
+ searchResultsContainerElement.innerHTML = "";
+
+ if (searchResultCount === 0) {
+
+ searchResultsContainerElement.innerHTML = "" +
+ "
There are no " + exports.aliases.maps.toLowerCase() + " that meet the search criteria.
" +
+ "
" +
+ "" + exports.aliases.map + " " +
+ "Coordinates " +
+ "Image " +
+ "" + exports.aliases.lot + " Count " +
+ " Loading licences...
',cityssm.postJSON(e+"/licences/doSearch",t,e=>{const t=e.licences;if(0===t.length)return void(s.innerHTML='Your search returned no results.
Displaying licences '+(c+1).toString()+" to "+Math.min(i+c,e.count).toString()+" of "+e.count.toString()+"
0){const e=document.createElement("a");e.className="button",e.textContent="Previous",e.addEventListener("click",e=>{e.preventDefault(),r.value=Math.max(0,c-i).toString(),a()}),t.append(e)}if(i+c{e.preventDefault(),r.value=(c+i).toString(),a()}),t.append(e)}s.querySelector(".level").append(t)}})},i=()=>{r.value="0",a()};t.addEventListener("submit",e=>{e.preventDefault()});const c=t.querySelectorAll(".input, .select select");for(const e of c)e.addEventListener("change",i);i()})();
\ No newline at end of file
diff --git a/public/javascripts/mapSearch.min.js b/public/javascripts/mapSearch.min.js
new file mode 100644
index 00000000..f3b44881
--- /dev/null
+++ b/public/javascripts/mapSearch.min.js
@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=document.querySelector("main").dataset.urlPrefix,t=exports.maps,s=document.querySelector("#searchFilter--map"),a=document.querySelector("#container--searchResults"),r=()=>{a.innerHTML='
";let r=0;const i=document.createElement("tbody"),o=s.value.trim().toLowerCase().split(" ");for(const s of t){const t=(s.mapName+" "+s.mapDescription+" "+s.mapAddress1+" "+s.mapAddress2).toLowerCase();let a=!0;for(const e of o)if(!t.includes(e)){a=!1;break}if(!a)continue;r+=1;const c=""===s.mapName?"(No Name)":s.mapName;i.insertAdjacentHTML("beforeend",''+cityssm.escapeHTML(c)+" '+(s.mapLatitude&&s.mapLongitude?' '+(s.mapSVG?' '+s.lotCount+" There are no '+exports.aliases.maps.toLowerCase()+" that meet the search criteria.
"+exports.aliases.map+' Coordinates Image '+exports.aliases.lot+" Count = new Map();
+
+
+function getMap(masterRow: MasterRecord): recordTypes.Map {
+
+ if (mapCache.has(masterRow.CM_CEMETERY)) {
+ return mapCache.get(masterRow.CM_CEMETERY);
+ }
+
+ let map = getMapByMapDescription(masterRow.CM_CEMETERY);
+
+ if (!map) {
+
+ console.log("Creating map: " + masterRow.CM_CEMETERY);
+
+ const mapId = addMap({
+ mapName: masterRow.CM_CEMETERY,
+ mapDescription: masterRow.CM_CEMETERY,
+ mapSVG: "",
+ mapLatitude: "",
+ mapLongitude: "",
+ mapAddress1: "",
+ mapAddress2: "",
+ mapCity: "Sault Ste. Marie",
+ mapProvince: "ON",
+ mapPostalCode: "",
+ mapPhoneNumber: ""
+ }, user);
+
+ map = getMapFromDatabase(mapId);
+ }
+
+ mapCache.set(masterRow.CM_CEMETERY, map);
+
+ return map;
+}
+
+
+function importFromCSV () {
+
+ const lotTypes = getLotTypes();
+
+ const rawData = fs.readFileSync("./temp/CMMASTER.csv").toString();
+
+ const cmmaster: papa.ParseResult = papa.parse(rawData, {
+ delimiter: ",",
+ header: true,
+ skipEmptyLines: true
+ });
+
+ for (const parseError of cmmaster.errors) {
+ console.log(parseError);
+ }
+
+ for (const masterRow of cmmaster.data) {
+ const map = getMap(masterRow);
+
+ const lotName = masterRow.CM_CEMETERY + "-" +
+ (masterRow.CM_BLOCK === "" ? "" : masterRow.CM_BLOCK + "-") +
+ (masterRow.CM_RANGE2 === "" ? masterRow.CM_RANGE1.toString() : masterRow.CM_RANGE2) + "-" +
+ (masterRow.CM_LOT2 === "" ? masterRow.CM_LOT1.toString() : masterRow.CM_LOT2) + "-" +
+ (masterRow.CM_GRAVE2 === "" ? masterRow.CM_GRAVE1.toString() : masterRow.CM_GRAVE2) + "-" +
+ masterRow.CM_INTERMENT;
+
+ const lotId = addLot({
+ lotName: lotName,
+ lotTypeId: lotTypes[0].lotTypeId,
+ lotTypeStatusId: "",
+ mapId: map.mapId,
+ mapKey: lotName,
+ lotLatitude: "",
+ lotLongitude: ""
+ }, user);
+ }
+}
+
+purgeTables();
+// purgeMaps();
+importFromCSV();
\ No newline at end of file
diff --git a/temp/so.exportMaps.d.ts b/temp/so.exportMaps.d.ts
new file mode 100644
index 00000000..cb0ff5c3
--- /dev/null
+++ b/temp/so.exportMaps.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/temp/so.exportMaps.js b/temp/so.exportMaps.js
new file mode 100644
index 00000000..6367a925
--- /dev/null
+++ b/temp/so.exportMaps.js
@@ -0,0 +1,32 @@
+import fs from "node:fs";
+import * as sql from "@cityssm/mssql-multi-pool";
+import { soMSSQL } from "./config.js";
+async function importMaps() {
+ let pool;
+ try {
+ pool = await sql.connect(soMSSQL);
+ const result = await pool.query("select m.ID as mapId, m.Name as mapName," +
+ " l.ID as layerId, l.Name as layerName, l.Image as layerImage" +
+ " from Legacy_Maps m" +
+ " left join Legacy_Layers l on m.ID = l.Map_ID");
+ for (const layer of result.recordset) {
+ const imageBuffer = layer.layerImage;
+ const fileName = layer.mapName + " - " + layer.layerName + " (" + layer.mapId + ", " + layer.layerId + ").wmf";
+ fs.writeFile("./temp/wmf/" + fileName, imageBuffer, (error) => {
+ if (error) {
+ console.log(error);
+ }
+ });
+ }
+ }
+ catch (_a) {
+ }
+ finally {
+ try {
+ pool.close();
+ }
+ catch (_b) {
+ }
+ }
+}
+await importMaps();
diff --git a/temp/so.exportMaps.ts b/temp/so.exportMaps.ts
new file mode 100644
index 00000000..140f4648
--- /dev/null
+++ b/temp/so.exportMaps.ts
@@ -0,0 +1,45 @@
+/* eslint-disable node/no-extraneous-import, node/no-unpublished-import */
+
+import fs from "node:fs";
+import * as sql from "@cityssm/mssql-multi-pool";
+import { soMSSQL } from "./config.js";
+import type * as sqlTypes from "mssql";
+
+async function importMaps() {
+
+ let pool: sqlTypes.ConnectionPool;
+
+ try {
+ pool = await sql.connect(soMSSQL);
+
+ const result = await pool.query("select m.ID as mapId, m.Name as mapName," +
+ " l.ID as layerId, l.Name as layerName, l.Image as layerImage" +
+ " from Legacy_Maps m" +
+ " left join Legacy_Layers l on m.ID = l.Map_ID");
+
+ for (const layer of result.recordset) {
+
+ const imageBuffer: Buffer = layer.layerImage;
+
+ const fileName = layer.mapName + " - " + layer.layerName + " (" + layer.mapId + ", " + layer.layerId + ").wmf";
+
+ fs.writeFile("./temp/wmf/" + fileName, imageBuffer, (error) => {
+ if (error) {
+ console.log(error);
+ }
+ });
+ }
+
+ } catch {
+ // ignore
+ } finally {
+ try {
+ pool.close();
+ } catch {
+ // ignore
+ }
+ }
+}
+
+
+await importMaps();
\ No newline at end of file
diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts
index 8ce8c639..68e4cf3f 100644
--- a/types/recordTypes.d.ts
+++ b/types/recordTypes.d.ts
@@ -23,6 +23,55 @@ export interface Map extends Record {
mapProvince?: string;
mapPostalCode?: string;
mapPhoneNumber?: string;
+ lotCount?: number;
+}
+export interface LotType extends Record {
+ lotTypeId?: number;
+ lotType?: string;
+ orderNumber?: number;
+ lotTypeStatuses?: LotTypeStatus[];
+ lotTypeFields?: LotTypeField[];
+}
+export interface LotTypeField extends Record {
+ lotTypeFieldId?: number;
+ lotTypeField?: string;
+ lotTypeId?: number;
+ lotType: LotType;
+ lotTypeFieldValues?: string;
+ isRequired?: boolean;
+ pattern?: string;
+ minimumLength?: number;
+ maximumLength?: number;
+ orderNumber?: number;
+}
+export interface LotTypeStatus extends Record {
+ lotTypeStatusId?: number;
+ lotTypeId?: number;
+ lotTypeStatus?: string;
+ orderNumber?: number;
+}
+export interface Lot extends Record {
+ lotId?: number;
+ lotName?: string;
+ lotTypeId?: number;
+ lotType?: LotType;
+ mapId?: number;
+ map?: Map;
+ mapKey?: string;
+ lotLatitude?: number;
+ lotLongitude?: number;
+ lotTypeStatusId?: number;
+ lotTypeStatus?: LotTypeStatus;
+}
+export interface Occupant extends Record {
+ occupantId?: number;
+ occupantName?: string;
+ occupantAddress1?: string;
+ occupantAddress2?: string;
+ occupantCity?: string;
+ occupantProvince?: string;
+ occupantPostalCode?: string;
+ occupantPhoneNumber?: string;
}
export interface User {
userName: string;
@@ -37,3 +86,6 @@ declare module "express-session" {
user: User;
}
}
+export interface PartialSession {
+ user: User;
+}
diff --git a/types/recordTypes.ts b/types/recordTypes.ts
index 850dcea9..95edbc7a 100644
--- a/types/recordTypes.ts
+++ b/types/recordTypes.ts
@@ -1,8 +1,3 @@
-/*
- * LOT OCCUPANCY DB TYPES
- */
-
-
export interface Record {
recordCreate_userName?: string;
recordCreate_timeMillis?: number;
@@ -18,8 +13,13 @@ export interface Record {
recordDelete_dateString?: string;
}
-export interface Map extends Record {
+/*
+ * LOT OCCUPANCY DB TYPES
+ */
+
+
+export interface Map extends Record {
mapId?: number;
mapName?: string;
mapDescription?: string;
@@ -34,9 +34,81 @@ export interface Map extends Record {
mapProvince?: string;
mapPostalCode?: string;
mapPhoneNumber?: string;
+
+ lotCount?: number;
}
+export interface LotType extends Record {
+ lotTypeId?: number;
+ lotType?: string;
+ orderNumber?: number;
+ lotTypeStatuses?: LotTypeStatus[];
+ lotTypeFields?: LotTypeField[];
+}
+
+
+export interface LotTypeField extends Record {
+ lotTypeFieldId?: number;
+ lotTypeField?: string;
+
+ lotTypeId?: number;
+ lotType: LotType;
+
+ lotTypeFieldValues?: string;
+ isRequired?: boolean;
+ pattern?: string;
+ minimumLength?: number;
+ maximumLength?: number;
+
+ orderNumber?: number;
+}
+
+
+export interface LotTypeStatus extends Record {
+ lotTypeStatusId?: number;
+ lotTypeId?: number;
+ lotTypeStatus?: string;
+ orderNumber?: number;
+}
+
+
+export interface Lot extends Record {
+ lotId?: number;
+ lotName?: string;
+
+ lotTypeId?: number;
+ lotType?: LotType;
+
+ mapId?: number;
+ map?: Map;
+ mapKey?: string;
+
+ lotLatitude?: number;
+ lotLongitude?: number;
+
+ lotTypeStatusId?: number;
+ lotTypeStatus?: LotTypeStatus;
+}
+
+
+export interface Occupant extends Record {
+ occupantId?: number;
+ occupantName?: string;
+ occupantAddress1?: string;
+ occupantAddress2?: string;
+ occupantCity?: string;
+ occupantProvince?: string;
+ occupantPostalCode?: string;
+ occupantPhoneNumber?: string;
+}
+
+
+/*
+ * USER TYPES
+ */
+
+
export interface User {
userName: string;
userProperties?: UserProperties;
@@ -53,3 +125,7 @@ declare module "express-session" {
user: User;
}
}
+
+export interface PartialSession {
+ user: User;
+}
\ No newline at end of file
diff --git a/views/_footerA.ejs b/views/_footerA.ejs
index a39c36d6..492f0f66 100644
--- a/views/_footerA.ejs
+++ b/views/_footerA.ejs
@@ -13,9 +13,16 @@
+
+
<%- include('_footerB'); -%>
diff --git a/views/map-view.ejs b/views/map-view.ejs
index e69de29b..c58f97a4 100644
--- a/views/map-view.ejs
+++ b/views/map-view.ejs
@@ -0,0 +1,81 @@
+<%- include('_header'); -%>
+
+
+
+
+
+
+
+
+
+ <%= map.mapName %>
+
+
+ <% if (user.userProperties.canUpdate) { %>
+
+ <% } %>
+
+
+ <%= map.mapDescription %>
+
+
+
+
+
Geographic Location
+
+ <% if (map.mapLatitude && map.mapLongitude) { %>
+
+ <% } else { %>
+
+
There are no geographic coordinates associated with this <%= configFunctions.getProperty("aliases.map").toLowerCase() %>.
+
+ <% } %>
+
+
+
Image
+
+ <% if (map.mapSVG) { %>
+
+ <% const imageURL = urlPrefix + "/images/maps/" + map.mapSVG %>
+
+
+
+ <% } else { %>
+
+
There are no image associated with this <%= configFunctions.getProperty("aliases.map").toLowerCase() %>.
+
+ <% } %>
+
+
+
+
+ <%= configFunctions.getProperty("aliases.lots") %>
+ <%= map.lotCount %>
+
+
+
Image" />
+
+