From d4192c81badc4725e8686a29ae30aa538b83f2e0 Mon Sep 17 00:00:00 2001 From: sharhio Date: Tue, 14 Jan 2025 16:53:08 +0200 Subject: [PATCH] DT-6528 kotka zone update --- middleware/config/kotka_zone_areas_20241218.json | 10 ---------- middleware/config/kotka_zone_areas_20250114.json | 10 ++++++++++ middleware/zones.js | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 middleware/config/kotka_zone_areas_20241218.json create mode 100644 middleware/config/kotka_zone_areas_20250114.json diff --git a/middleware/config/kotka_zone_areas_20241218.json b/middleware/config/kotka_zone_areas_20241218.json deleted file mode 100644 index ba9a6fa3..00000000 --- a/middleware/config/kotka_zone_areas_20241218.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "FeatureCollection", - "name": "kotka_aluetarkistusdata_final", - "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, - "features": [ - { "type": "Feature", "properties": { "Zone": "B" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 26.83968, 60.47486 ], [ 26.84189, 60.45795 ], [ 26.82796, 60.45678 ], [ 26.80929, 60.45686 ], [ 26.78478, 60.45279 ], [ 26.74259, 60.44597 ], [ 26.73049, 60.4344 ], [ 26.69969, 60.42511 ], [ 26.65605, 60.41751 ], [ 26.62183, 60.40906 ], [ 26.59444, 60.40441 ], [ 26.51152, 60.38369 ], [ 26.48511, 60.43781 ], [ 26.48034, 60.44129 ], [ 26.47709, 60.4477 ], [ 26.44784, 60.49242 ], [ 26.5112, 60.52731 ], [ 26.50061, 60.54544 ], [ 26.54429, 60.55491 ], [ 26.54178, 60.57501 ], [ 26.59728, 60.64141 ], [ 26.68276, 60.64929 ], [ 26.75388, 60.57571 ], [ 26.83968, 60.47486 ] ] ], [ [ [ 27.45468, 60.6411 ], [ 27.38819, 60.60218 ], [ 27.35657, 60.55877 ], [ 27.41552, 60.50872 ], [ 27.40018, 60.4648 ], [ 27.26241, 60.50882 ], [ 27.24569, 60.51519 ], [ 27.22937, 60.51528 ], [ 27.20699, 60.51884 ], [ 27.15645, 60.51671 ], [ 27.10014, 60.52914 ], [ 27.07054, 60.5302 ], [ 27.05177, 60.52594 ], [ 27.02367, 60.52941 ], [ 27.00928, 60.54956 ], [ 27.0285, 60.60451 ], [ 26.92214, 60.64855 ], [ 27.10312, 60.68555 ], [ 27.12465, 60.77686 ], [ 27.22527, 60.7604 ], [ 27.29264, 60.822 ], [ 27.42836, 60.84264 ], [ 27.45468, 60.6411 ] ] ] ] } }, - { "type": "Feature", "properties": { "Zone": "A" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 26.8274, 60.64478 ], [ 26.8821, 60.63635 ], [ 26.92214, 60.64855 ], [ 27.0285, 60.60451 ], [ 27.00928, 60.54956 ], [ 27.02367, 60.52941 ], [ 26.99909, 60.51837 ], [ 26.9936, 60.48471 ], [ 27.00922, 60.46868 ], [ 26.99147, 60.45636 ], [ 26.98329, 60.4455 ], [ 26.96423, 60.43607 ], [ 26.937, 60.43058 ], [ 26.91344, 60.42237 ], [ 26.88946, 60.42567 ], [ 26.88215, 60.43441 ], [ 26.84189, 60.45795 ], [ 26.83968, 60.47486 ], [ 26.75388, 60.57571 ], [ 26.78669, 60.60452 ], [ 26.73572, 60.66918 ], [ 26.7762, 60.68641 ], [ 26.8274, 60.64478 ] ] ] ] } } - ] - } - \ No newline at end of file diff --git a/middleware/config/kotka_zone_areas_20250114.json b/middleware/config/kotka_zone_areas_20250114.json new file mode 100644 index 00000000..99d89aae --- /dev/null +++ b/middleware/config/kotka_zone_areas_20250114.json @@ -0,0 +1,10 @@ +{ + "type": "FeatureCollection", + "name": "final_aluetarkistuskotka", + "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, + "features": [ + { "type": "Feature", "properties": { "Zone": "B" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 26.83968, 60.47486 ], [ 26.84189, 60.45795 ], [ 26.82951, 60.44301 ], [ 26.80027, 60.44339 ], [ 26.77411, 60.44377 ], [ 26.74259, 60.44597 ], [ 26.73049, 60.4344 ], [ 26.70739, 60.42283 ], [ 26.67869, 60.40693 ], [ 26.62183, 60.40906 ], [ 26.59444, 60.40441 ], [ 26.51152, 60.38369 ], [ 26.48511, 60.43781 ], [ 26.48034, 60.44129 ], [ 26.47709, 60.4477 ], [ 26.44784, 60.49242 ], [ 26.5112, 60.52731 ], [ 26.50061, 60.54544 ], [ 26.54429, 60.55491 ], [ 26.54178, 60.57501 ], [ 26.58865, 60.6432 ], [ 26.63752, 60.65659 ], [ 26.68276, 60.64929 ], [ 26.75388, 60.57571 ], [ 26.83968, 60.47486 ] ] ], [ [ [ 27.45468, 60.6411 ], [ 27.38819, 60.60218 ], [ 27.35657, 60.55877 ], [ 27.41552, 60.50872 ], [ 27.40018, 60.4648 ], [ 27.26241, 60.50882 ], [ 27.24569, 60.51519 ], [ 27.22937, 60.51528 ], [ 27.20699, 60.51884 ], [ 27.15645, 60.51671 ], [ 27.10014, 60.52914 ], [ 27.07054, 60.5302 ], [ 27.05177, 60.52594 ], [ 27.02367, 60.52941 ], [ 27.00928, 60.54956 ], [ 27.0285, 60.60451 ], [ 26.92214, 60.64855 ], [ 27.06903, 60.69333 ], [ 27.12465, 60.77686 ], [ 27.22527, 60.7604 ], [ 27.29264, 60.822 ], [ 27.42836, 60.84264 ], [ 27.45468, 60.6411 ] ] ] ] } }, + { "type": "Feature", "properties": { "Zone": "A" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 26.84394, 60.65508 ], [ 26.88703, 60.6432 ], [ 26.92214, 60.64855 ], [ 27.0285, 60.60451 ], [ 27.00928, 60.54956 ], [ 27.02367, 60.52941 ], [ 27.00881, 60.5177 ], [ 27.00419, 60.48512 ], [ 27.02882, 60.4764 ], [ 27.05267, 60.46767 ], [ 27.095, 60.45781 ], [ 27.09885, 60.42744 ], [ 27.09577, 60.37575 ], [ 27.04652, 60.37042 ], [ 26.90262, 60.39856 ], [ 26.83644, 60.41187 ], [ 26.84189, 60.45795 ], [ 26.83968, 60.47486 ], [ 26.75388, 60.57571 ], [ 26.76591, 60.60197 ], [ 26.71494, 60.66663 ], [ 26.79007, 60.69333 ], [ 26.84394, 60.65508 ] ] ] ] } } + ] + } + \ No newline at end of file diff --git a/middleware/zones.js b/middleware/zones.js index 8751671c..195809e5 100644 --- a/middleware/zones.js +++ b/middleware/zones.js @@ -13,7 +13,7 @@ function setup(prefix) { OULU: require('./config/oulu_zone_areas_20241011.json'), Joensuu: require('./config/joensuu_zone_areas_20230830.json'), Vaasa: require('./config/vaasa_zone_lines_20231220.json'), - Kotka: require('./config/kotka_zone_areas_20241218.json'), + Kotka: require('./config/kotka_zone_areas_20250114.json'), }; // precompute bounding boxes to optimize test speed