Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-21 00:00:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

more fixes for double precision of coordinates

Browse Source
This commit is contained in:
Michael Peter Christen 2012-06-04 23:37:41 +02:00
parent 964406ad17
commit 0284a4d88f
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/de/anomic/data/wiki/WikiCode.java
View File

@ -1049,7 +1049,7 @@ public class WikiCode extends AbstractWikiParser implements WikiParser {
if (d[d.length-1].toUpperCase().equals("w")) {lon = -lon; lonm = -lonm;}
}
}
if (lon != 0.0f && lat != 0.0f) {
if (lon != 0.0d && lat != 0.0d) {
// replace this with a format that the html parser can understand
line = line.substring(0, p) + (name.length() > 0 ? (" " + name) : "") + " <nobr> " + lato + " " + lat + "\u00B0 " + latm + "'</nobr><nobr>" + lono + " " + lon + "\u00B0 " + lonm + "'</nobr> " + line.substring(q + WIKI_CLOSE_METADATA.length());
s = p;

10
source/net/yacy/document/geolocalization/Coordinates.java
View File

@ -24,20 +24,20 @@ package net.yacy.document.geolocalization;
public class Coordinates {
private static final float tenmeter = 90.0f / 1.0e6f;
private static final double tenmeter = 90.0d / 1.0e6d;
private final float lon, lat;
private final double lon, lat;
public Coordinates(float lon, float lat) {
public Coordinates(double lon, double lat) {
this.lon = lon;
this.lat = lat;
}
public float lon() {
public double lon() {
return this.lon;
}
public float lat() {
public double lat() {
return this.lat;
}

24
source/net/yacy/document/parser/html/ContentScraper.java
View File

@ -174,8 +174,8 @@ public class ContentScraper extends AbstractScraper implements Scraper {
this.li = new ArrayList<String>();
this.content = new CharBuffer(MAX_DOCSIZE, 1024);
this.htmlFilterEventListeners = new EventListenerList();
this.lon = 0.0f;
this.lat = 0.0f;
this.lon = 0.0d;
this.lat = 0.0d;
this.evaluationScores.match(Element.url, root.toNormalform(false, false));
this.canonical = null;
}
@ -227,29 +227,29 @@ public class ContentScraper extends AbstractScraper implements Scraper {
r--;
if (newtext[r] == 'N') {
this.lat = Float.parseFloat(new String(newtext, r + 2, p - r - 2)) +
Float.parseFloat(new String(newtext, p + pl + 1, q - p - pl - 1)) / 60.0f;
if (this.lon != 0.0f) break location;
Float.parseFloat(new String(newtext, p + pl + 1, q - p - pl - 1)) / 60.0d;
if (this.lon != 0.0d) break location;
s = q + 6;
continue location;
}
if (newtext[r] == 'S') {
this.lat = -Float.parseFloat(new String(newtext, r + 2, p - r - 2)) -
Float.parseFloat(new String(newtext, p + pl + 1, q - p - pl - 1)) / 60.0f;
if (this.lon != 0.0f) break location;
Float.parseFloat(new String(newtext, p + pl + 1, q - p - pl - 1)) / 60.0d;
if (this.lon != 0.0d) break location;
s = q + 6;
continue location;
}
if (newtext[r] == 'E') {
this.lon = Float.parseFloat(new String(newtext, r + 2, p - r - 2)) +
Float.parseFloat(new String(newtext, p + pl + 1, q - p - pl - 1)) / 60.0f;
if (this.lat != 0.0f) break location;
Float.parseFloat(new String(newtext, p + pl + 1, q - p - pl - 1)) / 60.0d;
if (this.lat != 0.0d) break location;
s = q + 6;
continue location;
}
if (newtext[r] == 'W') {
this.lon = -Float.parseFloat(new String(newtext, r + 2, p - r - 2)) -
Float.parseFloat(new String(newtext, p + 2, q - p - pl - 1)) / 60.0f;
if (this.lat != 0.0f) break location;
Float.parseFloat(new String(newtext, p + 2, q - p - pl - 1)) / 60.0d;
if (this.lat != 0.0d) break location;
s = q + 6;
continue location;
}
@ -804,7 +804,7 @@ public class ContentScraper extends AbstractScraper implements Scraper {
// <meta NAME="geo.position" CONTENT="38.90551492;1.454004505" />
public double getLon() {
if (this.lon != 0.0f) return this.lon;
if (this.lon != 0.0d) return this.lon;
String s = this.metas.get("ICBM"); // InterContinental Ballistic Missile (abbrev. supposed to be a joke: http://www.jargon.net/jargonfile/i/ICBMaddress.html), see http://geourl.org/add.html#icbm
if (s != null) {
int p = s.indexOf(';');
@ -815,7 +815,7 @@ public class ContentScraper extends AbstractScraper implements Scraper {
this.lon = Double.parseDouble(s.substring(p + 1).trim());
}
}
if (this.lon != 0.0f) return this.lon;
if (this.lon != 0.0d) return this.lon;
s = this.metas.get("geo.position"); // http://geotags.com/geobot/add-tags.html
if (s != null) {
int p = s.indexOf(';');