Merge branch 'dev'

.gitignore

@@ -9,11 +9,14 @@ public/gpx-image/*/*.webp
 public/gpx-image-with-track/*.jpg
 public/gpx-track/totour/*/*.gpx
 public/gpx-track/fromtour/*/*.gpx
+public/range-image/desktop.ini
+public/range-image/*.jpg
 package-lock.json
 src/firebase.json
 src/knexfile.js
 src/knexfileTourenDb.js
 .DS_Store
 .local-chromium
 api.log
-test.json
+test.json
+*Zone.Identifier

database.sql

@@ -235,29 +235,11 @@ CREATE TABLE tracks (
 );
 
 
-
-
--- 30.03.2024 & 26.04.2024 run this drop columns if you have an existing database
-ALTER TABLE fahrplan
-DROP COLUMN IF EXISTS connection_description,
-DROP COLUMN IF EXISTS connection_description_detail,
-DROP COLUMN IF EXISTS return_description,
-DROP COLUMN IF EXISTS return_description_detail,
-DROP COLUMN IF EXISTS connection_lastregular_arrival_stop,
-DROP COLUMN IF EXISTS connection_lastregular_arrival_stop_lon,
-DROP COLUMN IF EXISTS connection_lastregular_arrival_stop_lat,
-DROP COLUMN IF EXISTS connection_departure_stop,
-DROP COLUMN IF EXISTS connection_departure_stop_lon,
-DROP COLUMN IF EXISTS connection_departure_stop_lat,
-DROP COLUMN IF EXISTS connection_arrival_stop,
-DROP COLUMN IF EXISTS connection_arrival_stop_lon,
-DROP COLUMN IF EXISTS connection_arrival_stop_lat,
-DROP COLUMN IF EXISTS connection_returns_departure_stop,
-DROP COLUMN IF EXISTS return_departure_stop_lon,
-DROP COLUMN IF EXISTS return_departure_stop_lat,
-DROP COLUMN IF EXISTS return_firstregular_departure_stop,
-DROP COLUMN IF EXISTS return_firstregular_departure_stop_lon,
-DROP COLUMN IF EXISTS return_firstregular_departure_stop_lat,
-DROP COLUMN IF EXISTS return_arrival_stop,
-DROP COLUMN IF EXISTS return_arrival_stop_lon,
-DROP COLUMN IF EXISTS return_arrival_stop_lat;
+CREATE TABLE canonical_alternate (
+      id SERIAL,
+      city_slug varchar(64) NOT NULL,
+      canonical_yn char(1) DEFAULT 'n',
+      zuugle_url varchar(100) NOT NULL,
+      href_lang varchar(5) DEFAULT 'de-at',
+      PRIMARY KEY (id, city_slug)
+);

src/jobs/sync.js

@@ -243,6 +243,35 @@ export async function fixTours(){
                     WHERE ct.tour_id=e.tour_id
                     AND ct.city_slug=e.city_slug;`);
 
+
+    // fill information about canonical and alternate links
+    await knex.raw(`TRUNCATE canonical_alternate;`);
+    await knex.raw(`INSERT INTO canonical_alternate (id, city_slug, canonical_yn, zuugle_url, href_lang)
+                    SELECT
+                    tour_id,
+                    city_slug,
+                    CASE WHEN ranking=1 THEN 'y' ELSE 'n' END AS canonical_yn,
+                    zuugle_url,
+                    hreflang
+                    FROM (
+                        SELECT 
+                        RANK() OVER(PARTITION BY c2t.tour_id ORDER BY c2t.min_connection_no_of_transfers ASC, c2t.min_connection_duration ASC, c2t.stop_selector DESC, c2t.city_slug ASC) AS ranking,
+                        c2t.tour_id,
+                        c2t.city_slug,
+                        CONCAT('www.zuugle.', LOWER(c2t.reachable_from_country), '/tour/', c2t.tour_id, '/', c2t.city_slug) AS zuugle_url,
+                        CASE WHEN c2t.reachable_from_country='SI' THEN 'sl-si' 
+                            WHEN c2t.reachable_from_country='DE' THEN 'de-de'
+                            WHEN c2t.reachable_from_country='IT' THEN 'it-it'
+                            WHEN c2t.reachable_from_country='CH' THEN 'de-ch'
+                            WHEN c2t.reachable_from_country='LI' THEN 'de-li'
+                            WHEN c2t.reachable_from_country='FR' THEN 'fr-fr'
+                            ELSE 'de-at' END AS hreflang	
+                        FROM city2tour AS c2t
+                        INNER JOIN tour AS t
+                        ON t.id=c2t.tour_id
+                    ) AS a;`);
+
+
     // Delete all the entries from logsearchphrase, which are older than 360 days.
     await knex.raw(`DELETE FROM logsearchphrase WHERE search_time < NOW() - INTERVAL '360 days';`);
 

src/routes/tours.js

@@ -18,8 +18,6 @@ router.get('/map', (req, res) => mapWrapper(req, res));
 router.get('/provider/:provider', (req, res) => providerWrapper(req, res));
 
 router.get('/total', (req, res) => totalWrapper(req, res));
-// router.get('/gpx', (req, res) => gpxWrapper(req, res));
-router.get('/:id/connections', (req, res) => connectionsWrapper(req, res));
 router.get('/:id/connections-extended', (req, res) => connectionsExtendedWrapper(req, res));
 router.get('/:id/gpx', (req, res) => tourGpxWrapper(req, res));
 router.get('/:id/:city', (req, res) => getWrapper(req, res));
@@ -566,7 +564,7 @@ const listWrapper = async (req, res) => {
 
             // markers-related
             if (!!markers_result && !!markers_result.rows) {
-            markers_array = markers_result.rows; // This is to be passed to the response below
+                markers_array = markers_result.rows; // This is to be passed to the response below
             } else {
                 console.log("markers_result is null or undefined");
             }    
@@ -889,63 +887,6 @@ const filterWrapper = async (req, res) => {
 
 
 
-const connectionsWrapper = async (req, res) => {
-    const id = req.params.id;
-    const city = !!req.query.city ? req.query.city : !!req.params.city ? req.params.city : null;
-    const domain = req.query.domain;
-
-    const weekday = getWeekday(moment());
-    const tour = await knex('tour').select().where({id: id}).first();
-    if(!!!tour || !!!city){
-        res.status(404).json({success: false});
-        return;
-    }
-
-    // const query_con = knex('fahrplan').select().where({hashed_url: tour.hashed_url, city_slug: city});
-    // const connections = await query_con;
-
-    let connections = [];
-    const fahrplan_sql = `SELECT * FROM fahrplan WHERE hashed_url='${tour.hashed_url}' AND city_slug='${city}';`;
-    const fahrplan_result = await knex.raw(fahrplan_sql)    
-    if (!!fahrplan_result && !!fahrplan_result.rows) {
-        connections = fahrplan_result.rows;
-    }
-
-    let missing_days = getMissingConnectionDays(connections);
-
-    await Promise.all(connections.map(connection => new Promise(resolve => {
-        connection.best_connection_duration_minutes = minutesFromMoment( moment(connection.best_connection_duration, 'HH:mm:ss') );
-        connection.connection_duration_minutes = minutesFromMoment( moment(connection.connection_duration, 'HH:mm:ss') );
-        connection.return_duration_minutes = minutesFromMoment( moment(connection.return_duration, 'HH:mm:ss') );
-        connection.missing_days = missing_days;
-        resolve(connection);
-    })));
-
-
-    let filteredConnections = [];
-    connections.forEach(t => {
-        if(!!!filteredConnections.find(tt => compareConnections(t, tt))){
-            filteredConnections.push(t);
-        }
-    })
-
-    let filteredReturns = [];
-    getConnectionsByWeekday(connections, weekday).forEach(t => {
-        /** Die Rückreisen werden nach aktuellem Tag gefiltert -> kann man machen, muss man aber nicht. Wenn nicht gefiltert, werden alle Rückreisen für alle Wochentage angezeigt, was eine falsche Anzahl an Rückreisen ausgibt */
-        if(!!!filteredReturns.find(tt => compareConnectionReturns(t, tt))){
-            t.gpx_file = `${getHost(domain)}/public/gpx-track/fromtour/${last_two_characters(t.fromtour_track_key)}/${t.fromtour_track_key}.gpx`;
-
-            filteredReturns.push(t);
-        }
-    })
-
-    filteredReturns.sort(function(x, y){
-        return moment(x.return_departure_datetime).unix() - moment(y.return_departure_datetime).unix();
-    })
-
-    res.status(200).json({success: true, connections: filteredConnections, returns: filteredReturns});
-}
-
 const connectionsExtendedWrapper = async (req, res) => {
     const id = req.params.id;
     const city = !!req.query.city ? req.query.city : !!req.params.city ? req.params.city : null;
@@ -1172,18 +1113,19 @@ const getConnectionsByWeekday = (connections, weekday) => {
 const prepareTourEntry = async (entry, city, domain, addDetails = true) => {
     if( !(!!entry && !!entry.provider) ) return entry ;    
 
-    entry.gpx_file = `${getHost(domain)}/public/gpx/${last_two_characters(entry.id)}/${entry.id}.gpx`;
+    const host = getHost(domain);
+    entry.gpx_file = `${host}/public/gpx/${last_two_characters(entry.id)}/${entry.id}.gpx`;
 
     if(!!addDetails){
         if(!!city){
             const toTour = await knex('fahrplan').select('totour_track_key').where({hashed_url: entry.hashed_url, city_slug: city}).whereNotNull('totour_track_key').first();
             const fromTour = await knex('fahrplan').select('fromtour_track_key').where({hashed_url: entry.hashed_url, city_slug: city}).whereNotNull('fromtour_track_key').first();
 
             if(!!toTour && !!toTour.totour_track_key){
-                entry.totour_gpx_file = `${getHost(domain)}/public/gpx-track/totour/${last_two_characters(toTour.totour_track_key)}/${toTour.totour_track_key}.gpx`;
+                entry.totour_gpx_file = `${host}/public/gpx-track/totour/${last_two_characters(toTour.totour_track_key)}/${toTour.totour_track_key}.gpx`;
             }
             if(!!fromTour && !!fromTour.fromtour_track_key){
-                entry.fromtour_gpx_file = `${getHost(domain)}/public/gpx-track/fromtour/${last_two_characters(fromTour.fromtour_track_key)}/${fromTour.fromtour_track_key}.gpx`;
+                entry.fromtour_gpx_file = `${host}/public/gpx-track/fromtour/${last_two_characters(fromTour.fromtour_track_key)}/${fromTour.fromtour_track_key}.gpx`;
             }
         }
 
@@ -1193,10 +1135,24 @@ const prepareTourEntry = async (entry, city, domain, addDetails = true) => {
 
         // convert the "difficulty" value into a text value 
         entry.difficulty = convertDifficulty(entry.difficulty)
+
+
+        // add info about canonical and alternate links of this tour with entry.id
+        const canon_sql = `SELECT
+                          city_slug,
+                          canonical_yn,
+                          zuugle_url,
+                          href_lang
+                          FROM canonical_alternate
+                          WHERE id=${entry.id};`;  
+        const canonical = await knex.raw(canon_sql); 
+        if (!!canonical) {
+            entry.canonical = canonical.rows;
+        }
     }
 
     const { ["hashed_url"]: remove, ...rest } = entry;
     return rest;
 }
 
-export default router;
+export default router;