*** empty log message ***

eserte · Mar 17, 2007 · 57263b4 · 57263b4
1 parent 27ae335
commit 57263b4
Show file tree

Hide file tree

Showing 30 changed files with 297 additions and 226 deletions.
diff --git a/MANIFEST.addtocvs b/MANIFEST.addtocvs
@@ -200,6 +200,7 @@ miscsrc/conv_geonet_data.pl
 miscsrc/convert2hafas
 miscsrc/convert_berlinmap.pl
 miscsrc/convert_coordsys
+miscsrc/convert_orig_to_bbd
 miscsrc/convert_radwege
 miscsrc/correct_data.pl
 miscsrc/correct_data_map.pl

diff --git a/MANIFEST.withcvs b/MANIFEST.withcvs
@@ -1121,6 +1121,7 @@ miscsrc/conv_geonet_data.pl
 miscsrc/convert2hafas
 miscsrc/convert_berlinmap.pl
 miscsrc/convert_coordsys
+miscsrc/convert_orig_to_bbd
 miscsrc/convert_radwege
 miscsrc/correct_data.pl
 miscsrc/correct_data_map.pl

diff --git a/Strassen/Core.pm b/Strassen/Core.pm
@@ -1,7 +1,7 @@
 # -*- perl -*-
 
 #
-# $Id: Core.pm,v 1.73 2007/01/06 19:17:23 eserte Exp $
+# $Id: Core.pm,v 1.74 2007/03/17 20:54:52 eserte Exp $
 #
 # Copyright (c) 1995-2003 Slaven Rezic. All rights reserved.
 # This is free software; you can redistribute it and/or modify it under the
@@ -28,7 +28,7 @@ use vars qw(@datadirs $OLD_AGREP $VERBOSE $VERSION $can_strassen_storable
 use enum qw(NAME COORDS CAT);
 use constant LAST => CAT;
 
-$VERSION = sprintf("%d.%02d", q$Revision: 1.73 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 1.74 $ =~ /(\d+)\.(\d+)/);
 
 if (defined $ENV{BBBIKE_DATADIR}) {
     require Config;
@@ -1351,6 +1351,13 @@ sub get_global_directives {
     }
 }
 
+# Note that this sets only the reference; if you want a copy, then
+# use Storable::dclone before!
+sub set_global_directives {
+    my($self, $global_directives) = @_;
+    $self->{GlobalDirectives} = $global_directives;
+}
+
 sub switch_encoding {
     my($fh, $value) = @_;
     # The encoding directive is executed immediately

diff --git a/Strassen/Strasse.pm b/Strassen/Strasse.pm
@@ -1,7 +1,7 @@
 # -*- perl -*-
 
 #
-# $Id: Strasse.pm,v 1.28 2006/08/26 21:57:47 eserte Exp $
+# $Id: Strasse.pm,v 1.28 2006/08/26 21:57:47 eserte Exp eserte $
 #
 # Copyright (c) 1995-2001 Slaven Rezic. All rights reserved.
 # This is free software; you can redistribute it and/or modify it under the

diff --git a/bbbike b/bbbike
@@ -2,7 +2,7 @@
 # -*- perl -*-
 
 #
-# $Id: bbbike,v 3.294 2007/03/16 21:41:36 eserte Exp $
+# $Id: bbbike,v 3.294 2007/03/16 21:41:36 eserte Exp eserte $
 # Author: Slaven Rezic
 #
 # Copyright (c) 1995-2007 Slaven Rezic. All rights reserved.
@@ -5161,6 +5161,10 @@ sub define_item_attribs {
 
 	 'X' => "red", # fallback color
 	);
+    for (qw(Q0 Q1 Q2 Q3)) { # same colors for tendencies
+	$category_color{$_."-"} = $category_color{$_};
+	$category_color{$_."+"} = $category_color{$_};
+    }
     %category_font_color =
 	(
 	 'W'  => '#2a45b7',

diff --git a/cgi/bbbike.cgi b/cgi/bbbike.cgi
@@ -5,7 +5,7 @@
 # -*- perl -*-
 
 #
-# $Id: bbbike.cgi,v 8.43 2007/03/15 22:12:13 eserte Exp $
+# $Id: bbbike.cgi,v 8.43 2007/03/15 22:12:13 eserte Exp eserte $
 # Author: Slaven Rezic
 #
 # Copyright (C) 1998-2007 Slaven Rezic. All rights reserved.

diff --git a/data/Makefile b/data/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 2.127 2007/03/05 20:55:32 eserte Exp eserte $
+# $Id: Makefile,v 2.129 2007/03/17 21:20:56 eserte Exp $
 #
 # This Makefile is only usable with a modern version of BSD make (also known
 # as "pmake"). The source for pmake can be found at
@@ -19,6 +19,7 @@ PERSISTENTTMPDIR=	$(BBBIKEDIR)/tmp
 #BERLINMAP2HAFAS=	${MISCSRCDIR}/berlinmap2hafas -strict
 HAFAS2HAFAS=		${MISCSRCDIR}/hafas2hafas -strict
 CONVERT2HAFAS=		${MISCSRCDIR}/convert2hafas -strict
+CONVERT_ORIG=		${MISCSRCDIR}/convert_orig_to_bbd
 CHECK_POINTS=		${MISCSRCDIR}/check_points
 CHECK_STR_PLZ=		${MISCSRCDIR}/check_str_plz
 CHECK_CONT=		${MISCSRCDIR}/check_cont
@@ -501,13 +502,13 @@ radwege_exact:	radwege-orig
 
 qualitaet_s:	qualitaet_s-orig
 	-@$(WRITEABLE) $@
-	$(CONVERT2HAFAS) qualitaet_s-orig > qualitaet_s~
+	$(CONVERT_ORIG) -strip-tendencies qualitaet_s-orig > qualitaet_s~
 	mv qualitaet_s~ qualitaet_s
 	-@$(READONLY) $@
 
 qualitaet_l:	qualitaet_l-orig
 	-@$(WRITEABLE) $@
-	$(CONVERT2HAFAS) qualitaet_l-orig > qualitaet_l~
+	$(CONVERT_ORIG) -strip-tendencies qualitaet_l-orig > qualitaet_l~
 	mv qualitaet_l~ qualitaet_l
 	-@$(READONLY) $@
 

diff --git a/data/exits b/data/exits
@@ -116,3 +116,5 @@
 	X 9308,12649 9303,12699 9181,12732
 	X 9283,12856 9303,12699 9181,12732
 	X 9306,12725 9303,12699 9181,12732
+	X 6252,7147 6185,7082 6151,7078
+	X 6252,7147 6195,7067 6243,7033
diff --git a/data/exits-orig b/data/exits-orig
@@ -116,3 +116,5 @@
 	X 9308,12649 9303,12699 9181,12732
 	X 9283,12856 9303,12699 9181,12732
 	X 9306,12725 9303,12699 9181,12732
+	X 6252,7147 6185,7082 6151,7078
+	X 6252,7147 6195,7067 6243,7033
diff --git a/data/fragezeichen b/data/fragezeichen
@@ -910,6 +910,8 @@ Albulaweg: Qualit
 Asbestweg: Qualit�t?	? 11207,1737 11309,1718 11362,1723
 Barkhausenstr.: Qualit�t?	? -10530,16281 -10744,16241
 Barkhausenstr.: Qualit�t?	? -10853,16230 -10970,16232 -11130,16245 -11296,16308 -11549,16413 -11783,16506
+An der Industriebahn: Qualit�t (wahrscheinlich Asphalt)? Vorfahrtstra�e?	? 14153,17670 14168,17522 14165,17224
+K 6315; (B188-Nennhausen); zw. Nennhausen u. Kotzen: Qualit�t (bis Ende 2005 bei der LBVS als "schlechte Stra�e" gekennzeichnet)	? -50149,24689 -50048,24475 -49883,24097 -50010,23562 -50201,23411 -50255,22794 -50938,21256
 # added from ampeln-orig
 wirklich? (?)	? 9215,3599
 Wirklich? (?)	? -3775,17087

diff --git a/data/fragezeichen-orig b/data/fragezeichen-orig
@@ -1414,3 +1414,5 @@ Albulaweg: Qualit
 Asbestweg: Qualit�t?	? 11207,1737 11309,1718 11362,1723
 Barkhausenstr.: Qualit�t?	? -10530,16281 -10744,16241
 Barkhausenstr.: Qualit�t?	? -10853,16230 -10970,16232 -11130,16245 -11296,16308 -11549,16413 -11783,16506
+An der Industriebahn: Qualit�t (wahrscheinlich Asphalt)? Vorfahrtstra�e?	? 14153,17670 14168,17522 14165,17224
+K 6315; (B188-Nennhausen); zw. Nennhausen u. Kotzen: Qualit�t (bis Ende 2005 bei der LBVS als "schlechte Stra�e" gekennzeichnet)	? -50149,24689 -50048,24475 -49883,24097 -50010,23562 -50201,23411 -50255,22794 -50938,21256
diff --git a/data/gesperrt_car b/data/gesperrt_car
@@ -349,3 +349,9 @@ Johannisstr. -> Friedrichstr.: Friedrichstr. (Stra
 Friedrichstr. -> Johannisstr.: Friedrichstr. (Stra�enbahn)	3 9236,13228 9245,13162 9395,13160
 Oranienburger Str. -> Linienstr.: Oranienburger Str. (Stra�enbahnhaltestelle)	3 9215,13392 9281,13374 9607,13507
 Linienstr. -> Oranienburger Str.: Oranienburger Str. (Stra�enbahnhaltestelle)	3 9607,13507 9281,13374 9415,13315
+Fregestr. -> Saarstr.: Durchfahrt f�r Autofahrer per Poller gesperrt	3 5777,6628 5897,6799 5828,6839
+Fregestr. -> Fregestr.: Durchfahrt f�r Autofahrer per Poller gesperrt	3 5777,6628 5897,6799 5957,6889
+Saarstr. -> Fregestr.: Durchfahrt f�r Autofahrer per Poller gesperrt	3 5828,6839 5897,6799 5957,6889
+Fregestr. -> Fregestr.: Durchfahrt f�r Autofahrer per Poller gesperrt	3 5957,6889 5897,6799 5777,6628
+Fregestr. -> Saarstr.: Durchfahrt f�r Autofahrer per Poller gesperrt	3 5957,6889 5897,6799 5972,6756
+Saarstr. -> Fregestr.: Durchfahrt f�r Autofahrer per Poller gesperrt	3 5972,6756 5897,6799 5777,6628
diff --git a/data/gesperrt_car-orig b/data/gesperrt_car-orig
@@ -274,3 +274,4 @@ Gabelberger Str./Frankfurter Allee	3 14451,12396 14381,12205 14434,12196
 Mainzer Str./Frankfurter Allee	3nocross 14381,12205 14434,12196 14488,12189
 Friedrichstr. (Stra�enbahn)	3nocross 9215,13392 9236,13228 9245,13162 9251,13109
 Oranienburger Str. (Stra�enbahnhaltestelle)	3nocross 9215,13392 9281,13374 9415,13315
+Saarstr.: Durchfahrt f�r Autofahrer per Poller gesperrt	3nocross 5972,6756 5897,6799 5828,6839
diff --git a/data/handicap_s b/data/handicap_s
@@ -333,7 +333,7 @@ Sparrstr. - Triftstr.: Gehweg	q1 7303,15173 7241,15293
 Koloniewege: Bodenschwellen, Schranken	q1 -2434,17638 -2408,17716 -2114,17878 -2154,17917 -2419,17955 -2539,18109 -2728,18149
 (Am Hohenzollernkanal): Fu�g�nger	q2 4971,15263 4469,15711 4273,15740 4212,15787 4369,15950 4136,16023 4078,15961 4049,15776 3775,15768
 Gralsburgsteig: enge Stra�e	q1 2164,25190 2210,25251 2038,25531 1950,25763 1924,26013
-Bahnhofstr. (Friedenau): enge Stra�e	q1 6082,7066 6139,7070 6157,7117
+Bahnhofstr. (Friedenau): enge Stra�e	q1 6082,7066 6151,7078 6157,7117
 (Michelangelostr. - Stra�e 106): Kleingartenanlage	q2 13838,15113 14060,14986 14314,14841 14592,14682
 Hugo-Heimann-Str.: enge, leicht kurvige Stra�e	q1 14120,1991 14165,2106 14229,2177 14453,2087 14587,2032
 (Am Invalidenfriedhof - Scharnhorststr.): Radfahren verboten, Schieben	q4 8114,13921 8216,13987

diff --git a/data/handicap_s-orig b/data/handicap_s-orig
@@ -379,7 +379,7 @@ Koloniewege: Bodenschwellen, Schranken	q1 -2434,17638 -2408,17716 -2114,17878 -2
 #: by: Helmut Stockinger:
 Gralsburgsteig: enge Stra�e	q1 2164,25190 2210,25251 2038,25531 1950,25763 1924,26013
 #: by: Kathrin (jackelkathrin):
-Bahnhofstr. (Friedenau): enge Stra�e	q1 6082,7066 6139,7070 6157,7117
+Bahnhofstr. (Friedenau): enge Stra�e	q1 6082,7066 6151,7078 6157,7117
 #: by: (x)qusor:
 (Michelangelostr. - Stra�e 106): Kleingartenanlage	q2 13838,15113 14060,14986 14314,14841 14592,14682
 #: by: Andrea (techlin):

diff --git a/data/qualitaet_l b/data/qualitaet_l
@@ -1,8 +1,6 @@
+#: version: $Id: qualitaet_l-orig,v 4.88 2007/03/17 21:21:42 eserte Exp $
 #: title: Qualit�t von Stra�en in Brandenburg und weiterer Umgebung
-#: version: $Id: qualitaet_l-orig,v 4.87 2007/03/15 22:14:08 eserte Exp eserte $
 #:
-#: temporary vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-K 6315; (B188-Nennhausen); zw. Nennhausen u. Kotzen; schlechte Stra�e; 01.11.96-unbekannt	Q3 -50149,24689 -50048,24475 -49883,24097 -50010,23562 -50201,23411 -50255,22794 -50938,21256
 Basdorf: Kopfsteinpflaster, m��ig bis OK	Q1 11978,35333 12193,34683 12551,32765
 Strausberg Nord - Pr�tzel: sehr guter Asphalt	Q0 43584,20871 44596,21287 45545,21723 46072,21966 46782,22769 47585,23227 47712,23526 47671,23769 48104,24510 48904,25611 49255,26084 50022,26518
 Hohenfinow - Pr�tzel: OK, guter bis m��iger Asphalt	Q0 50022,26518 49854,27156 49959,28837 49853,29177 50051,30256 50180,30446 50612,30802 50956,31117 51091,31408 51223,31981 51268,32363 51220,32718 51481,32928 51786,33138 51790,33352 51490,34128 50900,34846 50268,35539 50284,35873 50089,36374 49928,36724 49820,37042 49871,37410 49858,37721 49757,37842 49693,38229 49452,38565 49179,38756 48887,39276 48150,40470 47401,41301 47381,41481 47375,41768 46093,43456 46094,43714 45812,43789 45706,43838 45691,43968 45553,44234 45497,44760 45287,45499