From 310aed50e797715cab651aa33b3343c24ff047a3 Mon Sep 17 00:00:00 2001 From: sharhio Date: Wed, 30 Aug 2023 15:07:26 +0300 Subject: [PATCH 1/2] chore: dt-5982 joensuu zones --- app/configurations/config.joensuu.js | 28 +- .../joensuu_zone_lines_20230830.geojson | 512 ++++++++++++++++++ 2 files changed, 533 insertions(+), 7 deletions(-) create mode 100755 static/assets/geojson/joensuu_zone_lines_20230830.geojson diff --git a/app/configurations/config.joensuu.js b/app/configurations/config.joensuu.js index 7132015880..4f17b95c6a 100644 --- a/app/configurations/config.joensuu.js +++ b/app/configurations/config.joensuu.js @@ -73,6 +73,19 @@ export default configMerger(walttiConfig, { ], }, + geoJson: { + layers: [ + { + name: { + fi: 'Vyƶhykkeet', + sv: 'Zoner', + en: 'Zones', + }, + url: '/assets/geojson/joensuu_zone_lines_20230830.geojson', + }, + ], + }, + defaultEndpoint: { address: 'Keskusta, Joensuu', lat: 62.6024263, @@ -112,13 +125,14 @@ export default configMerger(walttiConfig, { ], }, zoneIdMapping: { - 1: 'A', - 2: 'B', - 3: 'C', - 4: 'D', - 5: 'E', - 6: 'F', - 7: 'G', + 1: 'City', + 2: 'A', + 3: 'B', + 4: 'C', + 5: 'D', + 6: 'E', + 7: 'F', + 8: 'G', }, zones: { stops: true, diff --git a/static/assets/geojson/joensuu_zone_lines_20230830.geojson b/static/assets/geojson/joensuu_zone_lines_20230830.geojson new file mode 100755 index 0000000000..281caed0ea --- /dev/null +++ b/static/assets/geojson/joensuu_zone_lines_20230830.geojson @@ -0,0 +1,512 @@ +{ + "type" : "FeatureCollection", + "name" : "Zone lines", + "features" : [ + { + "type" : "Feature", + "geometry" : { + "type" : "MultiLineString", + "coordinates" : [ + [ + [ 29.80824, 62.59221 ], + [ 29.79571, 62.59858 ], + [ 29.79213, 62.60366 ], + [ 29.79075, 62.61057 ], + [ 29.77956, 62.61487 ], + [ 29.76856, 62.61662 ], + [ 29.74892, 62.61754 ], + [ 29.73282, 62.61585 ], + [ 29.72384, 62.6175 ], + [ 29.70995, 62.60929 ], + [ 29.70906, 62.5995 ], + [ 29.74143, 62.59056 ], + [ 29.76262, 62.58628 ], + [ 29.76867, 62.58676 ], + [ 29.78405, 62.58537 ], + [ 29.79723, 62.58782 ], + [ 29.80824, 62.59221 ] + ] + ] + }, + "properties" : { + "Zone" : "City" + }, + "styles": [ + { + "color": "#666", + "weight": 2, + "opacity": 1 + }, + { + "color": "#333", + "weight": 12, + "opacity": 0.2 + } + ] + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiLineString", + "coordinates" : [ + [ + [ 29.92173, 62.552 ], + [ 29.91157, 62.58424 ], + [ 29.91841, 62.60399 ], + [ 29.91134, 62.61698 ], + [ 29.8932, 62.63683 ], + [ 29.85177, 62.65498 ], + [ 29.81906, 62.65994 ], + [ 29.81225, 62.65967 ], + [ 29.78664, 62.65967 ], + [ 29.74454, 62.65788 ], + [ 29.70027, 62.6574 ], + [ 29.65881, 62.65576 ], + [ 29.64708, 62.64459 ], + [ 29.63705, 62.63886 ], + [ 29.63438, 62.62943 ], + [ 29.79442, 62.54433 ], + [ 29.81676, 62.5428 ], + [ 29.83194, 62.54667 ], + [ 29.86668, 62.55314 ], + [ 29.92173, 62.552 ] + ] + ] + }, + "properties" : { + "Zone" : "A" + }, + "styles": [ + { + "color": "#666", + "weight": 2, + "opacity": 1 + }, + { + "color": "#333", + "weight": 12, + "opacity": 0.2 + } + ] + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiLineString", + "coordinates" : [ + [ + [ 30.11147, 62.43107 ], + [ 30.19331, 62.50975 ], + [ 30.22054, 62.52905 ], + [ 30.1952, 62.59438 ], + [ 30.15946, 62.63089 ], + [ 30.15006, 62.69404 ], + [ 30.05541, 62.76194 ], + [ 30.02982, 62.77533 ], + [ 29.99357, 62.79132 ], + [ 29.88761, 62.79591 ], + [ 29.85344, 62.78604 ], + [ 29.56622, 62.76523 ], + [ 29.56274, 62.75678 ], + [ 29.47552, 62.7286 ], + [ 29.38884, 62.68757 ], + [ 29.36709, 62.68723 ], + [ 29.33827, 62.66527 ], + [ 29.34831, 62.63289 ], + [ 29.31025, 62.58358 ], + [ 29.32472, 62.53853 ], + [ 29.38448, 62.52175 ], + [ 29.4055, 62.52132 ], + [ 29.41362, 62.52393 ], + [ 29.45104, 62.52309 ], + [ 29.62093, 62.49428 ], + [ 29.76889, 62.44494 ], + [ 29.9555, 62.42949 ], + [ 30.11147, 62.43107 ] + ] + ] + }, + "properties" : { + "Zone" : "B" + }, + "styles": [ + { + "color": "#666", + "weight": 2, + "opacity": 1 + }, + { + "color": "#333", + "weight": 12, + "opacity": 0.2 + } + ] + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiLineString", + "coordinates" : [ + [ + [ 30.11527, 62.34057 ], + [ 30.16951, 62.34841 ], + [ 30.26976, 62.36684 ], + [ 30.2829, 62.38895 ], + [ 30.27814, 62.44172 ], + [ 30.42545, 62.50922 ], + [ 30.44754, 62.57085 ], + [ 30.4366, 62.59032 ], + [ 30.39009, 62.62467 ], + [ 30.32652, 62.65276 ], + [ 30.23257, 62.68485 ], + [ 30.19863, 62.76667 ], + [ 30.17351, 62.79928 ], + [ 30.15782, 62.806 ], + [ 30.09805, 62.88379 ], + [ 29.95742, 62.89594 ], + [ 29.83254, 62.91182 ], + [ 29.73962, 62.92746 ], + [ 29.45574, 62.89551 ], + [ 29.40538, 62.84089 ], + [ 29.34314, 62.83447 ], + [ 29.2611, 62.80594 ], + [ 29.18059, 62.77153 ], + [ 29.15554, 62.70138 ], + [ 29.17813, 62.66297 ], + [ 29.15457, 62.66571 ], + [ 29.15159, 62.65316 ], + [ 29.11905, 62.62062 ], + [ 29.18946, 62.57845 ], + [ 29.29399, 62.46415 ], + [ 29.56891, 62.39045 ], + [ 29.72699, 62.37273 ], + [ 29.8498, 62.38604 ], + [ 29.96872, 62.36309 ], + [ 29.9849, 62.35996 ], + [ 30.11527, 62.34057 ] + ] + ] + }, + "properties" : { + "Zone" : "C" + }, + "styles": [ + { + "color": "#666", + "weight": 2, + "opacity": 1 + }, + { + "color": "#333", + "weight": 12, + "opacity": 0.2 + } + ] + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiLineString", + "coordinates" : [ + [ + [ 29.96872, 62.36309 ], + [ 30.0802, 62.23755 ], + [ 30.19485, 62.18129 ], + [ 30.22439, 62.14821 ], + [ 30.29747, 62.14364 ], + [ 30.42011, 62.21097 ], + [ 30.4731, 62.25871 ], + [ 30.61082, 62.35803 ], + [ 30.63399, 62.4275 ], + [ 30.64736, 62.53547 ], + [ 30.65057, 62.56122 ], + [ 30.61927, 62.65303 ], + [ 30.57799, 62.68716 ], + [ 30.52698, 62.71816 ], + [ 30.45221, 62.77409 ], + [ 30.40755, 62.80132 ], + [ 30.34749, 62.86192 ], + [ 30.31157, 62.91303 ], + [ 30.23485, 62.95248 ], + [ 30.19104, 62.96717 ], + [ 30.14799, 62.99117 ], + [ 30.10596, 62.98912 ], + [ 30.07284, 62.96608 ], + [ 30.02752, 62.98171 ], + [ 29.96338, 63.00377 ], + [ 29.72962, 63.01152 ], + [ 29.33852, 62.93861 ], + [ 29.24068, 62.90443 ], + [ 29.11606, 62.84242 ], + [ 28.90596, 62.70919 ], + [ 29.10338, 62.39977 ], + [ 29.56891, 62.39045 ] + ] + ] + }, + "properties" : { + "Zone" : "D" + }, + "styles": [ + { + "color": "#666", + "weight": 2, + "opacity": 1 + }, + { + "color": "#333", + "weight": 12, + "opacity": 0.2 + } + ] + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiLineString", + "coordinates" : [ + [ + [ 30.64736, 62.53547 ], + [ 30.98608, 62.53218 ], + [ 30.86937, 62.667 ], + [ 30.5299, 62.97749 ], + [ 30.39306, 63.05009 ], + [ 30.12157, 63.10479 ], + [ 29.99443, 63.11131 ], + [ 30.03522, 63.05348 ], + [ 30.02752, 62.98171 ] + ], + [ + [ 30.29747, 62.14364 ], + [ 30.16289, 62.08771 ], + [ 30.11485, 62.09283 ], + [ 30.00956, 62.14173 ], + [ 30.0802, 62.23755 ] + ] + ] + }, + "properties" : { + "Zone" : "E" + }, + "styles": [ + { + "color": "#666", + "weight": 2, + "opacity": 1 + }, + { + "color": "#333", + "weight": 12, + "opacity": 0.2 + } + ] + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiLineString", + "coordinates" : [ + [ + [ 30.98608, 62.53218 ], + [ 30.97077, 62.89535 ], + [ 30.74034, 63.08984 ], + [ 30.38539, 63.18668 ], + [ 30.1378, 63.25172 ], + [ 30.03301, 63.23743 ], + [ 30.00915, 63.23416 ], + [ 29.94569, 63.23253 ], + [ 29.90773, 63.14748 ], + [ 29.99443, 63.11131 ] + ] + ] + }, + "properties" : { + "Zone" : "F" + }, + "styles": [ + { + "color": "#666", + "weight": 2, + "opacity": 1 + }, + { + "color": "#333", + "weight": 12, + "opacity": 0.2 + } + ] + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiLineString", + "coordinates" : [ + [ + [ 30.38539, 63.18668 ], + [ 30.31646, 63.25867 ], + [ 30.20547, 63.3068 ], + [ 30.2085, 63.33408 ], + [ 30.01025, 63.35303 ], + [ 29.95242, 63.34385 ], + [ 29.91158, 63.28121 ], + [ 30.03301, 63.23743 ] + ] + ] + }, + "properties" : { + "Zone" : "G" + }, + "styles": [ + { + "color": "#666", + "weight": 2, + "opacity": 1 + }, + { + "color": "#333", + "weight": 12, + "opacity": 0.2 + } + ] + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiPoint", + "coordinates" : [ + [ 29.76686, 62.6394 ], + [ 29.87054, 62.59635 ], + [ 29.80192, 62.56277 ] + ] + }, + "properties" : { + "icon":{ + "id":"icon-zone-a", + "svg":"" + } + } + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiPoint", + "coordinates" : [ + [ 29.79238, 62.70606 ], + [ 30.05577, 62.60276 ], + [ 29.86449, 62.49609 ], + [ 29.502, 62.61708 ] + ] + }, + "properties" : { + "icon":{ + "id":"icon-zone-b", + "svg":"" + } + } + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiPoint", + "coordinates" : [ + [ 29.85106, 62.83957 ], + [ 30.31364, 62.55924 ], + [ 29.99585, 62.39156 ], + [ 29.25665, 62.62457 ] + ] + }, + "properties" : { + "icon":{ + "id":"icon-zone-c", + "svg":"" + } + } + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiPoint", + "coordinates" : [ + [ 29.80893, 62.95629 ], + [ 30.54362, 62.54252 ], + [ 30.14974, 62.29506 ], + [ 29.08011, 62.6664 ] + ] + }, + "properties" : { + "icon":{ + "id":"icon-zone-d", + "svg":"" + + } + } + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiPoint", + "coordinates" : [ + [ 30.19049, 63.03603 ], + [ 30.73443, 62.63576 ], + [ 30.11351, 62.15931 ] + ] + }, + "properties" : { + "icon":{ + "id":"icon-zone-e", + "svg":"" + + } + } + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiPoint", + "coordinates" : [ + [ 30.07178, 63.17447 ], + [ 30.64542, 63.00731 ], + [ 30.9326, 62.63744 ] + ] + }, + "properties" : { + "icon":{ + "id":"icon-zone-f", + "svg":"" + + } + } + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiPoint", + "coordinates" : [ + [ 30.136, 63.28489 ] + ] + }, + "properties" : { + "icon":{ + "id":"icon-zone-g", + "svg":"" + + } + } + }, + { + "type" : "Feature", + "geometry" : { + "type" : "MultiPoint", + "coordinates" : [ + [ 29.75631, 62.60132 ] + ] + }, + "properties" : { + "icon":{ + "id":"icon-zone-city", + "svg": " " + } + } + } + ] +} \ No newline at end of file From 90bc1618160c5064e229257d3dcc08e33b4f943c Mon Sep 17 00:00:00 2001 From: sharhio Date: Wed, 30 Aug 2023 16:00:52 +0300 Subject: [PATCH 2/2] chore: dt-5982 city icon adjusted --- static/assets/geojson/joensuu_zone_lines_20230830.geojson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/assets/geojson/joensuu_zone_lines_20230830.geojson b/static/assets/geojson/joensuu_zone_lines_20230830.geojson index 281caed0ea..58e825ccf4 100755 --- a/static/assets/geojson/joensuu_zone_lines_20230830.geojson +++ b/static/assets/geojson/joensuu_zone_lines_20230830.geojson @@ -498,7 +498,7 @@ "geometry" : { "type" : "MultiPoint", "coordinates" : [ - [ 29.75631, 62.60132 ] + [ 29.75631, 62.60534 ] ] }, "properties" : {