diff --git a/mw.pl b/mw.pl
old mode 100644
new mode 100755
index ddd8490..b98f5eb
--- a/mw.pl
+++ b/mw.pl
@@ -1,13 +1,10 @@
#
-# PERL mapweaver by gary68
+# PERL mapweaver by gary68 & atlas48
#
-#
-#
-#
-# Copyright (C) 2011, Gerhard Schwanz
+# Copyright(C)2011, Gerhard Schwanz
#
# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+# Free Software Foundation; either version 3 of the License, or(at your option)any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -15,170 +12,76 @@
# You should have received a copy of the GNU General Public License along with this program; if not, see
#
-
-
-# 0.03 20110614 -help
-# 0.03 20110614 square for nodes
-# 0.03 print prg name and version
-# 0.03 ruler
-# 0.04 ruler positions; ruler background; disc opacity correction; -debug; -verbose
-# 0.04 scale, colors and positions; header/footer
-# 0.04 triangle and diamond for nodes; labels and icons for nodes
-# 0.05 categories for config values
-# 0.06 drawArea; area rules; extended help, added valid object properties
-# 0.07 way labels; minsizearea implemented;
-# 0.08 added coastlines; problems with completeObjects! use option -cie
-# 0.09 oneways
-# 0.10 pagenumbers; rectangles; comments and empty lines in rule file; config in rule file
-# 0.10 coast lines fixed; auto bridge implemented
-# 0.11 area icons / patterns added; time; street directory; poi directory; pdf directoriy
-# 0.12 way shields
-# 0.13 routes, not yet working...
-# 0.14 route work
-# 0.15 routes working now - finetuning needed; bgbolor implemented; multipolygons
-# 0.16 size check for multipolygon areas; scale rule sizes (x:y)
-# 0.17 -forcenodes; projection in footer
-# 0.18 direxclude options and rule properties
-# 0.19 pagenumber bug solved
-# 0.20 legend
-# 0.21 legend in separate file
-# 0.22 help texts for object properties in rule file
-# 0.23 latex string sanitize
-# 0.24 labels for areas
-# 0.25 labels for multipolygons
-# 0.26 fix directory bugs
-# 0.27 way name substitution, if name is too long for way. incl. legend for map
-# 0.28 oceancolor bug fixed
-# 0.29 fonts/families
-# 0.30 -wns=5 now possible; way name substitutions in separate file
-# 0.31 getXXXrule bug fixed; wnsunique
-# 0.32 -targetSize
-# 0.33 -onewayautosize
-# 0.34 pbf support; halo; label transform; bold print of labels
-# 0.35 svg text creation bug fixed
-# 0.36 font size error wns corrected; box occupy; new place management
-# 0.37 -dirprg program to create directory; gpx support
-# 0.38 -gpxcolor; -gpxsize
-# 0.39 parameter bug dirprg fixed; sanitize bug fixed
-# 0.40 draw only items inside drawing area; check for undefined relation nodes, reduce errors
-# 0.41 fixed icon space occupy error; eliminated labels drawn outside map area
-# 0.42 fixed error with area label svg string
-# 0.43 check if areas (simple ways) are closed before drawing
-# 0.44 overpass options added
-# 0.45 utf-8 encoding error solved for overpass data
-# 0.46 out parameter fixed
-# 0.47 added srtm option
-# 0.48 shield error corrected
-
-
# TODO
# -different tempfilenames
-my $version = "0.48" ;
-my $programName = "mapweaver" ;
+my $version = "0.48";
+my $programName = "mapweaver";
-use strict ;
-use warnings ;
+use strict; use warnings;
+use OSM::osm;
-use OSM::osm ;
-use mwConfig ;
-use mwMap ;
-use mwRules ;
-use mwFile ;
-use mwNodes ;
-use mwWays ;
-use mwRelations ;
-use mwMulti ;
-use mwMisc ;
-use mwOccupy ;
-use mwGPX ;
+use mwConfig;
+use mwMap;
+use mwRules;
+use mwFile;
+use mwNodes;
+use mwWays;
+use mwRelations;
+use mwMulti;
+use mwMisc;
+use mwOccupy;
+use mwGPX;
-my $time0 = time() ;
+my $time0 = time();
+print "\n$programName $version by gary68\n\n";
-print "\n$programName $version by gary68\n\n" ;
+initConfig;
+getProgramOptions;
-initConfig() ;
+readConfigFile cv('ini');
-getProgramOptions() ;
-
-readConfigFile( cv('ini') ) ;
-
-if ( cv('help') eq "1" ) {
- printConfigDescriptions() ;
- printValidObjectProperties() ;
- die ("quit after help output\n") ;
+if(cv('help')eq "1"){ printConfigDescriptions;
+ printValidObjectProperties;
+ die "quit after help output\n";
}
+printConfig if cv('verbose');
+readRules;
-if ( cv('verbose') eq "1" ) {
- printConfig() ;
+if(cv('debug')eq "1"){ printNodeRules;
+ printWayRules;
+ printAreaRules;
+ printRouteRules;
}
+readFile;
+my $renderTime0 = time();
+adaptRuleSizes;
-readRules() ;
-
-if ( cv('debug') eq "1" ) {
- printNodeRules() ;
- printWayRules() ;
- printAreaRules() ;
- printRouteRules() ;
+unless(cv('multionly')){ processNodes;
+ createPoiDirectory()if cv('poi');
+ initOneways;
+ processWays;
+ createDirectory if cv('dir');
+ createDirPdf if cv('dirpdf');
+ processRoutes;
}
+processMultipolygons;
+createLegend if cv('legend');
+processPageNumbers if cv('pagenumbers');
+processRectanglesif if cv('rectangles');
+boxDrawOccupiedAreas if cv('test');
+processGPXFile if cv('gpx');
-readFile() ;
+writeMap;
-my $renderTime0 = time() ;
-
-adaptRuleSizes() ;
-
-if ( cv('multionly') eq "0" ) {
-
- processNodes() ;
-
- if ( cv('poi') eq "1") {
- createPoiDirectory() ;
- }
-
- initOneways() ;
- processWays() ;
-
- if ( cv('dir') eq "1") {
- createDirectory() ;
- }
-
- if ( cv('dirpdf') eq "1") {
- createDirPdf() ;
- }
-
- processRoutes() ;
-
-} # multionly
-
-processMultipolygons() ;
-
-
-if ( cv('legend') ne "0" ) { createLegend() ; }
-
-if ( cv('pagenumbers') ne "" ) { processPageNumbers() ; }
-if ( cv('rectangles') ne "" ) { processRectangles() ; }
-
-if ( cv ('test') eq "1") {
- boxDrawOccupiedAreas() ;
-}
-
-if ( cv ('gpx') ne "") {
- processGPXFile() ;
-}
-
-
-writeMap() ;
-
-my $renderTime1 = time() ;
-
-
-my ($paper, $x, $y) = fitsPaper () ; $x = int ($x*10) / 10 ; $y = int ($y*10) / 10 ;
-print "map ($x cm x $y cm) fits paper $paper\n\n" ;
-
-my $time1 = time() ;
-print "\nrender time (excluding all file operations) ", stringTimeSpent ($renderTime1-$renderTime0), "\n" ;
-print "\n$programName finished after ", stringTimeSpent ($time1-$time0), "\n\n" ;
+my $renderTime1 = time();
+my($paper, $x, $y)= fitsPaper();
+$x = int($x*10)/10;
+$y = int($y*10)/10;
+print "map($x cm x $y cm)fits paper $paper\n\n";
+my $time1 = time();
+print "\nrender time(excluding all file operations)", stringTimeSpent($renderTime1-$renderTime0), "\n";
+print "\n$programName finished after ", stringTimeSpent($time1-$time0), "\n\n";
diff --git a/mwCoastLines.pm b/mwCoastLines.pm
index 741c0cb..76d569a 100644
--- a/mwCoastLines.pm
+++ b/mwCoastLines.pm
@@ -1,13 +1,10 @@
#
# PERL mapweaver module by gary68
#
-#
-#
-#
-# Copyright (C) 2011, Gerhard Schwanz
+# Copyright(C)2011, Gerhard Schwanz
#
# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+# Free Software Foundation; either version 3 of the License, or(at your option)any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -16,402 +13,257 @@
#
-package mwCoastLines ;
+package mwCoastLines;
+use strict; use warnings;
+use Math::Polygon; use List::Util qw[min max];
-use strict ;
-use warnings ;
-use Math::Polygon ;
-use List::Util qw[min max] ;
-
-use mwMap ;
-use mwFile ;
-use mwConfig ;
-use mwMisc ;
+use mwMap;
+use mwFile;
+use mwConfig;
+use mwMisc;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-require Exporter ;
+require Exporter;
-@ISA = qw ( Exporter AutoLoader ) ;
+@ISA = qw(Exporter AutoLoader);
-@EXPORT = qw ( processCoastLines
+@EXPORT = qw(processCoastLines
- ) ;
+ );
-sub nearestPoint {
-#
+sub nearestPoint{#
# accepts x/y coordinates and returns nearest point on border of map to complete cut coast ways
#
- my $ref = shift ;
- my $x = $ref->[0] ;
- my $y = $ref->[1] ;
- my $xn ; my $yn ;
- my $min = 99999 ;
- # print " NP: initial $x $y\n" ;
- my ($xmax, $ymax) = getDimensions() ;
- # print " NP: dimensions $xmax $ymax\n" ;
- if ( abs ($xmax-$x) < $min) { # right
- $xn = $xmax ;
- $yn = $y ;
- $min = abs ($xmax-$x) ;
- }
- if ( abs ($ymax-$y) < $min) { # bottom
- $xn = $x ;
- $yn = $ymax ;
- $min = abs ($ymax-$y) ;
- }
- if ( abs ($x) < $min) { # left
- $xn = 0 ;
- $yn = $y ;
- $min = abs ($x) ;
- }
- if ( abs ($y) < $min) { # top
- $xn = $x ;
- $yn = 0 ;
- }
- # print " NP: final $xn $yn\n" ;
- my @a = ($xn, $yn) ;
- return (\@a) ;
-}
-
-
-
-sub nextPointOnBorder {
-#
+ my $ref = shift;
+ my $x = $ref->[0];
+ my $y = $ref->[1];
+ my $xn; my $yn;
+ my $min = 99999;
+ # print " NP: initial $x $y\n";
+ my($xmax, $ymax)= getDimensions();
+ # print " NP: dimensions $xmax $ymax\n";
+ if(abs($xmax-$x)<$min){# right
+ $xn = $xmax;
+ $yn = $y;
+ $min = abs($xmax-$x);
+} if(abs($ymax-$y)<$min){# bottom
+ $xn = $x;
+ $yn = $ymax;
+ $min = abs($ymax-$y);
+} if(abs($x)<$min){# left
+ $xn = 0;
+ $yn = $y;
+ $min = abs($x);
+} if(abs($y)< $min){# top
+ $xn = $x;
+ $yn = 0;
+} # print " NP: final $xn $yn\n";
+ my @a =($xn, $yn);
+ return \@a;
+}sub nextPointOnBorder{#
# accepts x/y coordinates and returns next point on border - to complete coast rings with other polygons and corner points
# hints if returned point is a corner
#
# right turns
- my ($x, $y) = @_ ;
- my ($xn, $yn) ;
- my $corner = 0 ;
- my ($xmax, $ymax) = getDimensions() ;
- if ($x == $xmax) { # right border
- if ($y < $ymax) {
- $xn = $xmax ; $yn = $y + 1 ;
- }
- else {
- $xn = $xmax - 1 ; $yn = $ymax ;
- }
- }
- else {
- if ($x == 0) { # left border
- if ($y > 0) {
- $xn = 0 ; $yn = $y - 1 ;
- }
- else {
- $xn = 1 ; $yn = 0 ;
- }
- }
- else {
- if ($y == $ymax) { # bottom border
- if ($x > 0) {
- $xn = $x - 1 ; $yn = $ymax ;
- }
- else {
- $xn = 0 ; $yn = $ymax - 1 ;
- }
- }
- else {
- if ($y == 0) { # top border
- if ($x < $xmax) {
- $xn = $x + 1 ; $yn = 0 ;
- }
- else {
- $xn = $xmax ; $yn = 1 ;
- }
- }
- }
- }
- }
- # print "NPOB: $x, $y --- finito $xn $yn\n" ;
+ my($x, $y)= @_;
+ my($xn, $yn);
+ my $corner = 0;
+ my($xmax, $ymax)= getDimensions();
+ if($x == $xmax){# right border
+ if($y < $ymax){ $xn = $xmax; $yn = $y + 1;
+ } else{ $xn = $xmax - 1; $yn = $ymax;
+ }} else{ if($x == 0){# left border
+ if($y > 0){ $xn = 0; $yn = $y - 1;
+ } else{ $xn = 1; $yn = 0;
+ } } else{ if($y == $ymax){# bottom border
+ if($x > 0){ $xn = $x - 1; $yn = $ymax;
+ } else{ $xn = 0; $yn = $ymax - 1;
+ } } else{ if($y == 0){# top border
+ if($x < $xmax){ $xn = $x + 1; $yn = 0;
+ } else{ $xn = $xmax; $yn = 1;
+ } } } }} # print "NPOB: $x, $y --- finito $xn $yn\n";
- if ( ($xn == 0) and ($yn == 0) ) { $corner = 1 ; }
- if ( ($xn == 0) and ($yn == $ymax) ) { $corner = 1 ; }
- if ( ($xn == $xmax) and ($yn == 0) ) { $corner = 1 ; }
- if ( ($xn == $xmax) and ($yn == $ymax) ) { $corner = 1 ; }
-
- return ($xn, $yn, $corner) ;
+ if(($xn == 0)and($yn == 0)){$corner = 1;} if(($xn == 0)and($yn == $ymax)){$corner = 1;} if(($xn == $xmax)and($yn == 0)){$corner = 1;} if(($xn == $xmax)and($yn == $ymax)){$corner = 1;}
+ return($xn, $yn, $corner);
}
-
# ---------------------------------------------------------------------------------
-sub processCoastLines {
-#
-#
-#
- print "check and process coastlines...\n" ;
+sub processCoastLines{ print "check and process coastlines...\n";
- my $ref = shift ; # ref to all coast ways
- my @allWays = @$ref ;
+ my $ref = shift; # ref to all coast ways
+ my @allWays = @$ref;
- if (cv('debug') eq "1") {
- print "COAST: " . scalar (@allWays) . " coast ways initially found.\n" ;
- print "COAST: ways: @allWays\n\n" ;
- }
+ if(cv('debug')){
+ print "COAST: " . scalar(@allWays). " coast ways initially found.\n";
+ print "COAST: ways: @allWays\n\n";
+}
-
- my ($lonRef, $latRef) = getNodePointers() ;
- my ($nodesRef, $tagRef) = getWayPointers() ;
+ my($lonRef, $latRef)= getNodePointers();
+ my($nodesRef, $tagRef)= getWayPointers();
# check coast ways. eliminate invisible ways. eliminate points outside map.
- my @newWays = () ;
- foreach my $w ( @allWays ) {
- my @nodes = @{ $$nodesRef{ $w } } ;
+ my @newWays =();
+ foreach my $w(@allWays){ my @nodes = @{$$nodesRef{$w}};
- my $allIn = 1 ;
- my $allOut = 1 ;
- foreach my $n ( @nodes ) {
- if ( pointInMap ($n) ) {
- $allOut = 0 ;
- }
- else {
- $allIn = 0 ;
- }
- }
-
- if ( $allIn ) {
- # use way as it is
- push @newWays, $w ;
- if ( cv ('debug') eq "1" ) { print "COAST: way $w will be used unmodified.\n" ; }
- }
- elsif ( $allOut) {
- # do nothing
- if ( cv ('debug') eq "1" ) { print "COAST: way $w will NOT be used. outside map.\n" ; }
- }
- else {
- # eliminate all outside nodes at start and end of way, then use new way
+ my $allIn = 1;
+ my $allOut = 1;
+ foreach my $n(@nodes){ if(pointInMap($n)){ $allOut = 0;
+ } else{ $allIn = 0;
+ } }
+ if($allIn){ # use way as it is
+ push @newWays, $w;
+ print "COAST: way $w will be used unmodified.\n" if cv('debug');
+ } elsif($allOut){ # do nothing
+ print "COAST: way $w will NOT be used. outside map.\n" if cv('debug');} } else{ # eliminate all outside nodes at start and end of way, then use new way
# eliminate outsides at start
- while ( (scalar @nodes >= 1) and ( ! pointInMap ($nodes[0]) ) ) {
- shift @nodes ;
- }
-
+ shift @nodes while((scalar(@nodes)>= 1)and not pointInMap($nodes[0]));
# eliminate outsides at end
- while ( (scalar @nodes >= 1) and ( ! pointInMap ($nodes[-1]) ) ) {
- pop @nodes ;
- }
-
- if ( scalar @nodes >= 2 ) {
- @{ $$nodesRef{$w}} = @nodes ;
- push @newWays, $w ;
- if ( cv ('debug') eq "1" ) { print "COAST: modified way $w will be used.\n" ; }
- }
- else {
- if ( cv ('debug') eq "1" ) { print "COAST: way $w too short now.\n" ; }
- }
-
- }
-
- }
-
- @allWays = @newWays ;
-
-
-
- if (cv('debug') eq "1") {
- print "\nCOAST: " . scalar (@allWays) . " coast ways will be used.\n" ;
- print "COAST: ways: @allWays\n\n" ;
- }
-
- if (scalar @allWays > 0) {
- # build rings
- my ($refWays, $refNodes) = buildRings (\@allWays, 0) ;
- my @ringNodes = @$refNodes ; # contains all nodes of rings // array of arrays !
- if (cv('debug') eq "1") { print "COAST: " . scalar (@ringNodes) . " rings found.\n" ; }
+ while((scalar @nodes >= 1)and not pointInMap($nodes[-1])){ pop @nodes;
+ }
+ if(scalar @nodes >= 2){ @{$$nodesRef{$w}}= @nodes;
+ push @newWays, $w;
+ if(cv('debug')eq "1"){print "COAST: modified way $w will be used.\n";} } else{ if(cv('debug')eq "1"){print "COAST: way $w too short now.\n";} } }
+}
+ @allWays = @newWays;
+ if(cv('debug')eq "1"){
+ print "\nCOAST: " . scalar(@allWays). " coast ways will be used.\n";
+ print "COAST: ways: @allWays\n\n";
+}
+ if(scalar @allWays > 0){ # build rings
+ my($refWays, $refNodes)= buildRings(\@allWays, 0);
+ my @ringNodes = @$refNodes; # contains all nodes of rings // array of arrays !
+ print "COAST: " . scalar(@ringNodes). " rings found.\n" if cv('debug');
# convert rings to coordinate system
- my @ringCoordsOpen = () ; my @ringCoordsClosed = () ;
- for (my $i=0; $i<=$#ringNodes; $i++) {
- # print "COAST: initial ring $i\n" ;
- my @actualCoords = () ;
- foreach my $node (@{$ringNodes[$i]}) {
- push @actualCoords, [convert ($$lonRef{$node}, $$latRef{$node})] ;
- }
- if (${$ringNodes[$i]}[0] == ${$ringNodes[$i]}[-1]) {
- push @ringCoordsClosed, [@actualCoords] ; # islands
- }
- else {
- push @ringCoordsOpen, [@actualCoords] ;
- }
- # printRingCoords (\@actualCoords) ;
- my $num = scalar @actualCoords ;
- if (cv('debug') eq "1") { print "COAST: initial ring $i - $actualCoords[0]->[0],$actualCoords[0]->[1] -->> $actualCoords[-1]->[0],$actualCoords[-1]->[1] nodes: $num\n" ; }
- }
-
- if (cv('debug') eq "1") { print "COAST: add points on border...\n" ; }
- foreach my $ring (@ringCoordsOpen) {
- # print "COAST: ring $ring with border nodes\n" ;
+ my @ringCoordsOpen =(); my @ringCoordsClosed =();
+ for(my $i=0; $i<=$#ringNodes; $i++){ # print "COAST: initial ring $i\n";
+ my @actualCoords =();
+ foreach my $node(@{$ringNodes[$i]}){ push @actualCoords, [convert($$lonRef{$node}, $$latRef{$node})];
+ } if(${$ringNodes[$i]}[0] == ${$ringNodes[$i]}[-1]){ push @ringCoordsClosed, [@actualCoords]; # islands
+ } else{ push @ringCoordsOpen, [@actualCoords];
+ } # printRingCoords(\@actualCoords);
+ my $num = scalar @actualCoords;
+ print "COAST: initial ring $i - $actualCoords[0]->[0],$actualCoords[0]->[1] -->> $actualCoords[-1]->[0],$actualCoords[-1]->[1] nodes: $num\n" if cv('debug');
+ }
+ if(cv('debug')eq "1"){print "COAST: add points on border...\n";} foreach my $ring(@ringCoordsOpen){ # print "COAST: ring $ring with border nodes\n";
# add first point on border
- my $ref = nearestPoint ($ring->[0]) ;
- my @a = @$ref ;
- unshift @$ring, [@a] ;
+ my $ref = nearestPoint($ring->[0]);
+ my @a = @$ref;
+ unshift @$ring, [@a];
# add last point on border
- $ref = nearestPoint ($ring->[-1]) ;
- @a = @$ref ;
- push @$ring, [@a] ;
- # printRingCoords ($ring) ;
- }
-
- my @islandRings = @ringCoordsClosed ;
- if (cv('debug') eq "1") { print "COAST: " . scalar (@islandRings) . " islands found.\n" ; }
- @ringCoordsClosed = () ;
+ $ref = nearestPoint($ring->[-1]);
+ @a = @$ref;
+ push @$ring, [@a];
+ # printRingCoords($ring);
+ }
+ my @islandRings = @ringCoordsClosed;
+ print "COAST: " . scalar(@islandRings). " islands found.\n" if cv('debug');
+ @ringCoordsClosed =();
# process ringCoordsOpen
# add other rings, corners...
- while (scalar @ringCoordsOpen > 0) { # as long as there are open rings
- if (cv('debug') eq "1") { print "COAST: building ring...\n" ; }
- my $ref = shift @ringCoordsOpen ; # get start ring
- my @actualRing = @$ref ;
+ while(scalar @ringCoordsOpen > 0){# as long as there are open rings
+ print "COAST: building ring...\n" if(cv('debug');
+ my $ref = shift @ringCoordsOpen; # get start ring
+ my @actualRing = @$ref;
- my $closed = 0 ; # mark as not closed
- my $actualX = $actualRing[-1]->[0] ;
- my $actualY = $actualRing[-1]->[1] ;
+ my $closed = 0; # mark as not closed
+ my $actualX = $actualRing[-1]->[0];
+ my $actualY = $actualRing[-1]->[1];
- my $actualStartX = $actualRing[0]->[0] ;
- my $actualStartY = $actualRing[0]->[1] ;
+ my $actualStartX = $actualRing[0]->[0];
+ my $actualStartY = $actualRing[0]->[1];
- if (cv('debug') eq "1") { print "COAST: actual and actualStart $actualX, $actualY - $actualStartX, $actualStartY\n" ; }
+ print "COAST: actual and actualStart $actualX, $actualY - $actualStartX, $actualStartY\n" if cv('debug');
- my $corner ;
- while (!$closed) { # as long as this ring is not closed
- ($actualX, $actualY, $corner) = nextPointOnBorder ($actualX, $actualY) ;
- # print " actual $actualX, $actualY\n" ;
- my $startFromOtherPolygon = -1 ;
+ my $corner;
+ while(!$closed){# as long as this ring is not closed
+ ($actualX, $actualY, $corner)= nextPointOnBorder($actualX, $actualY);
+ # print " actual $actualX, $actualY\n";
+ my $startFromOtherPolygon = -1;
# find matching ring if there is another ring
- if (scalar @ringCoordsOpen > 0) {
- for (my $i=0; $i <= $#ringCoordsOpen; $i++) {
- my @test = @{$ringCoordsOpen[$i]} ;
- # print " test ring $i: ", $test[0]->[0], " " , $test[0]->[1] , "\n" ;
- if ( ($actualX == $test[0]->[0]) and ($actualY == $test[0]->[1]) ) {
- $startFromOtherPolygon = $i ;
- if (cv('debug') eq "1") { print "COAST: matching start other polygon found i= $i\n" ; }
- }
- }
- }
- # process matching polygon, if present
- if ($startFromOtherPolygon != -1) { # start from other polygon {
- # append nodes
- # print "ARRAY TO PUSH: @{$ringCoordsOpen[$startFromOtherPolygon]}\n" ;
- push @actualRing, @{$ringCoordsOpen[$startFromOtherPolygon]} ;
+ if(scalar(@ringCoordsOpen)> 0){ for(my $i=0; $i <= $#ringCoordsOpen; $i++){ my @test = @{$ringCoordsOpen[$i]};
+ # print " test ring $i: ", $test[0]->[0], " " , $test[0]->[1] , "\n";
+ if(($actualX == $test[0]->[0])and($actualY == $test[0]->[1])){ $startFromOtherPolygon = $i;
+ print "COAST: matching start other polygon found i= $i\n" if cv('debug');
+ } } } # process matching polygon, if present
+ if($startFromOtherPolygon != -1){# start from other polygon{ # append nodes
+ # print "ARRAY TO PUSH: @{$ringCoordsOpen[$startFromOtherPolygon]}\n";
+ push @actualRing, @{$ringCoordsOpen[$startFromOtherPolygon]};
# set actual
- $actualX = $actualRing[-1]->[0] ;
- $actualY = $actualRing[-1]->[1] ;
+ $actualX = $actualRing[-1]->[0];
+ $actualY = $actualRing[-1]->[1];
# drop p2 from opens
- splice @ringCoordsOpen, $startFromOtherPolygon, 1 ;
- if (cv('debug') eq "1") { print "COAST: openring $startFromOtherPolygon added to actual ring\n" ; }
- }
- else {
- if ($corner) { # add corner to actual ring
- push @actualRing, [$actualX, $actualY] ;
- if (cv('debug') eq "1") { print "COAST: corner $actualX, $actualY added to actual ring\n" ; }
- }
- }
- # check if closed
- if ( ($actualX == $actualStartX) and ($actualY == $actualStartY) ) {
- $closed = 1 ;
- push @actualRing, [$actualX, $actualY] ;
- push @ringCoordsClosed, [@actualRing] ;
- if (cv('debug') eq "1") { print "COAST: ring now closed and moved to closed rings.\n" ; }
- }
- } # !closed
- } # open rings
+ splice @ringCoordsOpen, $startFromOtherPolygon, 1;
+ print "COAST: openring $startFromOtherPolygon added to actual ring\n" if cv('debug');
+ } else{ if($corner){# add corner to actual ring
+ push @actualRing, [$actualX, $actualY];
+ print "COAST: corner $actualX, $actualY added to actual ring\n" if cv('debug');
+ } } # check if closed
+ if(($actualX == $actualStartX)and($actualY == $actualStartY)){ $closed = 1;
+ push @actualRing, [$actualX, $actualY];
+ push @ringCoordsClosed, [@actualRing];
+ print "COAST: ring now closed and moved to closed rings.\n" if cv('debug');
+ } }# !closed
+ }# open rings
- my $color = cv('oceancolor') ;
+ my $color = cv('oceancolor');
# build islandRings polygons
- if (cv('debug') eq "1") { print "OCEAN: building island polygons\n" ; }
- my @islandPolygons = () ;
- if (scalar @islandRings > 0) {
- for (my $i=0; $i<=$#islandRings; $i++) {
- my @poly = () ;
- foreach my $node ( @{$islandRings[$i]} ) {
- push @poly, [$node->[0], $node->[1]] ;
- }
- my ($p) = Math::Polygon->new(@poly) ;
- $islandPolygons[$i] = $p ;
- }
- }
-
+ print "OCEAN: building island polygons\n" if cv('debug');
+ my @islandPolygons =();
+ if(scalar @islandRings > 0){ for(my $i=0; $i<=$#islandRings; $i++){ my @poly =();
+ foreach my $node(@{$islandRings[$i]}){ push @poly, [$node->[0], $node->[1]];
+ } my($p)= Math::Polygon->new(@poly);
+ $islandPolygons[$i] = $p;
+ } }
# build ocean ring polygons
- if (cv('debug') eq "1") { print "OCEAN: building ocean polygons\n" ; }
- my @oceanPolygons = () ;
- if (scalar @ringCoordsClosed > 0) {
- for (my $i=0; $i<=$#ringCoordsClosed; $i++) {
- my @poly = () ;
- foreach my $node ( @{$ringCoordsClosed[$i]} ) {
- push @poly, [$node->[0], $node->[1]] ;
- }
- my ($p) = Math::Polygon->new(@poly) ;
- $oceanPolygons[$i] = $p ;
- }
- }
- else {
- if (scalar @islandRings > 0) {
- if (cv('debug') eq "1") { print "OCEAN: build ocean rect\n" ; }
- my @ocean = () ;
- my ($x, $y) = getDimensions() ;
- push @ocean, [0,0], [$x,0], [$x,$y], [0,$y], [0,0] ;
- push @ringCoordsClosed, [@ocean] ;
- my ($p) = Math::Polygon->new(@ocean) ;
- push @oceanPolygons, $p ;
- }
- }
-
+ if(cv('debug')eq "1"){print "OCEAN: building ocean polygons\n";} my @oceanPolygons =();
+ if(scalar(@ringCoordsClosed)> 0){ for(my $i=0; $i<=$#ringCoordsClosed; $i++){ my @poly =();
+ foreach my $node(@{$ringCoordsClosed[$i]}){ push @poly, [$node->[0], $node->[1]];
+ } my($p)= Math::Polygon->new(@poly);
+ $oceanPolygons[$i] = $p;
+ } } else{ if(scalar(@islandRings)> 0){ if(cv('debug')eq "1"){print "OCEAN: build ocean rect\n";} my @ocean =();
+ my($x, $y)= getDimensions();
+ push @ocean, [0,0], [$x,0], [$x,$y], [0,$y], [0,0];
+ push @ringCoordsClosed, [@ocean];
+ my($p)= Math::Polygon->new(@ocean);
+ push @oceanPolygons, $p;
+ } }
# finally create pathes for SVG
- for (my $i=0; $i<=$#ringCoordsClosed; $i++) {
- # foreach my $ring (@ringCoordsClosed) {
- my @ring = @{$ringCoordsClosed[$i]} ;
- my @array = () ;
- my @coords = () ;
- foreach my $c (@ring) {
- push @coords, $c->[0], $c->[1] ;
- }
- push @array, [@coords] ;
- if (scalar @islandRings > 0) {
- for (my $j=0; $j<=$#islandRings; $j++) {
- # island in ring? 1:1 and coast on border?
- # if (isIn ($islandPolygons[$j], $oceanPolygons[$i]) == 1) {
- if ( (isIn ($islandPolygons[$j], $oceanPolygons[$i]) == 1) or
- ( (scalar @islandRings == 1) and (scalar @ringCoordsClosed == 1) ) ) {
- if (cv('debug') eq "1") { print "OCEAN: island $j in ocean $i\n" ; }
- my @coords = () ;
- foreach my $c (@{$islandRings[$j]}) {
- push @coords, $c->[0], $c->[1] ;
- }
- push @array, [@coords] ;
- }
- }
- }
+ for(my $i=0; $i<=$#ringCoordsClosed; $i++){ # foreach my $ring(@ringCoordsClosed){ my @ring = @{$ringCoordsClosed[$i]};
+ my @array =();
+ my @coords =();
+ foreach my $c(@ring){ push @coords, $c->[0], $c->[1];
+ } push @array, [@coords];
+ if(scalar @islandRings > 0){ for(my $j=0; $j<=$#islandRings; $j++){ # island in ring? 1:1 and coast on border?
+ # if(isIn($islandPolygons[$j], $oceanPolygons[$i])== 1){ if((isIn($islandPolygons[$j], $oceanPolygons[$i])== 1)or
+ ((scalar @islandRings == 1)and(scalar @ringCoordsClosed == 1))){ if(cv('debug')eq "1"){print "OCEAN: island $j in ocean $i\n";} my @coords =();
+ foreach my $c(@{$islandRings[$j]}){ push @coords, $c->[0], $c->[1];
+ } push @array, [@coords];
+ } } }
+ # drawAreaOcean($color, \@array);
+ my $svgText = "fill=\"$color\" ";
+ drawArea($svgText, "none", \@array, 0, "base");
- # drawAreaOcean ($color, \@array) ;
- my $svgText = "fill=\"$color\" " ;
- drawArea($svgText, "none", \@array, 0, "base") ;
+ }}}
+sub pointInMap{ my($n)= shift;
+ my($sizeX, $sizeY)= getDimensions();
+ my($lonRef, $latRef)= getNodePointers();
- }
- }
+ my($x, $y)= convert($$lonRef{$n}, $$latRef{$n});
+
+ my $ok = 0;
+ if(($x >= 0)and
+($x <= $sizeX)and
+($y >= 0)and
+($y <= $sizeY)){ $ok = 1;
+} return $ok;
}
-
-sub pointInMap {
- my ($n) = shift ;
- my ($sizeX, $sizeY) = getDimensions() ;
- my ($lonRef, $latRef) = getNodePointers() ;
-
- my ($x, $y) = convert ($$lonRef{$n}, $$latRef{$n}) ;
-
- my $ok = 0 ;
- if (
- ( $x >= 0 ) and
- ( $x <= $sizeX ) and
- ( $y >= 0 ) and
- ( $y <= $sizeY ) ) {
- $ok = 1 ;
- }
- return $ok ;
-}
-
-1 ;
+1;
diff --git a/mwConfig.pm b/mwConfig.pm
index 01daa5e..a7a177d 100644
--- a/mwConfig.pm
+++ b/mwConfig.pm
@@ -1,13 +1,10 @@
#
# PERL mapweaver module by gary68
#
-#
-#
-#
-# Copyright (C) 2011, Gerhard Schwanz
+# Copyright(C)2011, Gerhard Schwanz
#
# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+# Free Software Foundation; either version 3 of the License, or(at your option)any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -16,31 +13,30 @@
#
-package mwConfig ;
+package mwConfig;
-use strict ;
-use warnings ;
+use strict;
+use warnings;
-
-use Getopt::Long ;
+use Getopt::Long;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-require Exporter ;
+require Exporter;
-@ISA = qw ( Exporter AutoLoader ) ;
+@ISA = qw(Exporter AutoLoader);
-@EXPORT = qw ( cv
+@EXPORT = qw(cv
initConfig
readConfigFile
setConfigValue
printConfig
printConfigDescriptions
getProgramOptions
- ) ;
+ );
-my @initial = ( ["verbose",0, "print some more information (CLO)", "misc"],
- ["debug",0, "print debug information (CLO)", "misc"],
+my @initial =(["verbose",0, "print some more information(CLO)", "misc"],
+ ["debug",0, "print debug information(CLO)", "misc"],
["projection", "merc","Used projection", "map"],
["ellipsoid", "WGS84","Used ellipsoid", "map"],
@@ -93,69 +89,69 @@ my @initial = ( ["verbose",0, "print some more information (CLO)", "misc"],
["elementFont","","DON'T USE", "map"],
["elementFontFamily","sans-serif","default font family for map elements like title, scale, grid etc.", "map"],
- ["in","map.osm","osm in file (CLO)", "job"],
- ["srtm","","srtm in file (CLO)", "job"],
+ ["in","map.osm","osm in file(CLO)", "job"],
+ ["srtm","","srtm in file(CLO)", "job"],
- ["overpass",0,"use overpass servers to get data (CLO)", "job"],
- ["near","","search only near this name (when using overpass) (CLO)", "job"],
- ["overpassdistance",50000,"overpass distance for near search (CLO)", "job"],
- ["overpassserver","http://www.overpass-api.de/api/","overpass server address (CLO)", "job"],
+ ["overpass",0,"use overpass servers to get data(CLO)", "job"],
+ ["near","","search only near this name(when using overpass)(CLO)", "job"],
+ ["overpassdistance",50000,"overpass distance for near search(CLO)", "job"],
+ ["overpassserver","http://www.overpass-api.de/api/","overpass server address(CLO)", "job"],
- ["gpx","","gpx file to overlay (CLO)", "map"],
- ["gpxColor","black","color for gpx objects (CLO)", "map"],
- ["gpxSize",10,"base size of gpx objects (CLO)", "map"],
- ["ini","mwconfig.ini","file with configuration values (CLO)", "misc"],
- ["out","mapweaver.svg","svg output name (CLO)", "job"],
- ["style","mwStandardRules.txt","file with render rules (CLO)", "job"],
- ["svgname","mapweaver.svg","output file name for svg graphics (CLO)", "job"],
- ["size",2200,"size in pixels x axis, 300dpi (CLO)", "map"],
- ["maxTargetSize","","sizes w,h in cm [21,29.7] (CLO)", "map"],
- ["legend",0,"appearance and position of legend (CLO)", "map"],
- ["bgcolor","white","background color of map (CLO)", "map"],
- ["grid",0,"number of grid cells, 0 = no grid (CLO)", "map"],
- ["gridcolor","black","color of grid lines (CLO)", "map"],
- ["coords",0,"draw coordinate system (CLO)", "map"],
- ["coordsexp",-2,"size of grid cells, exp 10 (CLO)", "map"],
- ["coordscolor","black","color of coordinates grid lines (CLO)", "map"],
- ["clip",0," (CLO)", "job"],
- ["clipbbox",""," (CLO)", "job"],
- ["pad",0," (CLO)", "job"],
- ["ppc",6.5,"points per character (CLO)", "misc", "map"],
- ["pdf",0,"convert output to pdf (CLO)", "job"],
- ["png",0,"convert output to png (CLO)", "job"],
- ["pngdpi",115,"png resolution (CLO)", "job"],
- ["dir",0,"add directory (CLO)", "additional information"],
- ["dirprg","mwDir.pl","program to create directory (CLO)", "additional information"],
+ ["gpx","","gpx file to overlay(CLO)", "map"],
+ ["gpxColor","black","color for gpx objects(CLO)", "map"],
+ ["gpxSize",10,"base size of gpx objects(CLO)", "map"],
+ ["ini","mwconfig.ini","file with configuration values(CLO)", "misc"],
+ ["out","mapweaver.svg","svg output name(CLO)", "job"],
+ ["style","mwStandardRules.txt","file with render rules(CLO)", "job"],
+ ["svgname","mapweaver.svg","output file name for svg graphics(CLO)", "job"],
+ ["size",2200,"size in pixels x axis, 300dpi(CLO)", "map"],
+ ["maxTargetSize","","sizes w,h in cm [21,29.7](CLO)", "map"],
+ ["legend",0,"appearance and position of legend(CLO)", "map"],
+ ["bgcolor","white","background color of map(CLO)", "map"],
+ ["grid",0,"number of grid cells, 0 = no grid(CLO)", "map"],
+ ["gridcolor","black","color of grid lines(CLO)", "map"],
+ ["coords",0,"draw coordinate system(CLO)", "map"],
+ ["coordsexp",-2,"size of grid cells, exp 10(CLO)", "map"],
+ ["coordscolor","black","color of coordinates grid lines(CLO)", "map"],
+ ["clip",0,"(CLO)", "job"],
+ ["clipbbox","","(CLO)", "job"],
+ ["pad",0,"(CLO)", "job"],
+ ["ppc",6.5,"points per character(CLO)", "misc", "map"],
+ ["pdf",0,"convert output to pdf(CLO)", "job"],
+ ["png",0,"convert output to png(CLO)", "job"],
+ ["pngdpi",115,"png resolution(CLO)", "job"],
+ ["dir",0,"add directory(CLO)", "additional information"],
+ ["dirprg","mwDir.pl","program to create directory(CLO)", "additional information"],
["direxcludedefault", "no", "object default property for directory entries", "additional information"],
- ["poi",0,"add POI directory (CLO)", "additional information"],
- ["dirpdf",0,"create directory pdf (CLO)", "additional information"],
- ["dircolnum",2,"number of text columns for directory pdf (CLO)", "additional information"],
- ["dirtitle","Directory","title for directory (CLO)", "additional information"],
- ["tagstat",0,"print tag statistics (CLO)", "misc"],
- ["declutter",1," (CLO)", "map"],
- ["allowIconMove",0," (CLO)", "map"],
- ["forceNodes",0," (CLO)", "map"],
+ ["poi",0,"add POI directory(CLO)", "additional information"],
+ ["dirpdf",0,"create directory pdf(CLO)", "additional information"],
+ ["dircolnum",2,"number of text columns for directory pdf(CLO)", "additional information"],
+ ["dirtitle","Directory","title for directory(CLO)", "additional information"],
+ ["tagstat",0,"print tag statistics(CLO)", "misc"],
+ ["declutter",1,"(CLO)", "map"],
+ ["allowIconMove",0,"(CLO)", "map"],
+ ["forceNodes",0,"(CLO)", "map"],
["lineDist",10,"distance between text lines in pixels", "map"],
["maxCharPerLine",20,"maximum characters per line in node label", "map"],
- ["help",0,"prints help texts (CLO)", "misc"],
- ["oneways",0,"add oneway arrows (CLO)", "map"],
- ["onewayColor","white","color of oneway arrows (CLO)", "map"],
- ["onewaySize",20,"size of oneway arrows (CLO)", "map"],
+ ["help",0,"prints help texts(CLO)", "misc"],
+ ["oneways",0,"add oneway arrows(CLO)", "map"],
+ ["onewayColor","white","color of oneway arrows(CLO)", "map"],
+ ["onewaySize",20,"size of oneway arrows(CLO)", "map"],
["onewayAutoSize",0,"auto size oneway arrows accordind way size; factor 0..100; 0=NOT AUTO; else percent of way size(CLO)", "map"],
- ["autobridge",1,"automatically draw bridges and tunnels (CLO)", "map"],
+ ["autobridge",1,"automatically draw bridges and tunnels(CLO)", "map"],
["noLabel",0,"", "map"],
- ["place","","search for place name in osm file and create map (CLO)", "job"],
- ["placefile","","name of file containing only place information (CLO)", "job"],
- ["lonrad",2,"radius lon in km for place map (CLO)", "job"],
- ["latrad",2,"radius lat in km for place map (CLO)", "job"],
- ["ruler",0,"draw ruler; positions 1..4 (CLO)", "map"],
- ["rulercolor","black","color of ruler (CLO)", "map"],
- ["rulerbackground","none","background of ruler, none=transparent (CLO)", "map"],
- ["scale",0,"draw scale; positions 1..4 (CLO)", "map"],
- ["scalecolor","black","color of scale (CLO)", "map"],
- ["scalebackground","none","color of scale background; none=transparent (CLO)", "map"],
- ["scaleset",0,"set scale of map (i.e. 10000) (CLO)", "map"],
- ["rulescaleset",0,"set assumed scale for rules (CLO)", "map"],
+ ["place","","search for place name in osm file and create map(CLO)", "job"],
+ ["placefile","","name of file containing only place information(CLO)", "job"],
+ ["lonrad",2,"radius lon in km for place map(CLO)", "job"],
+ ["latrad",2,"radius lat in km for place map(CLO)", "job"],
+ ["ruler",0,"draw ruler; positions 1..4(CLO)", "map"],
+ ["rulercolor","black","color of ruler(CLO)", "map"],
+ ["rulerbackground","none","background of ruler, none=transparent(CLO)", "map"],
+ ["scale",0,"draw scale; positions 1..4(CLO)", "map"],
+ ["scalecolor","black","color of scale(CLO)", "map"],
+ ["scalebackground","none","color of scale background; none=transparent(CLO)", "map"],
+ ["scaleset",0,"set scale of map(i.e. 10000)(CLO)", "map"],
+ ["rulescaleset",0,"set assumed scale for rules(CLO)", "map"],
["routelabelcolor","black","", "routes"],
["routelabelsize",20,"", "routes"],
["routelabelfontfamily","sans-serif","font-family for route labels", "routes"],
@@ -164,136 +160,86 @@ my @initial = ( ["verbose",0, "print some more information (CLO)", "misc"],
["routeicondist",70,"", "routes"],
["routeiconscale",1,"", "routes"],
["routeicondir","./routeicons","", "routes"],
- ["poifile","","name of external POI file (CLO)", "job"],
- ["relid",0,"relation ID for hikingbook (CLO)", "misc"],
- ["rectangles","","draw rectangles for hikingbook (CLO)", "misc"],
- ["pagenumbers","","add page numbers to map (CLO)", "misc"],
- ["ra",0,"relation analyzer mode (CLO)", "misc"],
- ["multionly",0,"draw only multipolygons (CLO)", "misc"],
- ["test",0,"test feature (CLO)", "misc"],
- ["foot","mapweaver by gary68 - data by www.openstreetmap.org","text for footer (CLO)", "map"],
- ["footcolor","black","color for footer (CLO)", "map"],
- ["footbackground","none","background color for footer (CLO)", "map"],
- ["footsize",40,"font size for footer (CLO)", "map"],
- ["head","","text for header (CLO)", "map"],
- ["headcolor","black","color for header (CLO)", "map"],
- ["headbackground","none","background color for header (CLO)", "map"],
- ["headsize",40,"font size for header (CLO)", "map"],
+ ["poifile","","name of external POI file(CLO)", "job"],
+ ["relid",0,"relation ID for hikingbook(CLO)", "misc"],
+ ["rectangles","","draw rectangles for hikingbook(CLO)", "misc"],
+ ["pagenumbers","","add page numbers to map(CLO)", "misc"],
+ ["ra",0,"relation analyzer mode(CLO)", "misc"],
+ ["multionly",0,"draw only multipolygons(CLO)", "misc"],
+ ["test",0,"test feature(CLO)", "misc"],
+ ["foot","mapweaver by gary68 - data by www.openstreetmap.org","text for footer(CLO)", "map"],
+ ["footcolor","black","color for footer(CLO)", "map"],
+ ["footbackground","none","background color for footer(CLO)", "map"],
+ ["footsize",40,"font size for footer(CLO)", "map"],
+ ["head","","text for header(CLO)", "map"],
+ ["headcolor","black","color for header(CLO)", "map"],
+ ["headbackground","none","background color for header(CLO)", "map"],
+ ["headsize",40,"font size for header(CLO)", "map"],
- ["wns",0,"substitute unfitting way names by numbers; 0..4 1..4=positions in map; 5=file (CLO)", "map"],
+ ["wns",0,"substitute unfitting way names by numbers; 0..4 1..4=positions in map; 5=file(CLO)", "map"],
["wnssize",20,"size of labels in wns legend", "map"],
["wnscolor","black","color of labels in wns legend", "map"],
["wnsbgcolor","white","color of background of wns legend", "map"],
- ["wnsunique",0,"wns will label each way only once (CLO)", "map"],
+ ["wnsunique",0,"wns will label each way only once(CLO)", "map"],
["minAreaSize",400,"min size of area to be drawn on map", "map"],
["minAreaLabelSize",10000,"min size of area to be labeled on map", "map"],
- ["oceanColor","lightblue","color of ocean (CLO)", "map"],
- ["cIE",0,"osmosis clipIncompleteEntities instead of completeObjects (CLP)", "map"]
+ ["oceanColor","lightblue","color of ocean(CLO)", "map"],
+ ["cIE",0,"osmosis clipIncompleteEntities instead of completeObjects(CLP)", "map"]
- ) ;
+ );
-my %cv = () ;
-my %explanation = () ;
+my %cv =();
+my %explanation =();
# --------------------------------------------------------------------------------
-sub initConfig {
+sub initConfig{ # set initial values according to program internal values from array @initial
+ foreach my $kv(@initial){ $cv{lc($kv->[0])}= $kv->[1];
+ $explanation{lc($kv->[0])}= $kv->[2];
+}}
- # set initial values according to program internal values from array @initial
+sub setConfigValue{ # allows any module to change a certain k/v pair
+ my($k, $v)= @_;
- foreach my $kv (@initial) {
- $cv{ lc( $kv->[0] ) } = $kv->[1] ;
- $explanation{ lc( $kv->[0] ) } = $kv->[2] ;
- }
+ $k = lc($k);
+ $cv{$k}= $v;
+ if($cv{"verbose"}> 1){print "config key $k. value changed to $v\n";}}
+sub cv{ # access a value by key
+ my $k = shift;
+
+ $k = lc($k);
+ if(! defined $cv{$k}){print "WARNING: requested config key $k not defined!\n";} return($cv{$k});
}
+sub printConfig{ # print actual config to stdout
+ print "\nActual configuration\n";
-
-sub setConfigValue {
-
- # allows any module to change a certain k/v pair
-
- my ($k, $v) = @_ ;
-
- $k = lc ( $k ) ;
- $cv{$k} = $v ;
- if ($cv{"verbose"} > 1) { print "config key $k. value changed to $v\n" ; }
+ my %cats =();
+ foreach my $e(@initial){ $cats{$e->[3]}= 1;
}
-
-sub cv {
-
- # access a value by key
-
- my $k = shift ;
-
- $k = lc ( $k ) ;
- if ( ! defined $cv{ $k } ) { print "WARNING: requested config key $k not defined!\n" ; }
- return ( $cv{ $k } ) ;
+ foreach my $cat(sort keys %cats){ my @entries =();
+ foreach my $e(@initial){ if($e->[3] eq $cat){ push @entries, $e->[0];
+ } } print "\nCATEGORY $cat\n";
+ print "--------\n";
+ foreach my $e(sort{$a cmp $b}@entries){ printf "%-30s %-30s\n", $e, cv($e);
+ }} print "\n";
}
-
-sub printConfig {
-
- # print actual config to stdout
-
- print "\nActual configuration\n" ;
-
- my %cats = () ;
- foreach my $e (@initial) {
- $cats{ $e->[3] } = 1 ;
- }
-
- foreach my $cat (sort keys %cats) {
- my @entries = () ;
- foreach my $e (@initial) {
- if ($e->[3] eq $cat) {
- push @entries, $e->[0] ;
- }
- }
- print "\nCATEGORY $cat\n" ;
- print "--------\n" ;
- foreach my $e ( sort { $a cmp $b } @entries ) {
- printf "%-30s %-30s\n", $e, cv($e) ;
- }
- }
-
- print "\n" ;
-}
-
-sub readConfigFile {
-
- # read ini file; initial k/v pairs might be changed
-
- my $fileName = shift ;
- my $lc = 0 ;
+sub readConfigFile{ # read ini file; initial k/v pairs might be changed
+ my $fileName = shift;
+ my $lc = 0;
- print "reading config file $fileName\n" ;
+ print "reading config file $fileName\n";
- open (my $file, "<", $fileName) or die ("ERROR: could not open ini file $fileName\n") ;
- my $line = "" ;
- while ($line = <$file>) {
- $lc ++ ;
- if ( ! grep /^#/, $line) {
- my ($k, $v) = ( $line =~ /(.+?)=(.*)/ ) ;
- if ( ( ! defined $k ) or ( ! defined $v ) ) {
- print "WARNING: could not parse config line: $line" ;
- }
- else {
- $k = lc ( $k ) ;
- $cv{ $k } = $v ;
- }
- }
- }
- close ($file) ;
- print "$lc lines read.\n\n" ;
-}
-
-
-# ---------------------------------------------------------------------------------------
-
-sub getProgramOptions {
-
-
-my $optResult = GetOptions ( "in=s" => \$cv{'in'}, # the in file, mandatory
+ open(my $file, "<", $fileName)or die("ERROR: could not open ini file $fileName\n");
+ my $line = "";
+ while($line = <$file>){ $lc++;
+ unless(grep(/^#/, $line)){ my($k, $v)=($line =~ /(.+?)=(.*)/);
+ if((! defined $k)or(! defined $v)){ print "WARNING: could not parse config line: $line";
+ } else{ $k = lc($k);
+ $cv{$k}= $v;
+ } }} close $file;
+ print "$lc lines read.\n\n";
+}sub getProgramOptions{my $optResult = GetOptions("in=s" => \$cv{'in'}, # the in file, mandatory
"overpass" => \$cv{'overpass'},
"near:s" => \$cv{'near'},
"overpassdistance:i" => \$cv{'overpassdistance'},
@@ -377,28 +323,15 @@ my $optResult = GetOptions ( "in=s" => \$cv{'in'}, # the in file, mandatory
"debug" => \$cv{'debug'}, # turns debug messages on
"cie" => \$cv{'cie'}, # turns debug messages on
"verbose" => \$cv{'verbose'}, # turns twitter on
- "test" => \$cv{'test'} ) ; # test
-
-
+ "test" => \$cv{'test'}); # test
}
+sub printConfigDescriptions{ my @texts = @initial;
+ @texts = sort{$a->[0] cmp $b->[0]}@texts;
-sub printConfigDescriptions {
-
- my @texts = @initial ;
-
- @texts = sort {$a->[0] cmp $b->[0]} @texts ;
-
- print "\nconfig value descriptions\n\n" ;
- printf "%-25s %-50s %-20s\n" , "key" , "description", "default" ;
- foreach my $t (@texts) {
- my $def = $t->[1] ;
- if ($def eq "") { $def = "" ; }
- printf "%-25s %-50s %-20s\n" , $t->[0] , $t->[2], $def ;
- }
- print "\n" ;
-}
-
-
-1 ;
-
-
+ print "\nconfig value descriptions\n\n";
+ printf "%-25s %-50s %-20s\n" , "key" , "description", "default";
+ foreach my $t(@texts){ my $def = $t->[1];
+ $def = "" unless $def;
+ printf "%-25s %-50s %-20s\n" , $t->[0] , $t->[2], $def;
+} print "\n";
+}1;
diff --git a/mwDir.pl b/mwDir.pl
index a141104..db968f1 100755
--- a/mwDir.pl
+++ b/mwDir.pl
@@ -1,119 +1,119 @@
-use strict ;
-use warnings ;
+use strict;
+use warnings;
-use OSM::osm 8.3 ;
+use OSM::osm 8.3;
-my $version = "1.00" ;
+my $version = "1.00";
-my $streetFileName ;
-my $poiFileName ;
-my $pdfFileName ;
-my $texFileName ;
-my $titleText ;
-my $numColumns ;
+my $streetFileName;
+my $poiFileName;
+my $pdfFileName;
+my $texFileName;
+my $titleText;
+my $numColumns;
-my $streetFile ;
-my $poiFile ;
-my $texFile ;
+my $streetFile;
+my $poiFile;
+my $texFile;
-($streetFileName, $poiFileName, $titleText, $pdfFileName, $numColumns) = @ARGV ;
+($streetFileName, $poiFileName, $titleText, $pdfFileName, $numColumns)= @ARGV;
-print "mwDir.pl: $streetFileName, $poiFileName, $titleText, $pdfFileName, $numColumns\n" ;
+print "mwDir.pl: $streetFileName, $poiFileName, $titleText, $pdfFileName, $numColumns\n";
-$texFileName = $pdfFileName ;
-$texFileName =~ s/.pdf/.tex/ ;
+$texFileName = $pdfFileName;
+$texFileName =~ s/.pdf/.tex/;
-open ($texFile, ">", $texFileName) or die ("can't open tex output file") ;
-print $texFile "\\documentclass[a4paper,12pt]{book}\n" ;
-print $texFile "\\usepackage{multicol}\n" ;
-print $texFile "\\usepackage[utf8]{inputenc}\n" ;
-print $texFile "\\usepackage[top=2.5cm,bottom=2cm,left=3cm,right=2cm]{geometry}\n" ;
-print $texFile "\\columnsep7mm\n" ;
-print $texFile "\\begin{document}\n" ;
-print $texFile "\\section*{$titleText}\n" ;
-print $texFile "\n" ;
+open($texFile, ">", $texFileName)or die("can't open tex output file");
+print $texFile "\\documentclass[a4paper,12pt]{book}\n";
+print $texFile "\\usepackage{multicol}\n";
+print $texFile "\\usepackage[utf8]{inputenc}\n";
+print $texFile "\\usepackage[top=2.5cm,bottom=2cm,left=3cm,right=2cm]{geometry}\n";
+print $texFile "\\columnsep7mm\n";
+print $texFile "\\begin{document}\n";
+print $texFile "\\section*{$titleText}\n";
+print $texFile "\n";
-print $texFile "\\tiny\n" ;
-print $texFile "Data CC-BY-SA www.openstreetmap.org\n" ;
-print $texFile "\\normalsize\n\n" ;
+print $texFile "\\tiny\n";
+print $texFile "Data CC-BY-SA www.openstreetmap.org\n";
+print $texFile "\\normalsize\n\n";
# streets
-if ($streetFileName ne "none") {
- my $result = open ($streetFile, "<", $streetFileName) ;
- if ($result) {
- my $line ;
- print $texFile "\\begin{multicols}{$numColumns}[\\subsubsection*{Streets}]\n" ;
- print $texFile "\\tiny\n" ;
- while ($line = <$streetFile>) {
- $line = convertToLatex ($line) ;
- my (@entry) = split /\t/, $line ;
- print $texFile $entry[0] ;
- print $texFile " \\dotfill " ;
- print $texFile $entry[1], " \\\\\n" ;
- }
- close ($streetFile) ;
- print $texFile "\\normalsize\n" ;
- print $texFile "\\end{multicols}\n" ;
- }
- else {
- print "WARNING: street file $streetFile could not be opened." ;
- }
-}
+if($streetFileName ne "none"){
+ my $result = open($streetFile, "<", $streetFileName);
+ if($result){
+ my $line;
+ print $texFile "\\begin{multicols}{$numColumns}[\\subsubsection*{Streets}]\n";
+ print $texFile "\\tiny\n";
+ while($line = <$streetFile>){
+ $line = convertToLatex($line);
+ my(@entry)= split /\t/, $line;
+ print $texFile $entry[0];
+ print $texFile " \\dotfill ";
+ print $texFile $entry[1], " \\\\\n";
+ }
+ close($streetFile);
+ print $texFile "\\normalsize\n";
+ print $texFile "\\end{multicols}\n";
+}
+ else{
+ print "WARNING: street file $streetFile could not be opened.";
+}
+}
# POIs
-if ($poiFileName ne "none") {
- my $result = open ($poiFile, "<", $poiFileName) ;
- if ($result) {
- my $line ;
- print $texFile "\\begin{multicols}{$numColumns}[\\subsubsection*{Points of interest}]\n" ;
- print $texFile "\\tiny\n" ;
- while ($line = <$poiFile>) {
- $line = convertToLatex ($line) ;
- my @entry = split /\t/, $line ;
- print $texFile $entry[0] ;
- print $texFile " \\dotfill " ;
- print $texFile $entry[1], "\\\\\n" ;
- }
- close ($poiFile) ;
- print $texFile "\\normalsize\n" ;
- print $texFile "\\end{multicols}\n" ;
- }
- else {
- print "WARNING: POI file $poiFile could not be opened." ;
- }
-}
+if($poiFileName ne "none"){
+ my $result = open($poiFile, "<", $poiFileName);
+ if($result){
+ my $line;
+ print $texFile "\\begin{multicols}{$numColumns}[\\subsubsection*{Points of interest}]\n";
+ print $texFile "\\tiny\n";
+ while($line = <$poiFile>){
+ $line = convertToLatex($line);
+ my @entry = split /\t/, $line;
+ print $texFile $entry[0];
+ print $texFile " \\dotfill ";
+ print $texFile $entry[1], "\\\\\n";
+ }
+ close($poiFile);
+ print $texFile "\\normalsize\n";
+ print $texFile "\\end{multicols}\n";
+}
+ else{
+ print "WARNING: POI file $poiFile could not be opened.";
+}
+}
-print $texFile "\\end{document}\n" ;
-close ($texFile) ;
-print "directory tex file created.\n" ;
+print $texFile "\\end{document}\n";
+close($texFile);
+print "directory tex file created.\n";
-my $dviFileName = $pdfFileName ;
-$dviFileName =~ s/.pdf/.dvi/ ;
-my $psFileName = $pdfFileName ;
-$psFileName =~ s/.pdf/.ps/ ;
+my $dviFileName = $pdfFileName;
+$dviFileName =~ s/.pdf/.dvi/;
+my $psFileName = $pdfFileName;
+$psFileName =~ s/.pdf/.ps/;
-`latex $texFileName` ;
-print "directory dvi file created.\n" ;
-`dvips -D600 $dviFileName -o` ;
-print "directory ps file created.\n" ;
-`ps2pdf $psFileName $pdfFileName` ;
-print "directory pdf file created.\n" ;
-`rm *.dvi` ;
-`rm *.tex` ;
-`rm *.ps` ;
-`rm *.aux` ;
-`rm *.log` ;
-print "directory FINISHED.\n" ;
+`latex $texFileName`;
+print "directory dvi file created.\n";
+`dvips -D600 $dviFileName -o`;
+print "directory ps file created.\n";
+`ps2pdf $psFileName $pdfFileName`;
+print "directory pdf file created.\n";
+`rm *.dvi`;
+`rm *.tex`;
+`rm *.ps`;
+`rm *.aux`;
+`rm *.log`;
+print "directory FINISHED.\n";
diff --git a/mwFile.pm b/mwFile.pm
index 23bc85a..7fb9650 100644
--- a/mwFile.pm
+++ b/mwFile.pm
@@ -4,10 +4,10 @@
#
#
#
-# Copyright (C) 2011, Gerhard Schwanz
+# Copyright(C)2011, Gerhard Schwanz
#
# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+# Free Software Foundation; either version 3 of the License, or(at your option)any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -16,419 +16,305 @@
#
-package mwFile ;
+package mwFile;
-use strict ;
-use warnings ;
+use strict;
+use warnings;
-use mwConfig ;
-use mwMap ;
-use mwLabel ;
-use LWP::Simple ;
+use mwConfig;
+use mwMap;
+use mwLabel;
-use OSM::osm ;
+use LWP::Simple;
+use OSM::osm;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-require Exporter ;
+require Exporter;
-@ISA = qw ( Exporter AutoLoader ) ;
+@ISA = qw(Exporter AutoLoader);
-@EXPORT = qw ( readFile
+@EXPORT = qw(readFile
getNodePointers
getWayPointers
getRelationPointers
- ) ;
+ );
-my %lon ;
-my %lat ;
-my %memNodeTags ;
+my %lon;
+my %lat;
-my %memWayNodes ;
-my %memWayTags ;
+my %memNodeTags;
+my %memWayNodes;
+my %memWayTags;
+my %memRelationMembers;
+my %memRelationTags;
-my %memRelationMembers ;
-my %memRelationTags ;
-
-my $overpassSource0 = "interpreter?data=node%5B%22name%22%3D%22NAME%22%5D%3Bout%20body%3B%0A" ;
-my $overpassSource1 = "interpreter?data=node%5B%22name%22%3D%22NEAR%22%5D%3Bnode%28around%3ADIST%29%5B%22name%22%3D%22NAME%22%5D%3Bout%3B" ;
-my $overpassSource3 = "interpreter?data=%28node%28BOTTOM%2CLEFT%2CTOP%2CRIGHT%29%3B%3C%3B%3E%3B%29%3Bout%20meta%3B" ;
+my $overpassSource0 = "interpreter?data=node%5B%22name%22%3D%22NAME%22%5D%3Bout%20body%3B%0A";
+my $overpassSource1 = "interpreter?data=node%5B%22name%22%3D%22NEAR%22%5D%3Bnode%28around%3ADIST%29%5B%22name%22%3D%22NAME%22%5D%3Bout%3B";
+my $overpassSource3 = "interpreter?data=%28node%28BOTTOM%2CLEFT%2CTOP%2CRIGHT%29%3B%3C%3B%3E%3B%29%3Bout%20meta%3B";
-sub readFile {
-
- my ($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1, @nodeTags) ;
- my ($wayId, $wayUser, $aRef2, @wayTags, @wayNodes) ;
- my ($relationId, $relationUser, @relationTags, @relationMembers) ;
- my %invalidWays ;
+sub readFile{
+ my($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1, @nodeTags);
+ my($wayId, $wayUser, $aRef2, @wayTags, @wayNodes);
+ my($relationId, $relationUser, @relationTags, @relationMembers);
+ my %invalidWays;
- my $osmName ;
- if (defined cv('in')) { $osmName = cv('in') ; }
+ my $osmName;
+ if(defined cv('in')){$osmName = cv('in');}
+ my $clipbbox = "";
+ if(defined cv('clipbbox')){$clipbbox = cv('clipbbox');}
+ if(cv('overpass')eq "1"){ if(cv('place')eq ""){die("ERROR: option place not specified.\n");}
+ my $overpassNear = cv('near');
+ my $overpassDistance = cv('overpassdistance');
+ my $overpassName = cv('place');
+ my $overpassUrl1 = cv('overpassserver'). $overpassSource1;
- my $clipbbox = "" ;
- if (defined cv('clipbbox')) { $clipbbox = cv('clipbbox') ; }
-
- if ( cv('overpass') eq "1" ) {
- if ( cv('place') eq "" ) { die ("ERROR: option place not specified.\n") ; }
-
- my $overpassNear = cv('near') ;
- my $overpassDistance = cv('overpassdistance') ;
- my $overpassName = cv('place') ;
- my $overpassUrl1 = cv('overpassserver') . $overpassSource1 ;
-
- if ( cv('near') eq "" ) {
- $overpassUrl1 = cv('overpassserver') . $overpassSource0 ;
- }
-
- $overpassUrl1 =~ s/NEAR/$overpassNear/ ;
- $overpassUrl1 =~ s/DIST/$overpassDistance/ ;
- $overpassUrl1 =~ s/NAME/$overpassName/ ;
-
- if ( cv('debug') eq "1" ) { print "Overpass Query1: $overpassUrl1 ...\n" ; }
- print "Send Query 1 to overpass server..\n" ;
- my $result1 = get ( $overpassUrl1 ) ;
- if ( ! defined $result1 ) { die ("ERROR: bad overpass result!\n") ; }
-
- if ( cv('debug') eq "1" ) { print "\n$result1\n\n" ; }
+ if(cv('near')eq ""){ $overpassUrl1 = cv('overpassserver'). $overpassSource0;
+ }
+ $overpassUrl1 =~ s/NEAR/$overpassNear/;
+ $overpassUrl1 =~ s/DIST/$overpassDistance/;
+ $overpassUrl1 =~ s/NAME/$overpassName/;
+ if(cv('debug')eq "1"){print "Overpass Query1: $overpassUrl1 ...\n";} print "Send Query 1 to overpass server..\n";
+ my $result1 = get($overpassUrl1);
+ if(! defined $result1){die("ERROR: bad overpass result!\n");}
+ if(cv('debug')eq "1"){print "\n$result1\n\n";}
# get lon, lat
- my ($placeLon) = ( $result1 =~ /lon=\"([\d\.\-]+)/ ) ;
- my ($placeLat) = ( $result1 =~ /lat=\"([\d\.\-]+)/ ) ;
+ my($placeLon)=($result1 =~ /lon=\"([\d\.\-]+)/);
+ my($placeLat)=($result1 =~ /lat=\"([\d\.\-]+)/);
- if ((! defined $placeLon) or (! defined $placeLat)) { die ("ERROR: lon/lat could not be obtained from 1st overpass result.\n") ; }
-
- print "place $overpassName found:\n" ;
- print "lon= $placeLon\n" ;
- print "lat= $placeLat\n" ;
+ if((! defined $placeLon)or(! defined $placeLat)){die("ERROR: lon/lat could not be obtained from 1st overpass result.\n");}
+ print "place $overpassName found:\n";
+ print "lon= $placeLon\n";
+ print "lat= $placeLat\n";
# calc bbox
- my $overLeft = $placeLon - cv('lonrad')/(111.11 * cos ( $placeLat / 360 * 3.14 * 2 ) ) ;
- my $overRight = $placeLon + cv('lonrad')/(111.11 * cos ( $placeLat / 360 * 3.14 * 2 ) ) ;
- my $overTop = $placeLat + cv('latrad')/111.11 ;
- my $overBottom = $placeLat - cv('latrad')/111.11 ;
+ my $overLeft = $placeLon - cv('lonrad')/(111.11 * cos($placeLat / 360 * 3.14 * 2));
+ my $overRight = $placeLon + cv('lonrad')/(111.11 * cos($placeLat / 360 * 3.14 * 2));
+ my $overTop = $placeLat + cv('latrad')/111.11;
+ my $overBottom = $placeLat - cv('latrad')/111.11;
- my $overpassUrl2 = cv('overpassserver') . $overpassSource3 ;
- $overpassUrl2 =~ s/LEFT/$overLeft/ ;
- $overpassUrl2 =~ s/RIGHT/$overRight/ ;
- $overpassUrl2 =~ s/TOP/$overTop/ ;
- $overpassUrl2 =~ s/BOTTOM/$overBottom/ ;
+ my $overpassUrl2 = cv('overpassserver'). $overpassSource3;
+ $overpassUrl2 =~ s/LEFT/$overLeft/;
+ $overpassUrl2 =~ s/RIGHT/$overRight/;
+ $overpassUrl2 =~ s/TOP/$overTop/;
+ $overpassUrl2 =~ s/BOTTOM/$overBottom/;
- if ( cv('debug') eq "1" ) { print "Overpass Query2: $overpassUrl2\n" ; }
- print "Send Query 2 to overpass server..\n" ;
- my $result2 = get ( $overpassUrl2 ) ;
- if ( ! defined $result2 ) { die ("ERROR: bad overpass result!\n") ; }
-
+ if(cv('debug')eq "1"){print "Overpass Query2: $overpassUrl2\n";} print "Send Query 2 to overpass server..\n";
+ my $result2 = get($overpassUrl2);
+ if(! defined $result2){die("ERROR: bad overpass result!\n");}
# save
- my $opFileName = "overpass.osm" ;
- open (my $overFile, ">", $opFileName) ;
- binmode($overFile, ":utf8") ;
- print $overFile $result2 ;
- close ( $overFile ) ;
+ my $opFileName = "overpass.osm";
+ open(my $overFile, ">", $opFileName);
+ binmode($overFile, ":utf8");
+ print $overFile $result2;
+ close($overFile);
- setConfigValue ('in', $opFileName) ;
- $osmName = $opFileName ;
- # setConfigValue ('place', '') ;
+ setConfigValue('in', $opFileName);
+ $osmName = $opFileName;
+ # setConfigValue('place', '');
- $clipbbox = "$overLeft,$overBottom,$overRight,$overTop" ;
- if ( cv('debug') eq "1" ) { print "clipbox: $clipbbox\n" ; }
- }
-
- if ( grep /\.pbf/, $osmName ) {
- my $newName = $osmName ;
- $newName =~ s/\.pbf/\.osm/i ;
+ $clipbbox = "$overLeft,$overBottom,$overRight,$overTop";
+ if(cv('debug')eq "1"){print "clipbox: $clipbbox\n";}}
+ if(grep /\.pbf/, $osmName){ my $newName = $osmName;
+ $newName =~ s/\.pbf/\.osm/i;
# osmosis
- print "call osmosis to convert pbf file to osm file.\n" ;
- `osmosis --read-pbf $osmName --write-xml $newName` ;
+ print "call osmosis to convert pbf file to osm file.\n";
+ `osmosis --read-pbf $osmName --write-xml $newName`;
# change config
- $osmName = $newName ;
- setConfigValue ("in", $newName) ;
- }
-
+ $osmName = $newName;
+ setConfigValue("in", $newName);
+}
# -place given? look for place and call osmosis
- my $left ;
- my $right ;
- my $top ;
- my $bottom ;
+ my $left;
+ my $right;
+ my $top;
+ my $bottom;
- my $placeFound = 0 ; my $placeLon ; my $placeLat ;
- if ( ( cv('place') ne "") and (cv('overpass') ne "1" ) ) {
- my ($placeId) = ( cv('place') =~ /([\d]+)/);
- if (!defined $placeId) { $placeId = -999999999 ; }
- print "looking for place...\n" ;
+ my $placeFound = 0; my $placeLon; my $placeLat;
+ if((cv('place')ne "")and(cv('overpass')ne "1")){ my($placeId)=(cv('place')=~ /([\d]+)/);
+ if(!defined $placeId){$placeId = -999999999;} print "looking for place...\n";
- my $placeFileName = "" ;
- if ( cv('placeFile') ne "" ) {
- $placeFileName = cv('placeFile') ;
- }
- else {
- $placeFileName = cv('in') ;
- }
-
- openOsmFile ($placeFileName) ;
- ($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1) = getNode2 () ;
- if ($nodeId != -1) {
- @nodeTags = @$aRef1 ;
- }
- my $place = cv ('place') ;
- while ( ($nodeId != -1) and ($placeFound == 0) ) {
- my $placeNode = 0 ; my $placeName = 0 ;
- foreach my $tag ( @nodeTags ) {
- if ($tag->[0] eq "place") { $placeNode = 1 ; }
- if ( ($tag->[0] eq "name") and (grep /$place/i, $tag->[1]) ){ $placeName = 1 ; }
- }
- if ( (($placeNode == 1) and ($placeName == 1)) or ($placeId == $nodeId) ) {
- $placeFound = 1 ;
- $placeLon = $nodeLon ;
- $placeLat = $nodeLat ;
- }
- ($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1) = getNode2 () ;
- if ($nodeId != -1) {
- @nodeTags = @$aRef1 ;
- }
- }
-
- closeOsmFile() ;
-
- if ($placeFound == 1) {
- print "place $place found at " ;
- print "lon: $placeLon " ;
- print "lat: $placeLat\n" ;
- $left = $placeLon - cv('lonrad')/(111.11 * cos ( $placeLat / 360 * 3.14 * 2 ) ) ;
- $right = $placeLon + cv('lonrad')/(111.11 * cos ( $placeLat / 360 * 3.14 * 2 ) ) ;
- $top = $placeLat + cv('latrad')/111.11 ;
- $bottom = $placeLat - cv('latrad')/111.11 ;
-
- print "call osmosis...\n" ;
-
- if ( cv('cie') eq "0" ) {
- print "OSMOSIS STRING: --bounding-box completeWays=yes completeRelations=yes bottom=$bottom top=$top left=$left right=$right\n" ;
- `osmosis --read-xml $osmName --bounding-box completeWays=yes completeRelations=yes bottom=$bottom top=$top left=$left right=$right --write-xml ./temp.osm` ;
- }
- else {
- print "OSMOSIS STRING: --bounding-box clipIncompleteEntities=yes bottom=$bottom top=$top left=$left right=$right\n" ;
- `osmosis --read-xml $osmName --bounding-box clipIncompleteEntities=yes bottom=$bottom top=$top left=$left right=$right --write-xml ./temp.osm` ;
- }
-
- print "osmosis done.\n" ;
-
- $osmName = "./temp.osm" ;
- $clipbbox = "$left,$bottom,$right,$top" ;
- }
- else {
- print "ERROR: place $place not found.\n" ;
- die() ;
- }
+ my $placeFileName = "";
+ if(cv('placeFile')ne ""){
+ $placeFileName = cv('placeFile');
+ } else{ $placeFileName = cv('in');
}
+ openOsmFile($placeFileName);
+($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1)= getNode2();
+ if($nodeId != -1){ @nodeTags = @$aRef1;
+ } my $place = cv('place');
+ while(($nodeId != -1)and($placeFound == 0)){ my $placeNode = 0; my $placeName = 0;
+ foreach my $tag(@nodeTags){ if($tag->[0] eq "place"){$placeNode = 1;} if(($tag->[0] eq "name")and(grep /$place/i, $tag->[1])){$placeName = 1;} } if((($placeNode == 1)and($placeName == 1))or($placeId == $nodeId)){ $placeFound = 1;
+ $placeLon = $nodeLon;
+ $placeLat = $nodeLat;
+ } ($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1)= getNode2();
+ if($nodeId != -1){ @nodeTags = @$aRef1;
+ } }
+ closeOsmFile();
+ if($placeFound == 1){ print "place $place found at ";
+ print "lon: $placeLon ";
+ print "lat: $placeLat\n";
+ $left = $placeLon - cv('lonrad')/(111.11 * cos($placeLat / 360 * 3.14 * 2));
+ $right = $placeLon + cv('lonrad')/(111.11 * cos($placeLat / 360 * 3.14 * 2));
+ $top = $placeLat + cv('latrad')/111.11;
+ $bottom = $placeLat - cv('latrad')/111.11;
- my $srtmFileName = cv('srtm') ;
- if ( $srtmFileName ne "" ) {
+ print "call osmosis...\n";
- my $cmdX = "osmosis --read-xml $osmName --rx file=\"$srtmFileName\" --bounding-box completeWays=yes completeRelations=yes bottom=$bottom top=$top left=$left right=$right --merge --write-xml file=\"./temp2.osm\"" ;
- my $cmdP = "osmosis --read-xml $osmName --read-pbf file=\"$srtmFileName\" --bounding-box completeWays=yes completeRelations=yes bottom=$bottom top=$top left=$left right=$right --merge --write-xml file=\"./temp2.osm\"" ;
-
- my $cmd = "" ;
- if (grep /\.pbf/, $srtmFileName) {
- $cmd = $cmdP ;
- }
- else {
- $cmd = $cmdX ;
+ if(cv('cie')eq "0"){ print "OSMOSIS STRING: --bounding-box completeWays=yes completeRelations=yes bottom=$bottom top=$top left=$left right=$right\n";
+ `osmosis --read-xml $osmName --bounding-box completeWays=yes completeRelations=yes bottom=$bottom top=$top left=$left right=$right --write-xml ./temp.osm`;
+ } else{ print "OSMOSIS STRING: --bounding-box clipIncompleteEntities=yes bottom=$bottom top=$top left=$left right=$right\n";
+ `osmosis --read-xml $osmName --bounding-box clipIncompleteEntities=yes bottom=$bottom top=$top left=$left right=$right --write-xml ./temp.osm`;
}
+ print "osmosis done.\n";
- print "call osmosis to merge SRTM data...\n$cmd\n" ;
+ $osmName = "./temp.osm";
+ $clipbbox = "$left,$bottom,$right,$top";
+ } else{ print "ERROR: place $place not found.\n";
+ die();
+ }}
- `$cmd` ;
+ my $srtmFileName = cv('srtm');
+ if($srtmFileName ne ""){
+ my $cmdX = "osmosis --read-xml $osmName --rx file=\"$srtmFileName\" --bounding-box completeWays=yes completeRelations=yes bottom=$bottom top=$top left=$left right=$right --merge --write-xml file=\"./temp2.osm\"";
+ my $cmdP = "osmosis --read-xml $osmName --read-pbf file=\"$srtmFileName\" --bounding-box completeWays=yes completeRelations=yes bottom=$bottom top=$top left=$left right=$right --merge --write-xml file=\"./temp2.osm\"";
- $osmName = "temp2.osm" ;
+ my $cmd = "";
+ if(grep /\.pbf/, $srtmFileName){ $cmd = $cmdP;
+ } else{ $cmd = $cmdX;
}
+ print "call osmosis to merge SRTM data...\n$cmd\n";
+ `$cmd`;
+
+ $osmName = "temp2.osm";
+}
# STORE DATA
- my $nr = 0 ; my $wr = 0 ; my $rr = 0 ;
- print "reading osm file...\n" ;
+ my $nr = 0; my $wr = 0; my $rr = 0;
+ print "reading osm file...\n";
- openOsmFile ($osmName) ;
- ($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1) = getNode2 () ;
- if ($nodeId != -1) {
- @nodeTags = @$aRef1 ;
- }
- while ($nodeId != -1) {
- $nr++ ;
- $lon{$nodeId} = $nodeLon ; $lat{$nodeId} = $nodeLat ;
- @{$memNodeTags{$nodeId}} = @nodeTags ;
+ openOsmFile($osmName);
+($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1)= getNode2();
+ if($nodeId != -1){ @nodeTags = @$aRef1;
+} while($nodeId != -1){ $nr++;
+ $lon{$nodeId}= $nodeLon; $lat{$nodeId}= $nodeLat;
+ @{$memNodeTags{$nodeId}}= @nodeTags;
- ($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1) = getNode2 () ;
- if ($nodeId != -1) {
- @nodeTags = @$aRef1 ;
- }
- }
+($nodeId, $nodeLon, $nodeLat, $nodeUser, $aRef1)= getNode2();
+ if($nodeId != -1){ @nodeTags = @$aRef1;
+ }}
+($wayId, $wayUser, $aRef1, $aRef2)= getWay2();
+ if($wayId != -1){ @wayNodes = @$aRef1;
+ @wayTags = @$aRef2;
+} while($wayId != -1){ $wr++;
+ if(scalar(@wayNodes)> 1){ @{$memWayTags{$wayId}}= @wayTags;
+ @{$memWayNodes{$wayId}}= @wayNodes;
+ foreach my $node(@wayNodes){ if(!defined $lon{$node}){ print " ERROR: way $wayId references node $node, which is not present!\n";
+ } } } else{ $invalidWays{$wayId}= 1;
+ }
+($wayId, $wayUser, $aRef1, $aRef2)= getWay2();
+ if($wayId != -1){ @wayNodes = @$aRef1;
+ @wayTags = @$aRef2;
+ }}
- ($wayId, $wayUser, $aRef1, $aRef2) = getWay2 () ;
- if ($wayId != -1) {
- @wayNodes = @$aRef1 ;
- @wayTags = @$aRef2 ;
- }
- while ($wayId != -1) {
- $wr++ ;
- if (scalar (@wayNodes) > 1) {
- @{$memWayTags{$wayId}} = @wayTags ;
- @{$memWayNodes{$wayId}} = @wayNodes ;
- foreach my $node (@wayNodes) {
- if (!defined $lon{$node}) {
- print " ERROR: way $wayId references node $node, which is not present!\n" ;
- }
- }
- }
- else {
- $invalidWays{$wayId} = 1 ;
- }
-
- ($wayId, $wayUser, $aRef1, $aRef2) = getWay2 () ;
- if ($wayId != -1) {
- @wayNodes = @$aRef1 ;
- @wayTags = @$aRef2 ;
- }
- }
-
-
- ($relationId, $relationUser, $aRef1, $aRef2) = getRelation () ;
- if ($relationId != -1) {
- @relationMembers = @$aRef1 ;
- @relationTags = @$aRef2 ;
- }
-
- while ($relationId != -1) {
- $rr++ ;
- @{$memRelationTags{$relationId}} = @relationTags ;
- @{$memRelationMembers{$relationId}} = @relationMembers ;
-
- foreach my $member (@relationMembers) {
- if ( ($member->[0] eq "node") and (!defined $lon{$member->[1]}) ) {
- print " ERROR: relation $relationId references node $member->[1] which is not present!\n" ;
- }
- if ( ($member->[0] eq "way") and (!defined $memWayNodes{$member->[1]} ) and (!defined $invalidWays{$member->[1]}) ) {
- print " ERROR: relation $relationId references way $member->[1] which is not present or invalid!\n" ;
- }
- }
+($relationId, $relationUser, $aRef1, $aRef2)= getRelation();
+ if($relationId != -1){ @relationMembers = @$aRef1;
+ @relationTags = @$aRef2;
+}
+ while($relationId != -1){ $rr++;
+ @{$memRelationTags{$relationId}}= @relationTags;
+ @{$memRelationMembers{$relationId}}= @relationMembers;
+ foreach my $member(@relationMembers){ if(($member->[0] eq "node")and(!defined $lon{$member->[1]})){ print " ERROR: relation $relationId references node $member->[1] which is not present!\n";
+ } if(($member->[0] eq "way")and(!defined $memWayNodes{$member->[1]})and(!defined $invalidWays{$member->[1]})){ print " ERROR: relation $relationId references way $member->[1] which is not present or invalid!\n";
+ } }
#next
- ($relationId, $relationUser, $aRef1, $aRef2) = getRelation () ;
- if ($relationId != -1) {
- @relationMembers = @$aRef1 ;
- @relationTags = @$aRef2 ;
- }
- }
+($relationId, $relationUser, $aRef1, $aRef2)= getRelation();
+ if($relationId != -1){ @relationMembers = @$aRef1;
+ @relationTags = @$aRef2;
+ }}
+ closeOsmFile();
- closeOsmFile () ;
-
- print "read: $nr nodes, $wr ways and $rr relations.\n\n" ;
+ print "read: $nr nodes, $wr ways and $rr relations.\n\n";
# calc area of pic and init graphics
- my $lonMin = 999 ; my $lonMax = -999 ; my $latMin = 999 ; my $latMax = -999 ;
- foreach my $key (keys %lon) {
- if ($lon{$key} > $lonMax) { $lonMax = $lon{$key} ; }
- if ($lon{$key} < $lonMin) { $lonMin = $lon{$key} ; }
- if ($lat{$key} > $latMax) { $latMax = $lat{$key} ; }
- if ($lat{$key} < $latMin) { $latMin = $lat{$key} ; }
- }
-
+ my $lonMin = 999; my $lonMax = -999; my $latMin = 999; my $latMax = -999;
+ foreach my $key(keys %lon){ if($lon{$key}> $lonMax){$lonMax = $lon{$key};} if($lon{$key}< $lonMin){$lonMin = $lon{$key};} if($lat{$key}> $latMax){$latMax = $lat{$key};} if($lat{$key}< $latMin){$latMin = $lat{$key};}}
# clip picture if desired
- if ($clipbbox ne "") {
- my ($bbLeft, $bbBottom, $bbRight, $bbTop) = ($clipbbox =~ /([\d\-\.]+),([\d\-\.]+),([\d\-\.]+),([\d\-\.]+)/ ) ;
- # print "$bbLeft, $bbBottom, $bbRight, $bbTop\n" ;
- if (($bbLeft > $lonMax) or ($bbLeft < $lonMin)) { print "WARNING -clipbox left parameter outside data.\n" ; }
- if (($bbRight > $lonMax) or ($bbRight < $lonMin)) { print "WARNING -clipbox right parameter outside data.\n" ; }
- if (($bbBottom > $latMax) or ($bbBottom < $latMin)) { print "WARNING -clipbox bottom parameter outside data.\n" ; }
- if (($bbTop > $latMax) or ($bbTop < $latMin)) { print "WARNING -clipbox top parameter outside data.\n" ; }
- $lonMin = $bbLeft ;
- $lonMax = $bbRight ;
- $latMin = $bbBottom ;
- $latMax = $bbTop ;
- }
- else {
- if (defined cv('clip')) {
- if ( (cv('clip') > 0) and (cv('clip') < 100) ) {
- my $clip = cv('clip') ;
- $clip = $clip / 100 ;
- $lonMin += ($lonMax-$lonMin) * $clip ;
- $lonMax -= ($lonMax-$lonMin) * $clip ;
- $latMin += ($latMax-$latMin) * $clip ;
- $latMax -= ($latMax-$latMin) * $clip ;
- }
- }
- }
-
+ if($clipbbox ne ""){ my($bbLeft, $bbBottom, $bbRight, $bbTop)=($clipbbox =~ /([\d\-\.]+),([\d\-\.]+),([\d\-\.]+),([\d\-\.]+)/);
+ # print "$bbLeft, $bbBottom, $bbRight, $bbTop\n";
+ if(($bbLeft > $lonMax)or($bbLeft < $lonMin)){print "WARNING -clipbox left parameter outside data.\n";} if(($bbRight > $lonMax)or($bbRight < $lonMin)){print "WARNING -clipbox right parameter outside data.\n";} if(($bbBottom > $latMax)or($bbBottom < $latMin)){print "WARNING -clipbox bottom parameter outside data.\n";} if(($bbTop > $latMax)or($bbTop < $latMin)){print "WARNING -clipbox top parameter outside data.\n";} $lonMin = $bbLeft;
+ $lonMax = $bbRight;
+ $latMin = $bbBottom;
+ $latMax = $bbTop;
+} else{ if(defined cv('clip')){ if((cv('clip')> 0)and(cv('clip')< 100)){
+ my $clip = cv('clip');
+ $clip = $clip / 100;
+ $lonMin +=($lonMax-$lonMin)* $clip;
+ $lonMax -=($lonMax-$lonMin)* $clip;
+ $latMin +=($latMax-$latMin)* $clip;
+ $latMax -=($latMax-$latMin)* $clip;
+ } }}
# pad picture if desired
- if (defined cv('pad')) {
- my $pad = cv('pad') ;
- if ( ($pad > 0) and ($pad < 100) ) {
- $pad = $pad / 100 ;
- $lonMin -= ($lonMax-$lonMin) * $pad ;
- $lonMax += ($lonMax-$lonMin) * $pad ;
- $latMin -= ($latMax-$latMin) * $pad ;
- $latMax += ($latMax-$latMin) * $pad ;
- }
- }
-
- my $size = cv('size') ;
+ if(defined cv('pad')){ my $pad = cv('pad');
+ if(($pad > 0)and($pad < 100)){
+ $pad = $pad / 100;
+ $lonMin -=($lonMax-$lonMin)* $pad;
+ $lonMax +=($lonMax-$lonMin)* $pad;
+ $latMin -=($latMax-$latMin)* $pad;
+ $latMax +=($latMax-$latMin)* $pad;
+ }}
+ my $size = cv('size');
# calc pic size
- if ( cv('scaleSet') != 0 ) {
- my $dist = distance ($lonMin, $latMin, $lonMax, $latMin) ;
- my $width = $dist / cv('scaleSet') * 1000 * 100 / 2.54 ; # inches
- $size = int ($width * 300) ;
- }
+ if(cv('scaleSet')!= 0){ my $dist = distance($lonMin, $latMin, $lonMax, $latMin);
+ my $width = $dist / cv('scaleSet')* 1000 * 100 / 2.54; # inches
+ $size = int($width * 300);
+}
+ if(cv('maxTargetSize')ne ""){ my @a = split /,/, cv('maxTargetSize');
+ my $targetWidth = $a[0];
+ my $targetHeight = $a[1];
+ # print "TS: $targetWidth, $targetHeight [cm]\n";
+ my $distLon = distance($lonMin, $latMin, $lonMax, $latMin);
+ my $distLat = distance($lonMin, $latMin, $lonMin, $latMax);
+ # print "TS: $distLon, $distLat [km]\n";
+ my $scaleLon =($distLon * 1000 * 100)/ $targetWidth;
+ my $scaleLat =($distLat * 1000 * 100)/ $targetHeight;
+ my $targetScale = int $scaleLon;
+ if($scaleLat > $targetScale){$targetScale = int $scaleLat;} # print "TS: $targetScale [1:n]\n";
- if ( cv('maxTargetSize') ne "" ) {
- my @a = split /,/, cv('maxTargetSize') ;
- my $targetWidth = $a[0] ;
- my $targetHeight = $a[1] ;
- # print "TS: $targetWidth, $targetHeight [cm]\n" ;
- my $distLon = distance ($lonMin, $latMin, $lonMax, $latMin) ;
- my $distLat = distance ($lonMin, $latMin, $lonMin, $latMax) ;
- # print "TS: $distLon, $distLat [km]\n" ;
- my $scaleLon = ($distLon * 1000 * 100) / $targetWidth ;
- my $scaleLat = ($distLat * 1000 * 100) / $targetHeight ;
- my $targetScale = int $scaleLon ;
- if ( $scaleLat > $targetScale ) { $targetScale = int $scaleLat ; }
- # print "TS: $targetScale [1:n]\n" ;
-
- my $width = $distLon / $targetScale * 1000 * 100 / 2.54 ; # inches
- $size = int ($width * 300) ;
- print "Map width now $size [px] due to maxTargetSize parameter\n" ;
- }
-
- mwMap::initGraph ($size, $lonMin, $latMin, $lonMax, $latMax) ;
+ my $width = $distLon / $targetScale * 1000 * 100 / 2.54; # inches
+ $size = int($width * 300);
+ print "Map width now $size [px] due to maxTargetSize parameter\n";
+}
+ mwMap::initGraph($size, $lonMin, $latMin, $lonMax, $latMax);
}
-
-sub getNodePointers {
- return ( \%lon, \%lat, \%memNodeTags) ;
+sub getNodePointers{ return(\%lon, \%lat, \%memNodeTags);
+}
+sub getWayPointers{ return(\%memWayNodes, \%memWayTags);
+}
+sub getRelationPointers{
+ return(\%memRelationMembers, \%memRelationTags);
}
-sub getWayPointers {
- return ( \%memWayNodes, \%memWayTags) ;
-}
-
-sub getRelationPointers {
-
- return ( \%memRelationMembers, \%memRelationTags) ;
-}
-
-
-1 ;
+1;
diff --git a/mwGPX.pm b/mwGPX.pm
index 183bfd2..91afe57 100755
--- a/mwGPX.pm
+++ b/mwGPX.pm
@@ -4,10 +4,10 @@
#
#
#
-# Copyright (C) 2011, Gerhard Schwanz
+# Copyright(C)2011, Gerhard Schwanz
#
# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+# Free Software Foundation; either version 3 of the License, or(at your option)any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -16,108 +16,92 @@
#
-package mwGPX ;
+package mwGPX;
-use strict ;
-use warnings ;
+use strict;
+use warnings;
-use OSM::gpx ;
+use OSM::gpx;
-use mwConfig ;
-use mwMap ;
+use mwConfig;
+use mwMap;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-require Exporter ;
+require Exporter;
-@ISA = qw ( Exporter AutoLoader ) ;
+@ISA = qw(Exporter AutoLoader);
-@EXPORT = qw ( processGPXFile
- ) ;
+@EXPORT = qw(processGPXFile
+ );
-sub processGPXFile {
+sub processGPXFile{
+ my($ref1, $ref2, $ref3)= readGPXFile(cv('gpx'));
- my ($ref1, $ref2, $ref3) = readGPXFile ( cv('gpx') ) ;
+ my %wptHash = %$ref1;
+ my %rteHash = %$ref2;
+ my %trkHash = %$ref3;
- my %wptHash = %$ref1 ;
- my %rteHash = %$ref2 ;
- my %trkHash = %$ref3 ;
-
- my $size = cv('gpxsize') ;
- my $color = cv('gpxcolor') ;
-
- foreach my $wptNr ( sort { $a <=> $b } keys %wptHash) {
- # print "WPT $wptNr: $wptHash{$wptNr}{'lon'} $wptHash{$wptNr}{'lat'}\n" ;
- if (defined $wptHash{$wptNr}{'name'}) {
- # print " name: $wptHash{$wptNr}{'name'}\n" ;
- }
- if (defined $wptHash{$wptNr}{'ele'}) {
- # print " ele: $wptHash{$wptNr}{'ele'}\n" ;
- }
-
-
- my $svgString = "fill=\"$color\" stroke=\"none\" " ;
- my $lon = $wptHash{$wptNr}{'lon'} ;
- my $lat = $wptHash{$wptNr}{'lat'} ;
- drawCircle ($lon, $lat, 1, 3*$size, 0, $svgString, 'gpx') ;
+ my $size = cv('gpxsize');
+ my $color = cv('gpxcolor');
+ foreach my $wptNr(sort{$a <=> $b}keys %wptHash){ # print "WPT $wptNr: $wptHash{$wptNr}{'lon'}$wptHash{$wptNr}{'lat'}\n";
+ if(defined $wptHash{$wptNr}{'name'}){
+ # print " name: $wptHash{$wptNr}{'name'}\n";
+ } if(defined $wptHash{$wptNr}{'ele'}){
+ # print " ele: $wptHash{$wptNr}{'ele'}\n";
}
- foreach my $rteNr ( sort { $a <=> $b } keys %rteHash) {
- # print "RTE $rteNr\n" ;
+ my $svgString = "fill=\"$color\" stroke=\"none\" ";
+ my $lon = $wptHash{$wptNr}{'lon'};
+ my $lat = $wptHash{$wptNr}{'lat'};
+ drawCircle($lon, $lat, 1, 3*$size, 0, $svgString, 'gpx');
- my @coords = () ;
+}
+ foreach my $rteNr(sort{$a <=> $b}keys %rteHash){ # print "RTE $rteNr\n";
- foreach my $rteWptNr ( sort { $a <=> $b } keys %{$rteHash{$rteNr}}) {
- # print " wpt $rteWptNr: $rteHash{$rteNr}{$rteWptNr}{'lon'} $rteHash{$rteNr}{$rteWptNr}{'lat'}\n" ;
+ my @coords =();
- my $svgString = "fill=\"$color\" stroke=\"none\" " ;
- my $lon = $rteHash{$rteNr}{$rteWptNr}{'lon'} ;
- my $lat = $rteHash{$rteNr}{$rteWptNr}{'lat'} ;
- drawCircle ($lon, $lat, 1, 2*$size, 0, $svgString, 'gpx') ;
+ foreach my $rteWptNr(sort{$a <=> $b}keys %{$rteHash{$rteNr}}){ # print " wpt $rteWptNr: $rteHash{$rteNr}{$rteWptNr}{'lon'}$rteHash{$rteNr}{$rteWptNr}{'lat'}\n";
- my ($x, $y) = convert ($lon, $lat) ;
- push @coords, $x, $y ;
- }
+ my $svgString = "fill=\"$color\" stroke=\"none\" ";
+ my $lon = $rteHash{$rteNr}{$rteWptNr}{'lon'};
+ my $lat = $rteHash{$rteNr}{$rteWptNr}{'lat'};
+ drawCircle($lon, $lat, 1, 2*$size, 0, $svgString, 'gpx');
- my $svgString = "" ;
-
- my $lc = "round" ;
- my $lj = "round" ;
-
- $svgString = "stroke=\"$color\" stroke-width=\"$size\" stroke-linecap=\"$lc\" fill=\"none\" stroke-linejoin=\"$lj\" " ;
-
- drawWay (\@coords, 0, $svgString, "gpx", undef) ;
+ my($x, $y)= convert($lon, $lat);
+ push @coords, $x, $y;
}
+ my $svgString = "";
- foreach my $trkNr ( sort { $a <=> $b } keys %trkHash) {
- # print "TRK $trkNr\n" ;
- my %seg ;
- %seg = %{ $trkHash{$trkNr} } ;
+ my $lc = "round";
+ my $lj = "round";
- foreach my $segNr ( sort {$a <=> $b} keys %seg) {
- # print " SEG $segNr\n" ;
- my %points ;
- %points = %{ $seg{$segNr}} ;
- foreach my $ptNr ( sort { $a <=> $b } keys %points) {
- # print " trkpt $ptNr: $points{$ptNr}{'lon'} $points{$ptNr}{'lat'}\n" ;
+ $svgString = "stroke=\"$color\" stroke-width=\"$size\" stroke-linecap=\"$lc\" fill=\"none\" stroke-linejoin=\"$lj\" ";
- my $svgString = "fill=\"$color\" stroke=\"none\" " ;
- my $lon = $points{$ptNr}{'lon'} ;
- my $lat = $points{$ptNr}{'lat'} ;
- drawCircle ($lon, $lat, 1, $size, 0, $svgString, 'gpx') ;
- }
- }
- }
+ drawWay(\@coords, 0, $svgString, "gpx", undef);
+}
+ foreach my $trkNr(sort{$a <=> $b}keys %trkHash){ # print "TRK $trkNr\n";
+ my %seg;
+ %seg = %{$trkHash{$trkNr}};
+ foreach my $segNr(sort{$a <=> $b}keys %seg){ # print " SEG $segNr\n";
+ my %points;
+ %points = %{$seg{$segNr}};
+ foreach my $ptNr(sort{$a <=> $b}keys %points){ # print " trkpt $ptNr: $points{$ptNr}{'lon'}$points{$ptNr}{'lat'}\n";
+
+ my $svgString = "fill=\"$color\" stroke=\"none\" ";
+ my $lon = $points{$ptNr}{'lon'};
+ my $lat = $points{$ptNr}{'lat'};
+ drawCircle($lon, $lat, 1, $size, 0, $svgString, 'gpx');
+ } }}
}
-
-1 ;
+1;
diff --git a/mwInteractive.pl b/mwInteractive.pl
index 0373ce9..ba74f57 100644
--- a/mwInteractive.pl
+++ b/mwInteractive.pl
@@ -1,127 +1,111 @@
-use strict ;
-use warnings ;
+use strict;
+use warnings;
# mwInteractive.pl
-my $sStyle = "mwStandardRules.txt" ;
-my $tStyle = "mwTopoRules.txt" ;
+my $sStyle = "mwStandardRules.txt";
+my $tStyle = "mwTopoRules.txt";
-my $place = "" ;
-my $near = "" ;
-my $dist = 50000 ;
-my $lonrad = 2 ;
-my $latrad = 2 ;
-my $scaleset = 10000 ;
-my $png = 0 ;
-my $pdf = 1 ;
-my $outName = "" ;
-my $style = "" ;
+my $place = "";
+my $near = "";
+my $dist = 50000;
+my $lonrad = 2;
+my $latrad = 2;
+my $scaleset = 10000;
+my $png = 0;
+my $pdf = 1;
+my $outName = "";
+my $style = "";
-print "Mapweaver interactive\n\n" ;
+print "Mapweaver interactive\n\n";
-while ($place eq "") {
- print "Please enter exact place name:\n" ;
- $place = ;
- print "\n" ;
- chomp $place ;
+while($place eq ""){ print "Please enter exact place name:\n";
+ $place = ;
+ print "\n";
+ chomp $place;
}
+# ---
+
+print "Please enter exact place name of bigger city i.e. in vicinity:\n";
+$near = ;
+print "\n";
+chomp $near;
# ---
-print "Please enter exact place name of bigger city i.e. in vicinity:\n" ;
-$near = ;
-print "\n" ;
-chomp $near ;
+print "Please enter radius in m for vicinity search(defaults to 50.000):\n";
+$dist = ;
+print "\n";
+chomp $dist;
+if($dist eq ""){$dist = 50000;}
# ---
-print "Please enter radius in m for vicinity search (defaults to 50.000):\n" ;
-$dist = ;
-print "\n" ;
-chomp $dist ;
-
-if ($dist eq "") { $dist = 50000 ; }
-
+print "Please enter radius in km for latitude(defaults to 2km):\n";
+$latrad = ;
+print "\n";
+chomp $latrad;
+if($latrad eq ""){$latrad=2;}
# ---
-print "Please enter radius in km for latitude (defaults to 2km):\n" ;
-$latrad = ;
-print "\n" ;
-chomp $latrad ;
-if ($latrad eq "") { $latrad=2 ; }
-
+print "Please enter radius in km for longitude(defaults to 2km):\n";
+$lonrad = ;
+print "\n";
+chomp $lonrad;
+if($lonrad eq ""){$lonrad=2;}
# ---
-print "Please enter radius in km for longitude (defaults to 2km):\n" ;
-$lonrad = ;
-print "\n" ;
-chomp $lonrad ;
-if ($lonrad eq "") { $lonrad=2 ; }
-
+print "Please enter scale of map(i.e. 10000 for 1:10.000):\n";
+$scaleset = ;
+print "\n";
+chomp $scaleset;
+if($scaleset eq ""){$scaleset = 10000;}
# ---
-print "Please enter scale of map (i.e. 10000 for 1:10.000):\n" ;
-$scaleset = ;
-print "\n" ;
-chomp $scaleset ;
-if ($scaleset eq "") { $scaleset = 10000 ; }
-
+print "Output map in PDF format yes/no(defaults to yes):\n";
+$pdf = ;
+print "\n";
+chomp $pdf;
+if(($pdf eq "")or(lc $pdf eq "yes")){$pdf = 1;}
# ---
-print "Output map in PDF format yes/no (defaults to yes):\n" ;
-$pdf = ;
-print "\n" ;
-chomp $pdf ;
-if (($pdf eq "") or (lc $pdf eq "yes")) { $pdf = 1 ; }
-
+print "Output map in PNG format yes/no(defaults to no):\n";
+$png = ;
+print "\n";
+chomp $png;
+if(($png eq "")or(lc $png eq "no")){$png = 0;}if(lc $png eq "yes"){$png = 1;}
# ---
-print "Output map in PNG format yes/no (defaults to no):\n" ;
-$png = ;
-print "\n" ;
-chomp $png ;
-if (($png eq "") or (lc $png eq "no")) { $png = 0 ; }
-if (lc $png eq "yes") { $png = 1 ; }
+$outName = $place . ".svg";
+print "Output name(defaults to $outName):\n";
+$outName = ;
+print "\n";
+chomp $outName;
+
+if($outName eq ""){$outName = $place . ".svg";}if(! grep /\.svg$/, $outName){$outName .= ".svg";}
# ---
-$outName = $place . ".svg" ;
+print "Select map style from list:\n";
+print "1 - standard rules(default)\n";
+print "2 - topo rules\n";
+$style = ;
+print "\n";
+chomp $style;
-print "Output name (defaults to $outName):\n" ;
-$outName = ;
-print "\n" ;
-chomp $outName ;
-
-if ($outName eq "") { $outName = $place . ".svg" ; }
-if (! grep /\.svg$/, $outName) { $outName .= ".svg" ; }
-
-# ---
-
-print "Select map style from list:\n" ;
-print "1 - standard rules (default)\n" ;
-print "2 - topo rules\n" ;
-$style = ;
-print "\n" ;
-chomp $style ;
-
-if ($style eq "2") { $style = "mwTopoRules.txt" ; }
-else { $style = "mwStandardRules.txt" ; }
+if($style eq "2"){$style = "mwTopoRules.txt";}else{$style = "mwStandardRules.txt";}
+my $cmd = "perl mw.pl -place=\"$place\" -overpass -style=\"$style\" -out=\"$outName\" -scaleset=$scaleset ";
+if($near ne ""){$cmd .= "-near=\"$near\" -overpassdistance=$dist ";}$cmd .= " -lonrad=$lonrad -latrad=$latrad ";
+if($png eq "1"){$cmd .= " -png ";}if($pdf eq "1"){$cmd .= " -pdf ";}
+print "call mw.pl: $cmd\n";
-my $cmd = "perl mw.pl -place=\"$place\" -overpass -style=\"$style\" -out=\"$outName\" -scaleset=$scaleset " ;
-if ($near ne "") { $cmd .= "-near=\"$near\" -overpassdistance=$dist " ; }
-$cmd .= " -lonrad=$lonrad -latrad=$latrad " ;
-if ($png eq "1") { $cmd .= " -png " ; }
-if ($pdf eq "1") { $cmd .= " -pdf " ; }
-
-print "call mw.pl: $cmd\n" ;
-
-`$cmd` ;
+`$cmd`;
diff --git a/mwLabel.pm b/mwLabel.pm
index 7a1e6f4..8c4567c 100644
--- a/mwLabel.pm
+++ b/mwLabel.pm
@@ -4,10 +4,10 @@
#
#
#
-# Copyright (C) 2011, Gerhard Schwanz
+# Copyright(C)2011, Gerhard Schwanz
#
# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+# Free Software Foundation; either version 3 of the License, or(at your option)any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -16,313 +16,237 @@
#
-package mwLabel ;
+package mwLabel;
-use strict ;
-use warnings ;
+use strict;
+use warnings;
-use mwConfig ;
-use mwMap ;
-# use mwMisc ;
-use mwOccupy ;
+use mwConfig;
+use mwMap;
+# use mwMisc;
+use mwOccupy;
-my $labelPathId = 0 ;
+my $labelPathId = 0;
-my @lines = () ;
+my @lines =();
-my $numIconsMoved = 0 ;
-my $numLabels = 0 ;
-my $numIcons = 0 ;
-my $numLabelsOmitted = 0 ;
-my $numLabelsMoved = 0 ;
-my $numIconsOmitted = 0 ;
+my $numIconsMoved = 0;
+my $numLabels = 0;
+my $numIcons = 0;
+my $numLabelsOmitted = 0;
+my $numLabelsMoved = 0;
+my $numIconsOmitted = 0;
-my %poiHash = () ;
+my %poiHash =();
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-require Exporter ;
+require Exporter;
-@ISA = qw ( Exporter AutoLoader ) ;
+@ISA = qw(Exporter AutoLoader);
-@EXPORT = qw (
- placeLabelAndIcon
+@EXPORT = qw( placeLabelAndIcon
addToPoiHash
getPoiHash
- ) ;
+ );
-sub placeLabelAndIcon {
-#
+sub placeLabelAndIcon{#
# intelligent icon and label placement alg.
#
- my ($lon, $lat, $offset, $thickness, $text, $svgText, $icon, $iconSizeX, $iconSizeY, $layer) = @_ ;
+ my($lon, $lat, $offset, $thickness, $text, $svgText, $icon, $iconSizeX, $iconSizeY, $layer)= @_;
- if (cv('debug') eq "1") { print "PLAI: $lon, $lat, $offset, $thickness, $text, $svgText, $icon, $iconSizeX, $iconSizeY, $layer\n" ; }
+ if(cv('debug')eq "1"){print "PLAI: $lon, $lat, $offset, $thickness, $text, $svgText, $icon, $iconSizeX, $iconSizeY, $layer\n";}
+ my($x, $y)= mwMap::convert($lon, $lat); # center !
- my ($x, $y) = mwMap::convert ($lon, $lat) ; # center !
+ if(! coordsOut($x, $y)){
+ $y = $y + $offset;
- if ( ! coordsOut ($x, $y) ) {
+ my($ref)= splitLabel($text);
+ my(@lines)= @$ref;
+ my $numLines = scalar @lines;
+ my $maxTextLenPix = 0;
+ my $orientation = "";
+ my $lineDist = cv('linedist');;
+ my $tries = 0;
+ my $allowIconMove = cv('allowiconmove');
- $y = $y + $offset ;
-
- my ($ref) = splitLabel ($text) ;
- my (@lines) = @$ref ;
- my $numLines = scalar @lines ;
- my $maxTextLenPix = 0 ;
- my $orientation = "" ;
- my $lineDist = cv ('linedist') ; ;
- my $tries = 0 ;
- my $allowIconMove = cv ('allowiconmove') ;
-
- my ($textSize) = ( $svgText =~ /font-size=\"(\d+)\"/ ) ;
- if ( ! defined $textSize ) { die ("ERROR: font size could not be determined from svg format string \"$svgText\"\n") ; }
-
- foreach my $line (@lines) {
- my $len = length ($line) * cv('ppc') / 10 * $textSize ; # in pixels
- if ($len > $maxTextLenPix) { $maxTextLenPix = $len ; }
- }
- my $spaceTextX = $maxTextLenPix ;
- my $spaceTextY = $numLines * ($lineDist+$textSize) ;
+ my($textSize)=($svgText =~ /font-size=\"(\d+)\"/);
+ if(! defined $textSize){die("ERROR: font size could not be determined from svg format string \"$svgText\"\n");}
+ foreach my $line(@lines){ my $len = length($line)* cv('ppc')/ 10 * $textSize; # in pixels
+ if($len > $maxTextLenPix){$maxTextLenPix = $len;} } my $spaceTextX = $maxTextLenPix;
+ my $spaceTextY = $numLines *($lineDist+$textSize);
- if ($icon ne "none") {
- $numIcons++ ;
+ if($icon ne "none"){ $numIcons++;
# space for icon?
- my $sizeX1 = $iconSizeX ; if ($sizeX1 == 0) { $sizeX1 = 20 ; }
- my $sizeY1 = $iconSizeY ; if ($sizeY1 == 0) { $sizeY1 = 20 ; }
- my $iconX = $x - $sizeX1/2 ; # top left corner
- my $iconY = $y - $sizeY1/2 ;
+ my $sizeX1 = $iconSizeX; if($sizeX1 == 0){$sizeX1 = 20;} my $sizeY1 = $iconSizeY; if($sizeY1 == 0){$sizeY1 = 20;} my $iconX = $x - $sizeX1/2; # top left corner
+ my $iconY = $y - $sizeY1/2;
- my @shifts = (0) ;
- if ($allowIconMove eq "1") {
- @shifts = ( 0, -15, 15 ) ;
- }
- my $posFound = 0 ; my $posCount = 0 ;
- my ($iconAreaX1, $iconAreaY1, $iconAreaX2, $iconAreaY2) ;
- LABAB: foreach my $xShift (@shifts) {
- foreach my $yShift (@shifts) {
- $posCount++ ;
- if ( ( ! boxAreaOccupied ($iconX+$xShift, $iconY+$sizeY1+$yShift, $iconX+$sizeX1+$xShift, $iconY+$yShift) ) or ( cv('forcenodes') eq "1" ) ) {
- placeIcon ($iconX+$xShift, $iconY+$yShift, $icon, $sizeX1, $sizeY1, "nodes") ;
- $iconAreaX1 = $iconX+$xShift ;
- $iconAreaY1 = $iconY+$sizeY1+$yShift ;
- $iconAreaX2 = $iconX+$sizeX1+$xShift ;
- $iconAreaY2 = $iconY+$yShift ;
-
- $posFound = 1 ;
- if ($posCount > 1) { $numIconsMoved++ ; }
- $iconX = $iconX + $xShift ; # for later use with label
- $iconY = $iconY + $yShift ;
- last LABAB ;
- }
- }
- }
- if ($posFound == 1) {
+ my @shifts =(0);
+ if($allowIconMove eq "1"){ @shifts =(0, -15, 15);
+ } my $posFound = 0; my $posCount = 0;
+ my($iconAreaX1, $iconAreaY1, $iconAreaX2, $iconAreaY2);
+ LABAB: foreach my $xShift(@shifts){ foreach my $yShift(@shifts){ $posCount++;
+ if((! boxAreaOccupied($iconX+$xShift, $iconY+$sizeY1+$yShift, $iconX+$sizeX1+$xShift, $iconY+$yShift))or(cv('forcenodes')eq "1")){ placeIcon($iconX+$xShift, $iconY+$yShift, $icon, $sizeX1, $sizeY1, "nodes");
+ $iconAreaX1 = $iconX+$xShift;
+ $iconAreaY1 = $iconY+$sizeY1+$yShift;
+ $iconAreaX2 = $iconX+$sizeX1+$xShift;
+ $iconAreaY2 = $iconY+$yShift;
+ $posFound = 1;
+ if($posCount > 1){$numIconsMoved++;} $iconX = $iconX + $xShift; # for later use with label
+ $iconY = $iconY + $yShift;
+ last LABAB;
+ } } } if($posFound == 1){
# label text?
- if ($text ne "") {
- $numLabels++ ;
+ if($text ne ""){ $numLabels++;
- $sizeX1 += 1 ; $sizeY1 += 1 ;
+ $sizeX1 += 1; $sizeY1 += 1;
- my ($x1, $x2, $y1, $y2) ;
+ my($x1, $x2, $y1, $y2);
# $x, $y centered
# yes, check if space for label, choose position, draw
# no, count omitted text
- my @positions = () ; my $positionFound = 0 ;
+ my @positions =(); my $positionFound = 0;
# pos 1 centered below
- $x1 = $x - $spaceTextX/2 ; $x2 = $x + $spaceTextX/2 ; $y1 = $y + $sizeY1/2 + $spaceTextY ; $y2 = $y + $sizeY1/2 ; $orientation = "centered" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
+ $x1 = $x - $spaceTextX/2; $x2 = $x + $spaceTextX/2; $y1 = $y + $sizeY1/2 + $spaceTextY; $y2 = $y + $sizeY1/2; $orientation = "centered";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
# pos 2/3 to the right, bottom, top
- $x1 = $x + $sizeX1/2 ; $x2 = $x + $sizeX1/2 + $spaceTextX ; $y1 = $y + $sizeY1/2 ; $y2 = $y1 - $spaceTextY ; $orientation = "left" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
- $x1 = $x + $sizeX1/2 ; $x2 = $x + $sizeX1/2 + $spaceTextX ; $y2 = $y - $sizeY1/2 ; $y1 = $y2 + $spaceTextY ; $orientation = "left" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
+ $x1 = $x + $sizeX1/2; $x2 = $x + $sizeX1/2 + $spaceTextX; $y1 = $y + $sizeY1/2; $y2 = $y1 - $spaceTextY; $orientation = "left";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
+ $x1 = $x + $sizeX1/2; $x2 = $x + $sizeX1/2 + $spaceTextX; $y2 = $y - $sizeY1/2; $y1 = $y2 + $spaceTextY; $orientation = "left";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
# pos 4 centered upon
- $x1 = $x - $spaceTextX/2 ; $x2 = $x + $spaceTextX/2 ; $y1 = $y - $sizeY1/2 ; $y2 = $y - $sizeY1/2 - $spaceTextY ; $orientation = "centered" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
+ $x1 = $x - $spaceTextX/2; $x2 = $x + $spaceTextX/2; $y1 = $y - $sizeY1/2; $y2 = $y - $sizeY1/2 - $spaceTextY; $orientation = "centered";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
# pos 5/6 to the right, below and upon
- $x1 = $x + $sizeX1/2 ; $x2 = $x + $sizeX1/2 + $spaceTextX ; $y2 = $y + $sizeY1/2 ; $y1 = $y2 + $spaceTextY ; $orientation = "left" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
- $x1 = $x + $sizeX1/2 ; $x2 = $x + $sizeX1/2 + $spaceTextX ; $y1 = $y - $sizeY1/2 ; $y2 = $y1 - $spaceTextY ; $orientation = "left" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
+ $x1 = $x + $sizeX1/2; $x2 = $x + $sizeX1/2 + $spaceTextX; $y2 = $y + $sizeY1/2; $y1 = $y2 + $spaceTextY; $orientation = "left";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
+ $x1 = $x + $sizeX1/2; $x2 = $x + $sizeX1/2 + $spaceTextX; $y1 = $y - $sizeY1/2; $y2 = $y1 - $spaceTextY; $orientation = "left";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
# left normal, bottom, top
- $x1 = $x - $sizeX1/2 - $spaceTextX ; $x2 = $x - $sizeX1/2 ; $y1 = $y + $sizeY1/2 ; $y2 = $y1 - $spaceTextY ; $orientation = "right" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
- $x1 = $x - $sizeX1/2 - $spaceTextX ; $x2 = $x - $sizeX1/2 ; $y2 = $y - $sizeY1/2 ; $y1 = $y2 + $spaceTextY ; $orientation = "right" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
+ $x1 = $x - $sizeX1/2 - $spaceTextX; $x2 = $x - $sizeX1/2; $y1 = $y + $sizeY1/2; $y2 = $y1 - $spaceTextY; $orientation = "right";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
+ $x1 = $x - $sizeX1/2 - $spaceTextX; $x2 = $x - $sizeX1/2; $y2 = $y - $sizeY1/2; $y1 = $y2 + $spaceTextY; $orientation = "right";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
# left corners, bottom, top
- $x1 = $x - $sizeX1/2 - $spaceTextX ; $x2 = $x - $sizeX1/2 ; $y2 = $y + $sizeY1/2 ; $y1 = $y2 + $spaceTextY ; $orientation = "right" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
- $x1 = $x - $sizeX1/2 - $spaceTextX ; $x2 = $x - $sizeX1/2 ; $y1 = $y - $sizeY1/2 ; $y2 = $y1 - $spaceTextY ; $orientation = "right" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
+ $x1 = $x - $sizeX1/2 - $spaceTextX; $x2 = $x - $sizeX1/2; $y2 = $y + $sizeY1/2; $y1 = $y2 + $spaceTextY; $orientation = "right";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
+ $x1 = $x - $sizeX1/2 - $spaceTextX; $x2 = $x - $sizeX1/2; $y1 = $y - $sizeY1/2; $y2 = $y1 - $spaceTextY; $orientation = "right";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
- $tries = 0 ;
- LABB: foreach my $pos (@positions) {
- $tries++ ;
+ $tries = 0;
+ LABB: foreach my $pos(@positions){ $tries++;
- $positionFound = checkAndDrawText ($pos->[0], $pos->[1], $pos->[2], $pos->[3], $pos->[4], \@lines, $svgText, $layer) ;
+ $positionFound = checkAndDrawText($pos->[0], $pos->[1], $pos->[2], $pos->[3], $pos->[4], \@lines, $svgText, $layer);
- if ($positionFound == 1) {
- last LABB ;
- }
- }
- if ($positionFound == 0) { $numLabelsOmitted++ ; }
- if ($tries > 1) { $numLabelsMoved++ ; }
- } # label
+ if($positionFound == 1){ last LABB;
+ } } if($positionFound == 0){$numLabelsOmitted++;} if($tries > 1){$numLabelsMoved++;} }# label
- boxOccupyArea ($iconAreaX1, $iconAreaY1, $iconAreaX2, $iconAreaY2, 0, 2) ;
- } # pos found
- else {
- # no, count omitted
- $numIconsOmitted++ ;
- }
- }
- else { # only text
- my ($x1, $x2, $y1, $y2) ;
+ boxOccupyArea($iconAreaX1, $iconAreaY1, $iconAreaX2, $iconAreaY2, 0, 2);
+ }# pos found
+ else{ # no, count omitted
+ $numIconsOmitted++;
+ } } else{# only text
+ my($x1, $x2, $y1, $y2);
# x1, x2, y1, y2
# left, right, bottom, top
# choose space for text, draw
# count omitted
- $numLabels++ ;
- my @positions = () ;
- $x1 = $x + $thickness ; $x2 = $x + $thickness + $spaceTextX ; $y1 = $y ; $y2 = $y - $spaceTextY ; $orientation = "left" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
- $x1 = $x + $thickness ; $x2 = $x + $thickness + $spaceTextX ; $y1 = $y + $spaceTextY ; $y2 = $y ; $orientation = "left" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
+ $numLabels++;
+ my @positions =();
+ $x1 = $x + $thickness; $x2 = $x + $thickness + $spaceTextX; $y1 = $y; $y2 = $y - $spaceTextY; $orientation = "left";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
+ $x1 = $x + $thickness; $x2 = $x + $thickness + $spaceTextX; $y1 = $y + $spaceTextY; $y2 = $y; $orientation = "left";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
- $x1 = $x - ($thickness + $spaceTextX) ; $x2 = $x - $thickness ; $y1 = $y ; $y2 = $y - $spaceTextY ; $orientation = "right" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
- $x1 = $x - ($thickness + $spaceTextX) ; $x2 = $x - $thickness ; $y1 = $y ; $y2 = $y - $spaceTextY ; $orientation = "right" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
+ $x1 = $x -($thickness + $spaceTextX); $x2 = $x - $thickness; $y1 = $y; $y2 = $y - $spaceTextY; $orientation = "right";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
+ $x1 = $x -($thickness + $spaceTextX); $x2 = $x - $thickness; $y1 = $y; $y2 = $y - $spaceTextY; $orientation = "right";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
- $x1 = $x - $spaceTextX/2 ; $x2 = $x + $spaceTextX/2 ; $y1 = $y - $thickness ; $y2 = $y - ($thickness + $spaceTextY) ; $orientation = "centered" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
- $x1 = $x - $spaceTextX/2 ; $x2 = $x + $spaceTextX/2 ; $y1 = $y + $thickness + $spaceTextY ; $y2 = $y + $thickness ; $orientation = "centered" ;
- push @positions, [$x1, $x2, $y1, $y2, $orientation] ;
+ $x1 = $x - $spaceTextX/2; $x2 = $x + $spaceTextX/2; $y1 = $y - $thickness; $y2 = $y -($thickness + $spaceTextY); $orientation = "centered";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
+ $x1 = $x - $spaceTextX/2; $x2 = $x + $spaceTextX/2; $y1 = $y + $thickness + $spaceTextY; $y2 = $y + $thickness; $orientation = "centered";
+ push @positions, [$x1, $x2, $y1, $y2, $orientation];
- my $positionFound = 0 ;
- $tries = 0 ;
- LABA: foreach my $pos (@positions) {
- $tries++ ;
- # print "$lines[0] $pos->[0], $pos->[1], $pos->[2], $pos->[3], $pos->[4], $numLines\n" ;
+ my $positionFound = 0;
+ $tries = 0;
+ LABA: foreach my $pos(@positions){ $tries++;
+ # print "$lines[0] $pos->[0], $pos->[1], $pos->[2], $pos->[3], $pos->[4], $numLines\n";
- $positionFound = checkAndDrawText ($pos->[0], $pos->[1], $pos->[2], $pos->[3], $pos->[4], \@lines, $svgText, $layer) ;
+ $positionFound = checkAndDrawText($pos->[0], $pos->[1], $pos->[2], $pos->[3], $pos->[4], \@lines, $svgText, $layer);
- if ($positionFound == 1) {
- last LABA ;
- }
- }
- if ($positionFound == 0) { $numLabelsOmitted++ ; }
- if ($tries > 1) { $numLabelsMoved++ ; }
- }
- }
-}
+ if($positionFound == 1){ last LABA;
+ } } if($positionFound == 0){$numLabelsOmitted++;} if($tries > 1){$numLabelsMoved++;} }}}
-
-sub checkAndDrawText {
-#
+sub checkAndDrawText{#
# checks if area available and if so draws text
#
- my ($x1, $x2, $y1, $y2, $orientation, $refLines, $svgText, $layer) = @_ ;
+ my($x1, $x2, $y1, $y2, $orientation, $refLines, $svgText, $layer)= @_;
- if (cv('debug') eq "1") { print "CADT: $x1, $x2, $y1, $y2, $orientation, $refLines, $svgText, $layer\n" ; }
-
- my @lines = @$refLines ;
- my $numLines = scalar @lines ;
- my $lineDist = cv ('linedist') ;
-
- my ($size) = ( $svgText =~ /font-size=\"(\d+)\"/ ) ;
- if ( ! defined $size ) { die ("ERROR: font size could not be determined from svg format string \"$svgText\"\n") ; }
+ if(cv('debug')eq "1"){print "CADT: $x1, $x2, $y1, $y2, $orientation, $refLines, $svgText, $layer\n";}
+ my @lines = @$refLines;
+ my $numLines = scalar @lines;
+ my $lineDist = cv('linedist');
+ my($size)=($svgText =~ /font-size=\"(\d+)\"/);
+ if(! defined $size){die("ERROR: font size could not be determined from svg format string \"$svgText\"\n");}
# WATCH for variable sequence!
- if (
- ( ! boxAreaOccupied ($x1, $y1, $x2, $y2) ) or
- ( cv('forcenodes') eq "1" )
- ) {
+ if((! boxAreaOccupied($x1, $y1, $x2, $y2))or
+(cv('forcenodes')eq "1")){
+ for(my $i=0; $i<=$#lines; $i++){
+ my @points =($x1, $y2+($i+1)*($size+$lineDist), $x2, $y2+($i+1)*($size+$lineDist));
+ my $pathName = "LabelPath" . $labelPathId;
+ $labelPathId++;
+ createPath($pathName, \@points, "definitions");
- for (my $i=0; $i<=$#lines; $i++) {
-
- my @points = ($x1, $y2+($i+1)*($size+$lineDist), $x2, $y2+($i+1)*($size+$lineDist)) ;
- my $pathName = "LabelPath" . $labelPathId ;
- $labelPathId++ ;
- createPath ($pathName, \@points, "definitions") ;
-
- if ($orientation eq "centered") {
- pathText ($svgText, $lines[$i], $pathName, 0, "middle", 50, $layer)
- }
- if ($orientation eq "left") {
- pathText ($svgText, $lines[$i], $pathName, 0, "start", 0, $layer)
- }
- if ($orientation eq "right") {
- pathText ($svgText, $lines[$i], $pathName, 0, "end", 100, $layer)
- }
- }
-
- boxOccupyArea ($x1, $y1, $x2, $y2, 0, 2) ;
+ if($orientation eq "centered"){ pathText($svgText, $lines[$i], $pathName, 0, "middle", 50, $layer) } if($orientation eq "left"){ pathText($svgText, $lines[$i], $pathName, 0, "start", 0, $layer) } if($orientation eq "right"){ pathText($svgText, $lines[$i], $pathName, 0, "end", 100, $layer) } }
+ boxOccupyArea($x1, $y1, $x2, $y2, 0, 2);
- return (1) ;
- }
- else {
- return 0 ;
- }
-}
-
-sub splitLabel {
-#
+ return(1);
+} else{ return 0;
+}}
+sub splitLabel{#
# split label text at space locations and then merge new parts if new part will be smaller than XX chars
#
- my $text = shift ;
- my @lines = split / /, $text ;
- my $merged = 1 ;
- while ($merged) {
- $merged = 0 ;
- LAB2: for (my $i=0; $i<$#lines; $i++) {
- if (length ($lines[$i] . " " . $lines[$i+1]) <= cv ('maxcharperline') ) {
- $lines[$i] = $lines[$i] . " " . $lines[$i+1] ;
- splice (@lines, $i+1, 1) ;
- $merged = 1 ;
- last LAB2 ;
- }
- }
- }
- return (\@lines) ;
+ my $text = shift;
+ my @lines = split / /, $text;
+ my $merged = 1;
+ while($merged){ $merged = 0;
+ LAB2: for(my $i=0; $i<$#lines; $i++){ if(length($lines[$i] . " " . $lines[$i+1])<= cv('maxcharperline')){
+ $lines[$i] = $lines[$i] . " " . $lines[$i+1];
+ splice(@lines, $i+1, 1);
+ $merged = 1;
+ last LAB2;
+ } }} return(\@lines);
}
-
# ------------------------------------------------------------
-sub addToPoiHash {
- my ($name, $sq) = @_ ;
- if (defined $sq) {
- $poiHash{$name}{$sq} = 1 ;
- }
- else {
- $poiHash{$name} = 1 ;
- }
+sub addToPoiHash{ my($name, $sq)= @_;
+ if(defined $sq){ $poiHash{$name}{$sq}= 1;
+} else{ $poiHash{$name}= 1;
+}}
+
+sub getPoiHash{ return \%poiHash;
}
-
-sub getPoiHash {
- return \%poiHash ;
-}
-
-
-1 ;
+1;
diff --git a/mwMap.pm b/mwMap.pm
index e083592..b3c6ffd 100644
--- a/mwMap.pm
+++ b/mwMap.pm
@@ -4,10 +4,10 @@
#
#
#
-# Copyright (C) 2011, Gerhard Schwanz
+# Copyright(C)2011, Gerhard Schwanz
#
# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+# Free Software Foundation; either version 3 of the License, or(at your option)any later version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -16,31 +16,31 @@
#
-package mwMap ;
+package mwMap;
-use strict ;
-use warnings ;
+use strict;
+use warnings;
-use mwConfig ;
-# use mwMisc ;
-# use mwFile ;
-# use mwLabel ;
+use mwConfig;
+# use mwMisc;
+# use mwFile;
+# use mwLabel;
-use OSM::osm ;
+use OSM::osm;
-use Geo::Proj4 ;
+use Geo::Proj4;
-my $areaNum = 0 ;
-my %areaDef = () ;
+my $areaNum = 0;
+my %areaDef =();
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-require Exporter ;
+require Exporter;
-@ISA = qw ( Exporter AutoLoader ) ;
+@ISA = qw(Exporter AutoLoader);
-@EXPORT = qw ( initGraph
+@EXPORT = qw(initGraph
coordsOut
drawCircle
drawSquare
@@ -68,1174 +68,865 @@ require Exporter ;
getShieldId
addToLayer
createLegendFile
- ) ;
+ );
-my @belowWays = ("background", "base", "area", "multi") ;
+my @belowWays =("background", "base", "area", "multi");
-my @aboveWays = ( "arealabels", "wayLabels", "routes", "routeStops", "shields", "nodes", "icons", "text", "additional", "occupied") ;
+my @aboveWays =("arealabels", "wayLabels", "routes", "routeStops", "shields", "nodes", "icons", "text", "additional", "occupied");
-my @elements = ("scale", "ruler", "legend", "wns", "header", "footer", "rectangles", "title", "gpx") ;
+my @elements =("scale", "ruler", "legend", "wns", "header", "footer", "rectangles", "title", "gpx");
-my %svgLayer = () ;
-my %wayLayer = () ;
+my %svgLayer =();
+my %wayLayer =();
-my $shieldPathId = 0 ;
-my %createdShields = () ;
-my %shieldXSize = () ;
-my %shieldYSize = () ;
+my $shieldPathId = 0;
+my %createdShields =();
+my %shieldXSize =();
+my %shieldYSize =();
-my $proj ;
+my $proj;
-my ($bottom, $left, $right, $top) ;
-my ($sizeX, $sizeY) ;
-my ($projLeft, $projBottom, $projRight, $projTop) ;
-my ($projSizeX, $projSizeY) ;
-
-sub initGraph {
+my($bottom, $left, $right, $top);
+my($sizeX, $sizeY);
+my($projLeft, $projBottom, $projRight, $projTop);
+my($projSizeX, $projSizeY);
+sub initGraph{
# function initializes the picture and projection
- my ($x, $l, $b, $r, $t) = @_ ;
+ my($x, $l, $b, $r, $t)= @_;
- # my $l0 = int($l) - 1 ;
- my $l0 = int(($r+$l) / 2 ) ;
+ # my $l0 = int($l)- 1;
+ my $l0 = int(($r+$l)/ 2);
- $proj = Geo::Proj4->new(
- proj => cv('projection'),
+ $proj = Geo::Proj4->new( proj => cv('projection'),
ellps => cv('ellipsoid'),
lon_0 => $l0
- ) or die "parameter error: ".Geo::Proj4->error. "\n";
+)or die "parameter error: ".Geo::Proj4->error. "\n";
- ($projLeft, $projBottom) = $proj->forward($b, $l) ; # lat/lon!!!
- ($projRight, $projTop) = $proj->forward($t, $r) ; # lat/lon!!!
+($projLeft, $projBottom)= $proj->forward($b, $l); # lat/lon!!!
+($projRight, $projTop)= $proj->forward($t, $r); # lat/lon!!!
- $projSizeX = $projRight - $projLeft ;
- $projSizeY = $projTop - $projBottom ;
+ $projSizeX = $projRight - $projLeft;
+ $projSizeY = $projTop - $projBottom;
- my $factor = $projSizeY / $projSizeX ;
+ my $factor = $projSizeY / $projSizeX;
- $sizeX = int ($x) ;
- $sizeY = int ($x * $factor) ;
+ $sizeX = int($x);
+ $sizeY = int($x * $factor);
- $top = $t ;
- $left = $l ;
- $right = $r ;
- $bottom = $b ;
-
- if ( ( cv('bgcolor') ne "none" ) and ( cv('bgcolor') ne "" ) ) {
- my $col = cv('bgcolor') ;
- my $svgText = "fill=\"$col\" " ;
- drawRect (0, 0, $sizeX, $sizeY, 0, $svgText, "background") ;
- }
-
- if ( cv('ruler') ne "0" ) {
- drawRuler() ;
- }
-
- if ( cv('scale') ne "0" ) {
- drawScale() ;
- }
-
- if ( cv('grid') != 0) {
- drawGrid() ;
- }
- if ( cv('coords') eq "1") {
- drawCoords() ;
- }
- if ( length cv('foot') > 0 ) {
- drawFoot() ;
- }
- if ( length cv('head') > 0 ) {
- drawHead() ;
- }
+ $top = $t;
+ $left = $l;
+ $right = $r;
+ $bottom = $b;
+ if((cv('bgcolor')ne "none")and(cv('bgcolor')ne "")){ my $col = cv('bgcolor');
+ my $svgText = "fill=\"$col\" ";
+ drawRect(0, 0, $sizeX, $sizeY, 0, $svgText, "background");
}
-
-sub addToLayer {
- my ($layer, $text) = @_ ;
-
- if ( $layer =~ /^[\d\-\.]+$/) {
- push @{$wayLayer{$layer}}, $text ;
- # print "adding NUMERIC: $text\n" ;
- }
- else {
- push @{$svgLayer{$layer}}, $text ;
- # print "adding TEXTUAL: $text\n" ;
- }
+ if(cv('ruler')ne "0"){ drawRuler();
}
+ if(cv('scale')ne "0"){ drawScale();
+}
+ if(cv('grid')!= 0){ drawGrid();
+} if(cv('coords')eq "1"){ drawCoords();
+} if(length cv('foot')> 0){ drawFoot();
+} if(length cv('head')> 0){ drawHead();
+}
+}
+sub addToLayer{ my($layer, $text)= @_;
-sub drawWay {
+ if($layer =~ /^[\d\-\.]+$/){ push @{$wayLayer{$layer}}, $text;
+ # print "adding NUMERIC: $text\n";
+} else{ push @{$svgLayer{$layer}}, $text;
+ # print "adding TEXTUAL: $text\n";
+}}
+sub drawWay{
+ # accepts list of nodes(plus convert=1)or list of x,y,x,y(convert=0)and draws way/polygon to layerNr if defined or to layerName
- # accepts list of nodes (plus convert=1) or list of x,y,x,y (convert=0) and draws way/polygon to layerNr if defined or to layerName
-
- my ($nodesRef, $convert, $svgString, $layerName, $layerNumber) = @_ ;
- my @points = () ;
- my $valid = 0 ;
+ my($nodesRef, $convert, $svgString, $layerName, $layerNumber)= @_;
+ my @points =();
+ my $valid = 0;
# convert? and expand.
- my ($lonRef, $latRef, $tagRef) = mwFile::getNodePointers() ;
- if ($convert) {
- foreach my $node (@$nodesRef) {
- my ($x, $y) = convert ( $$lonRef{$node}, $$latRef{$node}) ;
- push @points, $x, $y ;
- if (! coordsOut ($x, $y)) {
- $valid = 1 ;
- }
- }
- }
- else {
- @points = @$nodesRef ;
- foreach my $node (@$nodesRef) {
- my ($x, $y) = ( $$lonRef{$node}, $$latRef{$node}) ;
- if (! coordsOut ($x, $y)) {
- $valid = 1 ;
- }
- }
+ my($lonRef, $latRef, $tagRef)= mwFile::getNodePointers();
+ if($convert){ foreach my $node(@$nodesRef){ my($x, $y)= convert($$lonRef{$node}, $$latRef{$node});
+ push @points, $x, $y;
+ if(! coordsOut($x, $y)){ $valid = 1;
+ } }} else{ @points = @$nodesRef;
+ foreach my $node(@$nodesRef){ my($x, $y)=($$lonRef{$node}, $$latRef{$node});
+ if(! coordsOut($x, $y)){ $valid = 1;
+ } }}
+ my $refp = simplifyPoints(\@points);
+ @points = @$refp;
+
+ if($valid){
+ my $svg = "";
- my $refp = simplifyPoints (\@points) ;
- @points = @$refp ;
+ if(defined $layerNumber){ push @{$wayLayer{$layerNumber}}, $svg;
+ } else{ push @{$svgLayer{$layerName}}, $svg;
+ }} else{ # if(){print "way not drawn, outside\n";}}}
- if ($valid) {
- my $svg = "" ;
-
- if (defined $layerNumber) {
- push @{ $wayLayer{ $layerNumber } }, $svg ;
- }
- else {
- push @{ $svgLayer { $layerName } }, $svg ;
- }
- }
- else {
- # if () { print "way not drawn, outside\n" ; }
- }
+ if($convert){($x, $y)= convert($x, $y);
}
+ if(! coordsOut($x, $y)){
+ my $svg = "" . $text . "";
+
+ push @{$svgLayer{$layerName}}, $svg;
+}}
-sub drawText {
-
- my ($x, $y, $convert, $text, $svgString, $layerName) = @_ ;
-
- if ($convert) {
- ($x, $y) = convert ($x, $y) ;
- }
-
- if ( ! coordsOut ($x, $y) ) {
-
- my $svg = "" . $text . "" ;
-
- push @{ $svgLayer { $layerName } }, $svg ;
- }
-}
-
-
-
-
-sub drawCircle {
-
+sub drawCircle{
# draws circle element to svgLayer given; if convertCoords then lon / lat is converted to x / y
- # circleradius either in pixel or in meters (convert=1)
+ # circleradius either in pixel or in meters(convert=1) my($x, $y, $convertCoords, $radius, $convertRadius, $format, $layerName)= @_;
- my ($x, $y, $convertCoords, $radius, $convertRadius, $format, $layerName) = @_ ;
-
- if ($convertCoords) {
- ($x, $y) = convert ($x, $y) ;
- }
- if ($convertRadius) {
- $radius = $radius / (1000 * distance ($left, $bottom, $right, $bottom) ) * $sizeX ;
- }
-
- if ( ! coordsOut ($x, $y) ) {
-
- my $svg = "" ;
-
- push @{ $svgLayer { $layerName } }, $svg ;
- }
+ if($convertCoords){($x, $y)= convert($x, $y);
+} if($convertRadius){ $radius = $radius /(1000 * distance($left, $bottom, $right, $bottom))* $sizeX;
}
+ if(! coordsOut($x, $y)){
+ my $svg = "";
-sub drawSquare {
-
+ push @{$svgLayer{$layerName}}, $svg;
+}}
+sub drawSquare{
# draws square element to svgLayer given; if convertCoords then lon / lat is converted to x / y
- # square size either in pixel or in meters (convert=1)
+ # square size either in pixel or in meters(convert=1) my($x, $y, $convertCoords, $size, $convertSize, $format, $layerName)= @_;
- my ($x, $y, $convertCoords, $size, $convertSize, $format, $layerName) = @_ ;
-
- if ($convertCoords) {
- ($x, $y) = convert ($x, $y) ;
- }
- if ($convertSize) {
- $size = $size / (1000 * distance ($left, $bottom, $right, $bottom) ) * $sizeX ;
- }
-
- my $x1 = $x - $size ;
- my $y1 = $y - $size ;
- my $dSize = 2 * $size ;
-
- if ( ! coordsOut ($x, $y) ) {
-
- my $svg = "" ;
-
- push @{ $svgLayer { $layerName } }, $svg ;
- }
+ if($convertCoords){($x, $y)= convert($x, $y);
+} if($convertSize){ $size = $size /(1000 * distance($left, $bottom, $right, $bottom))* $sizeX;
}
+ my $x1 = $x - $size;
+ my $y1 = $y - $size;
+ my $dSize = 2 * $size;
-sub drawTriangle {
+ if(! coordsOut($x, $y)){
+ my $svg = "";
+ push @{$svgLayer{$layerName}}, $svg;
+}}
+sub drawTriangle{
# draws triangle element to svgLayer given; if convertCoords then lon / lat is converted to x / y
- # square size either in pixel or in meters (convert=1)
+ # square size either in pixel or in meters(convert=1) my($x, $y, $convertCoords, $size, $convertSize, $format, $layerName)= @_;
- my ($x, $y, $convertCoords, $size, $convertSize, $format, $layerName) = @_ ;
-
- if ($convertCoords) {
- ($x, $y) = convert ($x, $y) ;
- }
- if ($convertSize) {
- $size = $size / (1000 * distance ($left, $bottom, $right, $bottom) ) * $sizeX ;
- }
-
- my $h = int ( sqrt ($size * $size / 2) ) ;
-
- my $x1 = $x ;
- # my $y1 = $y - $size ;
- my $y1 = $y - $h ;
- my $x2 = $x - $h ;
- my $y2 = $y + $h ;
- my $x3 = $x + $h ;
- my $y3 = $y + $h ;
-
- if ( ! coordsOut ($x1, $y1, $x2, $y2, $x3, $y3) ) {
-
- my $svg = "" ;
-
- push @{ $svgLayer { $layerName } }, $svg ;
- }
+ if($convertCoords){($x, $y)= convert($x, $y);
+} if($convertSize){ $size = $size /(1000 * distance($left, $bottom, $right, $bottom))* $sizeX;
}
+ my $h = int(sqrt($size * $size / 2));
-sub drawDiamond {
+ my $x1 = $x;
+ # my $y1 = $y - $size;
+ my $y1 = $y - $h;
+ my $x2 = $x - $h;
+ my $y2 = $y + $h;
+ my $x3 = $x + $h;
+ my $y3 = $y + $h;
+ if(! coordsOut($x1, $y1, $x2, $y2, $x3, $y3)){
+ my $svg = "";
+
+ push @{$svgLayer{$layerName}}, $svg;
+}}
+sub drawDiamond{
# draws diamond element to svgLayer given; if convertCoords then lon / lat is converted to x / y
- # square size either in pixel or in meters (convert=1)
+ # square size either in pixel or in meters(convert=1) my($x, $y, $convertCoords, $size, $convertSize, $format, $layerName)= @_;
- my ($x, $y, $convertCoords, $size, $convertSize, $format, $layerName) = @_ ;
-
- if ($convertCoords) {
- ($x, $y) = convert ($x, $y) ;
- }
- if ($convertSize) {
- $size = $size / (1000 * distance ($left, $bottom, $right, $bottom) ) * $sizeX ;
- }
-
- my $x1 = $x - $size ; # left
- my $y1 = $y ;
- my $x2 = $x ; # top
- my $y2 = $y - $size ;
- my $x3 = $x + $size ; #right
- my $y3 = $y ;
- my $x4 = $x ; # bottom
- my $y4 = $y + $size ;
-
- if ( ! coordsOut ($x1, $y1, $x2, $y2, $x3, $y3, $x4, $y4) ) {
- my $svg = "" ;
-
- push @{ $svgLayer { $layerName } }, $svg ;
- }
+ if($convertCoords){($x, $y)= convert($x, $y);
+} if($convertSize){ $size = $size /(1000 * distance($left, $bottom, $right, $bottom))* $sizeX;
}
+ my $x1 = $x - $size; # left
+ my $y1 = $y;
+ my $x2 = $x; # top
+ my $y2 = $y - $size;
+ my $x3 = $x + $size; #right
+ my $y3 = $y;
+ my $x4 = $x; # bottom
+ my $y4 = $y + $size;
-sub drawRect {
+ if(! coordsOut($x1, $y1, $x2, $y2, $x3, $y3, $x4, $y4)){ my $svg = "";
+ push @{$svgLayer{$layerName}}, $svg;
+}}
+sub drawRect{
# draws square element to svgLayer given; if convertCoords then lon / lat is converted to x / y
- # square size either in pixel or in meters (convert=1)
+ # square size either in pixel or in meters(convert=1) my($x1, $y1, $x2, $y2, $convertCoords, $format, $layerName)= @_;
- my ($x1, $y1, $x2, $y2, $convertCoords, $format, $layerName) = @_ ;
-
- if ($convertCoords) {
- ($x1, $y1) = convert ($x1, $y1) ;
- ($x2, $y2) = convert ($x2, $y2) ;
- }
-
- my $sizeX = $x2 - $x1 ;
- my $sizeY = $y2 - $y1 ;
-
- if ( ! coordsOut ($x1, $y1, $x2, $y2) ) {
- my $svg = "" ;
-
- push @{ $svgLayer { $layerName } }, $svg ;
- }
+ if($convertCoords){($x1, $y1)= convert($x1, $y1);
+($x2, $y2)= convert($x2, $y2);
}
+ my $sizeX = $x2 - $x1;
+ my $sizeY = $y2 - $y1;
+ if(! coordsOut($x1, $y1, $x2, $y2)){ my $svg = "";
-sub createPath {
-#
+ push @{$svgLayer{$layerName}}, $svg;
+}}
+
+sub createPath{#
# creates path element for later use with textPath
#
- my ($pathName, $refp, $layer) = @_ ;
+ my($pathName, $refp, $layer)= @_;
- my $refp2 = simplifyPoints ($refp) ;
- my @points = @$refp2 ;
+ my $refp2 = simplifyPoints($refp);
+ my @points = @$refp2;
- my $svg = "\n" ;
+ my $svg = "\n";
- push @{ $svgLayer{ $layer } }, $svg ;
+ push @{$svgLayer{$layer}}, $svg;
}
-
-sub pathText {
-#
+sub pathText{#
# draws text to path element; alignment: start, middle, end
#
- my ($svgText, $text, $pathName, $tSpan, $alignment, $offset, $layer) = @_ ;
+ my($svgText, $text, $pathName, $tSpan, $alignment, $offset, $layer)= @_;
- my $svg = "\n" ;
- $svg = $svg . "\n" ;
- $svg = $svg . "" . $text . " \n" ;
- $svg = $svg . "\n\n" ;
+ my $svg = "\n";
+ $svg = $svg . "\n";
+ $svg = $svg . "" . $text . " \n";
+ $svg = $svg . "\n\n";
- push @{ $svgLayer{ $layer } }, $svg ;
+ push @{$svgLayer{$layer}}, $svg;
}
-
-sub placeIcon {
-#
+sub placeIcon{#
# create SVG text for icons
#
- my ($x, $y, $icon, $sizeX, $sizeY, $layer) = @_ ;
+ my($x, $y, $icon, $sizeX, $sizeY, $layer)= @_;
- if ( ! coordsOut ($x, $y) ) {
+ if(! coordsOut($x, $y)){
+ my($out)= " 0){$out .= " width=\"" . $sizeX . "\"";} if($sizeY > 0){$out .= " height=\"" . $sizeY . "\"";} $out .= " xlink:href=\"" . $icon . "\" />";
- my ($out) = " 0) { $out .= " width=\"" . $sizeX . "\"" ; }
- if ($sizeY > 0) { $out .= " height=\"" . $sizeY . "\"" ; }
- $out .= " xlink:href=\"" . $icon . "\" />" ;
+ push @{$svgLayer{$layer}}, $out;
+}}
- push @{ $svgLayer{ $layer } }, $out ;
- }
-}
-
-
-sub drawArea {
-#
+sub drawArea{#
# draws mp in svg ARRAY of ARRAY of nodes/coordinates
#
- my ($svgText, $icon, $ref, $convert, $layer) = @_ ;
- my @ways = @$ref ;
- my $i ;
- my $svg = "" ;
- my $valid = 1 ;
- my @newArray = () ;
+ my($svgText, $icon, $ref, $convert, $layer)= @_;
+ my @ways = @$ref;
+ my $i;
+ my $svg = "";
+ my $valid = 1;
+ my @newArray =();
# TODO loop converts original data !!!
- if ($convert) {
- my ($lonRef, $latRef, $tagRef) = mwFile::getNodePointers () ;
- foreach my $aRef (@ways) {
- my @way = @$aRef ;
- my @newCoords = () ;
- foreach my $n (@way) {
- my ($x, $y) = convert ($$lonRef{$n}, $$latRef{$n}) ;
- push @newCoords, $x, $y ;
- if (coordsOut ($x, $y)) {
- $valid = 0 ;
- }
- }
- push @newArray , [@newCoords] ;
- }
- @ways = @newArray ;
- }
-
- if (defined $areaDef{$icon}) {
- $svg = "" ;
-
- if ($valid) {
- push @{ $svgLayer{ $layer } }, $svg ;
- }
+ if($convert){ my($lonRef, $latRef, $tagRef)= mwFile::getNodePointers();
+ foreach my $aRef(@ways){ my @way = @$aRef;
+ my @newCoords =();
+ foreach my $n(@way){ my($x, $y)= convert($$lonRef{$n}, $$latRef{$n});
+ push @newCoords, $x, $y;
+ if(coordsOut($x, $y)){ $valid = 0;
+ } } push @newArray , [@newCoords];
+ } @ways = @newArray;
}
+ if(defined $areaDef{$icon}){ $svg = "";
+ if($valid){ push @{$svgLayer{$layer}}, $svg;
+}}
# ---------------------------------------------------------------------
-sub writeMap {
+sub writeMap{
+ my $fileName = cv('out');
- my $fileName = cv ('out') ;
+ open(my $file, ">", $fileName)|| die "can't open svg output file $fileName\n";
- open (my $file, ">", $fileName) || die "can't open svg output file $fileName\n";
+ print $file "\n";
+ print $file "\n";
- print $file "\n" ;
- print $file "\n" ;
+ my $w = $sizeX / 300 * 2.54; # cm
+ my $h = $sizeY / 300 * 2.54;
- my $w = $sizeX / 300 * 2.54 ; # cm
- my $h = $sizeY / 300 * 2.54 ;
-
- my ($svg) = "\n" ;
-
- close ($file) ;
-
- if (cv('pdf') eq "1") {
- my ($pdfName) = $fileName ;
- $pdfName =~ s/\.svg/\.pdf/ ;
- print "creating pdf file $pdfName ...\n" ;
- `inkscape -A $pdfName $fileName` ;
- }
-
- if (cv('png') eq "1") {
- my ($pngName) = $fileName ;
- $pngName =~ s/\.svg/\.png/ ;
- my $dpi = cv('pngdpi') ;
- print "creating png file $pngName ($dpi dpi)...\n" ;
- `inkscape --export-dpi=$dpi -e $pngName $fileName` ;
- }
-
+ if(cv('pdf')eq "1"){ my($pdfName)= $fileName;
+ $pdfName =~ s/\.svg/\.pdf/;
+ print "creating pdf file $pdfName ...\n";
+ `inkscape -A $pdfName $fileName`;
+}
+ if(cv('png')eq "1"){ my($pngName)= $fileName;
+ $pngName =~ s/\.svg/\.png/;
+ my $dpi = cv('pngdpi');
+ print "creating png file $pngName($dpi dpi)...\n";
+ `inkscape --export-dpi=$dpi -e $pngName $fileName`;
+}
}
-
# -----------------------------------------------------------------------------------
-sub drawGrid {
-#
+sub drawGrid{#
# draw grid on top of map. receives number of parts in x/lon direction
#
- my $number = cv ('grid') ;
- my $color = cv ('gridcolor') ;
+ my $number = cv('grid');
+ my $color = cv('gridcolor');
- my $part = $sizeX / $number ;
- my $numY = $sizeY / $part ;
+ my $part = $sizeX / $number;
+ my $numY = $sizeY / $part;
- my $svgStringLine="stroke=\"$color\" stroke-width=\"5\" stroke-dasharray=\"30,30\"" ;
+ my $svgStringLine="stroke=\"$color\" stroke-width=\"5\" stroke-dasharray=\"30,30\"";
- my $svgStringText = mwMisc::createTextSVG ( cv('elementFontFamily'), cv('elementFont'), undef, undef, 60, $color, undef, undef) ;
+ my $svgStringText = mwMisc::createTextSVG(cv('elementFontFamily'), cv('elementFont'), undef, undef, 60, $color, undef, undef);
# vertical lines
- for (my $i = 1; $i <= $number; $i++) {
- my @coords = ($i*$part, 0, $i*$part, $sizeY) ;
- drawWay (\@coords, 0, $svgStringLine, "additional", undef) ;
- drawText ( ($i-1)*$part+$part/2, 160, 0, chr($i+64), $svgStringText, "additional") ;
+ for(my $i = 1; $i <= $number; $i++){ my @coords =($i*$part, 0, $i*$part, $sizeY);
+ drawWay(\@coords, 0, $svgStringLine, "additional", undef);
+ drawText(($i-1)*$part+$part/2, 160, 0, chr($i+64), $svgStringText, "additional");
- }
-
- # hor. lines
- for (my $i = 1; $i <= $numY; $i++) {
- my @coords = (0, $i*$part, $sizeX, $i*$part) ;
- drawWay (\@coords, 0, $svgStringLine, "additional", undef) ;
- drawText ( 20, ($i-1)*$part+$part/2, 0, $i, $svgStringText, "additional") ;
-
- }
}
+ # hor. lines
+ for(my $i = 1; $i <= $numY; $i++){ my @coords =(0, $i*$part, $sizeX, $i*$part);
+ drawWay(\@coords, 0, $svgStringLine, "additional", undef);
+ drawText(20,($i-1)*$part+$part/2, 0, $i, $svgStringText, "additional");
-sub drawCoords {
-#
+}}
+sub drawCoords{#
# draws coordinates grid on map
#
- my $exp = cv('coordsexp') ;
- my $color = cv ('coordscolor');
- my $step = 10 ** $exp ;
+ my $exp = cv('coordsexp');
+ my $color = cv('coordscolor');
+ my $step = 10 ** $exp;
# vert. lines
- my $start = int ($left / $step) + 1 ;
- my $actual = $start * $step ;
+ my $start = int($left / $step)+ 1;
+ my $actual = $start * $step;
- my $svgStringLine="stroke=\"$color\" stroke-width=\"3\"" ;
- my $svgStringText = mwMisc::createTextSVG ( cv('elementFontFamily'), cv('elementFont'), undef, undef, 30, $color, undef, undef) ;
+ my $svgStringLine="stroke=\"$color\" stroke-width=\"3\"";
+ my $svgStringText = mwMisc::createTextSVG(cv('elementFontFamily'), cv('elementFont'), undef, undef, 30, $color, undef, undef);
- while ($actual < $right) {
- my ($x1, $y1) = convert ($actual, 0) ;
+ while($actual < $right){ my($x1, $y1)= convert($actual, 0);
- drawText ( $x1+10, $sizeY-50, 0, $actual, $svgStringText, "additional") ;
+ drawText($x1+10, $sizeY-50, 0, $actual, $svgStringText, "additional");
- my @coords = ($x1, 0, $x1, $sizeY) ;
- drawWay (\@coords, 0, $svgStringLine, "additional", undef) ;
+ my @coords =($x1, 0, $x1, $sizeY);
+ drawWay(\@coords, 0, $svgStringLine, "additional", undef);
- $actual += $step ;
- }
-
- # hor lines
- $start = int ($bottom / $step) + 1 ;
- $actual = $start * $step ;
- while ($actual < $top) {
- # print "actualY: $actual\n" ;
- my ($x1, $y1) = convert (0, $actual) ;
-
- drawText ( $sizeX-180, $y1+30, 0, $actual, $svgStringText, "additional") ;
-
- my @coords = (0, $y1, $sizeX, $y1) ;
- drawWay (\@coords, 0, $svgStringLine, "additional", undef) ;
-
- $actual += $step ;
- }
+ $actual += $step;
}
+ # hor lines
+ $start = int($bottom / $step)+ 1;
+ $actual = $start * $step;
+ while($actual < $top){ # print "actualY: $actual\n";
+ my($x1, $y1)= convert(0, $actual);
+ drawText($sizeX-180, $y1+30, 0, $actual, $svgStringText, "additional");
+
+ my @coords =(0, $y1, $sizeX, $y1);
+ drawWay(\@coords, 0, $svgStringLine, "additional", undef);
+
+ $actual += $step;
+}}
# -----------------------------------------------------------------------------------
-sub convert {
-
+sub convert{
# converts real world coordinates to system graph pixel coordinates
- my ($x, $y) = @_ ;
+ my($x, $y)= @_;
- my ($x1, $y1) = $proj->forward($y, $x) ; # lat/lon!!!
+ my($x1, $y1)= $proj->forward($y, $x); # lat/lon!!!
- my $x2 = int ( ($x1 - $projLeft) / ($projRight - $projLeft) * $sizeX ) ;
- my $y2 = $sizeY - int ( ($y1 - $projBottom) / ($projTop - $projBottom) * $sizeY ) ;
+ my $x2 = int(($x1 - $projLeft)/($projRight - $projLeft)* $sizeX);
+ my $y2 = $sizeY - int(($y1 - $projBottom)/($projTop - $projBottom)* $sizeY);
- return ($x2, $y2) ;
+ return($x2, $y2);
}
+sub simplifyPoints{ my $ref = shift;
+ my @points = @$ref;
+ my @newPoints;
+ my $maxIndex = $#points;
-sub simplifyPoints {
- my $ref = shift ;
- my @points = @$ref ;
- my @newPoints ;
- my $maxIndex = $#points ;
-
- if (scalar @points > 4) {
- # push first
- push @newPoints, $points[0], $points[1] ;
+ if(scalar @points > 4){ # push first
+ push @newPoints, $points[0], $points[1];
# push other
- for (my $i=2; $i <= $maxIndex; $i+=2) {
- # $simplifyTotal++ ;
- if ( ($points[$i]==$points[$i-2]) and ($points[$i+1]==$points[$i-1]) ) {
- # same
- # $simplified++ ;
- }
- else {
- push @newPoints, $points[$i], $points[$i+1] ;
- }
- }
- return (\@newPoints) ;
- }
- else {
- return ($ref) ;
- }
-
+ for(my $i=2; $i <= $maxIndex; $i+=2){ # $simplifyTotal++;
+ if(($points[$i]==$points[$i-2])and($points[$i+1]==$points[$i-1])){ # same
+ # $simplified++;
+ } else{ push @newPoints, $points[$i], $points[$i+1];
+ } } return(\@newPoints);
+} else{ return($ref);
}
-
-sub drawRuler {
-#
+}
+sub drawRuler{#
# draws ruler
#
- my $col = cv('rulercolor') ;
+ my $col = cv('rulercolor');
- my $B ; my $B2 ;
- my $L ; my $Lpix ;
- my $x ;
- my $text ;
+ my $B; my $B2;
+ my $L; my $Lpix;
+ my $x;
+ my $text;
- my $lineThickness = 8 ; # at 300dpi
- my $textSize = 40 ; # at 300 dpi
- my $textDist = 60 ; # at 300 dpi
- my $lineLen = 40 ; # at 300 dpi
+ my $lineThickness = 8; # at 300dpi
+ my $textSize = 40; # at 300 dpi
+ my $textDist = 60; # at 300 dpi
+ my $lineLen = 40; # at 300 dpi
- my $xOffset = 2 * $lineThickness ;
- my $yOffset = 2 * $lineThickness ;
+ my $xOffset = 2 * $lineThickness;
+ my $yOffset = 2 * $lineThickness;
- $B = $right - $left ; # in degrees
- $B2 = $B * cos ($top/360*3.14*2) * 111.1 ; # in km
- $text = "50m" ; $x = 0.05 ; # default length ruler
+ $B = $right - $left; # in degrees
+ $B2 = $B * cos($top/360*3.14*2)* 111.1; # in km
+ $text = "50m"; $x = 0.05; # default length ruler
- if ($B2 > 0.5) {$text = "100 m" ; $x = 0.1 ; } # enlarge ruler
- if ($B2 > 1) {$text = "500 m" ; $x = 0.5 ; } # enlarge ruler
- if ($B2 > 5) {$text = "1 km" ; $x = 1 ; }
- if ($B2 > 10) {$text = "5 km" ; $x = 5 ; }
- if ($B2 > 50) {$text = "10 km" ; $x = 10 ; }
- $L = $x / (cos ($top/360*3.14*2) * 111.1 ) ; # length ruler in km
- $Lpix = $L / $B * $sizeX ; # length ruler in pixels
+ if($B2 > 0.5){$text = "100 m"; $x = 0.1;}# enlarge ruler
+ if($B2 > 1){$text = "500 m"; $x = 0.5;}# enlarge ruler
+ if($B2 > 5){$text = "1 km"; $x = 1;} if($B2 > 10){$text = "5 km"; $x = 5;} if($B2 > 50){$text = "10 km"; $x = 10;} $L = $x /(cos($top/360*3.14*2)* 111.1); # length ruler in km
+ $Lpix = $L / $B * $sizeX; # length ruler in pixels
- my $rSizeX = int ($Lpix + 2 * $xOffset) ;
- my $rSizeY = int ($lineLen + $textSize + 3 * $yOffset) ;
- addToLayer ("definitions", "") ;
+ my $rSizeX = int($Lpix + 2 * $xOffset);
+ my $rSizeY = int($lineLen + $textSize + 3 * $yOffset);
+ addToLayer("definitions", "");
- if ( cv('rulerbackground') ne "none" ) {
- my $color = cv ('rulerbackground') ;
- my $svgString = "fill=\"$color\"" ;
- drawRect (0, 0, $rSizeX, $rSizeY, 0, $svgString, "definitions") ;
- }
-
- my $svgString = "stroke=\"$col\" stroke-width=\"$lineThickness\" stroke-linecap=\"round\" " ;
-
- my @coords = ($xOffset, $yOffset, $xOffset+$Lpix, $yOffset) ;
- drawWay (\@coords, 0, $svgString, "definitions", undef) ;
-
- @coords = ($xOffset, $yOffset, $xOffset, $yOffset+$lineLen) ;
- drawWay (\@coords, 0, $svgString, "definitions", undef) ;
-
- @coords = ($xOffset+$Lpix, $yOffset, $xOffset+$Lpix, $yOffset+$lineLen) ;
- drawWay (\@coords, 0, $svgString, "definitions", undef) ;
-
- @coords = ($xOffset+$Lpix/2, $yOffset, $xOffset+$Lpix/2, $yOffset+$lineLen/2) ;
- drawWay (\@coords, 0, $svgString, "definitions", undef) ;
-
-
- my $scale= getScale() ;
- $text .= "(1:$scale)" ;
-
-
- $svgString = mwMisc::createTextSVG ( cv('elementFontFamily'), cv('elementFont'), undef, undef, 35, $col, undef, undef) ;
- drawText ($xOffset, $yOffset+$textDist+30, 0, $text, $svgString, "definitions") ;
-
- addToLayer ("definitions", "") ;
-
- my $posX = 40 ; my $posY = 40 ;
-
- if ( cv('ruler') eq "2") {
- $posX = $sizeX - 40 - $rSizeX ;
- $posY = 40 ;
- }
-
- if ( cv('ruler') eq "3") {
- $posX = 40 ;
- $posY = $sizeY - 40 - $rSizeY ;
- }
-
- if ( cv('ruler') eq "4") {
- $posX = $sizeX - 40 - $rSizeX ;
- $posY = $sizeY - 40 - $rSizeY ;
- }
-
- addToLayer ("ruler", "") ;
+ if(cv('rulerbackground')ne "none"){ my $color = cv('rulerbackground');
+ my $svgString = "fill=\"$color\"";
+ drawRect(0, 0, $rSizeX, $rSizeY, 0, $svgString, "definitions");
}
+ my $svgString = "stroke=\"$col\" stroke-width=\"$lineThickness\" stroke-linecap=\"round\" ";
-sub drawScale {
-#
+ my @coords =($xOffset, $yOffset, $xOffset+$Lpix, $yOffset);
+ drawWay(\@coords, 0, $svgString, "definitions", undef);
+
+ @coords =($xOffset, $yOffset, $xOffset, $yOffset+$lineLen);
+ drawWay(\@coords, 0, $svgString, "definitions", undef);
+
+ @coords =($xOffset+$Lpix, $yOffset, $xOffset+$Lpix, $yOffset+$lineLen);
+ drawWay(\@coords, 0, $svgString, "definitions", undef);
+
+ @coords =($xOffset+$Lpix/2, $yOffset, $xOffset+$Lpix/2, $yOffset+$lineLen/2);
+ drawWay(\@coords, 0, $svgString, "definitions", undef);
+
+
+ my $scale= getScale();
+ $text .= "(1:$scale)";
+
+
+ $svgString = mwMisc::createTextSVG(cv('elementFontFamily'), cv('elementFont'), undef, undef, 35, $col, undef, undef);
+ drawText($xOffset, $yOffset+$textDist+30, 0, $text, $svgString, "definitions");
+
+ addToLayer("definitions", "");
+
+ my $posX = 40; my $posY = 40;
+
+ if(cv('ruler')eq "2"){ $posX = $sizeX - 40 - $rSizeX;
+ $posY = 40;
+}
+ if(cv('ruler')eq "3"){ $posX = 40;
+ $posY = $sizeY - 40 - $rSizeY;
+}
+ if(cv('ruler')eq "4"){ $posX = $sizeX - 40 - $rSizeX;
+ $posY = $sizeY - 40 - $rSizeY;
+}
+ addToLayer("ruler", "");
+}
+sub drawScale{#
# draws scale value
#
- my $col = cv('scalecolor') ;
+ my $col = cv('scalecolor');
- my $xOffset = 20 ;
- my $yOffset = 20 ;
- my $fontSize = 70 ;
- my $borderDist = 60 ;
+ my $xOffset = 20;
+ my $yOffset = 20;
+ my $fontSize = 70;
+ my $borderDist = 60;
- my $rSizeX = int (350 + 2 * $xOffset) ;
- my $rSizeY = int ($fontSize + 2 * $yOffset) ;
- addToLayer ("definitions", "") ;
+ my $rSizeX = int(350 + 2 * $xOffset);
+ my $rSizeY = int($fontSize + 2 * $yOffset);
+ addToLayer("definitions", "");
- if ( cv('scalebackground') ne "none" ) {
- my $color = cv ('scalebackground') ;
- my $svgString = "fill=\"$color\"" ;
- drawRect (0, 0, $rSizeX, $rSizeY, 0, $svgString, "definitions") ;
- }
-
- my $scale= getScale() ;
-
- my $svgString = mwMisc::createTextSVG ( cv('elementFontFamily'), cv('elementFont'), undef, undef, $fontSize, $col, undef, undef) ;
- drawText ($xOffset, $fontSize + $yOffset, 0, "1:$scale", $svgString, "definitions") ;
-
- addToLayer ("definitions", "") ;
-
- my $posX = $borderDist ; my $posY = $borderDist ;
-
- if ( cv('scale') eq "2") {
- $posX = $sizeX - $borderDist - $rSizeX ;
- $posY = $borderDist ;
- }
-
- if ( cv('scale') eq "3") {
- $posX = $borderDist ;
- $posY = $sizeY - $borderDist - $rSizeY ;
- }
-
- if ( cv('scale') eq "4") {
- $posX = $sizeX - $borderDist - $rSizeX ;
- $posY = $sizeY - $borderDist - $rSizeY ;
- }
-
- addToLayer ("scale", "") ;
+ if(cv('scalebackground')ne "none"){ my $color = cv('scalebackground');
+ my $svgString = "fill=\"$color\"";
+ drawRect(0, 0, $rSizeX, $rSizeY, 0, $svgString, "definitions");
}
+ my $scale= getScale();
-sub drawFoot {
-#
+ my $svgString = mwMisc::createTextSVG(cv('elementFontFamily'), cv('elementFont'), undef, undef, $fontSize, $col, undef, undef);
+ drawText($xOffset, $fontSize + $yOffset, 0, "1:$scale", $svgString, "definitions");
+
+ addToLayer("definitions", "");
+
+ my $posX = $borderDist; my $posY = $borderDist;
+
+ if(cv('scale')eq "2"){ $posX = $sizeX - $borderDist - $rSizeX;
+ $posY = $borderDist;
+}
+ if(cv('scale')eq "3"){ $posX = $borderDist;
+ $posY = $sizeY - $borderDist - $rSizeY;
+}
+ if(cv('scale')eq "4"){ $posX = $sizeX - $borderDist - $rSizeX;
+ $posY = $sizeY - $borderDist - $rSizeY;
+}
+ addToLayer("scale", "");
+}
+sub drawFoot{#
# draws footer
#
- my $col = cv('footcolor') ;
- my $text = cv('foot') ;
- my $len = length $text ;
+ my $col = cv('footcolor');
+ my $text = cv('foot');
+ my $len = length $text;
- my $xOffset = 20 ;
- my $yOffset = 20 ;
- my $fontSize = cv('footsize') ;
- my $borderDistX = 60 ;
- my $borderDistY = $fontSize + 50 ;
+ my $xOffset = 20;
+ my $yOffset = 20;
+ my $fontSize = cv('footsize');
+ my $borderDistX = 60;
+ my $borderDistY = $fontSize + 50;
- my $rSizeX = int ($len*cv('ppc')/10*$fontSize + 2 * $xOffset) ;
- my $rSizeY = int ($fontSize + 2 * $yOffset) ;
- addToLayer ("definitions", "");
+
+ my $posX = $borderDistX; my $posY = $sizeY - $borderDistY;
+
+ addToLayer("footer", "");
+}
+sub drawHead{#
# draws header
#
- my $col = cv('headcolor') ;
- my $text = cv('head') ;
- my $len = length $text ;
+ my $col = cv('headcolor');
+ my $text = cv('head');
+ my $len = length $text;
- my $xOffset = 20 ;
- my $yOffset = 20 ;
- my $fontSize = cv('headsize') ;
- my $borderDistX = 60 ;
- my $borderDistY = 60 ;
+ my $xOffset = 20;
+ my $yOffset = 20;
+ my $fontSize = cv('headsize');
+ my $borderDistX = 60;
+ my $borderDistY = 60;
- my $rSizeX = int ($len*cv('ppc')/10*$fontSize + 2 * $xOffset) ;
- my $rSizeY = int ($fontSize + 2 * $yOffset) ;
- addToLayer ("definitions", "") ;
+ my $rSizeX = int($len*cv('ppc')/10*$fontSize + 2 * $xOffset);
+ my $rSizeY = int($fontSize + 2 * $yOffset);
+ addToLayer("definitions", "");
- if ( cv('headbackground') ne "none" ) {
- my $color = cv ('headbackground') ;
- my $svgString = "fill=\"$color\"" ;
- drawRect (0, 0, $rSizeX, $rSizeY, 0, $svgString, "definitions") ;
- }
+ if(cv('headbackground')ne "none"){ my $color = cv('headbackground');
+ my $svgString = "fill=\"$color\"";
+ drawRect(0, 0, $rSizeX, $rSizeY, 0, $svgString, "definitions");
+}
+ my $svgString = mwMisc::createTextSVG(cv('elementFontFamily'), cv('elementFont'), undef, undef, $fontSize, $col, undef, undef);
+ drawText($xOffset, $fontSize + $yOffset, 0, $text, $svgString, "definitions");
- my $svgString = mwMisc::createTextSVG ( cv('elementFontFamily'), cv('elementFont'), undef, undef, $fontSize, $col, undef, undef) ;
- drawText ($xOffset, $fontSize + $yOffset, 0, $text, $svgString, "definitions") ;
+ addToLayer("definitions", "");
- addToLayer ("definitions", "") ;
+ my $posX = $borderDistX; my $posY = $borderDistY;
- my $posX = $borderDistX ; my $posY = $borderDistY ;
-
- addToLayer ("header", "") ;
+ addToLayer("header", "");
}
-
-sub fitsPaper {
-#
+sub fitsPaper{#
# calculates on what paper size the map will fit. sizes are taken from global variables
#
- my $width = $sizeX / 300 * 2.54 ;
- my $height = $sizeY / 300 * 2.54 ;
- my $paper = "" ;
+ my $width = $sizeX / 300 * 2.54;
+ my $height = $sizeY / 300 * 2.54;
+ my $paper = "";
- my @sizes = () ;
- push @sizes, ["4A0", 168.2, 237.8] ;
- push @sizes, ["2A0", 118.9, 168.2] ;
- push @sizes, ["A0", 84.1, 118.9] ;
- push @sizes, ["A1", 59.4, 84.1] ;
- push @sizes, ["A2", 42, 59.4] ;
- push @sizes, ["A3", 29.7, 42] ;
- push @sizes, ["A4", 21, 29.7] ;
- push @sizes, ["A5", 14.8, 21] ;
- push @sizes, ["A6", 10.5, 14.8] ;
- push @sizes, ["A7", 7.4, 10.5] ;
- push @sizes, ["none", 0, 0] ;
+ my @sizes =();
+ push @sizes, ["4A0", 168.2, 237.8];
+ push @sizes, ["2A0", 118.9, 168.2];
+ push @sizes, ["A0", 84.1, 118.9];
+ push @sizes, ["A1", 59.4, 84.1];
+ push @sizes, ["A2", 42, 59.4];
+ push @sizes, ["A3", 29.7, 42];
+ push @sizes, ["A4", 21, 29.7];
+ push @sizes, ["A5", 14.8, 21];
+ push @sizes, ["A6", 10.5, 14.8];
+ push @sizes, ["A7", 7.4, 10.5];
+ push @sizes, ["none", 0, 0];
- foreach my $size (@sizes) {
- if ( ( ($width<=$size->[1]) and ($height<=$size->[2]) ) or ( ($width<=$size->[2]) and ($height<=$size->[1]) ) ) {
- $paper = $size->[0] ;
- }
- }
-
- return ($paper, $width, $height) ;
+ foreach my $size(@sizes){ if((($width<=$size->[1])and($height<=$size->[2]))or(($width<=$size->[2])and($height<=$size->[1]))){ $paper = $size->[0];
+ }}
+ return($paper, $width, $height);
}
-
-sub getScale {
-#
+sub getScale{#
# calcs scale of map
#
- my ($dpi) = 300 ;
+ my($dpi)= 300;
- my $dist = distance ($left, $bottom, $right, $bottom) ;
- my $inches = $sizeX / $dpi ;
- my $cm = $inches * 2.54 ;
- my $scale = int ( $dist / ($cm/100/1000) ) ;
- $scale = int ($scale / 100) * 100 ;
+ my $dist = distance($left, $bottom, $right, $bottom);
+ my $inches = $sizeX / $dpi;
+ my $cm = $inches * 2.54;
+ my $scale = int($dist /($cm/100/1000));
+ $scale = int($scale / 100)* 100;
- return ($scale) ;
+ return($scale);
}
-
-sub gridSquare {
-#
+sub gridSquare{#
# returns grid square of given coordinates for directories
#
- my ($lon, $lat) = @_ ;
+ my($lon, $lat)= @_;
- my $parts = cv('grid') ;
+ my $parts = cv('grid');
- my ($x, $y) = convert ($lon, $lat) ;
- my $xi = int ($x / ($sizeX / $parts)) + 1 ;
- my $yi = int ($y / ($sizeX / $parts)) + 1 ;
- if ( ($x >= 0) and ($x <= $sizeX) and ($y >= 0) and ($y <= $sizeY) ) {
- return (chr($xi+64) . $yi) ;
- }
- else {
- return undef ;
- }
+ my($x, $y)= convert($lon, $lat);
+ my $xi = int($x /($sizeX / $parts))+ 1;
+ my $yi = int($y /($sizeX / $parts))+ 1;
+ if(($x >= 0)and($x <= $sizeX)and($y >= 0)and($y <= $sizeY)){ return(chr($xi+64). $yi);
+} else{ return undef;
+}}
+
+sub getDimensions{ return($sizeX, $sizeY);
}
-
-
-sub getDimensions {
- return ($sizeX, $sizeY) ;
-}
-
# ----------------------------------------------------------------------
-sub initOneways {
-#
+sub initOneways{#
# write marker defs to svg
#
- my $color = cv('onewaycolor') ;
+ my $color = cv('onewaycolor');
- my @svgOutputDef = () ;
- for (my $markerSize = 5; $markerSize <= 40; $markerSize++) {
- push @svgOutputDef, "" ;
- push @svgOutputDef, "" ;
- push @svgOutputDef, "" ;
- }
-
-
- foreach my $line (@svgOutputDef) {
- addToLayer ("definitions", $line) ;
- }
+ my @svgOutputDef =();
+ for(my $markerSize = 5; $markerSize <= 40; $markerSize++){ push @svgOutputDef, "";
+ push @svgOutputDef, "";
+ push @svgOutputDef, "";
}
-sub addOnewayArrows {
-#
+ foreach my $line(@svgOutputDef){ addToLayer("definitions", $line);
+}}
+sub addOnewayArrows{#
# adds oneway arrows to new pathes
#
- my ($wayNodesRef, $direction, $thickness, $layer) = @_ ;
- my @wayNodes = @$wayNodesRef ;
- my ($lonRef, $latRef) = mwFile::getNodePointers() ;
+ my($wayNodesRef, $direction, $thickness, $layer)= @_;
+ my @wayNodes = @$wayNodesRef;
+ my($lonRef, $latRef)= mwFile::getNodePointers();
- if ($direction == -1) { @wayNodes = reverse @wayNodes ; }
+ if($direction == -1){@wayNodes = reverse @wayNodes;}
+ my $minDist = cv('onewaysize')* 1.5;
+ my $markerSize = cv('onewaySize');
- my $minDist = cv('onewaysize') * 1.5 ;
- my $markerSize = cv('onewaySize') ;
-
- if ( cv('onewayAutoSize') != 0 ) {
- $markerSize = int ( $thickness / 100 * cv('onewayAutoSize') ) ;
- if ( $markerSize < 5 ) { $markerSize = 5 ; }
- if ( $markerSize > 40 ) { $markerSize = 40 ; }
- $minDist = $markerSize * 1.5 ;
- }
-
- # create new pathes with new nodes
- for (my $i = 0; $i < scalar( @wayNodes ) - 1; $i++ ) {
- my ($x1, $y1) = convert ($$lonRef{$wayNodes[$i]}, $$latRef{$wayNodes[$i]}) ;
- my ($x2, $y2) = convert ($$lonRef{$wayNodes[$i+1]}, $$latRef{$wayNodes[$i+1]}) ;
- my $xn = ($x2+$x1) / 2 ;
- my $yn = ($y2+$y1) / 2 ;
- if (sqrt (($x2-$x1)**2+($y2-$y1)**2) > $minDist) {
- # create path
- # use path
- my $svg = "" ;
-
- addToLayer ($layer+$thickness/100, $svg) ;
- }
- }
+ if(cv('onewayAutoSize')!= 0){ $markerSize = int($thickness / 100 * cv('onewayAutoSize'));
+ if($markerSize < 5){$markerSize = 5;} if($markerSize > 40){$markerSize = 40;} $minDist = $markerSize * 1.5;
}
-
+ # create new pathes with new nodes
+ for(my $i = 0; $i < scalar(@wayNodes)- 1; $i++){ my($x1, $y1)= convert($$lonRef{$wayNodes[$i]}, $$latRef{$wayNodes[$i]});
+ my($x2, $y2)= convert($$lonRef{$wayNodes[$i+1]}, $$latRef{$wayNodes[$i+1]});
+ my $xn =($x2+$x1)/ 2;
+ my $yn =($y2+$y1)/ 2;
+ if(sqrt(($x2-$x1)**2+($y2-$y1)**2)> $minDist){ # create path
+ # use path
+ my $svg = "";
+
+ addToLayer($layer+$thickness/100, $svg);
+ }}}
# ----------------------------------------------------------------------------
-sub addAreaIcon {
-#
+sub addAreaIcon{#
# initial collection of area icons
#
- my $fileNameOriginal = shift ;
- # print "AREA: $fileNameOriginal\n" ;
- my $result = open (my $file, "<", $fileNameOriginal) ;
- close ($file) ;
- if ($result) {
- my ($x, $y) ;
- if (grep /.svg/, $fileNameOriginal) {
- ($x, $y) = mwMisc::sizeSVG ($fileNameOriginal) ;
- if ( ($x == 0) or ($y == 0) ) {
- $x = 32 ; $y = 32 ;
- print "WARNING: size of file $fileNameOriginal could not be determined. Set to 32px x 32px\n" ;
- }
+ my $fileNameOriginal = shift;
+ # print "AREA: $fileNameOriginal\n";
+ my $result = open(my $file, "<", $fileNameOriginal);
+ close($file);
+ if($result){ my($x, $y);
+ if(grep /.svg/, $fileNameOriginal){ ($x, $y)= mwMisc::sizeSVG($fileNameOriginal);
+ if(($x == 0)or($y == 0)){
+ $x = 32; $y = 32;
+ print "WARNING: size of file $fileNameOriginal could not be determined. Set to 32px x 32px\n";
}
-
- if (grep /.png/, $fileNameOriginal) {
- ($x, $y) = mwMisc::sizePNG ($fileNameOriginal) ;
- }
-
- if (!defined $areaDef{$fileNameOriginal}) {
-
- my $x1 = $x ; # scale area icons
- my $y1 = $y ;
- my $fx = $x1 / $x ;
- my $fy = $y1 / $y ;
+ }
+ if(grep /.png/, $fileNameOriginal){ ($x, $y)= mwMisc::sizePNG($fileNameOriginal);
+ }
+ if(!defined $areaDef{$fileNameOriginal}){
+ my $x1 = $x; # scale area icons
+ my $y1 = $y;
+ my $fx = $x1 / $x;
+ my $fy = $y1 / $y;
# add defs to svg output
- my $defName = "A" . $areaNum ;
- # print "INFO area icon $fileNameOriginal, $defName, $x, $y --- $x1, $y1 --- $fx, $fy --- processed.\n" ;
- $areaNum++ ;
+ my $defName = "A" . $areaNum;
+ # print "INFO area icon $fileNameOriginal, $defName, $x, $y --- $x1, $y1 --- $fx, $fy --- processed.\n";
+ $areaNum++;
- my $svgElement = "\n" ;
- $svgElement .= " \n" ;
- $svgElement .= "\n" ;
+ my $svgElement = "\n";
+ $svgElement .= " \n";
+ $svgElement .= "\n";
- addToLayer ("definitions", $svgElement) ;
-
- $defName = "#" . $defName ;
- $areaDef{$fileNameOriginal} = $defName ;
- }
- }
- else {
- print "WARNING: area icon $fileNameOriginal not found!\n" ;
- }
-}
+ addToLayer("definitions", $svgElement);
+ $defName = "#" . $defName;
+ $areaDef{$fileNameOriginal}= $defName;
+ }} else{ print "WARNING: area icon $fileNameOriginal not found!\n";
+}}
# ----------------------------------------------------------------------------
-sub createShield {
- my ($name, $targetSize) = @_ ;
- my @a = split /:/, $name ;
- my $shieldFileName = $a[1] ;
- my $shieldText = $a[2] ;
+sub createShield{ my($name, $targetSize)= @_;
+ my @a = split /:/, $name;
+ my $shieldFileName = $a[1];
+ my $shieldText = $a[2];
- if (! defined $createdShields{$name}) {
- open (my $file, "<", $shieldFileName) or die ("ERROR: shield definition $shieldFileName not found.\n") ;
- my @defText = <$file> ;
- close ($file) ;
+ if(! defined $createdShields{$name}){ open(my $file, "<", $shieldFileName)or die("ERROR: shield definition $shieldFileName not found.\n");
+ my @defText = <$file>;
+ close($file);
# get size
# calc scaling
- my $sizeX = 0 ;
- my $sizeY = 0 ;
- foreach my $line (@defText) {
- if (grep /