From 4443e188d1ffb737a088ef8fc30cda3837ed9080 Mon Sep 17 00:00:00 2001 From: Majk Shkurti Date: Wed, 29 Mar 2023 01:36:07 +0200 Subject: [PATCH 1/3] [FIX] oev_gueteklasse --- app/client/src/factory/layer.js | 39 --------------------------------- 1 file changed, 39 deletions(-) diff --git a/app/client/src/factory/layer.js b/app/client/src/factory/layer.js index 09c0a760c..18ffe56fc 100644 --- a/app/client/src/factory/layer.js +++ b/app/client/src/factory/layer.js @@ -90,33 +90,6 @@ function heatmapGet(taskId, proj, current_try, lConf, source) { } else { if (response.data) { addHeatmapToMap(response, lConf, source); - // mapStore.state.isMapBusy = false; - // const olFeatures = geobufToFeatures(response.data, { - // dataProjection: "EPSG:4326", - // featureProjection: "EPSG:3857" - // }); - // olFeatures.forEach(feature => { - // if ( - // ["heatmap_connectivity", "heatmap_population"].includes( - // lConf.name - // ) - // ) { - // if ("heatmap_connectivity" === lConf.name) { - // feature.set( - // "percentile_area_isochrone", - // Math.round(feature.get("area_class")) - // ); - // } else if ("heatmap_population" === lConf.name) { - // feature.set( - // "percentile_population", - // Math.round(feature.get("population_class")) - // ); - // } - // } else { - // feature.set("agg_class", Math.round(feature.get("agg_class"))); - // } - // }); - // source.addFeatures(olFeatures); } } }) @@ -474,23 +447,11 @@ export const LayerFactory = { } else if ( ["pt_oev_gueteklasse", "pt_station_count"].includes(lConf.name) ) { - const promiseConfig = { - responseType: "arraybuffer", - headers: { - Accept: "application/pdf", - "Content-Encoding": "gzip" - }, - cancelToken: new CancelToken(c => { - // An executor function receives a cancel function as a parameter - heatmapGetCancelToken = c; - }) - }; if (lConf.name === "pt_oev_gueteklasse") { const payload = { start_time: startTime, end_time: endTime, weekday: weekday, - return_type: returnType, station_config: indicatorsStore.state.pt_oev_gueteklasse.config }; promise = ApiService.post_(url, payload, promiseConfig); From 988b57cccad84293c89ca72551a528b83a1d4727 Mon Sep 17 00:00:00 2001 From: Majk Shkurti Date: Wed, 29 Mar 2023 02:15:51 +0200 Subject: [PATCH 2/3] trigger build --- infra/templates/k8s/deploy/rabbitmq.tpl.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/templates/k8s/deploy/rabbitmq.tpl.yaml b/infra/templates/k8s/deploy/rabbitmq.tpl.yaml index da6edf1b7..f65a5c857 100644 --- a/infra/templates/k8s/deploy/rabbitmq.tpl.yaml +++ b/infra/templates/k8s/deploy/rabbitmq.tpl.yaml @@ -10,7 +10,6 @@ metadata: namespace: ${NAMESPACE} spec: replicas: 1 - # hostname: goat_${NAMESPACE}_rabbitmq selector: matchLabels: app: goat-rabbitmq @@ -24,6 +23,7 @@ spec: labels: app: goat-rabbitmq spec: + hostname: goat_${NAMESPACE}_rabbitmq containers: - image: goatcommunity/rabbitmq:latest imagePullPolicy: IfNotPresent From c8315aacbca469860031114013bd2f6096fdd7fb Mon Sep 17 00:00:00 2001 From: Majk Shkurti Date: Wed, 29 Mar 2023 02:44:45 +0200 Subject: [PATCH 3/3] trigger build --- infra/templates/aws/worker-config.yaml | 6 +++--- infra/templates/k8s/deploy/rabbitmq.tpl.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infra/templates/aws/worker-config.yaml b/infra/templates/aws/worker-config.yaml index a2cc013b7..dec68c92c 100644 --- a/infra/templates/aws/worker-config.yaml +++ b/infra/templates/aws/worker-config.yaml @@ -28,9 +28,9 @@ Parameters: Description: "The name of the RabbitMQ cluster" Type: String AllowedValues: - - 'goat_dev_rabbitmq' - - 'goat_prod_rabbitmq' - Default: 'goat_dev_rabbitmq' + - 'goat-dev-rabbitmq' + - 'goat-prod-rabbitmq' + Default: 'goat-dev-rabbitmq' Mappings: diff --git a/infra/templates/k8s/deploy/rabbitmq.tpl.yaml b/infra/templates/k8s/deploy/rabbitmq.tpl.yaml index f65a5c857..8b5ce2a80 100644 --- a/infra/templates/k8s/deploy/rabbitmq.tpl.yaml +++ b/infra/templates/k8s/deploy/rabbitmq.tpl.yaml @@ -23,7 +23,7 @@ spec: labels: app: goat-rabbitmq spec: - hostname: goat_${NAMESPACE}_rabbitmq + hostname: goat-${NAMESPACE}-rabbitmq containers: - image: goatcommunity/rabbitmq:latest imagePullPolicy: IfNotPresent