Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 5 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
View
4 Bundle/BBBike_small.pm
@@ -21,10 +21,6 @@ Bundle::BBBike_small - A bundle to install only mandatory dependencies of BBBike
Tk 800.000 - das absolute Muss!
-Tk::ExecuteCommand - Bessere Fehlerberichte im temp_blockings-Editor
-
-Algorithm::Diff - Unterschiede im temp_blockings-Editor anzeigen
-
=head1 DESCRIPTION
View
4 Makefile.PL
@@ -227,9 +227,9 @@ my @req_table =
'Prereq für Geo::Distance::XS'], # diese Version ohne Warnungen
[qw/Geo::METAR 0 all 4 base/,
'Wetterdaten im METAR-Format'],
- [qw/Tk::ExecuteCommand 0 all 1 base/,
+ [qw/Tk::ExecuteCommand 0 all 0 base/,
'Bessere Fehlerberichte im temp_blockings-Editor'],
- [qw/Algorithm::Diff 0 all 1 base/,
+ [qw/Algorithm::Diff 0 all 0 base/,
'Unterschiede im temp_blockings-Editor anzeigen'],
[qw/Sort::Naturally 0 all 0 base/,
'Für natürliches Sortieren von bbd-Dateien'],
View
4 doc/links.pod
@@ -400,11 +400,11 @@ Perl-Module @ CPAN
OpenStreetMap
-=item L<http://download.geofabrik.de/openstreetmap/>
+=item L<http://download.geofabrik.de>
Download von vorgefertigten osm-Dateien per Land oder Region.
-=item L<http://download.geofabrik.de/openstreetmap/europe/germany/>
+=item L<http://download.geofabrik.de/europe/germany.html>
osm-Dateien f�r Deutschland.
View
4 doc/podindex.html
@@ -146,8 +146,8 @@ <h2 class="PODIDX">H</h2>
http://adfc.jgr.de/alternativradroute/alternativradroute.ovl&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_adfc_jgr_de_alt">[links]</a><br />
http://berlin.kauperts.de/&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_berlin_kauperts">[links]</a><br />
http://clickroute.de/&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_clickroute_de_">[links]</a><br />
-http://download.geofabrik.de/openstreetmap/&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_download_geofab">[links]</a><br />
-http://download.geofabrik.de/openstreetmap/europe/germany/&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_download_geofab1">[links]</a><br />
+http://download.geofabrik.de&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_download_geofab">[links]</a><br />
+http://download.geofabrik.de/europe/germany.html&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_download_geofab1">[links]</a><br />
http://fbinter.stadt-berlin.de/fb/index.jsp&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_fbinter_stadt_b">[links]</a><br />
http://gpsbabel.sourceforge.net/&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_gpsbabel_source">[links]</a><br />
http://home.arcor.de/peter.gerwien/gps.html&nbsp;&nbsp;<a class="POD_NAVLINK" href="links.html#http_home_arcor_de_p">[links]</a><br />
View
8 misc/Makefile
@@ -118,14 +118,14 @@ download-${land}.osm.bz2:
# cd just for checking:
mkdir -p ${OSM_DOWNLOAD_DIR}
cd ${OSM_DOWNLOAD_DIR} && true
- wget http://download.geofabrik.de/openstreetmap/europe/germany/${land}.osm.bz2 -O ${OSM_DOWNLOAD_DIR}/${land}.osm.bz2~
+ wget http://download.geofabrik.de/europe/germany/${land}-latest.osm.bz2 -O ${OSM_DOWNLOAD_DIR}/${land}.osm.bz2~
mv ${OSM_DOWNLOAD_DIR}/${land}.osm.bz2~ ${OSM_DOWNLOAD_DIR}/${land}.osm.bz2
download-${land}.osm.pbf:
# cd just for checking:
mkdir -p ${OSM_DOWNLOAD_DIR}
cd ${OSM_DOWNLOAD_DIR} && true
- wget http://download.geofabrik.de/openstreetmap/europe/germany/${land}.osm.pbf -O ${OSM_DOWNLOAD_DIR}/${land}.osm.pbf~
+ wget http://download.geofabrik.de/europe/germany/${land}-latest.osm.pbf -O ${OSM_DOWNLOAD_DIR}/${land}.osm.pbf~
mv ${OSM_DOWNLOAD_DIR}/${land}.osm.pbf~ ${OSM_DOWNLOAD_DIR}/${land}.osm.pbf
.endfor
@@ -134,14 +134,14 @@ download-${land}.osm.bz2:
# cd just for checking:
mkdir -p ${OSM_DOWNLOAD_DIR}
cd ${OSM_DOWNLOAD_DIR} && true
- wget http://download.geofabrik.de/openstreetmap/europe/${land}.osm.bz2 -O ${OSM_DOWNLOAD_DIR}/${land}.osm.bz2~
+ wget http://download.geofabrik.de/europe/${land}-latest.osm.bz2 -O ${OSM_DOWNLOAD_DIR}/${land}.osm.bz2~
mv ${OSM_DOWNLOAD_DIR}/${land}.osm.bz2~ ${OSM_DOWNLOAD_DIR}/${land}.osm.bz2
download-${land}.osm.pbf:
# cd just for checking:
mkdir -p ${OSM_DOWNLOAD_DIR}
cd ${OSM_DOWNLOAD_DIR} && true
- wget http://download.geofabrik.de/openstreetmap/europe/${land}.osm.pbf -O ${OSM_DOWNLOAD_DIR}/${land}.osm.pbf~
+ wget http://download.geofabrik.de/europe/${land}-latest.osm.pbf -O ${OSM_DOWNLOAD_DIR}/${land}.osm.pbf~
mv ${OSM_DOWNLOAD_DIR}/${land}.osm.pbf~ ${OSM_DOWNLOAD_DIR}/${land}.osm.pbf
.endfor
View
17 miscsrc/fragezeichen2org.pl
@@ -18,6 +18,7 @@
use lib (
"$FindBin::RealBin/..",
"$FindBin::RealBin/../lib",
+ "$FindBin::RealBin/../miscsrc", # für ReverseGeocoding.pm
$FindBin::RealBin,
);
@@ -156,6 +157,22 @@
binmode STDOUT, ':utf8';
print "fragezeichen/nextcheck\t\t\t-*- mode:org; coding:utf-8 -*-\n\n";
+if ($with_dist) {
+ require ReverseGeocoding;
+ require Karte::Polar;
+ require Karte::Standard;
+ my $rh = ReverseGeocoding->new;
+ if ($centerc) {
+ my($px,$py) = $Karte::Polar::obj->standard2map(split /,/, $centerc);
+ print "1st reference point for distances: ". $rh->find_closest("$px,$py", "road"), "\n";
+ if ($center2c) {
+ my($p2x,$p2y) = $Karte::Polar::obj->standard2map(split /,/, $center2c);
+ print "2nd reference point for distances: ". $rh->find_closest("$p2x,$p2y", "road"), "\n";
+ }
+ print "\n";
+ }
+}
+
my $today_printed = 0;
for my $record (@records) {
if (!$today_printed && $record->{date} le $today) {
View
2 port/windows/bbbike.tpl.iss
@@ -62,7 +62,7 @@ Name: "en"; MessagesFile: "compiler:Default.isl"
Root: HKCR; Subkey: ".bbr"; ValueType: string; ValueName: ""; ValueData: "BBBike.Route"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "BBBike.Route"; ValueType: string; ValueName: ""; ValueData: "BBBike-Route"; Flags: uninsdeletekey
Root: HKCR; Subkey: "BBBike.Route\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bbbike\images\srtbike.ico"
-Root: HKCR; Subkey: "BBBike.Route\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bbbike\bbbike"" ""%1"""
+Root: HKCR; Subkey: "BBBike.Route\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """[% wperl_exe %]"" ""{app}\bbbike\bbbike"" ""%1"""
[InstallDelete]
Type: filesandordirs; Name: "{app}\perl"
View
28 port/windows/create_bbbike_dist.pl
@@ -21,10 +21,12 @@
if $^O eq 'cygwin';
my $do_snapshot;
+my $do_continue;
GetOptions(
"snapshot" => \$do_snapshot,
+ "c|cont|continue" => \$do_continue,
)
- or die "usage: $0 [-snapshot]";
+ or die "usage: $0 [-snapshot] [-c|-continue]";
my $strawberry_ver = 'strawberry-perl-5.14.2.1';
my $strawberry_zip_file = $strawberry_ver . '-32bit-portable.zip';
@@ -43,16 +45,24 @@
my $bbbikewindist_dir = "$eserte_dos_path\\bbbikewindist";
my $bak_date = strftime("%Y%m%d%H%M%S", localtime);
if (-e $strawberry_dir) {
- print STDERR "Moving existing $strawberry_dir...\n";
- my $dest = "$strawberry_dir.$bak_date.bak";
- rename $strawberry_dir, $dest
- or die "Can't move $strawberry_dir to $dest: $!";
+ if ($do_continue) {
+ print STDERR "Reusing existing $strawberry_dir...\n";
+ } else {
+ print STDERR "Moving existing $strawberry_dir...\n";
+ my $dest = "$strawberry_dir.$bak_date.bak";
+ rename $strawberry_dir, $dest
+ or die "Can't move $strawberry_dir to $dest: $!";
+ }
}
if (-e $bbbikewindist_dir) {
- print STDERR "Moving existing $bbbikewindist_dir...\n";
- my $dest = "$bbbikewindist_dir.$bak_date.bak";
- rename $bbbikewindist_dir, $dest
- or die "Can't move $bbbikewindist_dir to $dest: $!";
+ if ($do_continue) {
+ print STDERR "Reusing existing $bbbikewindist_dir...\n";
+ } else {
+ print STDERR "Moving existing $bbbikewindist_dir...\n";
+ my $dest = "$bbbikewindist_dir.$bak_date.bak";
+ rename $bbbikewindist_dir, $dest
+ or die "Can't move $bbbikewindist_dir to $dest: $!";
+ }
}
{

No commit comments for this range

Something went wrong with that request. Please try again.