Unverified Commit 1a950109 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

GIS::Distance has been packaged for Debian trixie; drop Geo::Distance support

parent af2b2b2c

lib/Travel/Status/DE/IRIS/Stations.pm.PL

+4 −32
Original line number Diff line number Diff line
@@ -26,16 +26,7 @@ use warnings; 
use 5.014;

use utf8;



EOF



if ($ENV{DB_IRIS_DEB_BUILD}) {

	$buf .= "use Geo::Distance;\n"

}

else {

	$buf .= "use GIS::Distance;\n";

}



$buf .= <<'EOF';

use GIS::Distance;

use List::Util qw(min);

use List::UtilsBy qw(uniq_by);

use List::MoreUtils qw(firstval pairwise);
@@ -130,16 +121,7 @@ sub get_station_by_location { 


	$num_matches //= 10;



EOF



if ($ENV{DB_IRIS_DEB_BUILD}) {

	$buf .= "\tmy \$dist = Geo::Distance->new();\n";

}

else {

	$buf .= "\tmy \$dist = GIS::Distance->new();\n";

}



$buf .= <<'EOF';

	my $dist = GIS::Distance->new();



	# we only use geolocations inside germany.

	# For these, this fast preprocessing step will let through all
@@ -150,18 +132,8 @@ $buf .= <<'EOF'; 
		  and abs( $_->[4] - $lat )

		  < 1

	} @stations;

	my @distances

EOF



if ($ENV{DB_IRIS_DEB_BUILD}) {

	$buf .= '= map { $dist->distance( \'kilometer\', $lon, $lat, $_->[3], $_->[4] ) }';

}

else {

	$buf .= '= map { $dist->distance_metal( $lat, $lon, $_->[4], $_->[3] ) }';

}



$buf .= <<'EOF';

	  @candidates;

	my @distances = map

		{ $dist->distance_metal( $lat, $lon, $_->[4], $_->[3] ) } @candidates;

	my @station_map = pairwise { [ $a, $b ] } @candidates, @distances;



	@station_map = sort { $a->[1] <=> $b->[1] } @station_map;

scripts/makedeb-docker-helper

+1 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ apt-get update 
apt-get -y install \

	apt-file dh-make-perl libmodule-build-perl \

	libcache-perl libclass-accessor-perl libdatetime-perl \

	libdatetime-format-strptime-perl libgeo-distance-xs-perl \

	libdatetime-format-strptime-perl libgis-distance-perl \

	liblist-compare-perl liblist-moreutils-perl liblist-utilsby-perl \

	libwww-perl libtext-levenshteinxs-perl libxml-libxml-perl \

	libfile-slurp-perl libjson-perl libjson-xs-perl \
@@ -25,8 +25,6 @@ cp -a /orig/bin /orig/examples /orig/lib /orig/share /orig/t /src/app 
cd /src/app



sed -i 's/sign *=> *1/sign => 0/' Build.PL

sed -i 's/GIS::Distance/Geo::Distance/' Build.PL

export DB_IRIS_DEB_BUILD=1

perl Build.PL

perl Build

perl Build manifest