code cleanup

FreemapSlovakia · Dec 28, 2023 · 035df28 · 035df28
1 parent 78adcce
commit 035df28
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 41 deletions.
diff --git a/style/AerialwayNames.tsx b/style/AerialwayNames.tsx
@@ -1,4 +1,4 @@
-import { Rule, Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Rule, Style } from "jsxnik/mapnikConfig";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { SqlLayer } from "./SqlLayer";
 

diff --git a/style/Aeroways.tsx b/style/Aeroways.tsx
@@ -4,6 +4,9 @@ import { RuleEx } from "./RuleEx";
 import { SqlLayer } from "./SqlLayer";
 
 export function Aeroways() {
+  const aeroBgLine = { stroke: colors.aeroway };
+  const aeroFgLine = { stroke: "white", strokeWidth: 1 };
+
   return (
     <>
       <SqlLayer
@@ -13,29 +16,20 @@ export function Aeroways() {
       />
 
       <Style name="aeroways">
-        {(() => {
-          const aeroBgLine = { stroke: colors.aeroway };
-          const aeroFgLine = { stroke: "white", strokeWidth: 1 };
-
-          return (
-            <>
-              <RuleEx minZoom={11} maxZoom={11}>
-                <LineSymbolizer {...aeroBgLine} strokeWidth={3} />
-                <LineSymbolizer {...aeroFgLine} strokeWidth={0.5} strokeDasharray="3,3" />
-              </RuleEx>
+        <RuleEx minZoom={11} maxZoom={11}>
+          <LineSymbolizer {...aeroBgLine} strokeWidth={3} />
+          <LineSymbolizer {...aeroFgLine} strokeWidth={0.5} strokeDasharray="3,3" />
+        </RuleEx>
 
-              <RuleEx minZoom={12} maxZoom={13}>
-                <LineSymbolizer {...aeroBgLine} strokeWidth={5} />
-                <LineSymbolizer {...aeroFgLine} strokeDasharray="4,4" />
-              </RuleEx>
+        <RuleEx minZoom={12} maxZoom={13}>
+          <LineSymbolizer {...aeroBgLine} strokeWidth={5} />
+          <LineSymbolizer {...aeroFgLine} strokeDasharray="4,4" />
+        </RuleEx>
 
-              <RuleEx minZoom={14}>
-                <LineSymbolizer {...aeroBgLine} strokeWidth={8} />
-                <LineSymbolizer {...aeroFgLine} strokeDasharray="6,6" />
-              </RuleEx>
-            </>
-          );
-        })()}
+        <RuleEx minZoom={14}>
+          <LineSymbolizer {...aeroBgLine} strokeWidth={8} />
+          <LineSymbolizer {...aeroFgLine} strokeDasharray="6,6" />
+        </RuleEx>
       </Style>
     </>
   );

diff --git a/style/BuildingNames.tsx b/style/BuildingNames.tsx
@@ -1,4 +1,4 @@
-import { Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Style } from "jsxnik/mapnikConfig";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { Placements } from "./Placements";
 import { RuleEx } from "./RuleEx";

diff --git a/style/CountryNames.tsx b/style/CountryNames.tsx
@@ -1,4 +1,4 @@
-import { DebugSymbolizer, Format, Layer, Placement, Rule, Style } from "jsxnik/mapnikConfig";
+import { Format, Rule, Style } from "jsxnik/mapnikConfig";
 import { Borders } from "./Borders";
 import { DatasourceEx } from "./DatasourceEx";
 import { SqlLayer } from "./SqlLayer";

diff --git a/style/DatasourceEx.tsx b/style/DatasourceEx.tsx
@@ -1,4 +1,4 @@
-import { Datasource, Layer, Parameter, StyleName } from "jsxnik/mapnikConfig";
+import { Datasource, Parameter } from "jsxnik/mapnikConfig";
 
 type Props = {
   params: Record<string, string>;

diff --git a/style/FeatureLines.tsx b/style/FeatureLines.tsx
@@ -1,5 +1,5 @@
 import { LinePatternSymbolizer, LineSymbolizer, Style } from "jsxnik/mapnikConfig";
-import { colors, hsl } from "./colors";
+import { hsl } from "./colors";
 import { RuleEx } from "./RuleEx";
 import { SqlLayer } from "./SqlLayer";
 import { seq } from "./utils";

diff --git a/style/Geonames.tsx b/style/Geonames.tsx
@@ -1,4 +1,4 @@
-import { Rule, Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Rule, Style } from "jsxnik/mapnikConfig";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { ShpLayer } from "./ShpLayer";
 

diff --git a/style/HighwayNames.tsx b/style/HighwayNames.tsx
@@ -1,4 +1,4 @@
-import { Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Style } from "jsxnik/mapnikConfig";
 import { colors } from "./colors";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { RuleEx } from "./RuleEx";

diff --git a/style/Housenumbers.tsx b/style/Housenumbers.tsx
@@ -1,4 +1,4 @@
-import { Rule, Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Rule, Style } from "jsxnik/mapnikConfig";
 import { colors } from "./colors";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { SqlLayer } from "./SqlLayer";

diff --git a/style/LocalityNames.tsx b/style/LocalityNames.tsx
@@ -2,7 +2,6 @@ import { Rule, Style, TextSymbolizer } from "jsxnik/mapnikConfig";
 import { hsl } from "./colors";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { Placements } from "./Placements";
-import { RuleEx } from "./RuleEx";
 import { SqlLayer } from "./SqlLayer";
 
 export function LocalityNames() {

diff --git a/style/Placenames.tsx b/style/Placenames.tsx
@@ -1,4 +1,4 @@
-import { Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Style } from "jsxnik/mapnikConfig";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { Placements } from "./Placements";
 import { RuleEx } from "./RuleEx";

diff --git a/style/ProtectedAreaNames.tsx b/style/ProtectedAreaNames.tsx
@@ -1,4 +1,4 @@
-import { DebugSymbolizer, Rule, Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Rule, Style } from "jsxnik/mapnikConfig";
 import { colors } from "./colors";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { Placements } from "./Placements";

diff --git a/style/ProtectedAreas.tsx b/style/ProtectedAreas.tsx
@@ -1,9 +1,7 @@
 import { LinePatternSymbolizer, LineSymbolizer, PolygonPatternSymbolizer, Style } from "jsxnik/mapnikConfig";
-import { colors, hsl } from "./colors";
+import { colors } from "./colors";
 import { RuleEx } from "./RuleEx";
 import { SqlLayer } from "./SqlLayer";
-import { TextSymbolizerEx } from "./TextSymbolizerEx";
-import { seq, types } from "./utils";
 
 export const nationalParkFilter = "[type] = 'national_park' or ([type] = 'protected_area' and [protect_class] = '2')";
 

diff --git a/style/ShadingAndContours.tsx b/style/ShadingAndContours.tsx
@@ -1,4 +1,4 @@
-import { LineSymbolizer, RasterSymbolizer, Rule, Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { LineSymbolizer, RasterSymbolizer, Rule, Style } from "jsxnik/mapnikConfig";
 import { colors } from "./colors";
 import { DatasourceEx } from "./DatasourceEx";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";

diff --git a/style/ValleysRidges.tsx b/style/ValleysRidges.tsx
@@ -1,4 +1,4 @@
-import { Placement, Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Placement, Style } from "jsxnik/mapnikConfig";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { RuleEx } from "./RuleEx";
 import { SqlLayer } from "./SqlLayer";

diff --git a/style/WaterAreaNames.tsx b/style/WaterAreaNames.tsx
@@ -1,4 +1,4 @@
-import { Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Style } from "jsxnik/mapnikConfig";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { Placements } from "./Placements";
 import { RuleEx } from "./RuleEx";

diff --git a/style/WaterLineNames.tsx b/style/WaterLineNames.tsx
@@ -1,4 +1,4 @@
-import { Style, TextSymbolizer } from "jsxnik/mapnikConfig";
+import { Style } from "jsxnik/mapnikConfig";
 import { TextSymbolizerEx } from "./TextSymbolizerEx";
 import { RuleEx } from "./RuleEx";
 import { SqlLayer } from "./SqlLayer";

diff --git a/style/index.tsx b/style/index.tsx
@@ -1,5 +1,5 @@
 import config from "config";
-import { Map, RasterSymbolizer, Rule, Style } from "jsxnik/mapnikConfig";
+import { Map } from "jsxnik/mapnikConfig";
 import { serialize } from "jsxnik/serialize";
 import { AerialwayNames } from "./AerialwayNames";
 import { Aerialways } from "./Aerialways";
@@ -20,7 +20,6 @@ import { FeatureLinesMaskable } from "./FeatureLinesMaskable";
 import { FeatureNames, Features } from "./features";
 import { Fixmes } from "./Fixmes";
 import { FontSets } from "./FontSets";
-import { Foo } from "./Foo";
 import { Geonames } from "./Geonames";
 import { HighwayNames } from "./HighwayNames";
 import { Highways } from "./Highways";