Merge pull request #431 from HSLdevcom/DT-5714-map

DT-5714: Enable matka map
HSLdevcom · Dec 8, 2023 · 19db01a · 19db01a
2 parents 1452ab6 + 577f266
commit 19db01a
Show file tree

Hide file tree

Showing 15 changed files with 729 additions and 112 deletions.
diff --git a/server/app.js b/server/app.js
@@ -33,7 +33,7 @@ const apiSubscriptionParameter = process.env.API_SUBSCRIPTION_QUERY_PARAMETER_NA
 
 const MAP_URL = process.env.MAP_URL
   ? process.env.MAP_URL
-  : 'https://cdn.digitransit.fi/map/v2/hsl-map/{z}/{x}/{y}.png';
+  : 'https://cdn.digitransit.fi/map/v2';
 
 const __dirname = fileURLToPath(import.meta.url);
 const port = process.env.PORT || 3001;
@@ -83,8 +83,16 @@ app.get('/api/geocoding/:endpoint', (req, res, next) => {
     .catch(e => next(e));
 });
 
-app.get('/api/map', (req, res) => {
-  const url = `${MAP_URL}?${apiSubscriptionParameter}`;
+app.get('/api/map/:lang', (req, res) => {
+  const { lang } = req.params
+  let url;
+  const hasLang = lang !== 'null' && lang !== 'undefined'
+  if(hasLang && lang !== 'fi') {
+    url = `${MAP_URL}/hsl-map-${lang}/{z}/\{x}/{y}.png?${apiSubscriptionParameter}`
+  } else  {
+    url = `${MAP_URL}/hsl-map/{z}/\{x}/{y}.png?${apiSubscriptionParameter}`
+
+  }
   return res.status(200).json(url);
 });
 

diff --git a/src/MonitorMapContainer.tsx b/src/MonitorMapContainer.tsx
@@ -10,13 +10,17 @@ interface IProps {
   modal?: boolean;
   updateMap?: (settings: IMapSettings) => void;
   topics?: string[];
+  departures?: any;
+  lang: string;
 }
 const MonitorMapContainer: FC<IProps> = ({
   preview,
   mapSettings,
   modal,
   updateMap,
   topics,
+  departures,
+  lang,
 }) => {
   const [state, setState] = useMergeState({
     client: undefined,
@@ -68,6 +72,8 @@ const MonitorMapContainer: FC<IProps> = ({
         clientRef={clientRef}
         newTopics={topics}
         topicRef={topicRef}
+        departures={departures}
+        lang={lang}
       />
     </div>
   );

diff --git a/src/api.tsx b/src/api.tsx
@@ -28,8 +28,8 @@ const fetchData = (path, options, signal = undefined) => {
 };
 
 const monitorAPI = {
-  getMapSettings(signal = undefined) {
-    return fetchData('map', {}, signal);
+  getMapSettings(lang, signal = undefined) {
+    return fetchData(`map/${lang}`, {}, signal);
   },
   getPing(signal = undefined) {
     const options = {