Skip to content

Commit c469211

Browse files
wip
1 parent 23cea73 commit c469211

File tree

4 files changed

+24
-115
lines changed

4 files changed

+24
-115
lines changed

server/schema.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
"use strict";
22
Object.defineProperty(exports, "__esModule", { value: true });
3-
exports.parseQueryString = exports.tileSchema = exports.tripSchema = exports.matchSchema = exports.tableSchema = exports.nearestSchema = exports.routeSchema = void 0;
3+
exports.parseCoordinatesAndFormat = exports.parseQueryString = exports.tileSchema = exports.tripSchema = exports.matchSchema = exports.tableSchema = exports.nearestSchema = exports.routeSchema = void 0;
44
const querystring = require('querystring');
5+
const Format_1 = require("./Format");
56
function makeAnnotationsSchema(allowedAnnotations) {
67
return {
78
oneOf: [
@@ -286,3 +287,15 @@ function parseQueryString(queryString) {
286287
return parsed;
287288
}
288289
exports.parseQueryString = parseQueryString;
290+
function parseCoordinatesAndFormat(coordinatesAndFormat) {
291+
const lastDotIndex = coordinatesAndFormat.lastIndexOf('.');
292+
const formatString = coordinatesAndFormat.slice(lastDotIndex);
293+
let format = Format_1.Format.Json;
294+
if (formatString == '.flatbuffers' || formatString == '.json') {
295+
coordinatesAndFormat = coordinatesAndFormat.slice(0, lastDotIndex);
296+
format = formatString == '.flatbuffers' ? Format_1.Format.Flatbuffers : Format_1.Format.Json;
297+
}
298+
const coordinates = coordinatesAndFormat.split(';').map((c) => c.split(',').map((n) => parseFloat(n)));
299+
return { coordinates, format };
300+
}
301+
exports.parseCoordinatesAndFormat = parseCoordinatesAndFormat;

server/server.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,14 @@ async function main() {
5757
maxParamLength: Number.MAX_SAFE_INTEGER,
5858
rewriteUrl: (req) => {
5959
// https://github.com/fastify/fastify/issues/2487
60-
return req.url.replaceAll(';', '%3B');
60+
return req.url.replace(/;/g, '%3B');
6161
},
6262
querystringParser: schema_1.parseQueryString
6363
});
64-
function parseCoordinatesAndFormat(coordinatesAndFormat) {
65-
const lastDotIndex = coordinatesAndFormat.lastIndexOf('.');
66-
const formatString = coordinatesAndFormat.slice(lastDotIndex);
67-
let format = Format_1.Format.Json;
68-
if (formatString == '.flatbuffers' || formatString == '.json') {
69-
coordinatesAndFormat = coordinatesAndFormat.slice(0, lastDotIndex);
70-
format = formatString == '.flatbuffers' ? Format_1.Format.Flatbuffers : Format_1.Format.Json;
71-
}
72-
const coordinates = coordinatesAndFormat.split(';').map((c) => c.split(',').map((n) => parseFloat(n)));
73-
return { coordinates, format };
74-
}
7564
async function processRequest(handler, request, reply) {
7665
const { coordinatesAndFormat } = request.params;
7766
const query = request.query;
78-
const { format, coordinates } = parseCoordinatesAndFormat(coordinatesAndFormat);
67+
const { format, coordinates } = (0, schema_1.parseCoordinatesAndFormat)(coordinatesAndFormat);
7968
switch (format) {
8069
case Format_1.Format.Json:
8170
reply.type('application/json').code(200);

server/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ async function main() {
5959
maxParamLength: Number.MAX_SAFE_INTEGER,
6060
rewriteUrl: (req) => {
6161
// https://github.com/fastify/fastify/issues/2487
62-
return req.url!.replaceAll(';', '%3B');
62+
return req.url!.replace(/;/g, '%3B');
6363
},
6464
querystringParser: parseQueryString
6565
})

tsconfig.json

Lines changed: 7 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,12 @@
11
{
22
"compilerOptions": {
3-
/* Visit https://aka.ms/tsconfig to read more about this file */
4-
5-
/* Projects */
6-
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
7-
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
8-
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
9-
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
10-
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
11-
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
12-
13-
/* Language and Environment */
14-
"target": "es2021", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
15-
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
16-
// "jsx": "preserve", /* Specify what JSX code is generated. */
17-
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
18-
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
19-
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
20-
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
21-
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
22-
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
23-
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
24-
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
25-
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
26-
27-
/* Modules */
28-
"module": "commonjs", /* Specify what module code is generated. */
29-
//"rootDir": "./server",
30-
// "rootDir": "./", /* Specify the root folder within your source files. */
31-
// "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
32-
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
33-
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
34-
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
35-
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
36-
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
37-
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
38-
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
39-
// "resolveJsonModule": true, /* Enable importing .json files. */
40-
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
41-
42-
/* JavaScript Support */
43-
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
44-
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
45-
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
46-
47-
/* Emit */
48-
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
49-
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
50-
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
51-
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
52-
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
53-
// "outDir": "./", /* Specify an output folder for all emitted files. */
54-
// "removeComments": true, /* Disable emitting comments. */
55-
// "noEmit": true, /* Disable emitting files from a compilation. */
56-
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
57-
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
58-
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
59-
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
60-
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
61-
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
62-
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
63-
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
64-
// "newLine": "crlf", /* Set the newline character for emitting files. */
65-
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
66-
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
67-
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
68-
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
69-
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
70-
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
71-
72-
/* Interop Constraints */
73-
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
74-
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
75-
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
76-
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
77-
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
78-
79-
/* Type Checking */
80-
"strict": true, /* Enable all strict type-checking options. */
81-
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
82-
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
83-
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
84-
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
85-
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
86-
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
87-
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
88-
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
89-
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
90-
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
91-
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
92-
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
93-
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
94-
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
95-
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
96-
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
97-
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
98-
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
99-
100-
/* Completeness */
101-
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
102-
"skipLibCheck": true /* Skip type checking all .d.ts files. */
3+
"lib": ["es2020"],
4+
"target": "es2020",
5+
"module": "commonjs",
6+
"esModuleInterop": true,
7+
"forceConsistentCasingInFileNames": true,
8+
"strict": true,
9+
"skipLibCheck": true
10310
},
10411
"include": [
10512
"server/*"

0 commit comments

Comments
 (0)