type fixes, js modernization

src/attribute.ts

@@ -62,7 +62,7 @@ export class TextAttr {
     }
     for (const property of label_props) {
       if (
-        f.props.hasOwnProperty(property) &&
+        f.props.hasOwn(property) &&
         typeof f.props[property] === "string"
       ) {
         retval = f.props[property] as string;

src/compat/json_style.ts

@@ -47,10 +47,10 @@ export function filterFn(arr: any[]): Filter {
     return (z, f) => !arr.slice(2, arr.length).includes(f.props[arr[1]]);
   }
   if (arr[0] === "has") {
-    return (z, f) => f.props.hasOwnProperty(arr[1]);
+    return (z, f) => f.props.hasOwn(arr[1]);
   }
   if (arr[0] === "!has") {
-    return (z, f) => !f.props.hasOwnProperty(arr[1]);
+    return (z, f) => !f.props.hasOwn(arr[1]);
   }
   if (arr[0] === "all") {
     const parts = arr.slice(1, arr.length).map((e) => filterFn(e));
@@ -141,7 +141,7 @@ interface FontSub {
 export function getFont(obj: any, fontsubmap: any) {
   const fontfaces: FontSub[] = [];
   for (const wanted_face of obj["text-font"]) {
-    if (fontsubmap.hasOwnProperty(wanted_face)) {
+    if (fontsubmap.hasOwn(wanted_face)) {
       fontfaces.push(fontsubmap[wanted_face]);
     }
   }

src/default_style/style.ts

@@ -402,7 +402,7 @@ export const labelRules = (
         }),
         params.cityLabel,
       ),
-      sort: (a: any, b: any) => {
+      sort: (a: unknown, b: unknown) => {
         return a["pmap:rank"] - b["pmap:rank"];
       },
     },
@@ -436,7 +436,7 @@ export const labelRules = (
           params.cityLabel,
         ),
       ]),
-      sort: (a: any, b: any) => {
+      sort: (a: unknown, b: unknown) => {
         return a["pmap:rank"] - b["pmap:rank"];
       },
     },

src/labeler.ts

@@ -45,7 +45,7 @@ export interface LabelRule {
   symbolizer: LabelSymbolizer;
   filter?: Filter;
   visible?: boolean;
-  sort?: (a: any, b: any) => number;
+  sort?: (a: unknown, b: unknown) => number;
 }
 
 export const covering = (

src/line.ts

@@ -15,9 +15,9 @@ const linelabel = (
   targetLen: number,
 ): LabelableSegment[] => {
   const chunks = [];
-  let a;
-  let b;
-  let c;
+  let a: Point;
+  let b: Point;
+  let c: Point;
   let i = 0;
   let n = 0;
   let d = 0;
@@ -91,13 +91,11 @@ export interface LabelCandidate {
 }
 
 export function simpleLabel(
-  mls: any,
+  mls: Point[][],
   minimum: number,
   repeatDistance: number,
   cellSize: number,
 ): LabelCandidate[] {
-  let longestStart;
-  let longestEnd;
   const longestLength = 0;
 
   const candidates = [];