In case no family id is given the 6829 is used as default.
Any ideas for a better default id? 6829 is just a random number.
This avoids problems when using the maps in MapSource (especially
searching).
WanMil
Index: resources/help/en/options
===================================================================
--- resources/help/en/options (revision 1775)
+++ resources/help/en/options (working copy)
@@ -136,6 +136,8 @@
--family-id
This is an integer that identifies a family of products.
+ Range: [1..9999]
+ Mkgmap default: 6829
--family-name
If you build several maps, this option describes the
Index: src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java
===================================================================
--- src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java (revision 1775)
+++ src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java (working copy)
@@ -43,7 +43,7 @@
private String typName;
public void init(CommandArgs args) {
- int familyId = args.get("family-id", 0);
+ int familyId = args.get("family-id", CommandArgs.DEFAULT_FAMILYID);
productId = args.get("product-id", 1);
baseFilename = args.get("overview-mapname", "osmmap");
Index: src/uk/me/parabola/mkgmap/combiners/FileInfo.java
===================================================================
--- src/uk/me/parabola/mkgmap/combiners/FileInfo.java (revision 1775)
+++ src/uk/me/parabola/mkgmap/combiners/FileInfo.java (working copy)
@@ -341,7 +341,7 @@
}
public int getFamilyId() {
- return args.get("family-id", 0);
+ return args.get("family-id", CommandArgs.DEFAULT_FAMILYID);
}
public int getProductId() {
Index: src/uk/me/parabola/mkgmap/combiners/MdxBuilder.java
===================================================================
--- src/uk/me/parabola/mkgmap/combiners/MdxBuilder.java (revision 1775)
+++ src/uk/me/parabola/mkgmap/combiners/MdxBuilder.java (working copy)
@@ -31,7 +31,7 @@
private String outputDir;
public void init(CommandArgs args) {
- int familyId = args.get("family-id", 0);
+ int familyId = args.get("family-id", CommandArgs.DEFAULT_FAMILYID);
int productId = args.get("product-id", 1);
mdxFilename = args.get("overview-mapname", "osm") + ".mdx";
Index: src/uk/me/parabola/mkgmap/combiners/TdbBuilder.java
===================================================================
--- src/uk/me/parabola/mkgmap/combiners/TdbBuilder.java (revision 1775)
+++ src/uk/me/parabola/mkgmap/combiners/TdbBuilder.java (working copy)
@@ -73,7 +73,7 @@
areaName = args.get("area-name", "Overview Map");
- int familyId = args.get("family-id", 0);
+ int familyId = args.get("family-id", CommandArgs.DEFAULT_FAMILYID);
int productId = args.get("product-id", 1);
short productVersion = (short)args.get("product-version", 100);
Index: src/uk/me/parabola/mkgmap/CommandArgs.java
===================================================================
--- src/uk/me/parabola/mkgmap/CommandArgs.java (revision 1775)
+++ src/uk/me/parabola/mkgmap/CommandArgs.java (working copy)
@@ -5,6 +5,8 @@
import uk.me.parabola.util.EnhancedProperties;
public class CommandArgs {
+ public static final int DEFAULT_FAMILYID = 6829;
+
private final EnhancedProperties currentOptions;
public CommandArgs(EnhancedProperties args) {
_______________________________________________
mkgmap-dev mailing list
[email protected]
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
