Merge remote-tracking branch 'gh_aug/master' into brttnext

bin/db/inwhichpolygons/LICENSE

@@ -0,0 +1,39 @@
+Copyright (c) 2003 Nikolaus Horn
+All rights reserved. 
+
+This software is licensed under the New BSD license: 
+
+Redistribution and use in source and binary forms,
+with or without modification, are permitted provided
+that the following conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the
+above copyright notice, this list of conditions and
+the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+* Neither the name of Nikolaus Horn nor
+the names of its contributors may be used to endorse
+or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+

bin/db/net_sim/net_sim.1

@@ -5,6 +5,7 @@ net_sim \- estimate network magnitude threshold
 .nf
 \fBnet_sim \fP[-v] [-n \fInsta\fP] [-p \fIpf\fP] [-i \fIsta\fP[,\fIsta2\fP]]
 				[-s \fIsnr\fP] [-r \fIrmsdb\fP | -R \fIrms\fP] [-t \fItime\fP]
+				[-c] [-b] [-m] [d]
 			   	[-S \fIsta/lat/lon/rms\fP] [-f \fIgridfilename\fP] \fIdbname\fP [\fIplotfile\fP]
 .fi
 
@@ -35,6 +36,16 @@ Add a virtual station. Multiple stations can be specified by repeating the argum
 specify \fIsnr\fP. This overrides the value from the paramter file.
 .IP "-t time"
 Time for \fIrms\fP values when a database is used to lookup the \fIrms\fP values. If not specified, the program looks for recent values. How recent exactly is infuenced by the \fIsnr_latency\fP from the parameter file.
+.IP "-c
+Plotting cities (from a table \fBplaces\fI) is enabled by configuring the optional parameters \fIcities_dbname\fP and \fIcities_subset\fP in the parameterfile.
+The commandline paramter c disables plotting of cities. 
+.IP "-b
+Plotting borders (from a database with polygons) is enabled by configuring the optional parameters \fIplaces_dbname\fP and \fIplaces_subset\fP in the parameterfile.
+The commandline paramter b disables plotting of borders. 
+.IP "-m"
+Don't plot magnitude thresholds.
+.IP "-d"
+Don't plot distances.
 .IP "dbname"
 Name of database with station coordinates in a site table. This argument is required.
 .IP plotfilename

bin/db/net_sim/net_sim.pf

@@ -24,16 +24,37 @@ magtype Ml
 # c0 0.52
 # c1 1.66
 
+# Valid font sizes are xx-small, x-small, small, medium, large, x-large, xx-large, smaller, larger
+# or numerical font size in points
+title_fontsize medium
+label_fontsize x-small
 
 #if these are not specified, the program uses the bounding box of the network
 xmin 
 xmax
 ymin
 ymax
+
+# colorbar boundaries and contours
+number_contours
+mindist
+maxdist
+minmag
+maxmag
+
 #use all stations by default
 stations_used &Tbl{
 }
 stations_ignored &Tbl{
 }
 station_rms &Arr{
+#	GILA 20
+#	SQMD 3	
 }
+
+
+# additional labels and lines - mainly for orientation
+cities_dbname #/opt/antelope/local/data/database/ortsliste_kurz_utf8_aec_bin
+cities_subset #place=~/Wien
+borders_dbname #/opt/antelope/local/data/database/BekannteGrenzen
+borders_subset #ptype=~/pb/ || pname=~/Austria/