From a17e1abb3843a64999ff72e57d156586fcd32833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Sun, 14 Apr 2024 18:39:07 +0200 Subject: [PATCH] DB: Add Norway and Finland --- data/de/db-hafas-mgate.json | 399 +++++++++++++++++++++--------------- data/de/db-hafas-query.json | 2 +- 2 files changed, 240 insertions(+), 161 deletions(-) diff --git a/data/de/db-hafas-mgate.json b/data/de/db-hafas-mgate.json index 73cd092..2bf8b0d 100644 --- a/data/de/db-hafas-mgate.json +++ b/data/de/db-hafas-mgate.json @@ -852,7 +852,7 @@ } }, "anyCoverage": { - "region": ["UA", "HR", "BG", "IT", "FR", "ES", "PT", "GB", "DK", "SE", "LT", "LV", "RS", "ME"], + "region": ["FI", "UA", "HR", "BG", "IT", "FR", "ES", "PT", "GB", "DK", "SE", "LT", "LV", "RS", "ME", "NO"], "area": { "type": "MultiPolygon", "coordinates": [ @@ -934,165 +934,169 @@ [18.93, 58.74], [19.86, 59.21], [19.88, 59.22], - [20.15, 59.56], - [20.0, 59.67], - [19.2, 60.23], - [19.26, 60.6], - [19.18, 60.65], - [17.96, 61.02], - [17.93, 61.07], - [17.98, 61.48], - [18.02, 61.55], - [18.37, 62.35], - [18.38, 62.35], - [19.46, 62.98], - [19.63, 63.0], - [20.32, 63.15], - [20.34, 63.17], - [20.73, 63.39], - [20.84, 63.41], - [21.43, 63.55], - [21.56, 63.73], - [21.51, 63.92], - [21.56, 63.96], - [21.94, 64.13], - [21.97, 64.15], - [22.16, 64.35], - [22.19, 64.42], - [21.96, 64.8], - [21.98, 64.81], - [22.94, 65.03], - [22.98, 65.05], - [23.17, 65.19], - [23.4, 65.2099999], - [24.25, 65.31], - [24.2399999, 65.43], - [24.21, 65.9599999], - [24.19, 65.99], - [23.9899999, 66.23], - [23.96, 66.25], - [23.78, 66.28], - [23.7399999, 66.33], - [23.7399999, 66.39], - [23.93, 66.49], - [23.95, 66.52], - [24.11, 66.83], - [24.06, 66.89], - [23.67, 67.2], - [23.8299999, 67.26], - [23.88, 67.31], - [23.85, 67.49], - [23.79, 67.53], - [23.63, 67.55], - [23.67, 67.59], - [23.65, 67.65], - [23.59, 67.81], - [23.8299999, 67.9599999], - [23.7, 68.04], - [23.35, 68.24], - [23.32, 68.25], - [23.21, 68.24], - [23.13, 68.38], - [23.09, 68.4], - [22.66, 68.53], - [22.65, 68.53], - [22.0799999, 68.5699999], - [21.93, 68.68], - [21.91, 68.68], - [21.4899999, 68.78], - [21.45, 68.85], - [21.41, 68.86], - [21.01, 68.9599999], - [21.03, 69.0], - [20.96, 69.05], - [20.8, 69.13], - [20.78, 69.13], - [19.98, 69.14], - [19.95, 68.99], - [20.07, 68.94], - [20.22, 68.86], - [20.23, 68.84], - [19.8299999, 68.61], - [19.85, 68.48], - [19.92, 68.4599999], - [19.91, 68.4599999], - [19.84, 68.47], - [18.4, 68.68], - [18.35, 68.67], - [18.04, 68.62], - [18.03, 68.52], - [18.05, 68.24], - [17.88, 68.08], - [17.87, 68.08], - [17.27, 68.22], - [17.21, 68.19], - [16.68, 67.99], - [16.65, 67.9599999], - [16.43, 67.66], - [16.41, 67.65], - [16.11, 67.61], - [16.06, 67.55], - [15.95, 67.42], - [16.1, 67.31], - [16.3, 67.16], - [16.3, 67.11], - [15.25, 66.52], - [15.34, 66.34], - [15.02, 66.25], - [14.95, 66.25], - [14.38, 66.22], - [14.43, 66.08], - [14.41, 65.37], - [13.55, 64.62], - [13.57, 64.51], - [13.67, 64.47], - [14.03, 64.38], - [14.05, 64.23], - [13.93, 64.11], - [13.21, 64.19], - [13.13, 64.18], - [12.9, 64.15], - [12.7899999, 64.11], - [12.02, 63.63], - [12.07, 63.53], - [12.09, 63.5], - [11.84, 63.28], - [11.93, 63.18], - [12.09, 63.0], - [11.95, 62.6], - [11.99, 62.54], - [12.19, 62.25], - [12.02, 61.68], - [12.13, 61.61], - [12.4, 61.46], - [12.45, 61.47], - [12.5399999, 61.47], - [12.57, 61.45], - [12.74, 61.33], - [12.63, 61.15], - [12.16, 61.1], - [12.11, 60.99], - [12.16, 60.94], - [12.51, 60.49], - [12.45, 60.24], - [12.2899999, 60.05], - [11.77, 59.92], - [11.73, 59.83], - [11.7899999, 59.75], - [11.6199999, 59.68], - [11.59, 59.6], - [11.67, 59.42], - [11.73, 59.25], - [11.59, 59.0], - [11.51, 58.99], - [11.39, 59.23], - [11.31, 59.21], - [11.09, 59.17], - [11.05, 59.09], - [11.02, 59.07], - [10.96, 59.05], - [10.57, 58.98], - [10.52, 58.85], + [20.0536261, 59.4386402], + [20.29, 59.35], + [20.31, 59.35], + [22.29, 59.4], + [22.42, 59.41], + [22.6, 59.48], + [22.66, 59.5], + [23.32, 59.55], + [23.36, 59.55], + [24.88, 59.8], + [24.94, 59.82], + [25.93, 59.86], + [26.04, 59.87], + [26.78, 60.09], + [27.3, 60.09], + [27.49, 60.12], + [27.7, 60.25], + [27.8, 60.31], + [27.94, 60.52], + [28.55, 60.85], + [28.66, 60.84], + [28.71, 60.85], + [28.88, 61.03], + [29.28, 61.17], + [29.29, 61.18], + [30.7, 62.11], + [30.71, 62.12], + [31.17, 62.34], + [31.21, 62.34], + [31.66, 62.83], + [31.76, 62.92], + [31.36, 63.18], + [31.33, 63.29], + [31.28, 63.32], + [30.54, 63.56], + [30.52, 63.57], + [30.26, 63.71], + [30.31, 63.72], + [30.61, 63.98], + [30.67, 64.1], + [30.6, 64.27], + [30.55, 64.35], + [30.16, 64.47], + [30.2, 64.78], + [30.15, 64.88], + [29.78, 64.89], + [29.72, 64.9599999], + [29.72, 64.97], + [29.88, 65.0], + [30.01, 65.01], + [30.0, 65.22], + [29.95, 65.3], + [29.79, 65.33], + [29.88, 65.45], + [29.97, 65.5], + [29.97, 65.5699999], + [30.26, 65.61], + [30.23, 65.74], + [30.06, 66.11], + [30.01, 66.2], + [29.2, 66.91], + [29.91, 67.4], + [30.01, 67.44], + [30.11, 67.62], + [30.15, 67.74], + [29.75, 67.88], + [29.71, 67.9], + [29.43, 68.13], + [29.37, 68.17], + [28.75, 68.28], + [28.71, 68.29], + [28.57, 68.52], + [28.87, 68.79], + [28.9659298, 68.9259004], + [28.98, 68.92], + [29.03, 68.89], + [29.21, 68.97], + [29.33, 69.04], + [29.37, 69.2099999], + [30.15, 69.37], + [30.23, 69.41], + [30.21, 69.52], + [30.46, 69.45], + [30.48, 69.43], + [30.94, 69.4599999], + [31.11, 69.47], + [30.96, 69.75], + [31.59, 70.04], + [31.65, 70.05], + [31.82, 70.27], + [31.88, 70.35], + [31.65, 70.62], + [31.6, 70.64], + [30.5, 70.97], + [30.47, 70.97], + [28.41, 71.39], + [28.37, 71.4], + [25.71, 71.49], + [25.68, 71.49], + [23.7399999, 71.39], + [23.71, 71.38], + [22.28, 71.09], + [21.7, 70.9599999], + [18.25, 70.48], + [18.21, 70.47], + [17.11, 69.9], + [17.02, 69.85], + [15.74, 69.62], + [15.72, 69.61], + [14.72, 69.34], + [14.69, 69.33], + [13.84, 68.9599999], + [13.81, 68.95], + [13.33, 68.63], + [13.22, 68.56], + [12.6, 68.36], + [12.56, 68.35], + [12.09, 67.94], + [12.07, 67.91], + [11.4, 67.7], + [11.35, 67.67], + [11.19, 67.43], + [11.22, 67.35], + [11.59, 66.94], + [11.68, 66.85], + [11.5399999, 66.78], + [11.52, 66.76], + [11.02, 66.27], + [11.01, 66.26], + [10.86, 66.03], + [10.71, 65.77], + [9.93, 64.9599999], + [8.08, 64.14], + [8.07, 64.14], + [6.8, 63.36], + [6.79, 63.36], + [5.94, 63.07], + [5.92, 63.06], + [4.9, 62.57], + [4.88, 62.55], + [4.1, 61.8], + [4.07, 61.77], + [3.98, 61.01], + [3.99, 60.97], + [4.5599999, 59.69], + [4.5599999, 59.68], + [4.35, 59.27], + [4.37, 59.18], + [4.9, 58.87], + [4.93, 58.85], + [5.11, 58.52], + [5.13, 58.49], + [5.5599999, 58.19], + [5.58, 58.18], + [6.45, 57.78], + [6.48, 57.77], + [7.57, 57.65], + [7.6, 57.65], + [8.48, 57.84], + [8.51, 57.85], + [9.83, 58.57], + [10.28, 58.67], + [10.5307798, 58.6613524], [10.5399999, 58.5], [10.55, 58.46], [10.9781662, 57.8807163], @@ -1135,6 +1139,81 @@ [12.27, 54.55] ] ], + [ + [ + [-7.49, 70.76], + [-7.4, 70.79], + [-7.16, 71.17], + [-7.23, 71.3], + [-7.56, 71.4599999], + [-7.63, 71.47], + [-8.16, 71.49], + [-8.24, 71.49], + [-9.34, 71.2099999], + [-9.72, 71.06], + [-9.7899999, 70.99], + [-9.78, 70.7099999], + [-9.7, 70.64], + [-9.39, 70.52], + [-9.32, 70.51], + [-8.91, 70.49], + [-8.85, 70.49], + [-7.49, 70.76] + ] + ], + [ + [ + [21.51, 63.92], + [21.56, 63.96], + [21.94, 64.13], + [21.97, 64.15], + [22.16, 64.35], + [22.19, 64.42], + [21.96, 64.8], + [21.98, 64.81], + [22.94, 65.03], + [22.98, 65.05], + [23.17, 65.19], + [23.4, 65.2099999], + [24.0072502, 65.2814412], + [24.0, 65.16], + [23.77, 64.77], + [23.76, 64.76], + [23.11, 64.58], + [23.03, 64.55], + [22.88, 64.31], + [22.35, 64.17], + [22.32, 64.15], + [21.88, 63.82], + [21.85, 63.8], + [21.5555981, 63.7467273], + [21.51, 63.92] + ] + ], + [ + [ + [17.96, 61.02], + [17.93, 61.07], + [17.98, 61.48], + [18.02, 61.55], + [18.37, 62.35], + [18.38, 62.35], + [19.46, 62.98], + [19.63, 63.0], + [20.08546, 63.0990131], + [20.7, 61.98], + [20.71, 61.95], + [20.79, 61.66], + [20.79, 61.65], + [20.68, 61.2], + [20.06, 60.86], + [20.0, 60.83], + [19.21, 60.72], + [19.14, 60.7], + [19.1287786, 60.6655344], + [17.96, 61.02] + ] + ], [ [ [-5.08, 35.99], diff --git a/data/de/db-hafas-query.json b/data/de/db-hafas-query.json index 2c468ef..27e3efe 100644 --- a/data/de/db-hafas-query.json +++ b/data/de/db-hafas-query.json @@ -23,7 +23,7 @@ "region": ["PL", "CZ", "SK", "HU", "SI", "RO", "BE"] }, "anyCoverage": { - "region": ["UA", "HR", "BG", "IT", "FR", "ES", "PT", "GB", "DK", "SE", "LT", "LV", "RS", "ME"] + "region": ["FI", "UA", "HR", "BG", "IT", "FR", "ES", "PT", "GB", "DK", "SE", "LT", "LV", "RS", "ME", "NO"] } }, "options": {