Index: trunk/scripts/SyncEditorLayerIndex.groovy
===================================================================
--- trunk/scripts/SyncEditorLayerIndex.groovy (revision 11951)
+++ trunk/scripts/SyncEditorLayerIndex.groovy (revision 11964)
@@ -53,5 +53,15 @@
script.start()
script.loadJosmEntries()
+ if(options.josmxml) {
+ def file = new FileWriter(options.josmxml)
+ def stream = new BufferedWriter(file)
+ script.printentries(script.josmEntries, stream)
+ }
script.loadELIEntries()
+ if(options.elixml) {
+ def file = new FileWriter(options.elixml)
+ def stream = new BufferedWriter(file)
+ script.printentries(script.eliEntries, stream)
+ }
script.checkInOneButNotTheOther()
script.checkCommonEntries()
@@ -78,4 +88,6 @@
cli.x(longOpt:'xhtmlbody', argName:"xhtmlbody", "create XHTML body for display in a web page")
cli.X(longOpt:'xhtml', argName:"xhtml", "create XHTML for display in a web page")
+ cli.p(longOpt:'elixml', args:1, argName:"elixml", "ELI entries for use in JOSM as XML file (incomplete)")
+ cli.q(longOpt:'josmxml', args:1, argName:"josmxml", "JOSM entries reoutput as XML file (incomplete)")
cli.m(longOpt:'nomissingeli', argName:"nomissingeli", "don't show missing editor layer index entries")
cli.h(longOpt:'help', "show this help")
@@ -120,8 +132,8 @@
void myprintlnfinal(String s) {
if(outputStream != null) {
- outputStream.write(s);
- outputStream.newLine();
+ outputStream.write(s)
+ outputStream.newLine()
} else {
- println s;
+ println s
}
}
@@ -135,5 +147,5 @@
}
if (!options.noskip) {
- return;
+ return
}
} else if(options.xhtmlbody || options.xhtml) {
@@ -179,4 +191,45 @@
}
myprintln "*** Loaded ${eliEntries.size()} entries (ELI). ***"
+ }
+
+ void printentries(def entries, def stream) {
+ stream.write "\n"
+ stream.write "\n"
+ for (def e : entries) {
+ def best = "eli-best".equals(getQuality(e))
+ stream.write " \n"
+ stream.write " ${getName(e)}\n"
+ stream.write " ${getId(e)}\n"
+ def minlat = 1000
+ def minlon = 1000
+ def maxlat = -1000
+ def maxlon = -1000
+ def shapes = ""
+ def sep = "\n "
+ for(def s: getShapes(e)) {
+ shapes += " "
+ def i = 0
+ for(def p: s.getPoints()) {
+ def lat = p.getLat()
+ def lon = p.getLon()
+ if(lat > maxlat) maxlat = lat
+ if(lon > maxlon) maxlon = lon
+ if(lat < minlat) minlat = lat
+ if(lon < minlon) minlon = lon
+ if(!(i++%3)) {
+ shapes += sep + " "
+ }
+ shapes += ""
+ }
+ shapes += sep + "\n"
+ }
+ if(shapes) {
+ stream.write " \n"
+ stream.write shapes + " \n"
+ stream.write " \n"
+ }
+ }
+ stream.write "\n"
+ stream.close()
}
@@ -313,10 +366,10 @@
def jd = getDate(j)
// The forms 2015;- or -;2015 or 2015;2015 are handled equal to 2015
- String ef = ed.replaceAll("\\A-;","").replaceAll(";-\\z","").replaceAll("\\A([0-9-]+);\\1\\z","\$1");
+ String ef = ed.replaceAll("\\A-;","").replaceAll(";-\\z","").replaceAll("\\A([0-9-]+);\\1\\z","\$1")
// ELI has a strange and inconsistent used end_date definition, so we try again with subtraction by one
- String ed2 = ed;
+ String ed2 = ed
def reg = (ed =~ /^(.*;)(\d\d\d\d)(-(\d\d)(-(\d\d))?)?$/)
if(reg != null && reg.count == 1) {
- Calendar cal = Calendar.getInstance();
+ Calendar cal = Calendar.getInstance()
cal.set(reg[0][2] as Integer, reg[0][4] == null ? 0 : (reg[0][4] as Integer)-1, reg[0][6] == null ? 1 : reg[0][6] as Integer)
cal.add(Calendar.DAY_OF_MONTH, -1)
@@ -327,9 +380,9 @@
ed2 += "-" + String.format("%02d", cal.get(Calendar.DAY_OF_MONTH))
}
- String ef2 = ed2.replaceAll("\\A-;","").replaceAll(";-\\z","").replaceAll("\\A([0-9-]+);\\1\\z","\$1");
+ String ef2 = ed2.replaceAll("\\A-;","").replaceAll(";-\\z","").replaceAll("\\A([0-9-]+);\\1\\z","\$1")
if (!ed.equals(jd) && !ef.equals(jd) && !ed2.equals(jd) && !ef2.equals(jd)) {
- String t = "'${ed}'";
+ String t = "'${ed}'"
if (!ed.equals(ef)) {
- t += " or '${ef}'";
+ t += " or '${ef}'"
}
if (jd.isEmpty()) {
@@ -350,4 +403,9 @@
if(!p[0].equals(p[p.size()-1])) {
myprintln "+++ JOSM shape $num unclosed: ${getDescription(j)}"
+ }
+ for (def nump = 1; nump < p.size(); ++nump) {
+ if (p[nump-1] == p[nump]) {
+ myprintln "+++ JOSM shape $num double point at ${nump-1}: ${getDescription(j)}"
+ }
}
++num
@@ -362,4 +420,9 @@
if(!p[0].equals(p[p.size()-1]) && !options.nomissingeli) {
myprintln "+++ ELI shape $num unclosed: ${getDescription(e)}"
+ }
+ for (def nump = 1; nump < p.size(); ++nump) {
+ if (p[nump-1] == p[nump]) {
+ myprintln "+++ ELI shape $num double point at ${nump-1}: ${getDescription(e)}"
+ }
}
++num
@@ -426,5 +489,5 @@
def id = getId(j)
if(josmMirrors.containsKey(url)) {
- continue;
+ continue
}
if(id == null) {
@@ -433,5 +496,5 @@
myprintln "* JOSM-ID ${id} not unique: ${getDescription(j)}"
} else {
- josmIds.put(id, j);
+ josmIds.put(id, j)
}
def d = getDate(j)
@@ -442,6 +505,6 @@
} else {
try {
- def first = verifyDate(reg[0][2],reg[0][4],reg[0][6]);
- def second = verifyDate(reg[0][9],reg[0][11],reg[0][13]);
+ def first = verifyDate(reg[0][2],reg[0][4],reg[0][6])
+ def second = verifyDate(reg[0][9],reg[0][11],reg[0][13])
if(second.compareTo(first) < 0) {
myprintln "* JOSM-Date '${d}' is strange (second earlier than first): ${getDescription(j)}"
@@ -455,19 +518,19 @@
def js = getShapes(j)
if(js.size()) {
- def minlat = 1000;
- def minlon = 1000;
- def maxlat = -1000;
- def maxlon = -1000;
+ def minlat = 1000
+ def minlon = 1000
+ def maxlat = -1000
+ def maxlon = -1000
for(def s: js) {
for(def p: s.getPoints()) {
- def lat = p.getLat();
- def lon = p.getLon();
- if(lat > maxlat) maxlat = lat;
- if(lon > maxlon) maxlon = lon;
- if(lat < minlat) minlat = lat;
- if(lon < minlon) minlon = lon;
- }
- }
- def b = j.getBounds();
+ def lat = p.getLat()
+ def lon = p.getLon()
+ if(lat > maxlat) maxlat = lat
+ if(lon > maxlon) maxlon = lon
+ if(lat < minlat) minlat = lat
+ if(lon < minlon) minlon = lon
+ }
+ }
+ def b = j.getBounds()
if(b.getMinLat() != minlat || b.getMinLon() != minlon || b.getMaxLat() != maxlat || b.getMaxLon() != maxlon) {
myprintln "* Bounds do not match shape (is ${b.getMinLat()},${b.getMinLon()},${b.getMaxLat()},${b.getMaxLon()}, calculated ): ${getDescription(j)}"
@@ -495,5 +558,5 @@
else if(!end.isEmpty())
return "-;"+end
- return "";
+ return ""
}
static Date verifyDate(String year, String month, String day) {
@@ -518,7 +581,7 @@
static List getShapes(Object e) {
if (e instanceof ImageryInfo) {
- def bounds = e.getBounds();
+ def bounds = e.getBounds()
if(bounds != null) {
- return bounds.getShapes();
+ return bounds.getShapes()
}
return []