Author: lemovice
Date: Thu Oct 10 22:00:09 2013
New Revision: 4607
Log:
Remove ancestris.modules.geonames dependency
Add ancestris.modules.jdom dependency
Copy geoname lib from geo module for test purpose
Added:
trunk/AncestrisExtensions/place.geoname/src/org/
trunk/AncestrisExtensions/place.geoname/src/org/geonames/
trunk/AncestrisExtensions/place.geoname/src/org/geonames/Address.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/Address.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/FeatureClass.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/FeatureClass.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/InsufficientStyleException.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/InsufficientStyleException.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/Intersection.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/Intersection.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/InvalidParameterException.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/InvalidParameterException.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/PostalCode.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/PostalCode.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/PostalCodeSearchCriteria.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/PostalCodeSearchCriteria.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/StreetSegment.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/StreetSegment.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/Style.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/Style.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/Timezone.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/Timezone.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/Toponym.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/Toponym.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/ToponymSearchCriteria.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/ToponymSearchCriteria.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/ToponymSearchResult.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/ToponymSearchResult.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/WebService.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/WebService.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/WikipediaArticle.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/WikipediaArticle.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/utils/
trunk/AncestrisExtensions/place.geoname/src/org/geonames/utils/Bearing.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/utils/Bearing.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/utils/Distance.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/utils/Distance.java
trunk/AncestrisExtensions/place.geoname/src/org/geonames/wikipedia/
trunk/AncestrisExtensions/place.geoname/src/org/geonames/wikipedia/TextSummaryExtractor.java
- copied unchanged from r4605,
/trunk/AncestrisExtensions/Geo/src/org/geonames/wikipedia/TextSummaryExtractor.java
Modified:
trunk/AncestrisExtensions/place.geoname/nbproject/build-impl.xml
trunk/AncestrisExtensions/place.geoname/nbproject/genfiles.properties
trunk/AncestrisExtensions/place.geoname/nbproject/project.xml
trunk/AncestrisExtensions/place.geoname/src/ancestris/place/geonames/GeonamesPlace.java
trunk/AncestrisExtensions/place.geoname/src/ancestris/place/geonames/GeonamesPlacesList.java
Modified: trunk/AncestrisExtensions/place.geoname/nbproject/build-impl.xml
==============================================================================
--- trunk/AncestrisExtensions/place.geoname/nbproject/build-impl.xml
(original)
+++ trunk/AncestrisExtensions/place.geoname/nbproject/build-impl.xml Thu Oct
10 22:00:09 2013
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?><!--
*** GENERATED FROM project.xml - DO NOT EDIT ***
*** EDIT ../build.xml INSTEAD ***
--->
-<project name="ancestris.place.geonames-impl" basedir="..">
+--><project name="ancestris.place.geonames-impl" basedir="..">
<fail message="Please build using Ant 1.7.1 or higher.">
<condition>
<not>
Modified: trunk/AncestrisExtensions/place.geoname/nbproject/genfiles.properties
==============================================================================
--- trunk/AncestrisExtensions/place.geoname/nbproject/genfiles.properties
(original)
+++ trunk/AncestrisExtensions/place.geoname/nbproject/genfiles.properties
Thu Oct 10 22:00:09 2013
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=3ea3e308
-build.xml.script.CRC32=d10fda05
+build.xml.data.CRC32=edd3ad3b
+build.xml.script.CRC32=64657708
[email protected]
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=3ea3e308
-nbproject/build-impl.xml.script.CRC32=1e8c6edb
+nbproject/build-impl.xml.data.CRC32=edd3ad3b
+nbproject/build-impl.xml.script.CRC32=8ffa56d2
nbproject/[email protected]
Modified: trunk/AncestrisExtensions/place.geoname/nbproject/project.xml
==============================================================================
--- trunk/AncestrisExtensions/place.geoname/nbproject/project.xml
(original)
+++ trunk/AncestrisExtensions/place.geoname/nbproject/project.xml Thu Oct
10 22:00:09 2013
@@ -15,12 +15,19 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>ancestris.modules.geonames</code-name-base>
+ <code-name-base>ancestris.core</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>1</release-version>
- <specification-version>1.1.9</specification-version>
+ <specification-version>0.8.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>ancestris.modules.jdom</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.1.3</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
Modified:
trunk/AncestrisExtensions/place.geoname/src/ancestris/place/geonames/GeonamesPlace.java
==============================================================================
---
trunk/AncestrisExtensions/place.geoname/src/ancestris/place/geonames/GeonamesPlace.java
(original)
+++
trunk/AncestrisExtensions/place.geoname/src/ancestris/place/geonames/GeonamesPlace.java
Thu Oct 10 22:00:09 2013
@@ -1,7 +1,10 @@
package ancestris.place.geonames;
import ancestris.api.place.Place;
-import org.geonames.PostalCode;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.geonames.InsufficientStyleException;
+import org.geonames.Toponym;
/**
*
@@ -9,10 +12,10 @@
*/
public class GeonamesPlace implements Place {
- private PostalCode postalCode = null;
+ private Toponym toponym = null;
- public GeonamesPlace(PostalCode postalCode) {
- this.postalCode = postalCode;
+ public GeonamesPlace(Toponym toponym) {
+ this.toponym = toponym;
}
@Override
@@ -22,12 +25,17 @@
@Override
public String getCity() {
- return postalCode.getPlaceName();
+ return toponym.getName();
}
@Override
public String getFirstAvailableJurisdiction() {
- return postalCode.getAdminCode1();
+ try {
+ return toponym.getAdminCode1();
+ } catch (InsufficientStyleException ex) {
+ Logger.getLogger(GeonamesPlace.class.getName()).log(Level.SEVERE,
null, ex);
+ return "";
+ }
}
@Override
@@ -49,17 +57,20 @@
public String[] getJurisdictions() {
String[] jurisdictions = new String[10];
int index = 0;
-
- jurisdictions[index++] = postalCode.getPlaceName();
- jurisdictions[index++] = postalCode.getAdminName1();
- jurisdictions[index++] = postalCode.getAdminCode1();
- jurisdictions[index++] = postalCode.getAdminName2();
- jurisdictions[index++] = postalCode.getAdminCode2();
- jurisdictions[index++] = postalCode.getAdminName3();
- jurisdictions[index++] = postalCode.getAdminCode3();
- jurisdictions[index++] = postalCode.getPostalCode();
- jurisdictions[index++] = postalCode.getCountryCode();
-
+ try {
+ jurisdictions[index++] = toponym.getName();
+ jurisdictions[index++] = toponym.getAdminName1();
+ jurisdictions[index++] = toponym.getAdminCode1();
+ jurisdictions[index++] = toponym.getAdminName2();
+ jurisdictions[index++] = toponym.getAdminCode2();
+ jurisdictions[index++] = toponym.getAdminName3();
+ jurisdictions[index++] = toponym.getAdminCode3();
+ jurisdictions[index++] = toponym.getPostcode();
+ jurisdictions[index++] = toponym.getCountryCode();
+
+ } catch (InsufficientStyleException ex) {
+ Logger.getLogger(GeonamesPlace.class.getName()).log(Level.SEVERE,
null, ex);
+ }
return jurisdictions;
}
@@ -75,18 +86,23 @@
@Override
public Double getLongitude() {
- return postalCode.getLongitude();
+ return toponym.getLongitude();
}
@Override
public Double getLatitude() {
- return postalCode.getLatitude();
+ return toponym.getLatitude();
}
@Override
public String toString() {
- return postalCode.getPlaceName() + "," + postalCode.getAdminName1() +
","
- + postalCode.getAdminName2() + "," +
postalCode.getAdminName3() + ","
- + postalCode.getPostalCode() + "," +
postalCode.getCountryCode();
+ try {
+ return toponym.getName() + "," + toponym.getAdminName1() + ","
+ + toponym.getAdminName2() + "," + toponym.getAdminName3()
+ ","
+ + toponym.getPostcode() + "," + toponym.getCountryCode();
+ } catch (InsufficientStyleException ex) {
+ Logger.getLogger(GeonamesPlace.class.getName()).log(Level.SEVERE,
null, ex);
+ return "";
+ }
}
}
Modified:
trunk/AncestrisExtensions/place.geoname/src/ancestris/place/geonames/GeonamesPlacesList.java
==============================================================================
---
trunk/AncestrisExtensions/place.geoname/src/ancestris/place/geonames/GeonamesPlacesList.java
(original)
+++
trunk/AncestrisExtensions/place.geoname/src/ancestris/place/geonames/GeonamesPlacesList.java
Thu Oct 10 22:00:09 2013
@@ -2,14 +2,13 @@
import ancestris.api.place.Place;
import ancestris.api.place.PlacesList;
+import genj.gedcom.PropertyPlace;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.geonames.PostalCode;
-import org.geonames.PostalCodeSearchCriteria;
-import org.geonames.Style;
-import org.geonames.WebService;
+import org.geonames.*;
/**
*
@@ -21,18 +20,18 @@
private final static Logger logger =
Logger.getLogger(GeonamesPlacesList.class.getName(), null);
@Override
- public List<Place> findPlace(String placeName) {
- PostalCodeSearchCriteria searchCriteria = new
PostalCodeSearchCriteria();
- searchCriteria.setPlaceName(placeName);
+ public List<Place> findPlace(PropertyPlace place) {
+ ToponymSearchCriteria searchCriteria = new ToponymSearchCriteria();
+ searchCriteria.setLanguage(Locale.getDefault().toString());
searchCriteria.setStyle(Style.FULL);
-
+ ToponymSearchResult searchResult;
try {
- WebService.setUserName("lemovice");
- List<PostalCode> searchResult =
WebService.postalCodeSearch(searchCriteria);
+ searchCriteria.setQ(place.getDisplayValue().replaceAll(",", " "));
+ searchResult = WebService.search(searchCriteria);
- for (PostalCode postalCode : searchResult) {
- placesList.add(new GeonamesPlace(postalCode));
+ for (Toponym toponym : searchResult.getToponyms()) {
+ placesList.add(new GeonamesPlace(toponym));
}
return placesList;
} catch (Exception e) {
---------------------------------------------------------------------
Site Web Ancestris : http://www.ancestris.org
<*> Pour vous desinscrire de cette liste, envoyez un mail a :
[email protected]
<*> Pour obtenir de l'aide sur les commandes de la liste :
[email protected]
Pour obtenir tous les messages lies a ce fil de discussion, cliquez sur le
lien ci-dessous, cela ouvrira votre logiciel de messagerie. Il vous suffira
d'envoyer le message :
[email protected]
